From cd7c3476d51379a622210973be817ab783eabfa0 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Mon, 23 Oct 2017 00:34:55 -0500
Subject: Rename script commands again

---
 src/battle_2.c |  10 +-----
 src/scrcmd.c   | 102 ++++++++++++++++++++++++++++-----------------------------
 2 files changed, 52 insertions(+), 60 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index aeba69213..cee845c75 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -43,6 +43,7 @@
 #include "tv.h"
 #include "safari_zone.h"
 #include "battle_string_ids.h"
+#include "data2.h"
 
 struct UnknownStruct6
 {
@@ -2481,15 +2482,6 @@ static void sub_80398D0(struct Sprite *sprite)
     }
 }
 
-// to get rid of once the struct is declared in a header
-struct MonCoords
-{
-    // This would use a bitfield, but sub_8079F44
-    // uses it as a u8 and casting won't match.
-    u8 coords; // u8 x:4, y:4;
-    u8 y_offset;
-};
-
 extern const struct MonCoords gMonFrontPicCoords[];
 extern const struct MonCoords gCastformFrontSpriteCoords[];
 
diff --git a/src/scrcmd.c b/src/scrcmd.c
index af314609c..219dfebd0 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -495,7 +495,7 @@ bool8 ScrCmd_random(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_additem(struct ScriptContext *ctx)
+bool8 ScrCmd_giveitem(struct ScriptContext *ctx)
 {
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
@@ -504,7 +504,7 @@ bool8 ScrCmd_additem(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_removeitem(struct ScriptContext *ctx)
+bool8 ScrCmd_takeitem(struct ScriptContext *ctx)
 {
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
@@ -539,7 +539,7 @@ bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_addpcitem(struct ScriptContext *ctx)
+bool8 ScrCmd_givepcitem(struct ScriptContext *ctx)
 {
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u16 quantity = VarGet(ScriptReadHalfword(ctx));
@@ -557,7 +557,7 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_adddecor(struct ScriptContext *ctx)
+bool8 ScrCmd_givedecoration(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
@@ -565,7 +565,7 @@ bool8 ScrCmd_adddecor(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_removedecor(struct ScriptContext *ctx)
+bool8 ScrCmd_takedecoration(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
@@ -573,7 +573,7 @@ bool8 ScrCmd_removedecor(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_checkdecor(struct ScriptContext *ctx)
+bool8 ScrCmd_checkdecorspace(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
@@ -581,7 +581,7 @@ bool8 ScrCmd_checkdecor(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_hasdecor(struct ScriptContext *ctx)
+bool8 ScrCmd_checkdecor(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
@@ -613,14 +613,14 @@ bool8 ScrCmd_incrementgamestat(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_animdarklevel(struct ScriptContext *ctx)
+bool8 ScrCmd_animateflash(struct ScriptContext *ctx)
 {
     sub_80B009C(ScriptReadByte(ctx));
     ScriptContext1_Stop();
     return TRUE;
 }
 
-bool8 ScrCmd_setdarklevel(struct ScriptContext *ctx)
+bool8 ScrCmd_setflashradius(struct ScriptContext *ctx)
 {
     u16 flashLevel = VarGet(ScriptReadHalfword(ctx));
 
@@ -643,12 +643,12 @@ bool8 ScrCmd_fadescreen(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_fadescreendelay(struct ScriptContext *ctx)
+bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx)
 {
     u8 mode = ScriptReadByte(ctx);
-    u8 delay = ScriptReadByte(ctx);
+    u8 speed = ScriptReadByte(ctx);
 
-    fade_screen(mode, delay);
+    fade_screen(mode, speed);
     SetupNativeScript(ctx, IsPaletteNotActive);
     return TRUE;
 }
@@ -736,7 +736,7 @@ bool8 ScrCmd_doweather(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_tileeffect(struct ScriptContext *ctx)
+bool8 ScrCmd_setstepcallback(struct ScriptContext *ctx)
 {
     ActivatePerStepCallback(ScriptReadByte(ctx));
     return FALSE;
@@ -907,7 +907,7 @@ bool8 ScrCmd_getplayerxy(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_countpokemon(struct ScriptContext *ctx)
+bool8 ScrCmd_getpartysize(struct ScriptContext *ctx)
 {
     gScriptResult = CalculatePlayerPartyCount();
     return FALSE;
@@ -1121,7 +1121,7 @@ bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_showobject(struct ScriptContext *ctx)
+bool8 ScrCmd_showobject_at(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
     u8 mapGroup = ScriptReadByte(ctx);
@@ -1131,7 +1131,7 @@ bool8 ScrCmd_showobject(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_hideobject(struct ScriptContext *ctx)
+bool8 ScrCmd_hideobject_at(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
     u8 mapGroup = ScriptReadByte(ctx);
@@ -1339,7 +1339,7 @@ static bool8 WaitForAorBPress(void)
     return FALSE;
 }
 
-bool8 ScrCmd_waitbutton(struct ScriptContext *ctx)
+bool8 ScrCmd_waitbuttonpress(struct ScriptContext *ctx)
 {
     SetupNativeScript(ctx, WaitForAorBPress);
     return TRUE;
@@ -1454,7 +1454,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_drawpokepic(struct ScriptContext *ctx)
+bool8 ScrCmd_showmonpic(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
     u8 x = ScriptReadByte(ctx);
@@ -1464,7 +1464,7 @@ bool8 ScrCmd_drawpokepic(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_erasepokepic(struct ScriptContext *ctx)
+bool8 ScrCmd_hidemonpic(struct ScriptContext *ctx)
 {
     bool8 (*func)(void) = ScriptMenu_GetPicboxWaitFunc();
 
@@ -1474,7 +1474,7 @@ bool8 ScrCmd_erasepokepic(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_drawcontestwinner(struct ScriptContext *ctx)
+bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx)
 {
     u8 v1 = ScriptReadByte(ctx);
 
@@ -1694,7 +1694,7 @@ bool8 ScrCmd_vmessage(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getspeciesname(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferspeciesname(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 species = VarGet(ScriptReadHalfword(ctx));
@@ -1703,7 +1703,7 @@ bool8 ScrCmd_getspeciesname(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getfirstpartypokename(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferleadmonspeciesname(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
 
@@ -1714,7 +1714,7 @@ bool8 ScrCmd_getfirstpartypokename(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getpartypokename(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferpartymonnick(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
@@ -1724,7 +1724,7 @@ bool8 ScrCmd_getpartypokename(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getitemname(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferitemname(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
@@ -1733,7 +1733,7 @@ bool8 ScrCmd_getitemname(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getitemnameplural(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferitemnameplural(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
@@ -1743,7 +1743,7 @@ bool8 ScrCmd_getitemnameplural(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getdecorname(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferdecorationname(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 decorId = VarGet(ScriptReadHalfword(ctx));
@@ -1752,7 +1752,7 @@ bool8 ScrCmd_getdecorname(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getmovename(struct ScriptContext *ctx)
+bool8 ScrCmd_buffermovename(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 moveId = VarGet(ScriptReadHalfword(ctx));
@@ -1761,7 +1761,7 @@ bool8 ScrCmd_getmovename(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getnumberstring(struct ScriptContext *ctx)
+bool8 ScrCmd_buffernumberstring(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 v1 = VarGet(ScriptReadHalfword(ctx));
@@ -1771,7 +1771,7 @@ bool8 ScrCmd_getnumberstring(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getstdstring(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferstdstring(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 index = VarGet(ScriptReadHalfword(ctx));
@@ -1780,7 +1780,7 @@ bool8 ScrCmd_getstdstring(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getcontesttype(struct ScriptContext *ctx)
+bool8 ScrCmd_buffercontesttype(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 index = VarGet(ScriptReadHalfword(ctx));
@@ -1789,7 +1789,7 @@ bool8 ScrCmd_getcontesttype(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getstring(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferstring(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     const u8 *text = (u8 *)ScriptReadWord(ctx);
@@ -1806,7 +1806,7 @@ bool8 ScrCmd_vloadword(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_vgetstring(struct ScriptContext *ctx)
+bool8 ScrCmd_vbufferstring(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u32 addr = ScriptReadWord(ctx);
@@ -1817,7 +1817,7 @@ bool8 ScrCmd_vgetstring(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_getboxname(struct ScriptContext *ctx)
+bool8 ScrCmd_bufferboxname(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 boxId = VarGet(ScriptReadHalfword(ctx));
@@ -1826,7 +1826,7 @@ bool8 ScrCmd_getboxname(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_givepoke(struct ScriptContext *ctx)
+bool8 ScrCmd_givemon(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
     u8 level = ScriptReadByte(ctx);
@@ -1847,7 +1847,7 @@ bool8 ScrCmd_giveegg(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_setpokemove(struct ScriptContext *ctx)
+bool8 ScrCmd_setmonmove(struct ScriptContext *ctx)
 {
     u8 partyIndex = ScriptReadByte(ctx);
     u8 slot = ScriptReadByte(ctx);
@@ -1857,7 +1857,7 @@ bool8 ScrCmd_setpokemove(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_checkpokemove(struct ScriptContext *ctx)
+bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx)
 {
     u8 i;
     u16 moveId = ScriptReadHalfword(ctx);
@@ -1973,7 +1973,7 @@ bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_battlebegin(struct ScriptContext *ctx)
+bool8 ScrCmd_dotrainerbattle(struct ScriptContext *ctx)
 {
     BattleSetup_StartTrainerBattle();
     return TRUE;
@@ -2041,7 +2041,7 @@ bool8 ScrCmd_pokemart(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_pokemartdecor(struct ScriptContext *ctx)
+bool8 ScrCmd_pokemartdecoration(struct ScriptContext *ctx)
 {
     const void *ptr = (void *)ScriptReadWord(ctx);
 
@@ -2050,7 +2050,7 @@ bool8 ScrCmd_pokemartdecor(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_pokemartbp(struct ScriptContext *ctx)
+bool8 ScrCmd_pokemartdecoration2(struct ScriptContext *ctx)
 {
     const void *ptr = (void *)ScriptReadWord(ctx);
 
@@ -2068,7 +2068,7 @@ bool8 ScrCmd_playslotmachine(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_plantberrytree(struct ScriptContext *ctx)
+bool8 ScrCmd_setberrytree(struct ScriptContext *ctx)
 {
     u8 treeId = ScriptReadByte(ctx);
     u8 berry = ScriptReadByte(ctx);
@@ -2127,7 +2127,7 @@ bool8 ScrCmd_dofieldeffect(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_setfieldeffect(struct ScriptContext *ctx)
+bool8 ScrCmd_setfieldeffectarg(struct ScriptContext *ctx)
 {
     u8 argNum = ScriptReadByte(ctx);
 
@@ -2150,7 +2150,7 @@ bool8 ScrCmd_waitfieldeffect(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_sethealplace(struct ScriptContext *ctx)
+bool8 ScrCmd_setrespawn(struct ScriptContext *ctx)
 {
     u16 healLocationId = VarGet(ScriptReadHalfword(ctx));
 
@@ -2164,7 +2164,7 @@ bool8 ScrCmd_checkplayergender(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_playpokecry(struct ScriptContext *ctx)
+bool8 ScrCmd_playmoncry(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
     u16 mode = VarGet(ScriptReadHalfword(ctx));
@@ -2173,13 +2173,13 @@ bool8 ScrCmd_playpokecry(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_waitpokecry(struct ScriptContext *ctx)
+bool8 ScrCmd_waitmoncry(struct ScriptContext *ctx)
 {
     SetupNativeScript(ctx, IsCryFinished);
     return TRUE;
 }
 
-bool8 ScrCmd_setmaptile(struct ScriptContext *ctx)
+bool8 ScrCmd_setmetatile(struct ScriptContext *ctx)
 {
     u16 x = VarGet(ScriptReadHalfword(ctx));
     u16 y = VarGet(ScriptReadHalfword(ctx));
@@ -2353,8 +2353,8 @@ bool8 ScrCmd_cmdD9(struct ScriptContext *ctx)
     }
 }
 
-// This command will force the Pokémon to be obedient, you don't get to choose which value to set its obedience to
-bool8 ScrCmd_setpokeobedient(struct ScriptContext *ctx)
+// This command will force the Pokémon to be obedient, you don't get to make it disobedient
+bool8 ScrCmd_setmonobedient(struct ScriptContext *ctx)
 {
     bool8 obedient = TRUE;
     u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
@@ -2363,7 +2363,7 @@ bool8 ScrCmd_setpokeobedient(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_checkpokeobedience(struct ScriptContext *ctx)
+bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
 {
     u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
 
@@ -2398,7 +2398,7 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_setpokemetlocation(struct ScriptContext *ctx)
+bool8 ScrCmd_setmonmetlocation(struct ScriptContext *ctx)
 {
     u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
     u8 location = ScriptReadByte(ctx);
@@ -2414,7 +2414,7 @@ void sub_809BDB4(void)
     RemoveWindow(gUnknown_03000F30);
 }
 
-bool8 ScrCmd_gettrainerclass(struct ScriptContext *ctx)
+bool8 ScrCmd_buffertrainerclassname(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 trainerClassId = VarGet(ScriptReadHalfword(ctx));
@@ -2423,7 +2423,7 @@ bool8 ScrCmd_gettrainerclass(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_gettrainername(struct ScriptContext *ctx)
+bool8 ScrCmd_buffertrainername(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 trainerClassId = VarGet(ScriptReadHalfword(ctx));
-- 
cgit v1.2.3


From 6fcde15bb671db34dd1f17406ee20f319595b6a5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 28 Oct 2017 20:43:33 -0400
Subject: Decompile heal location data

---
 src/heal_location.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 src/heal_location.c

(limited to 'src')

diff --git a/src/heal_location.c b/src/heal_location.c
new file mode 100644
index 000000000..39d9a423d
--- /dev/null
+++ b/src/heal_location.c
@@ -0,0 +1,53 @@
+
+// Includes
+#include "global.h"
+#include "map_constants.h"
+#include "sprite.h"
+#include "heal_location.h"
+
+#define HEAL_LOCATION(map, x, y) {MAP_GROUP_##map, MAP_ID_##map, x, y}
+
+// Static type declarations
+
+// Static RAM declarations
+
+// Static ROM declarations
+
+// .rodata
+
+const struct {
+    const union AffineAnimCmd *const *const affineAnims;
+    void (* callback)(struct Sprite *sprite);
+} gUnknown_0859F534 = {
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
+
+const struct HealLocation gUnknown_0859F53C[] = {
+    HEAL_LOCATION(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F,  4,  2),
+    HEAL_LOCATION(LITTLEROOT_TOWN_MAYS_HOUSE_2F,      4,  2),
+    HEAL_LOCATION(PETALBURG_CITY,                    20, 17),
+    HEAL_LOCATION(SLATEPORT_CITY,                    19, 20),
+    HEAL_LOCATION(MAUVILLE_CITY,                     22,  6),
+    HEAL_LOCATION(RUSTBORO_CITY,                     16, 39),
+    HEAL_LOCATION(FORTREE_CITY,                       5,  7),
+    HEAL_LOCATION(LILYCOVE_CITY,                     24, 15),
+    HEAL_LOCATION(MOSSDEEP_CITY,                     28, 17),
+    HEAL_LOCATION(SOOTOPOLIS_CITY,                   43, 32),
+    HEAL_LOCATION(EVER_GRANDE_CITY,                  27, 49),
+    HEAL_LOCATION(LITTLEROOT_TOWN,                    5,  9),
+    HEAL_LOCATION(LITTLEROOT_TOWN,                   14,  9),
+    HEAL_LOCATION(OLDALE_TOWN,                        6, 17),
+    HEAL_LOCATION(DEWFORD_TOWN,                       2, 11),
+    HEAL_LOCATION(LAVARIDGE_TOWN,                     9,  7),
+    HEAL_LOCATION(FALLARBOR_TOWN,                    14,  8),
+    HEAL_LOCATION(VERDANTURF_TOWN,                   16,  4),
+    HEAL_LOCATION(PACIFIDLOG_TOWN,                    8, 16),
+    HEAL_LOCATION(EVER_GRANDE_CITY,                  18,  6),
+    HEAL_LOCATION(SOUTHERN_ISLAND_EXTERIOR,          15, 20),
+    HEAL_LOCATION(BATTLE_FRONTIER_OUTSIDE_EAST,       3, 52)
+};
+
+const u16 gUnknown_0859F5EC[] = INCBIN_U16("graphics/unknown/unk_859f5ec.gbapal");
+
+// .text
-- 
cgit v1.2.3


From 00f4bba6d8b5fac98fd62143743b70e774edda6a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 28 Oct 2017 20:55:01 -0400
Subject: Decompile heal location functions

---
 src/heal_location.c | 49 ++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/heal_location.c b/src/heal_location.c
index 39d9a423d..206acaf99 100644
--- a/src/heal_location.c
+++ b/src/heal_location.c
@@ -15,14 +15,6 @@
 
 // .rodata
 
-const struct {
-    const union AffineAnimCmd *const *const affineAnims;
-    void (* callback)(struct Sprite *sprite);
-} gUnknown_0859F534 = {
-    gDummySpriteAffineAnimTable,
-    SpriteCallbackDummy
-};
-
 const struct HealLocation gUnknown_0859F53C[] = {
     HEAL_LOCATION(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F,  4,  2),
     HEAL_LOCATION(LITTLEROOT_TOWN_MAYS_HOUSE_2F,      4,  2),
@@ -48,6 +40,45 @@ const struct HealLocation gUnknown_0859F53C[] = {
     HEAL_LOCATION(BATTLE_FRONTIER_OUTSIDE_EAST,       3, 52)
 };
 
-const u16 gUnknown_0859F5EC[] = INCBIN_U16("graphics/unknown/unk_859f5ec.gbapal");
+#define NUM_HEAL_LOCATIONS (ARRAY_COUNT(gUnknown_0859F53C))
 
 // .text
+
+u32 sub_8122C5C(u16 mapGroup, u16 mapNum)
+{
+    u32 i;
+
+    for (i = 0; i < NUM_HEAL_LOCATIONS; i ++)
+    {
+        if (gUnknown_0859F53C[i].group == mapGroup && gUnknown_0859F53C[i].map == mapNum)
+        {
+            return i + 1;
+        }
+    }
+    return 0;
+}
+
+const struct HealLocation *sub_8122C94(u16 mapGroup, u16 mapNum)
+{
+    u32 loc;
+
+    loc = sub_8122C5C(mapGroup, mapNum);
+    if (loc == 0)
+    {
+        return NULL;
+    }
+    return &gUnknown_0859F53C[loc - 1];
+}
+
+const struct HealLocation *sub_8122CBC(u32 loc)
+{
+    if (loc == 0)
+    {
+        return NULL;
+    }
+    if (loc > NUM_HEAL_LOCATIONS)
+    {
+        return NULL;
+    }
+    return &gUnknown_0859F53C[loc - 1];
+}
-- 
cgit v1.2.3


From bbda7125f6286ea2fd47180018dbbe1a451fbf72 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 28 Oct 2017 21:43:06 -0400
Subject: Rename functions

---
 src/heal_location.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/heal_location.c b/src/heal_location.c
index 206acaf99..b2f50c1f9 100644
--- a/src/heal_location.c
+++ b/src/heal_location.c
@@ -15,7 +15,7 @@
 
 // .rodata
 
-const struct HealLocation gUnknown_0859F53C[] = {
+static const struct HealLocation sSpawnLocations[] = {
     HEAL_LOCATION(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F,  4,  2),
     HEAL_LOCATION(LITTLEROOT_TOWN_MAYS_HOUSE_2F,      4,  2),
     HEAL_LOCATION(PETALBURG_CITY,                    20, 17),
@@ -40,17 +40,17 @@ const struct HealLocation gUnknown_0859F53C[] = {
     HEAL_LOCATION(BATTLE_FRONTIER_OUTSIDE_EAST,       3, 52)
 };
 
-#define NUM_HEAL_LOCATIONS (ARRAY_COUNT(gUnknown_0859F53C))
+#define NUM_HEAL_LOCATIONS (ARRAY_COUNT(sSpawnLocations))
 
 // .text
 
-u32 sub_8122C5C(u16 mapGroup, u16 mapNum)
+static u32 GetHealLocationIndexFromMapGroupAndNum(u16 mapGroup, u16 mapNum)
 {
     u32 i;
 
     for (i = 0; i < NUM_HEAL_LOCATIONS; i ++)
     {
-        if (gUnknown_0859F53C[i].group == mapGroup && gUnknown_0859F53C[i].map == mapNum)
+        if (sSpawnLocations[i].group == mapGroup && sSpawnLocations[i].map == mapNum)
         {
             return i + 1;
         }
@@ -58,19 +58,19 @@ u32 sub_8122C5C(u16 mapGroup, u16 mapNum)
     return 0;
 }
 
-const struct HealLocation *sub_8122C94(u16 mapGroup, u16 mapNum)
+const struct HealLocation *GetHealLocationPointerFromMapGroupAndNum(u16 mapGroup, u16 mapNum)
 {
     u32 loc;
 
-    loc = sub_8122C5C(mapGroup, mapNum);
+    loc = GetHealLocationIndexFromMapGroupAndNum(mapGroup, mapNum);
     if (loc == 0)
     {
         return NULL;
     }
-    return &gUnknown_0859F53C[loc - 1];
+    return &sSpawnLocations[loc - 1];
 }
 
-const struct HealLocation *sub_8122CBC(u32 loc)
+const struct HealLocation *GetHealLocationPointer(u32 loc)
 {
     if (loc == 0)
     {
@@ -80,5 +80,5 @@ const struct HealLocation *sub_8122CBC(u32 loc)
     {
         return NULL;
     }
-    return &gUnknown_0859F53C[loc - 1];
+    return &sSpawnLocations[loc - 1];
 }
-- 
cgit v1.2.3


From 27cee8bcf1e0215dd9480a83af752d849e644cf1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 28 Oct 2017 21:44:52 -0400
Subject: Remove unnecessary include

---
 src/heal_location.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/heal_location.c b/src/heal_location.c
index b2f50c1f9..e31a30fb4 100644
--- a/src/heal_location.c
+++ b/src/heal_location.c
@@ -2,7 +2,6 @@
 // Includes
 #include "global.h"
 #include "map_constants.h"
-#include "sprite.h"
 #include "heal_location.h"
 
 #define HEAL_LOCATION(map, x, y) {MAP_GROUP_##map, MAP_ID_##map, x, y}
@@ -15,7 +14,7 @@
 
 // .rodata
 
-static const struct HealLocation sSpawnLocations[] = {
+static const struct HealLocation sHealLocations[] = {
     HEAL_LOCATION(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F,  4,  2),
     HEAL_LOCATION(LITTLEROOT_TOWN_MAYS_HOUSE_2F,      4,  2),
     HEAL_LOCATION(PETALBURG_CITY,                    20, 17),
@@ -40,7 +39,7 @@ static const struct HealLocation sSpawnLocations[] = {
     HEAL_LOCATION(BATTLE_FRONTIER_OUTSIDE_EAST,       3, 52)
 };
 
-#define NUM_HEAL_LOCATIONS (ARRAY_COUNT(sSpawnLocations))
+#define NUM_HEAL_LOCATIONS (ARRAY_COUNT(sHealLocations))
 
 // .text
 
@@ -50,7 +49,7 @@ static u32 GetHealLocationIndexFromMapGroupAndNum(u16 mapGroup, u16 mapNum)
 
     for (i = 0; i < NUM_HEAL_LOCATIONS; i ++)
     {
-        if (sSpawnLocations[i].group == mapGroup && sSpawnLocations[i].map == mapNum)
+        if (sHealLocations[i].group == mapGroup && sHealLocations[i].map == mapNum)
         {
             return i + 1;
         }
@@ -67,7 +66,7 @@ const struct HealLocation *GetHealLocationPointerFromMapGroupAndNum(u16 mapGroup
     {
         return NULL;
     }
-    return &sSpawnLocations[loc - 1];
+    return &sHealLocations[loc - 1];
 }
 
 const struct HealLocation *GetHealLocationPointer(u32 loc)
@@ -80,5 +79,5 @@ const struct HealLocation *GetHealLocationPointer(u32 loc)
     {
         return NULL;
     }
-    return &sSpawnLocations[loc - 1];
+    return &sHealLocations[loc - 1];
 }
-- 
cgit v1.2.3


From 4049ed7e2c6bef50f2551cc846e0b428fdf51bd1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 28 Oct 2017 22:03:33 -0400
Subject: Rename REGION_MAP constants to adopt MAPSEC names from Ruby

---
 src/decoration.c | 4 ++--
 src/tv.c         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/decoration.c b/src/decoration.c
index 0179d36a1..b435c3db5 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1603,7 +1603,7 @@ void sub_81289F0(u8 taskId)
         ScriptContext1_SetupScript(gUnknown_08275D1F);
     }
     gSprites[sDecor_CameraSpriteObjectIdx1].pos1.y += 2;
-    if (gMapHeader.regionMapSectionId == REGION_MAP_SECRET_BASE)
+    if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
     {
         TV_PutSecretBaseVisitOnTheAir();
     }
@@ -2222,7 +2222,7 @@ void sub_81298EC(u8 taskId)
             {
                 StringExpandPlaceholders(gStringVar4, gText_DecorationReturnedToPC);
                 DisplayItemMessageOnField(taskId, gStringVar4, sub_8129D64);
-                if (gMapHeader.regionMapSectionId == REGION_MAP_SECRET_BASE)
+                if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
                 {
                     TV_PutSecretBaseVisitOnTheAir();
                 }
diff --git a/src/tv.c b/src/tv.c
index 3c822b394..305bfeda9 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -6432,10 +6432,10 @@ void DoTVShowTodaysRivalTrainer(void)
                 default:
                     sTVShowState = 7;
                     break;
-                case REGION_MAP_SECRET_BASE:
+                case MAPSEC_SECRET_BASE:
                     sTVShowState = 8;
                     break;
-                case REGION_MAP_NONE:
+                case MAPSEC_NONE:
                     switch (show->rivalTrainer.mapDataId)
                     {
                         case 0x115 ... 0x117:
@@ -6633,7 +6633,7 @@ void DoTVShowHoennTreasureInvestigators(void)
     {
         case 0:
             StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name);
-            if (show->treasureInvestigators.location == REGION_MAP_NONE)
+            if (show->treasureInvestigators.location == MAPSEC_NONE)
             {
                 switch (show->treasureInvestigators.mapDataId)
                 {
-- 
cgit v1.2.3


From 0a060ae254c48f7cbee99974b1c7bffd378d9c38 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 10:38:25 -0400
Subject: Start decompiling field_region_map

---
 src/field_region_map.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 src/field_region_map.c

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
new file mode 100644
index 000000000..4923f2069
--- /dev/null
+++ b/src/field_region_map.c
@@ -0,0 +1,84 @@
+
+// Includes
+#include "global.h"
+#include "main.h"
+#include "malloc.h"
+#include "gpu_regs.h"
+#include "bg.h"
+#include "text.h"
+#include "window.h"
+#include "text_window.h"
+#include "palette.h"
+#include "menu.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+EWRAM_DATA struct {
+    MainCallback callback;
+    u8 filler_004[0x888];
+    u16 unk_88c;
+} *gUnknown_0203BCD0 = NULL;
+
+// Static ROM declarations
+
+static void sub_81701C4(void);
+static void sub_8170260(void);
+static void sub_8170274(void);
+void sub_8170290(void);
+
+// .rodata
+
+extern const struct BgTemplate gUnknown_085E5068[];
+extern const struct WindowTemplate gUnknown_085E5070[];
+
+// .text
+
+void sub_817018C(MainCallback callback)
+{
+    SetVBlankCallback(NULL);
+    gUnknown_0203BCD0 = malloc(sizeof(*gUnknown_0203BCD0));
+    gUnknown_0203BCD0->unk_88c = 0;
+    gUnknown_0203BCD0->callback = callback;
+    SetMainCallback2(sub_81701C4);
+}
+
+static void sub_81701C4(void)
+{
+    SetGpuReg(REG_OFFSET_DISPCNT, 0);
+    SetGpuReg(REG_OFFSET_BG0HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG0VOFS, 0);
+    SetGpuReg(REG_OFFSET_BG1HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG1VOFS, 0);
+    SetGpuReg(REG_OFFSET_BG2HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG2VOFS, 0);
+    SetGpuReg(REG_OFFSET_BG3HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG3VOFS, 0);
+    ResetSpriteData();
+    FreeAllSpritePalettes();
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(1, gUnknown_085E5068, 2);
+    InitWindows(gUnknown_085E5070);
+    DeactivateAllTextPrinters();
+    sub_809882C(0, 0x27, 0xd0);
+    clear_scheduled_bg_copies_to_vram();
+    SetMainCallback2(sub_8170274);
+    SetVBlankCallback(sub_8170260);
+}
+
+static void sub_8170260(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+static void sub_8170274(void)
+{
+    sub_8170290();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+    do_scheduled_bg_tilemap_copies_to_vram();
+}
-- 
cgit v1.2.3


From 929638f572ceba01ffd528eb024a2f124ca4224e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 10:58:33 -0400
Subject: sub_8170290

---
 src/field_region_map.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 4923f2069..399ae9070 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -10,6 +10,9 @@
 #include "text_window.h"
 #include "palette.h"
 #include "menu.h"
+#include "strings.h"
+#include "international_string_util.h"
+#include "region_map.h"
 
 // Static type declarations
 
@@ -17,8 +20,9 @@
 
 EWRAM_DATA struct {
     MainCallback callback;
-    u8 filler_004[0x888];
-    u16 unk_88c;
+    u8 filler_004[0x4];
+    u8 filler_008[0x884];
+    u16 state;
 } *gUnknown_0203BCD0 = NULL;
 
 // Static ROM declarations
@@ -26,7 +30,8 @@ EWRAM_DATA struct {
 static void sub_81701C4(void);
 static void sub_8170260(void);
 static void sub_8170274(void);
-void sub_8170290(void);
+static void sub_8170290(void);
+void sub_8170428(void);
 
 // .rodata
 
@@ -39,7 +44,7 @@ void sub_817018C(MainCallback callback)
 {
     SetVBlankCallback(NULL);
     gUnknown_0203BCD0 = malloc(sizeof(*gUnknown_0203BCD0));
-    gUnknown_0203BCD0->unk_88c = 0;
+    gUnknown_0203BCD0->state = 0;
     gUnknown_0203BCD0->callback = callback;
     SetMainCallback2(sub_81701C4);
 }
@@ -82,3 +87,69 @@ static void sub_8170274(void)
     UpdatePaletteFade();
     do_scheduled_bg_tilemap_copies_to_vram();
 }
+
+void sub_8170290(void)
+{
+    u8 offset;
+
+    switch (gUnknown_0203BCD0->state)
+    {
+        case 0:
+            sub_8122CDC(gUnknown_0203BCD0->filler_008, 0);
+            sub_8124288(0, 0);
+            sub_81240D4(1, 1);
+            gUnknown_0203BCD0->state ++;
+            break;
+        case 1:
+            SetWindowBorderStyle(1, 0, 0x27, 0xd);
+            offset = GetStringCenterAlignXOffset(1, gText_Hoenn, 0x38);
+            PrintTextOnWindow(1, 1, gText_Hoenn, offset, 1, 0, 0);
+            schedule_bg_copy_tilemap_to_vram(0);
+            SetWindowBorderStyle(0, 0, 0x27, 0xd);
+            sub_8170428();
+            BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+            gUnknown_0203BCD0->state ++;
+            break;
+        case 2:
+            SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
+            ShowBg(0);
+            ShowBg(2);
+            gUnknown_0203BCD0->state ++;
+            break;
+        case 3:
+            if (!gPaletteFade.active)
+            {
+                gUnknown_0203BCD0->state ++;
+            }
+            break;
+        case 4:
+            switch (sub_81230AC())
+            {
+                case 3:
+                    sub_8170428();
+                    break;
+                case 4:
+                case 5:
+                    gUnknown_0203BCD0->state ++;
+                    break;
+            }
+            break;
+        case 5:
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_0203BCD0->state ++;
+            break;
+        case 6:
+            if (!gPaletteFade.active)
+            {
+                sub_812305C();
+                SetMainCallback2(gUnknown_0203BCD0->callback);
+                if (gUnknown_0203BCD0 != NULL)
+                {
+                    free(gUnknown_0203BCD0);
+                    gUnknown_0203BCD0 = NULL;
+                }
+                FreeAllWindowBuffers();
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 6e10e8caad9d6920c6a1451c0ec63edf529ce17a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 11:05:42 -0400
Subject: sub_8170428

---
 src/field_region_map.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 399ae9070..f78268018 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -20,8 +20,8 @@
 
 EWRAM_DATA struct {
     MainCallback callback;
-    u8 filler_004[0x4];
-    u8 filler_008[0x884];
+    u32 filler_004;
+    struct RegionMap regionMap;
     u16 state;
 } *gUnknown_0203BCD0 = NULL;
 
@@ -31,7 +31,7 @@ static void sub_81701C4(void);
 static void sub_8170260(void);
 static void sub_8170274(void);
 static void sub_8170290(void);
-void sub_8170428(void);
+static void sub_8170428(void);
 
 // .rodata
 
@@ -95,7 +95,7 @@ void sub_8170290(void)
     switch (gUnknown_0203BCD0->state)
     {
         case 0:
-            sub_8122CDC(gUnknown_0203BCD0->filler_008, 0);
+            sub_8122CDC(&gUnknown_0203BCD0->regionMap, 0);
             sub_8124288(0, 0);
             sub_81240D4(1, 1);
             gUnknown_0203BCD0->state ++;
@@ -103,7 +103,7 @@ void sub_8170290(void)
         case 1:
             SetWindowBorderStyle(1, 0, 0x27, 0xd);
             offset = GetStringCenterAlignXOffset(1, gText_Hoenn, 0x38);
-            PrintTextOnWindow(1, 1, gText_Hoenn, offset, 1, 0, 0);
+            PrintTextOnWindow(1, 1, gText_Hoenn, offset, 1, 0, NULL);
             schedule_bg_copy_tilemap_to_vram(0);
             SetWindowBorderStyle(0, 0, 0x27, 0xd);
             sub_8170428();
@@ -153,3 +153,18 @@ void sub_8170290(void)
             break;
     }
 }
+
+static void sub_8170428(void)
+{
+    if (gUnknown_0203BCD0->regionMap.unk_02)
+    {
+        FillWindowPixelBuffer(0, 0x11);
+        PrintTextOnWindow(0, 1, gUnknown_0203BCD0->regionMap.mapSecName, 0, 1, 0, NULL);
+        schedule_bg_copy_tilemap_to_vram(0);
+    }
+    else
+    {
+        FillWindowPixelBuffer(0, 0x11);
+        CopyWindowToVram(0, 3);
+    }
+}
-- 
cgit v1.2.3


From c0a229f10834785a709c40035dab6da03b8a30ff Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 11:12:28 -0400
Subject: Decompile field region map bg and window templates

---
 src/field_region_map.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index f78268018..c2a14d04e 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -18,7 +18,7 @@
 
 // Static RAM declarations
 
-EWRAM_DATA struct {
+static EWRAM_DATA struct {
     MainCallback callback;
     u32 filler_004;
     struct RegionMap regionMap;
@@ -35,8 +35,33 @@ static void sub_8170428(void);
 
 // .rodata
 
-extern const struct BgTemplate gUnknown_085E5068[];
-extern const struct WindowTemplate gUnknown_085E5070[];
+static const struct BgTemplate gUnknown_085E5068[] = {
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    }, {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 28,
+        .screenSize = 2,
+        .paletteMode = 1,
+        .priority = 2,
+        .baseTile = 0
+    }
+};
+
+static const struct WindowTemplate gUnknown_085E5070[] = {
+    {
+        0, 17, 17, 12,  2, 15, 0x0001
+    }, {
+        0, 22,  1,  7,  2, 15, 0x0019
+    }, DUMMY_WIN_TEMPLATE
+};
 
 // .text
 
-- 
cgit v1.2.3


From 76bb397e83ca5d8b4f7a501f2517e83e4a9eccec Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 19:33:53 -0400
Subject: region_map.c through sub_8122CF8

---
 src/field_region_map.c |  2 +-
 src/region_map.c       | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/region_map.c

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index c2a14d04e..e8c52de77 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -120,7 +120,7 @@ void sub_8170290(void)
     switch (gUnknown_0203BCD0->state)
     {
         case 0:
-            sub_8122CDC(&gUnknown_0203BCD0->regionMap, 0);
+            sub_8122CDC(&gUnknown_0203BCD0->regionMap, FALSE);
             sub_8124288(0, 0);
             sub_81240D4(1, 1);
             gUnknown_0203BCD0->state ++;
diff --git a/src/region_map.c b/src/region_map.c
new file mode 100644
index 000000000..1f54108d6
--- /dev/null
+++ b/src/region_map.c
@@ -0,0 +1,54 @@
+
+// Includes
+#include "global.h"
+#include "region_map.h"
+
+// Static type declarations
+
+struct UnkStruct_0203A148 {
+    u8 filler_000[0xa74];
+};
+
+// Static RAM declarations
+
+EWRAM_DATA struct RegionMap *gUnknown_0203A144 = NULL;
+EWRAM_DATA struct UnkStruct_0203A148 *gUnknown_0203A148 = NULL;
+
+// Static ROM declarations
+
+void sub_8122CF8(struct RegionMap *regionMap, struct UnkStruct_8122CF8 *arg1, bool8 arg2);
+bool8 sub_8122DB0(void);
+u8 sub_8123254(void);
+u8 sub_81230C4(void);
+
+// .rodata
+
+// .text
+
+void sub_8122CDC(struct RegionMap *regionMap, bool8 argument)
+{
+    sub_8122CF8(regionMap, NULL, argument);
+    while (sub_8122DB0());
+}
+
+void sub_8122CF8(struct RegionMap *regionMap, struct UnkStruct_8122CF8 *arg1, bool8 arg2)
+{
+    gUnknown_0203A144 = regionMap;
+    gUnknown_0203A144->unk_079 = 0;
+    gUnknown_0203A144->unk_078 = arg2;
+    gUnknown_0203A144->inputCallback = arg2 == TRUE ? sub_8123254 : sub_81230C4;
+    if (arg1 != NULL)
+    {
+        gUnknown_0203A144->unk_080 = arg1->unk_0_0;
+        gUnknown_0203A144->unk_081 = arg1->unk_0_2;
+        gUnknown_0203A144->unk_082 = arg1->unk_0_4;
+        gUnknown_0203A144->unk_083 = TRUE;
+    }
+    else
+    {
+        gUnknown_0203A144->unk_080 = 2;
+        gUnknown_0203A144->unk_081 = 2;
+        gUnknown_0203A144->unk_082 = 28;
+        gUnknown_0203A144->unk_083 = FALSE;
+    }
+}
-- 
cgit v1.2.3


From 6f68e5af95295d10b8dc956d6c621999002377de Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 20:49:49 -0400
Subject: sub_8122DB0

---
 src/field_region_map.c |   4 +-
 src/region_map.c       | 112 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 112 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index e8c52de77..74b62bbc7 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -120,7 +120,7 @@ void sub_8170290(void)
     switch (gUnknown_0203BCD0->state)
     {
         case 0:
-            sub_8122CDC(&gUnknown_0203BCD0->regionMap, FALSE);
+            sub_8122CDC(&gUnknown_0203BCD0->regionMap, 0);
             sub_8124288(0, 0);
             sub_81240D4(1, 1);
             gUnknown_0203BCD0->state ++;
@@ -181,7 +181,7 @@ void sub_8170290(void)
 
 static void sub_8170428(void)
 {
-    if (gUnknown_0203BCD0->regionMap.unk_02)
+    if (gUnknown_0203BCD0->regionMap.unk_002 != 0)
     {
         FillWindowPixelBuffer(0, 0x11);
         PrintTextOnWindow(0, 1, gUnknown_0203BCD0->regionMap.mapSecName, 0, 1, 0, NULL);
diff --git a/src/region_map.c b/src/region_map.c
index 1f54108d6..dc53f1ec6 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -2,6 +2,9 @@
 // Includes
 #include "global.h"
 #include "region_map.h"
+#include "menu.h"
+#include "palette.h"
+#include "bg.h"
 
 // Static type declarations
 
@@ -20,18 +23,30 @@ void sub_8122CF8(struct RegionMap *regionMap, struct UnkStruct_8122CF8 *arg1, bo
 bool8 sub_8122DB0(void);
 u8 sub_8123254(void);
 u8 sub_81230C4(void);
+void sub_81238AC(void);
+u16 sub_8123EB4(u16 mapSecId);
+u8 get_flagnr_blue_points(u16 mapSecId);
+void sub_81236C4(s32 a0, s32 a1, s32 a2, s32 a3, u16 a4, u16 a5, u16 a6);
+void sub_8123FB0(void);
+void sub_81237B4(void);
 
 // .rodata
 
+extern const u8 gUnknown_0859F77C[];
+extern const u8 gUnknown_085A04E0[];
+extern const u16 gUnknown_0859F73C[];
+extern const u8 gUnknown_0859F60C[];
+extern const u8 gUnknown_0859F650[];
+
 // .text
 
-void sub_8122CDC(struct RegionMap *regionMap, bool8 argument)
+void sub_8122CDC(struct RegionMap *regionMap, u8 argument)
 {
     sub_8122CF8(regionMap, NULL, argument);
     while (sub_8122DB0());
 }
 
-void sub_8122CF8(struct RegionMap *regionMap, struct UnkStruct_8122CF8 *arg1, bool8 arg2)
+void sub_8122CF8(struct RegionMap *regionMap, struct UnkStruct_8122CF8 *arg1, u8 arg2)
 {
     gUnknown_0203A144 = regionMap;
     gUnknown_0203A144->unk_079 = 0;
@@ -52,3 +67,96 @@ void sub_8122CF8(struct RegionMap *regionMap, struct UnkStruct_8122CF8 *arg1, bo
         gUnknown_0203A144->unk_083 = FALSE;
     }
 }
+
+void sub_8122D88(struct RegionMap *regionMap)
+{
+    gUnknown_0203A144 = regionMap;
+    sub_81238AC();
+    gUnknown_0203A144->unk_074 = gUnknown_0203A144->unk_054;
+    gUnknown_0203A144->unk_076 = gUnknown_0203A144->unk_056;
+}
+
+bool8 sub_8122DB0(void)
+{
+    switch (gUnknown_0203A144->unk_079)
+    {
+        case 0:
+            if (gUnknown_0203A144->unk_083)
+            {
+                decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->unk_080, gUnknown_0859F77C, 0, 0, 0);
+            }
+            else
+            {
+                LZ77UnCompVram(gUnknown_0859F77C, (u16 *)BG_SCREEN_ADDR(16));
+            }
+            break;
+        case 1:
+            if (gUnknown_0203A144->unk_083)
+            {
+                if (!free_temp_tile_data_buffers_if_possible())
+                {
+                    decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->unk_080, gUnknown_085A04E0, 0, 0, 1);
+                }
+            }
+            else
+            {
+                LZ77UnCompVram(gUnknown_085A04E0, (u16 *)BG_SCREEN_ADDR(28));
+            }
+            break;
+        case 2:
+            if (!free_temp_tile_data_buffers_if_possible())
+            {
+                LoadPalette(gUnknown_0859F73C, 0x70, 0x60);
+            }
+            break;
+        case 3:
+            LZ77UnCompWram(gUnknown_0859F60C, gUnknown_0203A144->unk_184);
+            break;
+        case 4:
+            LZ77UnCompWram(gUnknown_0859F650, gUnknown_0203A144->unk_284);
+            break;
+        case 5:
+            sub_81238AC();
+            gUnknown_0203A144->unk_074 = gUnknown_0203A144->unk_054;
+            gUnknown_0203A144->unk_076 = gUnknown_0203A144->unk_056;
+            gUnknown_0203A144->mapSecId = sub_8123EB4(gUnknown_0203A144->mapSecId);
+            gUnknown_0203A144->unk_002 = get_flagnr_blue_points(gUnknown_0203A144->mapSecId);
+            GetMapName(gUnknown_0203A144->mapSecName, gUnknown_0203A144->mapSecId, 16);
+            break;
+        case 6:
+            if (gUnknown_0203A144->unk_078 == 0)
+            {
+                sub_81236C4(0, 0, 0, 0, 0x100, 0x100, 0);
+            }
+            else
+            {
+                gUnknown_0203A144->unk_05c = gUnknown_0203A144->unk_054 * 8 - 0x34;
+                gUnknown_0203A144->unk_05e = gUnknown_0203A144->unk_056 * 8 - 0x44;
+                gUnknown_0203A144->unk_064 = gUnknown_0203A144->unk_054;
+                gUnknown_0203A144->unk_066 = gUnknown_0203A144->unk_056;
+                sub_81236C4(gUnknown_0203A144->unk_05c, gUnknown_0203A144->unk_05e, 0x38, 0x48, 0x80, 0x80, 0);
+            }
+            break;
+        case 7:
+            sub_8123FB0();
+            sub_81237B4();
+            gUnknown_0203A144->unk_01c = 0;
+            gUnknown_0203A144->unk_020 = 0;
+            gUnknown_0203A144->unk_07a = 0;
+            gUnknown_0203A144->unk_07e = 0;
+            if (gUnknown_0203A144->unk_083)
+            {
+                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_MAPBASEINDEX, 2);
+                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_VISIBLE, gUnknown_0203A144->unk_081);
+                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_CHARBASEINDEX, gUnknown_0203A144->unk_082);
+                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_PRIORITY, 1);
+                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_SCREENSIZE, 1);
+            }
+            gUnknown_0203A144->unk_079 ++;
+            return FALSE;
+        default:
+            return FALSE;
+    }
+    gUnknown_0203A144->unk_079 ++;
+    return TRUE;
+}
-- 
cgit v1.2.3


From a9afb8b13082fbc8090a6f8c14a6e6489d317998 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 20:58:53 -0400
Subject: through sub_81230AC

---
 src/region_map.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index dc53f1ec6..714aa51ee 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -140,8 +140,8 @@ bool8 sub_8122DB0(void)
         case 7:
             sub_8123FB0();
             sub_81237B4();
-            gUnknown_0203A144->unk_01c = 0;
-            gUnknown_0203A144->unk_020 = 0;
+            gUnknown_0203A144->unk_01c = NULL;
+            gUnknown_0203A144->unk_020 = NULL;
             gUnknown_0203A144->unk_07a = 0;
             gUnknown_0203A144->unk_07e = 0;
             if (gUnknown_0203A144->unk_083)
@@ -160,3 +160,30 @@ bool8 sub_8122DB0(void)
     gUnknown_0203A144->unk_079 ++;
     return TRUE;
 }
+
+void sub_8123030(u16 a0, u32 a1)
+{
+    BlendPalettes(0x380, a1, a0);
+    CpuCopy16(gPlttBufferFaded + 0x70, gPlttBufferUnfaded + 0x70, 0x60);
+}
+
+void sub_812305C(void)
+{
+    if (gUnknown_0203A144->unk_01c != NULL)
+    {
+        DestroySprite(gUnknown_0203A144->unk_01c);
+        FreeSpriteTilesByTag(gUnknown_0203A144->unk_058);
+        FreeSpritePaletteByTag(gUnknown_0203A144->unk_05a);
+    }
+    if (gUnknown_0203A144->unk_020 != NULL)
+    {
+        DestroySprite(gUnknown_0203A144->unk_020);
+        FreeSpriteTilesByTag(gUnknown_0203A144->unk_070);
+        FreeSpritePaletteByTag(gUnknown_0203A144->unk_072);
+    }
+}
+
+u8 sub_81230AC(void)
+{
+    return gUnknown_0203A144->inputCallback();
+}
-- 
cgit v1.2.3


From f07307dc73ef7e7a04c9c7091428a73303f8714c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 21:14:53 -0400
Subject: sub_81230C4

---
 src/region_map.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 60 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 714aa51ee..7d3db9c8b 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1,6 +1,7 @@
 
 // Includes
 #include "global.h"
+#include "main.h"
 #include "region_map.h"
 #include "menu.h"
 #include "palette.h"
@@ -12,6 +13,17 @@ struct UnkStruct_0203A148 {
     u8 filler_000[0xa74];
 };
 
+enum
+{
+    INPUT_EVENT_NONE,
+    INPUT_EVENT_DPAD,
+    INPUT_EVENT_2,
+    INPUT_EVENT_3,
+    INPUT_EVENT_A_BUTTON,
+    INPUT_EVENT_B_BUTTON,
+};
+
+
 // Static RAM declarations
 
 EWRAM_DATA struct RegionMap *gUnknown_0203A144 = NULL;
@@ -19,16 +31,15 @@ EWRAM_DATA struct UnkStruct_0203A148 *gUnknown_0203A148 = NULL;
 
 // Static ROM declarations
 
-void sub_8122CF8(struct RegionMap *regionMap, struct UnkStruct_8122CF8 *arg1, bool8 arg2);
-bool8 sub_8122DB0(void);
-u8 sub_8123254(void);
 u8 sub_81230C4(void);
+u8 sub_8123254(void);
+void sub_81236C4(s32 a0, s32 a1, s32 a2, s32 a3, u16 a4, u16 a5, u16 a6);
+void sub_81237B4(void);
 void sub_81238AC(void);
-u16 sub_8123EB4(u16 mapSecId);
 u8 get_flagnr_blue_points(u16 mapSecId);
-void sub_81236C4(s32 a0, s32 a1, s32 a2, s32 a3, u16 a4, u16 a5, u16 a6);
+u16 sub_8123EB4(u16 mapSecId);
 void sub_8123FB0(void);
-void sub_81237B4(void);
+u8 _swiopen(void);
 
 // .rodata
 
@@ -187,3 +198,46 @@ u8 sub_81230AC(void)
 {
     return gUnknown_0203A144->inputCallback();
 }
+
+u8 sub_81230C4(void)
+{
+    u8 input;
+
+    input = INPUT_EVENT_NONE;
+    gUnknown_0203A144->unk_07b = 0;
+    gUnknown_0203A144->unk_07c = 0;
+    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->unk_056 > 2)
+    {
+        gUnknown_0203A144->unk_07c = -1;
+        input = INPUT_EVENT_DPAD;
+    }
+    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->unk_056 < 16)
+    {
+        gUnknown_0203A144->unk_07c = +1;
+        input = INPUT_EVENT_DPAD;
+    }
+    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->unk_054 > 1)
+    {
+        gUnknown_0203A144->unk_07b = -1;
+        input = INPUT_EVENT_DPAD;
+    }
+    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->unk_054 < 28)
+    {
+        gUnknown_0203A144->unk_07b = +1;
+        input = INPUT_EVENT_DPAD;
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        input = INPUT_EVENT_A_BUTTON;
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        input = INPUT_EVENT_B_BUTTON;
+    }
+    if (input == INPUT_EVENT_DPAD)
+    {
+        gUnknown_0203A144->unk_07a = 4;
+        gUnknown_0203A144->inputCallback = _swiopen;
+    }
+    return input;
+}
-- 
cgit v1.2.3


From 8d35bf1c9e93c11f0e8d6e4d7933e3b1761072a6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 21:31:38 -0400
Subject: _swiopen

---
 src/field_region_map.c |  6 +++---
 src/region_map.c       | 58 ++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 45 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 74b62bbc7..2f73179d9 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -150,11 +150,11 @@ void sub_8170290(void)
         case 4:
             switch (sub_81230AC())
             {
-                case 3:
+                case INPUT_EVENT_MOVE_END:
                     sub_8170428();
                     break;
-                case 4:
-                case 5:
+                case INPUT_EVENT_A_BUTTON:
+                case INPUT_EVENT_B_BUTTON:
                     gUnknown_0203BCD0->state ++;
                     break;
             }
diff --git a/src/region_map.c b/src/region_map.c
index 7d3db9c8b..894937c6d 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -13,17 +13,6 @@ struct UnkStruct_0203A148 {
     u8 filler_000[0xa74];
 };
 
-enum
-{
-    INPUT_EVENT_NONE,
-    INPUT_EVENT_DPAD,
-    INPUT_EVENT_2,
-    INPUT_EVENT_3,
-    INPUT_EVENT_A_BUTTON,
-    INPUT_EVENT_B_BUTTON,
-};
-
-
 // Static RAM declarations
 
 EWRAM_DATA struct RegionMap *gUnknown_0203A144 = NULL;
@@ -40,6 +29,7 @@ u8 get_flagnr_blue_points(u16 mapSecId);
 u16 sub_8123EB4(u16 mapSecId);
 void sub_8123FB0(void);
 u8 _swiopen(void);
+u16 sub_812386C(u16 x, u16 y);
 
 // .rodata
 
@@ -209,22 +199,22 @@ u8 sub_81230C4(void)
     if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->unk_056 > 2)
     {
         gUnknown_0203A144->unk_07c = -1;
-        input = INPUT_EVENT_DPAD;
+        input = INPUT_EVENT_MOVE_START;
     }
     if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->unk_056 < 16)
     {
         gUnknown_0203A144->unk_07c = +1;
-        input = INPUT_EVENT_DPAD;
+        input = INPUT_EVENT_MOVE_START;
     }
     if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->unk_054 > 1)
     {
         gUnknown_0203A144->unk_07b = -1;
-        input = INPUT_EVENT_DPAD;
+        input = INPUT_EVENT_MOVE_START;
     }
     if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->unk_054 < 28)
     {
         gUnknown_0203A144->unk_07b = +1;
-        input = INPUT_EVENT_DPAD;
+        input = INPUT_EVENT_MOVE_START;
     }
     if (gMain.newKeys & A_BUTTON)
     {
@@ -234,10 +224,46 @@ u8 sub_81230C4(void)
     {
         input = INPUT_EVENT_B_BUTTON;
     }
-    if (input == INPUT_EVENT_DPAD)
+    if (input == INPUT_EVENT_MOVE_START)
     {
         gUnknown_0203A144->unk_07a = 4;
         gUnknown_0203A144->inputCallback = _swiopen;
     }
     return input;
 }
+
+u8 _swiopen(void)
+{
+    u16 mapSecId;
+
+    if (gUnknown_0203A144->unk_07a != 0)
+    {
+        return INPUT_EVENT_MOVE_CONT;
+    }
+    if (gUnknown_0203A144->unk_07b > 0)
+    {
+        gUnknown_0203A144->unk_054 ++;
+    }
+    if (gUnknown_0203A144->unk_07b < 0)
+    {
+        gUnknown_0203A144->unk_054 --;
+    }
+    if (gUnknown_0203A144->unk_07c > 0)
+    {
+        gUnknown_0203A144->unk_056 ++;
+    }
+    if (gUnknown_0203A144->unk_07c < 0)
+    {
+        gUnknown_0203A144->unk_056 --;
+    }
+    mapSecId = sub_812386C(gUnknown_0203A144->unk_054, gUnknown_0203A144->unk_056);
+    gUnknown_0203A144->unk_002 = get_flagnr_blue_points(mapSecId);
+    if (mapSecId != gUnknown_0203A144->mapSecId)
+    {
+        gUnknown_0203A144->mapSecId = mapSecId;
+        GetMapName(gUnknown_0203A144->mapSecName, gUnknown_0203A144->mapSecId, 16);
+    }
+    sub_8123FB0();
+    gUnknown_0203A144->inputCallback = sub_81230C4;
+    return INPUT_EVENT_MOVE_END;
+}
-- 
cgit v1.2.3


From 16c5a58f352f8daaf59e19e0dda93a3651a71ed2 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 21:38:45 -0400
Subject: sub_8123254

---
 src/region_map.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 894937c6d..a75d68854 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -29,6 +29,7 @@ u8 get_flagnr_blue_points(u16 mapSecId);
 u16 sub_8123EB4(u16 mapSecId);
 void sub_8123FB0(void);
 u8 _swiopen(void);
+u8 sub_8123334(void);
 u16 sub_812386C(u16 x, u16 y);
 
 // .rodata
@@ -267,3 +268,46 @@ u8 _swiopen(void)
     gUnknown_0203A144->inputCallback = sub_81230C4;
     return INPUT_EVENT_MOVE_END;
 }
+
+u8 sub_8123254(void)
+{
+    u8 input;
+
+    input = INPUT_EVENT_NONE;
+    gUnknown_0203A144->unk_06a = 0;
+    gUnknown_0203A144->unk_068 = 0;
+    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->unk_05e > -0x34)
+    {
+        gUnknown_0203A144->unk_068 = -1;
+        input = INPUT_EVENT_MOVE_START;
+    }
+    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->unk_05e < 0x3c)
+    {
+        gUnknown_0203A144->unk_068 = +1;
+        input = INPUT_EVENT_MOVE_START;
+    }
+    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->unk_05c > -0x2c)
+    {
+        gUnknown_0203A144->unk_06a = -1;
+        input = INPUT_EVENT_MOVE_START;
+    }
+    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->unk_05c < 0xac)
+    {
+        gUnknown_0203A144->unk_06a = +1;
+        input = INPUT_EVENT_MOVE_START;
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        input = INPUT_EVENT_A_BUTTON;
+    }
+    if (gMain.newKeys & B_BUTTON)
+    {
+        input = INPUT_EVENT_B_BUTTON;
+    }
+    if (input == INPUT_EVENT_MOVE_START)
+    {
+        gUnknown_0203A144->inputCallback = sub_8123334;
+        gUnknown_0203A144->unk_06c = 0;
+    }
+    return input;
+}
-- 
cgit v1.2.3


From 159728469472464c1aaaf0c8e154dcab36acbac5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 22:05:15 -0400
Subject: sub_8123334

---
 src/region_map.c | 178 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 108 insertions(+), 70 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index a75d68854..caf6b32a1 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -31,6 +31,7 @@ void sub_8123FB0(void);
 u8 _swiopen(void);
 u8 sub_8123334(void);
 u16 sub_812386C(u16 x, u16 y);
+void sub_812378C(s16 x, s16 y);
 
 // .rodata
 
@@ -51,19 +52,19 @@ void sub_8122CDC(struct RegionMap *regionMap, u8 argument)
 void sub_8122CF8(struct RegionMap *regionMap, struct UnkStruct_8122CF8 *arg1, u8 arg2)
 {
     gUnknown_0203A144 = regionMap;
-    gUnknown_0203A144->unk_079 = 0;
-    gUnknown_0203A144->unk_078 = arg2;
+    gUnknown_0203A144->initStep = 0;
+    gUnknown_0203A144->zoomed = arg2;
     gUnknown_0203A144->inputCallback = arg2 == TRUE ? sub_8123254 : sub_81230C4;
     if (arg1 != NULL)
     {
-        gUnknown_0203A144->unk_080 = arg1->unk_0_0;
+        gUnknown_0203A144->bgNum = arg1->unk_0_0;
         gUnknown_0203A144->unk_081 = arg1->unk_0_2;
         gUnknown_0203A144->unk_082 = arg1->unk_0_4;
         gUnknown_0203A144->unk_083 = TRUE;
     }
     else
     {
-        gUnknown_0203A144->unk_080 = 2;
+        gUnknown_0203A144->bgNum = 2;
         gUnknown_0203A144->unk_081 = 2;
         gUnknown_0203A144->unk_082 = 28;
         gUnknown_0203A144->unk_083 = FALSE;
@@ -74,18 +75,18 @@ void sub_8122D88(struct RegionMap *regionMap)
 {
     gUnknown_0203A144 = regionMap;
     sub_81238AC();
-    gUnknown_0203A144->unk_074 = gUnknown_0203A144->unk_054;
-    gUnknown_0203A144->unk_076 = gUnknown_0203A144->unk_056;
+    gUnknown_0203A144->unk_074 = gUnknown_0203A144->cursorPosX;
+    gUnknown_0203A144->unk_076 = gUnknown_0203A144->cursorPosY;
 }
 
 bool8 sub_8122DB0(void)
 {
-    switch (gUnknown_0203A144->unk_079)
+    switch (gUnknown_0203A144->initStep)
     {
         case 0:
             if (gUnknown_0203A144->unk_083)
             {
-                decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->unk_080, gUnknown_0859F77C, 0, 0, 0);
+                decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->bgNum, gUnknown_0859F77C, 0, 0, 0);
             }
             else
             {
@@ -97,7 +98,7 @@ bool8 sub_8122DB0(void)
             {
                 if (!free_temp_tile_data_buffers_if_possible())
                 {
-                    decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->unk_080, gUnknown_085A04E0, 0, 0, 1);
+                    decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->bgNum, gUnknown_085A04E0, 0, 0, 1);
                 }
             }
             else
@@ -112,54 +113,54 @@ bool8 sub_8122DB0(void)
             }
             break;
         case 3:
-            LZ77UnCompWram(gUnknown_0859F60C, gUnknown_0203A144->unk_184);
+            LZ77UnCompWram(gUnknown_0859F60C, gUnknown_0203A144->cursorSmallImage);
             break;
         case 4:
-            LZ77UnCompWram(gUnknown_0859F650, gUnknown_0203A144->unk_284);
+            LZ77UnCompWram(gUnknown_0859F650, gUnknown_0203A144->cursorLargeImage);
             break;
         case 5:
             sub_81238AC();
-            gUnknown_0203A144->unk_074 = gUnknown_0203A144->unk_054;
-            gUnknown_0203A144->unk_076 = gUnknown_0203A144->unk_056;
+            gUnknown_0203A144->unk_074 = gUnknown_0203A144->cursorPosX;
+            gUnknown_0203A144->unk_076 = gUnknown_0203A144->cursorPosY;
             gUnknown_0203A144->mapSecId = sub_8123EB4(gUnknown_0203A144->mapSecId);
             gUnknown_0203A144->unk_002 = get_flagnr_blue_points(gUnknown_0203A144->mapSecId);
             GetMapName(gUnknown_0203A144->mapSecName, gUnknown_0203A144->mapSecId, 16);
             break;
         case 6:
-            if (gUnknown_0203A144->unk_078 == 0)
+            if (gUnknown_0203A144->zoomed == FALSE)
             {
                 sub_81236C4(0, 0, 0, 0, 0x100, 0x100, 0);
             }
             else
             {
-                gUnknown_0203A144->unk_05c = gUnknown_0203A144->unk_054 * 8 - 0x34;
-                gUnknown_0203A144->unk_05e = gUnknown_0203A144->unk_056 * 8 - 0x44;
-                gUnknown_0203A144->unk_064 = gUnknown_0203A144->unk_054;
-                gUnknown_0203A144->unk_066 = gUnknown_0203A144->unk_056;
-                sub_81236C4(gUnknown_0203A144->unk_05c, gUnknown_0203A144->unk_05e, 0x38, 0x48, 0x80, 0x80, 0);
+                gUnknown_0203A144->scrollX = gUnknown_0203A144->cursorPosX * 8 - 0x34;
+                gUnknown_0203A144->scrollY = gUnknown_0203A144->cursorPosY * 8 - 0x44;
+                gUnknown_0203A144->unk_064 = gUnknown_0203A144->cursorPosX;
+                gUnknown_0203A144->unk_066 = gUnknown_0203A144->cursorPosY;
+                sub_81236C4(gUnknown_0203A144->scrollX, gUnknown_0203A144->scrollY, 0x38, 0x48, 0x80, 0x80, 0);
             }
             break;
         case 7:
             sub_8123FB0();
             sub_81237B4();
-            gUnknown_0203A144->unk_01c = NULL;
-            gUnknown_0203A144->unk_020 = NULL;
-            gUnknown_0203A144->unk_07a = 0;
-            gUnknown_0203A144->unk_07e = 0;
+            gUnknown_0203A144->cursorSprite = NULL;
+            gUnknown_0203A144->playerIconSprite = NULL;
+            gUnknown_0203A144->cursorMovementFrameCounter = 0;
+            gUnknown_0203A144->blinkPlayerIcon = FALSE;
             if (gUnknown_0203A144->unk_083)
             {
-                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_MAPBASEINDEX, 2);
-                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_VISIBLE, gUnknown_0203A144->unk_081);
-                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_CHARBASEINDEX, gUnknown_0203A144->unk_082);
-                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_PRIORITY, 1);
-                SetBgAttribute(gUnknown_0203A144->unk_080, BG_CTRL_ATTR_SCREENSIZE, 1);
+                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_MAPBASEINDEX, 2);
+                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_VISIBLE, gUnknown_0203A144->unk_081);
+                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_CHARBASEINDEX, gUnknown_0203A144->unk_082);
+                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_PRIORITY, 1);
+                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_SCREENSIZE, 1);
             }
-            gUnknown_0203A144->unk_079 ++;
+            gUnknown_0203A144->initStep ++;
             return FALSE;
         default:
             return FALSE;
     }
-    gUnknown_0203A144->unk_079 ++;
+    gUnknown_0203A144->initStep ++;
     return TRUE;
 }
 
@@ -171,17 +172,17 @@ void sub_8123030(u16 a0, u32 a1)
 
 void sub_812305C(void)
 {
-    if (gUnknown_0203A144->unk_01c != NULL)
+    if (gUnknown_0203A144->cursorSprite != NULL)
     {
-        DestroySprite(gUnknown_0203A144->unk_01c);
-        FreeSpriteTilesByTag(gUnknown_0203A144->unk_058);
-        FreeSpritePaletteByTag(gUnknown_0203A144->unk_05a);
+        DestroySprite(gUnknown_0203A144->cursorSprite);
+        FreeSpriteTilesByTag(gUnknown_0203A144->cursorTileTag);
+        FreeSpritePaletteByTag(gUnknown_0203A144->cursorPaletteTag);
     }
-    if (gUnknown_0203A144->unk_020 != NULL)
+    if (gUnknown_0203A144->playerIconSprite != NULL)
     {
-        DestroySprite(gUnknown_0203A144->unk_020);
-        FreeSpriteTilesByTag(gUnknown_0203A144->unk_070);
-        FreeSpritePaletteByTag(gUnknown_0203A144->unk_072);
+        DestroySprite(gUnknown_0203A144->playerIconSprite);
+        FreeSpriteTilesByTag(gUnknown_0203A144->playerIconTileTag);
+        FreeSpritePaletteByTag(gUnknown_0203A144->playerIconPaletteTag);
     }
 }
 
@@ -195,26 +196,26 @@ u8 sub_81230C4(void)
     u8 input;
 
     input = INPUT_EVENT_NONE;
-    gUnknown_0203A144->unk_07b = 0;
-    gUnknown_0203A144->unk_07c = 0;
-    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->unk_056 > 2)
+    gUnknown_0203A144->cursorDeltaX = 0;
+    gUnknown_0203A144->cursorDeltaY = 0;
+    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->cursorPosY > 2)
     {
-        gUnknown_0203A144->unk_07c = -1;
+        gUnknown_0203A144->cursorDeltaY = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->unk_056 < 16)
+    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->cursorPosY < 16)
     {
-        gUnknown_0203A144->unk_07c = +1;
+        gUnknown_0203A144->cursorDeltaY = +1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->unk_054 > 1)
+    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->cursorPosX > 1)
     {
-        gUnknown_0203A144->unk_07b = -1;
+        gUnknown_0203A144->cursorDeltaX = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->unk_054 < 28)
+    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->cursorPosX < 28)
     {
-        gUnknown_0203A144->unk_07b = +1;
+        gUnknown_0203A144->cursorDeltaX = +1;
         input = INPUT_EVENT_MOVE_START;
     }
     if (gMain.newKeys & A_BUTTON)
@@ -227,7 +228,7 @@ u8 sub_81230C4(void)
     }
     if (input == INPUT_EVENT_MOVE_START)
     {
-        gUnknown_0203A144->unk_07a = 4;
+        gUnknown_0203A144->cursorMovementFrameCounter = 4;
         gUnknown_0203A144->inputCallback = _swiopen;
     }
     return input;
@@ -237,27 +238,27 @@ u8 _swiopen(void)
 {
     u16 mapSecId;
 
-    if (gUnknown_0203A144->unk_07a != 0)
+    if (gUnknown_0203A144->cursorMovementFrameCounter != 0)
     {
         return INPUT_EVENT_MOVE_CONT;
     }
-    if (gUnknown_0203A144->unk_07b > 0)
+    if (gUnknown_0203A144->cursorDeltaX > 0)
     {
-        gUnknown_0203A144->unk_054 ++;
+        gUnknown_0203A144->cursorPosX ++;
     }
-    if (gUnknown_0203A144->unk_07b < 0)
+    if (gUnknown_0203A144->cursorDeltaX < 0)
     {
-        gUnknown_0203A144->unk_054 --;
+        gUnknown_0203A144->cursorPosX --;
     }
-    if (gUnknown_0203A144->unk_07c > 0)
+    if (gUnknown_0203A144->cursorDeltaY > 0)
     {
-        gUnknown_0203A144->unk_056 ++;
+        gUnknown_0203A144->cursorPosY ++;
     }
-    if (gUnknown_0203A144->unk_07c < 0)
+    if (gUnknown_0203A144->cursorDeltaY < 0)
     {
-        gUnknown_0203A144->unk_056 --;
+        gUnknown_0203A144->cursorPosY --;
     }
-    mapSecId = sub_812386C(gUnknown_0203A144->unk_054, gUnknown_0203A144->unk_056);
+    mapSecId = sub_812386C(gUnknown_0203A144->cursorPosX, gUnknown_0203A144->cursorPosY);
     gUnknown_0203A144->unk_002 = get_flagnr_blue_points(mapSecId);
     if (mapSecId != gUnknown_0203A144->mapSecId)
     {
@@ -274,26 +275,26 @@ u8 sub_8123254(void)
     u8 input;
 
     input = INPUT_EVENT_NONE;
-    gUnknown_0203A144->unk_06a = 0;
-    gUnknown_0203A144->unk_068 = 0;
-    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->unk_05e > -0x34)
+    gUnknown_0203A144->zoomedCursorDeltaX = 0;
+    gUnknown_0203A144->zoomedCursorDeltaY = 0;
+    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->scrollY > -0x34)
     {
-        gUnknown_0203A144->unk_068 = -1;
+        gUnknown_0203A144->zoomedCursorDeltaY = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->unk_05e < 0x3c)
+    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->scrollY < 0x3c)
     {
-        gUnknown_0203A144->unk_068 = +1;
+        gUnknown_0203A144->zoomedCursorDeltaY = +1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->unk_05c > -0x2c)
+    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->scrollX > -0x2c)
     {
-        gUnknown_0203A144->unk_06a = -1;
+        gUnknown_0203A144->zoomedCursorDeltaX = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->unk_05c < 0xac)
+    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->scrollX < 0xac)
     {
-        gUnknown_0203A144->unk_06a = +1;
+        gUnknown_0203A144->zoomedCursorDeltaX = +1;
         input = INPUT_EVENT_MOVE_START;
     }
     if (gMain.newKeys & A_BUTTON)
@@ -307,7 +308,44 @@ u8 sub_8123254(void)
     if (input == INPUT_EVENT_MOVE_START)
     {
         gUnknown_0203A144->inputCallback = sub_8123334;
-        gUnknown_0203A144->unk_06c = 0;
+        gUnknown_0203A144->zoomedCursorMovementFrameCounter = 0;
     }
     return input;
 }
+
+u8 sub_8123334(void)
+{
+    u16 x;
+    u16 y;
+    u16 mapSecId;
+
+    gUnknown_0203A144->scrollY += gUnknown_0203A144->zoomedCursorDeltaY;
+    gUnknown_0203A144->scrollX += gUnknown_0203A144->zoomedCursorDeltaX;
+    sub_812378C(gUnknown_0203A144->scrollX, gUnknown_0203A144->scrollY);
+    gUnknown_0203A144->zoomedCursorMovementFrameCounter ++;
+    if (gUnknown_0203A144->zoomedCursorMovementFrameCounter == 8)
+    {
+        x = (gUnknown_0203A144->scrollX + 0x2c) / 8 + 1;
+        y = (gUnknown_0203A144->scrollY + 0x34) / 8 + 2;
+        if (x != gUnknown_0203A144->unk_064 || y != gUnknown_0203A144->unk_066)
+        {
+            gUnknown_0203A144->unk_064 = x;
+            gUnknown_0203A144->unk_066 = y;
+            mapSecId = sub_812386C(x, y);
+            gUnknown_0203A144->unk_002 = get_flagnr_blue_points(mapSecId);
+            if (mapSecId != gUnknown_0203A144->mapSecId)
+            {
+                gUnknown_0203A144->mapSecId = mapSecId;
+                GetMapName(gUnknown_0203A144->mapSecName, gUnknown_0203A144->mapSecId, 16);
+            }
+            sub_8123FB0();
+        }
+        gUnknown_0203A144->zoomedCursorMovementFrameCounter = 0;
+        gUnknown_0203A144->inputCallback = sub_8123254;
+        return INPUT_EVENT_MOVE_END;
+    }
+    else
+    {
+        return INPUT_EVENT_MOVE_CONT;
+    }
+}
-- 
cgit v1.2.3


From 35a6d2046a65cfa9532d5c303c1b1b33c39e1687 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 29 Oct 2017 23:08:06 -0400
Subject: sub_8123418

---
 src/region_map.c | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index caf6b32a1..9da4d7586 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -32,6 +32,8 @@ u8 _swiopen(void);
 u8 sub_8123334(void);
 u16 sub_812386C(u16 x, u16 y);
 void sub_812378C(s16 x, s16 y);
+void sub_8124238(void);
+void sub_81243B0(void);
 
 // .rodata
 
@@ -344,8 +346,40 @@ u8 sub_8123334(void)
         gUnknown_0203A144->inputCallback = sub_8123254;
         return INPUT_EVENT_MOVE_END;
     }
+    return INPUT_EVENT_MOVE_CONT;
+}
+
+void sub_8123418(void)
+{
+    if (gUnknown_0203A144->zoomed == FALSE)
+    {
+        gUnknown_0203A144->scrollY = 0;
+        gUnknown_0203A144->scrollX = 0;
+        gUnknown_0203A144->unk_040 = 0;
+        gUnknown_0203A144->unk_03c = 0;
+        gUnknown_0203A144->unk_060 = gUnknown_0203A144->cursorPosX * 8 - 0x34;
+        gUnknown_0203A144->unk_062 = gUnknown_0203A144->cursorPosY * 8 - 0x44;
+        gUnknown_0203A144->unk_044 = (gUnknown_0203A144->unk_060 << 8) / 16;
+        gUnknown_0203A144->unk_048 = (gUnknown_0203A144->unk_062 << 8) / 16;
+        gUnknown_0203A144->unk_064 = gUnknown_0203A144->cursorPosX;
+        gUnknown_0203A144->unk_066 = gUnknown_0203A144->cursorPosY;
+        gUnknown_0203A144->unk_04c = 0x10000;
+        gUnknown_0203A144->unk_050 = -0x800;
+    }
     else
     {
-        return INPUT_EVENT_MOVE_CONT;
+        gUnknown_0203A144->unk_03c = gUnknown_0203A144->scrollX * 256;
+        gUnknown_0203A144->unk_040 = gUnknown_0203A144->scrollY * 256;
+        gUnknown_0203A144->unk_060 = 0;
+        gUnknown_0203A144->unk_062 = 0;
+        gUnknown_0203A144->unk_044 = -(gUnknown_0203A144->unk_03c / 16);
+        gUnknown_0203A144->unk_048 = -(gUnknown_0203A144->unk_040 / 16);
+        gUnknown_0203A144->cursorPosX = gUnknown_0203A144->unk_064;
+        gUnknown_0203A144->cursorPosY = gUnknown_0203A144->unk_066;
+        gUnknown_0203A144->unk_04c = 0x8000;
+        gUnknown_0203A144->unk_050 = 0x800;
     }
+    gUnknown_0203A144->unk_06e = 0;
+    sub_8124238();
+    sub_81243B0();
 }
-- 
cgit v1.2.3


From 474df271368917b79071ab101c36857fcab72c4b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 08:39:39 -0400
Subject: through CalcZoomScrollParams

---
 src/field_region_map.c |   6 +-
 src/region_map.c       | 387 ++++++++++++++++++++++++++++++-------------------
 2 files changed, 239 insertions(+), 154 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 2f73179d9..d70d44d58 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -120,9 +120,9 @@ void sub_8170290(void)
     switch (gUnknown_0203BCD0->state)
     {
         case 0:
-            sub_8122CDC(&gUnknown_0203BCD0->regionMap, 0);
+            InitRegionMap(&gUnknown_0203BCD0->regionMap, 0);
             sub_8124288(0, 0);
-            sub_81240D4(1, 1);
+            CreateRegionMapCursor(1, 1);
             gUnknown_0203BCD0->state ++;
             break;
         case 1:
@@ -166,7 +166,7 @@ void sub_8170290(void)
         case 6:
             if (!gPaletteFade.active)
             {
-                sub_812305C();
+                FreeRegionMapIconResources();
                 SetMainCallback2(gUnknown_0203BCD0->callback);
                 if (gUnknown_0203BCD0 != NULL)
                 {
diff --git a/src/region_map.c b/src/region_map.c
index 9da4d7586..c4d15a8ac 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -2,10 +2,10 @@
 // Includes
 #include "global.h"
 #include "main.h"
-#include "region_map.h"
 #include "menu.h"
 #include "palette.h"
-#include "bg.h"
+#include "trig.h"
+#include "region_map.h"
 
 // Static type declarations
 
@@ -15,25 +15,26 @@ struct UnkStruct_0203A148 {
 
 // Static RAM declarations
 
-EWRAM_DATA struct RegionMap *gUnknown_0203A144 = NULL;
+EWRAM_DATA struct RegionMap *gRegionMap = NULL;
 EWRAM_DATA struct UnkStruct_0203A148 *gUnknown_0203A148 = NULL;
 
 // Static ROM declarations
 
-u8 sub_81230C4(void);
-u8 sub_8123254(void);
-void sub_81236C4(s32 a0, s32 a1, s32 a2, s32 a3, u16 a4, u16 a5, u16 a6);
+static u8 ProcessRegionMapInput_Full(void);
+static u8 MoveRegionMapCursor_Full(void);
+static u8 ProcessRegionMapInput_Zoomed(void);
+static u8 MoveRegionMapCursor_Zoomed(void);
+void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f, u8 rotation);
 void sub_81237B4(void);
 void sub_81238AC(void);
 u8 get_flagnr_blue_points(u16 mapSecId);
 u16 sub_8123EB4(u16 mapSecId);
 void sub_8123FB0(void);
-u8 _swiopen(void);
-u8 sub_8123334(void);
 u16 sub_812386C(u16 x, u16 y);
 void sub_812378C(s16 x, s16 y);
 void sub_8124238(void);
 void sub_81243B0(void);
+void sub_81243DC(void);
 
 // .rodata
 
@@ -45,50 +46,50 @@ extern const u8 gUnknown_0859F650[];
 
 // .text
 
-void sub_8122CDC(struct RegionMap *regionMap, u8 argument)
+void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed)
 {
-    sub_8122CF8(regionMap, NULL, argument);
+    sub_8122CF8(regionMap, NULL, zoomed);
     while (sub_8122DB0());
 }
 
-void sub_8122CF8(struct RegionMap *regionMap, struct UnkStruct_8122CF8 *arg1, u8 arg2)
+void sub_8122CF8(struct RegionMap *regionMap, struct BgTemplate *template, bool8 zoomed)
 {
-    gUnknown_0203A144 = regionMap;
-    gUnknown_0203A144->initStep = 0;
-    gUnknown_0203A144->zoomed = arg2;
-    gUnknown_0203A144->inputCallback = arg2 == TRUE ? sub_8123254 : sub_81230C4;
-    if (arg1 != NULL)
+    gRegionMap = regionMap;
+    gRegionMap->initStep = 0;
+    gRegionMap->zoomed = zoomed;
+    gRegionMap->inputCallback = zoomed == TRUE ? ProcessRegionMapInput_Zoomed : ProcessRegionMapInput_Full;
+    if (template != NULL)
     {
-        gUnknown_0203A144->bgNum = arg1->unk_0_0;
-        gUnknown_0203A144->unk_081 = arg1->unk_0_2;
-        gUnknown_0203A144->unk_082 = arg1->unk_0_4;
-        gUnknown_0203A144->unk_083 = TRUE;
+        gRegionMap->bgNum = template->bg;
+        gRegionMap->charBaseIdx = template->charBaseIndex;
+        gRegionMap->mapBaseIdx = template->mapBaseIndex;
+        gRegionMap->bgManaged = TRUE;
     }
     else
     {
-        gUnknown_0203A144->bgNum = 2;
-        gUnknown_0203A144->unk_081 = 2;
-        gUnknown_0203A144->unk_082 = 28;
-        gUnknown_0203A144->unk_083 = FALSE;
+        gRegionMap->bgNum = 2;
+        gRegionMap->charBaseIdx = 2;
+        gRegionMap->mapBaseIdx = 28;
+        gRegionMap->bgManaged = FALSE;
     }
 }
 
 void sub_8122D88(struct RegionMap *regionMap)
 {
-    gUnknown_0203A144 = regionMap;
+    gRegionMap = regionMap;
     sub_81238AC();
-    gUnknown_0203A144->unk_074 = gUnknown_0203A144->cursorPosX;
-    gUnknown_0203A144->unk_076 = gUnknown_0203A144->cursorPosY;
+    gRegionMap->unk_074 = gRegionMap->cursorPosX;
+    gRegionMap->unk_076 = gRegionMap->cursorPosY;
 }
 
 bool8 sub_8122DB0(void)
 {
-    switch (gUnknown_0203A144->initStep)
+    switch (gRegionMap->initStep)
     {
         case 0:
-            if (gUnknown_0203A144->unk_083)
+            if (gRegionMap->bgManaged)
             {
-                decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->bgNum, gUnknown_0859F77C, 0, 0, 0);
+                decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, gUnknown_0859F77C, 0, 0, 0);
             }
             else
             {
@@ -96,11 +97,11 @@ bool8 sub_8122DB0(void)
             }
             break;
         case 1:
-            if (gUnknown_0203A144->unk_083)
+            if (gRegionMap->bgManaged)
             {
                 if (!free_temp_tile_data_buffers_if_possible())
                 {
-                    decompress_and_copy_tile_data_to_vram(gUnknown_0203A144->bgNum, gUnknown_085A04E0, 0, 0, 1);
+                    decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, gUnknown_085A04E0, 0, 0, 1);
                 }
             }
             else
@@ -115,54 +116,54 @@ bool8 sub_8122DB0(void)
             }
             break;
         case 3:
-            LZ77UnCompWram(gUnknown_0859F60C, gUnknown_0203A144->cursorSmallImage);
+            LZ77UnCompWram(gUnknown_0859F60C, gRegionMap->cursorSmallImage);
             break;
         case 4:
-            LZ77UnCompWram(gUnknown_0859F650, gUnknown_0203A144->cursorLargeImage);
+            LZ77UnCompWram(gUnknown_0859F650, gRegionMap->cursorLargeImage);
             break;
         case 5:
             sub_81238AC();
-            gUnknown_0203A144->unk_074 = gUnknown_0203A144->cursorPosX;
-            gUnknown_0203A144->unk_076 = gUnknown_0203A144->cursorPosY;
-            gUnknown_0203A144->mapSecId = sub_8123EB4(gUnknown_0203A144->mapSecId);
-            gUnknown_0203A144->unk_002 = get_flagnr_blue_points(gUnknown_0203A144->mapSecId);
-            GetMapName(gUnknown_0203A144->mapSecName, gUnknown_0203A144->mapSecId, 16);
+            gRegionMap->unk_074 = gRegionMap->cursorPosX;
+            gRegionMap->unk_076 = gRegionMap->cursorPosY;
+            gRegionMap->mapSecId = sub_8123EB4(gRegionMap->mapSecId);
+            gRegionMap->unk_002 = get_flagnr_blue_points(gRegionMap->mapSecId);
+            GetMapName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
             break;
         case 6:
-            if (gUnknown_0203A144->zoomed == FALSE)
+            if (gRegionMap->zoomed == FALSE)
             {
-                sub_81236C4(0, 0, 0, 0, 0x100, 0x100, 0);
+                CalcZoomScrollParams(0, 0, 0, 0, 0x100, 0x100, 0);
             }
             else
             {
-                gUnknown_0203A144->scrollX = gUnknown_0203A144->cursorPosX * 8 - 0x34;
-                gUnknown_0203A144->scrollY = gUnknown_0203A144->cursorPosY * 8 - 0x44;
-                gUnknown_0203A144->unk_064 = gUnknown_0203A144->cursorPosX;
-                gUnknown_0203A144->unk_066 = gUnknown_0203A144->cursorPosY;
-                sub_81236C4(gUnknown_0203A144->scrollX, gUnknown_0203A144->scrollY, 0x38, 0x48, 0x80, 0x80, 0);
+                gRegionMap->scrollX = gRegionMap->cursorPosX * 8 - 0x34;
+                gRegionMap->scrollY = gRegionMap->cursorPosY * 8 - 0x44;
+                gRegionMap->unk_064 = gRegionMap->cursorPosX;
+                gRegionMap->unk_066 = gRegionMap->cursorPosY;
+                CalcZoomScrollParams(gRegionMap->scrollX, gRegionMap->scrollY, 0x38, 0x48, 0x80, 0x80, 0);
             }
             break;
         case 7:
             sub_8123FB0();
             sub_81237B4();
-            gUnknown_0203A144->cursorSprite = NULL;
-            gUnknown_0203A144->playerIconSprite = NULL;
-            gUnknown_0203A144->cursorMovementFrameCounter = 0;
-            gUnknown_0203A144->blinkPlayerIcon = FALSE;
-            if (gUnknown_0203A144->unk_083)
+            gRegionMap->cursorSprite = NULL;
+            gRegionMap->playerIconSprite = NULL;
+            gRegionMap->cursorMovementFrameCounter = 0;
+            gRegionMap->blinkPlayerIcon = FALSE;
+            if (gRegionMap->bgManaged)
             {
-                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_MAPBASEINDEX, 2);
-                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_VISIBLE, gUnknown_0203A144->unk_081);
-                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_CHARBASEINDEX, gUnknown_0203A144->unk_082);
-                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_PRIORITY, 1);
-                SetBgAttribute(gUnknown_0203A144->bgNum, BG_CTRL_ATTR_SCREENSIZE, 1);
+                SetBgAttribute(gRegionMap->bgNum, BG_CTRL_ATTR_MAPBASEINDEX, 2);
+                SetBgAttribute(gRegionMap->bgNum, BG_CTRL_ATTR_VISIBLE, gRegionMap->charBaseIdx);
+                SetBgAttribute(gRegionMap->bgNum, BG_CTRL_ATTR_CHARBASEINDEX, gRegionMap->mapBaseIdx);
+                SetBgAttribute(gRegionMap->bgNum, BG_CTRL_ATTR_PRIORITY, 1);
+                SetBgAttribute(gRegionMap->bgNum, BG_CTRL_ATTR_SCREENSIZE, 1);
             }
-            gUnknown_0203A144->initStep ++;
+            gRegionMap->initStep ++;
             return FALSE;
         default:
             return FALSE;
     }
-    gUnknown_0203A144->initStep ++;
+    gRegionMap->initStep ++;
     return TRUE;
 }
 
@@ -172,52 +173,52 @@ void sub_8123030(u16 a0, u32 a1)
     CpuCopy16(gPlttBufferFaded + 0x70, gPlttBufferUnfaded + 0x70, 0x60);
 }
 
-void sub_812305C(void)
+void FreeRegionMapIconResources(void)
 {
-    if (gUnknown_0203A144->cursorSprite != NULL)
+    if (gRegionMap->cursorSprite != NULL)
     {
-        DestroySprite(gUnknown_0203A144->cursorSprite);
-        FreeSpriteTilesByTag(gUnknown_0203A144->cursorTileTag);
-        FreeSpritePaletteByTag(gUnknown_0203A144->cursorPaletteTag);
+        DestroySprite(gRegionMap->cursorSprite);
+        FreeSpriteTilesByTag(gRegionMap->cursorTileTag);
+        FreeSpritePaletteByTag(gRegionMap->cursorPaletteTag);
     }
-    if (gUnknown_0203A144->playerIconSprite != NULL)
+    if (gRegionMap->playerIconSprite != NULL)
     {
-        DestroySprite(gUnknown_0203A144->playerIconSprite);
-        FreeSpriteTilesByTag(gUnknown_0203A144->playerIconTileTag);
-        FreeSpritePaletteByTag(gUnknown_0203A144->playerIconPaletteTag);
+        DestroySprite(gRegionMap->playerIconSprite);
+        FreeSpriteTilesByTag(gRegionMap->playerIconTileTag);
+        FreeSpritePaletteByTag(gRegionMap->playerIconPaletteTag);
     }
 }
 
 u8 sub_81230AC(void)
 {
-    return gUnknown_0203A144->inputCallback();
+    return gRegionMap->inputCallback();
 }
 
-u8 sub_81230C4(void)
+static u8 ProcessRegionMapInput_Full(void)
 {
     u8 input;
 
     input = INPUT_EVENT_NONE;
-    gUnknown_0203A144->cursorDeltaX = 0;
-    gUnknown_0203A144->cursorDeltaY = 0;
-    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->cursorPosY > 2)
+    gRegionMap->cursorDeltaX = 0;
+    gRegionMap->cursorDeltaY = 0;
+    if (gMain.heldKeys & DPAD_UP && gRegionMap->cursorPosY > 2)
     {
-        gUnknown_0203A144->cursorDeltaY = -1;
+        gRegionMap->cursorDeltaY = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->cursorPosY < 16)
+    if (gMain.heldKeys & DPAD_DOWN && gRegionMap->cursorPosY < 16)
     {
-        gUnknown_0203A144->cursorDeltaY = +1;
+        gRegionMap->cursorDeltaY = +1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->cursorPosX > 1)
+    if (gMain.heldKeys & DPAD_LEFT && gRegionMap->cursorPosX > 1)
     {
-        gUnknown_0203A144->cursorDeltaX = -1;
+        gRegionMap->cursorDeltaX = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->cursorPosX < 28)
+    if (gMain.heldKeys & DPAD_RIGHT && gRegionMap->cursorPosX < 28)
     {
-        gUnknown_0203A144->cursorDeltaX = +1;
+        gRegionMap->cursorDeltaX = +1;
         input = INPUT_EVENT_MOVE_START;
     }
     if (gMain.newKeys & A_BUTTON)
@@ -230,73 +231,73 @@ u8 sub_81230C4(void)
     }
     if (input == INPUT_EVENT_MOVE_START)
     {
-        gUnknown_0203A144->cursorMovementFrameCounter = 4;
-        gUnknown_0203A144->inputCallback = _swiopen;
+        gRegionMap->cursorMovementFrameCounter = 4;
+        gRegionMap->inputCallback = MoveRegionMapCursor_Full;
     }
     return input;
 }
 
-u8 _swiopen(void)
+static u8 MoveRegionMapCursor_Full(void)
 {
     u16 mapSecId;
 
-    if (gUnknown_0203A144->cursorMovementFrameCounter != 0)
+    if (gRegionMap->cursorMovementFrameCounter != 0)
     {
         return INPUT_EVENT_MOVE_CONT;
     }
-    if (gUnknown_0203A144->cursorDeltaX > 0)
+    if (gRegionMap->cursorDeltaX > 0)
     {
-        gUnknown_0203A144->cursorPosX ++;
+        gRegionMap->cursorPosX ++;
     }
-    if (gUnknown_0203A144->cursorDeltaX < 0)
+    if (gRegionMap->cursorDeltaX < 0)
     {
-        gUnknown_0203A144->cursorPosX --;
+        gRegionMap->cursorPosX --;
     }
-    if (gUnknown_0203A144->cursorDeltaY > 0)
+    if (gRegionMap->cursorDeltaY > 0)
     {
-        gUnknown_0203A144->cursorPosY ++;
+        gRegionMap->cursorPosY ++;
     }
-    if (gUnknown_0203A144->cursorDeltaY < 0)
+    if (gRegionMap->cursorDeltaY < 0)
     {
-        gUnknown_0203A144->cursorPosY --;
+        gRegionMap->cursorPosY --;
     }
-    mapSecId = sub_812386C(gUnknown_0203A144->cursorPosX, gUnknown_0203A144->cursorPosY);
-    gUnknown_0203A144->unk_002 = get_flagnr_blue_points(mapSecId);
-    if (mapSecId != gUnknown_0203A144->mapSecId)
+    mapSecId = sub_812386C(gRegionMap->cursorPosX, gRegionMap->cursorPosY);
+    gRegionMap->unk_002 = get_flagnr_blue_points(mapSecId);
+    if (mapSecId != gRegionMap->mapSecId)
     {
-        gUnknown_0203A144->mapSecId = mapSecId;
-        GetMapName(gUnknown_0203A144->mapSecName, gUnknown_0203A144->mapSecId, 16);
+        gRegionMap->mapSecId = mapSecId;
+        GetMapName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
     }
     sub_8123FB0();
-    gUnknown_0203A144->inputCallback = sub_81230C4;
+    gRegionMap->inputCallback = ProcessRegionMapInput_Full;
     return INPUT_EVENT_MOVE_END;
 }
 
-u8 sub_8123254(void)
+static u8 ProcessRegionMapInput_Zoomed(void)
 {
     u8 input;
 
     input = INPUT_EVENT_NONE;
-    gUnknown_0203A144->zoomedCursorDeltaX = 0;
-    gUnknown_0203A144->zoomedCursorDeltaY = 0;
-    if (gMain.heldKeys & DPAD_UP && gUnknown_0203A144->scrollY > -0x34)
+    gRegionMap->zoomedCursorDeltaX = 0;
+    gRegionMap->zoomedCursorDeltaY = 0;
+    if (gMain.heldKeys & DPAD_UP && gRegionMap->scrollY > -0x34)
     {
-        gUnknown_0203A144->zoomedCursorDeltaY = -1;
+        gRegionMap->zoomedCursorDeltaY = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_DOWN && gUnknown_0203A144->scrollY < 0x3c)
+    if (gMain.heldKeys & DPAD_DOWN && gRegionMap->scrollY < 0x3c)
     {
-        gUnknown_0203A144->zoomedCursorDeltaY = +1;
+        gRegionMap->zoomedCursorDeltaY = +1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_LEFT && gUnknown_0203A144->scrollX > -0x2c)
+    if (gMain.heldKeys & DPAD_LEFT && gRegionMap->scrollX > -0x2c)
     {
-        gUnknown_0203A144->zoomedCursorDeltaX = -1;
+        gRegionMap->zoomedCursorDeltaX = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_RIGHT && gUnknown_0203A144->scrollX < 0xac)
+    if (gMain.heldKeys & DPAD_RIGHT && gRegionMap->scrollX < 0xac)
     {
-        gUnknown_0203A144->zoomedCursorDeltaX = +1;
+        gRegionMap->zoomedCursorDeltaX = +1;
         input = INPUT_EVENT_MOVE_START;
     }
     if (gMain.newKeys & A_BUTTON)
@@ -309,41 +310,41 @@ u8 sub_8123254(void)
     }
     if (input == INPUT_EVENT_MOVE_START)
     {
-        gUnknown_0203A144->inputCallback = sub_8123334;
-        gUnknown_0203A144->zoomedCursorMovementFrameCounter = 0;
+        gRegionMap->inputCallback = MoveRegionMapCursor_Zoomed;
+        gRegionMap->zoomedCursorMovementFrameCounter = 0;
     }
     return input;
 }
 
-u8 sub_8123334(void)
+static u8 MoveRegionMapCursor_Zoomed(void)
 {
     u16 x;
     u16 y;
     u16 mapSecId;
 
-    gUnknown_0203A144->scrollY += gUnknown_0203A144->zoomedCursorDeltaY;
-    gUnknown_0203A144->scrollX += gUnknown_0203A144->zoomedCursorDeltaX;
-    sub_812378C(gUnknown_0203A144->scrollX, gUnknown_0203A144->scrollY);
-    gUnknown_0203A144->zoomedCursorMovementFrameCounter ++;
-    if (gUnknown_0203A144->zoomedCursorMovementFrameCounter == 8)
+    gRegionMap->scrollY += gRegionMap->zoomedCursorDeltaY;
+    gRegionMap->scrollX += gRegionMap->zoomedCursorDeltaX;
+    sub_812378C(gRegionMap->scrollX, gRegionMap->scrollY);
+    gRegionMap->zoomedCursorMovementFrameCounter ++;
+    if (gRegionMap->zoomedCursorMovementFrameCounter == 8)
     {
-        x = (gUnknown_0203A144->scrollX + 0x2c) / 8 + 1;
-        y = (gUnknown_0203A144->scrollY + 0x34) / 8 + 2;
-        if (x != gUnknown_0203A144->unk_064 || y != gUnknown_0203A144->unk_066)
+        x = (gRegionMap->scrollX + 0x2c) / 8 + 1;
+        y = (gRegionMap->scrollY + 0x34) / 8 + 2;
+        if (x != gRegionMap->unk_064 || y != gRegionMap->unk_066)
         {
-            gUnknown_0203A144->unk_064 = x;
-            gUnknown_0203A144->unk_066 = y;
+            gRegionMap->unk_064 = x;
+            gRegionMap->unk_066 = y;
             mapSecId = sub_812386C(x, y);
-            gUnknown_0203A144->unk_002 = get_flagnr_blue_points(mapSecId);
-            if (mapSecId != gUnknown_0203A144->mapSecId)
+            gRegionMap->unk_002 = get_flagnr_blue_points(mapSecId);
+            if (mapSecId != gRegionMap->mapSecId)
             {
-                gUnknown_0203A144->mapSecId = mapSecId;
-                GetMapName(gUnknown_0203A144->mapSecName, gUnknown_0203A144->mapSecId, 16);
+                gRegionMap->mapSecId = mapSecId;
+                GetMapName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
             }
             sub_8123FB0();
         }
-        gUnknown_0203A144->zoomedCursorMovementFrameCounter = 0;
-        gUnknown_0203A144->inputCallback = sub_8123254;
+        gRegionMap->zoomedCursorMovementFrameCounter = 0;
+        gRegionMap->inputCallback = ProcessRegionMapInput_Zoomed;
         return INPUT_EVENT_MOVE_END;
     }
     return INPUT_EVENT_MOVE_CONT;
@@ -351,35 +352,119 @@ u8 sub_8123334(void)
 
 void sub_8123418(void)
 {
-    if (gUnknown_0203A144->zoomed == FALSE)
+    if (gRegionMap->zoomed == FALSE)
     {
-        gUnknown_0203A144->scrollY = 0;
-        gUnknown_0203A144->scrollX = 0;
-        gUnknown_0203A144->unk_040 = 0;
-        gUnknown_0203A144->unk_03c = 0;
-        gUnknown_0203A144->unk_060 = gUnknown_0203A144->cursorPosX * 8 - 0x34;
-        gUnknown_0203A144->unk_062 = gUnknown_0203A144->cursorPosY * 8 - 0x44;
-        gUnknown_0203A144->unk_044 = (gUnknown_0203A144->unk_060 << 8) / 16;
-        gUnknown_0203A144->unk_048 = (gUnknown_0203A144->unk_062 << 8) / 16;
-        gUnknown_0203A144->unk_064 = gUnknown_0203A144->cursorPosX;
-        gUnknown_0203A144->unk_066 = gUnknown_0203A144->cursorPosY;
-        gUnknown_0203A144->unk_04c = 0x10000;
-        gUnknown_0203A144->unk_050 = -0x800;
+        gRegionMap->scrollY = 0;
+        gRegionMap->scrollX = 0;
+        gRegionMap->unk_040 = 0;
+        gRegionMap->unk_03c = 0;
+        gRegionMap->unk_060 = gRegionMap->cursorPosX * 8 - 0x34;
+        gRegionMap->unk_062 = gRegionMap->cursorPosY * 8 - 0x44;
+        gRegionMap->unk_044 = (gRegionMap->unk_060 << 8) / 16;
+        gRegionMap->unk_048 = (gRegionMap->unk_062 << 8) / 16;
+        gRegionMap->unk_064 = gRegionMap->cursorPosX;
+        gRegionMap->unk_066 = gRegionMap->cursorPosY;
+        gRegionMap->unk_04c = 0x10000;
+        gRegionMap->unk_050 = -0x800;
     }
     else
     {
-        gUnknown_0203A144->unk_03c = gUnknown_0203A144->scrollX * 256;
-        gUnknown_0203A144->unk_040 = gUnknown_0203A144->scrollY * 256;
-        gUnknown_0203A144->unk_060 = 0;
-        gUnknown_0203A144->unk_062 = 0;
-        gUnknown_0203A144->unk_044 = -(gUnknown_0203A144->unk_03c / 16);
-        gUnknown_0203A144->unk_048 = -(gUnknown_0203A144->unk_040 / 16);
-        gUnknown_0203A144->cursorPosX = gUnknown_0203A144->unk_064;
-        gUnknown_0203A144->cursorPosY = gUnknown_0203A144->unk_066;
-        gUnknown_0203A144->unk_04c = 0x8000;
-        gUnknown_0203A144->unk_050 = 0x800;
+        gRegionMap->unk_03c = gRegionMap->scrollX * 256;
+        gRegionMap->unk_040 = gRegionMap->scrollY * 256;
+        gRegionMap->unk_060 = 0;
+        gRegionMap->unk_062 = 0;
+        gRegionMap->unk_044 = -(gRegionMap->unk_03c / 16);
+        gRegionMap->unk_048 = -(gRegionMap->unk_040 / 16);
+        gRegionMap->cursorPosX = gRegionMap->unk_064;
+        gRegionMap->cursorPosY = gRegionMap->unk_066;
+        gRegionMap->unk_04c = 0x8000;
+        gRegionMap->unk_050 = 0x800;
     }
-    gUnknown_0203A144->unk_06e = 0;
+    gRegionMap->unk_06e = 0;
     sub_8124238();
     sub_81243B0();
 }
+
+u8 sub_8123514(void)
+{
+    u8 r4;
+
+    if (gRegionMap->unk_06e >= 16)
+        return 0;
+    gRegionMap->unk_06e ++;
+    if (gRegionMap->unk_06e == 16)
+    {
+        gRegionMap->unk_044 = 0;
+        gRegionMap->unk_048 = 0;
+        gRegionMap->scrollX = gRegionMap->unk_060;
+        gRegionMap->scrollY = gRegionMap->unk_062;
+        gRegionMap->unk_04c = (gRegionMap->zoomed == FALSE) ? (128 << 8) : (256 << 8);
+        gRegionMap->zoomed = !gRegionMap->zoomed;
+        gRegionMap->inputCallback = (gRegionMap->zoomed == FALSE) ? ProcessRegionMapInput_Full : ProcessRegionMapInput_Zoomed;
+        CreateRegionMapCursor(gRegionMap->cursorTileTag, gRegionMap->cursorPaletteTag);
+        sub_81243DC();
+        r4 = 0;
+    }
+    else
+    {
+        gRegionMap->unk_03c += gRegionMap->unk_044;
+        gRegionMap->unk_040 += gRegionMap->unk_048;
+        gRegionMap->scrollX = gRegionMap->unk_03c >> 8;
+        gRegionMap->scrollY = gRegionMap->unk_040 >> 8;
+        gRegionMap->unk_04c += gRegionMap->unk_050;
+        if ((gRegionMap->unk_044 < 0 && gRegionMap->scrollX < gRegionMap->unk_060)
+            || (gRegionMap->unk_044 > 0 && gRegionMap->scrollX > gRegionMap->unk_060))
+        {
+            gRegionMap->scrollX = gRegionMap->unk_060;
+            gRegionMap->unk_044 = 0;
+        }
+        if ((gRegionMap->unk_048 < 0 && gRegionMap->scrollY < gRegionMap->unk_062)
+            || (gRegionMap->unk_048 > 0 && gRegionMap->scrollY > gRegionMap->unk_062))
+        {
+            gRegionMap->scrollY = gRegionMap->unk_062;
+            gRegionMap->unk_048 = 0;
+        }
+        if (gRegionMap->zoomed == FALSE)
+        {
+            if (gRegionMap->unk_04c < (128 << 8))
+            {
+                gRegionMap->unk_04c = (128 << 8);
+                gRegionMap->unk_050 = 0;
+            }
+        }
+        else
+        {
+            if (gRegionMap->unk_04c > (256 << 8))
+            {
+                gRegionMap->unk_04c = (256 << 8);
+                gRegionMap->unk_050 = 0;
+            }
+        }
+        r4 = 1;
+    }
+    CalcZoomScrollParams(gRegionMap->scrollX, gRegionMap->scrollY, 0x38, 0x48, gRegionMap->unk_04c >> 8, gRegionMap->unk_04c >> 8, 0);
+    return r4;
+}
+
+void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f, u8 rotation)
+{
+    s32 var1;
+    s32 var2;
+    s32 var3;
+    s32 var4;
+
+    gRegionMap->bg2pa = e * gSineTable[rotation + 64] >> 8;
+    gRegionMap->bg2pb = e * -gSineTable[rotation] >> 8;
+    gRegionMap->bg2pc = f * gSineTable[rotation] >> 8;
+    gRegionMap->bg2pd = f * gSineTable[rotation + 64] >> 8;
+
+    var1 = (scrollX << 8) + (c << 8);
+    var2 = d * gRegionMap->bg2pc + gRegionMap->bg2pa * c;
+    gRegionMap->bg2x = var1 - var2;
+
+    var3 = (scrollY << 8) + (d << 8);
+    var4 = gRegionMap->bg2pd * d + gRegionMap->bg2pb * c;
+    gRegionMap->bg2y = var3 - var4;
+
+    gRegionMap->needUpdateVideoRegs = TRUE;
+}
-- 
cgit v1.2.3


From f6a55433a2d93898b03e3ee3a65a2061ceda6a9a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 08:46:36 -0400
Subject: through sub_81237B4

---
 src/region_map.c | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index c4d15a8ac..0a2da354a 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -3,6 +3,7 @@
 #include "global.h"
 #include "main.h"
 #include "menu.h"
+#include "gpu_regs.h"
 #include "palette.h"
 #include "trig.h"
 #include "region_map.h"
@@ -454,17 +455,40 @@ void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f,
     s32 var4;
 
     gRegionMap->bg2pa = e * gSineTable[rotation + 64] >> 8;
-    gRegionMap->bg2pb = e * -gSineTable[rotation] >> 8;
-    gRegionMap->bg2pc = f * gSineTable[rotation] >> 8;
+    gRegionMap->bg2pc = e * -gSineTable[rotation] >> 8;
+    gRegionMap->bg2pb = f * gSineTable[rotation] >> 8;
     gRegionMap->bg2pd = f * gSineTable[rotation + 64] >> 8;
 
     var1 = (scrollX << 8) + (c << 8);
-    var2 = d * gRegionMap->bg2pc + gRegionMap->bg2pa * c;
+    var2 = d * gRegionMap->bg2pb + gRegionMap->bg2pa * c;
     gRegionMap->bg2x = var1 - var2;
 
     var3 = (scrollY << 8) + (d << 8);
-    var4 = gRegionMap->bg2pd * d + gRegionMap->bg2pb * c;
+    var4 = gRegionMap->bg2pd * d + gRegionMap->bg2pc * c;
     gRegionMap->bg2y = var3 - var4;
 
     gRegionMap->needUpdateVideoRegs = TRUE;
 }
+
+void sub_812378C(s16 x, s16 y)
+{
+    gRegionMap->bg2x = (x << 8) + 0x1c00;
+    gRegionMap->bg2y = (y << 8) + 0x2400;
+    gRegionMap->needUpdateVideoRegs = TRUE;
+}
+
+void sub_81237B4(void)
+{
+    if (gRegionMap->needUpdateVideoRegs)
+    {
+        SetGpuReg(REG_OFFSET_BG2PA, gRegionMap->bg2pa);
+        SetGpuReg(REG_OFFSET_BG2PB, gRegionMap->bg2pb);
+        SetGpuReg(REG_OFFSET_BG2PC, gRegionMap->bg2pc);
+        SetGpuReg(REG_OFFSET_BG2PD, gRegionMap->bg2pd);
+        SetGpuReg(REG_OFFSET_BG2X_L, gRegionMap->bg2x);
+        SetGpuReg(REG_OFFSET_BG2X_H, gRegionMap->bg2x >> 16);
+        SetGpuReg(REG_OFFSET_BG2Y_L, gRegionMap->bg2y);
+        SetGpuReg(REG_OFFSET_BG2Y_H, gRegionMap->bg2y >> 16);
+        gRegionMap->needUpdateVideoRegs = FALSE;
+    }
+}
-- 
cgit v1.2.3


From c324722987e48fa43fd4bad81555b22439e3e932 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 08:58:43 -0400
Subject: through GetRegionMapSectionIdAt

---
 src/region_map.c | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 0a2da354a..b771d7028 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -8,6 +8,13 @@
 #include "trig.h"
 #include "region_map.h"
 
+#define MAP_WIDTH 28
+#define MAP_HEIGHT 15
+#define MAPCURSOR_X_MIN 1
+#define MAPCURSOR_Y_MIN 2
+#define MAPCURSOR_X_MAX (MAPCURSOR_X_MIN + MAP_WIDTH - 1)
+#define MAPCURSOR_Y_MAX (MAPCURSOR_Y_MIN + MAP_HEIGHT - 1)
+
 // Static type declarations
 
 struct UnkStruct_0203A148 {
@@ -26,12 +33,12 @@ static u8 MoveRegionMapCursor_Full(void);
 static u8 ProcessRegionMapInput_Zoomed(void);
 static u8 MoveRegionMapCursor_Zoomed(void);
 void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f, u8 rotation);
-void sub_81237B4(void);
+void UpdateRegionMapVideoRegs(void);
 void sub_81238AC(void);
 u8 get_flagnr_blue_points(u16 mapSecId);
 u16 sub_8123EB4(u16 mapSecId);
 void sub_8123FB0(void);
-u16 sub_812386C(u16 x, u16 y);
+u16 GetRegionMapSectionIdAt(u16 x, u16 y);
 void sub_812378C(s16 x, s16 y);
 void sub_8124238(void);
 void sub_81243B0(void);
@@ -39,11 +46,12 @@ void sub_81243DC(void);
 
 // .rodata
 
-extern const u8 gUnknown_0859F77C[];
-extern const u8 gUnknown_085A04E0[];
-extern const u16 gUnknown_0859F73C[];
 extern const u8 gUnknown_0859F60C[];
 extern const u8 gUnknown_0859F650[];
+extern const u16 gUnknown_0859F73C[];
+extern const u8 gUnknown_0859F77C[];
+extern const u8 gUnknown_085A04E0[];
+extern const u8 gUnknown_085A096C[];
 
 // .text
 
@@ -146,7 +154,7 @@ bool8 sub_8122DB0(void)
             break;
         case 7:
             sub_8123FB0();
-            sub_81237B4();
+            UpdateRegionMapVideoRegs();
             gRegionMap->cursorSprite = NULL;
             gRegionMap->playerIconSprite = NULL;
             gRegionMap->cursorMovementFrameCounter = 0;
@@ -202,22 +210,22 @@ static u8 ProcessRegionMapInput_Full(void)
     input = INPUT_EVENT_NONE;
     gRegionMap->cursorDeltaX = 0;
     gRegionMap->cursorDeltaY = 0;
-    if (gMain.heldKeys & DPAD_UP && gRegionMap->cursorPosY > 2)
+    if (gMain.heldKeys & DPAD_UP && gRegionMap->cursorPosY > MAPCURSOR_Y_MIN)
     {
         gRegionMap->cursorDeltaY = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_DOWN && gRegionMap->cursorPosY < 16)
+    if (gMain.heldKeys & DPAD_DOWN && gRegionMap->cursorPosY < MAPCURSOR_Y_MAX)
     {
         gRegionMap->cursorDeltaY = +1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_LEFT && gRegionMap->cursorPosX > 1)
+    if (gMain.heldKeys & DPAD_LEFT && gRegionMap->cursorPosX > MAPCURSOR_X_MIN)
     {
         gRegionMap->cursorDeltaX = -1;
         input = INPUT_EVENT_MOVE_START;
     }
-    if (gMain.heldKeys & DPAD_RIGHT && gRegionMap->cursorPosX < 28)
+    if (gMain.heldKeys & DPAD_RIGHT && gRegionMap->cursorPosX < MAPCURSOR_X_MAX)
     {
         gRegionMap->cursorDeltaX = +1;
         input = INPUT_EVENT_MOVE_START;
@@ -262,7 +270,7 @@ static u8 MoveRegionMapCursor_Full(void)
     {
         gRegionMap->cursorPosY --;
     }
-    mapSecId = sub_812386C(gRegionMap->cursorPosX, gRegionMap->cursorPosY);
+    mapSecId = GetRegionMapSectionIdAt(gRegionMap->cursorPosX, gRegionMap->cursorPosY);
     gRegionMap->unk_002 = get_flagnr_blue_points(mapSecId);
     if (mapSecId != gRegionMap->mapSecId)
     {
@@ -335,7 +343,7 @@ static u8 MoveRegionMapCursor_Zoomed(void)
         {
             gRegionMap->unk_064 = x;
             gRegionMap->unk_066 = y;
-            mapSecId = sub_812386C(x, y);
+            mapSecId = GetRegionMapSectionIdAt(x, y);
             gRegionMap->unk_002 = get_flagnr_blue_points(mapSecId);
             if (mapSecId != gRegionMap->mapSecId)
             {
@@ -477,7 +485,7 @@ void sub_812378C(s16 x, s16 y)
     gRegionMap->needUpdateVideoRegs = TRUE;
 }
 
-void sub_81237B4(void)
+void UpdateRegionMapVideoRegs(void)
 {
     if (gRegionMap->needUpdateVideoRegs)
     {
@@ -492,3 +500,25 @@ void sub_81237B4(void)
         gRegionMap->needUpdateVideoRegs = FALSE;
     }
 }
+
+void sub_8123824(s16 x, s16 y)
+{
+    CalcZoomScrollParams(x, y, 0x38, 0x48, 0x100, 0x100, 0);
+    UpdateRegionMapVideoRegs();
+    if (gRegionMap->playerIconSprite != NULL)
+    {
+        gRegionMap->playerIconSprite->pos2.x = -x;
+        gRegionMap->playerIconSprite->pos2.y = -y;
+    }
+}
+
+u16 GetRegionMapSectionIdAt(u16 x, u16 y)
+{
+    if (y < MAPCURSOR_Y_MIN || y > MAPCURSOR_Y_MAX || x < MAPCURSOR_X_MIN || x > MAPCURSOR_X_MAX)
+    {
+        return MAPSEC_NONE2;
+    }
+    y -= MAPCURSOR_Y_MIN;
+    x -= MAPCURSOR_X_MIN;
+    return gUnknown_085A096C[x + y * MAP_WIDTH];
+}
-- 
cgit v1.2.3


From 525b17a110ee0099391eb91d9c99b4a6b88e46d8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 21:08:28 -0400
Subject: sub_81238AC

---
 src/region_map.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 195 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index b771d7028..30d5bc087 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -6,6 +6,8 @@
 #include "gpu_regs.h"
 #include "palette.h"
 #include "trig.h"
+#include "map_constants.h"
+#include "overworld.h"
 #include "region_map.h"
 
 #define MAP_WIDTH 28
@@ -21,6 +23,13 @@ struct UnkStruct_0203A148 {
     u8 filler_000[0xa74];
 };
 
+struct RegionMapLocation
+{
+    u8 x, y;
+    u8 width, height;
+    const u8 *regionMapSectionId;
+};
+
 // Static RAM declarations
 
 EWRAM_DATA struct RegionMap *gRegionMap = NULL;
@@ -34,12 +43,15 @@ static u8 ProcessRegionMapInput_Zoomed(void);
 static u8 MoveRegionMapCursor_Zoomed(void);
 void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f, u8 rotation);
 void UpdateRegionMapVideoRegs(void);
-void sub_81238AC(void);
+u16 GetRegionMapSectionIdAt(u16 x, u16 y);
+void sub_812378C(s16 x, s16 y);
+static void sub_81238AC(void);
 u8 get_flagnr_blue_points(u16 mapSecId);
 u16 sub_8123EB4(u16 mapSecId);
+void sub_8123F30(u16 *x, u16 *y);
 void sub_8123FB0(void);
-u16 GetRegionMapSectionIdAt(u16 x, u16 y);
-void sub_812378C(s16 x, s16 y);
+void sub_8123C00(void);
+bool32 sub_8123F74(u8 mapSecId);
 void sub_8124238(void);
 void sub_81243B0(void);
 void sub_81243DC(void);
@@ -52,6 +64,7 @@ extern const u16 gUnknown_0859F73C[];
 extern const u8 gUnknown_0859F77C[];
 extern const u8 gUnknown_085A04E0[];
 extern const u8 gUnknown_085A096C[];
+extern const struct RegionMapLocation gRegionMapEntries[];
 
 // .text
 
@@ -399,7 +412,9 @@ u8 sub_8123514(void)
     u8 r4;
 
     if (gRegionMap->unk_06e >= 16)
+    {
         return 0;
+    }
     gRegionMap->unk_06e ++;
     if (gRegionMap->unk_06e == 16)
     {
@@ -421,14 +436,12 @@ u8 sub_8123514(void)
         gRegionMap->scrollX = gRegionMap->unk_03c >> 8;
         gRegionMap->scrollY = gRegionMap->unk_040 >> 8;
         gRegionMap->unk_04c += gRegionMap->unk_050;
-        if ((gRegionMap->unk_044 < 0 && gRegionMap->scrollX < gRegionMap->unk_060)
-            || (gRegionMap->unk_044 > 0 && gRegionMap->scrollX > gRegionMap->unk_060))
+        if ((gRegionMap->unk_044 < 0 && gRegionMap->scrollX < gRegionMap->unk_060) || (gRegionMap->unk_044 > 0 && gRegionMap->scrollX > gRegionMap->unk_060))
         {
             gRegionMap->scrollX = gRegionMap->unk_060;
             gRegionMap->unk_044 = 0;
         }
-        if ((gRegionMap->unk_048 < 0 && gRegionMap->scrollY < gRegionMap->unk_062)
-            || (gRegionMap->unk_048 > 0 && gRegionMap->scrollY > gRegionMap->unk_062))
+        if ((gRegionMap->unk_048 < 0 && gRegionMap->scrollY < gRegionMap->unk_062) || (gRegionMap->unk_048 > 0 && gRegionMap->scrollY > gRegionMap->unk_062))
         {
             gRegionMap->scrollY = gRegionMap->unk_062;
             gRegionMap->unk_048 = 0;
@@ -522,3 +535,178 @@ u16 GetRegionMapSectionIdAt(u16 x, u16 y)
     x -= MAPCURSOR_X_MIN;
     return gUnknown_085A096C[x + y * MAP_WIDTH];
 }
+
+static void sub_81238AC(void)
+{
+    const struct MapHeader *mapHeader;
+    u16 mapWidth;
+    u16 mapHeight;
+    u16 x;
+    u16 y;
+    u16 r1;
+    u16 r9;
+    struct WarpData *r4;
+
+    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_SS_TIDAL_CORRIDOR
+        && (gSaveBlock1Ptr->location.mapNum == MAP_ID_SS_TIDAL_CORRIDOR
+            || gSaveBlock1Ptr->location.mapNum == MAP_ID_SS_TIDAL_LOWER_DECK
+            || gSaveBlock1Ptr->location.mapNum == MAP_ID_SS_TIDAL_ROOMS))
+    {
+        sub_8123C00();
+        return;
+    }
+
+    switch (get_map_light_level_by_bank_and_number(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum))
+    {
+        default:
+        case 1:
+        case 2:
+        case 3:
+        case 5:
+        case 6:
+            gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
+            gRegionMap->playerIsInCave = FALSE;
+            mapWidth = gMapHeader.mapData->width;
+            mapHeight = gMapHeader.mapData->height;
+            x = gSaveBlock1Ptr->pos.x;
+            y = gSaveBlock1Ptr->pos.y;
+            if (gRegionMap->mapSecId == MAPSEC_UNDERWATER || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE)
+            {
+                gRegionMap->playerIsInCave = TRUE;
+            }
+            break;
+        case 4:
+        case 7:
+            if (gMapHeader.flags & 0x02)
+            {
+                mapHeader = get_mapheader_by_bank_and_number(gSaveBlock1Ptr->warp4.mapGroup, gSaveBlock1Ptr->warp4.mapNum);
+                gRegionMap->mapSecId = mapHeader->regionMapSectionId;
+                gRegionMap->playerIsInCave = TRUE;
+                mapWidth = mapHeader->mapData->width;
+                mapHeight = mapHeader->mapData->height;
+                x = gSaveBlock1Ptr->warp4.x;
+                y = gSaveBlock1Ptr->warp4.y;
+            }
+            else
+            {
+                gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
+                gRegionMap->playerIsInCave = TRUE;
+                mapWidth = 1;
+                mapHeight = 1;
+                x = 1;
+                y = 1;
+            }
+            break;
+        case 9:
+            mapHeader = get_mapheader_by_bank_and_number((u16)gSaveBlock1Ptr->warp2.mapGroup, (u16)gSaveBlock1Ptr->warp2.mapNum);
+            gRegionMap->mapSecId = mapHeader->regionMapSectionId;
+            gRegionMap->playerIsInCave = TRUE;
+            mapWidth = mapHeader->mapData->width;
+            mapHeight = mapHeader->mapData->height;
+            x = gSaveBlock1Ptr->warp2.x;
+            y = gSaveBlock1Ptr->warp2.y;
+            break;
+        case 8:
+
+            gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
+            if (gRegionMap->mapSecId != MAPSEC_NONE)
+            {
+                r4 = &gSaveBlock1Ptr->warp4;
+                mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
+            }
+            else
+            {
+                r4 = &gSaveBlock1Ptr->warp2;
+                mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
+                gRegionMap->mapSecId = mapHeader->regionMapSectionId;
+            }
+            if (sub_8123F74(gRegionMap->mapSecId))
+            {
+                gRegionMap->playerIsInCave = TRUE;
+            }
+            else
+            {
+                gRegionMap->playerIsInCave = FALSE;
+            }
+            mapWidth = mapHeader->mapData->width;
+            mapHeight = mapHeader->mapData->height;
+            x = r4->x;
+            y = r4->y;
+            break;
+    }
+
+    r9 = x;
+
+    r1 = mapWidth / gRegionMapEntries[gRegionMap->mapSecId].width;
+    if (r1 == 0)
+    {
+        r1 = 1;
+    }
+    x /= r1;
+    if (x >= gRegionMapEntries[gRegionMap->mapSecId].width)
+    {
+        x = gRegionMapEntries[gRegionMap->mapSecId].width - 1;
+    }
+
+    r1 = mapHeight / gRegionMapEntries[gRegionMap->mapSecId].height;
+    if (r1 == 0)
+    {
+        r1 = 1;
+    }
+    y /= r1;
+    if (y >= gRegionMapEntries[gRegionMap->mapSecId].height)
+    {
+        y = gRegionMapEntries[gRegionMap->mapSecId].height - 1;
+    }
+
+    switch (gRegionMap->mapSecId)
+    {
+        case MAPSEC_ROUTE_114:
+            if (y != 0)
+            {
+                x = 0;
+            }
+            break;
+        case MAPSEC_ROUTE_126:
+        case MAPSEC_UNDERWATER_125:
+            x = 0;
+            if (gSaveBlock1Ptr->pos.x > 32)
+            {
+                x = 1;
+            }
+            if (gSaveBlock1Ptr->pos.x > 0x33)
+            {
+                x++;
+            }
+            y = 0;
+            if (gSaveBlock1Ptr->pos.y > 0x25)
+            {
+                y = 1;
+            }
+            if (gSaveBlock1Ptr->pos.y > 0x38)
+            {
+                y++;
+            }
+            break;
+        case MAPSEC_ROUTE_121:
+            x = 0;
+            if (r9 > 14)
+            {
+                x = 1;
+            }
+            if (r9 > 0x1C)
+            {
+                x++;
+            }
+            if (r9 > 0x36)
+            {
+                x++;
+            }
+            break;
+        case MAPSEC_UNDERWATER_MARINE_CAVE:
+            sub_8123F30(&gRegionMap->cursorPosX, &gRegionMap->cursorPosY);
+            return;
+    }
+    gRegionMap->cursorPosX = gRegionMapEntries[gRegionMap->mapSecId].x + x + MAPCURSOR_X_MIN;
+    gRegionMap->cursorPosY = gRegionMapEntries[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN;
+}
-- 
cgit v1.2.3


From cd9022f929525eca670bc17cca884f927d232be4 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 21:14:52 -0400
Subject: sub_8123C00

---
 src/region_map.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 30d5bc087..dd3654bee 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -8,6 +8,7 @@
 #include "trig.h"
 #include "map_constants.h"
 #include "overworld.h"
+#include "rom6.h"
 #include "region_map.h"
 
 #define MAP_WIDTH 28
@@ -46,11 +47,11 @@ void UpdateRegionMapVideoRegs(void);
 u16 GetRegionMapSectionIdAt(u16 x, u16 y);
 void sub_812378C(s16 x, s16 y);
 static void sub_81238AC(void);
+static void sub_8123C00(void);
 u8 get_flagnr_blue_points(u16 mapSecId);
 u16 sub_8123EB4(u16 mapSecId);
 void sub_8123F30(u16 *x, u16 *y);
 void sub_8123FB0(void);
-void sub_8123C00(void);
 bool32 sub_8123F74(u8 mapSecId);
 void sub_8124238(void);
 void sub_81243B0(void);
@@ -710,3 +711,55 @@ static void sub_81238AC(void)
     gRegionMap->cursorPosX = gRegionMapEntries[gRegionMap->mapSecId].x + x + MAPCURSOR_X_MIN;
     gRegionMap->cursorPosY = gRegionMapEntries[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN;
 }
+
+static void sub_8123C00(void)
+{
+    u16 y;
+    u16 x;
+    u8 mapGroup;
+    u8 mapNum;
+    u16 r1;
+    s16 sp2;
+    s16 sp4;
+    const struct MapHeader *mapHeader;
+
+    y = 0;
+    x = 0;
+    switch (GetSSTidalLocation(&mapGroup, &mapNum, &sp2, &sp4))
+    {
+        case 1:
+            gRegionMap->mapSecId = MAPSEC_SLATEPORT_CITY;
+            break;
+        case 2:
+            gRegionMap->mapSecId = MAPSEC_LILYCOVE_CITY;
+            break;
+        case 3:
+            gRegionMap->mapSecId = MAPSEC_ROUTE_124;
+            break;
+        case 4:
+            gRegionMap->mapSecId = MAPSEC_ROUTE_131;
+            break;
+        default:
+        case 0:
+            mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum);
+
+            gRegionMap->mapSecId = mapHeader->regionMapSectionId;
+            r1 = mapHeader->mapData->width / gRegionMapEntries[gRegionMap->mapSecId].width;
+            if (r1 == 0)
+                r1 = 1;
+            x = sp2 / r1;
+            if (x >= gRegionMapEntries[gRegionMap->mapSecId].width)
+                x = gRegionMapEntries[gRegionMap->mapSecId].width - 1;
+
+            r1 = mapHeader->mapData->height / gRegionMapEntries[gRegionMap->mapSecId].height;
+            if (r1 == 0)
+                r1 = 1;
+            y = sp4 / r1;
+            if (y >= gRegionMapEntries[gRegionMap->mapSecId].height)
+                y = gRegionMapEntries[gRegionMap->mapSecId].height - 1;
+            break;
+    }
+    gRegionMap->playerIsInCave = FALSE;
+    gRegionMap->cursorPosX = gRegionMapEntries[gRegionMap->mapSecId].x + x + MAPCURSOR_X_MIN;
+    gRegionMap->cursorPosY = gRegionMapEntries[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN;
+}
-- 
cgit v1.2.3


From f0c71c7e3fb13a4f909fed419cfa7935ebea2c4d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 21:20:31 -0400
Subject: get_flagnr_blue_points

---
 src/region_map.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index dd3654bee..dd708266b 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -8,6 +8,8 @@
 #include "trig.h"
 #include "map_constants.h"
 #include "overworld.h"
+#include "flags.h"
+#include "event_data.h"
 #include "rom6.h"
 #include "region_map.h"
 
@@ -48,7 +50,7 @@ u16 GetRegionMapSectionIdAt(u16 x, u16 y);
 void sub_812378C(s16 x, s16 y);
 static void sub_81238AC(void);
 static void sub_8123C00(void);
-u8 get_flagnr_blue_points(u16 mapSecId);
+static u8 get_flagnr_blue_points(u16 mapSecId);
 u16 sub_8123EB4(u16 mapSecId);
 void sub_8123F30(u16 *x, u16 *y);
 void sub_8123FB0(void);
@@ -763,3 +765,50 @@ static void sub_8123C00(void)
     gRegionMap->cursorPosX = gRegionMapEntries[gRegionMap->mapSecId].x + x + MAPCURSOR_X_MIN;
     gRegionMap->cursorPosY = gRegionMapEntries[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN;
 }
+
+static u8 get_flagnr_blue_points(u16 mapSecId)
+{
+    switch (mapSecId)
+    {
+        case MAPSEC_NONE2:
+            return 0;
+        case MAPSEC_LITTLEROOT_TOWN:
+            return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? 2 : 3;
+        case MAPSEC_OLDALE_TOWN:
+            return FlagGet(FLAG_VISITED_OLDALE_TOWN) ? 2 : 3;
+        case MAPSEC_DEWFORD_TOWN:
+            return FlagGet(FLAG_VISITED_DEWFORD_TOWN) ? 2 : 3;
+        case MAPSEC_LAVARIDGE_TOWN:
+            return FlagGet(FLAG_VISITED_LAVARIDGE_TOWN) ? 2 : 3;
+        case MAPSEC_FALLARBOR_TOWN:
+            return FlagGet(FLAG_VISITED_FALLARBOR_TOWN) ? 2 : 3;
+        case MAPSEC_VERDANTURF_TOWN:
+            return FlagGet(FLAG_VISITED_VERDANTURF_TOWN) ? 2 : 3;
+        case MAPSEC_PACIFIDLOG_TOWN:
+            return FlagGet(FLAG_VISITED_PACIFIDLOG_TOWN) ? 2 : 3;
+        case MAPSEC_PETALBURG_CITY:
+            return FlagGet(FLAG_VISITED_PETALBURG_CITY) ? 2 : 3;
+        case MAPSEC_SLATEPORT_CITY:
+            return FlagGet(FLAG_VISITED_SLATEPORT_CITY) ? 2 : 3;
+        case MAPSEC_MAUVILLE_CITY:
+            return FlagGet(FLAG_VISITED_MAUVILLE_CITY) ? 2 : 3;
+        case MAPSEC_RUSTBORO_CITY:
+            return FlagGet(FLAG_VISITED_RUSTBORO_CITY) ? 2 : 3;
+        case MAPSEC_FORTREE_CITY:
+            return FlagGet(FLAG_VISITED_FORTREE_CITY) ? 2 : 3;
+        case MAPSEC_LILYCOVE_CITY:
+            return FlagGet(FLAG_VISITED_LILYCOVE_CITY) ? 2 : 3;
+        case MAPSEC_MOSSDEEP_CITY:
+            return FlagGet(FLAG_VISITED_MOSSDEEP_CITY) ? 2 : 3;
+        case MAPSEC_SOOTOPOLIS_CITY:
+            return FlagGet(FLAG_VISITED_SOOTOPOLIS_CITY) ? 2 : 3;
+        case MAPSEC_EVER_GRANDE_CITY:
+            return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? 2 : 3;
+        case MAPSEC_BATTLE_FRONTIER:
+            return FlagGet(FLAG_UNLOCK_BATTLE_FRONTIER) ? 4 : 0;
+        case MAPSEC_SOUTHERN_ISLAND:
+            return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? 1 : 0;
+        default:
+            return 1;
+    }
+}
-- 
cgit v1.2.3


From 7b6792230a770dd67c94a3b34aecba87ad9a05db Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 21:34:19 -0400
Subject: sub_8123EB4

---
 src/field_region_map.c |  2 +-
 src/region_map.c       | 75 ++++++++++++++++++++++++++++++++++----------------
 2 files changed, 53 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index d70d44d58..6c483c6b6 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -181,7 +181,7 @@ void sub_8170290(void)
 
 static void sub_8170428(void)
 {
-    if (gUnknown_0203BCD0->regionMap.unk_002 != 0)
+    if (gUnknown_0203BCD0->regionMap.iconDrawType != 0)
     {
         FillWindowPixelBuffer(0, 0x11);
         PrintTextOnWindow(0, 1, gUnknown_0203BCD0->regionMap.mapSecName, 0, 1, 0, NULL);
diff --git a/src/region_map.c b/src/region_map.c
index dd708266b..9b333779e 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -52,6 +52,7 @@ static void sub_81238AC(void);
 static void sub_8123C00(void);
 static u8 get_flagnr_blue_points(u16 mapSecId);
 u16 sub_8123EB4(u16 mapSecId);
+u16 sub_8123F04(void);
 void sub_8123F30(u16 *x, u16 *y);
 void sub_8123FB0(void);
 bool32 sub_8123F74(u8 mapSecId);
@@ -68,6 +69,8 @@ extern const u8 gUnknown_0859F77C[];
 extern const u8 gUnknown_085A04E0[];
 extern const u8 gUnknown_085A096C[];
 extern const struct RegionMapLocation gRegionMapEntries[];
+extern const u16 gUnknown_085A1B84[];
+extern const u16 gUnknown_085A1B24[][2];
 
 // .text
 
@@ -151,7 +154,7 @@ bool8 sub_8122DB0(void)
             gRegionMap->unk_074 = gRegionMap->cursorPosX;
             gRegionMap->unk_076 = gRegionMap->cursorPosY;
             gRegionMap->mapSecId = sub_8123EB4(gRegionMap->mapSecId);
-            gRegionMap->unk_002 = get_flagnr_blue_points(gRegionMap->mapSecId);
+            gRegionMap->iconDrawType = get_flagnr_blue_points(gRegionMap->mapSecId);
             GetMapName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
             break;
         case 6:
@@ -287,7 +290,7 @@ static u8 MoveRegionMapCursor_Full(void)
         gRegionMap->cursorPosY --;
     }
     mapSecId = GetRegionMapSectionIdAt(gRegionMap->cursorPosX, gRegionMap->cursorPosY);
-    gRegionMap->unk_002 = get_flagnr_blue_points(mapSecId);
+    gRegionMap->iconDrawType = get_flagnr_blue_points(mapSecId);
     if (mapSecId != gRegionMap->mapSecId)
     {
         gRegionMap->mapSecId = mapSecId;
@@ -360,7 +363,7 @@ static u8 MoveRegionMapCursor_Zoomed(void)
             gRegionMap->unk_064 = x;
             gRegionMap->unk_066 = y;
             mapSecId = GetRegionMapSectionIdAt(x, y);
-            gRegionMap->unk_002 = get_flagnr_blue_points(mapSecId);
+            gRegionMap->iconDrawType = get_flagnr_blue_points(mapSecId);
             if (mapSecId != gRegionMap->mapSecId)
             {
                 gRegionMap->mapSecId = mapSecId;
@@ -771,44 +774,70 @@ static u8 get_flagnr_blue_points(u16 mapSecId)
     switch (mapSecId)
     {
         case MAPSEC_NONE2:
-            return 0;
+            return MAPSECTYPE_NONE;
         case MAPSEC_LITTLEROOT_TOWN:
-            return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_OLDALE_TOWN:
-            return FlagGet(FLAG_VISITED_OLDALE_TOWN) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_OLDALE_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_DEWFORD_TOWN:
-            return FlagGet(FLAG_VISITED_DEWFORD_TOWN) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_DEWFORD_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_LAVARIDGE_TOWN:
-            return FlagGet(FLAG_VISITED_LAVARIDGE_TOWN) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_LAVARIDGE_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_FALLARBOR_TOWN:
-            return FlagGet(FLAG_VISITED_FALLARBOR_TOWN) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_FALLARBOR_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_VERDANTURF_TOWN:
-            return FlagGet(FLAG_VISITED_VERDANTURF_TOWN) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_VERDANTURF_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_PACIFIDLOG_TOWN:
-            return FlagGet(FLAG_VISITED_PACIFIDLOG_TOWN) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_PACIFIDLOG_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_PETALBURG_CITY:
-            return FlagGet(FLAG_VISITED_PETALBURG_CITY) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_PETALBURG_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_SLATEPORT_CITY:
-            return FlagGet(FLAG_VISITED_SLATEPORT_CITY) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_SLATEPORT_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_MAUVILLE_CITY:
-            return FlagGet(FLAG_VISITED_MAUVILLE_CITY) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_MAUVILLE_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_RUSTBORO_CITY:
-            return FlagGet(FLAG_VISITED_RUSTBORO_CITY) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_RUSTBORO_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_FORTREE_CITY:
-            return FlagGet(FLAG_VISITED_FORTREE_CITY) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_FORTREE_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_LILYCOVE_CITY:
-            return FlagGet(FLAG_VISITED_LILYCOVE_CITY) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_LILYCOVE_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_MOSSDEEP_CITY:
-            return FlagGet(FLAG_VISITED_MOSSDEEP_CITY) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_MOSSDEEP_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_SOOTOPOLIS_CITY:
-            return FlagGet(FLAG_VISITED_SOOTOPOLIS_CITY) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_SOOTOPOLIS_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_EVER_GRANDE_CITY:
-            return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? 2 : 3;
+            return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_BATTLE_FRONTIER:
-            return FlagGet(FLAG_UNLOCK_BATTLE_FRONTIER) ? 4 : 0;
+            return FlagGet(FLAG_UNLOCK_BATTLE_FRONTIER) ? MAPSECTYPE_BATTLE_FRONTIER : MAPSECTYPE_NONE;
         case MAPSEC_SOUTHERN_ISLAND:
-            return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? 1 : 0;
+            return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? MAPSECTYPE_PLAIN : MAPSECTYPE_NONE;
         default:
-            return 1;
+            return MAPSECTYPE_PLAIN;
     }
 }
+
+u16 sub_8123E9C(u16 x, u16 y)
+{
+    return GetRegionMapSectionIdAt(x, y);
+}
+
+u16 sub_8123EB4(u16 mapSecId)
+{
+    u32 i;
+
+    for (i = 0; i < 3; i ++)
+    {
+        if (gUnknown_085A1B84[i] == mapSecId)
+        {
+            return sub_8123F04();
+        }
+    }
+    for (i = 0; gUnknown_085A1B24[i][0] != MAPSEC_NONE2; i ++)
+    {
+        if (gUnknown_085A1B24[i][0] == mapSecId)
+        {
+            return gUnknown_085A1B24[i][1];
+        }
+    }
+    return mapSecId;
+}
-- 
cgit v1.2.3


From ccbeaccc9ba3d33848f4c276a65661948b41624e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 21:47:37 -0400
Subject: sub_8123F30

---
 src/region_map.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 9b333779e..db41284af 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -69,8 +69,10 @@ extern const u8 gUnknown_0859F77C[];
 extern const u8 gUnknown_085A04E0[];
 extern const u8 gUnknown_085A096C[];
 extern const struct RegionMapLocation gRegionMapEntries[];
-extern const u16 gUnknown_085A1B84[];
 extern const u16 gUnknown_085A1B24[][2];
+extern const u16 gUnknown_085A1B84[];
+extern const u16 gUnknown_085A1B8A[];
+extern const struct UCoords16 gUnknown_085A1BAC[];
 
 // .text
 
@@ -841,3 +843,29 @@ u16 sub_8123EB4(u16 mapSecId)
     }
     return mapSecId;
 }
+
+u16 sub_8123F04(void)
+{
+    s16 idx;
+
+    idx = VarGet(VAR_0x4037) - 1;
+    if (idx < 0 || idx > 15)
+    {
+        idx = 0;
+    }
+    return gUnknown_085A1B8A[idx];
+}
+
+void sub_8123F30(u16 *x, u16 *y)
+{
+    u16 idx;
+
+    idx = VarGet(VAR_0x4037);
+    if (idx < 9 || idx > 16)
+    {
+        idx = 9;
+    }
+    idx -= 9;
+    *x = gUnknown_085A1BAC[idx].x + MAPCURSOR_X_MIN;
+    *y = gUnknown_085A1BAC[idx].y + MAPCURSOR_Y_MIN;
+}
-- 
cgit v1.2.3


From 4db83e00971029fe97282496f76432e3c88d1ba7 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 22:20:09 -0400
Subject: through sub_8123F9C

---
 src/region_map.c | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index db41284af..a5a84a187 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -44,16 +44,15 @@ static u8 ProcessRegionMapInput_Full(void);
 static u8 MoveRegionMapCursor_Full(void);
 static u8 ProcessRegionMapInput_Zoomed(void);
 static u8 MoveRegionMapCursor_Zoomed(void);
-void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f, u8 rotation);
-void UpdateRegionMapVideoRegs(void);
+static void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f, u8 rotation);
 u16 GetRegionMapSectionIdAt(u16 x, u16 y);
-void sub_812378C(s16 x, s16 y);
+static void sub_812378C(s16 x, s16 y);
 static void sub_81238AC(void);
 static void sub_8123C00(void);
 static u8 get_flagnr_blue_points(u16 mapSecId);
 u16 sub_8123EB4(u16 mapSecId);
-u16 sub_8123F04(void);
-void sub_8123F30(u16 *x, u16 *y);
+static u16 sub_8123F04(void);
+static void sub_8123F30(u16 *x, u16 *y);
 void sub_8123FB0(void);
 bool32 sub_8123F74(u8 mapSecId);
 void sub_8124238(void);
@@ -73,6 +72,7 @@ extern const u16 gUnknown_085A1B24[][2];
 extern const u16 gUnknown_085A1B84[];
 extern const u16 gUnknown_085A1B8A[];
 extern const struct UCoords16 gUnknown_085A1BAC[];
+extern const u8 gUnknown_085A1BCC[];
 
 // .text
 
@@ -476,7 +476,7 @@ u8 sub_8123514(void)
     return r4;
 }
 
-void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f, u8 rotation)
+static void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f, u8 rotation)
 {
     s32 var1;
     s32 var2;
@@ -499,7 +499,7 @@ void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f,
     gRegionMap->needUpdateVideoRegs = TRUE;
 }
 
-void sub_812378C(s16 x, s16 y)
+static void sub_812378C(s16 x, s16 y)
 {
     gRegionMap->bg2x = (x << 8) + 0x1c00;
     gRegionMap->bg2y = (y << 8) + 0x2400;
@@ -844,7 +844,7 @@ u16 sub_8123EB4(u16 mapSecId)
     return mapSecId;
 }
 
-u16 sub_8123F04(void)
+static u16 sub_8123F04(void)
 {
     s16 idx;
 
@@ -856,7 +856,7 @@ u16 sub_8123F04(void)
     return gUnknown_085A1B8A[idx];
 }
 
-void sub_8123F30(u16 *x, u16 *y)
+static void sub_8123F30(u16 *x, u16 *y)
 {
     u16 idx;
 
@@ -869,3 +869,22 @@ void sub_8123F30(u16 *x, u16 *y)
     *x = gUnknown_085A1BAC[idx].x + MAPCURSOR_X_MIN;
     *y = gUnknown_085A1BAC[idx].y + MAPCURSOR_Y_MIN;
 }
+
+bool32 sub_8123F74(u8 mapSecId)
+{
+    int i;
+
+    for (i = 0; i == 0; i ++)
+    {
+        if (gUnknown_085A1BCC[i] == mapSecId)
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+u16 sub_8123F9C(u16 mapSecId)
+{
+    return sub_8123EB4(mapSecId);
+}
-- 
cgit v1.2.3


From 853ced668731a5107be87bbe69aa8d1891504865 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 30 Oct 2017 22:35:28 -0400
Subject: sub_8123FB0

---
 src/region_map.c | 81 +++++++++++++++++++++++++++++++++++++++++++++-----------
 src/tv.c         |  4 +--
 2 files changed, 67 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index a5a84a187..8e31168d6 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -53,8 +53,9 @@ static u8 get_flagnr_blue_points(u16 mapSecId);
 u16 sub_8123EB4(u16 mapSecId);
 static u16 sub_8123F04(void);
 static void sub_8123F30(u16 *x, u16 *y);
-void sub_8123FB0(void);
-bool32 sub_8123F74(u8 mapSecId);
+static bool32 sub_8123F74(u8 mapSecId);
+static void sub_8123FB0(void);
+bool8 sub_8124038(u16 y);
 void sub_8124238(void);
 void sub_81243B0(void);
 void sub_81243DC(void);
@@ -168,8 +169,8 @@ bool8 sub_8122DB0(void)
             {
                 gRegionMap->scrollX = gRegionMap->cursorPosX * 8 - 0x34;
                 gRegionMap->scrollY = gRegionMap->cursorPosY * 8 - 0x44;
-                gRegionMap->unk_064 = gRegionMap->cursorPosX;
-                gRegionMap->unk_066 = gRegionMap->cursorPosY;
+                gRegionMap->zoomedCursorPosX = gRegionMap->cursorPosX;
+                gRegionMap->zoomedCursorPosY = gRegionMap->cursorPosY;
                 CalcZoomScrollParams(gRegionMap->scrollX, gRegionMap->scrollY, 0x38, 0x48, 0x80, 0x80, 0);
             }
             break;
@@ -360,10 +361,10 @@ static u8 MoveRegionMapCursor_Zoomed(void)
     {
         x = (gRegionMap->scrollX + 0x2c) / 8 + 1;
         y = (gRegionMap->scrollY + 0x34) / 8 + 2;
-        if (x != gRegionMap->unk_064 || y != gRegionMap->unk_066)
+        if (x != gRegionMap->zoomedCursorPosX || y != gRegionMap->zoomedCursorPosY)
         {
-            gRegionMap->unk_064 = x;
-            gRegionMap->unk_066 = y;
+            gRegionMap->zoomedCursorPosX = x;
+            gRegionMap->zoomedCursorPosY = y;
             mapSecId = GetRegionMapSectionIdAt(x, y);
             gRegionMap->iconDrawType = get_flagnr_blue_points(mapSecId);
             if (mapSecId != gRegionMap->mapSecId)
@@ -392,8 +393,8 @@ void sub_8123418(void)
         gRegionMap->unk_062 = gRegionMap->cursorPosY * 8 - 0x44;
         gRegionMap->unk_044 = (gRegionMap->unk_060 << 8) / 16;
         gRegionMap->unk_048 = (gRegionMap->unk_062 << 8) / 16;
-        gRegionMap->unk_064 = gRegionMap->cursorPosX;
-        gRegionMap->unk_066 = gRegionMap->cursorPosY;
+        gRegionMap->zoomedCursorPosX = gRegionMap->cursorPosX;
+        gRegionMap->zoomedCursorPosY = gRegionMap->cursorPosY;
         gRegionMap->unk_04c = 0x10000;
         gRegionMap->unk_050 = -0x800;
     }
@@ -405,8 +406,8 @@ void sub_8123418(void)
         gRegionMap->unk_062 = 0;
         gRegionMap->unk_044 = -(gRegionMap->unk_03c / 16);
         gRegionMap->unk_048 = -(gRegionMap->unk_040 / 16);
-        gRegionMap->cursorPosX = gRegionMap->unk_064;
-        gRegionMap->cursorPosY = gRegionMap->unk_066;
+        gRegionMap->cursorPosX = gRegionMap->zoomedCursorPosX;
+        gRegionMap->cursorPosY = gRegionMap->zoomedCursorPosY;
         gRegionMap->unk_04c = 0x8000;
         gRegionMap->unk_050 = 0x800;
     }
@@ -537,7 +538,7 @@ u16 GetRegionMapSectionIdAt(u16 x, u16 y)
 {
     if (y < MAPCURSOR_Y_MIN || y > MAPCURSOR_Y_MAX || x < MAPCURSOR_X_MIN || x > MAPCURSOR_X_MAX)
     {
-        return MAPSEC_NONE2;
+        return MAPSEC_NONE;
     }
     y -= MAPCURSOR_Y_MIN;
     x -= MAPCURSOR_X_MIN;
@@ -617,7 +618,7 @@ static void sub_81238AC(void)
         case 8:
 
             gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
-            if (gRegionMap->mapSecId != MAPSEC_NONE)
+            if (gRegionMap->mapSecId != MAPSEC_UNK_0x57)
             {
                 r4 = &gSaveBlock1Ptr->warp4;
                 mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
@@ -775,7 +776,7 @@ static u8 get_flagnr_blue_points(u16 mapSecId)
 {
     switch (mapSecId)
     {
-        case MAPSEC_NONE2:
+        case MAPSEC_NONE:
             return MAPSECTYPE_NONE;
         case MAPSEC_LITTLEROOT_TOWN:
             return FlagGet(FLAG_VISITED_LITTLEROOT_TOWN) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
@@ -834,7 +835,7 @@ u16 sub_8123EB4(u16 mapSecId)
             return sub_8123F04();
         }
     }
-    for (i = 0; gUnknown_085A1B24[i][0] != MAPSEC_NONE2; i ++)
+    for (i = 0; gUnknown_085A1B24[i][0] != MAPSEC_NONE; i ++)
     {
         if (gUnknown_085A1B24[i][0] == mapSecId)
         {
@@ -870,7 +871,7 @@ static void sub_8123F30(u16 *x, u16 *y)
     *y = gUnknown_085A1BAC[idx].y + MAPCURSOR_Y_MIN;
 }
 
-bool32 sub_8123F74(u8 mapSecId)
+static bool32 sub_8123F74(u8 mapSecId)
 {
     int i;
 
@@ -888,3 +889,51 @@ u16 sub_8123F9C(u16 mapSecId)
 {
     return sub_8123EB4(mapSecId);
 }
+
+static void sub_8123FB0(void)
+{
+    u16 x;
+    u16 y;
+    u16 unk_003;
+
+    if (gRegionMap->mapSecId == MAPSEC_NONE)
+    {
+        gRegionMap->unk_003 = 0;
+        return;
+    }
+    if (!gRegionMap->zoomed)
+    {
+        x = gRegionMap->cursorPosX;
+        y = gRegionMap->cursorPosY;
+    }
+    else
+    {
+        x = gRegionMap->zoomedCursorPosX;
+        y = gRegionMap->zoomedCursorPosY;
+    }
+    unk_003 = 0;
+    while (1)
+    {
+        if (x <= MAPCURSOR_X_MIN)
+        {
+            if (sub_8124038(y))
+            {
+                y --;
+                x = MAPCURSOR_X_MAX + 1;
+            }
+            else
+            {
+                break;
+            }
+        }
+        else
+        {
+            x --;
+            if (GetRegionMapSectionIdAt(x, y) == gRegionMap->mapSecId)
+            {
+                unk_003 ++;
+            }
+        }
+    }
+    gRegionMap->unk_003 = unk_003;
+}
diff --git a/src/tv.c b/src/tv.c
index 305bfeda9..87aa6e01a 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -6435,7 +6435,7 @@ void DoTVShowTodaysRivalTrainer(void)
                 case MAPSEC_SECRET_BASE:
                     sTVShowState = 8;
                     break;
-                case MAPSEC_NONE:
+                case MAPSEC_UNK_0x57:
                     switch (show->rivalTrainer.mapDataId)
                     {
                         case 0x115 ... 0x117:
@@ -6633,7 +6633,7 @@ void DoTVShowHoennTreasureInvestigators(void)
     {
         case 0:
             StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name);
-            if (show->treasureInvestigators.location == MAPSEC_NONE)
+            if (show->treasureInvestigators.location == MAPSEC_UNK_0x57)
             {
                 switch (show->treasureInvestigators.mapDataId)
                 {
-- 
cgit v1.2.3


From 6cd0086bf95f570b2876961fdd71537a915ce897 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 08:38:17 -0400
Subject: through CreateRegionMapCursor

---
 src/region_map.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 8e31168d6..3c1731332 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -55,7 +55,7 @@ static u16 sub_8123F04(void);
 static void sub_8123F30(u16 *x, u16 *y);
 static bool32 sub_8123F74(u8 mapSecId);
 static void sub_8123FB0(void);
-bool8 sub_8124038(u16 y);
+static bool8 sub_8124038(u16 y);
 void sub_8124238(void);
 void sub_81243B0(void);
 void sub_81243DC(void);
@@ -74,6 +74,8 @@ extern const u16 gUnknown_085A1B84[];
 extern const u16 gUnknown_085A1B8A[];
 extern const struct UCoords16 gUnknown_085A1BAC[];
 extern const u8 gUnknown_085A1BCC[];
+extern const struct SpritePalette gUnknown_085A1C00;
+extern const struct SpriteTemplate gUnknown_085A1C08;
 
 // .text
 
@@ -937,3 +939,88 @@ static void sub_8123FB0(void)
     }
     gRegionMap->unk_003 = unk_003;
 }
+
+static bool8 sub_8124038(u16 y)
+{
+    u16 x;
+
+    if (y -- == 0)
+    {
+        return 0;
+    }
+    for (x = MAPCURSOR_X_MIN; x <= MAPCURSOR_X_MAX; x ++)
+    {
+        if (GetRegionMapSectionIdAt(x, y) == gRegionMap->mapSecId)
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static void sub_8124088(struct Sprite *sprite)
+{
+    if (gRegionMap->cursorMovementFrameCounter != 0)
+    {
+        sprite->pos1.x += 2 * gRegionMap->cursorDeltaX;
+        sprite->pos1.y += 2 * gRegionMap->cursorDeltaY;
+        gRegionMap->cursorMovementFrameCounter --;
+    }
+}
+
+static void TaskDummy8(struct Sprite *sprite)
+{
+
+}
+
+void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
+{
+    u8 spriteId;
+    struct SpriteTemplate template;
+    struct SpritePalette palette;
+    struct SpriteSheet sheet;
+
+    palette = gUnknown_085A1C00;
+    template = gUnknown_085A1C08;
+    sheet.tag = tileTag;
+    template.tileTag = tileTag;
+    gRegionMap->cursorTileTag = tileTag;
+    palette.tag = paletteTag;
+    template.paletteTag = paletteTag;
+    gRegionMap->cursorPaletteTag = paletteTag;
+    if (!gRegionMap->zoomed)
+    {
+        sheet.data = gRegionMap->cursorSmallImage;
+        sheet.size = sizeof(gRegionMap->cursorSmallImage);
+        template.callback = sub_8124088;
+    }
+    else
+    {
+        sheet.data = gRegionMap->cursorLargeImage;
+        sheet.size = sizeof(gRegionMap->cursorLargeImage);
+        template.callback = TaskDummy8;
+    }
+    LoadSpriteSheet(&sheet);
+    LoadSpritePalette(&palette);
+    spriteId = CreateSprite(&template, 0x38, 0x48, 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        gRegionMap->cursorSprite = &gSprites[spriteId];
+        if (gRegionMap->zoomed == TRUE)
+        {
+            gRegionMap->cursorSprite->oam.size = 2;
+            gRegionMap->cursorSprite->pos1.x -= 8;
+            gRegionMap->cursorSprite->pos1.y -= 8;
+            StartSpriteAnim(gRegionMap->cursorSprite, 1);
+        }
+        else
+        {
+            gRegionMap->cursorSprite->oam.size = 1;
+            gRegionMap->cursorSprite->pos1.x = 8 * gRegionMap->cursorPosX + 4;
+            gRegionMap->cursorSprite->pos1.y = 8 * gRegionMap->cursorPosY + 4;
+        }
+        gRegionMap->cursorSprite->data1 = 2;
+        gRegionMap->cursorSprite->data2 = (IndexOfSpritePaletteTag(paletteTag) << 4) + 0x101;
+        gRegionMap->cursorSprite->data3 = 1;
+    }
+}
-- 
cgit v1.2.3


From 9f03434a132cb47a1edde9d7df243c1875461a53 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 08:44:03 -0400
Subject: through sub_8124278

---
 src/region_map.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 3c1731332..5ebffc21f 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -56,7 +56,7 @@ static void sub_8123F30(u16 *x, u16 *y);
 static bool32 sub_8123F74(u8 mapSecId);
 static void sub_8123FB0(void);
 static bool8 sub_8124038(u16 y);
-void sub_8124238(void);
+static void sub_8124238(void);
 void sub_81243B0(void);
 void sub_81243DC(void);
 
@@ -1021,6 +1021,26 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
         }
         gRegionMap->cursorSprite->data1 = 2;
         gRegionMap->cursorSprite->data2 = (IndexOfSpritePaletteTag(paletteTag) << 4) + 0x101;
-        gRegionMap->cursorSprite->data3 = 1;
+        gRegionMap->cursorSprite->data3 = TRUE;
     }
 }
+
+static void sub_8124238(void)
+{
+    if (gRegionMap->cursorSprite != NULL)
+    {
+        DestroySprite(gRegionMap->cursorSprite);
+        FreeSpriteTilesByTag(gRegionMap->cursorTileTag);
+        FreeSpritePaletteByTag(gRegionMap->cursorPaletteTag);
+    }
+}
+
+void sub_8124268(void)
+{
+    gRegionMap->cursorSprite->data3 = TRUE;
+}
+
+void sub_8124278(void)
+{
+    gRegionMap->cursorSprite->data3 = FALSE;
+}
-- 
cgit v1.2.3


From 7d7c8e8ba67801381e6bc49026f97231777b22f5 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 19:40:35 -0400
Subject: sub_8124288

---
 src/region_map.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 5ebffc21f..241cb1b15 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -59,6 +59,8 @@ static bool8 sub_8124038(u16 y);
 static void sub_8124238(void);
 void sub_81243B0(void);
 void sub_81243DC(void);
+void sub_812445C(struct Sprite *sprite);
+void sub_81244EC(struct Sprite *sprite);
 
 // .rodata
 
@@ -69,6 +71,10 @@ extern const u8 gUnknown_0859F77C[];
 extern const u8 gUnknown_085A04E0[];
 extern const u8 gUnknown_085A096C[];
 extern const struct RegionMapLocation gRegionMapEntries[];
+extern const u8 gUnknown_085A084C[];
+extern const u16 gUnknown_085A082C[];
+extern const u16 gUnknown_085A08CC[];
+extern const u8 gUnknown_085A08EC[];
 extern const u16 gUnknown_085A1B24[][2];
 extern const u16 gUnknown_085A1B84[];
 extern const u16 gUnknown_085A1B8A[];
@@ -76,6 +82,8 @@ extern const struct UCoords16 gUnknown_085A1BAC[];
 extern const u8 gUnknown_085A1BCC[];
 extern const struct SpritePalette gUnknown_085A1C00;
 extern const struct SpriteTemplate gUnknown_085A1C08;
+extern const struct OamData gUnknown_085A1C20;
+extern const union AnimCmd *const gUnknown_085A1C30[];
 
 // .text
 
@@ -111,8 +119,8 @@ void sub_8122D88(struct RegionMap *regionMap)
 {
     gRegionMap = regionMap;
     sub_81238AC();
-    gRegionMap->unk_074 = gRegionMap->cursorPosX;
-    gRegionMap->unk_076 = gRegionMap->cursorPosY;
+    gRegionMap->playerIconSpritePosX = gRegionMap->cursorPosX;
+    gRegionMap->playerIconSpritePosY = gRegionMap->cursorPosY;
 }
 
 bool8 sub_8122DB0(void)
@@ -156,8 +164,8 @@ bool8 sub_8122DB0(void)
             break;
         case 5:
             sub_81238AC();
-            gRegionMap->unk_074 = gRegionMap->cursorPosX;
-            gRegionMap->unk_076 = gRegionMap->cursorPosY;
+            gRegionMap->playerIconSpritePosX = gRegionMap->cursorPosX;
+            gRegionMap->playerIconSpritePosY = gRegionMap->cursorPosY;
             gRegionMap->mapSecId = sub_8123EB4(gRegionMap->mapSecId);
             gRegionMap->iconDrawType = get_flagnr_blue_points(gRegionMap->mapSecId);
             GetMapName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
@@ -1044,3 +1052,38 @@ void sub_8124278(void)
 {
     gRegionMap->cursorSprite->data3 = FALSE;
 }
+
+void sub_8124288(u16 tileTag, u16 paletteTag)
+{
+    u8 spriteId;
+    struct SpriteSheet sheet = {gUnknown_085A084C, 0x80, tileTag};
+    struct SpritePalette palette = {gUnknown_085A082C, paletteTag};
+    struct SpriteTemplate template = {tileTag, paletteTag, &gUnknown_085A1C20, gUnknown_085A1C30, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
+
+    if (sub_8124668(gMapHeader.regionMapSectionId))
+    {
+        gRegionMap->playerIconSprite = NULL;
+        return;
+    }
+    if (gSaveBlock2Ptr->playerGender == FEMALE)
+    {
+        sheet.data = gUnknown_085A08EC;
+        palette.data = gUnknown_085A08CC;
+    }
+    LoadSpriteSheet(&sheet);
+    LoadSpritePalette(&palette);
+    spriteId = CreateSprite(&template, 0, 0, 1);
+    gRegionMap->playerIconSprite = &gSprites[spriteId];
+    if (!gRegionMap->zoomed)
+    {
+        gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 8 + 4;
+        gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 8 + 4;
+        gRegionMap->playerIconSprite->callback = sub_81244EC;
+    }
+    else
+    {
+        gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 16 - 0x30;
+        gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 16 - 0x42;
+        gRegionMap->playerIconSprite->callback = sub_812445C;
+    }
+}
-- 
cgit v1.2.3


From 968ff8c3c8d6b5ee4b5af4b60489d8bf42bfd56f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 20:58:47 -0400
Subject: through UnhideRegionMapPlayerIcon

---
 src/field_region_map.c |  70 +++++++++++-----------
 src/region_map.c       | 158 +++++++++++++++++++++++++++++--------------------
 2 files changed, 130 insertions(+), 98 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 6c483c6b6..776ca6934 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -23,15 +23,15 @@ static EWRAM_DATA struct {
     u32 filler_004;
     struct RegionMap regionMap;
     u16 state;
-} *gUnknown_0203BCD0 = NULL;
+} *sFieldRegionMapHandler = NULL;
 
 // Static ROM declarations
 
-static void sub_81701C4(void);
-static void sub_8170260(void);
-static void sub_8170274(void);
-static void sub_8170290(void);
-static void sub_8170428(void);
+static void MCB2_InitRegionMapRegisters(void);
+static void VBCB_FieldUpdateRegionMap(void);
+static void MCB2_FieldUpdateRegionMap(void);
+static void FieldUpdateRegionMap(void);
+static void PrintRegionMapSecName(void);
 
 // .rodata
 
@@ -68,13 +68,13 @@ static const struct WindowTemplate gUnknown_085E5070[] = {
 void sub_817018C(MainCallback callback)
 {
     SetVBlankCallback(NULL);
-    gUnknown_0203BCD0 = malloc(sizeof(*gUnknown_0203BCD0));
-    gUnknown_0203BCD0->state = 0;
-    gUnknown_0203BCD0->callback = callback;
-    SetMainCallback2(sub_81701C4);
+    sFieldRegionMapHandler = malloc(sizeof(*sFieldRegionMapHandler));
+    sFieldRegionMapHandler->state = 0;
+    sFieldRegionMapHandler->callback = callback;
+    SetMainCallback2(MCB2_InitRegionMapRegisters);
 }
 
-static void sub_81701C4(void)
+static void MCB2_InitRegionMapRegisters(void)
 {
     SetGpuReg(REG_OFFSET_DISPCNT, 0);
     SetGpuReg(REG_OFFSET_BG0HOFS, 0);
@@ -93,37 +93,37 @@ static void sub_81701C4(void)
     DeactivateAllTextPrinters();
     sub_809882C(0, 0x27, 0xd0);
     clear_scheduled_bg_copies_to_vram();
-    SetMainCallback2(sub_8170274);
-    SetVBlankCallback(sub_8170260);
+    SetMainCallback2(MCB2_FieldUpdateRegionMap);
+    SetVBlankCallback(VBCB_FieldUpdateRegionMap);
 }
 
-static void sub_8170260(void)
+static void VBCB_FieldUpdateRegionMap(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-static void sub_8170274(void)
+static void MCB2_FieldUpdateRegionMap(void)
 {
-    sub_8170290();
+    FieldUpdateRegionMap();
     AnimateSprites();
     BuildOamBuffer();
     UpdatePaletteFade();
     do_scheduled_bg_tilemap_copies_to_vram();
 }
 
-void sub_8170290(void)
+static void FieldUpdateRegionMap(void)
 {
     u8 offset;
 
-    switch (gUnknown_0203BCD0->state)
+    switch (sFieldRegionMapHandler->state)
     {
         case 0:
-            InitRegionMap(&gUnknown_0203BCD0->regionMap, 0);
-            sub_8124288(0, 0);
+            InitRegionMap(&sFieldRegionMapHandler->regionMap, 0);
+            CreateRegionMapPlayerIcon(0, 0);
             CreateRegionMapCursor(1, 1);
-            gUnknown_0203BCD0->state ++;
+            sFieldRegionMapHandler->state ++;
             break;
         case 1:
             SetWindowBorderStyle(1, 0, 0x27, 0xd);
@@ -131,47 +131,47 @@ void sub_8170290(void)
             PrintTextOnWindow(1, 1, gText_Hoenn, offset, 1, 0, NULL);
             schedule_bg_copy_tilemap_to_vram(0);
             SetWindowBorderStyle(0, 0, 0x27, 0xd);
-            sub_8170428();
+            PrintRegionMapSecName();
             BeginNormalPaletteFade(-1, 0, 16, 0, 0);
-            gUnknown_0203BCD0->state ++;
+            sFieldRegionMapHandler->state ++;
             break;
         case 2:
             SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
             ShowBg(0);
             ShowBg(2);
-            gUnknown_0203BCD0->state ++;
+            sFieldRegionMapHandler->state ++;
             break;
         case 3:
             if (!gPaletteFade.active)
             {
-                gUnknown_0203BCD0->state ++;
+                sFieldRegionMapHandler->state ++;
             }
             break;
         case 4:
             switch (sub_81230AC())
             {
                 case INPUT_EVENT_MOVE_END:
-                    sub_8170428();
+                    PrintRegionMapSecName();
                     break;
                 case INPUT_EVENT_A_BUTTON:
                 case INPUT_EVENT_B_BUTTON:
-                    gUnknown_0203BCD0->state ++;
+                    sFieldRegionMapHandler->state ++;
                     break;
             }
             break;
         case 5:
             BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-            gUnknown_0203BCD0->state ++;
+            sFieldRegionMapHandler->state ++;
             break;
         case 6:
             if (!gPaletteFade.active)
             {
                 FreeRegionMapIconResources();
-                SetMainCallback2(gUnknown_0203BCD0->callback);
-                if (gUnknown_0203BCD0 != NULL)
+                SetMainCallback2(sFieldRegionMapHandler->callback);
+                if (sFieldRegionMapHandler != NULL)
                 {
-                    free(gUnknown_0203BCD0);
-                    gUnknown_0203BCD0 = NULL;
+                    free(sFieldRegionMapHandler);
+                    sFieldRegionMapHandler = NULL;
                 }
                 FreeAllWindowBuffers();
             }
@@ -179,12 +179,12 @@ void sub_8170290(void)
     }
 }
 
-static void sub_8170428(void)
+static void PrintRegionMapSecName(void)
 {
-    if (gUnknown_0203BCD0->regionMap.iconDrawType != 0)
+    if (sFieldRegionMapHandler->regionMap.iconDrawType != MAPSECTYPE_NONE)
     {
         FillWindowPixelBuffer(0, 0x11);
-        PrintTextOnWindow(0, 1, gUnknown_0203BCD0->regionMap.mapSecName, 0, 1, 0, NULL);
+        PrintTextOnWindow(0, 1, sFieldRegionMapHandler->regionMap.mapSecName, 0, 1, 0, NULL);
         schedule_bg_copy_tilemap_to_vram(0);
     }
     else
diff --git a/src/region_map.c b/src/region_map.c
index 241cb1b15..78bcfb563 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -45,20 +45,20 @@ static u8 MoveRegionMapCursor_Full(void);
 static u8 ProcessRegionMapInput_Zoomed(void);
 static u8 MoveRegionMapCursor_Zoomed(void);
 static void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f, u8 rotation);
-u16 GetRegionMapSectionIdAt(u16 x, u16 y);
-static void sub_812378C(s16 x, s16 y);
-static void sub_81238AC(void);
-static void sub_8123C00(void);
+static u16 GetRegionMapSectionIdAt_Internal(u16 x, u16 y);
+static void RegionMap_SetBG2XAndBG2Y(s16 x, s16 y);
+static void RegionMap_InitializeStateBasedOnPlayerLocation(void);
+static void RegionMap_InitializeStateBasedOnSSTidalLocation(void);
 static u8 get_flagnr_blue_points(u16 mapSecId);
-u16 sub_8123EB4(u16 mapSecId);
-static u16 sub_8123F04(void);
-static void sub_8123F30(u16 *x, u16 *y);
-static bool32 sub_8123F74(u8 mapSecId);
-static void sub_8123FB0(void);
-static bool8 sub_8124038(u16 y);
-static void sub_8124238(void);
-void sub_81243B0(void);
-void sub_81243DC(void);
+static u16 CorrectSpecialMapSecId_Internal(u16 mapSecId);
+static u16 RegionMap_GetTerraCaveMapSecId(void);
+static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y);
+static bool32 RegionMap_IsPlayerInCave(u8 mapSecId);
+static void RegionMap_GetPositionOfCursorWithinMapSection(void);
+static bool8 RegionMap_IsMapSecIdInNextRow(u16 y);
+static void FreeRegionMapCursorSprite(void);
+static void HideRegionMapPlayerIcon(void);
+static void UnhideRegionMapPlayerIcon(void);
 void sub_812445C(struct Sprite *sprite);
 void sub_81244EC(struct Sprite *sprite);
 
@@ -118,7 +118,7 @@ void sub_8122CF8(struct RegionMap *regionMap, struct BgTemplate *template, bool8
 void sub_8122D88(struct RegionMap *regionMap)
 {
     gRegionMap = regionMap;
-    sub_81238AC();
+    RegionMap_InitializeStateBasedOnPlayerLocation();
     gRegionMap->playerIconSpritePosX = gRegionMap->cursorPosX;
     gRegionMap->playerIconSpritePosY = gRegionMap->cursorPosY;
 }
@@ -163,10 +163,10 @@ bool8 sub_8122DB0(void)
             LZ77UnCompWram(gUnknown_0859F650, gRegionMap->cursorLargeImage);
             break;
         case 5:
-            sub_81238AC();
+            RegionMap_InitializeStateBasedOnPlayerLocation();
             gRegionMap->playerIconSpritePosX = gRegionMap->cursorPosX;
             gRegionMap->playerIconSpritePosY = gRegionMap->cursorPosY;
-            gRegionMap->mapSecId = sub_8123EB4(gRegionMap->mapSecId);
+            gRegionMap->mapSecId = CorrectSpecialMapSecId_Internal(gRegionMap->mapSecId);
             gRegionMap->iconDrawType = get_flagnr_blue_points(gRegionMap->mapSecId);
             GetMapName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
             break;
@@ -185,7 +185,7 @@ bool8 sub_8122DB0(void)
             }
             break;
         case 7:
-            sub_8123FB0();
+            RegionMap_GetPositionOfCursorWithinMapSection();
             UpdateRegionMapVideoRegs();
             gRegionMap->cursorSprite = NULL;
             gRegionMap->playerIconSprite = NULL;
@@ -302,14 +302,14 @@ static u8 MoveRegionMapCursor_Full(void)
     {
         gRegionMap->cursorPosY --;
     }
-    mapSecId = GetRegionMapSectionIdAt(gRegionMap->cursorPosX, gRegionMap->cursorPosY);
+    mapSecId = GetRegionMapSectionIdAt_Internal(gRegionMap->cursorPosX, gRegionMap->cursorPosY);
     gRegionMap->iconDrawType = get_flagnr_blue_points(mapSecId);
     if (mapSecId != gRegionMap->mapSecId)
     {
         gRegionMap->mapSecId = mapSecId;
         GetMapName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
     }
-    sub_8123FB0();
+    RegionMap_GetPositionOfCursorWithinMapSection();
     gRegionMap->inputCallback = ProcessRegionMapInput_Full;
     return INPUT_EVENT_MOVE_END;
 }
@@ -365,7 +365,7 @@ static u8 MoveRegionMapCursor_Zoomed(void)
 
     gRegionMap->scrollY += gRegionMap->zoomedCursorDeltaY;
     gRegionMap->scrollX += gRegionMap->zoomedCursorDeltaX;
-    sub_812378C(gRegionMap->scrollX, gRegionMap->scrollY);
+    RegionMap_SetBG2XAndBG2Y(gRegionMap->scrollX, gRegionMap->scrollY);
     gRegionMap->zoomedCursorMovementFrameCounter ++;
     if (gRegionMap->zoomedCursorMovementFrameCounter == 8)
     {
@@ -375,14 +375,14 @@ static u8 MoveRegionMapCursor_Zoomed(void)
         {
             gRegionMap->zoomedCursorPosX = x;
             gRegionMap->zoomedCursorPosY = y;
-            mapSecId = GetRegionMapSectionIdAt(x, y);
+            mapSecId = GetRegionMapSectionIdAt_Internal(x, y);
             gRegionMap->iconDrawType = get_flagnr_blue_points(mapSecId);
             if (mapSecId != gRegionMap->mapSecId)
             {
                 gRegionMap->mapSecId = mapSecId;
                 GetMapName(gRegionMap->mapSecName, gRegionMap->mapSecId, 16);
             }
-            sub_8123FB0();
+            RegionMap_GetPositionOfCursorWithinMapSection();
         }
         gRegionMap->zoomedCursorMovementFrameCounter = 0;
         gRegionMap->inputCallback = ProcessRegionMapInput_Zoomed;
@@ -422,13 +422,13 @@ void sub_8123418(void)
         gRegionMap->unk_050 = 0x800;
     }
     gRegionMap->unk_06e = 0;
-    sub_8124238();
-    sub_81243B0();
+    FreeRegionMapCursorSprite();
+    HideRegionMapPlayerIcon();
 }
 
-u8 sub_8123514(void)
+bool8 sub_8123514(void)
 {
-    u8 r4;
+    bool8 r4;
 
     if (gRegionMap->unk_06e >= 16)
     {
@@ -445,8 +445,8 @@ u8 sub_8123514(void)
         gRegionMap->zoomed = !gRegionMap->zoomed;
         gRegionMap->inputCallback = (gRegionMap->zoomed == FALSE) ? ProcessRegionMapInput_Full : ProcessRegionMapInput_Zoomed;
         CreateRegionMapCursor(gRegionMap->cursorTileTag, gRegionMap->cursorPaletteTag);
-        sub_81243DC();
-        r4 = 0;
+        UnhideRegionMapPlayerIcon();
+        r4 = FALSE;
     }
     else
     {
@@ -481,7 +481,7 @@ u8 sub_8123514(void)
                 gRegionMap->unk_050 = 0;
             }
         }
-        r4 = 1;
+        r4 = TRUE;
     }
     CalcZoomScrollParams(gRegionMap->scrollX, gRegionMap->scrollY, 0x38, 0x48, gRegionMap->unk_04c >> 8, gRegionMap->unk_04c >> 8, 0);
     return r4;
@@ -510,7 +510,7 @@ static void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e,
     gRegionMap->needUpdateVideoRegs = TRUE;
 }
 
-static void sub_812378C(s16 x, s16 y)
+static void RegionMap_SetBG2XAndBG2Y(s16 x, s16 y)
 {
     gRegionMap->bg2x = (x << 8) + 0x1c00;
     gRegionMap->bg2y = (y << 8) + 0x2400;
@@ -533,7 +533,7 @@ void UpdateRegionMapVideoRegs(void)
     }
 }
 
-void sub_8123824(s16 x, s16 y)
+void PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(s16 x, s16 y)
 {
     CalcZoomScrollParams(x, y, 0x38, 0x48, 0x100, 0x100, 0);
     UpdateRegionMapVideoRegs();
@@ -544,7 +544,7 @@ void sub_8123824(s16 x, s16 y)
     }
 }
 
-u16 GetRegionMapSectionIdAt(u16 x, u16 y)
+static u16 GetRegionMapSectionIdAt_Internal(u16 x, u16 y)
 {
     if (y < MAPCURSOR_Y_MIN || y > MAPCURSOR_Y_MAX || x < MAPCURSOR_X_MIN || x > MAPCURSOR_X_MAX)
     {
@@ -555,7 +555,7 @@ u16 GetRegionMapSectionIdAt(u16 x, u16 y)
     return gUnknown_085A096C[x + y * MAP_WIDTH];
 }
 
-static void sub_81238AC(void)
+static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
 {
     const struct MapHeader *mapHeader;
     u16 mapWidth;
@@ -571,7 +571,7 @@ static void sub_81238AC(void)
             || gSaveBlock1Ptr->location.mapNum == MAP_ID_SS_TIDAL_LOWER_DECK
             || gSaveBlock1Ptr->location.mapNum == MAP_ID_SS_TIDAL_ROOMS))
     {
-        sub_8123C00();
+        RegionMap_InitializeStateBasedOnSSTidalLocation();
         return;
     }
 
@@ -639,7 +639,7 @@ static void sub_81238AC(void)
                 mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
                 gRegionMap->mapSecId = mapHeader->regionMapSectionId;
             }
-            if (sub_8123F74(gRegionMap->mapSecId))
+            if (RegionMap_IsPlayerInCave(gRegionMap->mapSecId))
             {
                 gRegionMap->playerIsInCave = TRUE;
             }
@@ -723,14 +723,14 @@ static void sub_81238AC(void)
             }
             break;
         case MAPSEC_UNDERWATER_MARINE_CAVE:
-            sub_8123F30(&gRegionMap->cursorPosX, &gRegionMap->cursorPosY);
+            RegionMap_GetMarineCaveCoords(&gRegionMap->cursorPosX, &gRegionMap->cursorPosY);
             return;
     }
     gRegionMap->cursorPosX = gRegionMapEntries[gRegionMap->mapSecId].x + x + MAPCURSOR_X_MIN;
     gRegionMap->cursorPosY = gRegionMapEntries[gRegionMap->mapSecId].y + y + MAPCURSOR_Y_MIN;
 }
 
-static void sub_8123C00(void)
+static void RegionMap_InitializeStateBasedOnSSTidalLocation(void)
 {
     u16 y;
     u16 x;
@@ -829,12 +829,12 @@ static u8 get_flagnr_blue_points(u16 mapSecId)
     }
 }
 
-u16 sub_8123E9C(u16 x, u16 y)
+u16 GetRegionMapSectionIdAt(u16 x, u16 y)
 {
-    return GetRegionMapSectionIdAt(x, y);
+    return GetRegionMapSectionIdAt_Internal(x, y);
 }
 
-u16 sub_8123EB4(u16 mapSecId)
+static u16 CorrectSpecialMapSecId_Internal(u16 mapSecId)
 {
     u32 i;
 
@@ -842,7 +842,7 @@ u16 sub_8123EB4(u16 mapSecId)
     {
         if (gUnknown_085A1B84[i] == mapSecId)
         {
-            return sub_8123F04();
+            return RegionMap_GetTerraCaveMapSecId();
         }
     }
     for (i = 0; gUnknown_085A1B24[i][0] != MAPSEC_NONE; i ++)
@@ -855,7 +855,7 @@ u16 sub_8123EB4(u16 mapSecId)
     return mapSecId;
 }
 
-static u16 sub_8123F04(void)
+static u16 RegionMap_GetTerraCaveMapSecId(void)
 {
     s16 idx;
 
@@ -867,7 +867,7 @@ static u16 sub_8123F04(void)
     return gUnknown_085A1B8A[idx];
 }
 
-static void sub_8123F30(u16 *x, u16 *y)
+static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y)
 {
     u16 idx;
 
@@ -881,7 +881,7 @@ static void sub_8123F30(u16 *x, u16 *y)
     *y = gUnknown_085A1BAC[idx].y + MAPCURSOR_Y_MIN;
 }
 
-static bool32 sub_8123F74(u8 mapSecId)
+static bool32 RegionMap_IsPlayerInCave(u8 mapSecId)
 {
     int i;
 
@@ -895,20 +895,20 @@ static bool32 sub_8123F74(u8 mapSecId)
     return FALSE;
 }
 
-u16 sub_8123F9C(u16 mapSecId)
+u16 CorrectSpecialMapSecId(u16 mapSecId)
 {
-    return sub_8123EB4(mapSecId);
+    return CorrectSpecialMapSecId_Internal(mapSecId);
 }
 
-static void sub_8123FB0(void)
+static void RegionMap_GetPositionOfCursorWithinMapSection(void)
 {
     u16 x;
     u16 y;
-    u16 unk_003;
+    u16 posWithinMapSec;
 
     if (gRegionMap->mapSecId == MAPSEC_NONE)
     {
-        gRegionMap->unk_003 = 0;
+        gRegionMap->posWithinMapSec = 0;
         return;
     }
     if (!gRegionMap->zoomed)
@@ -921,12 +921,12 @@ static void sub_8123FB0(void)
         x = gRegionMap->zoomedCursorPosX;
         y = gRegionMap->zoomedCursorPosY;
     }
-    unk_003 = 0;
+    posWithinMapSec = 0;
     while (1)
     {
         if (x <= MAPCURSOR_X_MIN)
         {
-            if (sub_8124038(y))
+            if (RegionMap_IsMapSecIdInNextRow(y))
             {
                 y --;
                 x = MAPCURSOR_X_MAX + 1;
@@ -939,26 +939,26 @@ static void sub_8123FB0(void)
         else
         {
             x --;
-            if (GetRegionMapSectionIdAt(x, y) == gRegionMap->mapSecId)
+            if (GetRegionMapSectionIdAt_Internal(x, y) == gRegionMap->mapSecId)
             {
-                unk_003 ++;
+                posWithinMapSec ++;
             }
         }
     }
-    gRegionMap->unk_003 = unk_003;
+    gRegionMap->posWithinMapSec = posWithinMapSec;
 }
 
-static bool8 sub_8124038(u16 y)
+static bool8 RegionMap_IsMapSecIdInNextRow(u16 y)
 {
     u16 x;
 
     if (y -- == 0)
     {
-        return 0;
+        return FALSE;
     }
     for (x = MAPCURSOR_X_MIN; x <= MAPCURSOR_X_MAX; x ++)
     {
-        if (GetRegionMapSectionIdAt(x, y) == gRegionMap->mapSecId)
+        if (GetRegionMapSectionIdAt_Internal(x, y) == gRegionMap->mapSecId)
         {
             return TRUE;
         }
@@ -966,7 +966,7 @@ static bool8 sub_8124038(u16 y)
     return FALSE;
 }
 
-static void sub_8124088(struct Sprite *sprite)
+static void SpriteCallback_CursorFull(struct Sprite *sprite)
 {
     if (gRegionMap->cursorMovementFrameCounter != 0)
     {
@@ -976,7 +976,7 @@ static void sub_8124088(struct Sprite *sprite)
     }
 }
 
-static void TaskDummy8(struct Sprite *sprite)
+static void SpriteCallback_CursorZoomed(struct Sprite *sprite)
 {
 
 }
@@ -1000,13 +1000,13 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
     {
         sheet.data = gRegionMap->cursorSmallImage;
         sheet.size = sizeof(gRegionMap->cursorSmallImage);
-        template.callback = sub_8124088;
+        template.callback = SpriteCallback_CursorFull;
     }
     else
     {
         sheet.data = gRegionMap->cursorLargeImage;
         sheet.size = sizeof(gRegionMap->cursorLargeImage);
-        template.callback = TaskDummy8;
+        template.callback = SpriteCallback_CursorZoomed;
     }
     LoadSpriteSheet(&sheet);
     LoadSpritePalette(&palette);
@@ -1033,7 +1033,7 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
     }
 }
 
-static void sub_8124238(void)
+static void FreeRegionMapCursorSprite(void)
 {
     if (gRegionMap->cursorSprite != NULL)
     {
@@ -1053,7 +1053,7 @@ void sub_8124278(void)
     gRegionMap->cursorSprite->data3 = FALSE;
 }
 
-void sub_8124288(u16 tileTag, u16 paletteTag)
+void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
 {
     u8 spriteId;
     struct SpriteSheet sheet = {gUnknown_085A084C, 0x80, tileTag};
@@ -1087,3 +1087,35 @@ void sub_8124288(u16 tileTag, u16 paletteTag)
         gRegionMap->playerIconSprite->callback = sub_812445C;
     }
 }
+
+static void HideRegionMapPlayerIcon(void)
+{
+    if (gRegionMap->playerIconSprite != NULL)
+    {
+        gRegionMap->playerIconSprite->invisible = TRUE;
+        gRegionMap->playerIconSprite->callback = SpriteCallbackDummy;
+    }
+}
+
+static void UnhideRegionMapPlayerIcon(void)
+{
+    if (gRegionMap->playerIconSprite != NULL)
+    {
+        if (gRegionMap->zoomed == TRUE)
+        {
+            gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 16 - 0x30;
+            gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 16 - 0x42;
+            gRegionMap->playerIconSprite->callback = sub_812445C;
+            gRegionMap->playerIconSprite->invisible = FALSE;
+        }
+        else
+        {
+            gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 8 + 4;
+            gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 8 + 4;
+            gRegionMap->playerIconSprite->pos2.x = 0;
+            gRegionMap->playerIconSprite->pos2.y = 0;
+            gRegionMap->playerIconSprite->callback = sub_81244EC;
+            gRegionMap->playerIconSprite->invisible = FALSE;
+        }
+    }
+}
-- 
cgit v1.2.3


From 2f1325416b4d9d67767c35e710e6b6102ade3cd1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 21:32:25 -0400
Subject: through RegionMapPlayerIconSpriteCallback

---
 src/region_map.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 78bcfb563..9e76b43c1 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -59,8 +59,9 @@ static bool8 RegionMap_IsMapSecIdInNextRow(u16 y);
 static void FreeRegionMapCursorSprite(void);
 static void HideRegionMapPlayerIcon(void);
 static void UnhideRegionMapPlayerIcon(void);
-void sub_812445C(struct Sprite *sprite);
-void sub_81244EC(struct Sprite *sprite);
+static void RegionMapPlayerIconSpriteCallback_Zoomed(struct Sprite *sprite);
+static void RegionMapPlayerIconSpriteCallback_Full(struct Sprite *sprite);
+static void RegionMapPlayerIconSpriteCallback(struct Sprite *sprite);
 
 // .rodata
 
@@ -1078,13 +1079,13 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
     {
         gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 8 + 4;
         gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 8 + 4;
-        gRegionMap->playerIconSprite->callback = sub_81244EC;
+        gRegionMap->playerIconSprite->callback = RegionMapPlayerIconSpriteCallback_Full;
     }
     else
     {
         gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 16 - 0x30;
         gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 16 - 0x42;
-        gRegionMap->playerIconSprite->callback = sub_812445C;
+        gRegionMap->playerIconSprite->callback = RegionMapPlayerIconSpriteCallback_Zoomed;
     }
 }
 
@@ -1105,7 +1106,7 @@ static void UnhideRegionMapPlayerIcon(void)
         {
             gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 16 - 0x30;
             gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 16 - 0x42;
-            gRegionMap->playerIconSprite->callback = sub_812445C;
+            gRegionMap->playerIconSprite->callback = RegionMapPlayerIconSpriteCallback_Zoomed;
             gRegionMap->playerIconSprite->invisible = FALSE;
         }
         else
@@ -1114,8 +1115,53 @@ static void UnhideRegionMapPlayerIcon(void)
             gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 8 + 4;
             gRegionMap->playerIconSprite->pos2.x = 0;
             gRegionMap->playerIconSprite->pos2.y = 0;
-            gRegionMap->playerIconSprite->callback = sub_81244EC;
+            gRegionMap->playerIconSprite->callback = RegionMapPlayerIconSpriteCallback_Full;
             gRegionMap->playerIconSprite->invisible = FALSE;
         }
     }
 }
+
+static void RegionMapPlayerIconSpriteCallback_Zoomed(struct Sprite *sprite)
+{
+    sprite->pos2.x = -2 * gRegionMap->scrollX;
+    sprite->pos2.y = -2 * gRegionMap->scrollY;
+    sprite->data0 = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+    sprite->data1 = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
+    if (sprite->data0 < -8 || sprite->data0 > 0xa8 || sprite->data1 < -8 || sprite->data1 > 0xf8)
+    {
+        sprite->data2 = FALSE;
+    }
+    else
+    {
+        sprite->data2 = TRUE;
+    }
+    if (sprite->data2 == TRUE)
+    {
+        RegionMapPlayerIconSpriteCallback(sprite);
+    }
+    else
+    {
+        sprite->invisible = TRUE;
+    }
+}
+
+static void RegionMapPlayerIconSpriteCallback_Full(struct Sprite *sprite)
+{
+    RegionMapPlayerIconSpriteCallback(sprite);
+}
+
+static void RegionMapPlayerIconSpriteCallback(struct Sprite *sprite)
+{
+    if (gRegionMap->blinkPlayerIcon)
+    {
+        if (++ sprite->data7 > 16)
+        {
+            sprite->data7 = 0;
+            sprite->invisible = sprite->invisible ? FALSE : TRUE;
+        }
+    }
+    else
+    {
+        sprite->invisible = FALSE;
+    }
+}
-- 
cgit v1.2.3


From ef535b98b5e1384ce5f663a4ab4dfcb003fbe1c7 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 21:51:11 -0400
Subject: through GetMapName

---
 src/region_map.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 9e76b43c1..5284922cc 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -11,6 +11,9 @@
 #include "flags.h"
 #include "event_data.h"
 #include "rom6.h"
+#include "secret_base.h"
+#include "string_util.h"
+#include "text.h"
 #include "region_map.h"
 
 #define MAP_WIDTH 28
@@ -30,7 +33,7 @@ struct RegionMapLocation
 {
     u8 x, y;
     u8 width, height;
-    const u8 *regionMapSectionId;
+    const u8 *name;
 };
 
 // Static RAM declarations
@@ -1165,3 +1168,43 @@ static void RegionMapPlayerIconSpriteCallback(struct Sprite *sprite)
         sprite->invisible = FALSE;
     }
 }
+
+void sub_812454C(void)
+{
+    if (gRegionMap->playerIsInCave)
+    {
+        gRegionMap->blinkPlayerIcon = TRUE;
+    }
+}
+
+u8 *GetMapName(u8 *dest, u16 regionMapId, u16 padLength)
+{
+    u8 *str;
+    u16 i;
+
+    if (regionMapId == MAPSEC_SECRET_BASE)
+    {
+        str = GetSecretBaseMapName(dest);
+    }
+    else if (regionMapId < MAPSEC_NONE)
+    {
+        str = StringCopy(dest, gRegionMapEntries[regionMapId].name);
+    }
+    else
+    {
+        if (padLength == 0)
+        {
+            padLength = 18;
+        }
+        return StringFill(dest, CHAR_SPACE, padLength);
+    }
+    if (padLength != 0)
+    {
+        for (i = str - dest; i < padLength; i ++)
+        {
+            *str++ = CHAR_SPACE;
+        }
+        *str = EOS;
+    }
+    return str;
+}
-- 
cgit v1.2.3


From c3c08bf0379e172b8d7dd1b233947ebca83a3c3c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 21:55:57 -0400
Subject: through sub_8124610

---
 src/region_map.c | 28 +++++++++++++++++++++++++++-
 src/tv.c         |  4 ++--
 2 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 5284922cc..cd0f0b87c 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -13,6 +13,7 @@
 #include "rom6.h"
 #include "secret_base.h"
 #include "string_util.h"
+#include "strings.h"
 #include "text.h"
 #include "region_map.h"
 
@@ -632,7 +633,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
         case 8:
 
             gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
-            if (gRegionMap->mapSecId != MAPSEC_UNK_0x57)
+            if (gRegionMap->mapSecId != MAPSEC_SS_TIDAL)
             {
                 r4 = &gSaveBlock1Ptr->warp4;
                 mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
@@ -1208,3 +1209,28 @@ u8 *GetMapName(u8 *dest, u16 regionMapId, u16 padLength)
     }
     return str;
 }
+
+u8 *sub_81245DC(u8 *dest, u16 mapSecId)
+{
+    switch (mapSecId)
+    {
+        case MAPSEC_SS_TIDAL:
+            return StringCopy(dest, gText_Ferry);
+        case MAPSEC_SECRET_BASE:
+            return StringCopy(dest, gText_SecretBase);
+        default:
+            return GetMapName(dest, mapSecId, 0);
+    }
+}
+
+u8 *sub_8124610(u8 *dest, u16 mapSecId)
+{
+    if (mapSecId == MAPSEC_AQUA_HIDEOUT_OLD)
+    {
+        return StringCopy(dest, gText_Hideout);
+    }
+    else
+    {
+        return sub_81245DC(dest, mapSecId);
+    }
+}
diff --git a/src/tv.c b/src/tv.c
index 87aa6e01a..933b9c0b8 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -6435,7 +6435,7 @@ void DoTVShowTodaysRivalTrainer(void)
                 case MAPSEC_SECRET_BASE:
                     sTVShowState = 8;
                     break;
-                case MAPSEC_UNK_0x57:
+                case MAPSEC_SS_TIDAL:
                     switch (show->rivalTrainer.mapDataId)
                     {
                         case 0x115 ... 0x117:
@@ -6633,7 +6633,7 @@ void DoTVShowHoennTreasureInvestigators(void)
     {
         case 0:
             StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name);
-            if (show->treasureInvestigators.location == MAPSEC_UNK_0x57)
+            if (show->treasureInvestigators.location == MAPSEC_SS_TIDAL)
             {
                 switch (show->treasureInvestigators.mapDataId)
                 {
-- 
cgit v1.2.3


From f6d1e5a96506b5d370180682105e5ae2d5aed083 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 22:05:23 -0400
Subject: through sub_8124668

---
 src/region_map.c | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index cd0f0b87c..38419180d 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -32,8 +32,10 @@ struct UnkStruct_0203A148 {
 
 struct RegionMapLocation
 {
-    u8 x, y;
-    u8 width, height;
+    u8 x;
+    u8 y;
+    u8 width;
+    u8 height;
     const u8 *name;
 };
 
@@ -89,6 +91,7 @@ extern const struct SpritePalette gUnknown_085A1C00;
 extern const struct SpriteTemplate gUnknown_085A1C08;
 extern const struct OamData gUnknown_085A1C20;
 extern const union AnimCmd *const gUnknown_085A1C30[];
+extern const u8 gUnknown_085A1C34[];
 
 // .text
 
@@ -1234,3 +1237,30 @@ u8 *sub_8124610(u8 *dest, u16 mapSecId)
         return sub_81245DC(dest, mapSecId);
     }
 }
+
+void sub_8124630(u16 mapSecId, u16 *x, u16 *y, u16 *width, u16 *height)
+{
+    *x = gRegionMapEntries[mapSecId].x;
+    *y = gRegionMapEntries[mapSecId].y;
+    *width = gRegionMapEntries[mapSecId].width;
+    *height = gRegionMapEntries[mapSecId].height;
+}
+
+bool8 sub_8124658(void)
+{
+    return gRegionMap->zoomed;
+}
+
+bool32 sub_8124668(u8 mapSecId)
+{
+    u32 i;
+
+    for (i = 0; i < 3; i ++)
+    {
+        if (mapSecId == gUnknown_085A1C34[i])
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From f61822535bb2e1cf060d9c3e0a472f5a01b23681 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 22:34:12 -0400
Subject: MCB2_FlyMap

---
 src/region_map.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 115 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 38419180d..14bf9a6b0 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -3,6 +3,7 @@
 #include "global.h"
 #include "main.h"
 #include "menu.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "palette.h"
 #include "trig.h"
@@ -15,6 +16,7 @@
 #include "string_util.h"
 #include "strings.h"
 #include "text.h"
+#include "text_window.h"
 #include "region_map.h"
 
 #define MAP_WIDTH 28
@@ -26,10 +28,6 @@
 
 // Static type declarations
 
-struct UnkStruct_0203A148 {
-    u8 filler_000[0xa74];
-};
-
 struct RegionMapLocation
 {
     u8 x;
@@ -42,7 +40,15 @@ struct RegionMapLocation
 // Static RAM declarations
 
 EWRAM_DATA struct RegionMap *gRegionMap = NULL;
-EWRAM_DATA struct UnkStruct_0203A148 *gUnknown_0203A148 = NULL;
+EWRAM_DATA struct {
+    /*0x000*/ u8 filler_000[0x6];
+    /*0x006*/ u16 mapSecId;
+    /*0x008*/ struct RegionMap regionMap;
+    /*0x88c*/ u8 filler_88c[0x1c0];
+    /*0xa4c*/ u8 unk_a4c[0x28];
+} *gUnknown_0203A148 = NULL; // a74
+
+IWRAM_DATA bool32 gUnknown_03001180;
 
 // Static ROM declarations
 
@@ -68,6 +74,12 @@ static void UnhideRegionMapPlayerIcon(void);
 static void RegionMapPlayerIconSpriteCallback_Zoomed(struct Sprite *sprite);
 static void RegionMapPlayerIconSpriteCallback_Full(struct Sprite *sprite);
 static void RegionMapPlayerIconSpriteCallback(struct Sprite *sprite);
+void sub_81248C0(void);
+void sub_81248D4(void);
+void sub_81248F4(void func(void));
+void sub_8124904(void);
+void sub_8124A70(void);
+void sub_8124D14(void);
 
 // .rodata
 
@@ -92,6 +104,11 @@ extern const struct SpriteTemplate gUnknown_085A1C08;
 extern const struct OamData gUnknown_085A1C20;
 extern const union AnimCmd *const gUnknown_085A1C30[];
 extern const u8 gUnknown_085A1C34[];
+extern const struct BgTemplate gUnknown_085A1EE4[];
+extern const struct WindowTemplate gUnknown_085A1EF0[];
+extern const u8 gUnknown_085A1C58[];
+extern const u8 gUnknown_085A1C90[];
+extern const u16 gUnknown_085A1C38[];
 
 // .text
 
@@ -142,7 +159,7 @@ bool8 sub_8122DB0(void)
             }
             else
             {
-                LZ77UnCompVram(gUnknown_0859F77C, (u16 *)BG_SCREEN_ADDR(16));
+                LZ77UnCompVram(gUnknown_0859F77C, (u16 *)BG_CHAR_ADDR(2));
             }
             break;
         case 1:
@@ -1264,3 +1281,95 @@ bool32 sub_8124668(u8 mapSecId)
     }
     return FALSE;
 }
+
+void MCB2_FlyMap(void)
+{
+    switch (gMain.state)
+    {
+        case 0:
+            SetVBlankCallback(NULL);
+            SetGpuReg(REG_OFFSET_DISPCNT, 0);
+            SetGpuReg(REG_OFFSET_BG0HOFS, 0);
+            SetGpuReg(REG_OFFSET_BG0VOFS, 0);
+            SetGpuReg(REG_OFFSET_BG1HOFS, 0);
+            SetGpuReg(REG_OFFSET_BG1VOFS, 0);
+            SetGpuReg(REG_OFFSET_BG2VOFS, 0);
+            SetGpuReg(REG_OFFSET_BG2HOFS, 0);
+            SetGpuReg(REG_OFFSET_BG3HOFS, 0);
+            SetGpuReg(REG_OFFSET_BG3VOFS, 0);
+            gUnknown_0203A148 = malloc(sizeof(*gUnknown_0203A148));
+            if (gUnknown_0203A148 == NULL)
+            {
+                SetMainCallback2(sub_8086194);
+            }
+            else
+            {
+                ResetPaletteFade();
+                ResetSpriteData();
+                FreeSpriteTileRanges();
+                FreeAllSpritePalettes();
+                gMain.state ++;
+            }
+            break;
+        case 1:
+            ResetBgsAndClearDma3BusyFlags(0);
+            InitBgsFromTemplates(1, gUnknown_085A1EE4, 3);
+            gMain.state ++;
+            break;
+        case 2:
+            InitWindows(gUnknown_085A1EF0);
+            DeactivateAllTextPrinters();
+            gMain.state ++;
+            break;
+        case 3:
+            sub_809882C(0, 0x65, 0xd0);
+            clear_scheduled_bg_copies_to_vram();
+            gMain.state ++;
+            break;
+        case 4:
+            InitRegionMap(&gUnknown_0203A148->regionMap, FALSE);
+            CreateRegionMapCursor(0, 0);
+            CreateRegionMapPlayerIcon(1, 1);
+            gUnknown_0203A148->mapSecId = gUnknown_0203A148->regionMap.mapSecId;
+            StringFill(gUnknown_0203A148->unk_a4c, CHAR_SPACE, 16);
+            gUnknown_03001180 = TRUE;
+            sub_8124904();
+            gMain.state ++;
+            break;
+        case 5:
+            LZ77UnCompVram(gUnknown_085A1C58, (u16 *)BG_CHAR_ADDR(3));
+            gMain.state ++;
+            break;
+        case 6:
+            LZ77UnCompVram(gUnknown_085A1C90, (u16 *)BG_SCREEN_ADDR(30));
+            gMain.state ++;
+            break;
+        case 7:
+            LoadPalette(gUnknown_085A1C38, 0x10, 0x20);
+            PutWindowTilemap(2);
+            FillWindowPixelBuffer(2, 0x00);
+            PrintTextOnWindow(2, 1, gText_FlyToWhere, 0, 1, 0, NULL);
+            schedule_bg_copy_tilemap_to_vram(0);
+            gMain.state ++;
+            break;
+        case 8:
+            sub_8124A70();
+            gMain.state ++;
+            break;
+        case 9:
+            BlendPalettes(-1, 16, 0);
+            SetVBlankCallback(sub_81248C0);
+            gMain.state ++;
+            break;
+        case 10:
+            SetGpuReg(REG_OFFSET_BLDCNT, 0);
+            SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
+            ShowBg(0);
+            ShowBg(1);
+            ShowBg(2);
+            sub_81248F4(sub_8124D14);
+            SetMainCallback2(sub_81248D4);
+            gMain.state ++;
+            break;
+    }
+}
-- 
cgit v1.2.3


From 01c4b3bd35b914aa2da547d1c92cafb7849a75cb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 22:37:28 -0400
Subject: through sub_81248F4

---
 src/region_map.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 14bf9a6b0..15de369b9 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -41,7 +41,8 @@ struct RegionMapLocation
 
 EWRAM_DATA struct RegionMap *gRegionMap = NULL;
 EWRAM_DATA struct {
-    /*0x000*/ u8 filler_000[0x6];
+    /*0x000*/ void (*unk_000)(void);
+    /*0x004*/ u16 unk_004;
     /*0x006*/ u16 mapSecId;
     /*0x008*/ struct RegionMap regionMap;
     /*0x88c*/ u8 filler_88c[0x1c0];
@@ -1373,3 +1374,24 @@ void MCB2_FlyMap(void)
             break;
     }
 }
+
+void sub_81248C0(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_81248D4(void)
+{
+    gUnknown_0203A148->unk_000();
+    AnimateSprites();
+    BuildOamBuffer();
+    do_scheduled_bg_tilemap_copies_to_vram();
+}
+
+void sub_81248F4(void callback(void))
+{
+    gUnknown_0203A148->unk_000 = callback;
+    gUnknown_0203A148->unk_004 = 0;
+}
-- 
cgit v1.2.3


From 8c73c1450f67e4a0ee41583b1d2c8ccca6eb6925 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 23:11:48 -0400
Subject: sub_8124904

---
 src/region_map.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 15de369b9..b2cb25a59 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -14,6 +14,7 @@
 #include "rom6.h"
 #include "secret_base.h"
 #include "string_util.h"
+#include "international_string_util.h"
 #include "strings.h"
 #include "text.h"
 #include "text_window.h"
@@ -110,6 +111,11 @@ extern const struct WindowTemplate gUnknown_085A1EF0[];
 extern const u8 gUnknown_085A1C58[];
 extern const u8 gUnknown_085A1C90[];
 extern const u16 gUnknown_085A1C38[];
+extern const struct {
+    const u8 *const *name;
+    u16 mapSecId;
+    u16 flag;
+} gUnknown_085A1EDC[];
 
 // .text
 
@@ -1395,3 +1401,61 @@ void sub_81248F4(void callback(void))
     gUnknown_0203A148->unk_000 = callback;
     gUnknown_0203A148->unk_004 = 0;
 }
+
+void sub_8124904(void)
+{
+    u16 i;
+    bool32 flag;
+    const u8 *name;
+
+    if (gUnknown_0203A148->regionMap.iconDrawType > MAPSECTYPE_NONE && gUnknown_0203A148->regionMap.iconDrawType <= MAPSECTYPE_BATTLE_FRONTIER)
+    {
+        flag = FALSE;
+        for (i = 0; i < 1; i ++)
+        {
+            if (gUnknown_0203A148->regionMap.mapSecId == gUnknown_085A1EDC[i].mapSecId)
+            {
+                if (FlagGet(gUnknown_085A1EDC[i].flag))
+                {
+                    StringLength(gUnknown_085A1EDC[i].name[gUnknown_0203A148->regionMap.posWithinMapSec]);
+                    flag = TRUE;
+                    sub_8198070(0, FALSE);
+                    SetWindowBorderStyle(1, FALSE, 0x65, 0x0d);
+                    PrintTextOnWindow(1, 1, gUnknown_0203A148->regionMap.mapSecName, 0, 1, 0, NULL);
+                    name = gUnknown_085A1EDC[i].name[gUnknown_0203A148->regionMap.posWithinMapSec];
+                    PrintTextOnWindow(1, 1, name, GetStringRightAlignXOffset(1, name, 0x60), 0x11, 0, NULL);
+                    schedule_bg_copy_tilemap_to_vram(0);
+                    gUnknown_03001180 = TRUE;
+                }
+                break;
+            }
+        }
+        if (!flag)
+        {
+            if (gUnknown_03001180 == TRUE)
+            {
+                sub_8198070(1, FALSE);
+                SetWindowBorderStyle(0, FALSE, 0x65, 0x0d);
+            }
+            else
+            {
+                FillWindowPixelBuffer(0, 0x11);
+            }
+            PrintTextOnWindow(0, 1, gUnknown_0203A148->regionMap.mapSecName, 0, 1, 0, NULL);
+            schedule_bg_copy_tilemap_to_vram(0);
+            gUnknown_03001180 = FALSE;
+        }
+    }
+    else
+    {
+        if (gUnknown_03001180 == TRUE)
+        {
+            sub_8198070(1, FALSE);
+            SetWindowBorderStyle(0, FALSE, 0x65, 0x0d);
+        }
+        FillWindowPixelBuffer(0, 0x11);
+        CopyWindowToVram(0, 2);
+        schedule_bg_copy_tilemap_to_vram(0);
+        gUnknown_03001180 = FALSE;
+    }
+}
-- 
cgit v1.2.3


From 3d2571b0c5bb35d0fb21b555e139653e800ededa Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 23:18:56 -0400
Subject: sub_8124A70

---
 src/region_map.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index b2cb25a59..07ddd7477 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -46,7 +46,7 @@ EWRAM_DATA struct {
     /*0x004*/ u16 unk_004;
     /*0x006*/ u16 mapSecId;
     /*0x008*/ struct RegionMap regionMap;
-    /*0x88c*/ u8 filler_88c[0x1c0];
+    /*0x88c*/ u8 unk_88c[0x1c0];
     /*0xa4c*/ u8 unk_a4c[0x28];
 } *gUnknown_0203A148 = NULL; // a74
 
@@ -81,6 +81,8 @@ void sub_81248D4(void);
 void sub_81248F4(void func(void));
 void sub_8124904(void);
 void sub_8124A70(void);
+void sub_8124AD4(void);
+void sub_8124BE4(void);
 void sub_8124D14(void);
 
 // .rodata
@@ -106,16 +108,18 @@ extern const struct SpriteTemplate gUnknown_085A1C08;
 extern const struct OamData gUnknown_085A1C20;
 extern const union AnimCmd *const gUnknown_085A1C30[];
 extern const u8 gUnknown_085A1C34[];
-extern const struct BgTemplate gUnknown_085A1EE4[];
-extern const struct WindowTemplate gUnknown_085A1EF0[];
+extern const u16 gUnknown_085A1C38[];
 extern const u8 gUnknown_085A1C58[];
 extern const u8 gUnknown_085A1C90[];
-extern const u16 gUnknown_085A1C38[];
+extern const u8 gUnknown_085A1D68[];
+extern const struct BgTemplate gUnknown_085A1EE4[];
+extern const struct WindowTemplate gUnknown_085A1EF0[];
 extern const struct {
     const u8 *const *name;
     u16 mapSecId;
     u16 flag;
 } gUnknown_085A1EDC[];
+extern const struct SpritePalette gUnknown_085A1F10;
 
 // .text
 
@@ -1459,3 +1463,18 @@ void sub_8124904(void)
         gUnknown_03001180 = FALSE;
     }
 }
+
+
+void sub_8124A70(void)
+{
+    struct SpriteSheet sheet;
+
+    LZ77UnCompWram(gUnknown_085A1D68, gUnknown_0203A148->unk_88c);
+    sheet.data = gUnknown_0203A148->unk_88c;
+    sheet.size = 0x1c0;
+    sheet.tag = 2;
+    LoadSpriteSheet(&sheet);
+    LoadSpritePalette(&gUnknown_085A1F10);
+    sub_8124AD4();
+    sub_8124BE4();
+}
-- 
cgit v1.2.3


From 9f5f134476f5c74339709b70adf47d2471aee6c0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 31 Oct 2017 23:39:09 -0400
Subject: sub_8124AD4

---
 src/region_map.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 58 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 07ddd7477..484f60347 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -76,13 +76,14 @@ static void UnhideRegionMapPlayerIcon(void);
 static void RegionMapPlayerIconSpriteCallback_Zoomed(struct Sprite *sprite);
 static void RegionMapPlayerIconSpriteCallback_Full(struct Sprite *sprite);
 static void RegionMapPlayerIconSpriteCallback(struct Sprite *sprite);
-void sub_81248C0(void);
-void sub_81248D4(void);
-void sub_81248F4(void func(void));
+static void sub_81248C0(void);
+static void sub_81248D4(void);
+void sub_81248F4(void callback(void));
 void sub_8124904(void);
-void sub_8124A70(void);
-void sub_8124AD4(void);
+static void sub_8124A70(void);
+static void sub_8124AD4(void);
 void sub_8124BE4(void);
+void sub_8124CBC(struct Sprite *sprite);
 void sub_8124D14(void);
 
 // .rodata
@@ -120,6 +121,7 @@ extern const struct {
     u16 flag;
 } gUnknown_085A1EDC[];
 extern const struct SpritePalette gUnknown_085A1F10;
+extern const struct SpriteTemplate gUnknown_085A1F7C;
 
 // .text
 
@@ -1385,14 +1387,14 @@ void MCB2_FlyMap(void)
     }
 }
 
-void sub_81248C0(void)
+static void sub_81248C0(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void sub_81248D4(void)
+static void sub_81248D4(void)
 {
     gUnknown_0203A148->unk_000();
     AnimateSprites();
@@ -1465,7 +1467,7 @@ void sub_8124904(void)
 }
 
 
-void sub_8124A70(void)
+static void sub_8124A70(void)
 {
     struct SpriteSheet sheet;
 
@@ -1478,3 +1480,51 @@ void sub_8124A70(void)
     sub_8124AD4();
     sub_8124BE4();
 }
+
+static void sub_8124AD4(void)
+{
+    u16 canFlyFlag;
+    u16 i;
+    u16 x;
+    u16 y;
+    u16 width;
+    u16 height;
+    u16 shape;
+    u8 spriteId;
+
+    canFlyFlag = FLAG_VISITED_LITTLEROOT_TOWN;
+    for (i = 0; i < 16; i ++)
+    {
+        sub_8124630(i, &x, &y, &width, &height);
+        x = (x + 1) * 8 + 4;
+        y = (y + 2) * 8 + 4;
+        if (width == 2)
+        {
+            shape = ST_OAM_H_RECTANGLE;
+        }
+        else if (height == 2)
+        {
+            shape = ST_OAM_V_RECTANGLE;
+        }
+        else
+        {
+            shape = ST_OAM_SQUARE;
+        }
+        spriteId = CreateSprite(&gUnknown_085A1F7C, x, y, 10);
+        if (spriteId != MAX_SPRITES)
+        {
+            gSprites[spriteId].oam.shape = shape;
+            if (FlagGet(canFlyFlag))
+            {
+                gSprites[spriteId].callback = sub_8124CBC;
+            }
+            else
+            {
+                shape += 3;
+            }
+            StartSpriteAnim(&gSprites[spriteId], shape);
+            gSprites[spriteId].data0 = i;
+        }
+        canFlyFlag ++;
+    }
+}
-- 
cgit v1.2.3


From ee60ae7da9e8d24e645d09dc99f6b82f48909e16 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 1 Nov 2017 00:01:17 -0400
Subject: sub_8124BE4

---
 src/region_map.c | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 484f60347..b4d51889f 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -82,7 +82,7 @@ void sub_81248F4(void callback(void));
 void sub_8124904(void);
 static void sub_8124A70(void);
 static void sub_8124AD4(void);
-void sub_8124BE4(void);
+static void sub_8124BE4(void);
 void sub_8124CBC(struct Sprite *sprite);
 void sub_8124D14(void);
 
@@ -121,6 +121,7 @@ extern const struct {
     u16 flag;
 } gUnknown_085A1EDC[];
 extern const struct SpritePalette gUnknown_085A1F10;
+extern const u16 gUnknown_085A1F18[][2];
 extern const struct SpriteTemplate gUnknown_085A1F7C;
 
 // .text
@@ -1496,8 +1497,8 @@ static void sub_8124AD4(void)
     for (i = 0; i < 16; i ++)
     {
         sub_8124630(i, &x, &y, &width, &height);
-        x = (x + 1) * 8 + 4;
-        y = (y + 2) * 8 + 4;
+        x = (x + MAPCURSOR_X_MIN) * 8 + 4;
+        y = (y + MAPCURSOR_Y_MIN) * 8 + 4;
         if (width == 2)
         {
             shape = ST_OAM_H_RECTANGLE;
@@ -1528,3 +1529,33 @@ static void sub_8124AD4(void)
         canFlyFlag ++;
     }
 }
+
+static void sub_8124BE4(void)
+{
+    u16 i;
+    u16 x;
+    u16 y;
+    u16 width;
+    u16 height;
+    u16 mapSecId;
+    u8 spriteId;
+
+    for (i = 0; gUnknown_085A1F18[i][1] != MAPSEC_NONE; i ++)
+    {
+        if (FlagGet(gUnknown_085A1F18[i][0]))
+        {
+            mapSecId = gUnknown_085A1F18[i][1];
+            sub_8124630(mapSecId, &x, &y, &width, &height);
+            x = (x + MAPCURSOR_X_MIN) * 8;
+            y = (y + MAPCURSOR_Y_MIN) * 8;
+            spriteId = CreateSprite(&gUnknown_085A1F7C, x, y, 10);
+            if (spriteId != MAX_SPRITES)
+            {
+                gSprites[spriteId].oam.size = 1;
+                gSprites[spriteId].callback = sub_8124CBC;
+                StartSpriteAnim(&gSprites[spriteId], 6);
+                gSprites[spriteId].data0 = mapSecId;
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From e3005e88c7f738b893bcdb26eac2037aa0ec9a10 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 1 Nov 2017 00:34:57 -0400
Subject: Decompile remaining functions in region_map

---
 src/region_map.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 131 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index b4d51889f..919b82d1a 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -6,6 +6,7 @@
 #include "malloc.h"
 #include "gpu_regs.h"
 #include "palette.h"
+#include "party_menu.h"
 #include "trig.h"
 #include "map_constants.h"
 #include "overworld.h"
@@ -18,6 +19,9 @@
 #include "strings.h"
 #include "text.h"
 #include "text_window.h"
+#include "songs.h"
+#include "m4a.h"
+#include "field_effect.h"
 #include "region_map.h"
 
 #define MAP_WIDTH 28
@@ -47,7 +51,8 @@ EWRAM_DATA struct {
     /*0x006*/ u16 mapSecId;
     /*0x008*/ struct RegionMap regionMap;
     /*0x88c*/ u8 unk_88c[0x1c0];
-    /*0xa4c*/ u8 unk_a4c[0x28];
+    /*0xa4c*/ u8 unk_a4c[0x26];
+    /*0xa72*/ bool8 unk_a72;
 } *gUnknown_0203A148 = NULL; // a74
 
 IWRAM_DATA bool32 gUnknown_03001180;
@@ -83,8 +88,10 @@ void sub_8124904(void);
 static void sub_8124A70(void);
 static void sub_8124AD4(void);
 static void sub_8124BE4(void);
-void sub_8124CBC(struct Sprite *sprite);
-void sub_8124D14(void);
+static void sub_8124CBC(struct Sprite *sprite);
+static void sub_8124D14(void);
+static void sub_8124D64(void);
+static void sub_8124E0C(void);
 
 // .rodata
 
@@ -123,6 +130,7 @@ extern const struct {
 extern const struct SpritePalette gUnknown_085A1F10;
 extern const u16 gUnknown_085A1F18[][2];
 extern const struct SpriteTemplate gUnknown_085A1F7C;
+extern const u8 gUnknown_085A1E3C[][3];
 
 // .text
 
@@ -1559,3 +1567,123 @@ static void sub_8124BE4(void)
         }
     }
 }
+
+static void sub_8124CBC(struct Sprite *sprite)
+{
+    if (gUnknown_0203A148->regionMap.mapSecId == sprite->data0)
+    {
+        if (++ sprite->data1 > 16)
+        {
+            sprite->data1 = 0;
+            sprite->invisible = sprite->invisible ? FALSE : TRUE;
+        }
+    }
+    else
+    {
+        sprite->data1 = 16;
+        sprite->invisible = FALSE;
+    }
+}
+
+static void sub_8124D14(void)
+{
+    switch (gUnknown_0203A148->unk_004)
+    {
+        case 0:
+            BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+            gUnknown_0203A148->unk_004 ++;
+            break;
+        case 1:
+            if (!UpdatePaletteFade())
+            {
+                sub_81248F4(sub_8124D64);
+            }
+            break;
+    }
+}
+
+static void sub_8124D64(void)
+{
+    if (gUnknown_0203A148->unk_004 == 0)
+    {
+        switch (sub_81230AC())
+        {
+            case INPUT_EVENT_NONE:
+            case INPUT_EVENT_MOVE_START:
+            case INPUT_EVENT_MOVE_CONT:
+                break;
+            case INPUT_EVENT_MOVE_END:
+                sub_8124904();
+                break;
+            case INPUT_EVENT_A_BUTTON:
+                if (gUnknown_0203A148->regionMap.iconDrawType == MAPSECTYPE_CITY_CANFLY || gUnknown_0203A148->regionMap.iconDrawType == MAPSECTYPE_BATTLE_FRONTIER)
+                {
+                    m4aSongNumStart(SE_SELECT);
+                    gUnknown_0203A148->unk_a72 = TRUE;
+                    sub_81248F4(sub_8124E0C);
+                }
+                break;
+            case INPUT_EVENT_B_BUTTON:
+                m4aSongNumStart(SE_SELECT);
+                gUnknown_0203A148->unk_a72 = FALSE;
+                sub_81248F4(sub_8124E0C);
+                break;
+        }
+    }
+}
+
+static void sub_8124E0C(void)
+{
+    switch (gUnknown_0203A148->unk_004)
+    {
+        case 0:
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_0203A148->unk_004 ++;
+            break;
+        case 1:
+            if (!UpdatePaletteFade())
+            {
+                FreeRegionMapIconResources();
+                if (gUnknown_0203A148->unk_a72)
+                {
+                    switch (gUnknown_0203A148->regionMap.mapSecId)
+                    {
+                        case MAPSEC_SOUTHERN_ISLAND:
+                            sub_8084CCC(0x15);
+                            break;
+                        case MAPSEC_BATTLE_FRONTIER:
+                            sub_8084CCC(0x16);
+                            break;
+                        case MAPSEC_LITTLEROOT_TOWN:
+                            sub_8084CCC(gSaveBlock2Ptr->playerGender == MALE ? 0x0C : 0x0D);
+                            break;
+                        case MAPSEC_EVER_GRANDE_CITY:
+                            sub_8084CCC(FlagGet(SYS_POKEMON_LEAGUE_FLY) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B);
+                            break;
+                        default:
+                            if (gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0)
+                            {
+                                sub_8084CCC(gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2]);
+                            }
+                            else
+                            {
+                                warp1_set_2(gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][0], gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][1], -1);
+                            }
+                            break;
+                    }
+                    sub_80B69DC();
+                }
+                else
+                {
+                    SetMainCallback2(sub_81B58A8);
+                }
+                if (gUnknown_0203A148 != NULL)
+                {
+                    free(gUnknown_0203A148);
+                    gUnknown_0203A148 = NULL;
+                }
+                FreeAllWindowBuffers();
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 7eacb24cf7a889121e654c678bd4026aecd301b1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 1 Nov 2017 21:10:47 -0400
Subject: Start ripping graphics/data for region_map

---
 src/region_map.c | 56 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 919b82d1a..92f902fe1 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -83,8 +83,8 @@ static void RegionMapPlayerIconSpriteCallback_Full(struct Sprite *sprite);
 static void RegionMapPlayerIconSpriteCallback(struct Sprite *sprite);
 static void sub_81248C0(void);
 static void sub_81248D4(void);
-void sub_81248F4(void callback(void));
-void sub_8124904(void);
+static void sub_81248F4(void callback(void));
+static void sub_8124904(void);
 static void sub_8124A70(void);
 static void sub_8124AD4(void);
 static void sub_8124BE4(void);
@@ -95,17 +95,19 @@ static void sub_8124E0C(void);
 
 // .rodata
 
-extern const u8 gUnknown_0859F60C[];
-extern const u8 gUnknown_0859F650[];
-extern const u16 gUnknown_0859F73C[];
-extern const u8 gUnknown_0859F77C[];
-extern const u8 gUnknown_085A04E0[];
+static const u16 sRegionMapCursorPal[] = INCBIN_U16("graphics/pokenav/cursor.gbapal");
+static const u8 sRegionMapCursorSmallGfxLZ[] = INCBIN_U8("graphics/pokenav/cursor_small.4bpp.lz");
+static const u8 sRegionMapCursorLargeGfxLZ[] = INCBIN_U8("graphics/pokenav/cursor_large.4bpp.lz");
+static const u16 sRegionMapBkgnd_Pal[] = INCBIN_U16("graphics/pokenav/region_map.gbapal");
+static const u8 sRegionMapBkgnd_GfxLZ[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz");
+static const u8 sRegionMapBkgnd_TilemapLZ[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz");
+static const u16 sRegionMapPlayerIcon_BrendanPal[] = INCBIN_U16("graphics/pokenav/brendan_icon.gbapal");
+static const u8 sRegionMapPlayerIcon_BrendanGfx[] = INCBIN_U8("graphics/pokenav/brendan_icon.4bpp");
+static const u16 sRegionMapPlayerIcon_MayPal[] = INCBIN_U16("graphics/pokenav/may_icon.gbapal");
+static const u8 sRegionMapPlayerIcon_MayGfx[] = INCBIN_U8("graphics/pokenav/may_icon.4bpp");
+
 extern const u8 gUnknown_085A096C[];
 extern const struct RegionMapLocation gRegionMapEntries[];
-extern const u8 gUnknown_085A084C[];
-extern const u16 gUnknown_085A082C[];
-extern const u16 gUnknown_085A08CC[];
-extern const u8 gUnknown_085A08EC[];
 extern const u16 gUnknown_085A1B24[][2];
 extern const u16 gUnknown_085A1B84[];
 extern const u16 gUnknown_085A1B8A[];
@@ -120,17 +122,17 @@ extern const u16 gUnknown_085A1C38[];
 extern const u8 gUnknown_085A1C58[];
 extern const u8 gUnknown_085A1C90[];
 extern const u8 gUnknown_085A1D68[];
-extern const struct BgTemplate gUnknown_085A1EE4[];
-extern const struct WindowTemplate gUnknown_085A1EF0[];
+extern const u8 gUnknown_085A1E3C[][3];
 extern const struct {
     const u8 *const *name;
     u16 mapSecId;
     u16 flag;
 } gUnknown_085A1EDC[];
+extern const struct BgTemplate gUnknown_085A1EE4[];
+extern const struct WindowTemplate gUnknown_085A1EF0[];
 extern const struct SpritePalette gUnknown_085A1F10;
 extern const u16 gUnknown_085A1F18[][2];
 extern const struct SpriteTemplate gUnknown_085A1F7C;
-extern const u8 gUnknown_085A1E3C[][3];
 
 // .text
 
@@ -177,11 +179,11 @@ bool8 sub_8122DB0(void)
         case 0:
             if (gRegionMap->bgManaged)
             {
-                decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, gUnknown_0859F77C, 0, 0, 0);
+                decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, sRegionMapBkgnd_GfxLZ, 0, 0, 0);
             }
             else
             {
-                LZ77UnCompVram(gUnknown_0859F77C, (u16 *)BG_CHAR_ADDR(2));
+                LZ77UnCompVram(sRegionMapBkgnd_GfxLZ, (u16 *)BG_CHAR_ADDR(2));
             }
             break;
         case 1:
@@ -189,25 +191,25 @@ bool8 sub_8122DB0(void)
             {
                 if (!free_temp_tile_data_buffers_if_possible())
                 {
-                    decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, gUnknown_085A04E0, 0, 0, 1);
+                    decompress_and_copy_tile_data_to_vram(gRegionMap->bgNum, sRegionMapBkgnd_TilemapLZ, 0, 0, 1);
                 }
             }
             else
             {
-                LZ77UnCompVram(gUnknown_085A04E0, (u16 *)BG_SCREEN_ADDR(28));
+                LZ77UnCompVram(sRegionMapBkgnd_TilemapLZ, (u16 *)BG_SCREEN_ADDR(28));
             }
             break;
         case 2:
             if (!free_temp_tile_data_buffers_if_possible())
             {
-                LoadPalette(gUnknown_0859F73C, 0x70, 0x60);
+                LoadPalette(sRegionMapBkgnd_Pal, 0x70, 0x60);
             }
             break;
         case 3:
-            LZ77UnCompWram(gUnknown_0859F60C, gRegionMap->cursorSmallImage);
+            LZ77UnCompWram(sRegionMapCursorSmallGfxLZ, gRegionMap->cursorSmallImage);
             break;
         case 4:
-            LZ77UnCompWram(gUnknown_0859F650, gRegionMap->cursorLargeImage);
+            LZ77UnCompWram(sRegionMapCursorLargeGfxLZ, gRegionMap->cursorLargeImage);
             break;
         case 5:
             RegionMap_InitializeStateBasedOnPlayerLocation();
@@ -1103,8 +1105,8 @@ void sub_8124278(void)
 void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
 {
     u8 spriteId;
-    struct SpriteSheet sheet = {gUnknown_085A084C, 0x80, tileTag};
-    struct SpritePalette palette = {gUnknown_085A082C, paletteTag};
+    struct SpriteSheet sheet = {sRegionMapPlayerIcon_BrendanGfx, 0x80, tileTag};
+    struct SpritePalette palette = {sRegionMapPlayerIcon_BrendanPal, paletteTag};
     struct SpriteTemplate template = {tileTag, paletteTag, &gUnknown_085A1C20, gUnknown_085A1C30, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
 
     if (sub_8124668(gMapHeader.regionMapSectionId))
@@ -1114,8 +1116,8 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
     }
     if (gSaveBlock2Ptr->playerGender == FEMALE)
     {
-        sheet.data = gUnknown_085A08EC;
-        palette.data = gUnknown_085A08CC;
+        sheet.data = sRegionMapPlayerIcon_MayGfx;
+        palette.data = sRegionMapPlayerIcon_MayPal;
     }
     LoadSpriteSheet(&sheet);
     LoadSpritePalette(&palette);
@@ -1411,13 +1413,13 @@ static void sub_81248D4(void)
     do_scheduled_bg_tilemap_copies_to_vram();
 }
 
-void sub_81248F4(void callback(void))
+static void sub_81248F4(void callback(void))
 {
     gUnknown_0203A148->unk_000 = callback;
     gUnknown_0203A148->unk_004 = 0;
 }
 
-void sub_8124904(void)
+static void sub_8124904(void)
 {
     u16 i;
     bool32 flag;
-- 
cgit v1.2.3


From 50efd7b68d4a6952ccb0613892733a852deffc38 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 1 Nov 2017 21:51:59 -0400
Subject: Decompile region map entry structs

---
 src/region_map.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 92f902fe1..bc7e78c6b 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -106,8 +106,26 @@ static const u8 sRegionMapPlayerIcon_BrendanGfx[] = INCBIN_U8("graphics/pokenav/
 static const u16 sRegionMapPlayerIcon_MayPal[] = INCBIN_U16("graphics/pokenav/may_icon.gbapal");
 static const u8 sRegionMapPlayerIcon_MayGfx[] = INCBIN_U8("graphics/pokenav/may_icon.4bpp");
 
-extern const u8 gUnknown_085A096C[];
-extern const struct RegionMapLocation gRegionMapEntries[];
+static const u8 sRegionMap_MapSectionLayout[] = {
+    MAPSEC_NONE, MAPSEC_ROUTE_114, MAPSEC_ROUTE_114, MAPSEC_FALLARBOR_TOWN, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_FORTREE_CITY, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_NONE, MAPSEC_ROUTE_114, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_MT_CHIMNEY, MAPSEC_MT_CHIMNEY, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_115, MAPSEC_ROUTE_114, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_MT_CHIMNEY, MAPSEC_MT_CHIMNEY, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SAFARI_ZONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_115, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_LAVARIDGE_TOWN, MAPSEC_ROUTE_112, MAPSEC_ROUTE_112, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_LILYCOVE_CITY, MAPSEC_LILYCOVE_CITY, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_125, MAPSEC_ROUTE_125, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_115, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_122, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_125, MAPSEC_ROUTE_125, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_RUSTBORO_CITY, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_122, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_MOSSDEEP_CITY, MAPSEC_MOSSDEEP_CITY, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_RUSTBORO_CITY, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_VERDANTURF_TOWN, MAPSEC_ROUTE_117, MAPSEC_ROUTE_117, MAPSEC_ROUTE_117, MAPSEC_MAUVILLE_CITY, MAPSEC_MAUVILLE_CITY, MAPSEC_ROUTE_118, MAPSEC_ROUTE_118, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_104, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_SOOTOPOLIS_CITY, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_104, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_EVER_GRANDE_CITY,
+    MAPSEC_ROUTE_104, MAPSEC_PETALBURG_CITY, MAPSEC_ROUTE_102, MAPSEC_ROUTE_102, MAPSEC_OLDALE_TOWN, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_EVER_GRANDE_CITY,
+    MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_101, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SLATEPORT_CITY, MAPSEC_ROUTE_134, MAPSEC_ROUTE_134, MAPSEC_ROUTE_134, MAPSEC_ROUTE_133, MAPSEC_ROUTE_133, MAPSEC_ROUTE_133, MAPSEC_ROUTE_132, MAPSEC_ROUTE_132, MAPSEC_PACIFIDLOG_TOWN, MAPSEC_ROUTE_131, MAPSEC_ROUTE_131, MAPSEC_ROUTE_131, MAPSEC_ROUTE_130, MAPSEC_ROUTE_130, MAPSEC_ROUTE_130, MAPSEC_ROUTE_129, MAPSEC_ROUTE_129, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_LITTLEROOT_TOWN, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SLATEPORT_CITY, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_BATTLE_FRONTIER, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_ROUTE_106, MAPSEC_ROUTE_106, MAPSEC_ROUTE_106, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
+    MAPSEC_NONE, MAPSEC_NONE, MAPSEC_DEWFORD_TOWN, MAPSEC_ROUTE_107, MAPSEC_ROUTE_107, MAPSEC_ROUTE_107, MAPSEC_ROUTE_108, MAPSEC_ROUTE_108, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SOUTHERN_ISLAND, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE
+};
+
+#include "data/region_map/region_map_entries.h"
+
 extern const u16 gUnknown_085A1B24[][2];
 extern const u16 gUnknown_085A1B84[];
 extern const u16 gUnknown_085A1B8A[];
@@ -601,7 +619,7 @@ static u16 GetRegionMapSectionIdAt_Internal(u16 x, u16 y)
     }
     y -= MAPCURSOR_Y_MIN;
     x -= MAPCURSOR_X_MIN;
-    return gUnknown_085A096C[x + y * MAP_WIDTH];
+    return sRegionMap_MapSectionLayout[x + y * MAP_WIDTH];
 }
 
 static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
-- 
cgit v1.2.3


From 4ff03f85a97f7048d46b1200f1daeea9ecedcc68 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 1 Nov 2017 22:07:30 -0400
Subject: Decompile data related to Emerald-specific areas

---
 src/region_map.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 71 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index bc7e78c6b..9fbb8cc47 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -126,10 +126,69 @@ static const u8 sRegionMap_MapSectionLayout[] = {
 
 #include "data/region_map/region_map_entries.h"
 
-extern const u16 gUnknown_085A1B24[][2];
-extern const u16 gUnknown_085A1B84[];
-extern const u16 gUnknown_085A1B8A[];
-extern const struct UCoords16 gUnknown_085A1BAC[];
+static const u16 sRegionMap_SpecialPlaceLocations[][2] = {
+    {MAPSEC_UNDERWATER_TERRA_CAVE, MAPSEC_ROUTE_105},
+    {MAPSEC_UNDERWATER_124, MAPSEC_ROUTE_124},
+    {MAPSEC_UNDERWATER_UNK1, MAPSEC_ROUTE_129},
+    {MAPSEC_UNDERWATER_125, MAPSEC_ROUTE_126},
+    {MAPSEC_UNDERWATER_126, MAPSEC_ROUTE_127},
+    {MAPSEC_UNDERWATER_127, MAPSEC_ROUTE_128},
+    {MAPSEC_UNDERWATER_129, MAPSEC_ROUTE_129},
+    {MAPSEC_UNDERWATER_SOOTOPOLIS, MAPSEC_SOOTOPOLIS_CITY},
+    {MAPSEC_UNDERWATER_128, MAPSEC_ROUTE_128},
+    {MAPSEC_AQUA_HIDEOUT, MAPSEC_LILYCOVE_CITY},
+    {MAPSEC_AQUA_HIDEOUT_OLD, MAPSEC_LILYCOVE_CITY},
+    {MAPSEC_MAGMA_HIDEOUT, MAPSEC_ROUTE_112},
+    {MAPSEC_UNDERWATER_SEALED_CHAMBER, MAPSEC_ROUTE_134},
+    {MAPSEC_PETALBURG_WOODS, MAPSEC_ROUTE_104},
+    {MAPSEC_JAGGED_PASS, MAPSEC_ROUTE_112},
+    {MAPSEC_MT_PYRE, MAPSEC_ROUTE_122},
+    {MAPSEC_SKY_PILLAR, MAPSEC_ROUTE_131},
+    {MAPSEC_MIRAGE_TOWER, MAPSEC_ROUTE_111},
+    {MAPSEC_TRAINER_HILL, MAPSEC_ROUTE_111},
+    {MAPSEC_DESERT_UNDERPASS, MAPSEC_ROUTE_114},
+    {MAPSEC_ALTERING_CAVE_2, MAPSEC_ROUTE_103},
+    {MAPSEC_ARTISAN_CAVE, MAPSEC_ROUTE_103},
+    {MAPSEC_ABANDONED_SHIP, MAPSEC_ROUTE_108},
+    {MAPSEC_NONE, MAPSEC_NONE}
+};
+
+static const u16 sRegionMap_MarineCaveMapSecIds[] = {
+    MAPSEC_MARINE_CAVE,
+    MAPSEC_UNDERWATER_MARINE_CAVE,
+    MAPSEC_UNDERWATER_MARINE_CAVE
+};
+
+static const u16 sTerraCaveMapSectionIds[] = {
+    MAPSEC_ROUTE_114,
+    MAPSEC_ROUTE_114,
+    MAPSEC_ROUTE_115,
+    MAPSEC_ROUTE_115,
+    MAPSEC_ROUTE_116,
+    MAPSEC_ROUTE_116,
+    MAPSEC_ROUTE_118,
+    MAPSEC_ROUTE_118,
+    MAPSEC_ROUTE_105,
+    MAPSEC_ROUTE_105,
+    MAPSEC_ROUTE_125,
+    MAPSEC_ROUTE_125,
+    MAPSEC_ROUTE_127,
+    MAPSEC_ROUTE_127,
+    MAPSEC_ROUTE_129,
+    MAPSEC_ROUTE_129
+};
+
+static const struct UCoords16 sTerraCaveLocationCoords[] = {
+    {0x00, 0x0a},
+    {0x00, 0x0c},
+    {0x18, 0x03},
+    {0x19, 0x04},
+    {0x19, 0x06},
+    {0x19, 0x07},
+    {0x18, 0x0a},
+    {0x18, 0x0a}
+};
+
 extern const u8 gUnknown_085A1BCC[];
 extern const struct SpritePalette gUnknown_085A1C00;
 extern const struct SpriteTemplate gUnknown_085A1C08;
@@ -656,7 +715,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
             mapHeight = gMapHeader.mapData->height;
             x = gSaveBlock1Ptr->pos.x;
             y = gSaveBlock1Ptr->pos.y;
-            if (gRegionMap->mapSecId == MAPSEC_UNDERWATER || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE)
+            if (gRegionMap->mapSecId == MAPSEC_UNDERWATER_128 || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE)
             {
                 gRegionMap->playerIsInCave = TRUE;
             }
@@ -907,16 +966,16 @@ static u16 CorrectSpecialMapSecId_Internal(u16 mapSecId)
 
     for (i = 0; i < 3; i ++)
     {
-        if (gUnknown_085A1B84[i] == mapSecId)
+        if (sRegionMap_MarineCaveMapSecIds[i] == mapSecId)
         {
             return RegionMap_GetTerraCaveMapSecId();
         }
     }
-    for (i = 0; gUnknown_085A1B24[i][0] != MAPSEC_NONE; i ++)
+    for (i = 0; sRegionMap_SpecialPlaceLocations[i][0] != MAPSEC_NONE; i ++)
     {
-        if (gUnknown_085A1B24[i][0] == mapSecId)
+        if (sRegionMap_SpecialPlaceLocations[i][0] == mapSecId)
         {
-            return gUnknown_085A1B24[i][1];
+            return sRegionMap_SpecialPlaceLocations[i][1];
         }
     }
     return mapSecId;
@@ -931,7 +990,7 @@ static u16 RegionMap_GetTerraCaveMapSecId(void)
     {
         idx = 0;
     }
-    return gUnknown_085A1B8A[idx];
+    return sTerraCaveMapSectionIds[idx];
 }
 
 static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y)
@@ -944,8 +1003,8 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y)
         idx = 9;
     }
     idx -= 9;
-    *x = gUnknown_085A1BAC[idx].x + MAPCURSOR_X_MIN;
-    *y = gUnknown_085A1BAC[idx].y + MAPCURSOR_Y_MIN;
+    *x = sTerraCaveLocationCoords[idx].x + MAPCURSOR_X_MIN;
+    *y = sTerraCaveLocationCoords[idx].y + MAPCURSOR_Y_MIN;
 }
 
 static bool32 RegionMap_IsPlayerInCave(u8 mapSecId)
-- 
cgit v1.2.3


From 2e0b1700f42769e0aa2df2b45c4015056b36c806 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 1 Nov 2017 22:12:18 -0400
Subject: sRegionMap_MapSecAquaHideoutOld

---
 src/region_map.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 9fbb8cc47..195694988 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -189,7 +189,10 @@ static const struct UCoords16 sTerraCaveLocationCoords[] = {
     {0x18, 0x0a}
 };
 
-extern const u8 gUnknown_085A1BCC[];
+static const u8 sRegionMap_MapSecAquaHideoutOld[] = {
+    MAPSEC_AQUA_HIDEOUT_OLD
+};
+
 extern const struct SpritePalette gUnknown_085A1C00;
 extern const struct SpriteTemplate gUnknown_085A1C08;
 extern const struct OamData gUnknown_085A1C20;
@@ -1009,11 +1012,11 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y)
 
 static bool32 RegionMap_IsPlayerInCave(u8 mapSecId)
 {
-    int i;
+    u32 i;
 
-    for (i = 0; i == 0; i ++)
+    for (i = 0; i < 1; i ++)
     {
-        if (gUnknown_085A1BCC[i] == mapSecId)
+        if (sRegionMap_MapSecAquaHideoutOld[i] == mapSecId)
         {
             return TRUE;
         }
-- 
cgit v1.2.3


From 30d68db0dceaaef385e2a00a749ea365b5cb658a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 1 Nov 2017 22:26:54 -0400
Subject: sRegionMapCursorSpriteTemplate

---
 src/region_map.c | 42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 195694988..a8bf2dcfb 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -75,6 +75,7 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y);
 static bool32 RegionMap_IsPlayerInCave(u8 mapSecId);
 static void RegionMap_GetPositionOfCursorWithinMapSection(void);
 static bool8 RegionMap_IsMapSecIdInNextRow(u16 y);
+static void SpriteCallback_CursorFull(struct Sprite *sprite);
 static void FreeRegionMapCursorSprite(void);
 static void HideRegionMapPlayerIcon(void);
 static void UnhideRegionMapPlayerIcon(void);
@@ -193,8 +194,41 @@ static const u8 sRegionMap_MapSecAquaHideoutOld[] = {
     MAPSEC_AQUA_HIDEOUT_OLD
 };
 
-extern const struct SpritePalette gUnknown_085A1C00;
-extern const struct SpriteTemplate gUnknown_085A1C08;
+static const struct OamData sRegionMapCursorOam = {
+    .size = 1, .priority = 1
+};
+
+static const union AnimCmd sRegionMapCursorAnim1[] = {
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(4, 20),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd sRegionMapCursorAnim2[] = {
+    ANIMCMD_FRAME( 0, 10),
+    ANIMCMD_FRAME(16, 10),
+    ANIMCMD_FRAME(32, 10),
+    ANIMCMD_FRAME(16, 10),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sRegionMapCursorAnimTable[] = {
+    sRegionMapCursorAnim1,
+    sRegionMapCursorAnim2
+};
+
+static const struct SpritePalette sRegionMapCursorSpritePalette = { sRegionMapCursorPal, 0 };
+
+static const struct SpriteTemplate sRegionMapCursorSpriteTemplate = {
+    0,
+    0,
+    &sRegionMapCursorOam,
+    sRegionMapCursorAnimTable,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallback_CursorFull
+};
+
 extern const struct OamData gUnknown_085A1C20;
 extern const union AnimCmd *const gUnknown_085A1C30[];
 extern const u8 gUnknown_085A1C34[];
@@ -1117,8 +1151,8 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
     struct SpritePalette palette;
     struct SpriteSheet sheet;
 
-    palette = gUnknown_085A1C00;
-    template = gUnknown_085A1C08;
+    palette = sRegionMapCursorSpritePalette;
+    template = sRegionMapCursorSpriteTemplate;
     sheet.tag = tileTag;
     template.tileTag = tileTag;
     gRegionMap->cursorTileTag = tileTag;
-- 
cgit v1.2.3


From c99a08d448dd6d58d4a52924d5ad17483055194d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 1 Nov 2017 23:00:22 -0400
Subject: More data decomp in region_map

---
 src/region_map.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 99 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index a8bf2dcfb..e0273b7bb 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -229,19 +229,103 @@ static const struct SpriteTemplate sRegionMapCursorSpriteTemplate = {
     SpriteCallback_CursorFull
 };
 
-extern const struct OamData gUnknown_085A1C20;
-extern const union AnimCmd *const gUnknown_085A1C30[];
-extern const u8 gUnknown_085A1C34[];
-extern const u16 gUnknown_085A1C38[];
-extern const u8 gUnknown_085A1C58[];
-extern const u8 gUnknown_085A1C90[];
-extern const u8 gUnknown_085A1D68[];
-extern const u8 gUnknown_085A1E3C[][3];
-extern const struct {
+static const struct OamData sRegionMapPlayerIconOam = {
+    .size = 1, .priority = 2
+};
+
+static const union AnimCmd sRegionMapPlayerIconAnim1[] = {
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sRegionMapPlayerIconAnimTable[] = {
+    sRegionMapPlayerIconAnim1
+};
+
+static const u8 sRegionMapEventSectionIds[] = {
+    MAPSEC_BIRTH_ISLAND_2,
+    MAPSEC_FARAWAY_ISLAND,
+    MAPSEC_NAVEL_ROCK2
+};
+
+static const u16 sRegionMapFramePal[] = INCBIN_U16("graphics/pokenav/map_frame.gbapal");
+
+static const u8 sRegionMapFrameGfxLZ[] = INCBIN_U8("graphics/pokenav/map_frame.4bpp.lz");
+
+static const u8 sRegionMapFrameTilemapLZ[] = INCBIN_U8("graphics/pokenav/map_frame.bin.lz");
+
+static const u16 Unknown_085A1D48[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal");
+
+static const u8 gUnknown_085A1D68[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
+
+static const u8 gUnknown_085A1E3C[][3] = {
+    {MAP_GROUP_LITTLEROOT_TOWN, MAP_ID_LITTLEROOT_TOWN, 1},
+    {MAP_GROUP_OLDALE_TOWN, MAP_ID_OLDALE_TOWN, 14},
+    {MAP_GROUP_DEWFORD_TOWN, MAP_ID_DEWFORD_TOWN, 15},
+    {MAP_GROUP_LAVARIDGE_TOWN, MAP_ID_LAVARIDGE_TOWN, 16},
+    {MAP_GROUP_FALLARBOR_TOWN, MAP_ID_FALLARBOR_TOWN, 17},
+    {MAP_GROUP_VERDANTURF_TOWN, MAP_ID_VERDANTURF_TOWN, 18},
+    {MAP_GROUP_PACIFIDLOG_TOWN, MAP_ID_PACIFIDLOG_TOWN, 19},
+    {MAP_GROUP_PETALBURG_CITY, MAP_ID_PETALBURG_CITY, 3},
+    {MAP_GROUP_SLATEPORT_CITY, MAP_ID_SLATEPORT_CITY, 4},
+    {MAP_GROUP_MAUVILLE_CITY, MAP_ID_MAUVILLE_CITY, 5},
+    {MAP_GROUP_RUSTBORO_CITY, MAP_ID_RUSTBORO_CITY, 6},
+    {MAP_GROUP_FORTREE_CITY, MAP_ID_FORTREE_CITY, 7},
+    {MAP_GROUP_LILYCOVE_CITY, MAP_ID_LILYCOVE_CITY, 8},
+    {MAP_GROUP_MOSSDEEP_CITY, MAP_ID_MOSSDEEP_CITY, 9},
+    {MAP_GROUP_SOOTOPOLIS_CITY, MAP_ID_SOOTOPOLIS_CITY, 10},
+    {MAP_GROUP_EVER_GRANDE_CITY, MAP_ID_EVER_GRANDE_CITY, 11},
+    {MAP_GROUP_ROUTE101, MAP_ID_ROUTE101, 0},
+    {MAP_GROUP_ROUTE102, MAP_ID_ROUTE102, 0},
+    {MAP_GROUP_ROUTE103, MAP_ID_ROUTE103, 0},
+    {MAP_GROUP_ROUTE104, MAP_ID_ROUTE104, 0},
+    {MAP_GROUP_ROUTE105, MAP_ID_ROUTE105, 0},
+    {MAP_GROUP_ROUTE106, MAP_ID_ROUTE106, 0},
+    {MAP_GROUP_ROUTE107, MAP_ID_ROUTE107, 0},
+    {MAP_GROUP_ROUTE108, MAP_ID_ROUTE108, 0},
+    {MAP_GROUP_ROUTE109, MAP_ID_ROUTE109, 0},
+    {MAP_GROUP_ROUTE110, MAP_ID_ROUTE110, 0},
+    {MAP_GROUP_ROUTE111, MAP_ID_ROUTE111, 0},
+    {MAP_GROUP_ROUTE112, MAP_ID_ROUTE112, 0},
+    {MAP_GROUP_ROUTE113, MAP_ID_ROUTE113, 0},
+    {MAP_GROUP_ROUTE114, MAP_ID_ROUTE114, 0},
+    {MAP_GROUP_ROUTE115, MAP_ID_ROUTE115, 0},
+    {MAP_GROUP_ROUTE116, MAP_ID_ROUTE116, 0},
+    {MAP_GROUP_ROUTE117, MAP_ID_ROUTE117, 0},
+    {MAP_GROUP_ROUTE118, MAP_ID_ROUTE118, 0},
+    {MAP_GROUP_ROUTE119, MAP_ID_ROUTE119, 0},
+    {MAP_GROUP_ROUTE120, MAP_ID_ROUTE120, 0},
+    {MAP_GROUP_ROUTE121, MAP_ID_ROUTE121, 0},
+    {MAP_GROUP_ROUTE122, MAP_ID_ROUTE122, 0},
+    {MAP_GROUP_ROUTE123, MAP_ID_ROUTE123, 0},
+    {MAP_GROUP_ROUTE124, MAP_ID_ROUTE124, 0},
+    {MAP_GROUP_ROUTE125, MAP_ID_ROUTE125, 0},
+    {MAP_GROUP_ROUTE126, MAP_ID_ROUTE126, 0},
+    {MAP_GROUP_ROUTE127, MAP_ID_ROUTE127, 0},
+    {MAP_GROUP_ROUTE128, MAP_ID_ROUTE128, 0},
+    {MAP_GROUP_ROUTE129, MAP_ID_ROUTE129, 0},
+    {MAP_GROUP_ROUTE130, MAP_ID_ROUTE130, 0},
+    {MAP_GROUP_ROUTE131, MAP_ID_ROUTE131, 0},
+    {MAP_GROUP_ROUTE132, MAP_ID_ROUTE132, 0},
+    {MAP_GROUP_ROUTE133, MAP_ID_ROUTE133, 0},
+    {MAP_GROUP_ROUTE134, MAP_ID_ROUTE134, 0}
+};
+
+static const u8 *const gUnknown_085A1ED4[] = {
+    gUnknown_085EC782,
+    gUnknown_085EC791
+};
+
+static const struct {
     const u8 *const *name;
     u16 mapSecId;
     u16 flag;
-} gUnknown_085A1EDC[];
+} gUnknown_085A1EDC[] = {
+    gUnknown_085A1ED4,
+    MAPSEC_EVER_GRANDE_CITY,
+    SYS_POKEMON_LEAGUE_FLY
+};
+
 extern const struct BgTemplate gUnknown_085A1EE4[];
 extern const struct WindowTemplate gUnknown_085A1EF0[];
 extern const struct SpritePalette gUnknown_085A1F10;
@@ -1221,7 +1305,7 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
     u8 spriteId;
     struct SpriteSheet sheet = {sRegionMapPlayerIcon_BrendanGfx, 0x80, tileTag};
     struct SpritePalette palette = {sRegionMapPlayerIcon_BrendanPal, paletteTag};
-    struct SpriteTemplate template = {tileTag, paletteTag, &gUnknown_085A1C20, gUnknown_085A1C30, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
+    struct SpriteTemplate template = {tileTag, paletteTag, &sRegionMapPlayerIconOam, sRegionMapPlayerIconAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
 
     if (sub_8124668(gMapHeader.regionMapSectionId))
     {
@@ -1412,7 +1496,7 @@ bool32 sub_8124668(u8 mapSecId)
 
     for (i = 0; i < 3; i ++)
     {
-        if (mapSecId == gUnknown_085A1C34[i])
+        if (mapSecId == sRegionMapEventSectionIds[i])
         {
             return TRUE;
         }
@@ -1475,15 +1559,15 @@ void MCB2_FlyMap(void)
             gMain.state ++;
             break;
         case 5:
-            LZ77UnCompVram(gUnknown_085A1C58, (u16 *)BG_CHAR_ADDR(3));
+            LZ77UnCompVram(sRegionMapFrameGfxLZ, (u16 *)BG_CHAR_ADDR(3));
             gMain.state ++;
             break;
         case 6:
-            LZ77UnCompVram(gUnknown_085A1C90, (u16 *)BG_SCREEN_ADDR(30));
+            LZ77UnCompVram(sRegionMapFrameTilemapLZ, (u16 *)BG_SCREEN_ADDR(30));
             gMain.state ++;
             break;
         case 7:
-            LoadPalette(gUnknown_085A1C38, 0x10, 0x20);
+            LoadPalette(sRegionMapFramePal, 0x10, 0x20);
             PutWindowTilemap(2);
             FillWindowPixelBuffer(2, 0x00);
             PrintTextOnWindow(2, 1, gText_FlyToWhere, 0, 1, 0, NULL);
-- 
cgit v1.2.3


From 22f65174237cb16d69aedaf8bff54057ed966e8c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 1 Nov 2017 23:21:07 -0400
Subject: Decompile remaining region map data

---
 src/region_map.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 80 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index e0273b7bb..0f0fb1dca 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -326,11 +326,86 @@ static const struct {
     SYS_POKEMON_LEAGUE_FLY
 };
 
-extern const struct BgTemplate gUnknown_085A1EE4[];
-extern const struct WindowTemplate gUnknown_085A1EF0[];
-extern const struct SpritePalette gUnknown_085A1F10;
-extern const u16 gUnknown_085A1F18[][2];
-extern const struct SpriteTemplate gUnknown_085A1F7C;
+static const struct BgTemplate gUnknown_085A1EE4[] = {
+    { .bg = 0, .charBaseIndex = 0, .mapBaseIndex = 31, .screenSize = 0, .paletteMode = 0, .priority = 0 },
+    { .bg = 1, .charBaseIndex = 3, .mapBaseIndex = 30, .screenSize = 0, .paletteMode = 0, .priority = 1 },
+    { .bg = 2, .charBaseIndex = 2, .mapBaseIndex = 28, .screenSize = 2, .paletteMode = 1, .priority = 2 }
+};
+
+static const struct WindowTemplate gUnknown_085A1EF0[] = {
+    { 0, 17, 17, 12,  2, 15, 0x01 },
+    { 0, 17, 15, 12,  4, 15, 0x19 },
+    { 0,  1, 18, 14,  2, 15, 0x49 },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct SpritePalette gUnknown_085A1F10 = {
+    Unknown_085A1D48, 2
+};
+
+static const u16 gUnknown_085A1F18[][2] = {
+    {FLAG_UNLOCK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER},
+    {-1, MAPSEC_NONE}
+};
+
+static const struct OamData gOamData_085A1F20 = {
+    .priority = 2
+};
+
+static const union AnimCmd gUnknown_085A1F28[] = {
+    ANIMCMD_FRAME( 0, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gUnknown_085A1F30[] = {
+    ANIMCMD_FRAME( 1, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gUnknown_085A1F38[] = {
+    ANIMCMD_FRAME( 3, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gUnknown_085A1F40[] = {
+    ANIMCMD_FRAME( 5, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gUnknown_085A1F48[] = {
+    ANIMCMD_FRAME( 6, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gUnknown_085A1F50[] = {
+    ANIMCMD_FRAME( 8, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gUnknown_085A1F58[] = {
+    ANIMCMD_FRAME(10, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const gUnknown_085A1F60[] = {
+    gUnknown_085A1F28,
+    gUnknown_085A1F30,
+    gUnknown_085A1F38,
+    gUnknown_085A1F40,
+    gUnknown_085A1F48,
+    gUnknown_085A1F50,
+    gUnknown_085A1F58
+};
+
+static const struct SpriteTemplate gUnknown_085A1F7C = {
+    2,
+    2,
+    &gOamData_085A1F20,
+    gUnknown_085A1F60,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
 
 // .text
 
-- 
cgit v1.2.3


From 1b499670bd8a428f9b0d5506c334aa88bf4272a3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 1 Nov 2017 23:29:02 -0400
Subject: IWRAM and EWRAM symbols in region_map

---
 src/region_map.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 0f0fb1dca..5481606e9 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -44,8 +44,8 @@ struct RegionMapLocation
 
 // Static RAM declarations
 
-EWRAM_DATA struct RegionMap *gRegionMap = NULL;
-EWRAM_DATA struct {
+static EWRAM_DATA struct RegionMap *gRegionMap = NULL;
+static EWRAM_DATA struct {
     /*0x000*/ void (*unk_000)(void);
     /*0x004*/ u16 unk_004;
     /*0x006*/ u16 mapSecId;
@@ -55,7 +55,8 @@ EWRAM_DATA struct {
     /*0xa72*/ bool8 unk_a72;
 } *gUnknown_0203A148 = NULL; // a74
 
-IWRAM_DATA bool32 gUnknown_03001180;
+static bool32 gUnknown_03001180;
+static bool32 gUnknown_03001184;
 
 // Static ROM declarations
 
-- 
cgit v1.2.3


From 5243285ab2cbf895f28e9866e3f5671326422348 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 2 Nov 2017 18:19:49 +0100
Subject: start working on battle 7

---
 src/battle_7.c | 284 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 284 insertions(+)
 create mode 100644 src/battle_7.c

(limited to 'src')

diff --git a/src/battle_7.c b/src/battle_7.c
new file mode 100644
index 000000000..8e21f9df5
--- /dev/null
+++ b/src/battle_7.c
@@ -0,0 +1,284 @@
+#include "global.h"
+#include "battle.h"
+#include "battle_controllers.h"
+#include "battle_ai_script_commands.h"
+#include "malloc.h"
+#include "rng.h"
+#include "util.h"
+#include "pokemon.h"
+#include "moves.h"
+
+extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
+extern u8 gActiveBank;
+extern u16 gUnknown_020243FC;
+extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+
+extern const struct BattleMove gBattleMoves[];
+extern const u8 gUnknown_0831C604[];
+
+// this file's functions
+u8 sub_805D4A8(u16 move);
+u16 BattlePalaceGetTargetRetValue(void);
+void sub_805D7EC(struct Sprite *sprite);
+
+void AllocateBattleSpritesData(void)
+{
+    gBattleSpritesDataPtr = AllocZeroed(sizeof(struct BattleSpriteData));
+    gBattleSpritesDataPtr->bankData = AllocZeroed(sizeof(struct BattleSpriteInfo) * BATTLE_BANKS_COUNT);
+    gBattleSpritesDataPtr->healthBoxesData = AllocZeroed(sizeof(struct BattleHealthboxInfo) * BATTLE_BANKS_COUNT);
+    gBattleSpritesDataPtr->animationData = AllocZeroed(sizeof(struct BattleAnimationInfo));
+    gBattleSpritesDataPtr->battleBars = AllocZeroed(sizeof(struct BattleBarInfo) * BATTLE_BANKS_COUNT);
+}
+
+void FreeBattleSpritesData(void)
+{
+    if (gBattleSpritesDataPtr == NULL)
+        return;
+
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr->battleBars);
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr->animationData);
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr->healthBoxesData);
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr->bankData);
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr);
+}
+
+u16 ChooseMoveAndTargetInBattlePalace(void)
+{
+    s32 i, var1, var2;
+    s32 chosenMoveId = -1;
+    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
+    u8 unusableMovesBits = CheckMoveLimitations(gActiveBank, 0, 0xFF);
+    s32 percent = Random() % 100;
+
+    i = (gBattleStruct->field_92 & gBitTable[gActiveBank]) ? 2 : 0;
+    var2 = i;
+    var1 = i + 2;
+
+    for (; i < var1; i++)
+    {
+        if (gUnknown_0831C494[GetNatureFromPersonality(gBattleMons[gActiveBank].personality)][i] > percent)
+            break;
+    }
+
+    percent = i - var2;
+    if (i == var1)
+        percent = 2;
+
+    for (var2 = 0, i = 0; i < 4; i++)
+    {
+        if (moveInfo->moves[i] == MOVE_NONE)
+            break;
+        if (percent == sub_805D4A8(moveInfo->moves[i]) && moveInfo->currentPp[i] != 0)
+            var2 |= gBitTable[i];
+    }
+
+    if (var2 != 0)
+    {
+        gBattleStruct->field_92 &= 0xF;
+        gBattleStruct->field_92 |= (var2 << 4);
+        BattleAI_SetupAIData(var2);
+        chosenMoveId = BattleAI_ChooseMoveOrAction();
+    }
+
+    if (chosenMoveId == -1)
+    {
+        if (unusableMovesBits != 0xF)
+        {
+            var1 = 0, var2 = 0;
+
+            for (i = 0; i < 4; i++)
+            {
+                if (sub_805D4A8(moveInfo->moves[i]) == 0 && !(gBitTable[i] & unusableMovesBits))
+                    var1 += 0x1;
+                if (sub_805D4A8(moveInfo->moves[i]) == 1 && !(gBitTable[i] & unusableMovesBits))
+                    var1 += 0x10;
+                if (sub_805D4A8(moveInfo->moves[i]) == 2 && !(gBitTable[i] & unusableMovesBits))
+                    var1 += 0x100;
+            }
+
+            if ((var1 & 0xF) > 1)
+                var2++;
+            if ((var1 & 0xF0) > 0x1F)
+                var2++;
+            if ((var1 & 0xF0) > 0x1FF)
+                var2++;
+
+            if (var2 > 1 || var2 == 0)
+            {
+                do
+                {
+                    i = Random() % 4;
+                    if (!(gBitTable[i] & unusableMovesBits))
+                        chosenMoveId = i;
+                } while (chosenMoveId == -1);
+            }
+            else
+            {
+                if ((var1 & 0xF) > 1)
+                    var2 = 0;
+                if ((var1 & 0xF0) > 0x1F)
+                    var2 = 1;
+                if ((var1 & 0xF0) > 0x1FF)
+                    var2 = 2;
+
+                do
+                {
+                    i = Random() % 4;
+                    if (!(gBitTable[i] & unusableMovesBits) && var2 == sub_805D4A8(moveInfo->moves[i]))
+                        chosenMoveId = i;
+                } while (chosenMoveId == -1);
+            }
+
+            if (Random() % 100 > 49)
+            {
+                gProtectStructs[gActiveBank].flag_x10 = 1;
+                return 0;
+            }
+        }
+        else
+        {
+            gProtectStructs[gActiveBank].flag_x10 = 1;
+            return 0;
+        }
+    }
+
+    if (moveInfo->moves[chosenMoveId] == MOVE_CURSE)
+    {
+        if (moveInfo->monType1 != TYPE_GHOST && moveInfo->monType2 != TYPE_GHOST)
+            var1 = MOVE_TARGET_x10;
+        else
+            var1 = MOVE_TARGET_SELECTED;
+    }
+    else
+    {
+        var1 = gBattleMoves[moveInfo->moves[chosenMoveId]].target;
+    }
+
+    if (var1 & MOVE_TARGET_x10)
+        chosenMoveId |= (gActiveBank << 8);
+    else if (var1 == MOVE_TARGET_SELECTED)
+        chosenMoveId |= (BattlePalaceGetTargetRetValue());
+    else
+        chosenMoveId |= (GetBankByIdentity((GetBankIdentity(gActiveBank) & BIT_SIDE) ^ BIT_SIDE) << 8);
+
+    return chosenMoveId;
+}
+
+u8 sub_805D4A8(u16 move)
+{
+    switch (gBattleMoves[move].target)
+    {
+    case MOVE_TARGET_SELECTED:
+    case MOVE_TARGET_USER:
+    case MOVE_TARGET_RANDOM:
+    case MOVE_TARGET_BOTH:
+    case MOVE_TARGET_FOES_AND_ALLY:
+        if (gBattleMoves[move].power == 0)
+            return 2;
+        else
+            return 0;
+        break;
+    case MOVE_TARGET_DEPENDS:
+    case MOVE_TARGET_OPPONENTS_FIELD:
+        return 2;
+    case MOVE_TARGET_x10:
+        return 1;
+    default:
+        return 0;
+    }
+}
+
+u16 BattlePalaceGetTargetRetValue(void)
+{
+    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
+    {
+        u8 opposing1, opposing2;
+
+        if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+        {
+            opposing1 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+            opposing2 = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+        }
+        else
+        {
+            opposing1 = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+            opposing2 = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+        }
+
+        if (gBattleMons[opposing1].hp == gBattleMons[opposing2].hp)
+            return (((gActiveBank & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
+
+        switch (gUnknown_0831C604[GetNatureFromPersonality(gBattleMons[gActiveBank].personality)])
+        {
+        case 0:
+            if (gBattleMons[opposing1].hp > gBattleMons[opposing2].hp)
+                return opposing1 << 8;
+            else
+                return opposing2 << 8;
+        case 1:
+            if (gBattleMons[opposing1].hp < gBattleMons[opposing2].hp)
+                return opposing1 << 8;
+            else
+                return opposing2 << 8;
+        case 2:
+            return (((gActiveBank & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
+        }
+    }
+
+    return (gActiveBank ^ BIT_SIDE) << 8;
+}
+
+void sub_805D714(struct Sprite *sprite)
+{
+    u8 spriteId = sprite->data1;
+
+    if (!gSprites[spriteId].affineAnimEnded)
+        return;
+    if (gSprites[spriteId].invisible)
+        return;
+
+    if (gSprites[spriteId].animPaused)
+    {
+        gSprites[spriteId].animPaused = 0;
+    }
+    else
+    {
+        if (gSprites[spriteId].animEnded)
+            sprite->callback = SpriteCallbackDummy;
+    }
+}
+
+void sub_805D770(struct Sprite *sprite, bool8 arg1)
+{
+    sprite->animPaused = 1;
+    sprite->callback = SpriteCallbackDummy;
+
+    if (!arg1)
+        StartSpriteAffineAnim(sprite, 1);
+    else
+        StartSpriteAffineAnim(sprite, 1);
+
+    AnimateSprite(sprite);
+}
+
+void sub_805D7AC(struct Sprite *sprite)
+{
+    if (!(gUnknown_020243FC & 1))
+    {
+        sprite->pos2.x += sprite->data0;
+        if (sprite->pos2.x == 0)
+        {
+            if (sprite->pos2.y != 0)
+                sprite->callback = sub_805D7EC;
+            else
+                sprite->callback = SpriteCallbackDummy;
+        }
+    }
+}
+
+void sub_805D7EC(struct Sprite *sprite)
+{
+    sprite->pos2.y -= 2;
+    if (sprite->pos2.y == 0)
+        sprite->callback = SpriteCallbackDummy;
+}
-- 
cgit v1.2.3


From 6c8155074b67cce4dd5a6aa01d83bc6830b9d1c8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 4 Nov 2017 16:11:13 +0100
Subject: battle 7 is decompiled

---
 src/battle_2.c                            |    4 +-
 src/battle_7.c                            |  284 -------
 src/battle_controller_link_opponent.c     |   28 +-
 src/battle_controller_link_partner.c      |   32 +-
 src/battle_controller_opponent.c          |   28 +-
 src/battle_controller_player.c            |   42 +-
 src/battle_controller_player_partner.c    |   34 +-
 src/battle_controller_recorded_opponent.c |   28 +-
 src/battle_controller_recorded_player.c   |   36 +-
 src/battle_controller_safari.c            |    8 +-
 src/battle_controller_wally.c             |   24 +-
 src/battle_dome_cards.c                   |    4 +-
 src/battle_gfx_sfx_util.c                 | 1299 +++++++++++++++++++++++++++++
 src/battle_interface.c                    |   10 +-
 src/battle_script_commands.c              |   47 +-
 src/pokemon_3.c                           |    6 +-
 src/reshow_battle_screen.c                |   14 +-
 17 files changed, 1477 insertions(+), 451 deletions(-)
 delete mode 100644 src/battle_7.c
 create mode 100644 src/battle_gfx_sfx_util.c

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 24b43bdbd..e4ee624fb 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -4767,7 +4767,7 @@ static void HandleEndTurn_BattleWon(void)
     else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
             && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER))
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon;
 
         if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE)
@@ -4777,7 +4777,7 @@ static void HandleEndTurn_BattleWon(void)
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon;
 
         switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
diff --git a/src/battle_7.c b/src/battle_7.c
deleted file mode 100644
index 8e21f9df5..000000000
--- a/src/battle_7.c
+++ /dev/null
@@ -1,284 +0,0 @@
-#include "global.h"
-#include "battle.h"
-#include "battle_controllers.h"
-#include "battle_ai_script_commands.h"
-#include "malloc.h"
-#include "rng.h"
-#include "util.h"
-#include "pokemon.h"
-#include "moves.h"
-
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gActiveBank;
-extern u16 gUnknown_020243FC;
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-
-extern const struct BattleMove gBattleMoves[];
-extern const u8 gUnknown_0831C604[];
-
-// this file's functions
-u8 sub_805D4A8(u16 move);
-u16 BattlePalaceGetTargetRetValue(void);
-void sub_805D7EC(struct Sprite *sprite);
-
-void AllocateBattleSpritesData(void)
-{
-    gBattleSpritesDataPtr = AllocZeroed(sizeof(struct BattleSpriteData));
-    gBattleSpritesDataPtr->bankData = AllocZeroed(sizeof(struct BattleSpriteInfo) * BATTLE_BANKS_COUNT);
-    gBattleSpritesDataPtr->healthBoxesData = AllocZeroed(sizeof(struct BattleHealthboxInfo) * BATTLE_BANKS_COUNT);
-    gBattleSpritesDataPtr->animationData = AllocZeroed(sizeof(struct BattleAnimationInfo));
-    gBattleSpritesDataPtr->battleBars = AllocZeroed(sizeof(struct BattleBarInfo) * BATTLE_BANKS_COUNT);
-}
-
-void FreeBattleSpritesData(void)
-{
-    if (gBattleSpritesDataPtr == NULL)
-        return;
-
-    FREE_AND_SET_NULL(gBattleSpritesDataPtr->battleBars);
-    FREE_AND_SET_NULL(gBattleSpritesDataPtr->animationData);
-    FREE_AND_SET_NULL(gBattleSpritesDataPtr->healthBoxesData);
-    FREE_AND_SET_NULL(gBattleSpritesDataPtr->bankData);
-    FREE_AND_SET_NULL(gBattleSpritesDataPtr);
-}
-
-u16 ChooseMoveAndTargetInBattlePalace(void)
-{
-    s32 i, var1, var2;
-    s32 chosenMoveId = -1;
-    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
-    u8 unusableMovesBits = CheckMoveLimitations(gActiveBank, 0, 0xFF);
-    s32 percent = Random() % 100;
-
-    i = (gBattleStruct->field_92 & gBitTable[gActiveBank]) ? 2 : 0;
-    var2 = i;
-    var1 = i + 2;
-
-    for (; i < var1; i++)
-    {
-        if (gUnknown_0831C494[GetNatureFromPersonality(gBattleMons[gActiveBank].personality)][i] > percent)
-            break;
-    }
-
-    percent = i - var2;
-    if (i == var1)
-        percent = 2;
-
-    for (var2 = 0, i = 0; i < 4; i++)
-    {
-        if (moveInfo->moves[i] == MOVE_NONE)
-            break;
-        if (percent == sub_805D4A8(moveInfo->moves[i]) && moveInfo->currentPp[i] != 0)
-            var2 |= gBitTable[i];
-    }
-
-    if (var2 != 0)
-    {
-        gBattleStruct->field_92 &= 0xF;
-        gBattleStruct->field_92 |= (var2 << 4);
-        BattleAI_SetupAIData(var2);
-        chosenMoveId = BattleAI_ChooseMoveOrAction();
-    }
-
-    if (chosenMoveId == -1)
-    {
-        if (unusableMovesBits != 0xF)
-        {
-            var1 = 0, var2 = 0;
-
-            for (i = 0; i < 4; i++)
-            {
-                if (sub_805D4A8(moveInfo->moves[i]) == 0 && !(gBitTable[i] & unusableMovesBits))
-                    var1 += 0x1;
-                if (sub_805D4A8(moveInfo->moves[i]) == 1 && !(gBitTable[i] & unusableMovesBits))
-                    var1 += 0x10;
-                if (sub_805D4A8(moveInfo->moves[i]) == 2 && !(gBitTable[i] & unusableMovesBits))
-                    var1 += 0x100;
-            }
-
-            if ((var1 & 0xF) > 1)
-                var2++;
-            if ((var1 & 0xF0) > 0x1F)
-                var2++;
-            if ((var1 & 0xF0) > 0x1FF)
-                var2++;
-
-            if (var2 > 1 || var2 == 0)
-            {
-                do
-                {
-                    i = Random() % 4;
-                    if (!(gBitTable[i] & unusableMovesBits))
-                        chosenMoveId = i;
-                } while (chosenMoveId == -1);
-            }
-            else
-            {
-                if ((var1 & 0xF) > 1)
-                    var2 = 0;
-                if ((var1 & 0xF0) > 0x1F)
-                    var2 = 1;
-                if ((var1 & 0xF0) > 0x1FF)
-                    var2 = 2;
-
-                do
-                {
-                    i = Random() % 4;
-                    if (!(gBitTable[i] & unusableMovesBits) && var2 == sub_805D4A8(moveInfo->moves[i]))
-                        chosenMoveId = i;
-                } while (chosenMoveId == -1);
-            }
-
-            if (Random() % 100 > 49)
-            {
-                gProtectStructs[gActiveBank].flag_x10 = 1;
-                return 0;
-            }
-        }
-        else
-        {
-            gProtectStructs[gActiveBank].flag_x10 = 1;
-            return 0;
-        }
-    }
-
-    if (moveInfo->moves[chosenMoveId] == MOVE_CURSE)
-    {
-        if (moveInfo->monType1 != TYPE_GHOST && moveInfo->monType2 != TYPE_GHOST)
-            var1 = MOVE_TARGET_x10;
-        else
-            var1 = MOVE_TARGET_SELECTED;
-    }
-    else
-    {
-        var1 = gBattleMoves[moveInfo->moves[chosenMoveId]].target;
-    }
-
-    if (var1 & MOVE_TARGET_x10)
-        chosenMoveId |= (gActiveBank << 8);
-    else if (var1 == MOVE_TARGET_SELECTED)
-        chosenMoveId |= (BattlePalaceGetTargetRetValue());
-    else
-        chosenMoveId |= (GetBankByIdentity((GetBankIdentity(gActiveBank) & BIT_SIDE) ^ BIT_SIDE) << 8);
-
-    return chosenMoveId;
-}
-
-u8 sub_805D4A8(u16 move)
-{
-    switch (gBattleMoves[move].target)
-    {
-    case MOVE_TARGET_SELECTED:
-    case MOVE_TARGET_USER:
-    case MOVE_TARGET_RANDOM:
-    case MOVE_TARGET_BOTH:
-    case MOVE_TARGET_FOES_AND_ALLY:
-        if (gBattleMoves[move].power == 0)
-            return 2;
-        else
-            return 0;
-        break;
-    case MOVE_TARGET_DEPENDS:
-    case MOVE_TARGET_OPPONENTS_FIELD:
-        return 2;
-    case MOVE_TARGET_x10:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-u16 BattlePalaceGetTargetRetValue(void)
-{
-    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-    {
-        u8 opposing1, opposing2;
-
-        if (GetBankSide(gActiveBank) == SIDE_PLAYER)
-        {
-            opposing1 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
-            opposing2 = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
-        }
-        else
-        {
-            opposing1 = GetBankByIdentity(IDENTITY_PLAYER_MON1);
-            opposing2 = GetBankByIdentity(IDENTITY_PLAYER_MON2);
-        }
-
-        if (gBattleMons[opposing1].hp == gBattleMons[opposing2].hp)
-            return (((gActiveBank & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
-
-        switch (gUnknown_0831C604[GetNatureFromPersonality(gBattleMons[gActiveBank].personality)])
-        {
-        case 0:
-            if (gBattleMons[opposing1].hp > gBattleMons[opposing2].hp)
-                return opposing1 << 8;
-            else
-                return opposing2 << 8;
-        case 1:
-            if (gBattleMons[opposing1].hp < gBattleMons[opposing2].hp)
-                return opposing1 << 8;
-            else
-                return opposing2 << 8;
-        case 2:
-            return (((gActiveBank & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
-        }
-    }
-
-    return (gActiveBank ^ BIT_SIDE) << 8;
-}
-
-void sub_805D714(struct Sprite *sprite)
-{
-    u8 spriteId = sprite->data1;
-
-    if (!gSprites[spriteId].affineAnimEnded)
-        return;
-    if (gSprites[spriteId].invisible)
-        return;
-
-    if (gSprites[spriteId].animPaused)
-    {
-        gSprites[spriteId].animPaused = 0;
-    }
-    else
-    {
-        if (gSprites[spriteId].animEnded)
-            sprite->callback = SpriteCallbackDummy;
-    }
-}
-
-void sub_805D770(struct Sprite *sprite, bool8 arg1)
-{
-    sprite->animPaused = 1;
-    sprite->callback = SpriteCallbackDummy;
-
-    if (!arg1)
-        StartSpriteAffineAnim(sprite, 1);
-    else
-        StartSpriteAffineAnim(sprite, 1);
-
-    AnimateSprite(sprite);
-}
-
-void sub_805D7AC(struct Sprite *sprite)
-{
-    if (!(gUnknown_020243FC & 1))
-    {
-        sprite->pos2.x += sprite->data0;
-        if (sprite->pos2.x == 0)
-        {
-            if (sprite->pos2.y != 0)
-                sprite->callback = sub_805D7EC;
-            else
-                sprite->callback = SpriteCallbackDummy;
-        }
-    }
-}
-
-void sub_805D7EC(struct Sprite *sprite)
-{
-    sprite->pos2.y -= 2;
-    if (sprite->pos2.y == 0)
-        sprite->callback = SpriteCallbackDummy;
-}
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 968f6d49f..cb2ca0a4c 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -449,7 +449,7 @@ static void sub_8064C58(void)
     {
         FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
         DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_805EEE0(gActiveBank);
+        EnemyShadowCallbackToSetInvisible(gActiveBank);
         SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
         LinkOpponentBufferExecCompleted();
     }
@@ -485,7 +485,7 @@ static void sub_8064D60(void)
     if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattleBankFunc[gActiveBank] = sub_8064DD0;
     }
@@ -1164,7 +1164,7 @@ static void LinkOpponentHandleLoadMonSprite(void)
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                sub_80A5C6C(gActiveBank, 2),
-                                               sub_80A6138(gActiveBank),
+                                               GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
@@ -1198,7 +1198,7 @@ static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
       sub_80A5C6C(bank, 2),
-      sub_80A6138(bank),
+      GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
     gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
@@ -1227,7 +1227,7 @@ static void LinkOpponentHandleReturnMonToBall(void)
     {
         FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
         DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_805EEE0(gActiveBank);
+        EnemyShadowCallbackToSetInvisible(gActiveBank);
         SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
         LinkOpponentBufferExecCompleted();
     }
@@ -1239,7 +1239,7 @@ static void DoSwitchOutAnimation(void)
     {
     case 0:
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1247,7 +1247,7 @@ static void DoSwitchOutAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
             gBattleBankFunc[gActiveBank] = sub_8064C58;
         }
         break;
@@ -1382,7 +1382,7 @@ static void LinkOpponentHandleFaintAnimation(void)
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
     }
     else
@@ -1455,7 +1455,7 @@ static void LinkOpponentDoMoveAnimation(void)
             && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
         {
             gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1474,7 +1474,7 @@ static void LinkOpponentDoMoveAnimation(void)
             sub_805EB9C(1);
             if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
             {
-                DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
                 gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
@@ -1483,7 +1483,7 @@ static void LinkOpponentDoMoveAnimation(void)
     case 3:
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
-            sub_805E394();
+            CopyAllBattleSpritesInvisibilities();
             TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             LinkOpponentBufferExecCompleted();
@@ -1586,7 +1586,7 @@ static void LinkOpponentHandleStatusAnimation(void)
 {
     if (!mplay_80342A4(gActiveBank))
     {
-        DoStatusAnimation(gBattleBufferA[gActiveBank][1],
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
                         gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
         gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
     }
@@ -1698,7 +1698,7 @@ static void LinkOpponentHandlePlayFanfareOrBGM(void)
 {
     if (gBattleBufferA[gActiveBank][3])
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
     }
     else
@@ -1850,7 +1850,7 @@ static void LinkOpponentHandleBattleAnimation(void)
         u8 animationId = gBattleBufferA[gActiveBank][1];
         u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
 
-        if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
             LinkOpponentBufferExecCompleted();
         else
             gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 4a70a4dc1..79776c15d 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -312,7 +312,7 @@ static void CompleteOnHealthbarDone(void)
     }
     else
     {
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
         LinkPartnerBufferExecCompleted();
     }
 }
@@ -373,7 +373,7 @@ static void sub_814B4E0(void)
     {
         CopyBattleSpriteInvisibility(gActiveBank);
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattleBankFunc[gActiveBank] = sub_814B554;
     }
@@ -399,7 +399,7 @@ static void sub_814B5A8(void)
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
         StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
         UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
         sub_8076918(gActiveBank);
@@ -1026,7 +1026,7 @@ static void SetLinkPartnerMonData(u8 monId)
         break;
     }
 
-    sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
 }
 
 static void LinkPartnerHandleSetRawMonData(void)
@@ -1050,7 +1050,7 @@ static void LinkPartnerHandleLoadMonSprite(void)
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                sub_80A5C6C(gActiveBank, 2),
-                                               sub_80A6138(gActiveBank),
+                                               GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
     gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank;
@@ -1081,7 +1081,7 @@ static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
       sub_80A5C6C(bank, 2),
-      sub_80A6138(bank),
+      GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
     gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
@@ -1121,7 +1121,7 @@ static void DoSwitchOutAnimation(void)
     {
     case 0:
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1129,7 +1129,7 @@ static void DoSwitchOutAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
             gBattleBankFunc[gActiveBank] = sub_814B3DC;
         }
         break;
@@ -1201,7 +1201,7 @@ static void LinkPartnerHandleFaintAnimation(void)
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
     }
     else
@@ -1209,7 +1209,7 @@ static void LinkPartnerHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
             gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
             gSprites[gBankSpriteIds[gActiveBank]].data2 = 5;
@@ -1277,7 +1277,7 @@ static void LinkPartnerDoMoveAnimation(void)
             && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
         {
             gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1296,7 +1296,7 @@ static void LinkPartnerDoMoveAnimation(void)
             sub_805EB9C(1);
             if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
             {
-                DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
                 gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
@@ -1305,7 +1305,7 @@ static void LinkPartnerDoMoveAnimation(void)
     case 3:
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
-            sub_805E394();
+            CopyAllBattleSpritesInvisibilities();
             TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             LinkPartnerBufferExecCompleted();
@@ -1408,7 +1408,7 @@ static void LinkPartnerHandleStatusAnimation(void)
 {
     if (!mplay_80342A4(gActiveBank))
     {
-        DoStatusAnimation(gBattleBufferA[gActiveBank][1],
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
                         gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
         gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
     }
@@ -1520,7 +1520,7 @@ static void LinkPartnerHandlePlayFanfareOrBGM(void)
 {
     if (gBattleBufferA[gActiveBank][3])
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
     }
     else
@@ -1683,7 +1683,7 @@ static void LinkPartnerHandleBattleAnimation(void)
         u8 animationId = gBattleBufferA[gActiveBank][1];
         u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
 
-        if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
             LinkPartnerBufferExecCompleted();
         else
             gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 7ffd9d64b..831f434b0 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -437,7 +437,7 @@ static void sub_805FB08(void)
     {
         FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
         DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_805EEE0(gActiveBank);
+        EnemyShadowCallbackToSetInvisible(gActiveBank);
         SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
         OpponentBufferExecCompleted();
     }
@@ -473,7 +473,7 @@ static void sub_805FC10(void)
     if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
         gBattleBankFunc[gActiveBank] = sub_805FC80;
     }
 }
@@ -1152,7 +1152,7 @@ static void OpponentHandleLoadMonSprite(void)
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                sub_80A5C6C(gActiveBank, 2),
-                                               sub_80A6138(gActiveBank),
+                                               GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
@@ -1187,7 +1187,7 @@ static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
 
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
                                         sub_80A5C6C(bank, 2),
-                                        sub_80A6138(bank),
+                                        GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
     gSprites[gBankSpriteIds[bank]].data0 = bank;
@@ -1217,7 +1217,7 @@ static void OpponentHandleReturnMonToBall(void)
     {
         FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
         DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_805EEE0(gActiveBank);
+        EnemyShadowCallbackToSetInvisible(gActiveBank);
         SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
         OpponentBufferExecCompleted();
     }
@@ -1229,7 +1229,7 @@ static void DoSwitchOutAnimation(void)
     {
     case 0:
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1237,7 +1237,7 @@ static void DoSwitchOutAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
             gBattleBankFunc[gActiveBank] = sub_805FB08;
         }
         break;
@@ -1415,7 +1415,7 @@ static void OpponentHandleFaintAnimation(void)
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
     }
     else
@@ -1487,7 +1487,7 @@ static void OpponentDoMoveAnimation(void)
             && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
         {
             gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1506,7 +1506,7 @@ static void OpponentDoMoveAnimation(void)
             sub_805EB9C(1);
             if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
             {
-                DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
                 gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
@@ -1515,7 +1515,7 @@ static void OpponentDoMoveAnimation(void)
     case 3:
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
-            sub_805E394();
+            CopyAllBattleSpritesInvisibilities();
             TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             OpponentBufferExecCompleted();
@@ -1731,7 +1731,7 @@ static void OpponentHandleStatusAnimation(void)
 {
     if (!mplay_80342A4(gActiveBank))
     {
-        DoStatusAnimation(gBattleBufferA[gActiveBank][1],
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
                         gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
         gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
     }
@@ -1843,7 +1843,7 @@ static void OpponentHandlePlayFanfareOrBGM(void)
 {
     if (gBattleBufferA[gActiveBank][3])
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
     }
     else
@@ -2000,7 +2000,7 @@ static void OpponentHandleBattleAnimation(void)
         u8 animationId = gBattleBufferA[gActiveBank][1];
         u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
 
-        if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
             OpponentBufferExecCompleted();
         else
             gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 10d361cb9..91d3d55eb 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -1008,10 +1008,10 @@ static void sub_805896C(void)
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
 
         if (IsDoubleBattle())
-            sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], gActiveBank ^ BIT_MON);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], gActiveBank ^ BIT_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 3;
         gBattleBankFunc[gActiveBank] = sub_8058924;
@@ -1107,7 +1107,7 @@ static void sub_8058EDC(void)
         FreeSpritePaletteByTag(0x27F9);
 
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattleBankFunc[gActiveBank] = sub_8058FC0;
     }
@@ -1119,7 +1119,7 @@ static void sub_8058FC0(void)
         && !IsCryPlayingOrClearCrySongs())
     {
         m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
         PlayerBufferExecCompleted();
     }
 }
@@ -1164,7 +1164,7 @@ static void CompleteOnHealthbarDone(void)
     }
     else
     {
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
         PlayerBufferExecCompleted();
     }
 }
@@ -1305,7 +1305,7 @@ static void sub_8059544(u8 taskId)
     if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_MON])
         bank ^= BIT_MON;
 
-    DoSpecialBattleAnimation(bank, bank, bank, B_ANIM_LVL_UP);
+    InitAndLaunchSpecialAnimation(bank, bank, bank, B_ANIM_LVL_UP);
     gTasks[taskId].func = sub_80595A4;
 }
 
@@ -2193,7 +2193,7 @@ static void SetPlayerMonData(u8 monId)
         break;
     }
 
-    sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
 }
 
 static void PlayerHandleSetRawMonData(void)
@@ -2238,7 +2238,7 @@ static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
       sub_80A5C6C(bank, 2),
-      sub_80A6138(bank),
+      GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
     gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
@@ -2278,7 +2278,7 @@ static void DoSwitchOutAnimation(void)
     {
     case 0:
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -2286,7 +2286,7 @@ static void DoSwitchOutAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
             gBattleBankFunc[gActiveBank] = sub_8059744;
         }
         break;
@@ -2434,7 +2434,7 @@ static void PlayerHandleFaintAnimation(void)
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
     }
     else
@@ -2442,7 +2442,7 @@ static void PlayerHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
             gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
             gSprites[gBankSpriteIds[gActiveBank]].data2 = 5;
@@ -2462,7 +2462,7 @@ static void PlayerHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    DoSpecialBattleAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
@@ -2472,7 +2472,7 @@ static void PlayerHandleBallThrowAnim(void)
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    DoSpecialBattleAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
@@ -2525,7 +2525,7 @@ static void PlayerDoMoveAnimation(void)
             && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
         {
             gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -2544,7 +2544,7 @@ static void PlayerDoMoveAnimation(void)
             sub_805EB9C(1);
             if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
             {
-                DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
                 gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
@@ -2553,7 +2553,7 @@ static void PlayerDoMoveAnimation(void)
     case 3:
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
-            sub_805E394();
+            CopyAllBattleSpritesInvisibilities();
             TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             PlayerBufferExecCompleted();
@@ -2709,7 +2709,7 @@ static void PlayerHandleChoosePokemon(void)
 
 static void PlayerHandleCmd23(void)
 {
-    BattleMusicStop();
+    BattleStopLowHpSound();
     BeginNormalPaletteFade(-1, 2, 0, 16, 0);
     PlayerBufferExecCompleted();
 }
@@ -2788,7 +2788,7 @@ static void PlayerHandleStatusAnimation(void)
 {
     if (!mplay_80342A4(gActiveBank))
     {
-        DoStatusAnimation(gBattleBufferA[gActiveBank][1],
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
                         gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
         gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
     }
@@ -2930,7 +2930,7 @@ static void PlayerHandlePlayFanfareOrBGM(void)
 {
     if (gBattleBufferA[gActiveBank][3])
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
     }
     else
@@ -3088,7 +3088,7 @@ static void PlayerHandleBattleAnimation(void)
         u8 animationId = gBattleBufferA[gActiveBank][1];
         u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
 
-        if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
             PlayerBufferExecCompleted();
         else
             gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 34fd8a3eb..6ace9121c 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -327,7 +327,7 @@ static void CompleteOnHealthbarDone(void)
     }
     else
     {
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
         PlayerPartnerBufferExecCompleted();
     }
 }
@@ -469,7 +469,7 @@ static void sub_81BB628(u8 taskId)
     if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_MON])
         bank ^= BIT_MON;
 
-    DoSpecialBattleAnimation(bank, bank, bank, B_ANIM_LVL_UP);
+    InitAndLaunchSpecialAnimation(bank, bank, bank, B_ANIM_LVL_UP);
     gTasks[taskId].func = sub_81BB688;
 }
 
@@ -560,7 +560,7 @@ static void sub_81BB92C(void)
     {
         CopyBattleSpriteInvisibility(gActiveBank);
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattleBankFunc[gActiveBank] = sub_81BB9A0;
     }
@@ -586,7 +586,7 @@ static void sub_81BB9F4(void)
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
         StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
         UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
         sub_8076918(gActiveBank);
@@ -1213,7 +1213,7 @@ static void SetPlayerPartnerMonData(u8 monId)
         break;
     }
 
-    sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
 }
 
 static void PlayerPartnerHandleSetRawMonData(void)
@@ -1237,7 +1237,7 @@ static void PlayerPartnerHandleLoadMonSprite(void)
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                sub_80A5C6C(gActiveBank, 2),
-                                               sub_80A6138(gActiveBank),
+                                               GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
     gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank;
@@ -1268,7 +1268,7 @@ static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
       sub_80A5C6C(bank, 2),
-      sub_80A6138(bank),
+      GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
     gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
@@ -1308,7 +1308,7 @@ static void DoSwitchOutAnimation(void)
     {
     case 0:
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1316,7 +1316,7 @@ static void DoSwitchOutAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
             gBattleBankFunc[gActiveBank] = sub_81BB828;
         }
         break;
@@ -1395,7 +1395,7 @@ static void PlayerPartnerHandleFaintAnimation(void)
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
     }
     else
@@ -1403,7 +1403,7 @@ static void PlayerPartnerHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
             gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
             gSprites[gBankSpriteIds[gActiveBank]].data2 = 5;
@@ -1470,7 +1470,7 @@ static void PlayerPartnerDoMoveAnimation(void)
             && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
         {
             gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1489,7 +1489,7 @@ static void PlayerPartnerDoMoveAnimation(void)
             sub_805EB9C(1);
             if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
             {
-                DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
                 gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
@@ -1498,7 +1498,7 @@ static void PlayerPartnerDoMoveAnimation(void)
     case 3:
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
-            sub_805E394();
+            CopyAllBattleSpritesInvisibilities();
             TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             PlayerPartnerBufferExecCompleted();
@@ -1661,7 +1661,7 @@ static void PlayerPartnerHandleStatusAnimation(void)
 {
     if (!mplay_80342A4(gActiveBank))
     {
-        DoStatusAnimation(gBattleBufferA[gActiveBank][1],
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
                         gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
         gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
     }
@@ -1773,7 +1773,7 @@ static void PlayerPartnerHandlePlayFanfareOrBGM(void)
 {
     if (gBattleBufferA[gActiveBank][3])
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
     }
     else
@@ -1929,7 +1929,7 @@ static void PlayerPartnerHandleBattleAnimation(void)
         u8 animationId = gBattleBufferA[gActiveBank][1];
         u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
 
-        if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
             PlayerPartnerBufferExecCompleted();
         else
             gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 0dc7631ce..914ad9c43 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -433,7 +433,7 @@ static void sub_8186D9C(void)
     {
         FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
         DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_805EEE0(gActiveBank);
+        EnemyShadowCallbackToSetInvisible(gActiveBank);
         SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
         RecordedOpponentBufferExecCompleted();
     }
@@ -469,7 +469,7 @@ static void sub_8186EA4(void)
     if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattleBankFunc[gActiveBank] = sub_8186F14;
     }
@@ -1149,7 +1149,7 @@ static void RecordedOpponentHandleLoadMonSprite(void)
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                sub_80A5C6C(gActiveBank, 2),
-                                               sub_80A6138(gActiveBank),
+                                               GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
 
 
@@ -1184,7 +1184,7 @@ static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
 
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
                                         sub_80A5C6C(bank, 2),
-                                        sub_80A6138(bank),
+                                        GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
     gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
@@ -1213,7 +1213,7 @@ static void RecordedOpponentHandleReturnMonToBall(void)
     {
         FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
         DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        sub_805EEE0(gActiveBank);
+        EnemyShadowCallbackToSetInvisible(gActiveBank);
         SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
         RecordedOpponentBufferExecCompleted();
     }
@@ -1225,7 +1225,7 @@ static void DoSwitchOutAnimation(void)
     {
     case 0:
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1233,7 +1233,7 @@ static void DoSwitchOutAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
             gBattleBankFunc[gActiveBank] = sub_8186D9C;
         }
         break;
@@ -1314,7 +1314,7 @@ static void RecordedOpponentHandleFaintAnimation(void)
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
     }
     else
@@ -1386,7 +1386,7 @@ static void RecordedOpponentDoMoveAnimation(void)
             && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
         {
             gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1405,7 +1405,7 @@ static void RecordedOpponentDoMoveAnimation(void)
             sub_805EB9C(1);
             if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
             {
-                DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
                 gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
@@ -1414,7 +1414,7 @@ static void RecordedOpponentDoMoveAnimation(void)
     case 3:
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
-            sub_805E394();
+            CopyAllBattleSpritesInvisibilities();
             TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             RecordedOpponentBufferExecCompleted();
@@ -1530,7 +1530,7 @@ static void RecordedOpponentHandleStatusAnimation(void)
 {
     if (!mplay_80342A4(gActiveBank))
     {
-        DoStatusAnimation(gBattleBufferA[gActiveBank][1],
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
                         gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
         gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
     }
@@ -1642,7 +1642,7 @@ static void RecordedOpponentHandlePlayFanfareOrBGM(void)
 {
     if (gBattleBufferA[gActiveBank][3])
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
     }
     else
@@ -1794,7 +1794,7 @@ static void RecordedOpponentHandleBattleAnimation(void)
         u8 animationId = gBattleBufferA[gActiveBank][1];
         u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
 
-        if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
             RecordedOpponentBufferExecCompleted();
         else
             gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index a3343a391..8db7b5626 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -272,9 +272,9 @@ static void sub_8189AA0(void)
             FreeSpriteTilesByTag(0x27F9);
             FreeSpritePaletteByTag(0x27F9);
 
-            sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
             if (IsDoubleBattle())
-                sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], gActiveBank ^ BIT_MON);
+                HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], gActiveBank ^ BIT_MON);
 
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 3;
             gBattleBankFunc[gActiveBank] = sub_8189A58;
@@ -397,7 +397,7 @@ static void CompleteOnHealthbarDone(void)
     }
     else
     {
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -458,7 +458,7 @@ static void sub_818A2B4(void)
     {
         CopyBattleSpriteInvisibility(gActiveBank);
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattleBankFunc[gActiveBank] = sub_818A328;
     }
@@ -484,7 +484,7 @@ static void sub_818A37C(void)
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
         StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
         UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
         sub_8076918(gActiveBank);
@@ -1111,7 +1111,7 @@ static void SetRecordedPlayerMonData(u8 monId)
         break;
     }
 
-    sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
 }
 
 static void RecordedPlayerHandleSetRawMonData(void)
@@ -1135,7 +1135,7 @@ static void RecordedPlayerHandleLoadMonSprite(void)
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                sub_80A5C6C(gActiveBank, 2),
-                                               sub_80A6138(gActiveBank),
+                                               GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
     gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank;
@@ -1166,7 +1166,7 @@ static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
       sub_80A5C6C(bank, 2),
-      sub_80A6138(bank),
+      GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
     gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
@@ -1206,7 +1206,7 @@ static void DoSwitchOutAnimation(void)
     {
     case 0:
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1214,7 +1214,7 @@ static void DoSwitchOutAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
             gBattleBankFunc[gActiveBank] = sub_818A1B0;
         }
         break;
@@ -1313,7 +1313,7 @@ static void RecordedPlayerHandleFaintAnimation(void)
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
     }
     else
@@ -1321,7 +1321,7 @@ static void RecordedPlayerHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
             PlaySE12WithPanning(SE_POKE_DEAD, -64);
             gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
             gSprites[gBankSpriteIds[gActiveBank]].data2 = 5;
@@ -1388,7 +1388,7 @@ static void RecordedPlayerDoMoveAnimation(void)
             && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
         {
             gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1407,7 +1407,7 @@ static void RecordedPlayerDoMoveAnimation(void)
             sub_805EB9C(1);
             if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
             {
-                DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
                 gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
@@ -1416,7 +1416,7 @@ static void RecordedPlayerDoMoveAnimation(void)
     case 3:
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
-            sub_805E394();
+            CopyAllBattleSpritesInvisibilities();
             TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             RecordedPlayerBufferExecCompleted();
@@ -1549,7 +1549,7 @@ static void RecordedPlayerHandleStatusAnimation(void)
 {
     if (!mplay_80342A4(gActiveBank))
     {
-        DoStatusAnimation(gBattleBufferA[gActiveBank][1],
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
                         gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
         gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
     }
@@ -1661,7 +1661,7 @@ static void RecordedPlayerHandlePlayFanfareOrBGM(void)
 {
     if (gBattleBufferA[gActiveBank][3])
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
     }
     else
@@ -1813,7 +1813,7 @@ static void RecordedPlayerHandleBattleAnimation(void)
         u8 animationId = gBattleBufferA[gActiveBank][1];
         u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
 
-        if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
             RecordedPlayerBufferExecCompleted();
         else
             gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 0c5b698cf..468a92610 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -413,7 +413,7 @@ static void SafariHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    DoSpecialBattleAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
@@ -423,7 +423,7 @@ static void SafariHandleBallThrowAnim(void)
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    DoSpecialBattleAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
@@ -624,7 +624,7 @@ static void SafariHandlePlayFanfareOrBGM(void)
 {
     if (gBattleBufferA[gActiveBank][3])
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
     }
     else
@@ -683,7 +683,7 @@ static void SafariHandleBattleAnimation(void)
     u8 animationId = gBattleBufferA[gActiveBank][1];
     u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
 
-    if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+    if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
         SafariBufferExecCompleted();
     else
         gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index c2addd30c..ec052555a 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -369,7 +369,7 @@ static void sub_8168818(void)
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
 
         WallyBufferExecCompleted();
     }
@@ -387,7 +387,7 @@ static void CompleteOnHealthbarDone(void)
     }
     else
     {
-        sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
         WallyBufferExecCompleted();
     }
 }
@@ -1029,7 +1029,7 @@ static void SetWallyMonData(u8 monId)
         break;
     }
 
-    sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
 }
 
 static void WallyHandleSetRawMonData(void)
@@ -1051,7 +1051,7 @@ static void WallyHandleReturnMonToBall(void)
 {
     if (gBattleBufferA[gActiveBank][1] == 0)
     {
-        DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
+        InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
         gBattleBankFunc[gActiveBank] = sub_8168A20;
     }
     else
@@ -1112,7 +1112,7 @@ static void WallyHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    DoSpecialBattleAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnFinishedAnimation;
 }
 
@@ -1122,7 +1122,7 @@ static void WallyHandleBallThrowAnim(void)
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    DoSpecialBattleAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnFinishedAnimation;
 }
 
@@ -1163,7 +1163,7 @@ static void WallyDoMoveAnimation(void)
     case 0:
         if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
         {
-            DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
         break;
@@ -1182,7 +1182,7 @@ static void WallyDoMoveAnimation(void)
             sub_805EB9C(1);
             if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
             {
-                DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
         }
@@ -1190,7 +1190,7 @@ static void WallyDoMoveAnimation(void)
     case 3:
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
         {
-            sub_805E394();
+            CopyAllBattleSpritesInvisibilities();
             TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             WallyBufferExecCompleted();
@@ -1429,7 +1429,7 @@ static void WallyHandlePlayFanfareOrBGM(void)
 {
     if (gBattleBufferA[gActiveBank][3])
     {
-        BattleMusicStop();
+        BattleStopLowHpSound();
         PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
     }
     else
@@ -1496,7 +1496,7 @@ static void sub_816AA80(u8 bank)
     sub_806A068(species, GetBankIdentity(bank));
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
                                         sub_80A5C6C(bank, 2),
-                                        sub_80A6138(bank),
+                                        GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
     gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
@@ -1565,7 +1565,7 @@ static void WallyHandleBattleAnimation(void)
     u8 animationId = gBattleBufferA[gActiveBank][1];
     u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
 
-    if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+    if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
         WallyBufferExecCompleted();
     else
         gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index e6c67b20e..9385417b4 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -119,7 +119,7 @@ static void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot,
         if (paletteTag == 0xFFFF)
         {
             gUnknown_0203CCEC.paletteTag |= 0xFFFF;
-            LoadCompressedPalette(species_and_otid_get_pal(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20);
+            LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20);
         }
         else
         {
@@ -146,7 +146,7 @@ static void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot,
 {
     if (!isTrainer)
     {
-        LoadCompressedPalette(species_and_otid_get_pal(species, otId, personality), paletteSlot * 0x10, 0x20);
+        LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), paletteSlot * 0x10, 0x20);
     }
     else
     {
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
new file mode 100644
index 000000000..99a82f3ca
--- /dev/null
+++ b/src/battle_gfx_sfx_util.c
@@ -0,0 +1,1299 @@
+#include "global.h"
+#include "battle.h"
+#include "battle_controllers.h"
+#include "battle_ai_script_commands.h"
+#include "battle_anim.h"
+#include "battle_interface.h"
+#include "main.h"
+#include "malloc.h"
+#include "rng.h"
+#include "util.h"
+#include "pokemon.h"
+#include "moves.h"
+#include "task.h"
+#include "sprite.h"
+#include "sound.h"
+#include "m4a.h"
+#include "species.h"
+#include "decompress.h"
+#include "data2.h"
+#include "palette.h"
+#include "blend_palette.h"
+#include "contest.h"
+#include "songs.h"
+
+extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
+extern u8 gActiveBank;
+extern u8 gNoOfAllBanks;
+extern u16 gUnknown_020243FC;
+extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
+extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u8 gBanksByIdentity[BATTLE_BANKS_COUNT];
+extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
+extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
+extern struct MusicPlayerInfo gMPlay_SE1;
+extern struct MusicPlayerInfo gMPlay_SE2;
+extern struct MusicPlayerInfo gMPlay_BGM;
+
+extern const struct BattleMove gBattleMoves[];
+extern const u8 gUnknown_0831C604[];
+extern const u8 * const gUnknown_082C9320[];
+extern const u8 * const gUnknown_082C937C[];
+extern const struct CompressedSpriteSheet gMonFrontPicTable[];
+extern const struct CompressedSpriteSheet gMonBackPicTable[];
+extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
+extern const struct CompressedSpriteSheet gTrainerBackPicTable[];
+extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
+extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
+extern const union AnimCmd* const * const gMonAnimationsSpriteAnimsPtrTable[];
+extern const struct SpriteTemplate gUnknown_08329D98[4];
+extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
+extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
+extern const u8 gEnemyMonElevation[];
+
+// graphics
+extern const u32 gUnknown_08C093F0[];
+extern const u32 gSubstituteDollTilemap[];
+extern const u32 gSubstituteDollGfx[];
+extern const u16 gSubstituteDollPal[];
+extern const u8 gUnknown_08C1F1C8[];
+extern const u8 gUnknown_08C1F46C[];
+extern const u8 gUnknown_08C1F5E8[];
+extern const u8 gUnknown_08C1F76C[];
+extern const u8 gUnknown_08C1F8E8[];
+extern const u8 gUnknown_08C0237C[];
+extern const u16 gBattleInterface_BallStatusBarPal[];
+extern const u16 gBattleInterface_BallDisplayPal[];
+
+extern u8 sub_80688F8(u8, u8 bank);
+extern u8 pokemon_order_func(u8); // party menu
+extern void sub_81B8C68(void);
+
+// this file's functions
+static u8 sub_805D4A8(u16 move);
+static u16 BattlePalaceGetTargetRetValue(void);
+static void sub_805D7EC(struct Sprite *sprite);
+static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId);
+static void Task_ClearBitWhenBattleTableAnimDone(u8 taskId);
+static void Task_ClearBitWhenSpecialAnimDone(u8 taskId);
+static void ClearSpritesBankHealthboxAnimData(void);
+
+// const rom data
+static const struct CompressedSpriteSheet gUnknown_0832C0D0 =
+{
+    gUnknown_08C1F1C8, 0x1000, TAG_HEALTHBOX_PLAYER1_TILE
+};
+
+static const struct CompressedSpriteSheet gUnknown_0832C0D8 =
+{
+    gUnknown_08C1F46C, 0x1000, TAG_HEALTHBOX_OPPONENT1_TILE
+};
+
+static const struct CompressedSpriteSheet gUnknown_0832C0E0[2] =
+{
+    {gUnknown_08C1F5E8, 0x800, TAG_HEALTHBOX_PLAYER1_TILE},
+    {gUnknown_08C1F5E8, 0x800, TAG_HEALTHBOX_PLAYER2_TILE}
+};
+
+static const struct CompressedSpriteSheet gUnknown_0832C0F0[2] =
+{
+    {gUnknown_08C1F76C, 0x800, TAG_HEALTHBOX_OPPONENT1_TILE},
+    {gUnknown_08C1F76C, 0x800, TAG_HEALTHBOX_OPPONENT2_TILE}
+};
+
+static const struct CompressedSpriteSheet gUnknown_0832C100 =
+{
+    gUnknown_08C1F8E8, 0x1000, TAG_HEALTHBOX_SAFARI_TILE
+};
+
+static const struct CompressedSpriteSheet gUnknown_0832C108[BATTLE_BANKS_COUNT] =
+{
+    {gUnknown_08C0237C, 0x0100, 0xd704},
+    {gUnknown_08C0237C, 0x0120, 0xd705},
+    {gUnknown_08C0237C, 0x0100, 0xd706},
+    {gUnknown_08C0237C, 0x0120, 0xd707}
+};
+
+static const struct SpritePalette gUnknown_0832C128[2] =
+{
+    {gBattleInterface_BallStatusBarPal, TAG_HEALTHBOX_PAL},
+    {gBattleInterface_BallDisplayPal, 0xd704}
+};
+
+// code
+void AllocateBattleSpritesData(void)
+{
+    gBattleSpritesDataPtr = AllocZeroed(sizeof(struct BattleSpriteData));
+    gBattleSpritesDataPtr->bankData = AllocZeroed(sizeof(struct BattleSpriteInfo) * BATTLE_BANKS_COUNT);
+    gBattleSpritesDataPtr->healthBoxesData = AllocZeroed(sizeof(struct BattleHealthboxInfo) * BATTLE_BANKS_COUNT);
+    gBattleSpritesDataPtr->animationData = AllocZeroed(sizeof(struct BattleAnimationInfo));
+    gBattleSpritesDataPtr->battleBars = AllocZeroed(sizeof(struct BattleBarInfo) * BATTLE_BANKS_COUNT);
+}
+
+void FreeBattleSpritesData(void)
+{
+    if (gBattleSpritesDataPtr == NULL)
+        return;
+
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr->battleBars);
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr->animationData);
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr->healthBoxesData);
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr->bankData);
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr);
+}
+
+u16 ChooseMoveAndTargetInBattlePalace(void)
+{
+    s32 i, var1, var2;
+    s32 chosenMoveId = -1;
+    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
+    u8 unusableMovesBits = CheckMoveLimitations(gActiveBank, 0, 0xFF);
+    s32 percent = Random() % 100;
+
+    i = (gBattleStruct->field_92 & gBitTable[gActiveBank]) ? 2 : 0;
+    var2 = i;
+    var1 = i + 2;
+
+    for (; i < var1; i++)
+    {
+        if (gUnknown_0831C494[GetNatureFromPersonality(gBattleMons[gActiveBank].personality)][i] > percent)
+            break;
+    }
+
+    percent = i - var2;
+    if (i == var1)
+        percent = 2;
+
+    for (var2 = 0, i = 0; i < 4; i++)
+    {
+        if (moveInfo->moves[i] == MOVE_NONE)
+            break;
+        if (percent == sub_805D4A8(moveInfo->moves[i]) && moveInfo->currentPp[i] != 0)
+            var2 |= gBitTable[i];
+    }
+
+    if (var2 != 0)
+    {
+        gBattleStruct->field_92 &= 0xF;
+        gBattleStruct->field_92 |= (var2 << 4);
+        BattleAI_SetupAIData(var2);
+        chosenMoveId = BattleAI_ChooseMoveOrAction();
+    }
+
+    if (chosenMoveId == -1)
+    {
+        if (unusableMovesBits != 0xF)
+        {
+            var1 = 0, var2 = 0;
+
+            for (i = 0; i < 4; i++)
+            {
+                if (sub_805D4A8(moveInfo->moves[i]) == 0 && !(gBitTable[i] & unusableMovesBits))
+                    var1 += 0x1;
+                if (sub_805D4A8(moveInfo->moves[i]) == 1 && !(gBitTable[i] & unusableMovesBits))
+                    var1 += 0x10;
+                if (sub_805D4A8(moveInfo->moves[i]) == 2 && !(gBitTable[i] & unusableMovesBits))
+                    var1 += 0x100;
+            }
+
+            if ((var1 & 0xF) > 1)
+                var2++;
+            if ((var1 & 0xF0) > 0x1F)
+                var2++;
+            if ((var1 & 0xF0) > 0x1FF)
+                var2++;
+
+            if (var2 > 1 || var2 == 0)
+            {
+                do
+                {
+                    i = Random() % 4;
+                    if (!(gBitTable[i] & unusableMovesBits))
+                        chosenMoveId = i;
+                } while (chosenMoveId == -1);
+            }
+            else
+            {
+                if ((var1 & 0xF) > 1)
+                    var2 = 0;
+                if ((var1 & 0xF0) > 0x1F)
+                    var2 = 1;
+                if ((var1 & 0xF0) > 0x1FF)
+                    var2 = 2;
+
+                do
+                {
+                    i = Random() % 4;
+                    if (!(gBitTable[i] & unusableMovesBits) && var2 == sub_805D4A8(moveInfo->moves[i]))
+                        chosenMoveId = i;
+                } while (chosenMoveId == -1);
+            }
+
+            if (Random() % 100 > 49)
+            {
+                gProtectStructs[gActiveBank].flag_x10 = 1;
+                return 0;
+            }
+        }
+        else
+        {
+            gProtectStructs[gActiveBank].flag_x10 = 1;
+            return 0;
+        }
+    }
+
+    if (moveInfo->moves[chosenMoveId] == MOVE_CURSE)
+    {
+        if (moveInfo->monType1 != TYPE_GHOST && moveInfo->monType2 != TYPE_GHOST)
+            var1 = MOVE_TARGET_x10;
+        else
+            var1 = MOVE_TARGET_SELECTED;
+    }
+    else
+    {
+        var1 = gBattleMoves[moveInfo->moves[chosenMoveId]].target;
+    }
+
+    if (var1 & MOVE_TARGET_x10)
+        chosenMoveId |= (gActiveBank << 8);
+    else if (var1 == MOVE_TARGET_SELECTED)
+        chosenMoveId |= (BattlePalaceGetTargetRetValue());
+    else
+        chosenMoveId |= (GetBankByIdentity((GetBankIdentity(gActiveBank) & BIT_SIDE) ^ BIT_SIDE) << 8);
+
+    return chosenMoveId;
+}
+
+static u8 sub_805D4A8(u16 move)
+{
+    switch (gBattleMoves[move].target)
+    {
+    case MOVE_TARGET_SELECTED:
+    case MOVE_TARGET_USER:
+    case MOVE_TARGET_RANDOM:
+    case MOVE_TARGET_BOTH:
+    case MOVE_TARGET_FOES_AND_ALLY:
+        if (gBattleMoves[move].power == 0)
+            return 2;
+        else
+            return 0;
+        break;
+    case MOVE_TARGET_DEPENDS:
+    case MOVE_TARGET_OPPONENTS_FIELD:
+        return 2;
+    case MOVE_TARGET_x10:
+        return 1;
+    default:
+        return 0;
+    }
+}
+
+static u16 BattlePalaceGetTargetRetValue(void)
+{
+    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
+    {
+        u8 opposing1, opposing2;
+
+        if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+        {
+            opposing1 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+            opposing2 = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+        }
+        else
+        {
+            opposing1 = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+            opposing2 = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+        }
+
+        if (gBattleMons[opposing1].hp == gBattleMons[opposing2].hp)
+            return (((gActiveBank & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
+
+        switch (gUnknown_0831C604[GetNatureFromPersonality(gBattleMons[gActiveBank].personality)])
+        {
+        case 0:
+            if (gBattleMons[opposing1].hp > gBattleMons[opposing2].hp)
+                return opposing1 << 8;
+            else
+                return opposing2 << 8;
+        case 1:
+            if (gBattleMons[opposing1].hp < gBattleMons[opposing2].hp)
+                return opposing1 << 8;
+            else
+                return opposing2 << 8;
+        case 2:
+            return (((gActiveBank & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
+        }
+    }
+
+    return (gActiveBank ^ BIT_SIDE) << 8;
+}
+
+void sub_805D714(struct Sprite *sprite)
+{
+    u8 spriteId = sprite->data1;
+
+    if (!gSprites[spriteId].affineAnimEnded)
+        return;
+    if (gSprites[spriteId].invisible)
+        return;
+
+    if (gSprites[spriteId].animPaused)
+    {
+        gSprites[spriteId].animPaused = 0;
+    }
+    else
+    {
+        if (gSprites[spriteId].animEnded)
+            sprite->callback = SpriteCallbackDummy;
+    }
+}
+
+void sub_805D770(struct Sprite *sprite, bool8 arg1)
+{
+    sprite->animPaused = 1;
+    sprite->callback = SpriteCallbackDummy;
+
+    if (!arg1)
+        StartSpriteAffineAnim(sprite, 1);
+    else
+        StartSpriteAffineAnim(sprite, 1);
+
+    AnimateSprite(sprite);
+}
+
+void sub_805D7AC(struct Sprite *sprite)
+{
+    if (!(gUnknown_020243FC & 1))
+    {
+        sprite->pos2.x += sprite->data0;
+        if (sprite->pos2.x == 0)
+        {
+            if (sprite->pos2.y != 0)
+                sprite->callback = sub_805D7EC;
+            else
+                sprite->callback = SpriteCallbackDummy;
+        }
+    }
+}
+
+static void sub_805D7EC(struct Sprite *sprite)
+{
+    sprite->pos2.y -= 2;
+    if (sprite->pos2.y == 0)
+        sprite->callback = SpriteCallbackDummy;
+}
+
+void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status)
+{
+    gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive = 1;
+    if (!isStatus2)
+    {
+        if (status == STATUS_FREEZE)
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_FRZ);
+        else if (status == STATUS_POISON || status & STATUS_TOXIC_POISON)
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_PSN);
+        else if (status == STATUS_BURN)
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_BRN);
+        else if (status & STATUS_SLEEP)
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_SLP);
+        else if (status == STATUS_PARALYSIS)
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_PRZ);
+        else // no animation
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive = 0;
+    }
+    else
+    {
+        if (status & STATUS2_INFATUATION)
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_INFATUATION);
+        else if (status & STATUS2_CONFUSION)
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_CONFUSION);
+        else if (status & STATUS2_CURSED)
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_CURSED);
+        else if (status & STATUS2_NIGHTMARE)
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_NIGHTMARE);
+        else if (status & STATUS2_WRAPPED)
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_WRAPPED);
+        else // no animation
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive = 0;
+    }
+}
+
+#define tBank data[0]
+
+bool8 TryHandleLaunchBattleTableAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId, u16 argument)
+{
+    u8 taskId;
+
+    if (tableId == B_ANIM_CASTFORM_CHANGE && (argument & 0x80))
+    {
+        gBattleMonForms[activeBank] = (argument & ~(0x80));
+        return TRUE;
+    }
+    if (gBattleSpritesDataPtr->bankData[activeBank].behindSubstitute
+        && !ShouldAnimBeDoneRegardlessOfSubsitute(tableId))
+    {
+        return TRUE;
+    }
+    if (gBattleSpritesDataPtr->bankData[activeBank].behindSubstitute
+        && tableId == B_ANIM_SUBSTITUTE_FADE
+        && gSprites[gBankSpriteIds[activeBank]].invisible)
+    {
+        LoadBattleMonGfxAndAnimate(activeBank, TRUE, gBankSpriteIds[activeBank]);
+        ClearBehindSubstituteBit(activeBank);
+        return TRUE;
+    }
+
+    gAnimBankAttacker = atkBank;
+    gAnimBankTarget = defBank;
+    gBattleSpritesDataPtr->animationData->animArg = argument;
+    LaunchBattleAnimation(gUnknown_082C9320, tableId, FALSE);
+    taskId = CreateTask(Task_ClearBitWhenBattleTableAnimDone, 10);
+    gTasks[taskId].tBank = activeBank;
+    gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBank].animFromTableActive = 1;
+
+    return FALSE;
+}
+
+static void Task_ClearBitWhenBattleTableAnimDone(u8 taskId)
+{
+    gAnimScriptCallback();
+    if (!gAnimScriptActive)
+    {
+        gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBank].animFromTableActive = 0;
+        DestroyTask(taskId);
+    }
+}
+
+#undef tBank
+
+static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId)
+{
+    switch (animId)
+    {
+    case B_ANIM_SUBSTITUTE_FADE:
+    case B_ANIM_RAIN_CONTINUES:
+    case B_ANIM_SUN_CONTINUES:
+    case B_ANIM_SANDSTORM_CONTINUES:
+    case B_ANIM_HAIL_CONTINUES:
+    case B_ANIM_SNATCH_MOVE:
+        return TRUE;
+    default:
+        return FALSE;
+    }
+}
+
+#define tBank data[0]
+
+void InitAndLaunchSpecialAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId)
+{
+    u8 taskId;
+
+    gAnimBankAttacker = atkBank;
+    gAnimBankTarget = defBank;
+    LaunchBattleAnimation(gUnknown_082C937C, tableId, FALSE);
+    taskId = CreateTask(Task_ClearBitWhenSpecialAnimDone, 10);
+    gTasks[taskId].tBank = activeBank;
+    gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBank].specialAnimActive = 1;
+}
+
+static void Task_ClearBitWhenSpecialAnimDone(u8 taskId)
+{
+    gAnimScriptCallback();
+    if (!gAnimScriptActive)
+    {
+        gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBank].specialAnimActive = 0;
+        DestroyTask(taskId);
+    }
+}
+
+#undef tBank
+
+// great function to include newly added moves that don't have animation yet
+bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn)
+{
+    return FALSE;
+}
+
+bool8 mplay_80342A4(u8 bank)
+{
+    u8 zero = 0;
+
+    if (IsSEPlaying())
+    {
+        gBattleSpritesDataPtr->healthBoxesData[bank].field_8++;
+        if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_8 < 30)
+            return TRUE;
+
+        m4aMPlayStop(&gMPlay_SE1);
+        m4aMPlayStop(&gMPlay_SE2);
+    }
+    if (zero == 0)
+    {
+        gBattleSpritesDataPtr->healthBoxesData[bank].field_8 = 0;
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
+{
+    u32 monsPersonality, currentPersonality, otId;
+    u16 species;
+    u8 identity;
+    u16 paletteOffset;
+    const void *lzPaletteData;
+
+    monsPersonality = GetMonData(mon, MON_DATA_PERSONALITY);
+
+    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_NONE)
+    {
+        species = GetMonData(mon, MON_DATA_SPECIES);
+        currentPersonality = monsPersonality;
+    }
+    else
+    {
+        species = gBattleSpritesDataPtr->bankData[bank].transformSpecies;
+        currentPersonality = gTransformedPersonalities[bank];
+    }
+
+    otId = GetMonData(mon, MON_DATA_OT_ID);
+    identity = GetBankIdentity(bank);
+    HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
+                                              gMonSpritesGfxPtr->sprites[identity],
+                                              species, currentPersonality);
+
+    paletteOffset = 0x100 + bank * 16;
+
+    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_NONE)
+        lzPaletteData = GetMonFrontSpritePal(mon);
+    else
+        lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
+
+    LZDecompressWram(lzPaletteData, gDecompressionBuffer);
+    LoadPalette(gDecompressionBuffer, paletteOffset, 0x20);
+    LoadPalette(gDecompressionBuffer, 0x80 + bank * 16, 0x20);
+
+    if (species == SPECIES_CASTFORM)
+    {
+        paletteOffset = 0x100 + bank * 16;
+        LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]);
+        LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[bank]], paletteOffset, 0x20);
+    }
+
+    // transform's pink color
+    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
+    {
+        BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+        CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
+    }
+}
+
+void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
+{
+    u32 monsPersonality, currentPersonality, otId;
+    u16 species;
+    u8 identity;
+    u16 paletteOffset;
+    const void *lzPaletteData;
+
+    monsPersonality = GetMonData(mon, MON_DATA_PERSONALITY);
+
+    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_NONE)
+    {
+        species = GetMonData(mon, MON_DATA_SPECIES);
+        currentPersonality = monsPersonality;
+    }
+    else
+    {
+        species = gBattleSpritesDataPtr->bankData[bank].transformSpecies;
+        currentPersonality = gTransformedPersonalities[bank];
+    }
+
+    otId = GetMonData(mon, MON_DATA_OT_ID);
+    identity = GetBankIdentity(bank);
+
+    if (sub_80688F8(1, bank) == 1 || gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
+    {
+        HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species],
+                                                  gMonSpritesGfxPtr->sprites[identity],
+                                                  species, currentPersonality);
+    }
+    else
+    {
+        HandleLoadSpecialPokePic(&gMonBackPicTable[species],
+                                gMonSpritesGfxPtr->sprites[identity],
+                                species, currentPersonality);
+    }
+
+    paletteOffset = 0x100 + bank * 16;
+
+    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_NONE)
+        lzPaletteData = GetMonFrontSpritePal(mon);
+    else
+        lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
+
+    LZDecompressWram(lzPaletteData, gDecompressionBuffer);
+    LoadPalette(gDecompressionBuffer, paletteOffset, 0x20);
+    LoadPalette(gDecompressionBuffer, 0x80 + bank * 16, 0x20);
+
+    if (species == SPECIES_CASTFORM)
+    {
+        paletteOffset = 0x100 + bank * 16;
+        LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]);
+        LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[bank]], paletteOffset, 0x20);
+    }
+
+    // transform's pink color
+    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
+    {
+        BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+        CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
+    }
+}
+
+void nullsub_23(void)
+{
+}
+
+void nullsub_24(u16 species)
+{
+}
+
+void DecompressTrainerFrontPic(u16 frontPicId, u8 bank)
+{
+    u8 identity = GetBankIdentity(bank);
+    DecompressPicFromTable_2(&gTrainerFrontPicTable[frontPicId],
+                             gMonSpritesGfxPtr->sprites[identity],
+                             SPECIES_NONE);
+    LoadCompressedObjectPalette(&gTrainerFrontPicPaletteTable[frontPicId]);
+}
+
+void DecompressTrainerBackPic(u16 backPicId, u8 bank)
+{
+    u8 identity = GetBankIdentity(bank);
+    DecompressPicFromTable_2(&gTrainerBackPicTable[backPicId],
+                             gMonSpritesGfxPtr->sprites[identity],
+                             SPECIES_NONE);
+    LoadCompressedPalette(gTrainerBackPicPaletteTable[backPicId].data,
+                          0x100 + 16 * bank, 0x20);
+}
+
+void nullsub_25(u8 arg0)
+{
+}
+
+void FreeTrainerFrontPicPalette(u16 frontPicId)
+{
+    FreeSpritePaletteByTag(gTrainerFrontPicPaletteTable[frontPicId].tag);
+}
+
+void sub_805DFFC(void)
+{
+    u8 numberOfBanks = 0;
+    u8 i;
+
+    LoadSpritePalette(&gUnknown_0832C128[0]);
+    LoadSpritePalette(&gUnknown_0832C128[1]);
+    if (!IsDoubleBattle())
+    {
+        LoadCompressedObjectPic(&gUnknown_0832C0D0);
+        LoadCompressedObjectPic(&gUnknown_0832C0D8);
+        numberOfBanks = 2;
+    }
+    else
+    {
+        LoadCompressedObjectPic(&gUnknown_0832C0E0[0]);
+        LoadCompressedObjectPic(&gUnknown_0832C0E0[1]);
+        LoadCompressedObjectPic(&gUnknown_0832C0F0[0]);
+        LoadCompressedObjectPic(&gUnknown_0832C0F0[1]);
+        numberOfBanks = 4;
+    }
+    for (i = 0; i < numberOfBanks; i++)
+        LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[i]]);
+}
+
+bool8 BattleLoadAllHealthBoxesGfx(u8 state)
+{
+    bool8 retVal = FALSE;
+
+    if (state != 0)
+    {
+        if (state == 1)
+        {
+            LoadSpritePalette(&gUnknown_0832C128[0]);
+            LoadSpritePalette(&gUnknown_0832C128[1]);
+        }
+        else if (!IsDoubleBattle())
+        {
+            if (state == 2)
+            {
+                if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
+                    LoadCompressedObjectPic(&gUnknown_0832C100);
+                else
+                    LoadCompressedObjectPic(&gUnknown_0832C0D0);
+            }
+            else if (state == 3)
+                LoadCompressedObjectPic(&gUnknown_0832C0D8);
+            else if (state == 4)
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[0]]);
+            else if (state == 5)
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[1]]);
+            else
+                retVal = TRUE;
+        }
+        else
+        {
+            if (state == 2)
+                LoadCompressedObjectPic(&gUnknown_0832C0E0[0]);
+            else if (state == 3)
+                LoadCompressedObjectPic(&gUnknown_0832C0E0[1]);
+            else if (state == 4)
+                LoadCompressedObjectPic(&gUnknown_0832C0F0[0]);
+            else if (state == 5)
+                LoadCompressedObjectPic(&gUnknown_0832C0F0[1]);
+            else if (state == 6)
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[0]]);
+            else if (state == 7)
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[1]]);
+            else if (state == 8)
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[2]]);
+            else if (state == 9)
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[3]]);
+            else
+                retVal = TRUE;
+        }
+    }
+
+    return retVal;
+}
+
+void LoadBattleBarGfx(u8 arg0)
+{
+    LZDecompressWram(gUnknown_08C093F0, gMonSpritesGfxPtr->barFontGfx);
+}
+
+bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
+{
+    bool8 retVal = FALSE;
+
+    switch (*state1)
+    {
+    case 0:
+        ClearSpritesBankHealthboxAnimData();
+        (*state1)++;
+        break;
+    case 1:
+        if (!BattleLoadAllHealthBoxesGfx(*bank))
+        {
+            (*bank)++;
+        }
+        else
+        {
+            *bank = 0;
+            (*state1)++;
+        }
+        break;
+    case 2:
+        (*state1)++;
+        break;
+    case 3:
+        if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) && *bank == 0)
+            gHealthBoxesIds[*bank] = CreateSafariPlayerHealthboxSprites();
+        else
+            gHealthBoxesIds[*bank] = CreateBankHealthboxSprites(*bank);
+
+        (*bank)++;
+        if (*bank == gNoOfAllBanks)
+        {
+            *bank = 0;
+            (*state1)++;
+        }
+        break;
+    case 4:
+        SetBankHealthboxSpritePos(*bank);
+        if (gBanksByIdentity[*bank] <= 1)
+            DummyBattleInterfaceFunc(gHealthBoxesIds[*bank], FALSE);
+        else
+            DummyBattleInterfaceFunc(gHealthBoxesIds[*bank], TRUE);
+
+        (*bank)++;
+        if (*bank == gNoOfAllBanks)
+        {
+            *bank = 0;
+            (*state1)++;
+        }
+        break;
+    case 5:
+        if (GetBankSide(*bank) == SIDE_PLAYER)
+        {
+            if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
+                UpdateHealthboxAttribute(gHealthBoxesIds[*bank], &gPlayerParty[gBattlePartyID[*bank]], HEALTHBOX_ALL);
+        }
+        else
+        {
+            UpdateHealthboxAttribute(gHealthBoxesIds[*bank], &gEnemyParty[gBattlePartyID[*bank]], HEALTHBOX_ALL);
+        }
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[*bank]);
+        (*bank)++;
+        if (*bank == gNoOfAllBanks)
+        {
+            *bank = 0;
+            (*state1)++;
+        }
+        break;
+    case 6:
+        LoadAndCreateEnemyShadowSprites();
+        sub_81B8C68();
+        retVal = TRUE;
+        break;
+    }
+
+    return retVal;
+}
+
+void ClearSpritesHealthboxAnimData(void)
+{
+    memset(gBattleSpritesDataPtr->healthBoxesData, 0, sizeof(struct BattleHealthboxInfo) * BATTLE_BANKS_COUNT);
+    memset(gBattleSpritesDataPtr->animationData, 0, sizeof(struct BattleAnimationInfo));
+}
+
+static void ClearSpritesBankHealthboxAnimData(void)
+{
+    ClearSpritesHealthboxAnimData();
+    memset(gBattleSpritesDataPtr->bankData, 0, sizeof(struct BattleSpriteInfo) * BATTLE_BANKS_COUNT);
+}
+
+void CopyAllBattleSpritesInvisibilities(void)
+{
+    s32 i;
+
+    for (i = 0; i < gNoOfAllBanks; i++)
+        gBattleSpritesDataPtr->bankData[i].invisible = gSprites[gBankSpriteIds[i]].invisible;
+}
+
+void CopyBattleSpriteInvisibility(u8 bank)
+{
+    gBattleSpritesDataPtr->bankData[bank].invisible = gSprites[gBankSpriteIds[bank]].invisible;
+}
+
+void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
+{
+    u16 paletteOffset;
+    u32 personalityValue;
+    u32 otId;
+    u8 identity;
+    const u8 *lzPaletteData;
+
+    if (notTransform)
+    {
+        StartSpriteAnim(&gSprites[gBankSpriteIds[bankAtk]], gBattleSpritesDataPtr->animationData->animArg);
+        paletteOffset = 0x100 + bankAtk * 16;
+        LoadPalette(gBattleStruct->castformPalette[gBattleSpritesDataPtr->animationData->animArg], paletteOffset, 32);
+        gBattleMonForms[bankAtk] = gBattleSpritesDataPtr->animationData->animArg;
+        if (gBattleSpritesDataPtr->bankData[bankAtk].transformSpecies != SPECIES_NONE)
+        {
+            BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+            CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
+        }
+        gSprites[gBankSpriteIds[bankAtk]].pos1.y = GetBankSpriteDefault_Y(bankAtk);
+    }
+    else
+    {
+        const void *src;
+        void *dst;
+        u16 targetSpecies;
+
+        if (IsContest())
+        {
+            identity = 0;
+            targetSpecies = gContestResources->field_18->field_2;
+            personalityValue = gContestResources->field_18->field_8;
+            otId = gContestResources->field_18->field_C;
+
+            HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[targetSpecies],
+                                                      gMonSpritesGfxPtr->sprites[0],
+                                                      targetSpecies,
+                                                      gContestResources->field_18->field_10);
+        }
+        else
+        {
+            identity = GetBankIdentity(bankAtk);
+
+            if (GetBankSide(bankDef) == SIDE_OPPONENT)
+                targetSpecies = GetMonData(&gEnemyParty[gBattlePartyID[bankDef]], MON_DATA_SPECIES);
+            else
+                targetSpecies = GetMonData(&gPlayerParty[gBattlePartyID[bankDef]], MON_DATA_SPECIES);
+
+            if (GetBankSide(bankAtk) == SIDE_PLAYER)
+            {
+                personalityValue = GetMonData(&gPlayerParty[gBattlePartyID[bankAtk]], MON_DATA_PERSONALITY);
+                otId = GetMonData(&gPlayerParty[gBattlePartyID[bankAtk]], MON_DATA_OT_ID);
+
+                HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[targetSpecies],
+                                                          gMonSpritesGfxPtr->sprites[identity],
+                                                          targetSpecies,
+                                                          gTransformedPersonalities[bankAtk]);
+            }
+            else
+            {
+                personalityValue = GetMonData(&gEnemyParty[gBattlePartyID[bankAtk]], MON_DATA_PERSONALITY);
+                otId = GetMonData(&gEnemyParty[gBattlePartyID[bankAtk]], MON_DATA_OT_ID);
+
+                HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[targetSpecies],
+                                                          gMonSpritesGfxPtr->sprites[identity],
+                                                          targetSpecies,
+                                                          gTransformedPersonalities[bankAtk]);
+            }
+        }
+
+        src = gMonSpritesGfxPtr->sprites[identity];
+        dst = (void *)(VRAM + 0x10000 + gSprites[gBankSpriteIds[bankAtk]].oam.tileNum * 32);
+        DmaCopy32(3, src, dst, 0x800);
+        paletteOffset = 0x100 + bankAtk * 16;
+        lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue);
+        LZDecompressWram(lzPaletteData, gDecompressionBuffer);
+        LoadPalette(gDecompressionBuffer, paletteOffset, 32);
+
+        if (targetSpecies == SPECIES_CASTFORM)
+        {
+            gSprites[gBankSpriteIds[bankAtk]].anims = gMonAnimationsSpriteAnimsPtrTable[targetSpecies];
+            LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]);
+            LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[bankDef] * 16, paletteOffset, 32);
+        }
+
+        BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+        CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
+
+        if (!IsContest())
+        {
+            gBattleSpritesDataPtr->bankData[bankAtk].transformSpecies = targetSpecies;
+            gBattleMonForms[bankAtk] = gBattleMonForms[bankDef];
+        }
+
+        gSprites[gBankSpriteIds[bankAtk]].pos1.y = GetBankSpriteDefault_Y(bankAtk);
+        StartSpriteAnim(&gSprites[gBankSpriteIds[bankAtk]], gBattleMonForms[bankAtk]);
+    }
+}
+
+void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
+{
+    u8 identity;
+    s32 i;
+    u32 var;
+    const void *substitutePal;
+
+    if (!loadMonSprite)
+    {
+        if (IsContest())
+            identity = 0;
+        else
+            identity = GetBankIdentity(bank);
+
+        if (IsContest())
+            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[identity]);
+        else if (GetBankSide(bank) != SIDE_PLAYER)
+            LZDecompressVram(gSubstituteDollGfx, gMonSpritesGfxPtr->sprites[identity]);
+        else
+            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[identity]);
+
+        i = 1;
+        var = bank * 16;
+        substitutePal = gSubstituteDollPal;
+        for (; i < 4; i++)
+        {
+            register void *dmaSrc asm("r0") = gMonSpritesGfxPtr->sprites[identity];
+            void *dmaDst = (i * 0x800) + dmaSrc;
+            u32 dmaSize = 0x800;
+            DmaCopy32(3, dmaSrc, dmaDst, dmaSize);
+            i++;i--;
+        }
+
+        LoadCompressedPalette(substitutePal, 0x100 + var, 32);
+    }
+    else
+    {
+        if (!IsContest())
+        {
+            if (GetBankSide(bank) != SIDE_PLAYER)
+                BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
+            else
+                BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[bank]], bank);
+        }
+    }
+}
+
+void LoadBattleMonGfxAndAnimate(u8 bank, bool8 loadMonSprite, u8 spriteId)
+{
+    BattleLoadSubstituteOrMonSpriteGfx(bank, loadMonSprite);
+    StartSpriteAnim(&gSprites[spriteId], gBattleMonForms[bank]);
+
+    if (!loadMonSprite)
+        gSprites[spriteId].pos1.y = GetSubstituteSpriteDefault_Y(bank);
+    else
+        gSprites[spriteId].pos1.y = GetBankSpriteDefault_Y(bank);
+}
+
+void TrySetBehindSubstituteSpriteBit(u8 bank, u16 move)
+{
+    if (move == MOVE_SUBSTITUTE)
+        gBattleSpritesDataPtr->bankData[bank].behindSubstitute = 1;
+}
+
+void ClearBehindSubstituteBit(u8 bank)
+{
+    gBattleSpritesDataPtr->bankData[bank].behindSubstitute = 0;
+}
+
+void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank)
+{
+    u16 hp = GetMonData(mon, MON_DATA_HP);
+    u16 maxHP = GetMonData(mon, MON_DATA_MAX_HP);
+
+    if (GetHPBarLevel(hp, maxHP) == HP_BAR_RED)
+    {
+        if (!gBattleSpritesDataPtr->bankData[bank].lowHpSong)
+        {
+            if (!gBattleSpritesDataPtr->bankData[bank ^ BIT_MON].lowHpSong)
+                PlaySE(SE_HINSI);
+            gBattleSpritesDataPtr->bankData[bank].lowHpSong = 1;
+        }
+    }
+    else
+    {
+        gBattleSpritesDataPtr->bankData[bank].lowHpSong = 0;
+        if (!IsDoubleBattle())
+        {
+            m4aSongNumStop(SE_HINSI);
+            return;
+        }
+        if (IsDoubleBattle() && !gBattleSpritesDataPtr->bankData[bank ^ BIT_MON].lowHpSong)
+        {
+            m4aSongNumStop(SE_HINSI);
+            return;
+        }
+    }
+}
+
+void BattleStopLowHpSound(void)
+{
+    u8 playerBank = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+
+    gBattleSpritesDataPtr->bankData[playerBank].lowHpSong = 0;
+    if (IsDoubleBattle())
+        gBattleSpritesDataPtr->bankData[playerBank ^ BIT_MON].lowHpSong = 0;
+
+    m4aSongNumStop(SE_HINSI);
+}
+
+u8 GetMonHPBarLevel(struct Pokemon *mon)
+{
+    u16 hp = GetMonData(mon, MON_DATA_HP);
+    u16 maxHP = GetMonData(mon, MON_DATA_MAX_HP);
+
+    return GetHPBarLevel(hp, maxHP);
+}
+
+void sub_805EAE8(void)
+{
+    if (gMain.inBattle)
+    {
+        u8 playerBank1 = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+        u8 playerBank2 = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+        u8 bank1PartyId = pokemon_order_func(gBattlePartyID[playerBank1]);
+        u8 bank2PartyId = pokemon_order_func(gBattlePartyID[playerBank2]);
+
+        if (GetMonData(&gPlayerParty[bank1PartyId], MON_DATA_HP) != 0)
+            HandleLowHpMusicChange(&gPlayerParty[bank1PartyId], playerBank1);
+        if (IsDoubleBattle() && GetMonData(&gPlayerParty[bank2PartyId], MON_DATA_HP) != 0)
+            HandleLowHpMusicChange(&gPlayerParty[bank2PartyId], playerBank2);
+    }
+}
+
+void sub_805EB9C(u8 affineMode)
+{
+    s32 i;
+
+    for (i = 0; i < gNoOfAllBanks; i++)
+    {
+        if (IsBankSpritePresent(i))
+        {
+            gSprites[gBankSpriteIds[i]].oam.affineMode = affineMode;
+            if (affineMode == 0)
+            {
+                gBattleSpritesDataPtr->healthBoxesData[i].field_6 = gSprites[gBankSpriteIds[i]].oam.matrixNum;
+                gSprites[gBankSpriteIds[i]].oam.matrixNum = 0;
+            }
+            else
+            {
+                gSprites[gBankSpriteIds[i]].oam.matrixNum = gBattleSpritesDataPtr->healthBoxesData[i].field_6;
+            }
+        }
+    }
+}
+
+#define tBank data0
+
+void LoadAndCreateEnemyShadowSprites(void)
+{
+    u8 bank;
+
+    LoadCompressedObjectPic(&gSpriteSheet_EnemyShadow);
+
+    bank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+    gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, sub_80A5C6C(bank, 0), sub_80A5C6C(bank, 1) + 29, 0xC8);
+    gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data0 = bank;
+
+    if (IsDoubleBattle())
+    {
+        bank = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+        gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, sub_80A5C6C(bank, 0), sub_80A5C6C(bank, 1) + 29, 0xC8);
+        gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data0 = bank;
+    }
+}
+
+void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
+{
+    bool8 invisible = FALSE;
+    u8 bank = shadowSprite->tBank;
+    struct Sprite *bankSprite = &gSprites[gBankSpriteIds[bank]];
+
+    if (!bankSprite->inUse || !IsBankSpritePresent(bank))
+    {
+        shadowSprite->callback = SpriteCB_SetInvisible;
+        return;
+    }
+    if (gAnimScriptActive || bankSprite->invisible)
+        invisible = TRUE;
+    else if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE
+             && gEnemyMonElevation[gBattleSpritesDataPtr->bankData[bank].transformSpecies] == 0)
+        invisible = TRUE;
+
+    if (gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
+        invisible = TRUE;
+
+    shadowSprite->pos1.x = bankSprite->pos1.x;
+    shadowSprite->pos2.x = bankSprite->pos2.x;
+    shadowSprite->invisible = invisible;
+}
+
+#undef tBank
+
+void SpriteCB_SetInvisible(struct Sprite *sprite)
+{
+    sprite->invisible = 1;
+}
+
+void SetBankEnemyShadowSpriteCallback(u8 bank, u16 species)
+{
+    if (GetBankSide(bank) == SIDE_PLAYER)
+        return;
+
+    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
+        species = gBattleSpritesDataPtr->bankData[bank].transformSpecies;
+
+    if (gEnemyMonElevation[species] != 0)
+        gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].callback = SpriteCB_EnemyShadow;
+    else
+        gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].callback = SpriteCB_SetInvisible;
+}
+
+void EnemyShadowCallbackToSetInvisible(u8 bank)
+{
+    gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].callback = SpriteCB_SetInvisible;
+}
+
+void sub_805EF14(void)
+{
+    u16 *vramPtr = (u16*)(VRAM + 0x240);
+    s32 i;
+    s32 j;
+
+    for (i = 0; i < 9; i++)
+    {
+        for (j = 0; j < 16; j++)
+        {
+            if (!(*vramPtr & 0xF000))
+                *vramPtr |= 0xF000;
+            if (!(*vramPtr & 0x0F00))
+                *vramPtr |= 0x0F00;
+            if (!(*vramPtr & 0x00F0))
+                *vramPtr |= 0x00F0;
+            if (!(*vramPtr & 0x000F))
+                *vramPtr |= 0x000F;
+            vramPtr++;
+        }
+    }
+}
+
+void ClearTemporarySpeciesSpriteData(u8 bank, bool8 dontClearSubstitute)
+{
+    gBattleSpritesDataPtr->bankData[bank].transformSpecies = SPECIES_NONE;
+    gBattleMonForms[bank] = 0;
+    if (!dontClearSubstitute)
+        ClearBehindSubstituteBit(bank);
+}
+
+void AllocateMonSpritesGfx(void)
+{
+    u8 i = 0, j;
+
+    gMonSpritesGfxPtr = NULL;
+    gMonSpritesGfxPtr = AllocZeroed(sizeof(*gMonSpritesGfxPtr));
+    gMonSpritesGfxPtr->firstDecompressed = AllocZeroed(0x8000);
+
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    {
+        gMonSpritesGfxPtr->sprites[i] = gMonSpritesGfxPtr->firstDecompressed + (i * 0x2000);
+        *(gMonSpritesGfxPtr->templates + i) = gUnknown_08329D98[i];
+
+        for (j = 0; j < 4; j++)
+        {
+            gMonSpritesGfxPtr->field_74[i][j].data = gMonSpritesGfxPtr->sprites[i] + (j * 0x800);
+            gMonSpritesGfxPtr->field_74[i][j].size = 0x800;
+        }
+
+        gMonSpritesGfxPtr->templates[i].images = gMonSpritesGfxPtr->field_74[i];
+    }
+
+    gMonSpritesGfxPtr->barFontGfx = AllocZeroed(0x1000);
+}
+
+void FreeMonSpritesGfx(void)
+{
+    if (gMonSpritesGfxPtr == NULL)
+        return;
+
+    if (gMonSpritesGfxPtr->field_17C != NULL)
+        FREE_AND_SET_NULL(gMonSpritesGfxPtr->field_17C);
+    if (gMonSpritesGfxPtr->field_178 != NULL)
+        FREE_AND_SET_NULL(gMonSpritesGfxPtr->field_178);
+
+    FREE_AND_SET_NULL(gMonSpritesGfxPtr->barFontGfx);
+    FREE_AND_SET_NULL(gMonSpritesGfxPtr->firstDecompressed);
+    gMonSpritesGfxPtr->sprites[0] = NULL;
+    gMonSpritesGfxPtr->sprites[1] = NULL;
+    gMonSpritesGfxPtr->sprites[2] = NULL;
+    gMonSpritesGfxPtr->sprites[3] = NULL;
+    FREE_AND_SET_NULL(gMonSpritesGfxPtr);
+}
+
+bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon)
+{
+    s16 hp, maxHP;
+    s32 barLevel;
+
+    if (GetMonData(mon, MON_DATA_STATUS) & (STATUS_ANY | STATUS_TOXIC_COUNTER))
+        return FALSE;
+
+    hp = GetMonData(mon, MON_DATA_HP);
+    maxHP = GetMonData(mon, MON_DATA_MAX_HP);
+
+    barLevel = GetHPBarLevel(hp, maxHP);
+    if (barLevel <= HP_BAR_YELLOW)
+        return FALSE;
+
+    return TRUE;
+}
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 5f582a366..811751ca3 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -2545,19 +2545,19 @@ u8 GetHPBarLevel(s16 hp, s16 maxhp)
 
     if (hp == maxhp)
     {
-        result = 4;
+        result = HP_BAR_FULL;
     }
     else
     {
         u8 fraction = GetScaledHPFraction(hp, maxhp, 48);
         if (fraction > 24)
-            result = 3;
+            result = HP_BAR_GREEN;
         else if (fraction > 9)
-            result = 2;
+            result = HP_BAR_YELLOW;
         else if (fraction > 0)
-            result = 1;
+            result = HP_BAR_RED;
         else
-            result = 0;
+            result = HP_BAR_EMPTY;
     }
 
     return result;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c6cec7f0d..91be4fd9d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -1068,22 +1068,33 @@ static const u8 sBallCatchBonuses[] =
     20, 15, 10, 15 // Ultra, Great, Poke, Safari
 };
 
-// could be a 2d array or a struct
-const ALIGNED(4) u8 gUnknown_0831C494[] =
-{
-    0x3d, 0x44, 0x3d, 0x44, 0x14, 0x2d, 0x54, 0x5c,
-    0x46, 0x55, 0x20, 0x5c, 0x26, 0x45, 0x46, 0x55,
-    0x14, 0x5a, 0x46, 0x5c, 0x1e, 0x32, 0x20, 0x5a,
-    0x38, 0x4e, 0x38, 0x4e, 0x19, 0x28, 0x4b, 0x5a,
-    0x45, 0x4b, 0x1c, 0x53, 0x23, 0x2d, 0x1d, 0x23,
-    0x3e, 0x48, 0x1e, 0x32, 0x3a, 0x5f, 0x58, 0x5e,
-    0x22, 0x2d, 0x1d, 0x28, 0x23, 0x28, 0x23, 0x5f,
-    0x38, 0x4e, 0x38, 0x4e, 0x23, 0x50, 0x22, 0x5e,
-    0x2c, 0x5e, 0x22, 0x28, 0x38, 0x4e, 0x38, 0x4e,
-    0x1e, 0x58, 0x1e, 0x58, 0x1e, 0x2b, 0x1b, 0x21,
-    0x28, 0x5a, 0x19, 0x57, 0x12, 0x58, 0x5a, 0x5f,
-    0x58, 0x5e, 0x16, 0x2a, 0x2a, 0x5c, 0x2a, 0x2f,
-    0x38, 0x4e, 0x38, 0x4e
+const ALIGNED(4) u8 gUnknown_0831C494[][4] =
+{
+    {0x3d, 0x44, 0x3d, 0x44},
+    {0x14, 0x2d, 0x54, 0x5c},
+    {0x46, 0x55, 0x20, 0x5c},
+    {0x26, 0x45, 0x46, 0x55},
+    {0x14, 0x5a, 0x46, 0x5c},
+    {0x1e, 0x32, 0x20, 0x5a},
+    {0x38, 0x4e, 0x38, 0x4e},
+    {0x19, 0x28, 0x4b, 0x5a},
+    {0x45, 0x4b, 0x1c, 0x53},
+    {0x23, 0x2d, 0x1d, 0x23},
+    {0x3e, 0x48, 0x1e, 0x32},
+    {0x3a, 0x5f, 0x58, 0x5e},
+    {0x22, 0x2d, 0x1d, 0x28},
+    {0x23, 0x28, 0x23, 0x5f},
+    {0x38, 0x4e, 0x38, 0x4e},
+    {0x23, 0x50, 0x22, 0x5e},
+    {0x2c, 0x5e, 0x22, 0x28},
+    {0x38, 0x4e, 0x38, 0x4e},
+    {0x1e, 0x58, 0x1e, 0x58},
+    {0x1e, 0x2b, 0x1b, 0x21},
+    {0x28, 0x5a, 0x19, 0x57},
+    {0x12, 0x58, 0x5a, 0x5f},
+    {0x58, 0x5e, 0x16, 0x2a},
+    {0x2a, 0x5c, 0x2a, 0x2f},
+    {0x38, 0x4e, 0x38, 0x4e}
 };
 
 static const u8 sUnknown_0831C4F8[] =
@@ -3533,7 +3544,7 @@ static void atk23_getexp(void)
                 // music change in wild battle after fainting a poke
                 if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp && !gBattleStruct->wildVictorySong)
                 {
-                    BattleMusicStop();
+                    BattleStopLowHpSound();
                     PlayBGM(0x161);
                     gBattleStruct->wildVictorySong++;
                 }
@@ -3628,7 +3639,7 @@ static void atk23_getexp(void)
             if (gBattleBufferB[gActiveBank][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBank][1] == RET_VALUE_LEVELLED_UP)
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlePartyID[gActiveBank] == gBattleStruct->expGetterId)
-                    sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+                    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
 
                 PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBank, gBattleStruct->expGetterId)
 
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 27da8b18e..01dfc954a 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1234,12 +1234,12 @@ static void sub_806E6CC(u8 taskId)
     DestroyTask(taskId);
 }
 
-const u8 *pokemon_get_pal(struct Pokemon *mon)
+const u8 *GetMonFrontSpritePal(struct Pokemon *mon)
 {
     u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0);
     u32 otId = GetMonData(mon, MON_DATA_OT_ID, 0);
     u32 personality = GetMonData(mon, MON_DATA_PERSONALITY, 0);
-    return species_and_otid_get_pal(species, otId, personality);
+    return GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality);
 }
 
 // Extracts the upper 16 bits of a 32-bit number
@@ -1248,7 +1248,7 @@ const u8 *pokemon_get_pal(struct Pokemon *mon)
 // Extracts the lower 16 bits of a 32-bit number
 #define LOHALF(n) ((n) & 0xFFFF)
 
-const u8 *species_and_otid_get_pal(u16 species, u32 otId, u32 personality)
+const u8 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality)
 {
     u32 shinyValue;
 
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 002f4f069..3177a8946 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -37,8 +37,8 @@ extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
 extern void dp12_8087EA4(void);
 extern void trs_config(void);
 extern bool8 IsDoubleBattle(void);
-extern u8 sub_80A614C(u8 bank);
-extern u8 sub_80A6138(u8 bank);
+extern u8 GetSubstituteSpriteDefault_Y(u8 bank);
+extern u8 GetBankSpriteDefault_Y(u8 bank);
 extern u8 sub_80A82E4(u8 bank);
 extern void sub_806A068(u16 species, u8 bankIdentity);
 extern void sub_806A12C(u16 backPicId, u8 bankIdentity);
@@ -104,7 +104,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
         gReservedSpritePaletteCount = 4;
         break;
     case 5:
-        sub_805E350();
+        ClearSpritesHealthboxAnimData();
         break;
     case 6:
         if (BattleLoadAllHealthBoxesGfx(gBattleScripting.reshowHelperState))
@@ -217,7 +217,7 @@ static bool8 LoadBankSpriteGfx(u8 bank)
             if (!gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
                 BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
             else
-                BattleLoadSubstituteSpriteGfx(bank, FALSE);
+                BattleLoadSubstituteOrMonSpriteGfx(bank, FALSE);
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
             DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, bank);
@@ -226,7 +226,7 @@ static bool8 LoadBankSpriteGfx(u8 bank)
         else if (!gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
             BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[bank]], bank);
         else
-            BattleLoadSubstituteSpriteGfx(bank, FALSE);
+            BattleLoadSubstituteOrMonSpriteGfx(bank, FALSE);
 
         gBattleScripting.reshowHelperState = 0;
     }
@@ -250,9 +250,9 @@ static void CreateBankSprite(u8 bank)
         u8 posY;
 
         if (gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
-            posY = sub_80A614C(bank);
+            posY = GetSubstituteSpriteDefault_Y(bank);
         else
-            posY = sub_80A6138(bank);
+            posY = GetBankSpriteDefault_Y(bank);
 
         if (GetBankSide(bank) != SIDE_PLAYER)
         {
-- 
cgit v1.2.3


From 32c7d4f252acf8cc9dc42d50da046c4b3f0beb16 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 4 Nov 2017 16:25:19 +0100
Subject: make it compile

---
 src/battle_interface.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/battle_interface.c b/src/battle_interface.c
index 811751ca3..240c64862 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1239,11 +1239,11 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
             }
 
             ConvertIntToDecimalStringN(text + 6, value, STR_CONV_MODE_RIGHT_ALIGN, 3);
-            RenderTextFont9(gMonSpritesGfxPtr->fontPixels, 9, text);
+            RenderTextFont9(gMonSpritesGfxPtr->barFontGfx, 9, text);
 
             for (i = 0; i < 3; i++)
             {
-                CpuCopy32(&gMonSpritesGfxPtr->fontPixels[i * 64 + 32],
+                CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[i * 64 + 32],
                           (void*)((OBJ_VRAM0) + 32 * (gSprites[healthboxSpriteId].oam.tileNum + var + i)),
                           0x20);
             }
@@ -1308,19 +1308,19 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
             txtPtr = ConvertIntToDecimalStringN(text + 6, value, STR_CONV_MODE_RIGHT_ALIGN, 3);
             if (!maxOrCurrent)
                 StringCopy(txtPtr, gText_Slash);
-            RenderTextFont9(gMonSpritesGfxPtr->fontPixels, 9, text);
+            RenderTextFont9(gMonSpritesGfxPtr->barFontGfx, 9, text);
 
             for (i = var; i < var + 3; i++)
             {
                 if (i < 3)
                 {
-                    CpuCopy32(&gMonSpritesGfxPtr->fontPixels[((i - var) * 64) + 32],
+                    CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[((i - var) * 64) + 32],
                           (void*)((OBJ_VRAM0) + 32 * (1 + gSprites[r7].oam.tileNum + i)),
                           0x20);
                 }
                 else
                 {
-                    CpuCopy32(&gMonSpritesGfxPtr->fontPixels[((i - var) * 64) + 32],
+                    CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[((i - var) * 64) + 32],
                           (void*)((OBJ_VRAM0 + 0x20) + 32 * (i + gSprites[r7].oam.tileNum)),
                           0x20);
                 }
@@ -1328,7 +1328,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
 
             if (maxOrCurrent == HP_CURRENT)
             {
-                CpuCopy32(&gMonSpritesGfxPtr->fontPixels[224],
+                CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[224],
                           (void*)((OBJ_VRAM0) + ((gSprites[r7].oam.tileNum + 4) * 32)),
                           0x20);
                 CpuFill32(0, (void*)((OBJ_VRAM0) + (gSprites[r7].oam.tileNum * 32)), 0x20);
@@ -1350,15 +1350,15 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon)
 {
     u8 text[20];
     s32 j, var2;
-    u8 *fontPixels;
+    u8 *barFontGfx;
     u8 i, var, nature, healthboxSpriteId_2;
 
     memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4));
-    fontPixels = &gMonSpritesGfxPtr->fontPixels[0x520 + (GetBankIdentity(gSprites[healthboxSpriteId].data6) * 384)];
+    barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBankIdentity(gSprites[healthboxSpriteId].data6) * 384)];
     var = 5;
     nature = GetNature(mon);
     StringCopy(text + 6, gNatureNamePointers[nature]);
-    RenderTextFont9(fontPixels, 9, text);
+    RenderTextFont9(barFontGfx, 9, text);
 
     for (j = 6, i = 0; i < var; i++, j++)
     {
@@ -1371,18 +1371,18 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon)
         else
             elementId = 43;
 
-        CpuCopy32(GetHealthboxElementGfxPtr(elementId), fontPixels + (i * 64), 0x20);
+        CpuCopy32(GetHealthboxElementGfxPtr(elementId), barFontGfx + (i * 64), 0x20);
     }
 
     for (j = 1; j < var + 1; j++)
     {
         var2 = (gSprites[healthboxSpriteId].oam.tileNum + (j - (j / 8 * 8)) + (j / 8 * 64)) * 32;
-        CpuCopy32(fontPixels, (void*)(OBJ_VRAM0) + (var2), 0x20);
-        fontPixels += 0x20;
+        CpuCopy32(barFontGfx, (void*)(OBJ_VRAM0) + (var2), 0x20);
+        barFontGfx += 0x20;
 
         var2 = (8 + gSprites[healthboxSpriteId].oam.tileNum + (j - (j / 8 * 8)) + (j / 8 * 64)) * 32;
-        CpuCopy32(fontPixels, (void*)(OBJ_VRAM0) + (var2), 0x20);
-        fontPixels += 0x20;
+        CpuCopy32(barFontGfx, (void*)(OBJ_VRAM0) + (var2), 0x20);
+        barFontGfx += 0x20;
     }
 
     healthboxSpriteId_2 = gSprites[healthboxSpriteId].data5;
@@ -1390,20 +1390,20 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon)
     ConvertIntToDecimalStringN(text + 9, gBattleStruct->field_7B, STR_CONV_MODE_RIGHT_ALIGN, 2);
     text[5] = CHAR_SPACE;
     text[8] = CHAR_SLASH;
-    RenderTextFont9(gMonSpritesGfxPtr->fontPixels, 9, text);
+    RenderTextFont9(gMonSpritesGfxPtr->barFontGfx, 9, text);
 
     j = healthboxSpriteId_2; // needed to match for some reason
     for (j = 0; j < 5; j++)
     {
         if (j <= 1)
         {
-            CpuCopy32(&gMonSpritesGfxPtr->fontPixels[0x40 * j + 0x20],
+            CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[0x40 * j + 0x20],
                       (void*)(OBJ_VRAM0) + (gSprites[healthboxSpriteId_2].oam.tileNum + 2 + j) * 32,
                       32);
         }
         else
         {
-            CpuCopy32(&gMonSpritesGfxPtr->fontPixels[0x40 * j + 0x20],
+            CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[0x40 * j + 0x20],
                       (void*)(OBJ_VRAM0 + 0xC0) + (j + gSprites[healthboxSpriteId_2].oam.tileNum) * 32,
                       32);
         }
-- 
cgit v1.2.3


From 4d4d642285342bef6bafe4b932e3fd8eabeb7133 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 4 Nov 2017 22:40:36 +0100
Subject: dump berry blender and script menu

---
 src/berry_blender.c | 585 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 582 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/berry_blender.c b/src/berry_blender.c
index db50fe4c4..9d98f3fa7 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1,6 +1,8 @@
-
-// Includes
 #include "global.h"
+#include "bg.h"
+#include "window.h"
+#include "task.h"
+#include "sprite.h"
 
 // Static type declarations
 
@@ -11,8 +13,585 @@ IWRAM_DATA s16 gUnknown_03000DF8[6];
 IWRAM_DATA s16 gUnknown_03000E04;
 IWRAM_DATA s16 gUnknown_03000E06;
 
-// Static ROM declarations
+// graphics
+extern const u8 gBerryBlenderArrowTiles[];
+extern const u8 gBerryBlenderStartTiles[];
+extern const u8 gBerryBlenderMarubatsuTiles[];
+extern const u8 gBerryBlenderParticlesTiles[];
+extern const u8 gBerryBlenderCountdownNumbersTiles[];
+extern const u16 gBerryBlenderMiscPalette[];
+extern const u16 gBerryBlenderArrowPalette[];
+
+void sub_8080EA4(u8 taskId);
+void sub_8080FD0(u8 taskId);
+void sub_80810F8(u8 taskId);
+void sub_80833F8(struct Sprite *sprite);
+void sub_8082F68(struct Sprite *sprite);
+void sub_8083010(struct Sprite *sprite);
+void sub_80830C0(struct Sprite *sprite);
 
 // .rodata
+// TODO: make those static once the file is decompiled
+const u16 sBlenderCenterPal[] = INCBIN_U16("graphics/berry_blender/center.gbapal");
+const u8 sBlenderCenterMap[] = INCBIN_U8("graphics/berry_blender/center_map.bin");
+const u16 sBlenderOuterPal[] = INCBIN_U16("graphics/berry_blender/outer.gbapal");
+
+// unreferenced pals?
+static const u16 sUnknownPal_0[] = INCBIN_U16("graphics/unknown/8339514.gbapal");
+static const u16 sUnknownArray_1[224] = {0};
+
+// unused text?
+static const u8 sUnusedText_YesNo[] = _("YES\nNO");
+static const u8 sUnusedText_2[] = _("▶");
+static const u8 sUnusedText_Space[] = _(" ");
+static const u8 sUnusedText_Terminating[] = _("Terminating.");
+static const u8 sUnusedText_LinkPartnerNotFound[] = _("Link partner(s) not found.\nPlease try again.\p");
+
+const u8 gText_BerryBlenderStart[] = _("Starting up the BERRY BLENDER.\pPlease select a BERRY from your BAG\nto put in the BERRY BLENDER.\p");
+const u8 gText_NewParagraph[] = _("\p");
+const u8 gText_wasMade[] = _(" was made!");
+static const u8 sText_Mister[] = _("MISTER");
+static const u8 sText_Laddie[] = _("LADDIE");
+static const u8 sText_Lassie[] = _("LASSIE");
+static const u8 sText_Master[] = _("MASTER");
+static const u8 sText_Dude[] = _("DUDE");
+static const u8 sText_Miss[] = _("MISS");
+
+const u8* const sBlenderOpponentsNames[] =
+{
+    sText_Mister,
+    sText_Laddie,
+    sText_Lassie,
+    sText_Master,
+    sText_Dude,
+    sText_Miss
+};
+
+static const u8 sText_PressA_ToStart[] = _("Press the A Button to start.");
+static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while.");
+const u8 sText_CommunicationStandby[] = _("Communication standby…");
+const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?");
+const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p");
+const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p");
+const u8 sText_hasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER.");
+const u8 sText_someonesPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p");
+const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING");
+static const u8 sText_BerryUsed[] = _("BERRY USED");
+const u8 sText_SpaceBerry[] = _(" BERRY");
+const u8 sText_Time[] = _("Time:");
+const u8 sText_Min[] = _(" min. ");
+const u8 sText_Sec[] = _(" sec.");
+const u8 sText_MaximumSpeed[] = _("MAXIMUM SPEED");
+const u8 sText_RPM[] = _(" RPM");
+const u8 sText_Dot[] = _(".");
+const u8 sText_NewLine[] = _("\n");
+static const u8 sText_Space[] = _(" ");
+const u8 sText_Ranking[] = _("RANKING");
+const u8 sText_TheLevelIs[] = _("The level is ");
+const u8 sText_TheFeelIs[] = _(", and the feel is ");
+const u8 sText_Dot2[] = _(".");
+
+const struct BgTemplate gUnknown_08339974[3] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0,
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 12,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0,
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 8,
+        .screenSize = 1,
+        .paletteMode = 1,
+        .priority = 0,
+        .baseTile = 0,
+    }
+};
+
+const struct WindowTemplate gUnknown_08339980[] =
+{
+    {0, 1, 6, 7, 2, 0xE, 0x28},
+    {0, 0x16, 6, 7, 2, 0xE, 0x36},
+    {0, 1, 0xC, 7, 2, 0xE, 0x44},
+    {0, 0x16, 0xC, 7, 2, 0xE, 0x52},
+    {0, 2, 0xF, 0x1B, 4, 0xE, 0x60},
+    {0, 5, 3, 0x15, 0xE, 0xE, 0x60},
+    DUMMY_WIN_TEMPLATE
+};
+
+const struct WindowTemplate gUnknown_083399B8 =
+{
+    0, 0x15, 9, 5, 4, 0xE, 0xCC
+};
+
+const s8 gUnknown_083399C0[][2] =
+{
+    {-1, -1}, {1, -1}, {-1, 1}, {1, 1}
+};
+
+const u8 sBlenderSyncArrowsPos[][2] =
+{
+    {72, 32}, {168, 32}, {72, 128}, {168, 128}
+};
+
+const u8 gUnknown_083399D0[3][4] =
+{
+    {-1, 0, 1, -1}, {-1, 0, 1, 2}, {0, 1, 2, 3}
+};
+
+const u16 gUnknown_083399DC[] = {0, 0xC000, 0x4000, 0x8000};
+const u8 gUnknown_083399E4[] = {1, 1, 0};
+const u8 gUnknown_083399E7[] = {32, 224, 96, 160, 0};
+
+const TaskFunc gUnknown_083399EC[] =
+{
+    sub_8080EA4, sub_8080FD0, sub_80810F8
+};
+
+static const struct OamData sOamData_8216314 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 2,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sSpriteAnim_821631C[] =
+{
+    ANIMCMD_FRAME(16, 5, 1, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8216324[] =
+{
+    ANIMCMD_FRAME(16, 5, .vFlip = TRUE),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_821632C[] =
+{
+    ANIMCMD_FRAME(16, 5, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8216334[] =
+{
+    ANIMCMD_FRAME(16, 5, 0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_821633C[] =
+{
+    ANIMCMD_FRAME(48, 2, 1, 1),
+    ANIMCMD_FRAME(32, 5, 1, 1),
+    ANIMCMD_FRAME(48, 3, 1, 1),
+    ANIMCMD_FRAME(16, 5, 1, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8216350[] =
+{
+    ANIMCMD_FRAME(48, 2, .vFlip = TRUE),
+    ANIMCMD_FRAME(32, 5, .vFlip = TRUE),
+    ANIMCMD_FRAME(48, 3, .vFlip = TRUE),
+    ANIMCMD_FRAME(16, 5, .vFlip = TRUE),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8216364[] =
+{
+    ANIMCMD_FRAME(48, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(32, 5, .hFlip = TRUE),
+    ANIMCMD_FRAME(48, 3, .hFlip = TRUE),
+    ANIMCMD_FRAME(16, 5, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8216378[] =
+{
+    ANIMCMD_FRAME(48, 2, 0, 0),
+    ANIMCMD_FRAME(32, 5, 0, 0),
+    ANIMCMD_FRAME(48, 3, 0, 0),
+    ANIMCMD_FRAME(16, 5, 0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_821638C[] =
+{
+    ANIMCMD_FRAME(0, 5, 1, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8216394[] =
+{
+    ANIMCMD_FRAME(0, 5, .vFlip = TRUE),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_821639C[] =
+{
+    ANIMCMD_FRAME(0, 5, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82163A4[] =
+{
+    ANIMCMD_FRAME(0, 5, 0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_82163AC[] =
+{
+    sSpriteAnim_821631C,
+    sSpriteAnim_8216324,
+    sSpriteAnim_821632C,
+    sSpriteAnim_8216334,
+    sSpriteAnim_821633C,
+    sSpriteAnim_8216350,
+    sSpriteAnim_8216364,
+    sSpriteAnim_8216378,
+    sSpriteAnim_821638C,
+    sSpriteAnim_8216394,
+    sSpriteAnim_821639C,
+    sSpriteAnim_82163A4
+};
+
+const struct SpriteSheet sSpriteSheet_BlenderArrow =
+{
+    gBerryBlenderArrowTiles, 0x800, 46545
+};
+
+const struct SpritePalette sSpritePal_BlenderMisc =
+{
+    gBerryBlenderMiscPalette, 46546
+};
+
+const struct SpritePalette sSpritePal_BlenderArrow =
+{
+    gBerryBlenderArrowPalette, 12312
+};
+
+const struct SpriteTemplate sBlenderSyncArrow_SpriteTemplate =
+{
+    .tileTag = 46545,
+    .paletteTag = 12312,
+    .oam = &sOamData_8216314,
+    .anims = sSpriteAnimTable_82163AC,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80833F8
+};
+
+static const struct OamData sOamData_821640C =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sSpriteAnim_8216414[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_821641C[] =
+{
+    ANIMCMD_FRAME(4, 20, 1, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8216424[] =
+{
+    ANIMCMD_FRAME(8, 4),
+    ANIMCMD_FRAME(12, 4),
+    ANIMCMD_FRAME(8, 4),
+    ANIMCMD_FRAME(12, 4),
+    ANIMCMD_FRAME(8, 4),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_821643C[] =
+{
+    ANIMCMD_FRAME(8, 4),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_8216444[] =
+{
+    sSpriteAnim_8216414,
+    sSpriteAnim_821641C,
+    sSpriteAnim_8216424,
+    sSpriteAnim_821643C,
+};
+
+const struct SpriteSheet gUnknown_08339B38 =
+{
+    gBerryBlenderMarubatsuTiles, 0x200, 48888
+};
+
+const struct SpriteTemplate gUnknown_08339B40 =
+{
+    .tileTag = 48888,
+    .paletteTag = 46546,
+    .oam = &sOamData_821640C,
+    .anims = sSpriteAnimTable_8216444,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_8082F68
+};
+
+static const struct OamData sOamData_8216474 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sSpriteAnim_821647C[] =
+{
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(3, 5),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8216494[] =
+{
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(4, 5),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(0, 3),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82164AC[] =
+{
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(2, 2),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(3, 3),
+    ANIMCMD_FRAME(2, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82164D0[] =
+{
+    ANIMCMD_FRAME(5, 5, 1, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82164D8[] =
+{
+    ANIMCMD_FRAME(6, 5, 1, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_82164E0[] =
+{
+    sSpriteAnim_821647C,
+    sSpriteAnim_8216494,
+    sSpriteAnim_82164AC,
+    sSpriteAnim_82164D0,
+    sSpriteAnim_82164D8,
+};
+
+const struct SpriteSheet gUnknown_08339BD8 =
+{
+    gBerryBlenderParticlesTiles, 0xE0, 23456
+};
+
+const struct SpriteTemplate gUnknown_08339BE0 =
+{
+    .tileTag = 23456,
+    .paletteTag = 46546,
+    .oam = &sOamData_8216474,
+    .anims = sSpriteAnimTable_82164E0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+static const struct OamData sOamData_8216514 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 2,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sSpriteAnim_821651C[] =
+{
+    ANIMCMD_FRAME(32, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8216524[] =
+{
+    ANIMCMD_FRAME(16, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_821652C[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_8216534[] =
+{
+    sSpriteAnim_821651C,
+    sSpriteAnim_8216524,
+    sSpriteAnim_821652C,
+};
+
+const struct SpriteSheet gUnknown_08339C24 =
+{
+    gBerryBlenderCountdownNumbersTiles, 0x600, 12345
+};
+
+const struct SpriteTemplate gUnknown_08339C2C =
+{
+    .tileTag = 12345,
+    .paletteTag = 46546,
+    .oam = &sOamData_8216514,
+    .anims = sSpriteAnimTable_8216534,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_8083010
+};
+
+static const struct OamData sOamData_8216560 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sSpriteAnim_8216568[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_8216570[] =
+{
+    sSpriteAnim_8216568,
+};
+
+const struct SpriteSheet gUnknown_08339C58 =
+{
+    gBerryBlenderStartTiles, 0x400, 12346
+};
+
+const struct SpriteTemplate gUnknown_08339C60 =
+{
+    .tileTag = 12346,
+    .paletteTag = 46546,
+    .oam = &sOamData_8216560,
+    .anims = sSpriteAnimTable_8216570,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80830C0
+};
+
+const s16 gUnknown_08339C78[][5] =
+{
+    {-10,  20,  10,   2,   1},
+    {250,  20,  10,  -2,   1},
+    {-10, 140,  10,   2,  -1},
+    {250, 140,  10,  -2,  -1},
+};
+
+const u8 gUnknown_08339CA0[][3] =
+{
+    {4, 3, 2}, {0, 4, 3}, {1, 0, 4}, {2, 1, 0}, {3, 2, 1}, {0, 2, 3}, {1, 3, 4}, {2, 4, 0}, {3, 0, 1}, {4, 1, 2},
+};
+
+const u8 gUnknown_08339CBE[] = {30, 31, 32, 33, 34};
+
+const u8 gUnknown_08339CC3[] = {1, 1, 2, 3, 4};
+
+const u8 gUnknown_08339CC8[] = {0x1C, 0x16, 0x13, 0x1A, 0x19, 0x0E, 0x0D, 0x0B, 0x07, 0x15};
+
+static const u8 gUnknown_08339CD2[] =
+{
+    0xfe, 0x02, 0x02, 0xce, 0xd0, 0x37, 0x44, 0x07, 0x1f, 0x0c, 0x10,
+    0x00, 0xff, 0xfe, 0x91, 0x72, 0xce, 0xd0, 0x37, 0x44, 0x07, 0x1f,
+    0x0c, 0x10, 0x00, 0xff, 0x06, 0x27, 0x02, 0xff, 0x00, 0x0c, 0x48,
+    0x02, 0xff, 0x00, 0x01, 0x1f, 0x02, 0xff, 0x00, 0x16, 0x37, 0x02,
+    0xff, 0x00, 0x0d, 0x50, 0x4b, 0x02, 0xff, 0x06, 0x06, 0x06, 0x06,
+    0x05, 0x03, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x02
+};
+
+const struct WindowTemplate gUnknown_08339D14[] = {0, 6, 4, 0x12, 0xB, 0xF, 8};
 
 // .text
-- 
cgit v1.2.3


From bd56bb073f87eeca6e71b14ab1ec0a11ea1ee3a4 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 5 Nov 2017 12:05:07 +0100
Subject: start working on hall of fame

---
 src/hall_of_fame.c | 319 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 319 insertions(+)

(limited to 'src')

diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index d9fd40b84..d63efe21e 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -1,4 +1,323 @@
 #include "global.h"
 #include "hall_of_fame.h"
+#include "task.h"
+#include "palette.h"
+#include "sprite.h"
+#include "pokemon.h"
+#include "text.h"
+#include "malloc.h"
+#include "gpu_regs.h"
+#include "main.h"
+#include "sound.h"
+#include "songs.h"
+#include "decompress.h"
+#include "save.h"
+#include "window.h"
+#include "bg.h"
+#include "species.h"
 
+struct HallofFameMon
+{
+    u32 tid;
+    u32 personality;
+    u16 species : 9;
+    u16 lvl : 7;
+    u8 nick[10];
+};
 
+struct HallofFameMons
+{
+    struct HallofFameMon mons[6];
+};
+
+extern struct HallofFameMons *gHofMonsPtr;
+
+struct HofGfx
+{
+    u16 field_0;
+    u8 field_2[0x2010];
+};
+
+extern struct HofGfx *gUnknown_0203BCDC;
+
+extern u32 gUnknown_0203BCD4;
+extern bool8 HasHallOfFameRecords;
+extern u8 gDecompressionBuffer[];
+
+#define HALL_OF_FAME_MAX_TEAMS 50
+
+// strings
+extern const u8 gText_SavingDontTurnOffPower[];
+
+extern void sub_81973C4(u8, u8);
+extern u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
+
+// this file's functions
+void sub_8174EC4(void);
+void sub_8174F70(void);
+void sub_8174FAC(void);
+bool8 sub_8175024(void);
+void sub_817371C(u8 taskId);
+void sub_81738BC(u8 taskId);
+void sub_8173A8C(u8 taskId);
+void sub_81739C4(u8 taskId);
+void sub_8173A5C(u8 taskId);
+void sub_8173AA8(u8 taskId);
+void sub_8173BC0(u8 taskId);
+void sub_8175120(struct Sprite *sprite);
+
+void VBlankCB_HallOfFame(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void CB2_HallOfFame(void)
+{
+    RunTasks();
+    RunTextPrinters();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+bool8 sub_817357C(void)
+{
+    switch (gMain.state)
+    {
+    case 0:
+        SetVBlankCallback(NULL);
+        sub_8174EC4();
+        gUnknown_0203BCDC = AllocZeroed(sizeof(*gUnknown_0203BCDC));
+        gMain.state = 1;
+        break;
+    case 1:
+        sub_8174F70();
+        gMain.state++;
+        break;
+    case 2:
+        SetGpuReg(REG_OFFSET_BLDCNT, 0x3F42);
+        SetGpuReg(REG_OFFSET_BLDALPHA, 0x710);
+        SetGpuReg(REG_OFFSET_BLDY, 0);
+        sub_8174FAC();
+        gUnknown_0203BCDC->field_0 = 0;
+        gMain.state++;
+        break;
+    case 3:
+        if (!sub_8175024())
+        {
+            SetVBlankCallback(VBlankCB_HallOfFame);
+            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+            gMain.state++;
+        }
+        break;
+    case 4:
+        UpdatePaletteFade();
+        if (!gPaletteFade.active)
+        {
+            SetMainCallback2(CB2_HallOfFame);
+            PlayBGM(BGM_DENDOU);
+            return FALSE;
+        }
+        break;
+    }
+    return TRUE;
+}
+
+#define tData0              data[0]
+#define tDisplayedPoke      data[1]
+#define tPokesNumber        data[2]
+#define tFrameCount         data[3]
+#define tPlayerSpriteID     data[4]
+#define tMonSpriteID(i)     data[i + 5]
+
+void sub_8173694(void)
+{
+    if (!sub_817357C())
+    {
+        u8 taskId = CreateTask(sub_817371C, 0);
+        gTasks[taskId].tData0 = 0;
+        gHofMonsPtr = AllocZeroed(sizeof(*gHofMonsPtr));
+    }
+}
+
+void sub_81736D8(void)
+{
+    if (!sub_817357C())
+    {
+        u8 taskId = CreateTask(sub_817371C, 0);
+        gTasks[taskId].tData0 = 1;
+        gHofMonsPtr = AllocZeroed(sizeof(*gHofMonsPtr));
+    }
+}
+
+void sub_817371C(u8 taskId)
+{
+    u16 i, j;
+
+    gTasks[taskId].tPokesNumber = 0; // valid pokes
+
+    for (i = 0; i < 6; i++)
+    {
+        u8 nick[POKEMON_NAME_LENGTH + 2];
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES))
+        {
+            gHofMonsPtr->mons[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
+            gHofMonsPtr->mons[i].tid = GetMonData(&gPlayerParty[i], MON_DATA_OT_ID);
+            gHofMonsPtr->mons[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
+            gHofMonsPtr->mons[i].lvl = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
+            GetMonData(&gPlayerParty[i], MON_DATA_NICKNAME, nick);
+            for (j = 0; j < POKEMON_NAME_LENGTH; j++)
+            {
+                gHofMonsPtr->mons[i].nick[j] = nick[j];
+            }
+            gTasks[taskId].tPokesNumber++;
+        }
+        else
+        {
+            gHofMonsPtr->mons[i].species = 0;
+            gHofMonsPtr->mons[i].tid = 0;
+            gHofMonsPtr->mons[i].personality = 0;
+            gHofMonsPtr->mons[i].lvl = 0;
+            gHofMonsPtr->mons[i].nick[0] = EOS;
+        }
+    }
+
+    gUnknown_0203BCD4 = 0;
+    gTasks[taskId].tDisplayedPoke = 0;
+    gTasks[taskId].tPlayerSpriteID = 0xFF;
+
+    for (i = 0; i < 6; i++)
+    {
+        gTasks[taskId].tMonSpriteID(i) = 0xFF;
+    }
+
+    if (gTasks[taskId].tData0)
+        gTasks[taskId].func = sub_8173A8C;
+    else
+        gTasks[taskId].func = sub_81738BC;
+}
+
+void sub_81738BC(u8 taskId)
+{
+    u16 i;
+    struct HallofFameMons* lastSavedTeam = (struct HallofFameMons*)(gDecompressionBuffer);
+
+    if (!HasHallOfFameRecords)
+    {
+        memset(gDecompressionBuffer, 0, 0x2000);
+    }
+    else
+    {
+        if (sub_81534D0(3) != TRUE)
+            memset(gDecompressionBuffer, 0, 0x2000);
+    }
+
+    for (i = 0; i < HALL_OF_FAME_MAX_TEAMS; i++, lastSavedTeam++)
+    {
+        if (lastSavedTeam->mons[0].species == 0)
+            break;
+    }
+    if (i >= HALL_OF_FAME_MAX_TEAMS)
+    {
+        struct HallofFameMons *afterTeam = (struct HallofFameMons*)(gDecompressionBuffer);
+        struct HallofFameMons *beforeTeam = (struct HallofFameMons*)(gDecompressionBuffer);
+        afterTeam++;
+        for (i = 0; i < HALL_OF_FAME_MAX_TEAMS - 1; i++, beforeTeam++, afterTeam++)
+        {
+            *beforeTeam = *afterTeam;
+        }
+        lastSavedTeam--;
+    }
+    *lastSavedTeam = *gHofMonsPtr;
+
+    sub_81973C4(0, 0);
+    AddTextPrinterParametrized(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
+    CopyWindowToVram(0, 3);
+    gTasks[taskId].func = sub_81739C4;
+}
+
+extern u8 TrySavingData(u8);
+extern MainCallback gGameContinueCallback;
+extern u32 gDamagedSaveSectors;
+
+void sub_81739C4(u8 taskId)
+{
+    gGameContinueCallback = sub_81736D8;
+    if (TrySavingData(3) == 0xFF && gDamagedSaveSectors != 0)
+    {
+        UnsetBgTilemapBuffer(1);
+        UnsetBgTilemapBuffer(3);
+        FreeAllWindowBuffers();
+
+        if (gUnknown_0203BCDC != NULL)
+            FREE_AND_SET_NULL(gUnknown_0203BCDC);
+        if (gHofMonsPtr != NULL)
+            FREE_AND_SET_NULL(gHofMonsPtr);
+
+        DestroyTask(taskId);
+    }
+    else
+    {
+        PlaySE(SE_SAVE);
+        gTasks[taskId].func = sub_8173A5C;
+        gTasks[taskId].tFrameCount = 32;
+    }
+}
+
+void sub_8173A5C(u8 taskId)
+{
+    if (gTasks[taskId].tFrameCount)
+        gTasks[taskId].tFrameCount--;
+    else
+        gTasks[taskId].func = sub_8173A8C;
+}
+
+void sub_8173A8C(u8 taskId)
+{
+    gTasks[taskId].func = sub_8173AA8;
+}
+
+extern const s16 sHallOfFame_MonsFullTeamPositions[][4];
+extern const s16 sHallOfFame_MonsHalfTeamPositions[][4];
+
+extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);
+extern void sub_8197434(u8, u8);
+
+void sub_8173AA8(u8 taskId)
+{
+    u8 spriteId;
+    s16 xPos, yPos, field4, field6;
+
+    u16 currPokeID = gTasks[taskId].tDisplayedPoke;
+    struct HallofFameMon* currMon = &gHofMonsPtr->mons[currPokeID];
+
+    if (gTasks[taskId].tPokesNumber > 3)
+    {
+        xPos = sHallOfFame_MonsFullTeamPositions[currPokeID][0];
+        yPos = sHallOfFame_MonsFullTeamPositions[currPokeID][1];
+        field4 = sHallOfFame_MonsFullTeamPositions[currPokeID][2];
+        field6 = sHallOfFame_MonsFullTeamPositions[currPokeID][3];
+    }
+    else
+    {
+        xPos = sHallOfFame_MonsHalfTeamPositions[currPokeID][0];
+        yPos = sHallOfFame_MonsHalfTeamPositions[currPokeID][1];
+        field4 = sHallOfFame_MonsHalfTeamPositions[currPokeID][2];
+        field6 = sHallOfFame_MonsHalfTeamPositions[currPokeID][3];
+    }
+
+    if (currMon->species == SPECIES_EGG)
+        field6 += 10;
+
+    spriteId = sub_818D3E4(currMon->species, currMon->tid, currMon->personality, 1, xPos, yPos, currPokeID, 0xFFFF);
+    gSprites[spriteId].data1 = field4;
+    gSprites[spriteId].data2 = field6;
+    gSprites[spriteId].data0 = 0;
+    gSprites[spriteId].data7 = currMon->species;
+    gSprites[spriteId].callback = sub_8175120;
+    gTasks[taskId].tMonSpriteID(currPokeID) = spriteId;
+    sub_8197434(0, 1);
+    gTasks[taskId].func = sub_8173BC0;
+}
-- 
cgit v1.2.3


From 0f723f7677d52075b4798d9ec6bb4b60d752906f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 5 Nov 2017 14:55:13 +0100
Subject: halfway through hall of fame

---
 src/hall_of_fame.c | 668 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 615 insertions(+), 53 deletions(-)

(limited to 'src')

diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index d63efe21e..35509b53a 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -15,6 +15,10 @@
 #include "window.h"
 #include "bg.h"
 #include "species.h"
+#include "game_stat.h"
+#include "blend_palette.h"
+#include "string_util.h"
+#include "m4a.h"
 
 struct HallofFameMon
 {
@@ -43,28 +47,79 @@ extern struct HofGfx *gUnknown_0203BCDC;
 extern u32 gUnknown_0203BCD4;
 extern bool8 HasHallOfFameRecords;
 extern u8 gDecompressionBuffer[];
+extern struct MusicPlayerInfo gMPlay_BGM;
+extern MainCallback gGameContinueCallback;
+extern u32 gDamagedSaveSectors;
 
 #define HALL_OF_FAME_MAX_TEAMS 50
 
 // strings
 extern const u8 gText_SavingDontTurnOffPower[];
+extern const u8 gText_LeagueChamp[];
+extern const u8 gText_HOFNumber[];
+extern const u8 gText_PickNextCancel[];
+extern const u8 gText_PickCancel[];
+extern const u8 gText_UnkCtrlF800Exit[];
+extern const u8 gText_HOFCorrupted[];
 
 extern void sub_81973C4(u8, u8);
 extern u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
+extern void sub_8175620(void);
+extern u8 TrySavingData(u8);
+extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);
+extern void sub_8197434(u8, u8);
+extern u16 sub_818D97C(u8 playerGender, u8);
+extern u16 sub_818D8AC(u16, u8, s16, s16, u8, u16);
+extern const void* stdpal_get(u8);
+extern void sub_80987D4(u8, u8, u16, u8);
+extern u16 sub_818D820(u16);
+extern u16 sub_818D8F0(u16);
+extern u16 sub_818D7D8(u16 species, u32 trainerId, u32 personality, u8 arg3, s16 sp0, s16 sp1, u8 sp2, u16 sp3);
+extern void sub_8198204(u8 *dst, const u8 *src, u8, u8, u8);
+extern bool8 sub_80F9C30(void);
+extern void sub_8198314(void);
+extern void sub_8137C3C(void);
+extern void sub_8198180(const u8 *src, u8, u8);
+extern void sub_80F9BF4(u16, u16, u8);
+extern void sub_81980F0(u8, u8, u8, u8, u16);
+extern void sub_80F9BCC(u16, u16, u8);
+extern bool8 sub_80F9C1C(void);
 
 // this file's functions
 void sub_8174EC4(void);
 void sub_8174F70(void);
 void sub_8174FAC(void);
+void sub_81751FC(void);
+static void SetCallback2AfterHallOfFameDisplay(void);
 bool8 sub_8175024(void);
-void sub_817371C(u8 taskId);
-void sub_81738BC(u8 taskId);
-void sub_8173A8C(u8 taskId);
-void sub_81739C4(u8 taskId);
-void sub_8173A5C(u8 taskId);
-void sub_8173AA8(u8 taskId);
-void sub_8173BC0(u8 taskId);
+static void Task_Hof_InitMonData(u8 taskId);
+static void Task_Hof_InitTeamSaveData(u8 taskId);
+static void Task_Hof_SetMonDisplayTask(u8 taskId);
+static void Task_Hof_TrySaveData(u8 taskId);
+static void Task_Hof_WaitForFrames(u8 taskId);
+static void Task_Hof_DisplayMon(u8 taskId);
+static void Task_Hof_PrintMonInfoAfterAnimating(u8 taskId);
+static void Task_Hof_TryDisplayAnotherMon(u8 taskId);
+static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId);
+static void sub_8173DC0(u8 taskId);
+static void sub_8173EA4(u8 taskId);
+static void sub_8173EE4(u8 taskId);
+static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId);
+static void Task_Hof_ExitOnKeyPressed(u8 taskId);
+static void Task_Hof_HandlePaletteOnExit(u8 taskId);
+static void Task_Hof_HandleExit(u8 taskId);
+static void Task_HofPC_CopySaveData(u8 taskId);
+static void Task_HofPC_PrintDataIsCorrupted(u8 taskId);
+static void Task_HofPC_DrawSpritesPrintText(u8 taskId);
+static void Task_HofPC_PrintMonInfo(u8 taskId);
+static void Task_HofPC_HandleInput(u8 taskId);
+static void Task_HofPC_HandlePaletteOnExit(u8 taskId);
+static void Task_HofPC_HandleExit(u8 taskId);
+static void Task_HofPC_ExitOnButtonPress(u8 taskId);
 void sub_8175120(struct Sprite *sprite);
+void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u8 unused2);
+void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 arg1);
+void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2);
 
 void VBlankCB_HallOfFame(void)
 {
@@ -82,7 +137,7 @@ void CB2_HallOfFame(void)
     UpdatePaletteFade();
 }
 
-bool8 sub_817357C(void)
+static bool8 InitHallOfFameScreen(void)
 {
     switch (gMain.state)
     {
@@ -125,34 +180,34 @@ bool8 sub_817357C(void)
     return TRUE;
 }
 
-#define tData0              data[0]
-#define tDisplayedPoke      data[1]
+#define tDontSaveData       data[0]
+#define tDisplayedMonId     data[1]
 #define tPokesNumber        data[2]
 #define tFrameCount         data[3]
 #define tPlayerSpriteID     data[4]
 #define tMonSpriteID(i)     data[i + 5]
 
-void sub_8173694(void)
+void CB2_DoHallOfFameScreen(void)
 {
-    if (!sub_817357C())
+    if (!InitHallOfFameScreen())
     {
-        u8 taskId = CreateTask(sub_817371C, 0);
-        gTasks[taskId].tData0 = 0;
+        u8 taskId = CreateTask(Task_Hof_InitMonData, 0);
+        gTasks[taskId].tDontSaveData = FALSE;
         gHofMonsPtr = AllocZeroed(sizeof(*gHofMonsPtr));
     }
 }
 
-void sub_81736D8(void)
+void CB2_DoHallOfFameScreenDontSaveData(void)
 {
-    if (!sub_817357C())
+    if (!InitHallOfFameScreen())
     {
-        u8 taskId = CreateTask(sub_817371C, 0);
-        gTasks[taskId].tData0 = 1;
+        u8 taskId = CreateTask(Task_Hof_InitMonData, 0);
+        gTasks[taskId].tDontSaveData = TRUE;
         gHofMonsPtr = AllocZeroed(sizeof(*gHofMonsPtr));
     }
 }
 
-void sub_817371C(u8 taskId)
+static void Task_Hof_InitMonData(u8 taskId)
 {
     u16 i, j;
 
@@ -185,7 +240,7 @@ void sub_817371C(u8 taskId)
     }
 
     gUnknown_0203BCD4 = 0;
-    gTasks[taskId].tDisplayedPoke = 0;
+    gTasks[taskId].tDisplayedMonId = 0;
     gTasks[taskId].tPlayerSpriteID = 0xFF;
 
     for (i = 0; i < 6; i++)
@@ -193,13 +248,13 @@ void sub_817371C(u8 taskId)
         gTasks[taskId].tMonSpriteID(i) = 0xFF;
     }
 
-    if (gTasks[taskId].tData0)
-        gTasks[taskId].func = sub_8173A8C;
+    if (gTasks[taskId].tDontSaveData)
+        gTasks[taskId].func = Task_Hof_SetMonDisplayTask;
     else
-        gTasks[taskId].func = sub_81738BC;
+        gTasks[taskId].func = Task_Hof_InitTeamSaveData;
 }
 
-void sub_81738BC(u8 taskId)
+static void Task_Hof_InitTeamSaveData(u8 taskId)
 {
     u16 i;
     struct HallofFameMons* lastSavedTeam = (struct HallofFameMons*)(gDecompressionBuffer);
@@ -235,16 +290,12 @@ void sub_81738BC(u8 taskId)
     sub_81973C4(0, 0);
     AddTextPrinterParametrized(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
     CopyWindowToVram(0, 3);
-    gTasks[taskId].func = sub_81739C4;
+    gTasks[taskId].func = Task_Hof_TrySaveData;
 }
 
-extern u8 TrySavingData(u8);
-extern MainCallback gGameContinueCallback;
-extern u32 gDamagedSaveSectors;
-
-void sub_81739C4(u8 taskId)
+static void Task_Hof_TrySaveData(u8 taskId)
 {
-    gGameContinueCallback = sub_81736D8;
+    gGameContinueCallback = CB2_DoHallOfFameScreenDontSaveData;
     if (TrySavingData(3) == 0xFF && gDamagedSaveSectors != 0)
     {
         UnsetBgTilemapBuffer(1);
@@ -261,63 +312,574 @@ void sub_81739C4(u8 taskId)
     else
     {
         PlaySE(SE_SAVE);
-        gTasks[taskId].func = sub_8173A5C;
+        gTasks[taskId].func = Task_Hof_WaitForFrames;
         gTasks[taskId].tFrameCount = 32;
     }
 }
 
-void sub_8173A5C(u8 taskId)
+static void Task_Hof_WaitForFrames(u8 taskId)
 {
     if (gTasks[taskId].tFrameCount)
         gTasks[taskId].tFrameCount--;
     else
-        gTasks[taskId].func = sub_8173A8C;
+        gTasks[taskId].func = Task_Hof_SetMonDisplayTask;
 }
 
-void sub_8173A8C(u8 taskId)
+static void Task_Hof_SetMonDisplayTask(u8 taskId)
 {
-    gTasks[taskId].func = sub_8173AA8;
+    gTasks[taskId].func = Task_Hof_DisplayMon;
 }
 
 extern const s16 sHallOfFame_MonsFullTeamPositions[][4];
 extern const s16 sHallOfFame_MonsHalfTeamPositions[][4];
 
-extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);
-extern void sub_8197434(u8, u8);
-
-void sub_8173AA8(u8 taskId)
+static void Task_Hof_DisplayMon(u8 taskId)
 {
     u8 spriteId;
     s16 xPos, yPos, field4, field6;
 
-    u16 currPokeID = gTasks[taskId].tDisplayedPoke;
-    struct HallofFameMon* currMon = &gHofMonsPtr->mons[currPokeID];
+    u16 currMonId = gTasks[taskId].tDisplayedMonId;
+    struct HallofFameMon* currMon = &gHofMonsPtr->mons[currMonId];
 
     if (gTasks[taskId].tPokesNumber > 3)
     {
-        xPos = sHallOfFame_MonsFullTeamPositions[currPokeID][0];
-        yPos = sHallOfFame_MonsFullTeamPositions[currPokeID][1];
-        field4 = sHallOfFame_MonsFullTeamPositions[currPokeID][2];
-        field6 = sHallOfFame_MonsFullTeamPositions[currPokeID][3];
+        xPos = sHallOfFame_MonsFullTeamPositions[currMonId][0];
+        yPos = sHallOfFame_MonsFullTeamPositions[currMonId][1];
+        field4 = sHallOfFame_MonsFullTeamPositions[currMonId][2];
+        field6 = sHallOfFame_MonsFullTeamPositions[currMonId][3];
     }
     else
     {
-        xPos = sHallOfFame_MonsHalfTeamPositions[currPokeID][0];
-        yPos = sHallOfFame_MonsHalfTeamPositions[currPokeID][1];
-        field4 = sHallOfFame_MonsHalfTeamPositions[currPokeID][2];
-        field6 = sHallOfFame_MonsHalfTeamPositions[currPokeID][3];
+        xPos = sHallOfFame_MonsHalfTeamPositions[currMonId][0];
+        yPos = sHallOfFame_MonsHalfTeamPositions[currMonId][1];
+        field4 = sHallOfFame_MonsHalfTeamPositions[currMonId][2];
+        field6 = sHallOfFame_MonsHalfTeamPositions[currMonId][3];
     }
 
     if (currMon->species == SPECIES_EGG)
         field6 += 10;
 
-    spriteId = sub_818D3E4(currMon->species, currMon->tid, currMon->personality, 1, xPos, yPos, currPokeID, 0xFFFF);
+    spriteId = sub_818D3E4(currMon->species, currMon->tid, currMon->personality, 1, xPos, yPos, currMonId, 0xFFFF);
     gSprites[spriteId].data1 = field4;
     gSprites[spriteId].data2 = field6;
     gSprites[spriteId].data0 = 0;
     gSprites[spriteId].data7 = currMon->species;
     gSprites[spriteId].callback = sub_8175120;
-    gTasks[taskId].tMonSpriteID(currPokeID) = spriteId;
+    gTasks[taskId].tMonSpriteID(currMonId) = spriteId;
     sub_8197434(0, 1);
-    gTasks[taskId].func = sub_8173BC0;
+    gTasks[taskId].func = Task_Hof_PrintMonInfoAfterAnimating;
+}
+
+static void Task_Hof_PrintMonInfoAfterAnimating(u8 taskId)
+{
+    u16 currMonId = gTasks[taskId].tDisplayedMonId;
+    struct HallofFameMon* currMon = &gHofMonsPtr->mons[currMonId];
+    struct Sprite *monSprite = &gSprites[gTasks[taskId].tMonSpriteID(currMonId)];
+
+    if (monSprite->callback == SpriteCallbackDummy)
+    {
+        monSprite->oam.affineMode = 0;
+        HallOfFame_PrintMonInfo(currMon, 0, 14);
+        gTasks[taskId].tFrameCount = 120;
+        gTasks[taskId].func = Task_Hof_TryDisplayAnotherMon;
+    }
+}
+
+static void Task_Hof_TryDisplayAnotherMon(u8 taskId)
+{
+    u16 currPokeID = gTasks[taskId].tDisplayedMonId;
+    struct HallofFameMon* currMon = &gHofMonsPtr->mons[currPokeID];
+
+    if (gTasks[taskId].tFrameCount != 0)
+    {
+        gTasks[taskId].tFrameCount--;
+    }
+    else
+    {
+        gUnknown_0203BCD4 |= (0x10000 << gSprites[gTasks[taskId].tMonSpriteID(currPokeID)].oam.paletteNum);
+        if (gTasks[taskId].tDisplayedMonId <= 4 && currMon[1].species != SPECIES_NONE) // there is another pokemon to display
+        {
+            gTasks[taskId].tDisplayedMonId++;
+            BeginNormalPaletteFade(gUnknown_0203BCD4, 0, 12, 12, 0x63B0);
+            gSprites[gTasks[taskId].tMonSpriteID(currPokeID)].oam.priority = 1;
+            gTasks[taskId].func = Task_Hof_DisplayMon;
+        }
+        else
+        {
+            gTasks[taskId].func = Task_Hof_PaletteFadeAndPrintWelcomeText;
+        }
+    }
+}
+
+static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskID)
+{
+    u16 i;
+
+    BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, 0);
+    for (i = 0; i < 6; i++)
+    {
+        if (gTasks[taskID].tMonSpriteID(i) != 0xFF)
+            gSprites[gTasks[taskID].tMonSpriteID(i)].oam.priority = 0;
+    }
+
+    HallOfFame_PrintWelcomeText(0, 15);
+    PlaySE(SE_DENDOU);
+    gTasks[taskID].tFrameCount = 400;
+    gTasks[taskID].func = sub_8173DC0;
+}
+
+static void sub_8173DC0(u8 taskID)
+{
+    if (gTasks[taskID].tFrameCount != 0)
+    {
+        gTasks[taskID].tFrameCount--;
+        if ((gTasks[taskID].tFrameCount & 3) == 0 && gTasks[taskID].tFrameCount > 110)
+            sub_81751FC();
+    }
+    else
+    {
+        u16 i;
+        for (i = 0; i < 6; i++)
+        {
+            if (gTasks[taskID].tMonSpriteID(i) != 0xFF)
+                gSprites[gTasks[taskID].tMonSpriteID(i)].oam.priority = 1;
+        }
+        BeginNormalPaletteFade(gUnknown_0203BCD4, 0, 12, 12, 0x63B0);
+        FillWindowPixelBuffer(0, 0);
+        CopyWindowToVram(0, 3);
+        gTasks[taskID].tFrameCount = 7;
+        gTasks[taskID].func = sub_8173EA4;
+    }
+}
+
+static void sub_8173EA4(u8 taskID)
+{
+    if (gTasks[taskID].tFrameCount >= 16)
+    {
+        gTasks[taskID].func = sub_8173EE4;
+    }
+    else
+    {
+        gTasks[taskID].tFrameCount++;
+        SetGpuReg(REG_OFFSET_BLDALPHA, gTasks[taskID].tFrameCount * 256);
+    }
+}
+
+extern const struct WindowTemplate gUnknown_085E5380;
+
+static void sub_8173EE4(u8 taskID)
+{
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+    ShowBg(0);
+    ShowBg(1);
+    ShowBg(3);
+    gTasks[taskID].tPlayerSpriteID = sub_818D8AC(sub_818D97C(gSaveBlock2Ptr->playerGender, 1), 1, 120, 72, 6, 0xFFFF);
+    AddWindow(&gUnknown_085E5380);
+    sub_80987D4(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0);
+    LoadPalette(stdpal_get(1), 0xE0, 0x20);
+    gTasks[taskID].tFrameCount = 120;
+    gTasks[taskID].func = Task_Hof_WaitAndPrintPlayerInfo;
+}
+
+static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskID)
+{
+    if (gTasks[taskID].tFrameCount != 0)
+    {
+        gTasks[taskID].tFrameCount--;
+    }
+    else if (gSprites[gTasks[taskID].tPlayerSpriteID].pos1.x != 192)
+    {
+        gSprites[gTasks[taskID].tPlayerSpriteID].pos1.x++;
+    }
+    else
+    {
+        FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
+        HallOfFame_PrintPlayerInfo(1, 2);
+        sub_81973C4(0, 0);
+        AddTextPrinterParametrized(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3);
+        CopyWindowToVram(0, 3);
+        gTasks[taskID].func = Task_Hof_ExitOnKeyPressed;
+    }
+}
+
+static void Task_Hof_ExitOnKeyPressed(u8 taskID)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        FadeOutBGM(4);
+        gTasks[taskID].func = Task_Hof_HandlePaletteOnExit;
+    }
+}
+
+static void Task_Hof_HandlePaletteOnExit(u8 taskID)
+{
+    CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
+    BeginNormalPaletteFade(-1, 8, 0, 0x10, 0);
+    gTasks[taskID].func = Task_Hof_HandleExit;
 }
+
+static void Task_Hof_HandleExit(u8 taskID)
+{
+    if (!gPaletteFade.active)
+    {
+        s32 i;
+
+        for (i = 0; i < 6; i++)
+        {
+            u8 spriteId = gTasks[taskID].tMonSpriteID(i);
+            if (spriteId != 0xFF)
+            {
+                FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
+                sub_818D820(spriteId);
+            }
+        }
+
+        sub_818D8F0(gTasks[taskID].tPlayerSpriteID);
+        HideBg(0);
+        HideBg(1);
+        HideBg(3);
+        FreeAllWindowBuffers();
+        UnsetBgTilemapBuffer(1);
+        UnsetBgTilemapBuffer(3);
+        ResetBgsAndClearDma3BusyFlags(0);
+        DestroyTask(taskID);
+
+        if (gUnknown_0203BCDC != NULL)
+            FREE_AND_SET_NULL(gUnknown_0203BCDC);
+        if (gHofMonsPtr != NULL)
+            FREE_AND_SET_NULL(gHofMonsPtr);
+
+        SetCallback2AfterHallOfFameDisplay();
+    }
+}
+
+static void SetCallback2AfterHallOfFameDisplay(void)
+{
+    SetMainCallback2(sub_8175620);
+}
+
+#undef tDontSaveData
+#undef tDisplayedPoke
+#undef tPokesNumber
+#undef tFrameCount
+#undef tPlayerSpriteID
+#undef tMonSpriteID
+
+#define tCurrTeamNo     data[0]
+#define tCurrPageNo     data[1]
+#define tCurrPokeID     data[2]
+#define tPokesNo        data[4]
+#define tMonSpriteID(i) data[i + 5]
+
+extern const struct HallofFameMon sDummyFameMon;
+
+void CB2_DoHallOfFamePC(void)
+{
+    switch (gMain.state)
+    {
+    case 0:
+    default:
+        SetVBlankCallback(NULL);
+        sub_8174EC4();
+        gUnknown_0203BCDC = AllocZeroed(sizeof(*gUnknown_0203BCDC));
+        gMain.state = 1;
+        break;
+    case 1:
+        sub_8174F70();
+        gMain.state++;
+        break;
+    case 2:
+        SetGpuReg(REG_OFFSET_BLDCNT, 0);
+        SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+        SetGpuReg(REG_OFFSET_BLDY, 0);
+        sub_8174FAC();
+        gMain.state++;
+        break;
+    case 3:
+        if (!sub_8175024())
+        {
+            struct HallofFameMons *fameMons = (struct HallofFameMons*)(gDecompressionBuffer);
+            fameMons->mons[0] = sDummyFameMon;
+            sub_80F9BCC(0, 0, 0);
+            SetVBlankCallback(VBlankCB_HallOfFame);
+            gMain.state++;
+        }
+        break;
+    case 4:
+        RunTasks();
+        AnimateSprites();
+        BuildOamBuffer();
+        UpdatePaletteFade();
+        if (!sub_80F9C1C())
+            gMain.state++;
+        break;
+    case 5:
+        {
+            u8 taskId, i;
+
+            SetGpuReg(REG_OFFSET_BLDCNT, 0x3F42);
+            SetGpuReg(REG_OFFSET_BLDALPHA, 0x710);
+            SetGpuReg(REG_OFFSET_BLDY, 0);
+            taskId = CreateTask(Task_HofPC_CopySaveData, 0);
+
+            for (i = 0; i < 6; i++)
+            {
+                gTasks[taskId].tMonSpriteID(i) = 0xFF;
+            }
+
+            gHofMonsPtr = AllocZeroed(0x2000);
+            SetMainCallback2(CB2_HallOfFame);
+        }
+        break;
+    }
+}
+
+static void Task_HofPC_CopySaveData(u8 taskID)
+{
+    sub_81980F0(0, 0x1E, 0, 0xC, 0x226);
+    if (sub_81534D0(3) != 1)
+    {
+        gTasks[taskID].func = Task_HofPC_PrintDataIsCorrupted;
+    }
+    else
+    {
+        u16 i;
+        struct HallofFameMons* savedTeams;
+
+        CpuCopy16(gDecompressionBuffer, gHofMonsPtr, 0x2000);
+        savedTeams = gHofMonsPtr;
+        for (i = 0; i < HALL_OF_FAME_MAX_TEAMS; i++, savedTeams++)
+        {
+            if (savedTeams->mons[0].species == SPECIES_NONE)
+                break;
+        }
+
+        if (i < HALL_OF_FAME_MAX_TEAMS)
+            gTasks[taskID].tCurrTeamNo = i - 1;
+        else
+            gTasks[taskID].tCurrTeamNo = HALL_OF_FAME_MAX_TEAMS - 1;
+
+        gTasks[taskID].tCurrPageNo = GetGameStat(GAME_STAT_ENTERED_HOF);
+
+        gTasks[taskID].func = Task_HofPC_DrawSpritesPrintText;
+    }
+}
+
+static void Task_HofPC_DrawSpritesPrintText(u8 taskID)
+{
+    struct HallofFameMons* savedTeams = gHofMonsPtr;
+    struct HallofFameMon* currMon;
+    u16 i;
+
+    for (i = 0; i < gTasks[taskID].tCurrTeamNo; i++)
+        savedTeams++;
+
+    currMon = &savedTeams->mons[0];
+    gUnknown_0203BCD4 = 0;
+    gTasks[taskID].tCurrPokeID = 0;
+    gTasks[taskID].tPokesNo = 0;
+
+    for (i = 0; i < 6; i++, currMon++)
+    {
+        if (currMon->species != 0)
+            gTasks[taskID].tPokesNo++;
+    }
+
+    currMon = &savedTeams->mons[0];
+
+    for (i = 0; i < 6; i++, currMon++)
+    {
+        if (currMon->species != 0)
+        {
+            u16 spriteID;
+            s16 posX, posY;
+
+            if (gTasks[taskID].tPokesNo > 3)
+            {
+                posX = sHallOfFame_MonsFullTeamPositions[i][2];
+                posY = sHallOfFame_MonsFullTeamPositions[i][3];
+            }
+            else
+            {
+                posX = sHallOfFame_MonsHalfTeamPositions[i][2];
+                posY = sHallOfFame_MonsHalfTeamPositions[i][3];
+            }
+
+            if (currMon->species == SPECIES_EGG)
+                posY += 10;
+
+            spriteID = sub_818D7D8(currMon->species, currMon->tid, currMon->personality, 1, posX, posY, i, 0xFFFF);
+            gSprites[spriteID].oam.priority = 1;
+            gTasks[taskID].tMonSpriteID(i) = spriteID;
+        }
+        else
+        {
+            gTasks[taskID].tMonSpriteID(i) = 0xFF;
+        }
+    }
+
+    BlendPalettes(0xFFFF0000, 0xC, 0x63B0);
+
+    ConvertIntToDecimalStringN(gStringVar1, gTasks[taskID].tCurrPageNo, STR_CONV_MODE_RIGHT_ALIGN, 3);
+    StringExpandPlaceholders(gStringVar4, gText_HOFNumber);
+
+    if (gTasks[taskID].tCurrTeamNo <= 0)
+        sub_8198204(gStringVar4, gText_PickCancel, 0, 0, 1);
+    else
+        sub_8198204(gStringVar4, gText_PickNextCancel, 0, 0, 1);
+
+    gTasks[taskID].func = Task_HofPC_PrintMonInfo;
+}
+
+static void Task_HofPC_PrintMonInfo(u8 taskID)
+{
+    struct HallofFameMons* savedTeams = gHofMonsPtr;
+    struct HallofFameMon* currMon;
+    u16 i;
+    u16 currMonID;
+
+    for (i = 0; i < gTasks[taskID].tCurrTeamNo; i++)
+        savedTeams++;
+
+    for (i = 0; i < 6; i++)
+    {
+        u16 spriteID = gTasks[taskID].tMonSpriteID(i);
+        if (spriteID != 0xFF)
+            gSprites[spriteID].oam.priority = 1;
+    }
+
+    currMonID = gTasks[taskID].tMonSpriteID(gTasks[taskID].tCurrPokeID);
+    gSprites[currMonID].oam.priority = 0;
+    gUnknown_0203BCD4 = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ 0xFFFF0000;
+    BlendPalettesUnfaded(gUnknown_0203BCD4, 0xC, 0x63B0);
+
+    currMon = &savedTeams->mons[gTasks[taskID].tCurrPokeID];
+    if (currMon->species != SPECIES_EGG)
+    {
+        StopCryAndClearCrySongs();
+        PlayCry1(currMon->species, 0);
+    }
+    HallOfFame_PrintMonInfo(currMon, 0, 14);
+
+    gTasks[taskID].func = Task_HofPC_HandleInput;
+}
+
+static void Task_HofPC_HandleInput(u8 taskID)
+{
+    u16 i;
+
+    if (gMain.newKeys & A_BUTTON)
+    {
+        if (gTasks[taskID].tCurrTeamNo != 0) // prepare another team to view
+        {
+            gTasks[taskID].tCurrTeamNo--;
+            for (i = 0; i < 6; i++)
+            {
+                u8 spriteID = gTasks[taskID].tMonSpriteID(i);
+                if (spriteID != 0xFF)
+                {
+                    sub_818D820(spriteID);
+                    gTasks[taskID].tMonSpriteID(i) = 0xFF;
+                }
+            }
+            if (gTasks[taskID].tCurrPageNo != 0)
+                gTasks[taskID].tCurrPageNo--;
+            gTasks[taskID].func = Task_HofPC_DrawSpritesPrintText;
+        }
+        else // no more teams to view, turn off hall of fame PC
+        {
+            if (IsCryPlayingOrClearCrySongs())
+            {
+                StopCryAndClearCrySongs();
+                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+            }
+            gTasks[taskID].func = Task_HofPC_HandlePaletteOnExit;
+        }
+    }
+    else if (gMain.newKeys & B_BUTTON) // turn off hall of fame PC
+    {
+        if (IsCryPlayingOrClearCrySongs())
+        {
+            StopCryAndClearCrySongs();
+            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+        }
+        gTasks[taskID].func = Task_HofPC_HandlePaletteOnExit;
+    }
+    else if (gMain.newKeys & DPAD_UP && gTasks[taskID].tCurrPokeID != 0) // change mon -1
+    {
+        gTasks[taskID].tCurrPokeID--;
+        gTasks[taskID].func = Task_HofPC_PrintMonInfo;
+    }
+    else if (gMain.newKeys & DPAD_DOWN && gTasks[taskID].tCurrPokeID < gTasks[taskID].tPokesNo - 1) // change mon +1
+    {
+        gTasks[taskID].tCurrPokeID++;
+        gTasks[taskID].func = Task_HofPC_PrintMonInfo;
+    }
+}
+
+static void Task_HofPC_HandlePaletteOnExit(u8 taskID)
+{
+    struct HallofFameMons* fameMons;
+
+    CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
+    fameMons = (struct HallofFameMons*)(gDecompressionBuffer);
+    fameMons->mons[0] = sDummyFameMon;
+    sub_80F9BF4(0, 0, 0);
+    gTasks[taskID].func = Task_HofPC_HandleExit;
+}
+
+static void Task_HofPC_HandleExit(u8 taskID)
+{
+    if (!sub_80F9C30())
+    {
+        u8 i;
+
+        for (i = 0; i < 6; i++)
+        {
+            u16 spriteId = gTasks[taskID].tMonSpriteID(i);
+            if (spriteId != 0xFF)
+            {
+                sub_818D820(spriteId);
+                gTasks[taskID].tMonSpriteID(i) = 0xFF;
+            }
+        }
+
+        HideBg(0);
+        HideBg(1);
+        HideBg(3);
+        sub_8198314();
+        FreeAllWindowBuffers();
+        UnsetBgTilemapBuffer(1);
+        UnsetBgTilemapBuffer(3);
+        ResetBgsAndClearDma3BusyFlags(0);
+        DestroyTask(taskID);
+
+        if (gUnknown_0203BCDC != NULL)
+            FREE_AND_SET_NULL(gUnknown_0203BCDC);
+        if (gHofMonsPtr != NULL)
+            FREE_AND_SET_NULL(gHofMonsPtr);
+
+        sub_8137C3C();
+    }
+}
+
+static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
+{
+    sub_8198180(gText_UnkCtrlF800Exit, 8, 1);
+    sub_81973C4(0, 0);
+    AddTextPrinterParametrized(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
+    CopyWindowToVram(0, 3);
+    gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
+}
+
+static void Task_HofPC_ExitOnButtonPress(u8 taskID)
+{
+    if (gMain.newKeys & A_BUTTON)
+        gTasks[taskID].func = Task_HofPC_HandlePaletteOnExit;
+}
+
+#undef tCurrTeamNo
+#undef tCurrPageNo
+#undef tCurrPokeID
+#undef tPokesNo
+#undef tMonSpriteID
-- 
cgit v1.2.3


From a2263207bf64439c9ad35ad5b8f0d5c5ea289d30 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 6 Nov 2017 17:27:39 +0100
Subject: hall of fame is decompiled

---
 src/hall_of_fame.c | 718 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 597 insertions(+), 121 deletions(-)

(limited to 'src')

diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 35509b53a..6e9cac28b 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -19,6 +19,11 @@
 #include "blend_palette.h"
 #include "string_util.h"
 #include "m4a.h"
+#include "international_string_util.h"
+#include "unknown_task.h"
+#include "trig.h"
+#include "rng.h"
+#include "event_data.h"
 
 struct HallofFameMon
 {
@@ -38,8 +43,25 @@ extern struct HallofFameMons *gHofMonsPtr;
 
 struct HofGfx
 {
-    u16 field_0;
-    u8 field_2[0x2010];
+    u16 state;
+    u8 field_2;
+    u8 field_3;
+    u8 field_4;
+    u8 field_5;
+    u8 field_6;
+    u8 field_7;
+    u8 field_8;
+    u8 field_9;
+    u8 field_A;
+    u8 field_B;
+    u8 field_C;
+    u8 field_D;
+    u8 field_E;
+    u8 field_F;
+    u8 field_10;
+    u8 field_11;
+    u8 tilemap1[0x1000];
+    u8 tilemap2[0x1000];
 };
 
 extern struct HofGfx *gUnknown_0203BCDC;
@@ -50,9 +72,24 @@ extern u8 gDecompressionBuffer[];
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern MainCallback gGameContinueCallback;
 extern u32 gDamagedSaveSectors;
+extern u8 gReservedSpritePaletteCount;
 
 #define HALL_OF_FAME_MAX_TEAMS 50
 
+extern const u8 gUnknown_085E53FC[];
+extern const struct SpriteTemplate gUnknown_085E54D0;
+extern const struct BgTemplate gUnknown_085E5374[3];
+extern const struct CompressedSpriteSheet sHallOfFame_ConfettiSpriteSheet;
+extern const struct CompressedSpritePalette sHallOfFame_ConfettiSpritePalette;
+extern const u16 gHallOfFame_Pal[];
+extern const u8 gUnknown_085E5388[];
+extern const u8 gUnknown_085E538C[];
+extern const struct HallofFameMon sDummyFameMon;
+extern const struct WindowTemplate gUnknown_085E5380;
+extern const s16 sHallOfFame_MonsFullTeamPositions[][4];
+extern const s16 sHallOfFame_MonsHalfTeamPositions[][4];
+extern const u32 gUnknown_085E5508[];
+
 // strings
 extern const u8 gText_SavingDontTurnOffPower[];
 extern const u8 gText_LeagueChamp[];
@@ -61,6 +98,12 @@ extern const u8 gText_PickNextCancel[];
 extern const u8 gText_PickCancel[];
 extern const u8 gText_UnkCtrlF800Exit[];
 extern const u8 gText_HOFCorrupted[];
+extern const u8 gText_WelcomeToHOF[];
+extern const u8 gText_Number[];
+extern const u8 gText_Level[];
+extern const u8 gText_IDNumber[];
+extern const u8 gText_Name[];
+extern const u8 gText_MainMenuTime[];
 
 extern void sub_81973C4(u8, u8);
 extern u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
@@ -84,12 +127,23 @@ extern void sub_80F9BF4(u16, u16, u8);
 extern void sub_81980F0(u8, u8, u8, u8, u16);
 extern void sub_80F9BCC(u16, u16, u8);
 extern bool8 sub_80F9C1C(void);
+extern u16 SpeciesToPokedexNum(u16 species);
+extern void dp13_810BB8C(void);
+extern void sub_81971D0(void);
+extern void sub_8197200(void);
+extern void sub_8152254(void);
+extern void sub_81525D0(u8);
+extern void sub_8152438(u8, void*);
+extern void sub_8152474(u8, u8, u8);
+extern void sub_81522D4(void);
+extern bool32 sub_81521C0(u8);
+extern u8 sub_81524C4(const void *arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, u8 arg5, s16 arg6);
 
 // this file's functions
-void sub_8174EC4(void);
+void ClearVramOamPltt_LoadHofPal(void);
 void sub_8174F70(void);
 void sub_8174FAC(void);
-void sub_81751FC(void);
+bool8 sub_81751FC(void);
 static void SetCallback2AfterHallOfFameDisplay(void);
 bool8 sub_8175024(void);
 static void Task_Hof_InitMonData(u8 taskId);
@@ -116,10 +170,11 @@ static void Task_HofPC_HandleInput(u8 taskId);
 static void Task_HofPC_HandlePaletteOnExit(u8 taskId);
 static void Task_HofPC_HandleExit(u8 taskId);
 static void Task_HofPC_ExitOnButtonPress(u8 taskId);
-void sub_8175120(struct Sprite *sprite);
+void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite);
 void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u8 unused2);
-void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 arg1);
+void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2);
 void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2);
+void sub_8175364(u8 taskId);
 
 void VBlankCB_HallOfFame(void)
 {
@@ -143,7 +198,7 @@ static bool8 InitHallOfFameScreen(void)
     {
     case 0:
         SetVBlankCallback(NULL);
-        sub_8174EC4();
+        ClearVramOamPltt_LoadHofPal();
         gUnknown_0203BCDC = AllocZeroed(sizeof(*gUnknown_0203BCDC));
         gMain.state = 1;
         break;
@@ -156,7 +211,7 @@ static bool8 InitHallOfFameScreen(void)
         SetGpuReg(REG_OFFSET_BLDALPHA, 0x710);
         SetGpuReg(REG_OFFSET_BLDY, 0);
         sub_8174FAC();
-        gUnknown_0203BCDC->field_0 = 0;
+        gUnknown_0203BCDC->state = 0;
         gMain.state++;
         break;
     case 3:
@@ -185,7 +240,7 @@ static bool8 InitHallOfFameScreen(void)
 #define tPokesNumber        data[2]
 #define tFrameCount         data[3]
 #define tPlayerSpriteID     data[4]
-#define tMonSpriteID(i)     data[i + 5]
+#define tMonSpriteId(i)     data[i + 5]
 
 void CB2_DoHallOfFameScreen(void)
 {
@@ -245,7 +300,7 @@ static void Task_Hof_InitMonData(u8 taskId)
 
     for (i = 0; i < 6; i++)
     {
-        gTasks[taskId].tMonSpriteID(i) = 0xFF;
+        gTasks[taskId].tMonSpriteId(i) = 0xFF;
     }
 
     if (gTasks[taskId].tDontSaveData)
@@ -330,8 +385,9 @@ static void Task_Hof_SetMonDisplayTask(u8 taskId)
     gTasks[taskId].func = Task_Hof_DisplayMon;
 }
 
-extern const s16 sHallOfFame_MonsFullTeamPositions[][4];
-extern const s16 sHallOfFame_MonsHalfTeamPositions[][4];
+#define tDestinationX  data1
+#define tDestinationY  data2
+#define tSpecies       data7
 
 static void Task_Hof_DisplayMon(u8 taskId)
 {
@@ -360,12 +416,12 @@ static void Task_Hof_DisplayMon(u8 taskId)
         field6 += 10;
 
     spriteId = sub_818D3E4(currMon->species, currMon->tid, currMon->personality, 1, xPos, yPos, currMonId, 0xFFFF);
-    gSprites[spriteId].data1 = field4;
-    gSprites[spriteId].data2 = field6;
+    gSprites[spriteId].tDestinationX = field4;
+    gSprites[spriteId].tDestinationY = field6;
     gSprites[spriteId].data0 = 0;
-    gSprites[spriteId].data7 = currMon->species;
-    gSprites[spriteId].callback = sub_8175120;
-    gTasks[taskId].tMonSpriteID(currMonId) = spriteId;
+    gSprites[spriteId].tSpecies = currMon->species;
+    gSprites[spriteId].callback = SpriteCB_GetOnScreenAndAnimate;
+    gTasks[taskId].tMonSpriteId(currMonId) = spriteId;
     sub_8197434(0, 1);
     gTasks[taskId].func = Task_Hof_PrintMonInfoAfterAnimating;
 }
@@ -374,7 +430,7 @@ static void Task_Hof_PrintMonInfoAfterAnimating(u8 taskId)
 {
     u16 currMonId = gTasks[taskId].tDisplayedMonId;
     struct HallofFameMon* currMon = &gHofMonsPtr->mons[currMonId];
-    struct Sprite *monSprite = &gSprites[gTasks[taskId].tMonSpriteID(currMonId)];
+    struct Sprite *monSprite = &gSprites[gTasks[taskId].tMonSpriteId(currMonId)];
 
     if (monSprite->callback == SpriteCallbackDummy)
     {
@@ -396,12 +452,12 @@ static void Task_Hof_TryDisplayAnotherMon(u8 taskId)
     }
     else
     {
-        gUnknown_0203BCD4 |= (0x10000 << gSprites[gTasks[taskId].tMonSpriteID(currPokeID)].oam.paletteNum);
+        gUnknown_0203BCD4 |= (0x10000 << gSprites[gTasks[taskId].tMonSpriteId(currPokeID)].oam.paletteNum);
         if (gTasks[taskId].tDisplayedMonId <= 4 && currMon[1].species != SPECIES_NONE) // there is another pokemon to display
         {
             gTasks[taskId].tDisplayedMonId++;
             BeginNormalPaletteFade(gUnknown_0203BCD4, 0, 12, 12, 0x63B0);
-            gSprites[gTasks[taskId].tMonSpriteID(currPokeID)].oam.priority = 1;
+            gSprites[gTasks[taskId].tMonSpriteId(currPokeID)].oam.priority = 1;
             gTasks[taskId].func = Task_Hof_DisplayMon;
         }
         else
@@ -411,29 +467,29 @@ static void Task_Hof_TryDisplayAnotherMon(u8 taskId)
     }
 }
 
-static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskID)
+static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId)
 {
     u16 i;
 
     BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, 0);
     for (i = 0; i < 6; i++)
     {
-        if (gTasks[taskID].tMonSpriteID(i) != 0xFF)
-            gSprites[gTasks[taskID].tMonSpriteID(i)].oam.priority = 0;
+        if (gTasks[taskId].tMonSpriteId(i) != 0xFF)
+            gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 0;
     }
 
     HallOfFame_PrintWelcomeText(0, 15);
     PlaySE(SE_DENDOU);
-    gTasks[taskID].tFrameCount = 400;
-    gTasks[taskID].func = sub_8173DC0;
+    gTasks[taskId].tFrameCount = 400;
+    gTasks[taskId].func = sub_8173DC0;
 }
 
-static void sub_8173DC0(u8 taskID)
+static void sub_8173DC0(u8 taskId)
 {
-    if (gTasks[taskID].tFrameCount != 0)
+    if (gTasks[taskId].tFrameCount != 0)
     {
-        gTasks[taskID].tFrameCount--;
-        if ((gTasks[taskID].tFrameCount & 3) == 0 && gTasks[taskID].tFrameCount > 110)
+        gTasks[taskId].tFrameCount--;
+        if ((gTasks[taskId].tFrameCount & 3) == 0 && gTasks[taskId].tFrameCount > 110)
             sub_81751FC();
     }
     else
@@ -441,55 +497,53 @@ static void sub_8173DC0(u8 taskID)
         u16 i;
         for (i = 0; i < 6; i++)
         {
-            if (gTasks[taskID].tMonSpriteID(i) != 0xFF)
-                gSprites[gTasks[taskID].tMonSpriteID(i)].oam.priority = 1;
+            if (gTasks[taskId].tMonSpriteId(i) != 0xFF)
+                gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1;
         }
         BeginNormalPaletteFade(gUnknown_0203BCD4, 0, 12, 12, 0x63B0);
         FillWindowPixelBuffer(0, 0);
         CopyWindowToVram(0, 3);
-        gTasks[taskID].tFrameCount = 7;
-        gTasks[taskID].func = sub_8173EA4;
+        gTasks[taskId].tFrameCount = 7;
+        gTasks[taskId].func = sub_8173EA4;
     }
 }
 
-static void sub_8173EA4(u8 taskID)
+static void sub_8173EA4(u8 taskId)
 {
-    if (gTasks[taskID].tFrameCount >= 16)
+    if (gTasks[taskId].tFrameCount >= 16)
     {
-        gTasks[taskID].func = sub_8173EE4;
+        gTasks[taskId].func = sub_8173EE4;
     }
     else
     {
-        gTasks[taskID].tFrameCount++;
-        SetGpuReg(REG_OFFSET_BLDALPHA, gTasks[taskID].tFrameCount * 256);
+        gTasks[taskId].tFrameCount++;
+        SetGpuReg(REG_OFFSET_BLDALPHA, gTasks[taskId].tFrameCount * 256);
     }
 }
 
-extern const struct WindowTemplate gUnknown_085E5380;
-
-static void sub_8173EE4(u8 taskID)
+static void sub_8173EE4(u8 taskId)
 {
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
     ShowBg(0);
     ShowBg(1);
     ShowBg(3);
-    gTasks[taskID].tPlayerSpriteID = sub_818D8AC(sub_818D97C(gSaveBlock2Ptr->playerGender, 1), 1, 120, 72, 6, 0xFFFF);
+    gTasks[taskId].tPlayerSpriteID = sub_818D8AC(sub_818D97C(gSaveBlock2Ptr->playerGender, 1), 1, 120, 72, 6, 0xFFFF);
     AddWindow(&gUnknown_085E5380);
     sub_80987D4(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0);
     LoadPalette(stdpal_get(1), 0xE0, 0x20);
-    gTasks[taskID].tFrameCount = 120;
-    gTasks[taskID].func = Task_Hof_WaitAndPrintPlayerInfo;
+    gTasks[taskId].tFrameCount = 120;
+    gTasks[taskId].func = Task_Hof_WaitAndPrintPlayerInfo;
 }
 
-static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskID)
+static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
 {
-    if (gTasks[taskID].tFrameCount != 0)
+    if (gTasks[taskId].tFrameCount != 0)
     {
-        gTasks[taskID].tFrameCount--;
+        gTasks[taskId].tFrameCount--;
     }
-    else if (gSprites[gTasks[taskID].tPlayerSpriteID].pos1.x != 192)
+    else if (gSprites[gTasks[taskId].tPlayerSpriteID].pos1.x != 192)
     {
-        gSprites[gTasks[taskID].tPlayerSpriteID].pos1.x++;
+        gSprites[gTasks[taskId].tPlayerSpriteID].pos1.x++;
     }
     else
     {
@@ -498,27 +552,27 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskID)
         sub_81973C4(0, 0);
         AddTextPrinterParametrized(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3);
         CopyWindowToVram(0, 3);
-        gTasks[taskID].func = Task_Hof_ExitOnKeyPressed;
+        gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
     }
 }
 
-static void Task_Hof_ExitOnKeyPressed(u8 taskID)
+static void Task_Hof_ExitOnKeyPressed(u8 taskId)
 {
     if (gMain.newKeys & A_BUTTON)
     {
         FadeOutBGM(4);
-        gTasks[taskID].func = Task_Hof_HandlePaletteOnExit;
+        gTasks[taskId].func = Task_Hof_HandlePaletteOnExit;
     }
 }
 
-static void Task_Hof_HandlePaletteOnExit(u8 taskID)
+static void Task_Hof_HandlePaletteOnExit(u8 taskId)
 {
     CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
     BeginNormalPaletteFade(-1, 8, 0, 0x10, 0);
-    gTasks[taskID].func = Task_Hof_HandleExit;
+    gTasks[taskId].func = Task_Hof_HandleExit;
 }
 
-static void Task_Hof_HandleExit(u8 taskID)
+static void Task_Hof_HandleExit(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -526,7 +580,7 @@ static void Task_Hof_HandleExit(u8 taskID)
 
         for (i = 0; i < 6; i++)
         {
-            u8 spriteId = gTasks[taskID].tMonSpriteID(i);
+            u8 spriteId = gTasks[taskId].tMonSpriteId(i);
             if (spriteId != 0xFF)
             {
                 FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
@@ -534,7 +588,7 @@ static void Task_Hof_HandleExit(u8 taskID)
             }
         }
 
-        sub_818D8F0(gTasks[taskID].tPlayerSpriteID);
+        sub_818D8F0(gTasks[taskId].tPlayerSpriteID);
         HideBg(0);
         HideBg(1);
         HideBg(3);
@@ -542,7 +596,7 @@ static void Task_Hof_HandleExit(u8 taskID)
         UnsetBgTilemapBuffer(1);
         UnsetBgTilemapBuffer(3);
         ResetBgsAndClearDma3BusyFlags(0);
-        DestroyTask(taskID);
+        DestroyTask(taskId);
 
         if (gUnknown_0203BCDC != NULL)
             FREE_AND_SET_NULL(gUnknown_0203BCDC);
@@ -563,15 +617,13 @@ static void SetCallback2AfterHallOfFameDisplay(void)
 #undef tPokesNumber
 #undef tFrameCount
 #undef tPlayerSpriteID
-#undef tMonSpriteID
+#undef tMonSpriteId
 
 #define tCurrTeamNo     data[0]
 #define tCurrPageNo     data[1]
-#define tCurrPokeID     data[2]
+#define tCurrPokeId     data[2]
 #define tPokesNo        data[4]
-#define tMonSpriteID(i) data[i + 5]
-
-extern const struct HallofFameMon sDummyFameMon;
+#define tMonSpriteId(i) data[i + 5]
 
 void CB2_DoHallOfFamePC(void)
 {
@@ -580,7 +632,7 @@ void CB2_DoHallOfFamePC(void)
     case 0:
     default:
         SetVBlankCallback(NULL);
-        sub_8174EC4();
+        ClearVramOamPltt_LoadHofPal();
         gUnknown_0203BCDC = AllocZeroed(sizeof(*gUnknown_0203BCDC));
         gMain.state = 1;
         break;
@@ -624,7 +676,7 @@ void CB2_DoHallOfFamePC(void)
 
             for (i = 0; i < 6; i++)
             {
-                gTasks[taskId].tMonSpriteID(i) = 0xFF;
+                gTasks[taskId].tMonSpriteId(i) = 0xFF;
             }
 
             gHofMonsPtr = AllocZeroed(0x2000);
@@ -634,12 +686,12 @@ void CB2_DoHallOfFamePC(void)
     }
 }
 
-static void Task_HofPC_CopySaveData(u8 taskID)
+static void Task_HofPC_CopySaveData(u8 taskId)
 {
     sub_81980F0(0, 0x1E, 0, 0xC, 0x226);
     if (sub_81534D0(3) != 1)
     {
-        gTasks[taskID].func = Task_HofPC_PrintDataIsCorrupted;
+        gTasks[taskId].func = Task_HofPC_PrintDataIsCorrupted;
     }
     else
     {
@@ -655,34 +707,34 @@ static void Task_HofPC_CopySaveData(u8 taskID)
         }
 
         if (i < HALL_OF_FAME_MAX_TEAMS)
-            gTasks[taskID].tCurrTeamNo = i - 1;
+            gTasks[taskId].tCurrTeamNo = i - 1;
         else
-            gTasks[taskID].tCurrTeamNo = HALL_OF_FAME_MAX_TEAMS - 1;
+            gTasks[taskId].tCurrTeamNo = HALL_OF_FAME_MAX_TEAMS - 1;
 
-        gTasks[taskID].tCurrPageNo = GetGameStat(GAME_STAT_ENTERED_HOF);
+        gTasks[taskId].tCurrPageNo = GetGameStat(GAME_STAT_ENTERED_HOF);
 
-        gTasks[taskID].func = Task_HofPC_DrawSpritesPrintText;
+        gTasks[taskId].func = Task_HofPC_DrawSpritesPrintText;
     }
 }
 
-static void Task_HofPC_DrawSpritesPrintText(u8 taskID)
+static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
 {
     struct HallofFameMons* savedTeams = gHofMonsPtr;
     struct HallofFameMon* currMon;
     u16 i;
 
-    for (i = 0; i < gTasks[taskID].tCurrTeamNo; i++)
+    for (i = 0; i < gTasks[taskId].tCurrTeamNo; i++)
         savedTeams++;
 
     currMon = &savedTeams->mons[0];
     gUnknown_0203BCD4 = 0;
-    gTasks[taskID].tCurrPokeID = 0;
-    gTasks[taskID].tPokesNo = 0;
+    gTasks[taskId].tCurrPokeId = 0;
+    gTasks[taskId].tPokesNo = 0;
 
     for (i = 0; i < 6; i++, currMon++)
     {
         if (currMon->species != 0)
-            gTasks[taskID].tPokesNo++;
+            gTasks[taskId].tPokesNo++;
     }
 
     currMon = &savedTeams->mons[0];
@@ -691,10 +743,10 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskID)
     {
         if (currMon->species != 0)
         {
-            u16 spriteID;
+            u16 spriteId;
             s16 posX, posY;
 
-            if (gTasks[taskID].tPokesNo > 3)
+            if (gTasks[taskId].tPokesNo > 3)
             {
                 posX = sHallOfFame_MonsFullTeamPositions[i][2];
                 posY = sHallOfFame_MonsFullTeamPositions[i][3];
@@ -708,52 +760,52 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskID)
             if (currMon->species == SPECIES_EGG)
                 posY += 10;
 
-            spriteID = sub_818D7D8(currMon->species, currMon->tid, currMon->personality, 1, posX, posY, i, 0xFFFF);
-            gSprites[spriteID].oam.priority = 1;
-            gTasks[taskID].tMonSpriteID(i) = spriteID;
+            spriteId = sub_818D7D8(currMon->species, currMon->tid, currMon->personality, 1, posX, posY, i, 0xFFFF);
+            gSprites[spriteId].oam.priority = 1;
+            gTasks[taskId].tMonSpriteId(i) = spriteId;
         }
         else
         {
-            gTasks[taskID].tMonSpriteID(i) = 0xFF;
+            gTasks[taskId].tMonSpriteId(i) = 0xFF;
         }
     }
 
     BlendPalettes(0xFFFF0000, 0xC, 0x63B0);
 
-    ConvertIntToDecimalStringN(gStringVar1, gTasks[taskID].tCurrPageNo, STR_CONV_MODE_RIGHT_ALIGN, 3);
+    ConvertIntToDecimalStringN(gStringVar1, gTasks[taskId].tCurrPageNo, STR_CONV_MODE_RIGHT_ALIGN, 3);
     StringExpandPlaceholders(gStringVar4, gText_HOFNumber);
 
-    if (gTasks[taskID].tCurrTeamNo <= 0)
+    if (gTasks[taskId].tCurrTeamNo <= 0)
         sub_8198204(gStringVar4, gText_PickCancel, 0, 0, 1);
     else
         sub_8198204(gStringVar4, gText_PickNextCancel, 0, 0, 1);
 
-    gTasks[taskID].func = Task_HofPC_PrintMonInfo;
+    gTasks[taskId].func = Task_HofPC_PrintMonInfo;
 }
 
-static void Task_HofPC_PrintMonInfo(u8 taskID)
+static void Task_HofPC_PrintMonInfo(u8 taskId)
 {
     struct HallofFameMons* savedTeams = gHofMonsPtr;
     struct HallofFameMon* currMon;
     u16 i;
     u16 currMonID;
 
-    for (i = 0; i < gTasks[taskID].tCurrTeamNo; i++)
+    for (i = 0; i < gTasks[taskId].tCurrTeamNo; i++)
         savedTeams++;
 
     for (i = 0; i < 6; i++)
     {
-        u16 spriteID = gTasks[taskID].tMonSpriteID(i);
-        if (spriteID != 0xFF)
-            gSprites[spriteID].oam.priority = 1;
+        u16 spriteId = gTasks[taskId].tMonSpriteId(i);
+        if (spriteId != 0xFF)
+            gSprites[spriteId].oam.priority = 1;
     }
 
-    currMonID = gTasks[taskID].tMonSpriteID(gTasks[taskID].tCurrPokeID);
+    currMonID = gTasks[taskId].tMonSpriteId(gTasks[taskId].tCurrPokeId);
     gSprites[currMonID].oam.priority = 0;
     gUnknown_0203BCD4 = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ 0xFFFF0000;
     BlendPalettesUnfaded(gUnknown_0203BCD4, 0xC, 0x63B0);
 
-    currMon = &savedTeams->mons[gTasks[taskID].tCurrPokeID];
+    currMon = &savedTeams->mons[gTasks[taskId].tCurrPokeId];
     if (currMon->species != SPECIES_EGG)
     {
         StopCryAndClearCrySongs();
@@ -761,30 +813,30 @@ static void Task_HofPC_PrintMonInfo(u8 taskID)
     }
     HallOfFame_PrintMonInfo(currMon, 0, 14);
 
-    gTasks[taskID].func = Task_HofPC_HandleInput;
+    gTasks[taskId].func = Task_HofPC_HandleInput;
 }
 
-static void Task_HofPC_HandleInput(u8 taskID)
+static void Task_HofPC_HandleInput(u8 taskId)
 {
     u16 i;
 
     if (gMain.newKeys & A_BUTTON)
     {
-        if (gTasks[taskID].tCurrTeamNo != 0) // prepare another team to view
+        if (gTasks[taskId].tCurrTeamNo != 0) // prepare another team to view
         {
-            gTasks[taskID].tCurrTeamNo--;
+            gTasks[taskId].tCurrTeamNo--;
             for (i = 0; i < 6; i++)
             {
-                u8 spriteID = gTasks[taskID].tMonSpriteID(i);
-                if (spriteID != 0xFF)
+                u8 spriteId = gTasks[taskId].tMonSpriteId(i);
+                if (spriteId != 0xFF)
                 {
-                    sub_818D820(spriteID);
-                    gTasks[taskID].tMonSpriteID(i) = 0xFF;
+                    sub_818D820(spriteId);
+                    gTasks[taskId].tMonSpriteId(i) = 0xFF;
                 }
             }
-            if (gTasks[taskID].tCurrPageNo != 0)
-                gTasks[taskID].tCurrPageNo--;
-            gTasks[taskID].func = Task_HofPC_DrawSpritesPrintText;
+            if (gTasks[taskId].tCurrPageNo != 0)
+                gTasks[taskId].tCurrPageNo--;
+            gTasks[taskId].func = Task_HofPC_DrawSpritesPrintText;
         }
         else // no more teams to view, turn off hall of fame PC
         {
@@ -793,7 +845,7 @@ static void Task_HofPC_HandleInput(u8 taskID)
                 StopCryAndClearCrySongs();
                 m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
             }
-            gTasks[taskID].func = Task_HofPC_HandlePaletteOnExit;
+            gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit;
         }
     }
     else if (gMain.newKeys & B_BUTTON) // turn off hall of fame PC
@@ -803,21 +855,21 @@ static void Task_HofPC_HandleInput(u8 taskID)
             StopCryAndClearCrySongs();
             m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
         }
-        gTasks[taskID].func = Task_HofPC_HandlePaletteOnExit;
+        gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit;
     }
-    else if (gMain.newKeys & DPAD_UP && gTasks[taskID].tCurrPokeID != 0) // change mon -1
+    else if (gMain.newKeys & DPAD_UP && gTasks[taskId].tCurrPokeId != 0) // change mon -1
     {
-        gTasks[taskID].tCurrPokeID--;
-        gTasks[taskID].func = Task_HofPC_PrintMonInfo;
+        gTasks[taskId].tCurrPokeId--;
+        gTasks[taskId].func = Task_HofPC_PrintMonInfo;
     }
-    else if (gMain.newKeys & DPAD_DOWN && gTasks[taskID].tCurrPokeID < gTasks[taskID].tPokesNo - 1) // change mon +1
+    else if (gMain.newKeys & DPAD_DOWN && gTasks[taskId].tCurrPokeId < gTasks[taskId].tPokesNo - 1) // change mon +1
     {
-        gTasks[taskID].tCurrPokeID++;
-        gTasks[taskID].func = Task_HofPC_PrintMonInfo;
+        gTasks[taskId].tCurrPokeId++;
+        gTasks[taskId].func = Task_HofPC_PrintMonInfo;
     }
 }
 
-static void Task_HofPC_HandlePaletteOnExit(u8 taskID)
+static void Task_HofPC_HandlePaletteOnExit(u8 taskId)
 {
     struct HallofFameMons* fameMons;
 
@@ -825,10 +877,10 @@ static void Task_HofPC_HandlePaletteOnExit(u8 taskID)
     fameMons = (struct HallofFameMons*)(gDecompressionBuffer);
     fameMons->mons[0] = sDummyFameMon;
     sub_80F9BF4(0, 0, 0);
-    gTasks[taskID].func = Task_HofPC_HandleExit;
+    gTasks[taskId].func = Task_HofPC_HandleExit;
 }
 
-static void Task_HofPC_HandleExit(u8 taskID)
+static void Task_HofPC_HandleExit(u8 taskId)
 {
     if (!sub_80F9C30())
     {
@@ -836,11 +888,11 @@ static void Task_HofPC_HandleExit(u8 taskID)
 
         for (i = 0; i < 6; i++)
         {
-            u16 spriteId = gTasks[taskID].tMonSpriteID(i);
+            u16 spriteId = gTasks[taskId].tMonSpriteId(i);
             if (spriteId != 0xFF)
             {
                 sub_818D820(spriteId);
-                gTasks[taskID].tMonSpriteID(i) = 0xFF;
+                gTasks[taskId].tMonSpriteId(i) = 0xFF;
             }
         }
 
@@ -852,7 +904,7 @@ static void Task_HofPC_HandleExit(u8 taskID)
         UnsetBgTilemapBuffer(1);
         UnsetBgTilemapBuffer(3);
         ResetBgsAndClearDma3BusyFlags(0);
-        DestroyTask(taskID);
+        DestroyTask(taskId);
 
         if (gUnknown_0203BCDC != NULL)
             FREE_AND_SET_NULL(gUnknown_0203BCDC);
@@ -872,14 +924,438 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
     gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
 }
 
-static void Task_HofPC_ExitOnButtonPress(u8 taskID)
+static void Task_HofPC_ExitOnButtonPress(u8 taskId)
 {
     if (gMain.newKeys & A_BUTTON)
-        gTasks[taskID].func = Task_HofPC_HandlePaletteOnExit;
+        gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit;
 }
 
 #undef tCurrTeamNo
 #undef tCurrPageNo
-#undef tCurrPokeID
+#undef tCurrPokeId
 #undef tPokesNo
-#undef tMonSpriteID
+#undef tMonSpriteId
+
+void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2)
+{
+    FillWindowPixelBuffer(0, 0);
+    PutWindowTilemap(0);
+    box_print(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, gUnknown_085E5388, 0, gText_WelcomeToHOF);
+    CopyWindowToVram(0, 3);
+}
+
+void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u8 unused2)
+{
+    u8 text[30];
+    u8 *stringPtr;
+    s32 dexNumber;
+    s32 width;
+
+    FillWindowPixelBuffer(0, 0);
+    PutWindowTilemap(0);
+
+    // dex number
+    if (currMon->species != SPECIES_EGG)
+    {
+        stringPtr = StringCopy(text, gText_Number);
+        dexNumber = SpeciesToPokedexNum(currMon->species);
+        if (dexNumber != 0xFFFF)
+        {
+            stringPtr[0] = (dexNumber / 100) + CHAR_0;
+            stringPtr++;
+            dexNumber %= 100;
+            stringPtr[0] = (dexNumber / 10) + CHAR_0;
+            stringPtr++;
+            stringPtr[0] = (dexNumber % 10) + CHAR_0;
+            stringPtr++;
+        }
+        else
+        {
+            *(stringPtr)++ = CHAR_QUESTION_MARK;
+            *(stringPtr)++ = CHAR_QUESTION_MARK;
+            *(stringPtr)++ = CHAR_QUESTION_MARK;
+        }
+        stringPtr[0] = EOS;
+        box_print(0, 1, 0x10, 1, gUnknown_085E5388, -1, text);
+    }
+
+    // nick, species names, gender and level
+    memcpy(text, currMon->nick, POKEMON_NAME_LENGTH);
+    text[POKEMON_NAME_LENGTH] = EOS;
+    if (currMon->species == SPECIES_EGG)
+    {
+        width = GetStringCenterAlignXOffset(1, text, 0xD0);
+        box_print(0, 1, width, 1, gUnknown_085E5388, -1, text);
+        CopyWindowToVram(0, 3);
+    }
+    else
+    {
+        width = GetStringRightAlignXOffset(1, text, 0x80);
+        box_print(0, 1, width, 1, gUnknown_085E5388, -1, text);
+
+        text[0] = CHAR_SLASH;
+        stringPtr = StringCopy(text + 1, gSpeciesNames[currMon->species]);
+
+        if (currMon->species != SPECIES_NIDORAN_M && currMon->species != SPECIES_NIDORAN_F)
+        {
+            switch (GetGenderFromSpeciesAndPersonality(currMon->species, currMon->personality))
+            {
+            case MON_MALE:
+                stringPtr[0] = CHAR_MALE;
+                stringPtr++;
+                break;
+            case MON_FEMALE:
+                stringPtr[0] = CHAR_FEMALE;
+                stringPtr++;
+                break;
+            }
+        }
+
+        stringPtr[0] = EOS;
+        box_print(0, 1, 0x80, 1, gUnknown_085E5388, -1, text);
+
+        stringPtr = StringCopy(text, gText_Level);
+        ConvertIntToDecimalStringN(stringPtr, currMon->lvl, STR_CONV_MODE_LEFT_ALIGN, 3);
+        box_print(0, 1, 0x24, 0x11, gUnknown_085E5388, -1, text);
+
+        stringPtr = StringCopy(text, gText_IDNumber);
+        ConvertIntToDecimalStringN(stringPtr, (u16)(currMon->tid), STR_CONV_MODE_LEADING_ZEROS, 5);
+        box_print(0, 1, 0x68, 0x11, gUnknown_085E5388, -1, text);
+
+        CopyWindowToVram(0, 3);
+    }
+}
+
+void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
+{
+    u8 text[20];
+    u32 width;
+    u16 trainerId;
+
+    FillWindowPixelBuffer(1, 0x11);
+    PutWindowTilemap(1);
+    SetWindowBorderStyle(1, FALSE, 0x21D, 0xD);
+    box_print(1, 1, 0, 1, gUnknown_085E538C, -1, gText_Name);
+
+    width = GetStringRightAlignXOffset(1, gSaveBlock2Ptr->playerName, 0x70);
+    box_print(1, 1, width, 1, gUnknown_085E538C, -1, gSaveBlock2Ptr->playerName);
+
+    trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) | (gSaveBlock2Ptr->playerTrainerId[1] << 8);
+    box_print(1, 1, 0, 0x11, gUnknown_085E538C, 0, gText_IDNumber);
+    text[0] = (trainerId % 100000) / 10000 + CHAR_0;
+    text[1] = (trainerId % 10000) / 1000 + CHAR_0;
+    text[2] = (trainerId % 1000) / 100 + CHAR_0;
+    text[3] = (trainerId % 100) / 10 + CHAR_0;
+    text[4] = (trainerId % 10) / 1 + CHAR_0;
+    text[5] = EOS;
+    width = GetStringRightAlignXOffset(1, text, 0x70);
+    box_print(1, 1, width, 0x11, gUnknown_085E538C, -1, text);
+
+    box_print(1, 1, 0, 0x21, gUnknown_085E538C, -1, gText_MainMenuTime);
+    text[0] = (gSaveBlock2Ptr->playTimeHours / 100) + CHAR_0;
+    text[1] = (gSaveBlock2Ptr->playTimeHours % 100) / 10 + CHAR_0;
+    text[2] = (gSaveBlock2Ptr->playTimeHours % 10) + CHAR_0;
+
+    if (text[0] == CHAR_0)
+        text[0] = CHAR_SPACE;
+    if (text[0] == CHAR_SPACE && text[1] == CHAR_0)
+        text[8] = CHAR_SPACE;
+
+    text[3] = CHAR_COLON;
+    text[4] = (gSaveBlock2Ptr->playTimeMinutes % 100) / 10 + CHAR_0;
+    text[5] = (gSaveBlock2Ptr->playTimeMinutes % 10) + CHAR_0;
+    text[6] = EOS;
+
+    width = GetStringRightAlignXOffset(1, text, 0x70);
+    box_print(1, 1, width, 0x21, gUnknown_085E538C, -1, text);
+
+    CopyWindowToVram(1, 3);
+}
+
+void ClearVramOamPltt_LoadHofPal(void)
+{
+    u32 vramOffset, oamOffset, plttOffset;
+    u32 vramSize, oamSize, plttSize;
+
+    vramOffset = (VRAM);
+    vramSize = VRAM_SIZE;
+    while (TRUE)
+    {
+        DmaFill16(3, 0, vramOffset, 0x1000);
+        vramOffset += 0x1000;
+        vramSize -= 0x1000;
+        if (vramSize <= 0x1000)
+        {
+            DmaFill16(3, 0, vramOffset, vramSize);
+            break;
+        }
+    }
+
+    oamOffset = OAM;
+    oamSize = OAM_SIZE;
+    DmaFill32(3, 0, oamOffset, oamSize);
+
+    plttOffset = PLTT;
+    plttSize = PLTT_SIZE;
+    DmaFill16(3, 0, plttOffset, plttSize);
+
+    ResetPaletteFade();
+    LoadPalette(gHallOfFame_Pal, 0, 0x20);
+}
+
+void sub_8174F70(void)
+{
+    remove_some_task();
+    ResetTasks();
+    ResetSpriteData();
+    reset_temp_tile_data_buffers();
+    dp13_810BB8C();
+    FreeAllSpritePalettes();
+    gReservedSpritePaletteCount = 8;
+    LoadCompressedObjectPic(&sHallOfFame_ConfettiSpriteSheet);
+    LoadCompressedObjectPalette(&sHallOfFame_ConfettiSpritePalette);
+}
+
+void sub_8174FAC(void)
+{
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_085E5374, ARRAY_COUNT(gUnknown_085E5374));
+    SetBgTilemapBuffer(1, gUnknown_0203BCDC->tilemap1);
+    SetBgTilemapBuffer(3, gUnknown_0203BCDC->tilemap2);
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    ChangeBgX(1, 0, 0);
+    ChangeBgY(1, 0, 0);
+    ChangeBgX(3, 0, 0);
+    ChangeBgY(3, 0, 0);
+}
+
+bool8 sub_8175024(void)
+{
+    switch (gUnknown_0203BCDC->state)
+    {
+    case 0:
+        decompress_and_copy_tile_data_to_vram(1, gUnknown_085E5508, 0, 0, 0);
+        break;
+    case 1:
+        if (free_temp_tile_data_buffers_if_possible())
+            return TRUE;
+        break;
+    case 2:
+        FillBgTilemapBufferRect_Palette0(1, 1, 0, 0, 0x20, 2);
+        FillBgTilemapBufferRect_Palette0(1, 0, 0, 3, 0x20, 0xB);
+        FillBgTilemapBufferRect_Palette0(1, 1, 0, 0xE, 0x20, 6);
+        FillBgTilemapBufferRect_Palette0(3, 2, 0, 0, 0x20, 0x20);
+
+        CopyBgTilemapBufferToVram(1);
+        CopyBgTilemapBufferToVram(3);
+        break;
+    case 3:
+        sub_81971D0();
+        sub_8197200();
+        break;
+    case 4:
+        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
+        ShowBg(0);
+        ShowBg(1);
+        ShowBg(3);
+        gUnknown_0203BCDC->state = 0;
+        return FALSE;
+    }
+
+    gUnknown_0203BCDC->state++;
+    return TRUE;
+}
+
+void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite)
+{
+    if (sprite->pos1.x != sprite->tDestinationX
+        || sprite->pos1.y != sprite->tDestinationY)
+    {
+        if (sprite->pos1.x < sprite->tDestinationX)
+            sprite->pos1.x += 15;
+        if (sprite->pos1.x > sprite->tDestinationX)
+            sprite->pos1.x -= 15;
+
+        if (sprite->pos1.y < sprite->tDestinationY)
+            sprite->pos1.y += 10;
+        if (sprite->pos1.y > sprite->tDestinationY)
+            sprite->pos1.y -= 10;
+    }
+    else
+    {
+        s16 species = sprite->tSpecies;
+
+        if (species == SPECIES_EGG)
+            DoMonFrontSpriteAnimation(sprite, species, TRUE, 3);
+        else
+            DoMonFrontSpriteAnimation(sprite, species, FALSE, 3);
+    }
+}
+
+#undef tDestinationX
+#undef tDestinationY
+#undef tSpecies
+
+static void sub_81751A4(struct Sprite* sprite)
+{
+    if (sprite->pos2.y > 120)
+    {
+        DestroySprite(sprite);
+    }
+    else
+    {
+        u16 rand;
+        u8 tableID;
+
+        sprite->pos2.y++;
+        sprite->pos2.y += sprite->data1;
+
+        tableID = sprite->data0;
+        rand = (Random() % 4) + 8;
+        sprite->pos2.x = rand * gSineTable[tableID] / 256;
+
+        sprite->data0 += 4;
+    }
+}
+
+bool8 sub_81751FC(void)
+{
+    u8 spriteID;
+    struct Sprite* sprite;
+
+    s16 posX = Random() % 240;
+    s16 posY = -(Random() % 8);
+
+    spriteID = CreateSprite(&gUnknown_085E54D0, posX, posY, 0);
+    sprite = &gSprites[spriteID];
+
+    StartSpriteAnim(sprite, Random() % 17);
+
+    if (Random() & 3)
+        sprite->data1 = 0;
+    else
+        sprite->data1 = 1;
+
+    return FALSE;
+}
+
+void sub_8175280(void)
+{
+    u8 taskId;
+
+    gSpecialVar_0x8004 = 180;
+    taskId = CreateTask(sub_8175364, 0);
+    if (taskId != 0xFF)
+    {
+        gTasks[taskId].data[1] = gSpecialVar_0x8004;
+        gSpecialVar_0x8005 = taskId;
+    }
+}
+
+void sub_81752C0(void)
+{
+    u8 taskId;
+
+    if ((taskId = FindTaskIdByFunc(sub_8175364)) != 0xFF)
+        DestroyTask(taskId);
+
+    sub_8152254();
+    FreeSpriteTilesByTag(0x3E9);
+    FreeSpritePaletteByTag(0x3E9);
+}
+
+struct UnknownStruct912B4
+{
+    s16 field_0;
+    s16 field_2;
+    s16 field_4;
+    s16 field_6;
+    s16 field_8;
+    s16 field_A;
+    s16 field_C;
+    s16 field_E;
+    s16 field_10;
+    s16 field_12;
+    s16 field_14;
+    s16 field_16;
+    s16 field_18;
+    s16 field_1A;
+    s16 field_1C;
+    s16 field_1E;
+    s16 field_20;
+    s16 field_22;
+    s16 field_24;
+    s16 field_26;
+    s16 field_28;
+};
+
+void sub_81752F4(struct UnknownStruct912B4 *unkStruct)
+{
+    if (unkStruct->field_E > 110)
+    {
+        gTasks[unkStruct->field_28].data[15]--;
+        sub_81525D0(unkStruct->field_16);
+    }
+    else
+    {
+        u8 var;
+        s32 rand;
+
+        unkStruct->field_E++;
+        unkStruct->field_E += unkStruct->field_1C;
+
+        var = unkStruct->field_1A;
+        rand = Random();
+        rand &= 3;
+        rand += 8;
+        unkStruct->field_C = (rand) * ((gSineTable[var])) / 256;
+
+        unkStruct->field_1A += 4;
+    }
+}
+
+void sub_8175364(u8 taskId)
+{
+    u32 var = 0;
+    u16 *data = gTasks[taskId].data;
+
+    switch (data[0])
+    {
+    case 0:
+        if (!sub_81521C0(0x40))
+        {
+            DestroyTask(taskId);
+            gSpecialVar_0x8004 = var;
+            gSpecialVar_0x8005 = 0xFFFF;
+        }
+        LoadCompressedObjectPic(&sHallOfFame_ConfettiSpriteSheet);
+        LoadCompressedObjectPalette(&sHallOfFame_ConfettiSpritePalette);
+        data[0]++;
+        break;
+    case 1:
+        if (data[1] != 0 && data[1] % 3 == 0)
+        {
+            var = sub_81524C4(gUnknown_085E53FC, 0x3E9, 0x3E9, Random() % 240, -(Random() % 8), Random() % 0x11, var);
+            if (var != 0xFF)
+            {
+                sub_8152438(var, sub_81752F4);
+                if ((Random() & 3) == 0)
+                    sub_8152474(var, 1, 1);
+                sub_8152474(var, 7, taskId);
+                data[15]++;
+            }
+        }
+        sub_81522D4();
+        if (data[1] != 0)
+            data[1]--;
+        else if (data[15] == 0)
+            data[0] = 0xFF;
+        break;
+    case 0xFF:
+        sub_81752C0();
+        gSpecialVar_0x8004 = var;
+        gSpecialVar_0x8005 = 0xFFFF;
+        break;
+    }
+}
-- 
cgit v1.2.3


From a729e9838e88a982b590aafbd6330fc80c1f32e2 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 6 Nov 2017 18:41:32 +0100
Subject: move data to hall of fame c file

---
 src/hall_of_fame.c | 423 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 378 insertions(+), 45 deletions(-)

(limited to 'src')

diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 6e9cac28b..50538dd49 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -76,20 +76,6 @@ extern u8 gReservedSpritePaletteCount;
 
 #define HALL_OF_FAME_MAX_TEAMS 50
 
-extern const u8 gUnknown_085E53FC[];
-extern const struct SpriteTemplate gUnknown_085E54D0;
-extern const struct BgTemplate gUnknown_085E5374[3];
-extern const struct CompressedSpriteSheet sHallOfFame_ConfettiSpriteSheet;
-extern const struct CompressedSpritePalette sHallOfFame_ConfettiSpritePalette;
-extern const u16 gHallOfFame_Pal[];
-extern const u8 gUnknown_085E5388[];
-extern const u8 gUnknown_085E538C[];
-extern const struct HallofFameMon sDummyFameMon;
-extern const struct WindowTemplate gUnknown_085E5380;
-extern const s16 sHallOfFame_MonsFullTeamPositions[][4];
-extern const s16 sHallOfFame_MonsHalfTeamPositions[][4];
-extern const u32 gUnknown_085E5508[];
-
 // strings
 extern const u8 gText_SavingDontTurnOffPower[];
 extern const u8 gText_LeagueChamp[];
@@ -105,6 +91,10 @@ extern const u8 gText_IDNumber[];
 extern const u8 gText_Name[];
 extern const u8 gText_MainMenuTime[];
 
+// graphics
+extern const u8 gContestConfetti_Gfx[];
+extern const u8 gContestConfetti_Pal[];
+
 extern void sub_81973C4(u8, u8);
 extern u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
 extern void sub_8175620(void);
@@ -137,15 +127,15 @@ extern void sub_8152438(u8, void*);
 extern void sub_8152474(u8, u8, u8);
 extern void sub_81522D4(void);
 extern bool32 sub_81521C0(u8);
-extern u8 sub_81524C4(const void *arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, u8 arg5, s16 arg6);
+extern u8 sub_81524C4(const struct OamData *arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, u8 arg5, s16 arg6);
 
 // this file's functions
-void ClearVramOamPltt_LoadHofPal(void);
-void sub_8174F70(void);
-void sub_8174FAC(void);
-bool8 sub_81751FC(void);
+static void ClearVramOamPltt_LoadHofPal(void);
+static void sub_8174F70(void);
+static void sub_8174FAC(void);
+static bool8 sub_81751FC(void);
 static void SetCallback2AfterHallOfFameDisplay(void);
-bool8 sub_8175024(void);
+static bool8 sub_8175024(void);
 static void Task_Hof_InitMonData(u8 taskId);
 static void Task_Hof_InitTeamSaveData(u8 taskId);
 static void Task_Hof_SetMonDisplayTask(u8 taskId);
@@ -170,20 +160,363 @@ static void Task_HofPC_HandleInput(u8 taskId);
 static void Task_HofPC_HandlePaletteOnExit(u8 taskId);
 static void Task_HofPC_HandleExit(u8 taskId);
 static void Task_HofPC_ExitOnButtonPress(u8 taskId);
-void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite);
-void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u8 unused2);
-void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2);
-void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2);
-void sub_8175364(u8 taskId);
+static void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite);
+static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u8 unused2);
+static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2);
+static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2);
+static void sub_8175364(u8 taskId);
+static void sub_81751A4(struct Sprite* sprite);
+
+// const rom data
+static const struct BgTemplate sHof_BgTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 29,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    },
+};
+
+static const struct WindowTemplate sHof_WindowTemplate = {0, 2, 2, 0xE, 6, 0xE, 1};
+
+static const u8 gUnknown_085E5388[] = {0, 1, 2, 0};
+
+static const u8 gUnknown_085E538C[] = {0, 2, 3, 0, 4, 5, 0, 0};
+
+static const struct CompressedSpriteSheet sHallOfFame_ConfettiSpriteSheet =
+{
+    gContestConfetti_Gfx, 0x220, 1001
+};
+
+static const u8 sUnused0[8] = {};
+
+static const struct CompressedSpritePalette sHallOfFame_ConfettiSpritePalette =
+{
+    gContestConfetti_Pal, 1001
+};
+
+static const u8 sUnused1[8] = {};
+
+static const s16 sHallOfFame_MonsFullTeamPositions[6][4] =
+{
+    {120,   210,    120,    40},
+    {326,   220,    56,     40},
+    {-86,   220,    184,    40},
+    {120,   -62,    120,    88},
+    {-70,   -92,    200,    88},
+    {310,   -92,    40,     88}
+};
+
+static const s16 sHallOfFame_MonsHalfTeamPositions[3][4] =
+{
+    {120,   234,    120,    64},
+    {326,   244,    56,     64},
+    {-86,   244,    184,    64}
+};
+
+static const struct OamData sOamData_85E53FC =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sSpriteAnim_85E5404[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E540C[] =
+{
+    ANIMCMD_FRAME(1, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E5414[] =
+{
+    ANIMCMD_FRAME(2, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E541C[] =
+{
+    ANIMCMD_FRAME(3, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E5424[] =
+{
+    ANIMCMD_FRAME(4, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E542C[] =
+{
+    ANIMCMD_FRAME(5, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E5434[] =
+{
+    ANIMCMD_FRAME(6, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E543C[] =
+{
+    ANIMCMD_FRAME(7, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E5444[] =
+{
+    ANIMCMD_FRAME(8, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E544C[] =
+{
+    ANIMCMD_FRAME(9, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E5454[] =
+{
+    ANIMCMD_FRAME(10, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E545C[] =
+{
+    ANIMCMD_FRAME(11, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E5464[] =
+{
+    ANIMCMD_FRAME(12, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E546C[] =
+{
+    ANIMCMD_FRAME(13, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E5474[] =
+{
+    ANIMCMD_FRAME(14, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E547C[] =
+{
+    ANIMCMD_FRAME(15, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85E5484[] =
+{
+    ANIMCMD_FRAME(16, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd * const sSpriteAnimTable_85E548C[] =
+{
+    sSpriteAnim_85E5404, sSpriteAnim_85E540C, sSpriteAnim_85E5414, sSpriteAnim_85E541C,
+    sSpriteAnim_85E5424, sSpriteAnim_85E542C, sSpriteAnim_85E5434, sSpriteAnim_85E543C,
+    sSpriteAnim_85E5444, sSpriteAnim_85E544C, sSpriteAnim_85E5454, sSpriteAnim_85E545C,
+    sSpriteAnim_85E5464, sSpriteAnim_85E546C, sSpriteAnim_85E5474, sSpriteAnim_85E547C,
+    sSpriteAnim_85E5484
+};
+
+static const struct SpriteTemplate sSpriteTemplate_85E54D0 =
+{
+    .tileTag = 1001,
+    .paletteTag = 1001,
+    .oam = &sOamData_85E53FC,
+    .anims = sSpriteAnimTable_85E548C,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_81751A4
+};
+
+// todo: dump actual graphics
+static const u32 sHallOfFame_Pal[] =
+{
+    0, 0x109F63B0, 0x5B6E, 0, 0, 0, 0, 0x7FFF2108
+};
+
+// todo: dump actual graphics
+static const u32 sHallOfFame_Gfx[] =
+{
+    0x3A010,
+    0xF0000033,
+    0x11019001,
+    0x9001F011,
+    0x22220001,
+    0x44442222,
+    0xF0E04444,
+    0x70073007,
+    0x11113329,
+    0x13033331,
+    0x33333311,
+    0xF0030031,
+    0x1108049,
+    0x1111FFFF,
+    0x4913EEEE,
+    0xE10700F1,
+    0x110B00EE,
+    0x1D90EF,
+    0x1EFFF11E,
+    0x1EEEE11E,
+    0x1500EF4A,
+    0xB00EFEE,
+    0xF11F90FF,
+    0xFFF1FE01,
+    0xEEE1EEE1,
+    0xF1211200,
+    0x1E0300EE,
+    0x10E1EF11,
+    0x3B40D029,
+    0x1E7C00,
+    0xF3331178,
+    0x331100EF,
+    0x3331FEEF,
+    0x10E8F3EF,
+    0x105F9003,
+    0x7C003394,
+    0x3AE1133E,
+    0xC003EEE,
+    0x1800310,
+    0xEF8F10F1,
+    0xFEA30081,
+    0xE1FEEE1E,
+    0x33A300EF,
+    0x6800EEEF,
+    0x1EFE0130,
+    0x3009300,
+    0xF11EFF0A,
+    0xFFA1101E,
+    0x17EF0300,
+    0x80FEEEFE,
+    0x11313F,
+    0xD7006100,
+    0xEF332F,
+    0x8F00FF0A,
+    0x7B209F60,
+    0xEF440400,
+    0x3EFE2201,
+    0x33070013,
+    0xC0FE50F1,
+    0x110EF80,
+    0xFEF1EEF1,
+    0xF1EFFF00,
+    0xF1FEEEFF,
+    0x921EBF1,
+    0x111120A0,
+    0xF12601EE,
+    0x1107D00,
+    0x819100EB,
+    0xFE2D005D,
+    0x10FFB100,
+    0xFE3910AB,
+    0x9810B410,
+    0x3108F11,
+    0x89209F11,
+    0xA0EFF6A0,
+    0x1FE8D00,
+    0xE111F153,
+    0xF1AFE11E,
+    0x641011B3,
+    0x19110EF,
+    0x406FA07C,
+    0xA400CBB3,
+    0xEEFF0300,
+    0x611E2D01,
+    0x6314612F,
+    0x11470133,
+    0xE3EE3387,
+    0x23318810,
+    0x210170F7,
+    0x950087,
+    0xA00FF03,
+    0x1123FE0,
+    0xCC00F141,
+    0xFFFE1EEF,
+    0x8F3402EE,
+    0xF1EE1ED0,
+    0x10B7201E,
+    0x23CF0EE,
+    0x8301EF17,
+    0x1A011002,
+    0x20CC0133,
+    0x70A7017B,
+    0xF35701,
+    0x7C00EF80,
+    0xF1BA22EE,
+    0xDCED011D,
+    0x1009621,
+    0xE16000FE,
+    0xF1F9001F,
+    0xB42A5FE,
+    0x113FF1EE,
+    0xFEA702FF,
+    0xE04101,
+    0xD03F22BC,
+    1
+};
+
+static const struct HallofFameMon sDummyFameMon =
+{
+    0x3EA03EA, 0, 0, 0, {0}
+};
+
+static const u8 sUnused2[6] = {2, 1, 3, 6, 4, 5};
 
-void VBlankCB_HallOfFame(void)
+// code
+static void VBlankCB_HallOfFame(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void CB2_HallOfFame(void)
+static void CB2_HallOfFame(void)
 {
     RunTasks();
     RunTextPrinters();
@@ -528,7 +861,7 @@ static void sub_8173EE4(u8 taskId)
     ShowBg(1);
     ShowBg(3);
     gTasks[taskId].tPlayerSpriteID = sub_818D8AC(sub_818D97C(gSaveBlock2Ptr->playerGender, 1), 1, 120, 72, 6, 0xFFFF);
-    AddWindow(&gUnknown_085E5380);
+    AddWindow(&sHof_WindowTemplate);
     sub_80987D4(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0);
     LoadPalette(stdpal_get(1), 0xE0, 0x20);
     gTasks[taskId].tFrameCount = 120;
@@ -936,7 +1269,7 @@ static void Task_HofPC_ExitOnButtonPress(u8 taskId)
 #undef tPokesNo
 #undef tMonSpriteId
 
-void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2)
+static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2)
 {
     FillWindowPixelBuffer(0, 0);
     PutWindowTilemap(0);
@@ -944,7 +1277,7 @@ void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2)
     CopyWindowToVram(0, 3);
 }
 
-void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u8 unused2)
+static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u8 unused2)
 {
     u8 text[30];
     u8 *stringPtr;
@@ -1026,7 +1359,7 @@ void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u8 unuse
     }
 }
 
-void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
+static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
 {
     u8 text[20];
     u32 width;
@@ -1072,7 +1405,7 @@ void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
     CopyWindowToVram(1, 3);
 }
 
-void ClearVramOamPltt_LoadHofPal(void)
+static void ClearVramOamPltt_LoadHofPal(void)
 {
     u32 vramOffset, oamOffset, plttOffset;
     u32 vramSize, oamSize, plttSize;
@@ -1100,10 +1433,10 @@ void ClearVramOamPltt_LoadHofPal(void)
     DmaFill16(3, 0, plttOffset, plttSize);
 
     ResetPaletteFade();
-    LoadPalette(gHallOfFame_Pal, 0, 0x20);
+    LoadPalette(sHallOfFame_Pal, 0, 0x20);
 }
 
-void sub_8174F70(void)
+static void sub_8174F70(void)
 {
     remove_some_task();
     ResetTasks();
@@ -1116,10 +1449,10 @@ void sub_8174F70(void)
     LoadCompressedObjectPalette(&sHallOfFame_ConfettiSpritePalette);
 }
 
-void sub_8174FAC(void)
+static void sub_8174FAC(void)
 {
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_085E5374, ARRAY_COUNT(gUnknown_085E5374));
+    InitBgsFromTemplates(0, sHof_BgTemplates, ARRAY_COUNT(sHof_BgTemplates));
     SetBgTilemapBuffer(1, gUnknown_0203BCDC->tilemap1);
     SetBgTilemapBuffer(3, gUnknown_0203BCDC->tilemap2);
     ChangeBgX(0, 0, 0);
@@ -1130,12 +1463,12 @@ void sub_8174FAC(void)
     ChangeBgY(3, 0, 0);
 }
 
-bool8 sub_8175024(void)
+static bool8 sub_8175024(void)
 {
     switch (gUnknown_0203BCDC->state)
     {
     case 0:
-        decompress_and_copy_tile_data_to_vram(1, gUnknown_085E5508, 0, 0, 0);
+        decompress_and_copy_tile_data_to_vram(1, sHallOfFame_Gfx, 0, 0, 0);
         break;
     case 1:
         if (free_temp_tile_data_buffers_if_possible())
@@ -1167,7 +1500,7 @@ bool8 sub_8175024(void)
     return TRUE;
 }
 
-void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite)
+static void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite)
 {
     if (sprite->pos1.x != sprite->tDestinationX
         || sprite->pos1.y != sprite->tDestinationY)
@@ -1219,7 +1552,7 @@ static void sub_81751A4(struct Sprite* sprite)
     }
 }
 
-bool8 sub_81751FC(void)
+static bool8 sub_81751FC(void)
 {
     u8 spriteID;
     struct Sprite* sprite;
@@ -1227,7 +1560,7 @@ bool8 sub_81751FC(void)
     s16 posX = Random() % 240;
     s16 posY = -(Random() % 8);
 
-    spriteID = CreateSprite(&gUnknown_085E54D0, posX, posY, 0);
+    spriteID = CreateSprite(&sSpriteTemplate_85E54D0, posX, posY, 0);
     sprite = &gSprites[spriteID];
 
     StartSpriteAnim(sprite, Random() % 17);
@@ -1253,7 +1586,7 @@ void sub_8175280(void)
     }
 }
 
-void sub_81752C0(void)
+static void sub_81752C0(void)
 {
     u8 taskId;
 
@@ -1290,7 +1623,7 @@ struct UnknownStruct912B4
     s16 field_28;
 };
 
-void sub_81752F4(struct UnknownStruct912B4 *unkStruct)
+static void sub_81752F4(struct UnknownStruct912B4 *unkStruct)
 {
     if (unkStruct->field_E > 110)
     {
@@ -1315,7 +1648,7 @@ void sub_81752F4(struct UnknownStruct912B4 *unkStruct)
     }
 }
 
-void sub_8175364(u8 taskId)
+static void sub_8175364(u8 taskId)
 {
     u32 var = 0;
     u16 *data = gTasks[taskId].data;
@@ -1336,7 +1669,7 @@ void sub_8175364(u8 taskId)
     case 1:
         if (data[1] != 0 && data[1] % 3 == 0)
         {
-            var = sub_81524C4(gUnknown_085E53FC, 0x3E9, 0x3E9, Random() % 240, -(Random() % 8), Random() % 0x11, var);
+            var = sub_81524C4(&sOamData_85E53FC, 0x3E9, 0x3E9, Random() % 240, -(Random() % 8), Random() % 0x11, var);
             if (var != 0xFF)
             {
                 sub_8152438(var, sub_81752F4);
-- 
cgit v1.2.3


From 19d9cff2ff582d68d5aa76fd9d2068a6407e1466 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 6 Nov 2017 18:57:22 +0100
Subject: static variables to hall of fame c

---
 src/hall_of_fame.c | 108 +++++++++++++++++++++++------------------------------
 1 file changed, 46 insertions(+), 62 deletions(-)

(limited to 'src')

diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 50538dd49..2148daddf 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -39,35 +39,19 @@ struct HallofFameMons
     struct HallofFameMon mons[6];
 };
 
-extern struct HallofFameMons *gHofMonsPtr;
-
 struct HofGfx
 {
     u16 state;
-    u8 field_2;
-    u8 field_3;
-    u8 field_4;
-    u8 field_5;
-    u8 field_6;
-    u8 field_7;
-    u8 field_8;
-    u8 field_9;
-    u8 field_A;
-    u8 field_B;
-    u8 field_C;
-    u8 field_D;
-    u8 field_E;
-    u8 field_F;
-    u8 field_10;
-    u8 field_11;
+    u8 field_2[16];
     u8 tilemap1[0x1000];
     u8 tilemap2[0x1000];
 };
 
-extern struct HofGfx *gUnknown_0203BCDC;
+static EWRAM_DATA struct HallofFameMons *sHofMonsPtr = NULL;
+static EWRAM_DATA struct HofGfx *sHofGfxPtr = NULL;
 
+extern bool8 gHasHallOfFameRecords;
 extern u32 gUnknown_0203BCD4;
-extern bool8 HasHallOfFameRecords;
 extern u8 gDecompressionBuffer[];
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern MainCallback gGameContinueCallback;
@@ -532,7 +516,7 @@ static bool8 InitHallOfFameScreen(void)
     case 0:
         SetVBlankCallback(NULL);
         ClearVramOamPltt_LoadHofPal();
-        gUnknown_0203BCDC = AllocZeroed(sizeof(*gUnknown_0203BCDC));
+        sHofGfxPtr = AllocZeroed(sizeof(*sHofGfxPtr));
         gMain.state = 1;
         break;
     case 1:
@@ -544,7 +528,7 @@ static bool8 InitHallOfFameScreen(void)
         SetGpuReg(REG_OFFSET_BLDALPHA, 0x710);
         SetGpuReg(REG_OFFSET_BLDY, 0);
         sub_8174FAC();
-        gUnknown_0203BCDC->state = 0;
+        sHofGfxPtr->state = 0;
         gMain.state++;
         break;
     case 3:
@@ -581,7 +565,7 @@ void CB2_DoHallOfFameScreen(void)
     {
         u8 taskId = CreateTask(Task_Hof_InitMonData, 0);
         gTasks[taskId].tDontSaveData = FALSE;
-        gHofMonsPtr = AllocZeroed(sizeof(*gHofMonsPtr));
+        sHofMonsPtr = AllocZeroed(sizeof(*sHofMonsPtr));
     }
 }
 
@@ -591,7 +575,7 @@ void CB2_DoHallOfFameScreenDontSaveData(void)
     {
         u8 taskId = CreateTask(Task_Hof_InitMonData, 0);
         gTasks[taskId].tDontSaveData = TRUE;
-        gHofMonsPtr = AllocZeroed(sizeof(*gHofMonsPtr));
+        sHofMonsPtr = AllocZeroed(sizeof(*sHofMonsPtr));
     }
 }
 
@@ -606,24 +590,24 @@ static void Task_Hof_InitMonData(u8 taskId)
         u8 nick[POKEMON_NAME_LENGTH + 2];
         if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES))
         {
-            gHofMonsPtr->mons[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
-            gHofMonsPtr->mons[i].tid = GetMonData(&gPlayerParty[i], MON_DATA_OT_ID);
-            gHofMonsPtr->mons[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
-            gHofMonsPtr->mons[i].lvl = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
+            sHofMonsPtr->mons[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
+            sHofMonsPtr->mons[i].tid = GetMonData(&gPlayerParty[i], MON_DATA_OT_ID);
+            sHofMonsPtr->mons[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
+            sHofMonsPtr->mons[i].lvl = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
             GetMonData(&gPlayerParty[i], MON_DATA_NICKNAME, nick);
             for (j = 0; j < POKEMON_NAME_LENGTH; j++)
             {
-                gHofMonsPtr->mons[i].nick[j] = nick[j];
+                sHofMonsPtr->mons[i].nick[j] = nick[j];
             }
             gTasks[taskId].tPokesNumber++;
         }
         else
         {
-            gHofMonsPtr->mons[i].species = 0;
-            gHofMonsPtr->mons[i].tid = 0;
-            gHofMonsPtr->mons[i].personality = 0;
-            gHofMonsPtr->mons[i].lvl = 0;
-            gHofMonsPtr->mons[i].nick[0] = EOS;
+            sHofMonsPtr->mons[i].species = 0;
+            sHofMonsPtr->mons[i].tid = 0;
+            sHofMonsPtr->mons[i].personality = 0;
+            sHofMonsPtr->mons[i].lvl = 0;
+            sHofMonsPtr->mons[i].nick[0] = EOS;
         }
     }
 
@@ -647,7 +631,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
     u16 i;
     struct HallofFameMons* lastSavedTeam = (struct HallofFameMons*)(gDecompressionBuffer);
 
-    if (!HasHallOfFameRecords)
+    if (!gHasHallOfFameRecords)
     {
         memset(gDecompressionBuffer, 0, 0x2000);
     }
@@ -673,7 +657,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
         }
         lastSavedTeam--;
     }
-    *lastSavedTeam = *gHofMonsPtr;
+    *lastSavedTeam = *sHofMonsPtr;
 
     sub_81973C4(0, 0);
     AddTextPrinterParametrized(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
@@ -690,10 +674,10 @@ static void Task_Hof_TrySaveData(u8 taskId)
         UnsetBgTilemapBuffer(3);
         FreeAllWindowBuffers();
 
-        if (gUnknown_0203BCDC != NULL)
-            FREE_AND_SET_NULL(gUnknown_0203BCDC);
-        if (gHofMonsPtr != NULL)
-            FREE_AND_SET_NULL(gHofMonsPtr);
+        if (sHofGfxPtr != NULL)
+            FREE_AND_SET_NULL(sHofGfxPtr);
+        if (sHofMonsPtr != NULL)
+            FREE_AND_SET_NULL(sHofMonsPtr);
 
         DestroyTask(taskId);
     }
@@ -728,7 +712,7 @@ static void Task_Hof_DisplayMon(u8 taskId)
     s16 xPos, yPos, field4, field6;
 
     u16 currMonId = gTasks[taskId].tDisplayedMonId;
-    struct HallofFameMon* currMon = &gHofMonsPtr->mons[currMonId];
+    struct HallofFameMon* currMon = &sHofMonsPtr->mons[currMonId];
 
     if (gTasks[taskId].tPokesNumber > 3)
     {
@@ -762,7 +746,7 @@ static void Task_Hof_DisplayMon(u8 taskId)
 static void Task_Hof_PrintMonInfoAfterAnimating(u8 taskId)
 {
     u16 currMonId = gTasks[taskId].tDisplayedMonId;
-    struct HallofFameMon* currMon = &gHofMonsPtr->mons[currMonId];
+    struct HallofFameMon* currMon = &sHofMonsPtr->mons[currMonId];
     struct Sprite *monSprite = &gSprites[gTasks[taskId].tMonSpriteId(currMonId)];
 
     if (monSprite->callback == SpriteCallbackDummy)
@@ -777,7 +761,7 @@ static void Task_Hof_PrintMonInfoAfterAnimating(u8 taskId)
 static void Task_Hof_TryDisplayAnotherMon(u8 taskId)
 {
     u16 currPokeID = gTasks[taskId].tDisplayedMonId;
-    struct HallofFameMon* currMon = &gHofMonsPtr->mons[currPokeID];
+    struct HallofFameMon* currMon = &sHofMonsPtr->mons[currPokeID];
 
     if (gTasks[taskId].tFrameCount != 0)
     {
@@ -931,10 +915,10 @@ static void Task_Hof_HandleExit(u8 taskId)
         ResetBgsAndClearDma3BusyFlags(0);
         DestroyTask(taskId);
 
-        if (gUnknown_0203BCDC != NULL)
-            FREE_AND_SET_NULL(gUnknown_0203BCDC);
-        if (gHofMonsPtr != NULL)
-            FREE_AND_SET_NULL(gHofMonsPtr);
+        if (sHofGfxPtr != NULL)
+            FREE_AND_SET_NULL(sHofGfxPtr);
+        if (sHofMonsPtr != NULL)
+            FREE_AND_SET_NULL(sHofMonsPtr);
 
         SetCallback2AfterHallOfFameDisplay();
     }
@@ -966,7 +950,7 @@ void CB2_DoHallOfFamePC(void)
     default:
         SetVBlankCallback(NULL);
         ClearVramOamPltt_LoadHofPal();
-        gUnknown_0203BCDC = AllocZeroed(sizeof(*gUnknown_0203BCDC));
+        sHofGfxPtr = AllocZeroed(sizeof(*sHofGfxPtr));
         gMain.state = 1;
         break;
     case 1:
@@ -1012,7 +996,7 @@ void CB2_DoHallOfFamePC(void)
                 gTasks[taskId].tMonSpriteId(i) = 0xFF;
             }
 
-            gHofMonsPtr = AllocZeroed(0x2000);
+            sHofMonsPtr = AllocZeroed(0x2000);
             SetMainCallback2(CB2_HallOfFame);
         }
         break;
@@ -1031,8 +1015,8 @@ static void Task_HofPC_CopySaveData(u8 taskId)
         u16 i;
         struct HallofFameMons* savedTeams;
 
-        CpuCopy16(gDecompressionBuffer, gHofMonsPtr, 0x2000);
-        savedTeams = gHofMonsPtr;
+        CpuCopy16(gDecompressionBuffer, sHofMonsPtr, 0x2000);
+        savedTeams = sHofMonsPtr;
         for (i = 0; i < HALL_OF_FAME_MAX_TEAMS; i++, savedTeams++)
         {
             if (savedTeams->mons[0].species == SPECIES_NONE)
@@ -1052,7 +1036,7 @@ static void Task_HofPC_CopySaveData(u8 taskId)
 
 static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
 {
-    struct HallofFameMons* savedTeams = gHofMonsPtr;
+    struct HallofFameMons* savedTeams = sHofMonsPtr;
     struct HallofFameMon* currMon;
     u16 i;
 
@@ -1118,7 +1102,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
 
 static void Task_HofPC_PrintMonInfo(u8 taskId)
 {
-    struct HallofFameMons* savedTeams = gHofMonsPtr;
+    struct HallofFameMons* savedTeams = sHofMonsPtr;
     struct HallofFameMon* currMon;
     u16 i;
     u16 currMonID;
@@ -1239,10 +1223,10 @@ static void Task_HofPC_HandleExit(u8 taskId)
         ResetBgsAndClearDma3BusyFlags(0);
         DestroyTask(taskId);
 
-        if (gUnknown_0203BCDC != NULL)
-            FREE_AND_SET_NULL(gUnknown_0203BCDC);
-        if (gHofMonsPtr != NULL)
-            FREE_AND_SET_NULL(gHofMonsPtr);
+        if (sHofGfxPtr != NULL)
+            FREE_AND_SET_NULL(sHofGfxPtr);
+        if (sHofMonsPtr != NULL)
+            FREE_AND_SET_NULL(sHofMonsPtr);
 
         sub_8137C3C();
     }
@@ -1453,8 +1437,8 @@ static void sub_8174FAC(void)
 {
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, sHof_BgTemplates, ARRAY_COUNT(sHof_BgTemplates));
-    SetBgTilemapBuffer(1, gUnknown_0203BCDC->tilemap1);
-    SetBgTilemapBuffer(3, gUnknown_0203BCDC->tilemap2);
+    SetBgTilemapBuffer(1, sHofGfxPtr->tilemap1);
+    SetBgTilemapBuffer(3, sHofGfxPtr->tilemap2);
     ChangeBgX(0, 0, 0);
     ChangeBgY(0, 0, 0);
     ChangeBgX(1, 0, 0);
@@ -1465,7 +1449,7 @@ static void sub_8174FAC(void)
 
 static bool8 sub_8175024(void)
 {
-    switch (gUnknown_0203BCDC->state)
+    switch (sHofGfxPtr->state)
     {
     case 0:
         decompress_and_copy_tile_data_to_vram(1, sHallOfFame_Gfx, 0, 0, 0);
@@ -1492,11 +1476,11 @@ static bool8 sub_8175024(void)
         ShowBg(0);
         ShowBg(1);
         ShowBg(3);
-        gUnknown_0203BCDC->state = 0;
+        sHofGfxPtr->state = 0;
         return FALSE;
     }
 
-    gUnknown_0203BCDC->state++;
+    sHofGfxPtr->state++;
     return TRUE;
 }
 
-- 
cgit v1.2.3


From 61408456e82d3818fb8a7ab0e6b389c43ea47492 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 8 Nov 2017 18:05:47 +0100
Subject: starter choose file is decompiled

---
 src/mail.c           |   2 +-
 src/starter_choose.c | 391 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/text_window.c    |   4 +-
 3 files changed, 394 insertions(+), 3 deletions(-)
 create mode 100644 src/starter_choose.c

(limited to 'src')

diff --git a/src/mail.c b/src/mail.c
index 1060d73bd..1ceb1be1a 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -386,7 +386,7 @@ bool8 sub_81215EC(void)
             CopyBgTilemapBufferToVram(2);
             break;
         case 12:
-            LoadPalette(sub_8098C64(), 240, 32);
+            LoadPalette(GetOverworldTextboxPalettePtr(), 240, 32);
             gPlttBufferUnfaded[250] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color10;
             gPlttBufferFaded[250] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color10;
             gPlttBufferUnfaded[251] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color12;
diff --git a/src/starter_choose.c b/src/starter_choose.c
new file mode 100644
index 000000000..c730e0978
--- /dev/null
+++ b/src/starter_choose.c
@@ -0,0 +1,391 @@
+#include "global.h"
+#include "starter_choose.h"
+#include "palette.h"
+#include "sprite.h"
+#include "pokemon.h"
+#include "task.h"
+#include "bg.h"
+#include "gpu_regs.h"
+#include "main.h"
+#include "window.h"
+#include "text.h"
+#include "decompress.h"
+#include "menu.h"
+#include "sound.h"
+#include "songs.h"
+#include "event_data.h"
+#include "pokedex.h"
+#include "data2.h"
+#include "international_string_util.h"
+#include "trig.h"
+
+#define STARTER_MON_COUNT   3
+
+// Position of the sprite of the selected starter Pokemon
+#define STARTER_PKMN_POS_X 120
+#define STARTER_PKMN_POS_Y 64
+
+extern u16 sStarterChooseWindowId;
+
+// graphics
+extern const u32 gBirchHelpGfx[];
+extern const u32 gBirchBagTilemap[];
+extern const u32 gBirchGrassTilemap[];
+extern const u16 gBirchBagGrassPal[];
+
+// text
+extern const u8 gText_BirchInTrouble[];
+extern const u8 gText_ConfirmStarterChoice[];
+
+extern const u16 sStarterMons[STARTER_MON_COUNT];
+extern const struct BgTemplate gUnknown_085B1E00[3];
+extern const struct WindowTemplate gUnknown_085B1DCC[];
+extern const struct WindowTemplate gUnknown_085B1DDC;
+extern const struct CompressedSpriteSheet gUnknown_085B1ED8[];
+extern const struct CompressedSpriteSheet gUnknown_085B1EE8[];
+extern const struct SpritePalette gUnknown_085B1EF8[];
+extern const struct SpriteTemplate sSpriteTemplate_PokeBall;
+extern const struct SpriteTemplate sSpriteTemplate_Hand;
+extern const struct SpriteTemplate gUnknown_085B1F40;
+extern const union AffineAnimCmd *const gUnknown_085B1ED0;
+extern const u8 sPokeballCoords[STARTER_MON_COUNT][2];
+extern const struct WindowTemplate gUnknown_085B1DE4;
+extern const u8 gStarterChoose_LabelCoords[][2];
+extern const u8 gUnknown_085B1E0C[];
+extern const u8 gUnknown_085B1E28[][2];
+
+extern void sub_809882C(u8, u16, u8);
+extern void remove_some_task(void);
+extern void clear_scheduled_bg_copies_to_vram(void);
+extern void dp13_810BB8C(void);
+extern void do_scheduled_bg_tilemap_copies_to_vram(void);
+extern u16 sub_818D820(u16);
+extern const u16 *GetOverworldTextboxPalettePtr(void);
+extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);
+
+// this file's functions
+static void MainCallback2_StarterChoose(void);
+static void sub_8134604(void);
+static void Task_StarterChoose1(u8 taskId);
+static void Task_StarterChoose2(u8 taskId);
+static void Task_StarterChoose3(u8 taskId);
+static void Task_StarterChoose4(u8 taskId);
+static void Task_StarterChoose5(u8 taskId);
+static void Task_StarterChoose6(u8 taskId);
+static void Task_MoveStarterChooseCursor(u8 taskId);
+static void sub_8134668(u8 taskId);
+static void CreateStarterPokemonLabel(u8 selection);
+static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y);
+static void StarterPokemonSpriteCallback(struct Sprite *sprite);
+
+u16 GetStarterPokemon(u16 chosenStarterId)
+{
+    if (chosenStarterId > STARTER_MON_COUNT)
+        chosenStarterId = 0;
+    return sStarterMons[chosenStarterId];
+}
+
+static void VblankCB_StarterChoose(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+#define tStarterSelection   data[0]
+#define tPkmnSpriteId       data[1]
+#define tCircleSpriteId     data[2]
+
+void CB2_ChooseStarter(void)
+{
+    u16 savedIme;
+    u8 taskId;
+    u8 spriteId;
+
+    SetVBlankCallback(NULL);
+
+    SetGpuReg(REG_OFFSET_DISPCNT, 0);
+    SetGpuReg(REG_OFFSET_BG3CNT, 0);
+    SetGpuReg(REG_OFFSET_BG2CNT, 0);
+    SetGpuReg(REG_OFFSET_BG1CNT, 0);
+    SetGpuReg(REG_OFFSET_BG0CNT, 0);
+
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    ChangeBgX(1, 0, 0);
+    ChangeBgY(1, 0, 0);
+    ChangeBgX(2, 0, 0);
+    ChangeBgY(2, 0, 0);
+    ChangeBgX(3, 0, 0);
+    ChangeBgY(3, 0, 0);
+
+    DmaFill16(3, 0, VRAM, VRAM_SIZE);
+    DmaFill32(3, 0, OAM, OAM_SIZE);
+    DmaFill16(3, 0, PLTT, PLTT_SIZE);
+
+    LZ77UnCompVram(&gBirchHelpGfx, (void *)VRAM);
+    LZ77UnCompVram(&gBirchBagTilemap, (void *)(VRAM + 0x3000));
+    LZ77UnCompVram(&gBirchGrassTilemap, (void *)(VRAM + 0x3800));
+
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_085B1E00, ARRAY_COUNT(gUnknown_085B1E00));
+    InitWindows(gUnknown_085B1DCC);
+
+    DeactivateAllTextPrinters();
+    sub_809882C(0, 0x2A8, 0xD0);
+    clear_scheduled_bg_copies_to_vram();
+    remove_some_task();
+    ResetTasks();
+    ResetSpriteData();
+    ResetPaletteFade();
+    FreeAllSpritePalettes();
+    dp13_810BB8C();
+
+    LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20);
+    LoadPalette(gBirchBagGrassPal, 0, 0x40);
+    LoadCompressedObjectPic(&gUnknown_085B1ED8[0]);
+    LoadCompressedObjectPic(&gUnknown_085B1EE8[0]);
+    LoadSpritePalettes(gUnknown_085B1EF8);
+    BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+
+    EnableInterrupts(DISPSTAT_VBLANK);
+    SetVBlankCallback(VblankCB_StarterChoose);
+    SetMainCallback2(MainCallback2_StarterChoose);
+
+    SetGpuReg(REG_OFFSET_WININ, 0x3F);
+    SetGpuReg(REG_OFFSET_WINOUT, 0x1F);
+    SetGpuReg(REG_OFFSET_WIN0H, 0);
+    SetGpuReg(REG_OFFSET_WIN0V, 0);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0xFE);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+    SetGpuReg(REG_OFFSET_BLDY, 7);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+
+    ShowBg(0);
+    ShowBg(2);
+    ShowBg(3);
+
+    taskId = CreateTask(Task_StarterChoose1, 0);
+    gTasks[taskId].tStarterSelection = 1;
+
+    // Create hand sprite
+    spriteId = CreateSprite(&sSpriteTemplate_Hand, 120, 56, 2);
+    gSprites[spriteId].data0 = taskId;
+
+    // Create three Pokeball sprites
+    spriteId = CreateSprite(&sSpriteTemplate_PokeBall, sPokeballCoords[0][0], sPokeballCoords[0][1], 2);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data1 = 0;
+
+    spriteId = CreateSprite(&sSpriteTemplate_PokeBall, sPokeballCoords[1][0], sPokeballCoords[1][1], 2);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data1 = 1;
+
+    spriteId = CreateSprite(&sSpriteTemplate_PokeBall, sPokeballCoords[2][0], sPokeballCoords[2][1], 2);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data1 = 2;
+
+    sStarterChooseWindowId = 0xFF;
+}
+
+static void MainCallback2_StarterChoose(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    do_scheduled_bg_tilemap_copies_to_vram();
+    UpdatePaletteFade();
+}
+
+static void Task_StarterChoose1(u8 taskId)
+{
+    CreateStarterPokemonLabel(gTasks[taskId].tStarterSelection);
+    SetWindowBorderStyle(0, FALSE, 0x2A8, 0xD);
+    PrintTextOnWindow(0, 1, gText_BirchInTrouble, 0, 1, 0, NULL);
+    PutWindowTilemap(0);
+    schedule_bg_copy_tilemap_to_vram(0);
+    gTasks[taskId].func = Task_StarterChoose2;
+}
+
+static void Task_StarterChoose2(u8 taskId)
+{
+    u8 selection = gTasks[taskId].tStarterSelection;
+
+    if (gMain.newKeys & A_BUTTON)
+    {
+        u8 spriteId;
+
+        sub_8134604();
+
+        // Create white circle background
+        spriteId = CreateSprite(&gUnknown_085B1F40, sPokeballCoords[selection][0], sPokeballCoords[selection][1], 1);
+        gTasks[taskId].tCircleSpriteId = spriteId;
+
+        // Create Pokemon sprite
+        spriteId = CreatePokemonFrontSprite(GetStarterPokemon(gTasks[taskId].tStarterSelection), sPokeballCoords[selection][0], sPokeballCoords[selection][1]);
+        gSprites[spriteId].affineAnims = &gUnknown_085B1ED0;
+        gSprites[spriteId].callback = StarterPokemonSpriteCallback;
+
+        gTasks[taskId].tPkmnSpriteId = spriteId;
+        gTasks[taskId].func = Task_StarterChoose3;
+    }
+    else if ((gMain.newKeys & DPAD_LEFT) && selection > 0)
+    {
+        gTasks[taskId].tStarterSelection--;
+        gTasks[taskId].func = Task_MoveStarterChooseCursor;
+    }
+    else if ((gMain.newKeys & DPAD_RIGHT) && selection < (STARTER_MON_COUNT - 1))
+    {
+        gTasks[taskId].tStarterSelection++;
+        gTasks[taskId].func = Task_MoveStarterChooseCursor;
+    }
+}
+
+static void Task_StarterChoose3(u8 taskId)
+{
+    if (gSprites[gTasks[taskId].tCircleSpriteId].affineAnimEnded &&
+      gSprites[gTasks[taskId].tCircleSpriteId].pos1.x == STARTER_PKMN_POS_X &&
+      gSprites[gTasks[taskId].tCircleSpriteId].pos1.y == STARTER_PKMN_POS_Y)
+    {
+        gTasks[taskId].func = Task_StarterChoose4;
+    }
+}
+
+static void Task_StarterChoose4(u8 taskId)
+{
+    PlayCry1(GetStarterPokemon(gTasks[taskId].tStarterSelection), 0);
+    FillWindowPixelBuffer(0, 0x11);
+    PrintTextOnWindow(0, 1, gText_ConfirmStarterChoice, 0, 1, 0, NULL);
+    schedule_bg_copy_tilemap_to_vram(0);
+    CreateYesNoMenu(&gUnknown_085B1DDC, 0x2A8, 0xD, 0);
+    gTasks[taskId].func = Task_StarterChoose5;
+}
+
+static void Task_StarterChoose5(u8 taskId)
+{
+    u8 spriteId;
+
+    switch (sub_8198C58())
+    {
+    case 0:  // YES
+        // Return the starter choice and exit.
+        gScriptResult = gTasks[taskId].tStarterSelection;
+        dp13_810BB8C();
+        SetMainCallback2(gMain.savedCallback);
+        break;
+    case 1:  // NO
+    case -1: // B button
+        PlaySE(SE_SELECT);
+        spriteId = gTasks[taskId].tPkmnSpriteId;
+        FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
+        sub_818D820(spriteId);
+
+        spriteId = gTasks[taskId].tCircleSpriteId;
+        FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
+        DestroySprite(&gSprites[spriteId]);
+        gTasks[taskId].func = Task_StarterChoose6;
+        break;
+    }
+}
+
+static void Task_StarterChoose6(u8 taskId)
+{
+    gTasks[taskId].func = Task_StarterChoose1;
+}
+
+static void CreateStarterPokemonLabel(u8 selection)
+{
+    u8 text[32];
+    struct WindowTemplate winTemplate;
+    const u8 *speciesName;
+    s32 width;
+    u8 labelLeft, labelRight, labelTop, labelBottom;
+
+    u16 species = GetStarterPokemon(selection);
+    CopyMonCategoryText(SpeciesToNationalPokedexNum(species), text);
+    speciesName = gSpeciesNames[species];
+
+    winTemplate = gUnknown_085B1DE4;
+    winTemplate.tilemapLeft = gStarterChoose_LabelCoords[selection][0];
+    winTemplate.tilemapTop = gStarterChoose_LabelCoords[selection][1];
+
+    sStarterChooseWindowId = AddWindow(&winTemplate);
+    FillWindowPixelBuffer(sStarterChooseWindowId, 0);
+
+    width = GetStringCenterAlignXOffset(7, text, 0x68);
+    box_print(sStarterChooseWindowId, 7, width, 1, gUnknown_085B1E0C, 0, text);
+
+    width = GetStringCenterAlignXOffset(1, speciesName, 0x68);
+    box_print(sStarterChooseWindowId, 1, width, 0x11, gUnknown_085B1E0C, 0, speciesName);
+
+    PutWindowTilemap(sStarterChooseWindowId);
+    schedule_bg_copy_tilemap_to_vram(0);
+
+    labelLeft = gStarterChoose_LabelCoords[selection][0] * 8 - 4;
+    labelRight = (gStarterChoose_LabelCoords[selection][0] + 13) * 8 + 4;
+    labelTop = gStarterChoose_LabelCoords[selection][1] * 8;
+    labelBottom = (gStarterChoose_LabelCoords[selection][1] + 4) * 8;
+    SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(labelLeft, labelRight));
+    SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(labelTop, labelBottom));
+}
+
+static void sub_8134604(void)
+{
+    FillWindowPixelBuffer(sStarterChooseWindowId, 0);
+    ClearWindowTilemap(sStarterChooseWindowId);
+    RemoveWindow(sStarterChooseWindowId);
+    sStarterChooseWindowId = 0xFF;
+    SetGpuReg(REG_OFFSET_WIN0H, 0);
+    SetGpuReg(REG_OFFSET_WIN0V, 0);
+    schedule_bg_copy_tilemap_to_vram(0);
+}
+
+static void Task_MoveStarterChooseCursor(u8 taskId)
+{
+    sub_8134604();
+    gTasks[taskId].func = sub_8134668;
+}
+
+static void sub_8134668(u8 taskId)
+{
+    CreateStarterPokemonLabel(gTasks[taskId].tStarterSelection);
+    gTasks[taskId].func = Task_StarterChoose2;
+}
+
+static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
+{
+    u8 spriteId;
+
+    spriteId = sub_818D3E4(species, 8, 0, 1, x, y, 0xE, 0xFFFF);
+    gSprites[spriteId].oam.priority = 0;
+    return spriteId;
+}
+
+static void sub_81346DC(struct Sprite *sprite)
+{
+    sprite->pos1.x = gUnknown_085B1E28[gTasks[sprite->data0].tStarterSelection][0];
+    sprite->pos1.y = gUnknown_085B1E28[gTasks[sprite->data0].tStarterSelection][1];
+    sprite->pos2.y = Sin(sprite->data1, 8);
+    sprite->data1 = (u8)(sprite->data1) + 4;
+}
+
+static void sub_813473C(struct Sprite *sprite)
+{
+    if (gTasks[sprite->data0].tStarterSelection == sprite->data1)
+        StartSpriteAnimIfDifferent(sprite, 1);
+    else
+        StartSpriteAnimIfDifferent(sprite, 0);
+}
+
+static void StarterPokemonSpriteCallback(struct Sprite *sprite)
+{
+    //Move sprite to upper center of screen
+    if (sprite->pos1.x > STARTER_PKMN_POS_X)
+        sprite->pos1.x -= 4;
+    if (sprite->pos1.x < STARTER_PKMN_POS_X)
+        sprite->pos1.x += 4;
+    if (sprite->pos1.y > STARTER_PKMN_POS_Y)
+        sprite->pos1.y -= 2;
+    if (sprite->pos1.y < STARTER_PKMN_POS_Y)
+        sprite->pos1.y += 2;
+}
diff --git a/src/text_window.c b/src/text_window.c
index 55aedf688..336536c04 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -23,7 +23,7 @@ const struct TilesPal* sub_8098758(u8 id)
 void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset)
 {
     LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gUnknown_08DDD748, 0x1C0, destOffset);
-    LoadPalette(sub_8098C64(), palOffset, 0x20);
+    LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20);
 }
 
 void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset)
@@ -113,7 +113,7 @@ const u16* stdpal_get(u8 id)
     return &gUnknown_0851017C[id];
 }
 
-const u16* sub_8098C64(void)
+const u16* GetOverworldTextboxPalettePtr(void)
 {
     return gUnknown_08DDD728;
 }
-- 
cgit v1.2.3


From e6ef86e4b0a66440c3339c8d63c13dcd11521984 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Wed, 8 Nov 2017 15:20:10 -0600
Subject: Update variable and flag names

---
 src/battle_2.c               |  14 ++--
 src/battle_message.c         |   2 +-
 src/battle_script_commands.c |   2 +-
 src/battle_util.c            |   8 +--
 src/berry.c                  |   4 +-
 src/braille_puzzles.c        |  24 +++----
 src/calculate_base_damage.c  |   8 +--
 src/decoration.c             |   4 +-
 src/event_data.c             |  44 ++++++------
 src/field_special_scene.c    |   2 +-
 src/item.c                   |   4 +-
 src/lilycove_lady.c          |   6 +-
 src/lottery_corner.c         |   6 +-
 src/pokemon_2.c              |   6 +-
 src/pokemon_size_record.c    |  10 +--
 src/safari_zone.c            |  26 +++----
 src/scrcmd.c                 |  52 +++++++-------
 src/start_menu.c             |  10 +--
 src/tv.c                     | 162 +++++++++++++++++++++----------------------
 src/walda_phrase.c           |   8 +--
 20 files changed, 201 insertions(+), 201 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 6b7c4063e..bd2899aec 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -511,7 +511,7 @@ static void sub_8036A5C(void)
 
     gBattleStruct->field_182 = r6;
     *(&gBattleStruct->field_183) = r6 >> 8;
-    gBattleStruct->field_183 |= FlagGet(SYS_FRONTIER_PASS) << 7;
+    gBattleStruct->field_183 |= FlagGet(FLAG_SYS_FRONTIER_PASS) << 7;
 }
 
 static void SetPlayerBerryDataInBattleStruct(void)
@@ -1612,7 +1612,7 @@ void BattleMainCB2(void)
 
     if (gMain.heldKeys & B_BUTTON && gBattleTypeFlags & BATTLE_TYPE_RECORDED && sub_8186450())
     {
-        gScriptResult = gBattleOutcome = BATTLE_PLAYER_TELEPORTED;
+        gSpecialVar_ScriptResult = gBattleOutcome = BATTLE_PLAYER_TELEPORTED;
         ResetPaletteFadeControl();
         BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
         SetMainCallback2(CB2_QuitRecordedBattle);
@@ -2070,7 +2070,7 @@ static void sub_8038F34(void)
 
             if (!gSaveBlock2Ptr->field_CA9_b && i == monsCount)
             {
-                if (FlagGet(SYS_FRONTIER_PASS))
+                if (FlagGet(FLAG_SYS_FRONTIER_PASS))
                 {
                     FreeAllWindowBuffers();
                     SetMainCallback2(sub_80392A8);
@@ -4428,7 +4428,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
 
     // badge boost
     if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
-        && FlagGet(BADGE03_GET)
+        && FlagGet(FLAG_BADGE03_GET)
         && GetBankSide(bank1) == SIDE_PLAYER)
     {
         speedBank1 = (speedBank1 * 110) / 100;
@@ -4462,7 +4462,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
 
     // badge boost
     if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
-        && FlagGet(BADGE03_GET)
+        && FlagGet(FLAG_BADGE03_GET)
         && GetBankSide(bank2) == SIDE_PLAYER)
     {
         speedBank2 = (speedBank2 * 110) / 100;
@@ -4751,7 +4751,7 @@ static void HandleEndTurn_BattleWon(void)
 
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
     {
-        gScriptResult = gBattleOutcome;
+        gSpecialVar_ScriptResult = gBattleOutcome;
         gBattleTextBuff1[0] = gBattleOutcome;
         gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
         gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
@@ -5013,7 +5013,7 @@ static void ReturnFromBattleToOverworld(void)
     if (gBattleTypeFlags & BATTLE_TYPE_LINK && gReceivedRemoteLinkPlayers != 0)
         return;
 
-    gScriptResult = gBattleOutcome;
+    gSpecialVar_ScriptResult = gBattleOutcome;
     gMain.inBattle = 0;
     gMain.callback1 = gPreBattleCallback1;
 
diff --git a/src/battle_message.c b/src/battle_message.c
index aeff721d6..5797650bc 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1907,7 +1907,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 HANDLE_NICKNAME_STRING_CASE(gBattleScripting.bank, *(&gBattleStruct->field_52))
                 break;
             case B_TXT_PC_CREATOR_NAME: // lanette pc
-                if (FlagGet(SYS_PC_LANETTE))
+                if (FlagGet(FLAG_SYS_PC_LANETTE))
                     toCpy = gText_Lanettes;
                 else
                     toCpy = gText_Someones;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 28357d984..784c2e80d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -11160,7 +11160,7 @@ static void atkF0_give_caught_mon(void)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         }
 
-        if (FlagGet(SYS_PC_LANETTE))
+        if (FlagGet(FLAG_SYS_PC_LANETTE))
             gBattleCommunication[MULTISTRING_CHOOSER]++;
     }
 
diff --git a/src/battle_util.c b/src/battle_util.c
index 0a0badb33..537bb2793 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -3511,16 +3511,16 @@ u8 IsPokeDisobedient(void)
             return 0;
         if (!IsOtherTrainer(gBattleMons[gBankAttacker].otId, gBattleMons[gBankAttacker].otName))
             return 0;
-        if (FlagGet(BADGE08_GET))
+        if (FlagGet(FLAG_BADGE08_GET))
             return 0;
 
         obedienceLevel = 10;
 
-        if (FlagGet(BADGE02_GET))
+        if (FlagGet(FLAG_BADGE02_GET))
             obedienceLevel = 30;
-        if (FlagGet(BADGE04_GET))
+        if (FlagGet(FLAG_BADGE04_GET))
             obedienceLevel = 50;
-        if (FlagGet(BADGE06_GET))
+        if (FlagGet(FLAG_BADGE06_GET))
             obedienceLevel = 70;
     }
 
diff --git a/src/berry.c b/src/berry.c
index 98cf7d932..2d3efa9c6 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1169,7 +1169,7 @@ void FieldObjectInteractionGetBerryTreeData(void)
     id = FieldObjectGetBerryTreeId(gSelectedMapObject);
     berry = GetBerryTypeByBerryTreeId(id);
     ResetBerryTreeSparkleFlag(id);
-    unk = gScriptLastTalked;
+    unk = gSpecialVar_ScriptLastTalked;
     num = gSaveBlock1Ptr->location.mapNum;
     group = gSaveBlock1Ptr->location.mapGroup;
     if (sub_8092E9C(unk, num, group))
@@ -1219,7 +1219,7 @@ void FieldObjectInteractionPickBerryTree(void)
 void FieldObjectInteractionRemoveBerryTree(void)
 {
     RemoveBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject));
-    sub_8092EF0(gScriptLastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    sub_8092EF0(gSpecialVar_ScriptLastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
 }
 
 u8 PlayerHasBerries(void)
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 9a6f0371c..c8055470a 100755
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -33,7 +33,7 @@ void sub_8179944(void);
 
 bool8 ShouldDoBrailleDigEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_DIG)
+    if (!FlagGet(FLAG_SYS_BRAILLE_DIG)
      && (gSaveBlock1Ptr->location.mapGroup == 0x18
      && gSaveBlock1Ptr->location.mapNum == 0x47))
     {
@@ -58,7 +58,7 @@ void DoBrailleDigEffect(void)
     MapGridSetMetatileIdAt(18, 9, 3636);
     DrawWholeMapView();
     PlaySE(SE_BAN);
-    FlagSet(SYS_BRAILLE_DIG);
+    FlagSet(FLAG_SYS_BRAILLE_DIG);
     ScriptContext2_Disable();
 }
 
@@ -81,7 +81,7 @@ bool8 CheckRelicanthWailord(void)
 void ShouldDoBrailleStrengthEffectOld(void)
 {
     /*
-        if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS))
+        if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS))
     {
         if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23)
             return TRUE;
@@ -105,13 +105,13 @@ void DoBrailleStrengthEffect(void)
     MapGridSetMetatileIdAt(16, 27, 3636);
     DrawWholeMapView();
     PlaySE(SE_BAN);
-    FlagSet(SYS_BRAILLE_STRENGTH);
+    FlagSet(FLAG_SYS_BRAILLE_STRENGTH);
     ScriptContext2_Disable();
 }
 
 bool8 ShouldDoBrailleFlyEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB))
+    if (!FlagGet(FLAG_SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB))
     {
         if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25)
             return TRUE;
@@ -151,7 +151,7 @@ void UseFlyAncientTomb_Finish(void)
     MapGridSetMetatileIdAt(16, 27, 3636);
     DrawWholeMapView();
     PlaySE(SE_BAN);
-    FlagSet(SYS_BRAILLE_FLY);
+    FlagSet(FLAG_SYS_BRAILLE_FLY);
     ScriptContext2_Disable();
 }
     */
@@ -205,7 +205,7 @@ void SealedChamberShakingEffect(u8 taskId)
 // moved later in the function because it was rewritten.
 bool8 ShouldDoBrailleStrengthEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x06))
+    if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x06))
     {
         if (gSaveBlock1Ptr->pos.x == 6 && gSaveBlock1Ptr->pos.y == 23)
             { gBraillePuzzleCallbackFlag = STRENGTH_PUZZLE; return TRUE; }
@@ -240,13 +240,13 @@ void sub_8179860(void)
     MapGridSetMetatileIdAt(16, 27, 3636);
     DrawWholeMapView();
     PlaySE(SE_BAN);
-    FlagSet(SYS_BRAILLE_STRENGTH);
+    FlagSet(FLAG_SYS_BRAILLE_STRENGTH);
     ScriptContext2_Disable();
 }
 
 bool8 ShouldDoBrailleFlyEffect(void)
 {
-    if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x44))
+    if (!FlagGet(FLAG_SYS_BRAILLE_FLY) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x44))
     {
         if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 25)
             { gBraillePuzzleCallbackFlag = FLY_PUZZLE; return TRUE; }
@@ -276,7 +276,7 @@ void sub_8179944(void)
     MapGridSetMetatileIdAt(16, 27, 3636);
     DrawWholeMapView();
     PlaySE(SE_BAN);
-    FlagSet(SYS_BRAILLE_FLY);
+    FlagSet(FLAG_SYS_BRAILLE_FLY);
     ScriptContext2_Disable();
 }
 
@@ -284,7 +284,7 @@ void sub_8179944(void)
 void DoBrailleWait(void)
 {
     /*
-    if (!FlagGet(SYS_BRAILLE_WAIT))
+    if (!FlagGet(FLAG_SYS_BRAILLE_WAIT))
         CreateTask(Task_BrailleWait, 0x50);
 }
 
@@ -387,7 +387,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void)
     if (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x43)
     {
         // _08179A1A
-        if (FlagGet(SYS_BRAILLE_WAIT) != FALSE)
+        if (FlagGet(FLAG_SYS_BRAILLE_WAIT) != FALSE)
             return FALSE;
         if (FlagGet(2) == FALSE)
             return FALSE;
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c
index 8996059f9..89770b17a 100644
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@@ -84,13 +84,13 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     if (attacker->ability == ABILITY_HUGE_POWER || attacker->ability == ABILITY_PURE_POWER)
         attack *= 2;
 
-    if (ShouldGetStatBadgeBoost(BADGE01_GET, bankAtk))
+    if (ShouldGetStatBadgeBoost(FLAG_BADGE01_GET, bankAtk))
         attack = (110 * attack) / 100;
-    if (ShouldGetStatBadgeBoost(BADGE05_GET, bankDef))
+    if (ShouldGetStatBadgeBoost(FLAG_BADGE05_GET, bankDef))
         defense = (110 * defense) / 100;
-    if (ShouldGetStatBadgeBoost(BADGE07_GET, bankAtk))
+    if (ShouldGetStatBadgeBoost(FLAG_BADGE07_GET, bankAtk))
         spAttack = (110 * spAttack) / 100;
-    if (ShouldGetStatBadgeBoost(BADGE07_GET, bankDef))
+    if (ShouldGetStatBadgeBoost(FLAG_BADGE07_GET, bankDef))
         spDefense = (110 * spDefense) / 100;
 
     for (i = 0; i < 17; i++)
diff --git a/src/decoration.c b/src/decoration.c
index 0179d36a1..5396a125c 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -2133,10 +2133,10 @@ void sub_8129708(void)
     u16 i;
 
     gSpecialVar_0x8005 = 0;
-    gScriptResult = 0;
+    gSpecialVar_ScriptResult = 0;
     if (gSpecialVar_0x8004 == sCurDecorSelectedInRearrangement)
     {
-        gScriptResult = 1;
+        gSpecialVar_ScriptResult = 1;
     }
     else if (gDecorations[gUnknown_0203A17C.items[sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx]].permission == DECORPERM_SOLID_MAT)
     {
diff --git a/src/event_data.c b/src/event_data.c
index 19a310db5..88cf4dedc 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -17,11 +17,11 @@ EWRAM_DATA u16 gSpecialVar_0x8008 = 0;
 EWRAM_DATA u16 gSpecialVar_0x8009 = 0;
 EWRAM_DATA u16 gSpecialVar_0x800A = 0;
 EWRAM_DATA u16 gSpecialVar_0x800B = 0;
-EWRAM_DATA u16 gScriptResult = 0;
-EWRAM_DATA u16 gScriptLastTalked = 0;
-EWRAM_DATA u16 gScriptFacing = 0;
-EWRAM_DATA u16 gSpecialVar_0x8012 = 0;
-EWRAM_DATA u16 gSpecialVar_0x8013 = 0;
+EWRAM_DATA u16 gSpecialVar_ScriptResult = 0;
+EWRAM_DATA u16 gSpecialVar_ScriptLastTalked = 0;
+EWRAM_DATA u16 gSpecialVar_ScriptFacing = 0;
+EWRAM_DATA u16 gSpecialVar_MonBoxId = 0;
+EWRAM_DATA u16 gSpecialVar_MonBoxPos = 0;
 EWRAM_DATA u16 gSpecialVar_0x8014 = 0;
 EWRAM_DATA static u8 gUnknown_020375FC[16] = {0};
 
@@ -40,11 +40,11 @@ void ClearTempFieldEventData(void)
 {
     memset(gSaveBlock1Ptr->flags, 0, TEMP_FLAGS_SIZE);
     memset(gSaveBlock1Ptr->vars, 0, TEMP_VARS_SIZE);
-    FlagClear(SYS_ENC_UP_ITEM);
-    FlagClear(SYS_ENC_DOWN_ITEM);
-    FlagClear(SYS_USE_STRENGTH);
-    FlagClear(SYS_CTRL_OBJ_DELETE);
-    FlagClear(SYS_UNKNOWN_880);
+    FlagClear(FLAG_SYS_ENC_UP_ITEM);
+    FlagClear(FLAG_SYS_ENC_DOWN_ITEM);
+    FlagClear(FLAG_SYS_USE_STRENGTH);
+    FlagClear(FLAG_SYS_CTRL_OBJ_DELETE);
+    FlagClear(FLAG_SYS_UNKNOWN_880);
 }
 
 // probably had different flag splits at one point.
@@ -58,7 +58,7 @@ void DisableNationalPokedex(void)
     u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
     gSaveBlock2Ptr->pokedex.nationalMagic = 0;
     *nationalDexVar = 0;
-    FlagClear(SYS_NATIONAL_DEX);
+    FlagClear(FLAG_SYS_NATIONAL_DEX);
 }
 
 void EnableNationalPokedex(void)
@@ -66,7 +66,7 @@ void EnableNationalPokedex(void)
     u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX);
     gSaveBlock2Ptr->pokedex.nationalMagic = 0xDA;
     *nationalDexVar = 0x302;
-    FlagSet(SYS_NATIONAL_DEX);
+    FlagSet(FLAG_SYS_NATIONAL_DEX);
     gSaveBlock2Ptr->pokedex.unknown1 = 1;
     gSaveBlock2Ptr->pokedex.order = 0;
     sub_80BB358();
@@ -74,7 +74,7 @@ void EnableNationalPokedex(void)
 
 bool32 IsNationalPokedexEnabled(void)
 {
-    if (gSaveBlock2Ptr->pokedex.nationalMagic == 0xDA && VarGet(VAR_NATIONAL_DEX) == 0x302 && FlagGet(SYS_NATIONAL_DEX))
+    if (gSaveBlock2Ptr->pokedex.nationalMagic == 0xDA && VarGet(VAR_NATIONAL_DEX) == 0x302 && FlagGet(FLAG_SYS_NATIONAL_DEX))
         return TRUE;
     else
         return FALSE;
@@ -82,32 +82,32 @@ bool32 IsNationalPokedexEnabled(void)
 
 void DisableMysteryEvent(void)
 {
-    FlagClear(SYS_MYSTERY_EVENT_ENABLE);
+    FlagClear(FLAG_SYS_MYSTERY_EVENT_ENABLE);
 }
 
 void EnableMysteryEvent(void)
 {
-    FlagSet(SYS_MYSTERY_EVENT_ENABLE);
+    FlagSet(FLAG_SYS_MYSTERY_EVENT_ENABLE);
 }
 
 bool32 IsMysteryEventEnabled(void)
 {
-    return FlagGet(SYS_MYSTERY_EVENT_ENABLE);
+    return FlagGet(FLAG_SYS_MYSTERY_EVENT_ENABLE);
 }
 
 void DisableMysteryGift(void)
 {
-    FlagClear(SYS_MYSTERY_GIFT_ENABLE);
+    FlagClear(FLAG_SYS_MYSTERY_GIFT_ENABLE);
 }
 
 void EnableMysteryGift(void)
 {
-    FlagSet(SYS_MYSTERY_GIFT_ENABLE);
+    FlagSet(FLAG_SYS_MYSTERY_GIFT_ENABLE);
 }
 
 bool32 IsMysteryGiftEnabled(void)
 {
-    return FlagGet(SYS_MYSTERY_GIFT_ENABLE);
+    return FlagGet(FLAG_SYS_MYSTERY_GIFT_ENABLE);
 }
 
 void sub_809D4D8(void)
@@ -145,18 +145,18 @@ void sub_809D570(void)
 void DisableResetRTC(void)
 {
     VarSet(VAR_RESET_RTC_ENABLE, 0);
-    FlagClear(SYS_RESET_RTC_ENABLE);
+    FlagClear(FLAG_SYS_RESET_RTC_ENABLE);
 }
 
 void EnableResetRTC(void)
 {
     VarSet(VAR_RESET_RTC_ENABLE, 0x920);
-    FlagSet(SYS_RESET_RTC_ENABLE);
+    FlagSet(FLAG_SYS_RESET_RTC_ENABLE);
 }
 
 bool32 CanResetRTC(void)
 {
-    if (FlagGet(SYS_RESET_RTC_ENABLE) && VarGet(VAR_RESET_RTC_ENABLE) == 0x920)
+    if (FlagGet(FLAG_SYS_RESET_RTC_ENABLE) && VarGet(VAR_RESET_RTC_ENABLE) == 0x920)
         return TRUE;
     else
         return FALSE;
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 54c1d8144..f92f342eb 100755
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -354,7 +354,7 @@ void sub_80FB768(void)
 
 void sub_80FB7A4(void)
 {
-    FlagSet(SYS_CRUISE_MODE);
+    FlagSet(FLAG_SYS_CRUISE_MODE);
     FlagSet(0x4001);
     FlagSet(0x4000);
     saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
diff --git a/src/item.c b/src/item.c
index 0114676b6..a684ea6f0 100644
--- a/src/item.c
+++ b/src/item.c
@@ -165,11 +165,11 @@ bool8 HasAtLeastOneBerry(void)
     {
         if (CheckBagHasItem(i, 1) == TRUE)
         {
-            gScriptResult = 1;
+            gSpecialVar_ScriptResult = 1;
             return TRUE;
         }
     }
-    gScriptResult = 0;
+    gSpecialVar_ScriptResult = 0;
     return FALSE;
 }
 
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 3b7ae49f2..f7ec5dbaf 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -242,11 +242,11 @@ void sub_818D9C0(void)
     {
         lilycoveLady = &gSaveBlock1Ptr->lilycoveLady;
         VarSet(VAR_0x4011, gUnknown_0860B074[lilycoveLady->contest.category]);
-        gScriptResult = TRUE;
+        gSpecialVar_ScriptResult = TRUE;
     }
     else
     {
-        gScriptResult = FALSE;
+        gSpecialVar_ScriptResult = FALSE;
     }
 }
 
@@ -308,7 +308,7 @@ void SetLilycoveLadyRandomly(void)
 
 void sub_818DAEC(void)
 {
-    gScriptResult = GetLilycoveLadyId();
+    gSpecialVar_ScriptResult = GetLilycoveLadyId();
 }
 
 static u8 sub_818DB04(const u16 *data)
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index 3939f7d7f..7c8c32189 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -42,7 +42,7 @@ void SetRandomLotteryNumber(u16 i)
 void RetrieveLotteryNumber(void)
 {
     u16 lottoNumber = GetLotteryNumber();
-    gScriptResult = lottoNumber;
+    gSpecialVar_ScriptResult = lottoNumber;
 }
 
 void PickLotteryCornerTicket(void)
@@ -66,7 +66,7 @@ void PickLotteryCornerTicket(void)
             if (!GetMonData(pkmn, MON_DATA_IS_EGG))
             {
                 u32 otId = GetMonData(pkmn, MON_DATA_OT_ID);
-                u8 numMatchingDigits = GetMatchingDigits(gScriptResult, otId);
+                u8 numMatchingDigits = GetMatchingDigits(gSpecialVar_ScriptResult, otId);
 
                 if (numMatchingDigits > gSpecialVar_0x8004 && numMatchingDigits > 1)
                 {
@@ -90,7 +90,7 @@ void PickLotteryCornerTicket(void)
             !GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_IS_EGG))
             {
                 u32 otId = GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_OT_ID);
-                u8 numMatchingDigits = GetMatchingDigits(gScriptResult, otId);
+                u8 numMatchingDigits = GetMatchingDigits(gSpecialVar_ScriptResult, otId);
 
                 if (numMatchingDigits > gSpecialVar_0x8004 && numMatchingDigits > 1)
                 {
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 587773836..3802cc5eb 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -1086,10 +1086,10 @@ u8 SendMonToPC(struct Pokemon* mon)
             {
                 MonRestorePP(mon);
                 CopyMon(checkingMon, &mon->box, sizeof(mon->box));
-                gSpecialVar_0x8012 = boxNo;
-                gSpecialVar_0x8013 = boxPos;
+                gSpecialVar_MonBoxId = boxNo;
+                gSpecialVar_MonBoxPos = boxPos;
                 if (get_unknown_box_id() != boxNo)
-                    FlagClear(SYS_STORAGE_UNKNOWN_FLAG);
+                    FlagClear(FLAG_SYS_STORAGE_UNKNOWN_FLAG);
                 VarSet(VAR_STORAGE_UNKNOWN, boxNo);
                 return MON_GIVEN_TO_PC;
             }
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 1758fba32..e138b86c8 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -109,13 +109,13 @@ static void FormatMonSizeRecord(u8 *string, u32 size)
 
 static u8 CompareMonSize(u16 species, u16 *sizeRecord)
 {
-    if (gScriptResult == 0xFF)
+    if (gSpecialVar_ScriptResult == 0xFF)
     {
         return 0;
     }
     else
     {
-        struct Pokemon *pkmn = &gPlayerParty[gScriptResult];
+        struct Pokemon *pkmn = &gPlayerParty[gSpecialVar_ScriptResult];
 
         if (GetMonData(pkmn, MON_DATA_IS_EGG) == TRUE || GetMonData(pkmn, MON_DATA_SPECIES) != species)
         {
@@ -173,7 +173,7 @@ void CompareSeedotSize(void)
 {
     u16 *sizeRecord = GetVarPointer(VAR_SEEDOT_SIZE_RECORD);
 
-    gScriptResult = CompareMonSize(SPECIES_SEEDOT, sizeRecord);
+    gSpecialVar_ScriptResult = CompareMonSize(SPECIES_SEEDOT, sizeRecord);
 }
 
 void InitLotadSizeRecord(void)
@@ -192,7 +192,7 @@ void CompareLotadSize(void)
 {
     u16 *sizeRecord = GetVarPointer(VAR_LOTAD_SIZE_RECORD);
 
-    gScriptResult = CompareMonSize(SPECIES_LOTAD, sizeRecord);
+    gSpecialVar_ScriptResult = CompareMonSize(SPECIES_LOTAD, sizeRecord);
 }
 
 void GiveGiftRibbonToParty(u8 index, u8 ribbonId)
@@ -217,6 +217,6 @@ void GiveGiftRibbonToParty(u8 index, u8 ribbonId)
             }
         }
         if (gotRibbon)
-            FlagSet(SYS_RIBBON_GET);
+            FlagSet(FLAG_SYS_RIBBON_GET);
     }
 }
diff --git a/src/safari_zone.c b/src/safari_zone.c
index 77c6bbd61..a493dd13f 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -50,17 +50,17 @@ static void DecrementFeederStepCounters(void);
 
 bool32 GetSafariZoneFlag(void)
 {
-    return FlagGet(SYS_SAFARI_MODE);
+    return FlagGet(FLAG_SYS_SAFARI_MODE);
 }
 
 void SetSafariZoneFlag(void)
 {
-    FlagSet(SYS_SAFARI_MODE);
+    FlagSet(FLAG_SYS_SAFARI_MODE);
 }
 
 void ResetSafariZoneFlag(void)
 {
-    FlagClear(SYS_SAFARI_MODE);
+    FlagClear(FLAG_SYS_SAFARI_MODE);
 }
 
 void EnterSafariMode(void)
@@ -152,13 +152,13 @@ void GetPokeblockFeederInFront(void)
          && sPokeblockFeeders[i].x == x
          && sPokeblockFeeders[i].y == y)
         {
-            gScriptResult = i;
+            gSpecialVar_ScriptResult = i;
             StringCopy(gStringVar1, gPokeblockNames[sPokeblockFeeders[i].pokeblock.color]);
             return;
         }
     }
 
-    gScriptResult = -1;
+    gSpecialVar_ScriptResult = -1;
 }
 
 void GetPokeblockFeederWithinRange(void)
@@ -181,13 +181,13 @@ void GetPokeblockFeederWithinRange(void)
                 y *= -1;
             if ((x + y) <= 5)
             {
-                gScriptResult = i;
+                gSpecialVar_ScriptResult = i;
                 return;
             }
         }
     }
 
-    gScriptResult = -1;
+    gSpecialVar_ScriptResult = -1;
 }
 
 // unused
@@ -195,20 +195,20 @@ struct Pokeblock *SafariZoneGetPokeblockInFront(void)
 {
     GetPokeblockFeederInFront();
 
-    if (gScriptResult == 0xFFFF)
+    if (gSpecialVar_ScriptResult == 0xFFFF)
         return NULL;
     else
-        return &sPokeblockFeeders[gScriptResult].pokeblock;
+        return &sPokeblockFeeders[gSpecialVar_ScriptResult].pokeblock;
 }
 
 struct Pokeblock *SafariZoneGetActivePokeblock(void)
 {
     GetPokeblockFeederWithinRange();
 
-    if (gScriptResult == 0xFFFF)
+    if (gSpecialVar_ScriptResult == 0xFFFF)
         return NULL;
     else
-        return &sPokeblockFeeders[gScriptResult].pokeblock;
+        return &sPokeblockFeeders[gSpecialVar_ScriptResult].pokeblock;
 }
 
 void SafariZoneActivatePokeblockFeeder(u8 pkblId)
@@ -255,13 +255,13 @@ bool8 GetInFrontFeederPokeblockAndSteps(void)
 {
     GetPokeblockFeederInFront();
 
-    if (gScriptResult == 0xFFFF)
+    if (gSpecialVar_ScriptResult == 0xFFFF)
     {
         return FALSE;
     }
 
     ConvertIntToDecimalStringN(gStringVar2,
-        sPokeblockFeeders[gScriptResult].stepCounter,
+        sPokeblockFeeders[gSpecialVar_ScriptResult].stepCounter,
         STR_CONV_MODE_LEADING_ZEROS, 3);
 
     return TRUE;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 219dfebd0..4fa88f359 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -69,7 +69,7 @@ extern u16 gSpecialVar_0x8001;
 extern u16 gSpecialVar_0x8002;
 extern u16 gSpecialVar_0x8004;
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_ScriptResult;
 
 extern u16 gScriptContestCategory;
 
@@ -491,7 +491,7 @@ bool8 ScrCmd_random(struct ScriptContext *ctx)
 {
     u16 max = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = Random() % max;
+    gSpecialVar_ScriptResult = Random() % max;
     return FALSE;
 }
 
@@ -500,7 +500,7 @@ bool8 ScrCmd_giveitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = AddBagItem(itemId, (u8)quantity);
+    gSpecialVar_ScriptResult = AddBagItem(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -509,7 +509,7 @@ bool8 ScrCmd_takeitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = RemoveBagItem(itemId, (u8)quantity);
+    gSpecialVar_ScriptResult = RemoveBagItem(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -518,7 +518,7 @@ bool8 ScrCmd_checkitemspace(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = CheckBagHasSpace(itemId, (u8)quantity);
+    gSpecialVar_ScriptResult = CheckBagHasSpace(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -527,7 +527,7 @@ bool8 ScrCmd_checkitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = CheckBagHasItem(itemId, (u8)quantity);
+    gSpecialVar_ScriptResult = CheckBagHasItem(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -535,7 +535,7 @@ bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx)
 {
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = GetPocketByItemId(itemId);
+    gSpecialVar_ScriptResult = GetPocketByItemId(itemId);
     return FALSE;
 }
 
@@ -544,7 +544,7 @@ bool8 ScrCmd_givepcitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u16 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = AddPCItem(itemId, quantity);
+    gSpecialVar_ScriptResult = AddPCItem(itemId, quantity);
     return FALSE;
 }
 
@@ -553,7 +553,7 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u16 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = CheckPCHasItem(itemId, quantity);
+    gSpecialVar_ScriptResult = CheckPCHasItem(itemId, quantity);
     return FALSE;
 }
 
@@ -561,7 +561,7 @@ bool8 ScrCmd_givedecoration(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = DecorationAdd(decorId);
+    gSpecialVar_ScriptResult = DecorationAdd(decorId);
     return FALSE;
 }
 
@@ -569,7 +569,7 @@ bool8 ScrCmd_takedecoration(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = DecorationRemove(decorId);
+    gSpecialVar_ScriptResult = DecorationRemove(decorId);
     return FALSE;
 }
 
@@ -577,7 +577,7 @@ bool8 ScrCmd_checkdecorspace(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = DecorationCheckSpace(decorId);
+    gSpecialVar_ScriptResult = DecorationCheckSpace(decorId);
     return FALSE;
 }
 
@@ -585,7 +585,7 @@ bool8 ScrCmd_checkdecor(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = CheckHasDecoration(decorId);
+    gSpecialVar_ScriptResult = CheckHasDecoration(decorId);
     return FALSE;
 }
 
@@ -909,7 +909,7 @@ bool8 ScrCmd_getplayerxy(struct ScriptContext *ctx)
 
 bool8 ScrCmd_getpartysize(struct ScriptContext *ctx)
 {
-    gScriptResult = CalculatePlayerPartyCount();
+    gSpecialVar_ScriptResult = CalculatePlayerPartyCount();
     return FALSE;
 }
 
@@ -1835,7 +1835,7 @@ bool8 ScrCmd_givemon(struct ScriptContext *ctx)
     u32 unkParam2 = ScriptReadWord(ctx);
     u8 unkParam3 = ScriptReadByte(ctx);
 
-    gScriptResult = ScriptGiveMon(species, level, item, unkParam1, unkParam2, unkParam3);
+    gSpecialVar_ScriptResult = ScriptGiveMon(species, level, item, unkParam1, unkParam2, unkParam3);
     return FALSE;
 }
 
@@ -1843,7 +1843,7 @@ bool8 ScrCmd_giveegg(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = ScriptGiveEgg(species);
+    gSpecialVar_ScriptResult = ScriptGiveEgg(species);
     return FALSE;
 }
 
@@ -1862,7 +1862,7 @@ bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx)
     u8 i;
     u16 moveId = ScriptReadHalfword(ctx);
 
-    gScriptResult = 6;
+    gSpecialVar_ScriptResult = 6;
     for (i = 0; i < 6; i++)
     {
         u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES, NULL);
@@ -1871,7 +1871,7 @@ bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx)
         // UB: GetMonData() arguments don't match function definition
         if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) && pokemon_has_move(&gPlayerParty[i], moveId) == TRUE)
         {
-            gScriptResult = i;
+            gSpecialVar_ScriptResult = i;
             gSpecialVar_0x8004 = species;
             break;
         }
@@ -1905,7 +1905,7 @@ bool8 ScrCmd_checkmoney(struct ScriptContext *ctx)
     u8 ignore = ScriptReadByte(ctx);
 
     if (!ignore)
-        gScriptResult = IsEnoughMoney(&gSaveBlock1Ptr->money, amount);
+        gSpecialVar_ScriptResult = IsEnoughMoney(&gSaveBlock1Ptr->money, amount);
     return FALSE;
 }
 
@@ -2085,7 +2085,7 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
 {
     u16 value = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = GetPriceReduction(value);
+    gSpecialVar_ScriptResult = GetPriceReduction(value);
     return FALSE;
 }
 
@@ -2160,7 +2160,7 @@ bool8 ScrCmd_setrespawn(struct ScriptContext *ctx)
 
 bool8 ScrCmd_checkplayergender(struct ScriptContext *ctx)
 {
-    gScriptResult = gSaveBlock2Ptr->playerGender;
+    gSpecialVar_ScriptResult = gSaveBlock2Ptr->playerGender;
     return FALSE;
 }
 
@@ -2285,9 +2285,9 @@ bool8 ScrCmd_givecoins(struct ScriptContext *ctx)
     u16 coins = VarGet(ScriptReadHalfword(ctx));
 
     if (GiveCoins(coins) == TRUE)
-        gScriptResult = 0;
+        gSpecialVar_ScriptResult = 0;
     else
-        gScriptResult = 1;
+        gSpecialVar_ScriptResult = 1;
     return FALSE;
 }
 
@@ -2296,9 +2296,9 @@ bool8 ScrCmd_takecoins(struct ScriptContext *ctx)
     u16 coins = VarGet(ScriptReadHalfword(ctx));
 
     if (TakeCoins(coins) == TRUE)
-        gScriptResult = 0;
+        gSpecialVar_ScriptResult = 0;
     else
-        gScriptResult = 1;
+        gSpecialVar_ScriptResult = 1;
     return FALSE;
 }
 
@@ -2367,7 +2367,7 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
 {
     u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
 
-    gScriptResult = GetMonData(&gPlayerParty[partyIndex], MON_DATA_OBEDIENCE, NULL);
+    gSpecialVar_ScriptResult = GetMonData(&gPlayerParty[partyIndex], MON_DATA_OBEDIENCE, NULL);
     return FALSE;
 }
 
diff --git a/src/start_menu.c b/src/start_menu.c
index 37331a922..f45fd8626 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -74,12 +74,12 @@ void AddStartMenuAction(u8 action)
 
 static void BuildStartMenuActions_Normal(void)
 {
-    if (FlagGet(SYS_POKEDEX_GET) == TRUE)
+    if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKEDEX);
-    if (FlagGet(SYS_POKEMON_GET) == TRUE)
+    if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKEMON);
     AddStartMenuAction(MENU_ACTION_BAG);
-    if (FlagGet(SYS_POKENAV_GET) == TRUE)
+    if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKENAV);
     AddStartMenuAction(MENU_ACTION_PLAYER);
     AddStartMenuAction(MENU_ACTION_SAVE);
@@ -102,7 +102,7 @@ static void BuildStartMenuActions_LinkMode(void)
 {
     AddStartMenuAction(MENU_ACTION_POKEMON);
     AddStartMenuAction(MENU_ACTION_BAG);
-    if (FlagGet(SYS_POKENAV_GET) == TRUE)
+    if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKENAV);
     AddStartMenuAction(MENU_ACTION_PLAYER_LINK);
     AddStartMenuAction(MENU_ACTION_OPTION);
@@ -113,7 +113,7 @@ static void BuildStartMenuActions_UnionRoom(void)
 {
     AddStartMenuAction(MENU_ACTION_POKEMON);
     AddStartMenuAction(MENU_ACTION_BAG);
-    if (FlagGet(SYS_POKENAV_GET) == TRUE)
+    if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKENAV);
     AddStartMenuAction(MENU_ACTION_PLAYER);
     AddStartMenuAction(MENU_ACTION_OPTION);
diff --git a/src/tv.c b/src/tv.c
index 3c822b394..3601f7a10 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -214,23 +214,23 @@ const struct {
 
 // TODO: Figure out what these are, and define constants in include/flags.h
 const u16 sGoldSymbolFlags[] = {
-    SYS_TOWER_GOLD,
-    SYS_DOME_GOLD,
-    SYS_PALACE_GOLD,
-    SYS_ARENA_GOLD,
-    SYS_FACTORY_GOLD,
-    SYS_PIKE_GOLD,
-    SYS_PYRAMID_GOLD
+    FLAG_SYS_TOWER_GOLD,
+    FLAG_SYS_DOME_GOLD,
+    FLAG_SYS_PALACE_GOLD,
+    FLAG_SYS_ARENA_GOLD,
+    FLAG_SYS_FACTORY_GOLD,
+    FLAG_SYS_PIKE_GOLD,
+    FLAG_SYS_PYRAMID_GOLD
 };
 
 const u16 sSilverSymbolFlags[] = {
-    SYS_TOWER_SILVER,
-    SYS_DOME_SILVER,
-    SYS_PALACE_SILVER,
-    SYS_ARENA_SILVER,
-    SYS_FACTORY_SILVER,
-    SYS_PIKE_SILVER,
-    SYS_PYRAMID_SILVER
+    FLAG_SYS_TOWER_SILVER,
+    FLAG_SYS_DOME_SILVER,
+    FLAG_SYS_PALACE_SILVER,
+    FLAG_SYS_ARENA_SILVER,
+    FLAG_SYS_FACTORY_SILVER,
+    FLAG_SYS_PIKE_SILVER,
+    FLAG_SYS_PYRAMID_SILVER
 };
 
 // TODO: Figure out what these are, and define constants in include/vars.h
@@ -823,7 +823,7 @@ u8 FindAnyTVShowOnTheAir(void)
 
 void UpdateTVScreensOnMap(int width, int height)
 {
-    FlagSet(SYS_TV_WATCH);
+    FlagSet(FLAG_SYS_TV_WATCH);
     switch (CheckForBigMovieOrEmergencyNewsOnTV())
     {
         case 1:
@@ -836,9 +836,9 @@ void UpdateTVScreensOnMap(int width, int height)
             {
                 SetTVMetatilesOnMap(width, height, 0x3);
             }
-            else if (FlagGet(SYS_TV_START) && (FindAnyTVShowOnTheAir() != 0xff || FindAnyTVNewsOnTheAir() != 0xff || IsTVShowInSearchOfTrainersAiring()))
+            else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != 0xff || FindAnyTVNewsOnTheAir() != 0xff || IsTVShowInSearchOfTrainersAiring()))
             {
-                FlagClear(SYS_TV_WATCH);
+                FlagClear(FLAG_SYS_TV_WATCH);
                 SetTVMetatilesOnMap(width, height, 0x3);
             }
             break;
@@ -1288,7 +1288,7 @@ void PutBattleUpdateOnTheAir(u8 a0, u16 a1, u16 a2, u16 a3)
     if (sCurTVShowSlot != -1)
     {
         FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BATTLE_UPDATE);
-        if (gScriptResult != 1)
+        if (gSpecialVar_ScriptResult != 1)
         {
             show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
             show->battleUpdate.kind = TVSHOW_BATTLE_UPDATE;
@@ -1337,7 +1337,7 @@ bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unus
         return FALSE;
     }
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_3_CHEERS_FOR_POKEBLOCKS);
-    if (gScriptResult == 1)
+    if (gSpecialVar_ScriptResult == 1)
     {
         return FALSE;
     }
@@ -1606,7 +1606,7 @@ void PutNameRaterShowOnTheAir(void)
     TVShow *show;
 
     InterviewBefore_NameRater();
-    if (gScriptResult != 1)
+    if (gSpecialVar_ScriptResult != 1)
     {
         GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
         if (StringLength(gSaveBlock2Ptr->playerName) > 1 && StringLength(gStringVar1) > 1)
@@ -1653,7 +1653,7 @@ void PutLilycoveContestLadyShowOnTheAir(void)
     TVShow *show;
 
     sub_80EFA88();
-    if (gScriptResult != TRUE)
+    if (gSpecialVar_ScriptResult != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         sub_818E848(&show->contestLiveUpdates2.language);
@@ -1731,7 +1731,7 @@ void sub_80ED718(void)
     u16 outbreakIdx;
     TVShow *show;
 
-    if (FlagGet(SYS_GAME_CLEAR))
+    if (FlagGet(FLAG_SYS_GAME_CLEAR))
     {
         for (i = 0; i < 24; i ++)
         {
@@ -1943,7 +1943,7 @@ void sub_80EDB44(void)
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         show->rivalTrainer.kind = TVSHOW_TODAYS_RIVAL_TRAINER;
         show->rivalTrainer.active = FALSE;
-        for (i = BADGE01_GET, nBadges = 0; i < BADGE01_GET + 8; i ++)
+        for (i = FLAG_BADGE01_GET, nBadges = 0; i < FLAG_BADGE01_GET + 8; i ++)
         {
             if (FlagGet(i))
             {
@@ -2613,7 +2613,7 @@ bool8 sub_80EE7C0(void)
         return TRUE;
     }
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_FAN_CLUB_SPECIAL);
-    if (gScriptResult == TRUE)
+    if (gSpecialVar_ScriptResult == TRUE)
     {
         return TRUE;
     }
@@ -2814,7 +2814,7 @@ void sub_80EED88(void)
 {
     u8 newsKind;
 
-    if (FlagGet(SYS_GAME_CLEAR))
+    if (FlagGet(FLAG_SYS_GAME_CLEAR))
     {
         sCurTVShowSlot = sub_80EEE30(gSaveBlock1Ptr->pokeNews);
         if (sCurTVShowSlot != -1 && rbernoulli(1, 100) != TRUE)
@@ -2905,7 +2905,7 @@ void DoPokeNews(void)
     i = FindAnyTVNewsOnTheAir();
     if (i == 0xFF)
     {
-        gScriptResult = FALSE;
+        gSpecialVar_ScriptResult = FALSE;
     }
     else
     {
@@ -2928,7 +2928,7 @@ void DoPokeNews(void)
             gSaveBlock1Ptr->pokeNews[i].state = 0;
             ShowFieldMessage(sPokeNewsTextGroup_Upcoming[gSaveBlock1Ptr->pokeNews[i].kind]);
         }
-        gScriptResult = TRUE;
+        gSpecialVar_ScriptResult = TRUE;
     }
 }
 
@@ -2959,7 +2959,7 @@ bool8 IsPriceDiscounted(u8 newsKind)
     switch (newsKind)
     {
         case POKENEWS_SLATEPORT:
-            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_SLATEPORT_CITY && gSaveBlock1Ptr->location.mapNum == MAP_ID_SLATEPORT_CITY && gScriptLastTalked == 25)
+            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_SLATEPORT_CITY && gSaveBlock1Ptr->location.mapNum == MAP_ID_SLATEPORT_CITY && gSpecialVar_ScriptLastTalked == 25)
             {
                 return TRUE;
             }
@@ -3005,7 +3005,7 @@ void sub_80EF120(u16 days)
             }
             else
             {
-                if (gSaveBlock1Ptr->pokeNews[i].state == 0 && FlagGet(SYS_GAME_CLEAR) == TRUE)
+                if (gSaveBlock1Ptr->pokeNews[i].state == 0 && FlagGet(FLAG_SYS_GAME_CLEAR) == TRUE)
                 {
                     gSaveBlock1Ptr->pokeNews[i].state = 1;
                 }
@@ -3189,7 +3189,7 @@ void FindActiveBroadcastByShowType_SetScriptResult(u8 kind)
         {
             if (gSaveBlock1Ptr->tvShows[i].common.active == TRUE)
             {
-                gScriptResult = TRUE;
+                gSpecialVar_ScriptResult = TRUE;
             }
             else
             {
@@ -3205,7 +3205,7 @@ void FindActiveBroadcastByShowType_SetScriptResult(u8 kind)
 
 void InterviewBefore(void)
 {
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     switch (gSpecialVar_0x8005)
     {
         case TVSHOW_FAN_CLUB_LETTER:
@@ -3244,7 +3244,7 @@ void InterviewBefore(void)
 void InterviewBefore_FanClubLetter(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_FAN_CLUB_LETTER);
-    if (!gScriptResult)
+    if (!gSpecialVar_ScriptResult)
     {
         StringCopy(gStringVar1, gSpeciesNames[GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_SPECIES, NULL)]);
         InitializeEasyChatWordArray(gSaveBlock1Ptr->tvShows[sCurTVShowSlot].fanclubLetter.words, 6);
@@ -3254,7 +3254,7 @@ void InterviewBefore_FanClubLetter(void)
 void InterviewBefore_RecentHappenings(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_RECENT_HAPPENINGS);
-    if (!gScriptResult)
+    if (!gSpecialVar_ScriptResult)
     {
         InitializeEasyChatWordArray(gSaveBlock1Ptr->tvShows[sCurTVShowSlot].recentHappenings.words, 6);
     }
@@ -3263,7 +3263,7 @@ void InterviewBefore_RecentHappenings(void)
 void InterviewBefore_PkmnFanClubOpinions(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_PKMN_FAN_CLUB_OPINIONS);
-    if (!gScriptResult)
+    if (!gSpecialVar_ScriptResult)
     {
         StringCopy(gStringVar1, gSpeciesNames[GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_SPECIES, NULL)]);
         GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_NICKNAME, gStringVar2);
@@ -3274,7 +3274,7 @@ void InterviewBefore_PkmnFanClubOpinions(void)
 
 void InterviewBefore_Dummy(void)
 {
-    gScriptResult = TRUE;
+    gSpecialVar_ScriptResult = TRUE;
 }
 
 void InterviewBefore_NameRater(void)
@@ -3285,7 +3285,7 @@ void InterviewBefore_NameRater(void)
 void InterviewBefore_BravoTrainerPkmnProfile(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE);
-    if (!gScriptResult)
+    if (!gSpecialVar_ScriptResult)
     {
         InitializeEasyChatWordArray(gSaveBlock1Ptr->tvShows[sCurTVShowSlot].bravoTrainer.words, 2);
     }
@@ -3304,7 +3304,7 @@ void InterviewBefore_3CheersForPokeblocks(void)
 void InterviewBefore_BravoTrainerBTProfile(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE);
-    if (!gScriptResult)
+    if (!gSpecialVar_ScriptResult)
     {
         InitializeEasyChatWordArray(gSaveBlock1Ptr->tvShows[sCurTVShowSlot].bravoTrainerTower.words, 1);
     }
@@ -3313,7 +3313,7 @@ void InterviewBefore_BravoTrainerBTProfile(void)
 void InterviewBefore_FanClubSpecial(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_FAN_CLUB_SPECIAL);
-    if (!gScriptResult)
+    if (!gSpecialVar_ScriptResult)
     {
         InitializeEasyChatWordArray(gSaveBlock1Ptr->tvShows[sCurTVShowSlot].fanClubSpecial.words, 1);
     }
@@ -3429,11 +3429,11 @@ void sub_80EFA88(void)
     gSpecialVar_0x8006 = sCurTVShowSlot;
     if (sCurTVShowSlot == -1)
     {
-        gScriptResult = TRUE;
+        gSpecialVar_ScriptResult = TRUE;
     }
     else
     {
-        gScriptResult = FALSE;
+        gSpecialVar_ScriptResult = FALSE;
     }
 }
 
@@ -3636,7 +3636,7 @@ void ChangeBoxPokemonNickname(void)
 {
     struct BoxPokemon *boxMon;
 
-    boxMon = GetBoxedMonPtr(gSpecialVar_0x8012, gSpecialVar_0x8013);
+    boxMon = GetBoxedMonPtr(gSpecialVar_MonBoxId, gSpecialVar_MonBoxPos);
     GetBoxMonData(boxMon, MON_DATA_NICKNAME, gStringVar3);
     GetBoxMonData(boxMon, MON_DATA_NICKNAME, gStringVar2);
     DoNamingScreen(3, gStringVar2, GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL), GetBoxMonGender(boxMon), GetBoxMonData(boxMon, MON_DATA_PERSONALITY, NULL), ChangeBoxPokemonNickname_CB);
@@ -3644,7 +3644,7 @@ void ChangeBoxPokemonNickname(void)
 
 void ChangeBoxPokemonNickname_CB(void)
 {
-    SetBoxMonNickFromAnyBox(gSpecialVar_0x8012, gSpecialVar_0x8013, gStringVar2);
+    SetBoxMonNickFromAnyBox(gSpecialVar_MonBoxId, gSpecialVar_MonBoxPos, gStringVar2);
     c2_exit_to_overworld_1_continue_scripts_restart_music();
 }
 
@@ -3658,11 +3658,11 @@ void TV_CheckMonOTIDEqualsPlayerID(void)
 {
     if (GetPlayerIDAsU32() == GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_ID, NULL))
     {
-        gScriptResult = FALSE;
+        gSpecialVar_ScriptResult = FALSE;
     }
     else
     {
-        gScriptResult = TRUE;
+        gSpecialVar_ScriptResult = TRUE;
     }
 }
 
@@ -3712,11 +3712,11 @@ u8 CheckForBigMovieOrEmergencyNewsOnTV(void)
             return 0;
         }
     }
-    if (FlagGet(SYS_TV_LATI) == TRUE)
+    if (FlagGet(FLAG_SYS_TV_LATI) == TRUE)
     {
         return 1;
     }
-    if (FlagGet(SYS_TV_HOME) == TRUE)
+    if (FlagGet(FLAG_SYS_TV_HOME) == TRUE)
     {
         return 2;
     }
@@ -4561,7 +4561,7 @@ void sub_80F0B64(void)
 {
     u16 i;
 
-    if (FlagGet(SYS_GAME_CLEAR) != TRUE)
+    if (FlagGet(FLAG_SYS_GAME_CLEAR) != TRUE)
     {
         for (i = 0; i < 24; i ++)
         {
@@ -4736,7 +4736,7 @@ void sub_80F0F24(void)
 {
     u8 i;
 
-    if (FlagGet(SYS_GAME_CLEAR) != TRUE)
+    if (FlagGet(FLAG_SYS_GAME_CLEAR) != TRUE)
     {
         for (i = 0; i < 16; i ++)
         {
@@ -5108,7 +5108,7 @@ void DoTVShowBravoTrainerPokemonProfile(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5180,7 +5180,7 @@ void DoTVShowBravoTrainerBattleTower(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch(state)
     {
@@ -5277,7 +5277,7 @@ void DoTVShowTodaysSmartShopper(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch(state)
     {
@@ -5400,7 +5400,7 @@ void DoTVShowTheNameRaterShow(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5498,7 +5498,7 @@ void DoTVShowPokemonTodaySuccessfulCapture(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5576,7 +5576,7 @@ void DoTVShowPokemonTodayFailedCapture(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5630,7 +5630,7 @@ void DoTVShowPokemonFanClubLetter(void)
     u16 rval;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5683,7 +5683,7 @@ void DoTVShowRecentHappenings(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5718,7 +5718,7 @@ void DoTVShowPokemonFanClubOpinions(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5768,7 +5768,7 @@ void DoTVShowPokemonContestLiveUpdates(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6115,7 +6115,7 @@ void DoTVShowPokemonBattleUpdate(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6187,7 +6187,7 @@ void DoTVShow3CheersForPokeblocks(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6288,7 +6288,7 @@ void DoTVShowInSearchOfTrainers(void)
 {
     u8 state;
 
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6344,7 +6344,7 @@ void DoTVShowInSearchOfTrainers(void)
             CopyEasyChatWord(gStringVar1, gSaveBlock1Ptr->gabbyAndTyData.quote[0]);
             StringCopy(gStringVar2, gSpeciesNames[gSaveBlock1Ptr->gabbyAndTyData.mon1]);
             StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1Ptr->gabbyAndTyData.mon2]);
-            gScriptResult = TRUE;
+            gSpecialVar_ScriptResult = TRUE;
             sTVShowState = 0;
             TakeTVShowInSearchOfTrainersOffTheAir();
             break;
@@ -6358,7 +6358,7 @@ void DoTVShowPokemonAngler(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     if (show->pokemonAngler.nBites < show->pokemonAngler.nFails)
     {
         sTVShowState = 0;
@@ -6392,7 +6392,7 @@ void DoTVShowTheWorldOfMasters(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6422,7 +6422,7 @@ void DoTVShowTodaysRivalTrainer(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6571,7 +6571,7 @@ void DoTVShowDewfordTrendWatcherNetwork(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6627,7 +6627,7 @@ void DoTVShowHoennTreasureInvestigators(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6671,7 +6671,7 @@ void DoTVShowFindThatGamer(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6745,7 +6745,7 @@ void DoTVShowBreakingNewsTV(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6848,7 +6848,7 @@ void DoTVShowSecretBaseVisit(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6944,7 +6944,7 @@ void DoTVShowPokemonLotteryWinnerFlashReport(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     TVShowConvertInternationalString(gStringVar1, show->lottoWinner.playerName, show->lottoWinner.language);
     if (show->lottoWinner.whichPrize == 0)
@@ -6974,7 +6974,7 @@ void DoTVShowThePokemonBattleSeminar(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7038,7 +7038,7 @@ void DoTVShowTrainerFanClubSpecial(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7104,7 +7104,7 @@ void DoTVShowTrainerFanClub(void)
     u32 playerId;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7191,7 +7191,7 @@ void DoTVShowSpotTheCuties(void)
     u32 playerId;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7296,7 +7296,7 @@ void DoTVShowPokemonNewsBattleFrontier(void)
     u32 playerId;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7445,7 +7445,7 @@ void DoTVShowWhatsNo1InHoennToday(void)
     u32 playerId;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7561,7 +7561,7 @@ void DoTVShowSecretBaseSecrets(void)
     u16 i;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7797,7 +7797,7 @@ void DoTVShowSafariFanClub(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7884,7 +7884,7 @@ void DoTVShowPokemonContestLiveUpdates2(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gScriptResult = FALSE;
+    gSpecialVar_ScriptResult = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7916,7 +7916,7 @@ void DoTVShowPokemonContestLiveUpdates2(void)
 
 void TVShowDone(void)
 {
-    gScriptResult = TRUE;
+    gSpecialVar_ScriptResult = TRUE;
     sTVShowState = 0;
     gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004].common.active = FALSE;
 }
diff --git a/src/walda_phrase.c b/src/walda_phrase.c
index 7e06d1319..c1da86b15 100644
--- a/src/walda_phrase.c
+++ b/src/walda_phrase.c
@@ -98,17 +98,17 @@ u16 TryGetWallpaperWithWaldaPhrase(void)
     u16 backgroundClr, foregroundClr;
     u8 patternId, iconId;
     u16 trainerId = ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId);
-    gScriptResult = TryCalculateWallpaper(&backgroundClr, &foregroundClr, &iconId, &patternId, trainerId, GetWaldaPhrasePtr());
+    gSpecialVar_ScriptResult = TryCalculateWallpaper(&backgroundClr, &foregroundClr, &iconId, &patternId, trainerId, GetWaldaPhrasePtr());
 
-    if (gScriptResult)
+    if (gSpecialVar_ScriptResult)
     {
         SetWaldaWallpaperPatternId(patternId);
         SetWaldaWallpaperIconId(iconId);
         SetWaldaWallpaperColors(backgroundClr, foregroundClr);
     }
 
-    SetWaldaWallpaperLockedOrUnlocked(gScriptResult);
-    return (bool8)(gScriptResult);
+    SetWaldaWallpaperLockedOrUnlocked(gSpecialVar_ScriptResult);
+    return (bool8)(gSpecialVar_ScriptResult);
 }
 
 static u8 GetLetterTableId(u8 letter)
-- 
cgit v1.2.3


From 2e40384fa22725de06a5293454b8962ab4de8f4d Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Fri, 10 Nov 2017 18:12:18 -0600
Subject: Extract baseroms from event_scripts

---
 src/battle_2.c                            |   6 +-
 src/battle_controller_link_opponent.c     |   2 +-
 src/battle_controller_link_partner.c      |   2 +-
 src/battle_controller_player.c            |   4 +-
 src/battle_controller_player_partner.c    |   2 +-
 src/battle_controller_recorded_opponent.c |   2 +-
 src/battle_controller_recorded_player.c   |   2 +-
 src/battle_controller_safari.c            |   4 +-
 src/battle_controller_wally.c             |   4 +-
 src/berry.c                               |   8 +--
 src/decoration.c                          |  12 ++--
 src/event_data.c                          |   6 +-
 src/field_map_obj.c                       |   4 +-
 src/item.c                                |   4 +-
 src/lilycove_lady.c                       |  14 ++--
 src/lottery_corner.c                      |   6 +-
 src/new_game.c                            |   4 +-
 src/pokemon_size_record.c                 |   8 +--
 src/safari_zone.c                         |  36 +++++-----
 src/scrcmd.c                              |  56 +++++++--------
 src/secret_base.c                         |  62 ++++++++--------
 src/tv.c                                  | 114 +++++++++++++++---------------
 src/walda_phrase.c                        |   8 +--
 23 files changed, 185 insertions(+), 185 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 289425ee2..c60b99e13 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -1611,7 +1611,7 @@ void BattleMainCB2(void)
 
     if (gMain.heldKeys & B_BUTTON && gBattleTypeFlags & BATTLE_TYPE_RECORDED && sub_8186450())
     {
-        gSpecialVar_ScriptResult = gBattleOutcome = BATTLE_PLAYER_TELEPORTED;
+        gSpecialVar_Result = gBattleOutcome = BATTLE_PLAYER_TELEPORTED;
         ResetPaletteFadeControl();
         BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
         SetMainCallback2(CB2_QuitRecordedBattle);
@@ -4750,7 +4750,7 @@ static void HandleEndTurn_BattleWon(void)
 
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
     {
-        gSpecialVar_ScriptResult = gBattleOutcome;
+        gSpecialVar_Result = gBattleOutcome;
         gBattleTextBuff1[0] = gBattleOutcome;
         gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
         gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
@@ -5012,7 +5012,7 @@ static void ReturnFromBattleToOverworld(void)
     if (gBattleTypeFlags & BATTLE_TYPE_LINK && gReceivedRemoteLinkPlayers != 0)
         return;
 
-    gSpecialVar_ScriptResult = gBattleOutcome;
+    gSpecialVar_Result = gBattleOutcome;
     gMain.inBattle = 0;
     gMain.callback1 = gPreBattleCallback1;
 
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 968f6d49f..17e244500 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -36,7 +36,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 4a70a4dc1..a831b98cf 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -36,7 +36,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 10d361cb9..4fdc2e4a0 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -46,7 +46,7 @@ extern struct MusicPlayerInfo gMPlay_BGM;
 extern u16 gPartnerTrainerId;
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gUnknown_0203CEE8;
 extern u8 gUnknown_0203CEE9;
 extern u8 gUnknown_0203CF00[];
@@ -1416,7 +1416,7 @@ static void CompleteWhenChoseItem(void)
 {
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
-        EmitOneReturnValue(1, gScriptItemId);
+        EmitOneReturnValue(1, gSpecialVar_ItemId);
         PlayerBufferExecCompleted();
     }
 }
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 34fd8a3eb..867bde5e4 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -35,7 +35,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 0dc7631ce..ab086cc80 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -37,7 +37,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index a3343a391..246379378 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -36,7 +36,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 0c5b698cf..49c98915e 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -33,7 +33,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
@@ -305,7 +305,7 @@ static void CompleteWhenChosePokeblock(void)
 {
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
-        EmitOneReturnValue(1, gScriptItemId);
+        EmitOneReturnValue(1, gSpecialVar_ItemId);
         SafariBufferExecCompleted();
     }
 }
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index c2addd30c..2844c76c4 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -45,7 +45,7 @@ extern struct MusicPlayerInfo gMPlay_BGM;
 extern u16 gPartnerTrainerId;
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleOutcome;
@@ -314,7 +314,7 @@ static void CompleteOnChosenItem(void)
 {
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
-        EmitOneReturnValue(1, gScriptItemId);
+        EmitOneReturnValue(1, gSpecialVar_ItemId);
         WallyBufferExecCompleted();
     }
 }
diff --git a/src/berry.c b/src/berry.c
index 2d3efa9c6..6d1fd17a1 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -14,7 +14,7 @@ extern void CB2_ChooseBerry(void);
 extern const u8* GetFieldObjectScriptPointerForComparison(void);
 extern bool8 sub_8092E9C(u8, u8, u8);
 
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 
 extern const u8 BerryTreeScript[];
 
@@ -1169,7 +1169,7 @@ void FieldObjectInteractionGetBerryTreeData(void)
     id = FieldObjectGetBerryTreeId(gSelectedMapObject);
     berry = GetBerryTypeByBerryTreeId(id);
     ResetBerryTreeSparkleFlag(id);
-    unk = gSpecialVar_ScriptLastTalked;
+    unk = gSpecialVar_LastTalked;
     num = gSaveBlock1Ptr->location.mapNum;
     group = gSaveBlock1Ptr->location.mapGroup;
     if (sub_8092E9C(unk, num, group))
@@ -1202,7 +1202,7 @@ void Bag_ChooseBerry(void)
 
 void FieldObjectInteractionPlantBerryTree(void)
 {
-    u8 berry = ItemIdToBerryType(gScriptItemId);
+    u8 berry = ItemIdToBerryType(gSpecialVar_ItemId);
 
     PlantBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject), berry, 1, TRUE);
     FieldObjectInteractionGetBerryTreeData();
@@ -1219,7 +1219,7 @@ void FieldObjectInteractionPickBerryTree(void)
 void FieldObjectInteractionRemoveBerryTree(void)
 {
     RemoveBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject));
-    sub_8092EF0(gSpecialVar_ScriptLastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
 }
 
 u8 PlayerHasBerries(void)
diff --git a/src/decoration.c b/src/decoration.c
index 5396a125c..37cabf652 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1600,7 +1600,7 @@ void sub_81289F0(u8 taskId)
     {
         sCurDecorMapX = gTasks[taskId].data[0] - 7;
         sCurDecorMapY = gTasks[taskId].data[1] - 7;
-        ScriptContext1_SetupScript(gUnknown_08275D1F);
+        ScriptContext1_SetupScript(EventScript_275D1F);
     }
     gSprites[sDecor_CameraSpriteObjectIdx1].pos1.y += 2;
     if (gMapHeader.regionMapSectionId == REGION_MAP_SECRET_BASE)
@@ -1700,7 +1700,7 @@ void sub_8128C64(u8 taskId)
             data[2] ++;
             break;
         case 1:
-            ScriptContext1_SetupScript(gUnknown_08275D0C);
+            ScriptContext1_SetupScript(EventScript_275D0C);
             data[2] ++;
             break;
         case 2:
@@ -2133,10 +2133,10 @@ void sub_8129708(void)
     u16 i;
 
     gSpecialVar_0x8005 = 0;
-    gSpecialVar_ScriptResult = 0;
+    gSpecialVar_Result = 0;
     if (gSpecialVar_0x8004 == sCurDecorSelectedInRearrangement)
     {
-        gSpecialVar_ScriptResult = 1;
+        gSpecialVar_Result = 1;
     }
     else if (gDecorations[gUnknown_0203A17C.items[sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx]].permission == DECORPERM_SOLID_MAT)
     {
@@ -2206,7 +2206,7 @@ void sub_81298EC(u8 taskId)
         case 1:
             if (!gPaletteFade.active) {
                 DrawWholeMapView();
-                ScriptContext1_SetupScript(gUnknown_08275D2E);
+                ScriptContext1_SetupScript(EventScript_275D2E);
                 sub_8197434(0, 1);
                 gTasks[taskId].data[2] = 2;
             }
@@ -2691,7 +2691,7 @@ void sub_812A2C4(u8 taskId)
             data[2] ++;
             break;
         case 1:
-            ScriptContext1_SetupScript(gUnknown_08275D0C);
+            ScriptContext1_SetupScript(EventScript_275D0C);
             data[2] ++;
             break;
         case 2:
diff --git a/src/event_data.c b/src/event_data.c
index 88cf4dedc..e3742a147 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -17,9 +17,9 @@ EWRAM_DATA u16 gSpecialVar_0x8008 = 0;
 EWRAM_DATA u16 gSpecialVar_0x8009 = 0;
 EWRAM_DATA u16 gSpecialVar_0x800A = 0;
 EWRAM_DATA u16 gSpecialVar_0x800B = 0;
-EWRAM_DATA u16 gSpecialVar_ScriptResult = 0;
-EWRAM_DATA u16 gSpecialVar_ScriptLastTalked = 0;
-EWRAM_DATA u16 gSpecialVar_ScriptFacing = 0;
+EWRAM_DATA u16 gSpecialVar_Result = 0;
+EWRAM_DATA u16 gSpecialVar_LastTalked = 0;
+EWRAM_DATA u16 gSpecialVar_Facing = 0;
 EWRAM_DATA u16 gSpecialVar_MonBoxId = 0;
 EWRAM_DATA u16 gSpecialVar_MonBoxPos = 0;
 EWRAM_DATA u16 gSpecialVar_0x8014 = 0;
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 9932563f2..dfdeb63a3 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1765,10 +1765,10 @@ void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat)
         switch (decorCat)
         {
             case DECORCAT_DOLL:
-                sub_808F228(&gMapObjects[mapObjectId], gUnknown_082766A2);
+                sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A2);
                 break;
             case DECORCAT_CUSHION:
-                sub_808F228(&gMapObjects[mapObjectId], gUnknown_082766A6);
+                sub_808F228(&gMapObjects[mapObjectId], EventScript_2766A6);
                 break;
         }
     }
diff --git a/src/item.c b/src/item.c
index a684ea6f0..32347623e 100644
--- a/src/item.c
+++ b/src/item.c
@@ -165,11 +165,11 @@ bool8 HasAtLeastOneBerry(void)
     {
         if (CheckBagHasItem(i, 1) == TRUE)
         {
-            gSpecialVar_ScriptResult = 1;
+            gSpecialVar_Result = 1;
             return TRUE;
         }
     }
-    gSpecialVar_ScriptResult = 0;
+    gSpecialVar_Result = 0;
     return FALSE;
 }
 
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index f7ec5dbaf..62171e475 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -226,7 +226,7 @@ static EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL;
 static EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;
 static EWRAM_DATA struct LilycoveLadyContest *gUnknown_0203CD6C = NULL;
 
-extern EWRAM_DATA u16 gScriptItemId;
+extern EWRAM_DATA u16 gSpecialVar_ItemId;
 
 u8 GetLilycoveLadyId(void)
 {
@@ -242,11 +242,11 @@ void sub_818D9C0(void)
     {
         lilycoveLady = &gSaveBlock1Ptr->lilycoveLady;
         VarSet(VAR_0x4011, gUnknown_0860B074[lilycoveLady->contest.category]);
-        gSpecialVar_ScriptResult = TRUE;
+        gSpecialVar_Result = TRUE;
     }
     else
     {
-        gSpecialVar_ScriptResult = FALSE;
+        gSpecialVar_Result = FALSE;
     }
 }
 
@@ -308,7 +308,7 @@ void SetLilycoveLadyRandomly(void)
 
 void sub_818DAEC(void)
 {
-    gSpecialVar_ScriptResult = GetLilycoveLadyId();
+    gSpecialVar_Result = GetLilycoveLadyId();
 }
 
 static u8 sub_818DB04(const u16 *data)
@@ -459,7 +459,7 @@ static bool8 sub_818DD84(u16 itemId)
 
 bool8 sub_818DE44(void)
 {
-    return sub_818DD84(gScriptItemId);
+    return sub_818DD84(gSpecialVar_ItemId);
 }
 
 bool8 sub_818DE5C(void)
@@ -845,7 +845,7 @@ void sub_818E47C(void)
 
 void sub_818E490(void)
 {
-    RemoveBagItem(gScriptItemId, 1);
+    RemoveBagItem(gSpecialVar_ItemId, 1);
 }
 
 void sub_818E4A4(void)
@@ -853,7 +853,7 @@ void sub_818E4A4(void)
     u8 i;
 
     gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    gUnknown_0203CD68->itemId = gScriptItemId;
+    gUnknown_0203CD68->itemId = gSpecialVar_ItemId;
     for (i = 0; i < 4; i ++)
     {
         gUnknown_0203CD68->playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index 7c8c32189..211b78f19 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -42,7 +42,7 @@ void SetRandomLotteryNumber(u16 i)
 void RetrieveLotteryNumber(void)
 {
     u16 lottoNumber = GetLotteryNumber();
-    gSpecialVar_ScriptResult = lottoNumber;
+    gSpecialVar_Result = lottoNumber;
 }
 
 void PickLotteryCornerTicket(void)
@@ -66,7 +66,7 @@ void PickLotteryCornerTicket(void)
             if (!GetMonData(pkmn, MON_DATA_IS_EGG))
             {
                 u32 otId = GetMonData(pkmn, MON_DATA_OT_ID);
-                u8 numMatchingDigits = GetMatchingDigits(gSpecialVar_ScriptResult, otId);
+                u8 numMatchingDigits = GetMatchingDigits(gSpecialVar_Result, otId);
 
                 if (numMatchingDigits > gSpecialVar_0x8004 && numMatchingDigits > 1)
                 {
@@ -90,7 +90,7 @@ void PickLotteryCornerTicket(void)
             !GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_IS_EGG))
             {
                 u32 otId = GetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_OT_ID);
-                u8 numMatchingDigits = GetMatchingDigits(gSpecialVar_ScriptResult, otId);
+                u8 numMatchingDigits = GetMatchingDigits(gSpecialVar_Result, otId);
 
                 if (numMatchingDigits > gSpecialVar_0x8004 && numMatchingDigits > 1)
                 {
diff --git a/src/new_game.c b/src/new_game.c
index d0666dd71..75e80dc8e 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -59,7 +59,7 @@ extern void ResetContestLinkResults(void);
 extern void ResetPokeJumpResults(void);
 extern void SetBerryPowder(u32* powder, u32 newValue);
 
-extern u8 gUnknown_082715DE[];
+extern u8 EventScript_2715DE[];
 
 void WriteUnalignedWord(u32 var, u8 *dataPtr)
 {
@@ -198,7 +198,7 @@ void NewGameInitData(void)
     ResetFanClub();
     ResetLotteryCorner();
     WarpToTruck();
-    ScriptContext2_RunNewScript(gUnknown_082715DE);
+    ScriptContext2_RunNewScript(EventScript_2715DE);
     ResetMiniGamesResults();
     copy_strings_to_sav1();
 	SetLilycoveLady();
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index e138b86c8..ec0103bc7 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -109,13 +109,13 @@ static void FormatMonSizeRecord(u8 *string, u32 size)
 
 static u8 CompareMonSize(u16 species, u16 *sizeRecord)
 {
-    if (gSpecialVar_ScriptResult == 0xFF)
+    if (gSpecialVar_Result == 0xFF)
     {
         return 0;
     }
     else
     {
-        struct Pokemon *pkmn = &gPlayerParty[gSpecialVar_ScriptResult];
+        struct Pokemon *pkmn = &gPlayerParty[gSpecialVar_Result];
 
         if (GetMonData(pkmn, MON_DATA_IS_EGG) == TRUE || GetMonData(pkmn, MON_DATA_SPECIES) != species)
         {
@@ -173,7 +173,7 @@ void CompareSeedotSize(void)
 {
     u16 *sizeRecord = GetVarPointer(VAR_SEEDOT_SIZE_RECORD);
 
-    gSpecialVar_ScriptResult = CompareMonSize(SPECIES_SEEDOT, sizeRecord);
+    gSpecialVar_Result = CompareMonSize(SPECIES_SEEDOT, sizeRecord);
 }
 
 void InitLotadSizeRecord(void)
@@ -192,7 +192,7 @@ void CompareLotadSize(void)
 {
     u16 *sizeRecord = GetVarPointer(VAR_LOTAD_SIZE_RECORD);
 
-    gSpecialVar_ScriptResult = CompareMonSize(SPECIES_LOTAD, sizeRecord);
+    gSpecialVar_Result = CompareMonSize(SPECIES_LOTAD, sizeRecord);
 }
 
 void GiveGiftRibbonToParty(u8 index, u8 ribbonId)
diff --git a/src/safari_zone.c b/src/safari_zone.c
index a493dd13f..d3d40af28 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -20,10 +20,10 @@ struct PokeblockFeeder
 extern u8 gBattleOutcome;
 extern void* gFieldCallback;
 
-extern u8 gUnknown_082A4B8A[];
-extern u8 gUnknown_082A4B6F[];
-extern u8 gUnknown_082A4B4C[];
-extern u8 gUnknown_082A4B9B[];
+extern u8 EventScript_2A4B8A[];
+extern u8 EventScript_2A4B6F[];
+extern u8 EventScript_2A4B4C[];
+extern u8 EventScript_2A4B9B[];
 extern const u8* const gPokeblockNames[];
 
 extern void sub_80EE44C(u8, u8);
@@ -94,7 +94,7 @@ bool8 SafariZoneTakeStep(void)
     sSafariZoneStepCounter--;
     if (sSafariZoneStepCounter == 0)
     {
-        ScriptContext1_SetupScript(gUnknown_082A4B8A);
+        ScriptContext1_SetupScript(EventScript_2A4B8A);
         return TRUE;
     }
     return FALSE;
@@ -102,7 +102,7 @@ bool8 SafariZoneTakeStep(void)
 
 void SafariZoneRetirePrompt(void)
 {
-    ScriptContext1_SetupScript(gUnknown_082A4B6F);
+    ScriptContext1_SetupScript(EventScript_2A4B6F);
 }
 
 void sub_80FC190(void)
@@ -116,14 +116,14 @@ void sub_80FC190(void)
     }
     else if (gBattleOutcome == BATTLE_SAFARI_OUT_OF_BALLS)
     {
-        ScriptContext2_RunNewScript(gUnknown_082A4B4C);
+        ScriptContext2_RunNewScript(EventScript_2A4B4C);
         warp_in();
         gFieldCallback = sub_80AF6F0;
         SetMainCallback2(c2_load_new_map);
     }
     else if (gBattleOutcome == BATTLE_CAUGHT)
     {
-        ScriptContext1_SetupScript(gUnknown_082A4B9B);
+        ScriptContext1_SetupScript(EventScript_2A4B9B);
         ScriptContext1_Stop();
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
     }
@@ -152,13 +152,13 @@ void GetPokeblockFeederInFront(void)
          && sPokeblockFeeders[i].x == x
          && sPokeblockFeeders[i].y == y)
         {
-            gSpecialVar_ScriptResult = i;
+            gSpecialVar_Result = i;
             StringCopy(gStringVar1, gPokeblockNames[sPokeblockFeeders[i].pokeblock.color]);
             return;
         }
     }
 
-    gSpecialVar_ScriptResult = -1;
+    gSpecialVar_Result = -1;
 }
 
 void GetPokeblockFeederWithinRange(void)
@@ -181,13 +181,13 @@ void GetPokeblockFeederWithinRange(void)
                 y *= -1;
             if ((x + y) <= 5)
             {
-                gSpecialVar_ScriptResult = i;
+                gSpecialVar_Result = i;
                 return;
             }
         }
     }
 
-    gSpecialVar_ScriptResult = -1;
+    gSpecialVar_Result = -1;
 }
 
 // unused
@@ -195,20 +195,20 @@ struct Pokeblock *SafariZoneGetPokeblockInFront(void)
 {
     GetPokeblockFeederInFront();
 
-    if (gSpecialVar_ScriptResult == 0xFFFF)
+    if (gSpecialVar_Result == 0xFFFF)
         return NULL;
     else
-        return &sPokeblockFeeders[gSpecialVar_ScriptResult].pokeblock;
+        return &sPokeblockFeeders[gSpecialVar_Result].pokeblock;
 }
 
 struct Pokeblock *SafariZoneGetActivePokeblock(void)
 {
     GetPokeblockFeederWithinRange();
 
-    if (gSpecialVar_ScriptResult == 0xFFFF)
+    if (gSpecialVar_Result == 0xFFFF)
         return NULL;
     else
-        return &sPokeblockFeeders[gSpecialVar_ScriptResult].pokeblock;
+        return &sPokeblockFeeders[gSpecialVar_Result].pokeblock;
 }
 
 void SafariZoneActivatePokeblockFeeder(u8 pkblId)
@@ -255,13 +255,13 @@ bool8 GetInFrontFeederPokeblockAndSteps(void)
 {
     GetPokeblockFeederInFront();
 
-    if (gSpecialVar_ScriptResult == 0xFFFF)
+    if (gSpecialVar_Result == 0xFFFF)
     {
         return FALSE;
     }
 
     ConvertIntToDecimalStringN(gStringVar2,
-        sPokeblockFeeders[gSpecialVar_ScriptResult].stepCounter,
+        sPokeblockFeeders[gSpecialVar_Result].stepCounter,
         STR_CONV_MODE_LEADING_ZEROS, 3);
 
     return TRUE;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 4fa88f359..183b9bab5 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -69,9 +69,9 @@ extern u16 gSpecialVar_0x8001;
 extern u16 gSpecialVar_0x8002;
 extern u16 gSpecialVar_0x8004;
 
-extern u16 gSpecialVar_ScriptResult;
+extern u16 gSpecialVar_Result;
 
-extern u16 gScriptContestCategory;
+extern u16 gSpecialVar_ContestCategory;
 
 IWRAM_DATA u8 gUnknown_03000F30;
 
@@ -491,7 +491,7 @@ bool8 ScrCmd_random(struct ScriptContext *ctx)
 {
     u16 max = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = Random() % max;
+    gSpecialVar_Result = Random() % max;
     return FALSE;
 }
 
@@ -500,7 +500,7 @@ bool8 ScrCmd_giveitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = AddBagItem(itemId, (u8)quantity);
+    gSpecialVar_Result = AddBagItem(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -509,7 +509,7 @@ bool8 ScrCmd_takeitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = RemoveBagItem(itemId, (u8)quantity);
+    gSpecialVar_Result = RemoveBagItem(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -518,7 +518,7 @@ bool8 ScrCmd_checkitemspace(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = CheckBagHasSpace(itemId, (u8)quantity);
+    gSpecialVar_Result = CheckBagHasSpace(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -527,7 +527,7 @@ bool8 ScrCmd_checkitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u32 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = CheckBagHasItem(itemId, (u8)quantity);
+    gSpecialVar_Result = CheckBagHasItem(itemId, (u8)quantity);
     return FALSE;
 }
 
@@ -535,7 +535,7 @@ bool8 ScrCmd_checkitemtype(struct ScriptContext *ctx)
 {
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = GetPocketByItemId(itemId);
+    gSpecialVar_Result = GetPocketByItemId(itemId);
     return FALSE;
 }
 
@@ -544,7 +544,7 @@ bool8 ScrCmd_givepcitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u16 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = AddPCItem(itemId, quantity);
+    gSpecialVar_Result = AddPCItem(itemId, quantity);
     return FALSE;
 }
 
@@ -553,7 +553,7 @@ bool8 ScrCmd_checkpcitem(struct ScriptContext *ctx)
     u16 itemId = VarGet(ScriptReadHalfword(ctx));
     u16 quantity = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = CheckPCHasItem(itemId, quantity);
+    gSpecialVar_Result = CheckPCHasItem(itemId, quantity);
     return FALSE;
 }
 
@@ -561,7 +561,7 @@ bool8 ScrCmd_givedecoration(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = DecorationAdd(decorId);
+    gSpecialVar_Result = DecorationAdd(decorId);
     return FALSE;
 }
 
@@ -569,7 +569,7 @@ bool8 ScrCmd_takedecoration(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = DecorationRemove(decorId);
+    gSpecialVar_Result = DecorationRemove(decorId);
     return FALSE;
 }
 
@@ -577,7 +577,7 @@ bool8 ScrCmd_checkdecorspace(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = DecorationCheckSpace(decorId);
+    gSpecialVar_Result = DecorationCheckSpace(decorId);
     return FALSE;
 }
 
@@ -585,7 +585,7 @@ bool8 ScrCmd_checkdecor(struct ScriptContext *ctx)
 {
     u32 decorId = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = CheckHasDecoration(decorId);
+    gSpecialVar_Result = CheckHasDecoration(decorId);
     return FALSE;
 }
 
@@ -909,7 +909,7 @@ bool8 ScrCmd_getplayerxy(struct ScriptContext *ctx)
 
 bool8 ScrCmd_getpartysize(struct ScriptContext *ctx)
 {
-    gSpecialVar_ScriptResult = CalculatePlayerPartyCount();
+    gSpecialVar_Result = CalculatePlayerPartyCount();
     return FALSE;
 }
 
@@ -1835,7 +1835,7 @@ bool8 ScrCmd_givemon(struct ScriptContext *ctx)
     u32 unkParam2 = ScriptReadWord(ctx);
     u8 unkParam3 = ScriptReadByte(ctx);
 
-    gSpecialVar_ScriptResult = ScriptGiveMon(species, level, item, unkParam1, unkParam2, unkParam3);
+    gSpecialVar_Result = ScriptGiveMon(species, level, item, unkParam1, unkParam2, unkParam3);
     return FALSE;
 }
 
@@ -1843,7 +1843,7 @@ bool8 ScrCmd_giveegg(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = ScriptGiveEgg(species);
+    gSpecialVar_Result = ScriptGiveEgg(species);
     return FALSE;
 }
 
@@ -1862,7 +1862,7 @@ bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx)
     u8 i;
     u16 moveId = ScriptReadHalfword(ctx);
 
-    gSpecialVar_ScriptResult = 6;
+    gSpecialVar_Result = 6;
     for (i = 0; i < 6; i++)
     {
         u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES, NULL);
@@ -1871,7 +1871,7 @@ bool8 ScrCmd_checkpartymove(struct ScriptContext *ctx)
         // UB: GetMonData() arguments don't match function definition
         if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) && pokemon_has_move(&gPlayerParty[i], moveId) == TRUE)
         {
-            gSpecialVar_ScriptResult = i;
+            gSpecialVar_Result = i;
             gSpecialVar_0x8004 = species;
             break;
         }
@@ -1905,7 +1905,7 @@ bool8 ScrCmd_checkmoney(struct ScriptContext *ctx)
     u8 ignore = ScriptReadByte(ctx);
 
     if (!ignore)
-        gSpecialVar_ScriptResult = IsEnoughMoney(&gSaveBlock1Ptr->money, amount);
+        gSpecialVar_Result = IsEnoughMoney(&gSaveBlock1Ptr->money, amount);
     return FALSE;
 }
 
@@ -2085,7 +2085,7 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
 {
     u16 value = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = GetPriceReduction(value);
+    gSpecialVar_Result = GetPriceReduction(value);
     return FALSE;
 }
 
@@ -2113,7 +2113,7 @@ bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx)
 
 bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx)
 {
-    sub_80F84C4(gScriptContestCategory);
+    sub_80F84C4(gSpecialVar_ContestCategory);
     ScriptContext1_Stop();
     return TRUE;
 }
@@ -2160,7 +2160,7 @@ bool8 ScrCmd_setrespawn(struct ScriptContext *ctx)
 
 bool8 ScrCmd_checkplayergender(struct ScriptContext *ctx)
 {
-    gSpecialVar_ScriptResult = gSaveBlock2Ptr->playerGender;
+    gSpecialVar_Result = gSaveBlock2Ptr->playerGender;
     return FALSE;
 }
 
@@ -2285,9 +2285,9 @@ bool8 ScrCmd_givecoins(struct ScriptContext *ctx)
     u16 coins = VarGet(ScriptReadHalfword(ctx));
 
     if (GiveCoins(coins) == TRUE)
-        gSpecialVar_ScriptResult = 0;
+        gSpecialVar_Result = 0;
     else
-        gSpecialVar_ScriptResult = 1;
+        gSpecialVar_Result = 1;
     return FALSE;
 }
 
@@ -2296,9 +2296,9 @@ bool8 ScrCmd_takecoins(struct ScriptContext *ctx)
     u16 coins = VarGet(ScriptReadHalfword(ctx));
 
     if (TakeCoins(coins) == TRUE)
-        gSpecialVar_ScriptResult = 0;
+        gSpecialVar_Result = 0;
     else
-        gSpecialVar_ScriptResult = 1;
+        gSpecialVar_Result = 1;
     return FALSE;
 }
 
@@ -2367,7 +2367,7 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
 {
     u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
 
-    gSpecialVar_ScriptResult = GetMonData(&gPlayerParty[partyIndex], MON_DATA_OBEDIENCE, NULL);
+    gSpecialVar_Result = GetMonData(&gPlayerParty[partyIndex], MON_DATA_OBEDIENCE, NULL);
     return FALSE;
 }
 
diff --git a/src/secret_base.c b/src/secret_base.c
index 7a1a53828..89e276e80 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -175,14 +175,14 @@ void sub_80E8B6C(void)
 {
     u16 i;
 
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     for (i = 0; i < 20; i ++)
     {
         if (sCurSecretBaseId != gSaveBlock1Ptr->secretBases[i].secretBaseId)
         {
             continue;
         }
-        gSpecialVar_ScriptResult = TRUE;
+        gSpecialVar_Result = TRUE;
         VarSet(VAR_0x4054, i);
         break;
     }
@@ -192,11 +192,11 @@ void sub_80E8BC8(void)
 {
     if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0)
     {
-        gSpecialVar_ScriptResult = TRUE;
+        gSpecialVar_Result = TRUE;
     }
     else
     {
-        gSpecialVar_ScriptResult = FALSE;
+        gSpecialVar_Result = FALSE;
     }
 }
 
@@ -544,22 +544,22 @@ void sub_80E933C(void)
                 metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
                 if (MetatileBehavior_IsMB_B5(metatile) == TRUE || MetatileBehavior_IsMB_C3(metatile) == TRUE)
                 {
-                    gSpecialVar_ScriptResult = gMapHeader.events->mapObjects[objIdx].graphicsId + VAR_0x3F20;
-                    VarSet(gSpecialVar_ScriptResult, gDecorations[roomDecor[decorIdx]].tiles[0]);
-                    gSpecialVar_ScriptResult = gMapHeader.events->mapObjects[objIdx].localId;
+                    gSpecialVar_Result = gMapHeader.events->mapObjects[objIdx].graphicsId + VAR_0x3F20;
+                    VarSet(gSpecialVar_Result, gDecorations[roomDecor[decorIdx]].tiles[0]);
+                    gSpecialVar_Result = gMapHeader.events->mapObjects[objIdx].localId;
                     FlagClear(gSpecialVar_0x8004 + 0xAE);
-                    show_sprite(gSpecialVar_ScriptResult, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
-                    sub_808EBA8(gSpecialVar_ScriptResult, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
-                    sub_808F254(gSpecialVar_ScriptResult, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+                    show_sprite(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+                    sub_808EBA8(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
+                    sub_808F254(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
                     if (CurrentMapIsSecretBase() == TRUE && VarGet(VAR_0x4054) != 0)
                     {
                         if (category == DECORCAT_DOLL)
                         {
-                            sub_808F28C(gSpecialVar_ScriptResult, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, DECORCAT_DOLL);
+                            sub_808F28C(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, DECORCAT_DOLL);
                         }
                         else if (category == DECORCAT_CUSHION)
                         {
-                            sub_808F28C(gSpecialVar_ScriptResult, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, DECORCAT_CUSHION);
+                            sub_808F28C(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, DECORCAT_CUSHION);
                         }
                     }
                     gSpecialVar_0x8004 ++;
@@ -608,14 +608,14 @@ void sub_80E9668(struct Coords16 *coords, struct MapEvents *events)
 {
     sub_80E9608(coords, events);
     sub_80E8B6C();
-    ScriptContext1_SetupScript(gUnknown_08275BB7);
+    ScriptContext1_SetupScript(EventScript_275BB7);
 }
 
 bool8 sub_80E9680(void)
 {
     sub_80E8B58();
     sub_80E8B6C();
-    if (gSpecialVar_ScriptResult == TRUE)
+    if (gSpecialVar_Result == TRUE)
     {
         return FALSE;
     }
@@ -657,11 +657,11 @@ void sub_80E9744(void)
 {
     if (gSaveBlock1Ptr->secretBases[0].secretBaseId != sCurSecretBaseId)
     {
-        gSpecialVar_ScriptResult = TRUE;
+        gSpecialVar_Result = TRUE;
     }
     else
     {
-        gSpecialVar_ScriptResult = FALSE;
+        gSpecialVar_Result = FALSE;
     }
 }
 
@@ -1016,15 +1016,15 @@ void sub_80E9BDC(void)
 {
     if (sub_80E9878(VarGet(VAR_0x4054)) == TRUE)
     {
-        gSpecialVar_ScriptResult = 1;
+        gSpecialVar_Result = 1;
     }
     else if (sub_80E9BA8() > 9)
     {
-        gSpecialVar_ScriptResult = 2;
+        gSpecialVar_Result = 2;
     }
     else
     {
-        gSpecialVar_ScriptResult = 0;
+        gSpecialVar_Result = 0;
     }
 }
 
@@ -1289,41 +1289,41 @@ const u8 *sub_80EA250(void)
     param = sub_80EA20C(VarGet(VAR_0x4054));
     if (param == 0)
     {
-        return gUnknown_08274966;
+        return SecretBase_RedCave1_Text_274966;
     }
     if (param == 1)
     {
-        return gUnknown_08274D13;
+        return SecretBase_RedCave1_Text_274D13;
     }
     if (param == 2)
     {
-        return gUnknown_08274FFE;
+        return SecretBase_RedCave1_Text_274FFE;
     }
     if (param == 3)
     {
-        return gUnknown_08275367;
+        return SecretBase_RedCave1_Text_275367;
     }
     if (param == 4)
     {
-        return gUnknown_082756C7;
+        return SecretBase_RedCave1_Text_2756C7;
     }
     if (param == 5)
     {
-        return gUnknown_08274B24;
+        return SecretBase_RedCave1_Text_274B24;
     }
     if (param == 6)
     {
-        return gUnknown_08274E75;
+        return SecretBase_RedCave1_Text_274E75;
     }
     if (param == 7)
     {
-        return gUnknown_082751E1;
+        return SecretBase_RedCave1_Text_2751E1;
     }
     if (param == 8)
     {
-        return gUnknown_082754F6;
+        return SecretBase_RedCave1_Text_2754F6;
     }
-    return gUnknown_082758CC;
+    return SecretBase_RedCave1_Text_2758CC;
 }
 
 void sub_80EA2E4(void)
@@ -1335,7 +1335,7 @@ void sub_80EA2E4(void)
 
 void sub_80EA30C(void)
 {
-    gSaveBlock1Ptr->secretBases[VarGet(VAR_0x4054)].sbr_field_1_5 = gSpecialVar_ScriptResult;
+    gSaveBlock1Ptr->secretBases[VarGet(VAR_0x4054)].sbr_field_1_5 = gSpecialVar_Result;
 }
 
 void sub_80EA354(void)
@@ -1353,7 +1353,7 @@ void sub_80EA354(void)
         FlagSet(0x922);
     }
     gSpecialVar_0x8004 = sub_80EA20C(secretBaseRecordId);
-    gSpecialVar_ScriptResult = gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_5;
+    gSpecialVar_Result = gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_5;
 }
 
 
diff --git a/src/tv.c b/src/tv.c
index 3601f7a10..2cb1d4384 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1263,7 +1263,7 @@ void InterviewAfter_ContestLiveUpdates(void)
         show2->contestLiveUpdates.kind = TVSHOW_CONTEST_LIVE_UPDATES;
         show2->contestLiveUpdates.active = TRUE;
         StringCopy(show2->contestLiveUpdates.playerName, gSaveBlock2Ptr->playerName);
-        show2->contestLiveUpdates.category = gScriptContestCategory;
+        show2->contestLiveUpdates.category = gSpecialVar_ContestCategory;
         show2->contestLiveUpdates.species = GetMonData(&gPlayerParty[gUnknown_02039F24], MON_DATA_SPECIES, NULL);
         show2->contestLiveUpdates.winningSpecies = show->contestLiveUpdates.winningSpecies;
         show2->contestLiveUpdates.appealFlags2 = show->contestLiveUpdates.appealFlags2;
@@ -1288,7 +1288,7 @@ void PutBattleUpdateOnTheAir(u8 a0, u16 a1, u16 a2, u16 a3)
     if (sCurTVShowSlot != -1)
     {
         FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BATTLE_UPDATE);
-        if (gSpecialVar_ScriptResult != 1)
+        if (gSpecialVar_Result != 1)
         {
             show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
             show->battleUpdate.kind = TVSHOW_BATTLE_UPDATE;
@@ -1337,7 +1337,7 @@ bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unus
         return FALSE;
     }
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_3_CHEERS_FOR_POKEBLOCKS);
-    if (gSpecialVar_ScriptResult == 1)
+    if (gSpecialVar_Result == 1)
     {
         return FALSE;
     }
@@ -1527,8 +1527,8 @@ void BravoTrainerPokemonProfile_BeforeInterview2(u8 a0)
     if (sCurTVShowSlot != -1)
     {
         show->bravoTrainer.contestResult = a0;
-        show->bravoTrainer.contestCategory = gScriptContestCategory;
-        show->bravoTrainer.contestRank = gUnknown_02039F2E;
+        show->bravoTrainer.contestCategory = gSpecialVar_ContestCategory;
+        show->bravoTrainer.contestRank = gSpecialVar_ContestRank;
         show->bravoTrainer.species = GetMonData(&gPlayerParty[gUnknown_02039F24], MON_DATA_SPECIES, NULL);
         GetMonData(&gPlayerParty[gUnknown_02039F24], MON_DATA_NICKNAME, show->bravoTrainer.pokemonNickname);
         StripExtCtrlCodes(show->bravoTrainer.pokemonNickname);
@@ -1606,7 +1606,7 @@ void PutNameRaterShowOnTheAir(void)
     TVShow *show;
 
     InterviewBefore_NameRater();
-    if (gSpecialVar_ScriptResult != 1)
+    if (gSpecialVar_Result != 1)
     {
         GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
         if (StringLength(gSaveBlock2Ptr->playerName) > 1 && StringLength(gStringVar1) > 1)
@@ -1653,7 +1653,7 @@ void PutLilycoveContestLadyShowOnTheAir(void)
     TVShow *show;
 
     sub_80EFA88();
-    if (gSpecialVar_ScriptResult != TRUE)
+    if (gSpecialVar_Result != TRUE)
     {
         show = &gSaveBlock1Ptr->tvShows[sCurTVShowSlot];
         sub_818E848(&show->contestLiveUpdates2.language);
@@ -2613,7 +2613,7 @@ bool8 sub_80EE7C0(void)
         return TRUE;
     }
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_FAN_CLUB_SPECIAL);
-    if (gSpecialVar_ScriptResult == TRUE)
+    if (gSpecialVar_Result == TRUE)
     {
         return TRUE;
     }
@@ -2905,7 +2905,7 @@ void DoPokeNews(void)
     i = FindAnyTVNewsOnTheAir();
     if (i == 0xFF)
     {
-        gSpecialVar_ScriptResult = FALSE;
+        gSpecialVar_Result = FALSE;
     }
     else
     {
@@ -2928,7 +2928,7 @@ void DoPokeNews(void)
             gSaveBlock1Ptr->pokeNews[i].state = 0;
             ShowFieldMessage(sPokeNewsTextGroup_Upcoming[gSaveBlock1Ptr->pokeNews[i].kind]);
         }
-        gSpecialVar_ScriptResult = TRUE;
+        gSpecialVar_Result = TRUE;
     }
 }
 
@@ -2959,7 +2959,7 @@ bool8 IsPriceDiscounted(u8 newsKind)
     switch (newsKind)
     {
         case POKENEWS_SLATEPORT:
-            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_SLATEPORT_CITY && gSaveBlock1Ptr->location.mapNum == MAP_ID_SLATEPORT_CITY && gSpecialVar_ScriptLastTalked == 25)
+            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_SLATEPORT_CITY && gSaveBlock1Ptr->location.mapNum == MAP_ID_SLATEPORT_CITY && gSpecialVar_LastTalked == 25)
             {
                 return TRUE;
             }
@@ -3189,7 +3189,7 @@ void FindActiveBroadcastByShowType_SetScriptResult(u8 kind)
         {
             if (gSaveBlock1Ptr->tvShows[i].common.active == TRUE)
             {
-                gSpecialVar_ScriptResult = TRUE;
+                gSpecialVar_Result = TRUE;
             }
             else
             {
@@ -3205,7 +3205,7 @@ void FindActiveBroadcastByShowType_SetScriptResult(u8 kind)
 
 void InterviewBefore(void)
 {
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     switch (gSpecialVar_0x8005)
     {
         case TVSHOW_FAN_CLUB_LETTER:
@@ -3244,7 +3244,7 @@ void InterviewBefore(void)
 void InterviewBefore_FanClubLetter(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_FAN_CLUB_LETTER);
-    if (!gSpecialVar_ScriptResult)
+    if (!gSpecialVar_Result)
     {
         StringCopy(gStringVar1, gSpeciesNames[GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_SPECIES, NULL)]);
         InitializeEasyChatWordArray(gSaveBlock1Ptr->tvShows[sCurTVShowSlot].fanclubLetter.words, 6);
@@ -3254,7 +3254,7 @@ void InterviewBefore_FanClubLetter(void)
 void InterviewBefore_RecentHappenings(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_RECENT_HAPPENINGS);
-    if (!gSpecialVar_ScriptResult)
+    if (!gSpecialVar_Result)
     {
         InitializeEasyChatWordArray(gSaveBlock1Ptr->tvShows[sCurTVShowSlot].recentHappenings.words, 6);
     }
@@ -3263,7 +3263,7 @@ void InterviewBefore_RecentHappenings(void)
 void InterviewBefore_PkmnFanClubOpinions(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_PKMN_FAN_CLUB_OPINIONS);
-    if (!gSpecialVar_ScriptResult)
+    if (!gSpecialVar_Result)
     {
         StringCopy(gStringVar1, gSpeciesNames[GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_SPECIES, NULL)]);
         GetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_NICKNAME, gStringVar2);
@@ -3274,7 +3274,7 @@ void InterviewBefore_PkmnFanClubOpinions(void)
 
 void InterviewBefore_Dummy(void)
 {
-    gSpecialVar_ScriptResult = TRUE;
+    gSpecialVar_Result = TRUE;
 }
 
 void InterviewBefore_NameRater(void)
@@ -3285,7 +3285,7 @@ void InterviewBefore_NameRater(void)
 void InterviewBefore_BravoTrainerPkmnProfile(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE);
-    if (!gSpecialVar_ScriptResult)
+    if (!gSpecialVar_Result)
     {
         InitializeEasyChatWordArray(gSaveBlock1Ptr->tvShows[sCurTVShowSlot].bravoTrainer.words, 2);
     }
@@ -3304,7 +3304,7 @@ void InterviewBefore_3CheersForPokeblocks(void)
 void InterviewBefore_BravoTrainerBTProfile(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE);
-    if (!gSpecialVar_ScriptResult)
+    if (!gSpecialVar_Result)
     {
         InitializeEasyChatWordArray(gSaveBlock1Ptr->tvShows[sCurTVShowSlot].bravoTrainerTower.words, 1);
     }
@@ -3313,7 +3313,7 @@ void InterviewBefore_BravoTrainerBTProfile(void)
 void InterviewBefore_FanClubSpecial(void)
 {
     FindActiveBroadcastByShowType_SetScriptResult(TVSHOW_FAN_CLUB_SPECIAL);
-    if (!gSpecialVar_ScriptResult)
+    if (!gSpecialVar_Result)
     {
         InitializeEasyChatWordArray(gSaveBlock1Ptr->tvShows[sCurTVShowSlot].fanClubSpecial.words, 1);
     }
@@ -3429,11 +3429,11 @@ void sub_80EFA88(void)
     gSpecialVar_0x8006 = sCurTVShowSlot;
     if (sCurTVShowSlot == -1)
     {
-        gSpecialVar_ScriptResult = TRUE;
+        gSpecialVar_Result = TRUE;
     }
     else
     {
-        gSpecialVar_ScriptResult = FALSE;
+        gSpecialVar_Result = FALSE;
     }
 }
 
@@ -3658,11 +3658,11 @@ void TV_CheckMonOTIDEqualsPlayerID(void)
 {
     if (GetPlayerIDAsU32() == GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_ID, NULL))
     {
-        gSpecialVar_ScriptResult = FALSE;
+        gSpecialVar_Result = FALSE;
     }
     else
     {
-        gSpecialVar_ScriptResult = TRUE;
+        gSpecialVar_Result = TRUE;
     }
 }
 
@@ -5108,7 +5108,7 @@ void DoTVShowBravoTrainerPokemonProfile(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5180,7 +5180,7 @@ void DoTVShowBravoTrainerBattleTower(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch(state)
     {
@@ -5277,7 +5277,7 @@ void DoTVShowTodaysSmartShopper(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch(state)
     {
@@ -5400,7 +5400,7 @@ void DoTVShowTheNameRaterShow(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5498,7 +5498,7 @@ void DoTVShowPokemonTodaySuccessfulCapture(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5576,7 +5576,7 @@ void DoTVShowPokemonTodayFailedCapture(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5630,7 +5630,7 @@ void DoTVShowPokemonFanClubLetter(void)
     u16 rval;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5683,7 +5683,7 @@ void DoTVShowRecentHappenings(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5718,7 +5718,7 @@ void DoTVShowPokemonFanClubOpinions(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -5768,7 +5768,7 @@ void DoTVShowPokemonContestLiveUpdates(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6115,7 +6115,7 @@ void DoTVShowPokemonBattleUpdate(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6187,7 +6187,7 @@ void DoTVShow3CheersForPokeblocks(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6288,7 +6288,7 @@ void DoTVShowInSearchOfTrainers(void)
 {
     u8 state;
 
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6344,7 +6344,7 @@ void DoTVShowInSearchOfTrainers(void)
             CopyEasyChatWord(gStringVar1, gSaveBlock1Ptr->gabbyAndTyData.quote[0]);
             StringCopy(gStringVar2, gSpeciesNames[gSaveBlock1Ptr->gabbyAndTyData.mon1]);
             StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1Ptr->gabbyAndTyData.mon2]);
-            gSpecialVar_ScriptResult = TRUE;
+            gSpecialVar_Result = TRUE;
             sTVShowState = 0;
             TakeTVShowInSearchOfTrainersOffTheAir();
             break;
@@ -6358,7 +6358,7 @@ void DoTVShowPokemonAngler(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     if (show->pokemonAngler.nBites < show->pokemonAngler.nFails)
     {
         sTVShowState = 0;
@@ -6392,7 +6392,7 @@ void DoTVShowTheWorldOfMasters(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6422,7 +6422,7 @@ void DoTVShowTodaysRivalTrainer(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6571,7 +6571,7 @@ void DoTVShowDewfordTrendWatcherNetwork(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6627,7 +6627,7 @@ void DoTVShowHoennTreasureInvestigators(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6671,7 +6671,7 @@ void DoTVShowFindThatGamer(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6745,7 +6745,7 @@ void DoTVShowBreakingNewsTV(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6848,7 +6848,7 @@ void DoTVShowSecretBaseVisit(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -6944,7 +6944,7 @@ void DoTVShowPokemonLotteryWinnerFlashReport(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     TVShowConvertInternationalString(gStringVar1, show->lottoWinner.playerName, show->lottoWinner.language);
     if (show->lottoWinner.whichPrize == 0)
@@ -6974,7 +6974,7 @@ void DoTVShowThePokemonBattleSeminar(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7038,7 +7038,7 @@ void DoTVShowTrainerFanClubSpecial(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7104,7 +7104,7 @@ void DoTVShowTrainerFanClub(void)
     u32 playerId;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7191,7 +7191,7 @@ void DoTVShowSpotTheCuties(void)
     u32 playerId;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7296,7 +7296,7 @@ void DoTVShowPokemonNewsBattleFrontier(void)
     u32 playerId;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7445,7 +7445,7 @@ void DoTVShowWhatsNo1InHoennToday(void)
     u32 playerId;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7561,7 +7561,7 @@ void DoTVShowSecretBaseSecrets(void)
     u16 i;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7797,7 +7797,7 @@ void DoTVShowSafariFanClub(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7884,7 +7884,7 @@ void DoTVShowPokemonContestLiveUpdates2(void)
     u8 state;
 
     show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004];
-    gSpecialVar_ScriptResult = FALSE;
+    gSpecialVar_Result = FALSE;
     state = sTVShowState;
     switch (state)
     {
@@ -7916,7 +7916,7 @@ void DoTVShowPokemonContestLiveUpdates2(void)
 
 void TVShowDone(void)
 {
-    gSpecialVar_ScriptResult = TRUE;
+    gSpecialVar_Result = TRUE;
     sTVShowState = 0;
     gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004].common.active = FALSE;
 }
diff --git a/src/walda_phrase.c b/src/walda_phrase.c
index c1da86b15..59fd3fedb 100644
--- a/src/walda_phrase.c
+++ b/src/walda_phrase.c
@@ -98,17 +98,17 @@ u16 TryGetWallpaperWithWaldaPhrase(void)
     u16 backgroundClr, foregroundClr;
     u8 patternId, iconId;
     u16 trainerId = ReadUnalignedWord(gSaveBlock2Ptr->playerTrainerId);
-    gSpecialVar_ScriptResult = TryCalculateWallpaper(&backgroundClr, &foregroundClr, &iconId, &patternId, trainerId, GetWaldaPhrasePtr());
+    gSpecialVar_Result = TryCalculateWallpaper(&backgroundClr, &foregroundClr, &iconId, &patternId, trainerId, GetWaldaPhrasePtr());
 
-    if (gSpecialVar_ScriptResult)
+    if (gSpecialVar_Result)
     {
         SetWaldaWallpaperPatternId(patternId);
         SetWaldaWallpaperIconId(iconId);
         SetWaldaWallpaperColors(backgroundClr, foregroundClr);
     }
 
-    SetWaldaWallpaperLockedOrUnlocked(gSpecialVar_ScriptResult);
-    return (bool8)(gSpecialVar_ScriptResult);
+    SetWaldaWallpaperLockedOrUnlocked(gSpecialVar_Result);
+    return (bool8)(gSpecialVar_Result);
 }
 
 static u8 GetLetterTableId(u8 letter)
-- 
cgit v1.2.3


From fa3691ca40d431d3f533c6e1bad47c4c4af81ccf Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 11 Nov 2017 14:45:08 +0100
Subject: start pss

---
 src/egg_hatch.c              |   4 +-
 src/pokemon_storage_system.c | 122 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 116 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 589e8901d..13c088883 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -75,7 +75,7 @@ extern void CreateYesNoMenu(const struct WindowTemplate*, u16, u8, u8);
 extern void DoNamingScreen(u8, const u8*, u16, u8, u32, MainCallback);
 extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor* colors, s8 speed, u8 *str);
 extern u16 sub_80D22D0(void);
-extern u8 sub_80C7050(u8);
+extern u8 CountPartyAliveNonEggMonsExcept(u8);
 
 static void Task_EggHatch(u8 taskID);
 static void CB2_EggHatch_0(void);
@@ -888,6 +888,6 @@ u8 GetEggStepsToSubtract(void)
 u16 sub_80722E0(void)
 {
     u16 value = sub_80D22D0();
-    value += sub_80C7050(6);
+    value += CountPartyAliveNonEggMonsExcept(6);
     return value;
 }
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 3e409244c..8eeac96b1 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -1,15 +1,121 @@
-
-// Includes
 #include "global.h"
+#include "pokemon_storage_system.h"
+#include "pokemon.h"
+#include "species.h"
+#include "event_data.h"
+#include "string_util.h"
+#include "text.h"
 
-// Static type declarations
+IWRAM_DATA u8 gUnknown_03000F78[0x188];
 
-// Static RAM declarations
+u8 CountMonsInBox(u8 boxId)
+{
+    u16 i, count;
 
-IWRAM_DATA u8 gUnknown_03000F78[0x188];
+    for (i = 0, count = 0; i < IN_BOX_COUNT; i++)
+    {
+        if (GetBoxMonDataFromAnyBox(boxId, i, MON_DATA_SPECIES) != SPECIES_NONE)
+            count++;
+    }
+
+    return count;
+}
+
+s16 GetFirstFreeBoxSpot(u8 boxId)
+{
+    u16 i;
+
+    for (i = 0; i < IN_BOX_COUNT; i++)
+    {
+        if (GetBoxMonDataFromAnyBox(boxId, i, MON_DATA_SPECIES) == SPECIES_NONE)
+            return i;
+    }
+
+    return -1; // all spots are taken
+}
+
+u8 CountPartyNonEggMons(void)
+{
+    u16 i, count;
+
+    for (i = 0, count = 0; i < PARTY_SIZE; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE
+            && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
+        {
+            count++;
+        }
+    }
+
+    return count;
+}
+
+u8 CountPartyAliveNonEggMonsExcept(u8 slotToIgnore)
+{
+    u16 i, count;
+
+    for (i = 0, count = 0; i < PARTY_SIZE; i++)
+    {
+        if (i != slotToIgnore
+            && GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE
+            && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)
+            && GetMonData(&gPlayerParty[i], MON_DATA_HP) != 0)
+        {
+            count++;
+        }
+    }
+
+    return count;
+}
+
+u16 CountPartyAliveNonEggMons_IgnoreVar0x8004Slot(void)
+{
+    return CountPartyAliveNonEggMonsExcept(gSpecialVar_0x8004);
+}
+
+u8 CountPartyMons(void)
+{
+    u16 i, count;
+
+    for (i = 0, count = 0; i < PARTY_SIZE; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE)
+        {
+            count++;
+        }
+    }
+
+    return count;
+}
+
+static u8 *StringCopyAndFillWithSpaces(u8 *dst, const u8 *src, u16 n)
+{
+    u8 *str;
+
+    for (str = StringCopy(dst, src); str < dst + n; str++)
+        *str = CHAR_SPACE;
+
+    *str = EOS;
+    return str;
+}
 
-// Static ROM declarations
+static void sub_80C7128(u16 *dst, u16 dstToAdd, u16 dstToMul, const u16 *src, u16 srcToAdd, u16 srcToMul, u32 size, u16 count, u16 srcBy)
+{
+    u16 i;
 
-// .rodata
+    size <<= 0x11;
+    dst += (dstToMul * 32) + dstToAdd;
+    src += (srcToMul * srcBy) + srcToAdd;
 
-// .text
+    i = 0;
+    if (i < count)
+    {
+        size >>= 1;
+        for (i = 0; i < count; i++)
+        {
+            CpuSet(src, dst, size >> 0x10);
+            dst += 0x20;
+            src += srcBy;
+        }
+    }
+}
-- 
cgit v1.2.3


From 7472d639cf846172ad2ab911579451e4052f70aa Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 11 Nov 2017 20:01:04 +0100
Subject: match one function in battlescript cmds

---
 src/battle_script_commands.c | 432 ++++++++++---------------------------------
 1 file changed, 93 insertions(+), 339 deletions(-)

(limited to 'src')

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c6cec7f0d..ee23b629d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -13,6 +13,7 @@
 #include "calculate_base_damage.h"
 #include "rng.h"
 #include "battle_controllers.h"
+#include "battle_interface.h"
 #include "species.h"
 #include "songs.h"
 #include "text.h"
@@ -118,7 +119,7 @@ struct TrainerMoney
 
 extern const struct BattleMove gBattleMoves[];
 extern const struct BaseStats gBaseStats[];
-extern const u8 gTypeEffectiveness[];
+extern const u8 gTypeEffectiveness[336];
 extern const u16 gMissStringIds[];
 extern const u16 gTrappingMoves[];
 extern const struct TrainerMoney gTrainerMoneyTable[];
@@ -139,7 +140,6 @@ extern void sub_81A5BF8(void); // battle frontier 2
 extern void sub_81A5D44(void); // battle frontier 2
 extern void sub_81B8E80(u8 bank, u8, u8); // party menu
 extern bool8 sub_81B1250(void); // ?
-extern u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale); // battle interface
 extern bool8 InBattlePike(void);
 extern bool8 InBattlePyramid(void);
 extern u16 GetBattlePyramidPickupItemId(void);
@@ -340,7 +340,7 @@ static void atk48_playstatchangeanimation(void);
 static void atk49_moveend(void);
 static void atk4A_typecalc2(void);
 static void atk4B_return_atk_to_ball(void);
-static void atk4C_copy_poke_data(void);
+static void atk4C_get_switched_mon_data(void);
 static void atk4D_switch_data_update(void);
 static void atk4E_switchin_anim(void);
 static void atk4F_jump_if_cannot_switch(void);
@@ -368,7 +368,7 @@ static void atk64_statusanimation(void);
 static void atk65_status2animation(void);
 static void atk66_chosenstatusanimation(void);
 static void atk67_yesnobox(void);
-static void atk68_80246A0(void);
+static void atk68_cancel_everyones_actions(void);
 static void atk69_dmg_adjustment3(void);
 static void atk6A_removeitem(void);
 static void atk6B_atknameinbuff1(void);
@@ -457,7 +457,7 @@ static void atkBD_copyfoestats(void);
 static void atkBE_rapidspinfree(void);
 static void atkBF_set_defense_curl(void);
 static void atkC0_recoverbasedonsunlight(void);
-static void atkC1_hidden_power(void);
+static void atkC1_hidden_power_calc(void);
 static void atkC2_selectnexttarget(void);
 static void atkC3_setfutureattack(void);
 static void atkC4_beat_up(void);
@@ -592,7 +592,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk49_moveend,
     atk4A_typecalc2,
     atk4B_return_atk_to_ball,
-    atk4C_copy_poke_data,
+    atk4C_get_switched_mon_data,
     atk4D_switch_data_update,
     atk4E_switchin_anim,
     atk4F_jump_if_cannot_switch,
@@ -620,7 +620,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk65_status2animation,
     atk66_chosenstatusanimation,
     atk67_yesnobox,
-    atk68_80246A0,
+    atk68_cancel_everyones_actions,
     atk69_dmg_adjustment3,
     atk6A_removeitem,
     atk6B_atknameinbuff1,
@@ -709,7 +709,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atkBE_rapidspinfree,
     atkBF_set_defense_curl,
     atkC0_recoverbasedonsunlight,
-    atkC1_hidden_power,
+    atkC1_hidden_power_calc,
     atkC2_selectnexttarget,
     atkC3_setfutureattack,
     atkC4_beat_up,
@@ -828,7 +828,7 @@ static const u32 sStatusFlagsForMoveEffects[] =
     0x00000000,
     0x00000000,
     STATUS2_ESCAPE_PREVENTION,
-    0x08000000,
+    STATUS2_NIGHTMARE,
     0x00000000,
     0x00000000,
     0x00000000,
@@ -1233,7 +1233,7 @@ bool8 JumpIfMoveAffectedByProtect(u16 move)
     return affected;
 }
 
-bool8 AccuracyCalcHelper(u16 move)
+static bool8 AccuracyCalcHelper(u16 move)
 {
     if (gStatuses3[gBankTarget] & STATUS3_ALWAYS_HITS && gDisableStructs[gBankTarget].bankWithSureHit == gBankAttacker)
     {
@@ -1532,9 +1532,6 @@ static void ModulateDmgByType(u8 multiplier)
     }
 }
 
-#define TYPE_FORESIGHT  0xFE
-#define TYPE_ENDTABLE   0xFF
-
 static void atk06_typecalc(void)
 {
     s32 i = 0;
@@ -1566,24 +1563,24 @@ static void atk06_typecalc(void)
     }
     else
     {
-        while (gTypeEffectiveness[i] != TYPE_ENDTABLE)
+        while (TYPE_EFFECT_ATK_TYPE(i) != TYPE_ENDTABLE)
         {
-            if (gTypeEffectiveness[i] == TYPE_FORESIGHT)
+            if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
                 if (gBattleMons[gBankTarget].status2 & STATUS2_FORESIGHT)
                     break;
                 i += 3;
                 continue;
             }
-            else if (gTypeEffectiveness[i] == moveType)
+            else if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type1)
-                    ModulateDmgByType(gTypeEffectiveness[i + 2]);
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type1)
+                    ModulateDmgByType(TYPE_EFFECT_MULTIPLIER(i));
                 // check type2
-                if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2 &&
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2 &&
                     gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2)
-                    ModulateDmgByType(gTypeEffectiveness[i + 2]);
+                    ModulateDmgByType(TYPE_EFFECT_MULTIPLIER(i));
             }
             i += 3;
         }
@@ -1625,45 +1622,46 @@ static void CheckWonderGuardAndLevitate(void)
         return;
     }
 
-    while (gTypeEffectiveness[i] != TYPE_ENDTABLE)
+    while (TYPE_EFFECT_ATK_TYPE(i) != TYPE_ENDTABLE)
     {
-        if (gTypeEffectiveness[i] == TYPE_FORESIGHT)
+        if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
         {
             if (gBattleMons[gBankTarget].status2 & STATUS2_FORESIGHT)
                 break;
             i += 3;
             continue;
         }
-        if (gTypeEffectiveness[i] == moveType)
+        if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
         {
             // check no effect
-            if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type1 && gTypeEffectiveness[i + 2] == 0)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type1
+                && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
             {
                 gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
                 gProtectStructs[gBankAttacker].targetNotAffected = 1;
             }
-            if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2 &&
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2 &&
                 gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2 &&
-                gTypeEffectiveness[i + 2] == TYPE_MUL_NO_EFFECT)
+                TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
             {
                 gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
                 gProtectStructs[gBankAttacker].targetNotAffected = 1;
             }
 
             // check super effective
-            if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type1 && gTypeEffectiveness[i + 2] == 20)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 20)
                 flags |= 1;
-            if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2
              && gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
-             && gTypeEffectiveness[i + 2] == TYPE_MUL_SUPER_EFFECTIVE)
+             && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                 flags |= 1;
 
             // check not very effective
-            if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type1 && gTypeEffectiveness[i + 2] == 5)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 5)
                 flags |= 2;
-            if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2
              && gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
-             && gTypeEffectiveness[i + 2] == TYPE_MUL_NOT_EFFECTIVE)
+             && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                 flags |= 2;
         }
         i += 3;
@@ -1738,9 +1736,9 @@ u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef)
     }
     else
     {
-        while (gTypeEffectiveness[i]!= TYPE_ENDTABLE)
+        while (TYPE_EFFECT_ATK_TYPE(i) != TYPE_ENDTABLE)
         {
-            if (gTypeEffectiveness[i] == TYPE_FORESIGHT)
+            if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
                 if (gBattleMons[bankDef].status2 & STATUS2_FORESIGHT)
                     break;
@@ -1748,15 +1746,15 @@ u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef)
                 continue;
             }
 
-            else if (gTypeEffectiveness[i] == moveType)
+            else if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (gTypeEffectiveness[i + 1] == gBattleMons[bankDef].type1)
-                    ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags);
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[bankDef].type1)
+                    ModulateDmgByType2(TYPE_EFFECT_MULTIPLIER(i), move, &flags);
                 // check type2
-                if (gTypeEffectiveness[i + 1] == gBattleMons[bankDef].type2 &&
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[bankDef].type2 &&
                     gBattleMons[bankDef].type1 != gBattleMons[bankDef].type2)
-                    ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags);
+                    ModulateDmgByType2(TYPE_EFFECT_MULTIPLIER(i), move, &flags);
             }
             i += 3;
         }
@@ -1790,21 +1788,21 @@ u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility)
     }
     else
     {
-        while (gTypeEffectiveness[i] != TYPE_ENDTABLE)
+        while (TYPE_EFFECT_ATK_TYPE(i) != TYPE_ENDTABLE)
         {
-            if (gTypeEffectiveness[i] == TYPE_FORESIGHT)
+            if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
                 i += 3;
                 continue;
             }
-            if (gTypeEffectiveness[i] == moveType)
+            if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (gTypeEffectiveness[i + 1] == type1)
-                    ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags);
+                if (TYPE_EFFECT_DEF_TYPE(i) == type1)
+                    ModulateDmgByType2(TYPE_EFFECT_MULTIPLIER(i), move, &flags);
                 // check type2
-                if (gTypeEffectiveness[i + 1] == type2 && type1 != type2)
-                    ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags);
+                if (TYPE_EFFECT_DEF_TYPE(i) == type2 && type1 != type2)
+                    ModulateDmgByType2(TYPE_EFFECT_MULTIPLIER(i), move, &flags);
             }
             i += 3;
         }
@@ -5224,9 +5222,9 @@ static void atk4A_typecalc2(void)
     }
     else
     {
-        while (gTypeEffectiveness[i]!= TYPE_ENDTABLE)
+        while (TYPE_EFFECT_ATK_TYPE(i) != TYPE_ENDTABLE)
         {
-            if (gTypeEffectiveness[i] == TYPE_FORESIGHT)
+            if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
                 if (gBattleMons[gBankTarget].status2 & STATUS2_FORESIGHT)
                 {
@@ -5239,43 +5237,43 @@ static void atk4A_typecalc2(void)
                 }
             }
 
-            if (gTypeEffectiveness[i] == moveType)
+            if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type1)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type1)
                 {
-                    if (gTypeEffectiveness[i + 2] == 0)
+                    if (TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
                     {
                         gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
                         break;
                     }
-                    if (gTypeEffectiveness[i + 2] == 5)
+                    if (TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                     {
                         flags |= MOVESTATUS_NOTVERYEFFECTIVE;
                     }
-                    if (gTypeEffectiveness[i + 2] == 20)
+                    if (TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                     {
                         flags |= MOVESTATUS_SUPEREFFECTIVE;
                     }
                 }
                 // check type2
-                if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2)
                 {
                     if (gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
-                        && gTypeEffectiveness[i + 2] == 0)
+                        && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
                     {
                         gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
                         break;
                     }
-                    if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2
+                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2
                         && gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
-                        && gTypeEffectiveness[i + 2] == 5)
+                        && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                     {
                         flags |= MOVESTATUS_NOTVERYEFFECTIVE;
                     }
-                    if (gTypeEffectiveness[i + 1] == gBattleMons[gBankTarget].type2
+                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2
                         && gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
-                        && gTypeEffectiveness[i + 2] == 20)
+                        && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                     {
                         flags |= MOVESTATUS_SUPEREFFECTIVE;
                     }
@@ -5314,7 +5312,7 @@ static void atk4B_return_atk_to_ball(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk4C_copy_poke_data(void)
+static void atk4C_get_switched_mon_data(void)
 {
     if (gBattleExecBuffer)
         return;
@@ -5323,7 +5321,7 @@ static void atk4C_copy_poke_data(void)
 
     gBattlePartyID[gActiveBank] = *(gBattleStruct->field_5C + gActiveBank);
 
-    EmitGetMonData(0, 0, gBitTable[gBattlePartyID[gActiveBank]]);
+    EmitGetMonData(0, REQUEST_ALL_BATTLE, gBitTable[gBattlePartyID[gActiveBank]]);
     MarkBufferBankForExecution(gActiveBank);
 
     gBattlescriptCurrInstr += 2;
@@ -5360,7 +5358,7 @@ static void atk4D_switch_data_update(void)
 
     if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
     {
-        for (i = 0; i < 8; i++)
+        for (i = 0; i < BATTLE_STATS_NO; i++)
         {
             gBattleMons[gActiveBank].statStages[i] = oldData.statStages[i];
         }
@@ -5376,11 +5374,8 @@ static void atk4D_switch_data_update(void)
     }
 
     gBattleScripting.bank = gActiveBank;
-    gBattleTextBuff1[0] = PLACEHOLDER_BEGIN;
-    gBattleTextBuff1[1] = 7;
-    gBattleTextBuff1[2] = gActiveBank;
-    gBattleTextBuff1[3] = gBattlePartyID[gActiveBank];
-    gBattleTextBuff1[4] = EOS;
+
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gActiveBank, gBattlePartyID[gActiveBank]);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -6565,7 +6560,7 @@ static void atk67_yesnobox(void)
     }
 }
 
-static void atk68_80246A0(void)
+static void atk68_cancel_everyones_actions(void)
 {
     s32 i;
 
@@ -8803,7 +8798,6 @@ static void atkA5_painsplitdmgcalc(void)
     }
 }
 
-#ifdef NONMATCHING
 static void atkA6_settypetorandomresistance(void) // conversion 2
 {
     if (gUnknown_02024250[gBankAttacker] == 0
@@ -8818,298 +8812,58 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
     }
     else
     {
-        s32 type = 0, rands = 0;
-        do
+        s32 i, j, rands;
+
+        for (rands = 0; rands < 1000; rands++)
         {
-            while (((type = (Random() & 0x7F)) > 0x70));
+            while (((i = (Random() & 0x7F)) > sizeof(gTypeEffectiveness) / 3));
 
-            type *= 3;
+            i *= 3;
 
-            if (gTypeEffectiveness[type] == gUnknown_02024258[gBankAttacker]
-                && gTypeEffectiveness[type + 2] <= 5
-                && gBattleMons[gBankAttacker].type1 != gTypeEffectiveness[type + 1]
-                && gBattleMons[gBankAttacker].type2 != gTypeEffectiveness[type + 1])
+            if (TYPE_EFFECT_ATK_TYPE(i) == gUnknown_02024258[gBankAttacker]
+                && TYPE_EFFECT_MULTIPLIER(i) <= TYPE_MUL_NOT_EFFECTIVE
+                && gBattleMons[gBankAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
+                && gBattleMons[gBankAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
             {
-                gBattleMons[gBankAttacker].type1 = type;
-                gBattleMons[gBankAttacker].type2 = type;
+                gBattleMons[gBankAttacker].type1 = TYPE_EFFECT_DEF_TYPE(i);
+                gBattleMons[gBankAttacker].type2 = TYPE_EFFECT_DEF_TYPE(i);
 
-                PREPARE_TYPE_BUFFER(gBattleTextBuff1, type)
+                PREPARE_TYPE_BUFFER(gBattleTextBuff1, TYPE_EFFECT_DEF_TYPE(i))
 
                 gBattlescriptCurrInstr += 5;
                 return;
             }
+        }
 
-            rands++;
-        } while (rands <= 999);
-
-        type = 0, rands = 0;
-        do
+        for (j = 0, rands = 0; rands < sizeof(gTypeEffectiveness); j += 3, rands += 3)
         {
-            s8 var = (s8)(gTypeEffectiveness[type]);
-            if (var > -1 || var < -2)
+            switch (TYPE_EFFECT_ATK_TYPE(j))
             {
-                if (gTypeEffectiveness[type] == gUnknown_02024258[gBankAttacker]
-                    && gTypeEffectiveness[type + 2] <= 5
-                    && gBattleMons[gBankAttacker].type1 != gTypeEffectiveness[type + 1]
-                    && gBattleMons[gBankAttacker].type2 != gTypeEffectiveness[type + 1])
+            case TYPE_ENDTABLE:
+            case TYPE_FORESIGHT:
+                break;
+            default:
+                if (TYPE_EFFECT_ATK_TYPE(j) == gUnknown_02024258[gBankAttacker]
+                    && TYPE_EFFECT_MULTIPLIER(j) <= 5
+                    && gBattleMons[gBankAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
+                    && gBattleMons[gBankAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
                 {
-                    gBattleMons[gBankAttacker].type1 = gTypeEffectiveness[rands + 1];
-                    gBattleMons[gBankAttacker].type2 = gTypeEffectiveness[rands + 1];
+                    gBattleMons[gBankAttacker].type1 = TYPE_EFFECT_DEF_TYPE(rands);
+                    gBattleMons[gBankAttacker].type2 = TYPE_EFFECT_DEF_TYPE(rands);
 
-                    PREPARE_TYPE_BUFFER(gBattleTextBuff1, gTypeEffectiveness[rands + 1])
+                    PREPARE_TYPE_BUFFER(gBattleTextBuff1, TYPE_EFFECT_DEF_TYPE(rands))
 
                     gBattlescriptCurrInstr += 5;
                     return;
                 }
+                break;
             }
-            type += 3, rands += 3;
-        } while (rands < 336);
+        }
 
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
 
-#else
-__attribute__((naked))
-static void atkA6_settypetorandomresistance(void) // conversion 2
-{
-    asm(".syntax unified\n\
-	push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	ldr r1, =gUnknown_02024250\n\
-	ldr r4, =gBankAttacker\n\
-	ldrb r0, [r4]\n\
-	lsls r0, 1\n\
-	adds r2, r0, r1\n\
-	ldrh r1, [r2]\n\
-	cmp r1, 0\n\
-	beq _08052B7E\n\
-	ldr r0, =0x0000ffff\n\
-	cmp r1, r0\n\
-	beq _08052B7E\n\
-	ldrh r0, [r2]\n\
-	bl IsTwoTurnsMove\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _08052C1C\n\
-	ldr r1, =gBattleMons\n\
-	ldr r2, =gUnknown_02024270\n\
-	ldrb r0, [r4]\n\
-	adds r0, r2\n\
-	ldrb r2, [r0]\n\
-	movs r0, 0x58\n\
-	muls r0, r2\n\
-	adds r1, 0x50\n\
-	adds r0, r1\n\
-	ldr r0, [r0]\n\
-	movs r1, 0x80\n\
-	lsls r1, 5\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	beq _08052C1C\n\
-_08052B7E:\n\
-	ldr r3, =gBattlescriptCurrInstr\n\
-	ldr r2, [r3]\n\
-	ldrb r1, [r2, 0x1]\n\
-	ldrb r0, [r2, 0x2]\n\
-	lsls r0, 8\n\
-	orrs r1, r0\n\
-	ldrb r0, [r2, 0x3]\n\
-	lsls r0, 16\n\
-	orrs r1, r0\n\
-	ldrb r0, [r2, 0x4]\n\
-	lsls r0, 24\n\
-	orrs r1, r0\n\
-	str r1, [r3]\n\
-	b _08052D08\n\
-	.pool\n\
-_08052BB4:\n\
-	mov r0, r12\n\
-	strb r5, [r0]\n\
-	mov r1, r10\n\
-	ldrb r0, [r1]\n\
-	muls r0, r2\n\
-	adds r0, r7\n\
-	adds r0, 0x22\n\
-	strb r5, [r0]\n\
-	ldr r1, =gBattleTextBuff1\n\
-	movs r0, 0xFD\n\
-	strb r0, [r1]\n\
-	movs r0, 0x3\n\
-	strb r0, [r1, 0x1]\n\
-	strb r5, [r1, 0x2]\n\
-	movs r0, 0xFF\n\
-	strb r0, [r1, 0x3]\n\
-	ldr r1, =gBattlescriptCurrInstr\n\
-	b _08052C0A\n\
-	.pool\n\
-_08052BE0:\n\
-	mov r0, r8\n\
-	adds r0, 0x1\n\
-	adds r0, r3\n\
-	ldrb r2, [r0]\n\
-	strb r2, [r4]\n\
-	mov r4, r10\n\
-	ldrb r0, [r4]\n\
-	muls r0, r6\n\
-	ldr r7, =gBattleMons\n\
-	adds r0, r7\n\
-	adds r0, 0x22\n\
-	strb r2, [r0]\n\
-	ldr r1, =gBattleTextBuff1\n\
-	movs r0, 0xFD\n\
-	strb r0, [r1]\n\
-	movs r0, 0x3\n\
-	strb r0, [r1, 0x1]\n\
-	strb r2, [r1, 0x2]\n\
-	movs r0, 0xFF\n\
-	strb r0, [r1, 0x3]\n\
-	mov r1, r12\n\
-_08052C0A:\n\
-	ldr r0, [r1]\n\
-	adds r0, 0x5\n\
-	str r0, [r1]\n\
-	b _08052D08\n\
-	.pool\n\
-_08052C1C:\n\
-	movs r4, 0\n\
-	mov r8, r4\n\
-	movs r7, 0x7F\n\
-	mov r9, r7\n\
-_08052C24:\n\
-	bl Random\n\
-	mov r4, r9\n\
-	ands r4, r0\n\
-	cmp r4, 0x70\n\
-	bhi _08052C24\n\
-	lsls r0, r4, 1\n\
-	adds r4, r0, r4\n\
-	ldr r6, =gTypeEffectiveness\n\
-	adds r3, r4, r6\n\
-	ldr r1, =gUnknown_02024258\n\
-	ldr r2, =gBankAttacker\n\
-	ldrb r5, [r2]\n\
-	lsls r0, r5, 1\n\
-	adds r0, r1\n\
-	ldrb r1, [r3]\n\
-	mov r10, r2\n\
-	ldrh r0, [r0]\n\
-	cmp r1, r0\n\
-	bne _08052C80\n\
-	adds r0, r4, 0x2\n\
-	adds r0, r6\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0x5\n\
-	bhi _08052C80\n\
-	ldr r7, =gBattleMons\n\
-	movs r2, 0x58\n\
-	adds r0, r5, 0\n\
-	muls r0, r2\n\
-	adds r3, r0, r7\n\
-	movs r0, 0x21\n\
-	adds r0, r3\n\
-	mov r12, r0\n\
-	adds r0, r4, 0x1\n\
-	adds r0, r6\n\
-	ldrb r5, [r0]\n\
-	mov r1, r12\n\
-	ldrb r0, [r1]\n\
-	adds r1, r5, 0\n\
-	cmp r0, r1\n\
-	beq _08052C80\n\
-	adds r0, r3, 0\n\
-	adds r0, 0x22\n\
-	ldrb r0, [r0]\n\
-	cmp r0, r1\n\
-	bne _08052BB4\n\
-_08052C80:\n\
-	movs r7, 0x1\n\
-	add r8, r7\n\
-	ldr r0, =0x000003e7\n\
-	cmp r8, r0\n\
-	ble _08052C24\n\
-	movs r0, 0\n\
-	mov r8, r0\n\
-	ldr r1, =gBattlescriptCurrInstr\n\
-	mov r12, r1\n\
-	ldr r3, =gTypeEffectiveness\n\
-	adds r0, r4, 0x1\n\
-	adds r0, r3\n\
-	mov r9, r0\n\
-	adds r5, r3, 0\n\
-_08052C9C:\n\
-	ldrb r1, [r5]\n\
-	cmp r1, 0xFF\n\
-	bgt _08052CA6\n\
-	cmp r1, 0xFE\n\
-	bge _08052CE0\n\
-_08052CA6:\n\
-	mov r4, r10\n\
-	ldrb r2, [r4]\n\
-	lsls r0, r2, 1\n\
-	ldr r7, =gUnknown_02024258\n\
-	adds r0, r7\n\
-	ldrh r0, [r0]\n\
-	cmp r1, r0\n\
-	bne _08052CE0\n\
-	ldrb r0, [r5, 0x2]\n\
-	cmp r0, 0x5\n\
-	bhi _08052CE0\n\
-	movs r6, 0x58\n\
-	adds r0, r2, 0\n\
-	muls r0, r6\n\
-	ldr r1, =gBattleMons\n\
-	adds r2, r0, r1\n\
-	adds r4, r2, 0\n\
-	adds r4, 0x21\n\
-	ldrb r0, [r4]\n\
-	mov r7, r9\n\
-	ldrb r1, [r7]\n\
-	cmp r0, r1\n\
-	beq _08052CE0\n\
-	adds r0, r2, 0\n\
-	adds r0, 0x22\n\
-	ldrb r0, [r0]\n\
-	cmp r0, r1\n\
-	beq _08052CE0\n\
-	b _08052BE0\n\
-_08052CE0:\n\
-	adds r5, 0x3\n\
-	movs r0, 0x3\n\
-	add r8, r0\n\
-	ldr r0, =0x0000014f\n\
-	cmp r8, r0\n\
-	bls _08052C9C\n\
-	mov r1, r12\n\
-	ldr r2, [r1]\n\
-	ldrb r1, [r2, 0x1]\n\
-	ldrb r0, [r2, 0x2]\n\
-	lsls r0, 8\n\
-	orrs r1, r0\n\
-	ldrb r0, [r2, 0x3]\n\
-	lsls r0, 16\n\
-	orrs r1, r0\n\
-	ldrb r0, [r2, 0x4]\n\
-	lsls r0, 24\n\
-	orrs r1, r0\n\
-	mov r4, r12\n\
-	str r1, [r4]\n\
-_08052D08:\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n\
-        .syntax divided");
-}
-#endif // NONMATCHING
-
 static void atkA7_setalwayshitflag(void)
 {
     gStatuses3[gBankTarget] &= ~(STATUS3_ALWAYS_HITS);
@@ -9848,7 +9602,7 @@ static void atkC0_recoverbasedonsunlight(void)
 }
 
 #ifdef NONMATCHING
-static void atkC1_hidden_power(void)
+static void atkC1_hidden_power_calc(void)
 {
     s32 powerBits;
     s32 typeBits;
@@ -9879,7 +9633,7 @@ static void atkC1_hidden_power(void)
 
 #else
 __attribute__((naked))
-static void atkC1_hidden_power(void)
+static void atkC1_hidden_power_calc(void)
 {
     asm(".syntax unified\n\
         	push {r4-r7,lr}\n\
-- 
cgit v1.2.3


From b1abe40230f2815c58a08b02eabf831317a68f15 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 11 Nov 2017 22:58:23 +0100
Subject: atk9e_metronome matching

---
 src/battle_script_commands.c | 104 ++++++-------------------------------------
 1 file changed, 13 insertions(+), 91 deletions(-)

(limited to 'src')

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index ee23b629d..72bef41f1 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -8542,13 +8542,11 @@ static void atk9D_mimicattackcopy(void)
     }
 }
 
-#ifdef NONMATCHING
 static void atk9E_metronome(void)
 {
     while (1)
     {
-        const u16 *move;
-        s32 i, j;
+        s32 i;
 
         gCurrentMove = (Random() & 0x1FF) + 1;
         if (gCurrentMove > LAST_MOVE_INDEX)
@@ -8556,102 +8554,26 @@ static void atk9E_metronome(void)
 
         for (i = 0; i < 4; i++); // ?
 
-        for (move = sMovesForbiddenToCopy; ; move++)
+        i = -1;
+        while (1)
         {
-            if (*move == gCurrentMove)
+            i++;
+            if (sMovesForbiddenToCopy[i] == gCurrentMove)
                 break;
-            if (*move == METRONOME_FORBIDDEN_END)
+            if (sMovesForbiddenToCopy[i] == METRONOME_FORBIDDEN_END)
                 break;
         }
 
-        if (*move == METRONOME_FORBIDDEN_END)
-            break;
+        if (sMovesForbiddenToCopy[i] == METRONOME_FORBIDDEN_END)
+        {
+            gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
+            gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
+            gBankTarget = GetMoveTarget(gCurrentMove, 0);
+            return;
+        }
     }
-
-    gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
-    gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
-    gBankTarget = GetMoveTarget(gCurrentMove, 0);
-}
-
-#else
-__attribute__((naked))
-static void atk9E_metronome(void)
-{
-    asm(
-    "\n\
-    .syntax unified\n\
-	push {r4-r7,lr}\n\
-	mov r7, r8\n\
-	push {r7}\n\
-	ldr r7, =gCurrentMove\n\
-	movs r6, 0xB1\n\
-	lsls r6, 1\n\
-	ldr r5, =sMovesForbiddenToCopy\n\
-	ldr r0, =gBattlescriptCurrInstr\n\
-	mov r8, r0\n\
-_080524EE:\n\
-	bl Random\n\
-	ldr r2, =0x000001ff\n\
-	adds r1, r2, 0\n\
-	ands r0, r1\n\
-	adds r0, 0x1\n\
-	strh r0, [r7]\n\
-	cmp r0, r6\n\
-	bhi _080524EE\n\
-	movs r0, 0x3\n\
-_08052502:\n\
-	subs r0, 0x1\n\
-	cmp r0, 0\n\
-	bge _08052502\n\
-	ldr r4, =gCurrentMove\n\
-	ldrh r2, [r4]\n\
-	ldr r3, =0x0000ffff\n\
-	subs r0, r5, 0x2\n\
-_08052510:\n\
-	adds r0, 0x2\n\
-	ldrh r1, [r0]\n\
-	cmp r1, r2\n\
-	beq _0805251C\n\
-	cmp r1, r3\n\
-	bne _08052510\n\
-_0805251C:\n\
-	ldr r0, =0x0000ffff\n\
-	cmp r1, r0\n\
-	bne _080524EE\n\
-	ldr r2, =gHitMarker\n\
-	ldr r0, [r2]\n\
-	ldr r1, =0xfffffbff\n\
-	ands r0, r1\n\
-	str r0, [r2]\n\
-	ldr r3, =gBattleScriptsForMoveEffects\n\
-	ldr r2, =gBattleMoves\n\
-	ldrh r1, [r4]\n\
-	lsls r0, r1, 1\n\
-	adds r0, r1\n\
-	lsls r0, 2\n\
-	adds r0, r2\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 2\n\
-	adds r0, r3\n\
-	ldr r0, [r0]\n\
-	mov r1, r8\n\
-	str r0, [r1]\n\
-	ldrh r0, [r4]\n\
-	movs r1, 0\n\
-	bl GetMoveTarget\n\
-	ldr r1, =gBankTarget\n\
-	strb r0, [r1]\n\
-	pop {r3}\n\
-	mov r8, r3\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-    .pool\n\
-    .syntax divided");
 }
 
-#endif // NONMATCHING
-
 static void atk9F_dmgtolevel(void)
 {
     gBattleMoveDamage = gBattleMons[gBankAttacker].level;
-- 
cgit v1.2.3


From c3f6f528e865155f359ca2ff10b68ace1cc99edb Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 12 Nov 2017 00:16:46 +0100
Subject: come closer maybe

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

(limited to 'src')

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 72bef41f1..a619ee778 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -9526,22 +9526,22 @@ static void atkC0_recoverbasedonsunlight(void)
 #ifdef NONMATCHING
 static void atkC1_hidden_power_calc(void)
 {
-    s32 powerBits;
-    s32 typeBits;
-
-    powerBits = ((gBattleMons[gBankAttacker].hpIV & 2) >> 1)
-                  | ((gBattleMons[gBankAttacker].attackIV & 2) << 0)
-                  | ((gBattleMons[gBankAttacker].defenseIV & 2) << 1)
-                  | ((gBattleMons[gBankAttacker].speedIV & 2) << 2)
-                  | ((gBattleMons[gBankAttacker].spAttackIV & 2) << 3)
-                  | ((gBattleMons[gBankAttacker].spDefenseIV & 2) << 4);
-
-    typeBits = ((gBattleMons[gBankAttacker].hpIV & 1) << 0)
-                  | ((gBattleMons[gBankAttacker].attackIV & 1) << 1)
-                  | ((gBattleMons[gBankAttacker].defenseIV & 1) << 2)
-                  | ((gBattleMons[gBankAttacker].speedIV & 1) << 3)
-                  | ((gBattleMons[gBankAttacker].spAttackIV & 1) << 4)
-                  | ((gBattleMons[gBankAttacker].spDefenseIV & 1) << 5);
+    u32 powerBits = 0;
+    u32 typeBits = 0;
+
+    powerBits |= ((gBattleMons[gBankAttacker].hpIV & 2) >> 1);
+    powerBits |= ((gBattleMons[gBankAttacker].attackIV & 2) << 0);
+    powerBits |= ((gBattleMons[gBankAttacker].defenseIV & 2) << 1);
+    powerBits |= ((gBattleMons[gBankAttacker].speedIV & 2) << 2);
+    powerBits |= ((gBattleMons[gBankAttacker].spAttackIV & 2) << 3);
+    powerBits |= ((gBattleMons[gBankAttacker].spDefenseIV & 2) << 4);
+
+    typeBits |= ((gBattleMons[gBankAttacker].hpIV & 1) << 0);
+    typeBits |= ((gBattleMons[gBankAttacker].attackIV & 1) << 1);
+    typeBits |= ((gBattleMons[gBankAttacker].defenseIV & 1) << 2);
+    typeBits |= ((gBattleMons[gBankAttacker].speedIV & 1) << 3);
+    typeBits |= ((gBattleMons[gBankAttacker].spAttackIV & 1) << 4);
+    typeBits |= ((gBattleMons[gBankAttacker].spDefenseIV & 1) << 5);
 
     gDynamicBasePower = (40 * powerBits) / 63 + 30;
 
-- 
cgit v1.2.3


From 47a8c6c432d377cf21e479ffd2c5dc1e2a800108 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 12 Nov 2017 16:39:21 +0100
Subject: battle5 decompiled and renamed

---
 src/battle_2.c     |   2 +-
 src/battle_util2.c | 219 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+), 1 deletion(-)
 create mode 100644 src/battle_util2.c

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index e4ee624fb..27131adb3 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -353,7 +353,7 @@ static const u8 sUnknown_0831BCF3[] = {4, 4, 4, 4};
 void CB2_InitBattle(void)
 {
     MoveSaveBlocks_ResetHeap();
-    AllocateBattleResrouces();
+    AllocateBattleResources();
     AllocateBattleSpritesData();
     AllocateMonSpritesGfx();
     sub_8185F84();
diff --git a/src/battle_util2.c b/src/battle_util2.c
new file mode 100644
index 000000000..e119c85d7
--- /dev/null
+++ b/src/battle_util2.c
@@ -0,0 +1,219 @@
+#include "global.h"
+#include "battle.h"
+#include "battle_controllers.h"
+#include "malloc.h"
+#include "pokemon.h"
+#include "event_data.h"
+#include "abilities.h"
+#include "rng.h"
+
+extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
+extern u8 gUnknown_0203CF00[];
+extern const u8* gBattlescriptCurrInstr;
+extern u8 gBattleCommunication[];
+extern u8 gActiveBank;
+
+extern const u8 BattleScript_MoveUsedWokeUp[];
+extern const u8 BattleScript_MoveUsedIsFrozen[];
+extern const u8 BattleScript_MoveUsedUnfroze[];
+extern const u8 BattleScript_MoveUsedIsAsleep[];
+
+extern void sub_81D55D0(void);
+extern void sub_81D5694(void);
+extern u8 pokemon_order_func(u8);
+extern void sub_81B8FB0(u8, u8);
+
+void AllocateBattleResources(void)
+{
+    gBattleResources = gBattleResources; // something dumb needed to match
+
+    if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
+        sub_81D55D0();
+
+    gBattleStruct = AllocZeroed(sizeof(*gBattleStruct));
+
+    gBattleResources = AllocZeroed(sizeof(*gBattleResources));
+    gBattleResources->secretBase = AllocZeroed(sizeof(*gBattleResources->secretBase));
+    gBattleResources->flags = AllocZeroed(sizeof(*gBattleResources->flags));
+    gBattleResources->battleScriptsStack = AllocZeroed(sizeof(*gBattleResources->battleScriptsStack));
+    gBattleResources->battleCallbackStack = AllocZeroed(sizeof(*gBattleResources->battleCallbackStack));
+    gBattleResources->statsBeforeLvlUp = AllocZeroed(sizeof(*gBattleResources->statsBeforeLvlUp));
+    gBattleResources->ai = AllocZeroed(sizeof(*gBattleResources->ai));
+    gBattleResources->battleHistory = AllocZeroed(sizeof(*gBattleResources->battleHistory));
+    gBattleResources->AI_ScriptsStack = AllocZeroed(sizeof(*gBattleResources->AI_ScriptsStack));
+
+    gLinkBattleSendBuffer = AllocZeroed(BATTLE_BUFFER_LINK_SIZE);
+    gLinkBattleRecvBuffer = AllocZeroed(BATTLE_BUFFER_LINK_SIZE);
+
+    gUnknown_0202305C = AllocZeroed(0x2000);
+    gUnknown_02023060 = AllocZeroed(0x1000);
+
+    if (gBattleTypeFlags & BATTLE_TYPE_SECRET_BASE)
+    {
+        u16 currSecretBaseId = VarGet(VAR_0x4054);
+        CreateSecretBaseEnemyParty(&gSaveBlock1Ptr->secretBases[currSecretBaseId]);
+    }
+}
+
+void FreeBattleResources(void)
+{
+    if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
+        sub_81D5694();
+
+    if (gBattleResources != NULL)
+    {
+        FREE_AND_SET_NULL(gBattleStruct);
+
+        FREE_AND_SET_NULL(gBattleResources->secretBase);
+        FREE_AND_SET_NULL(gBattleResources->flags);
+        FREE_AND_SET_NULL(gBattleResources->battleScriptsStack);
+        FREE_AND_SET_NULL(gBattleResources->battleCallbackStack);
+        FREE_AND_SET_NULL(gBattleResources->statsBeforeLvlUp);
+        FREE_AND_SET_NULL(gBattleResources->ai);
+        FREE_AND_SET_NULL(gBattleResources->battleHistory);
+        FREE_AND_SET_NULL(gBattleResources->AI_ScriptsStack);
+        FREE_AND_SET_NULL(gBattleResources);
+
+        FREE_AND_SET_NULL(gLinkBattleSendBuffer);
+        FREE_AND_SET_NULL(gLinkBattleRecvBuffer);
+
+        FREE_AND_SET_NULL(gUnknown_0202305C);
+        FREE_AND_SET_NULL(gUnknown_02023060);
+    }
+}
+
+void AdjustFriendshipOnBattleFaint(u8 bank)
+{
+    u8 opposingBank;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
+    {
+        u8 opposingBank2;
+
+        opposingBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        opposingBank2 = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+
+        if (gBattleMons[opposingBank2].level > gBattleMons[opposingBank].level)
+            opposingBank = opposingBank2;
+    }
+    else
+    {
+        opposingBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+    }
+
+    if (gBattleMons[opposingBank].level > gBattleMons[bank].level)
+    {
+        if (gBattleMons[opposingBank].level - gBattleMons[bank].level > 29)
+            AdjustFriendship(&gPlayerParty[gBattlePartyID[bank]], 8);
+        else
+            AdjustFriendship(&gPlayerParty[gBattlePartyID[bank]], 6);
+    }
+    else
+    {
+        AdjustFriendship(&gPlayerParty[gBattlePartyID[bank]], 6);
+    }
+}
+
+void sub_80571DC(u8 bank, u8 arg1)
+{
+    if (GetBankSide(bank) != SIDE_OPPONENT)
+    {
+        s32 i;
+
+        // gBattleStruct->field_60[0][i]
+
+        for (i = 0; i < 3; i++)
+            gUnknown_0203CF00[i] = *(0 * 3 + i + (u8*)(gBattleStruct->field_60));
+
+        sub_81B8FB0(pokemon_order_func(gBattlePartyID[bank]), pokemon_order_func(arg1));
+
+        for (i = 0; i < 3; i++)
+            *(0 * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+    }
+}
+
+u32 sub_805725C(u8 bank)
+{
+    u32 effect = 0;
+
+    do
+    {
+        switch (gBattleCommunication[MULTIUSE_STATE])
+        {
+        case 0:
+            if (gBattleMons[bank].status1 & STATUS_SLEEP)
+            {
+                if (UproarWakeUpCheck(bank))
+                {
+                    gBattleMons[bank].status1 &= ~(STATUS_SLEEP);
+                    gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
+                    BattleScriptPushCursor();
+                    gBattleCommunication[MULTISTRING_CHOOSER] = 1;
+                    gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
+                    effect = 2;
+                }
+                else
+                {
+                    u32 toSub;
+
+                    if (gBattleMons[bank].ability == ABILITY_EARLY_BIRD)
+                        toSub = 2;
+                    else
+                        toSub = 1;
+
+                    if ((gBattleMons[bank].status1 & STATUS_SLEEP) < toSub)
+                        gBattleMons[bank].status1 &= ~(STATUS_SLEEP);
+                    else
+                        gBattleMons[bank].status1 -= toSub;
+
+                    if (gBattleMons[bank].status1 & STATUS_SLEEP)
+                    {
+                        gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep;
+                        effect = 2;
+                    }
+                    else
+                    {
+                        gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
+                        BattleScriptPushCursor();
+                        gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+                        gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
+                        effect = 2;
+                    }
+                }
+            }
+            gBattleCommunication[MULTIUSE_STATE]++;
+            break;
+        case 1:
+            if (gBattleMons[bank].status1 & STATUS_FREEZE)
+            {
+                if (Random() % 5 != 0)
+                {
+                    gBattlescriptCurrInstr = BattleScript_MoveUsedIsFrozen;
+                }
+                else
+                {
+                    gBattleMons[bank].status1 &= ~(STATUS_FREEZE);
+                    BattleScriptPushCursor();
+                    gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
+                    gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+                }
+                effect = 2;
+            }
+            gBattleCommunication[MULTIUSE_STATE]++;
+            break;
+        case 2:
+            break;
+        }
+
+    } while (gBattleCommunication[MULTIUSE_STATE] != 2 && effect == 0);
+
+    if (effect == 2)
+    {
+        gActiveBank = bank;
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
+        MarkBufferBankForExecution(gActiveBank);
+    }
+
+    return effect;
+}
-- 
cgit v1.2.3


From 9febe24d9fb41633d3d95b97899ebe1cf60486fc Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 12 Nov 2017 17:06:31 +0100
Subject: label some battle struct fields

---
 src/battle_2.c                            | 22 +++++------
 src/battle_ai_switch_items.c              | 65 +++++++++++++++----------------
 src/battle_controller_opponent.c          | 10 ++---
 src/battle_controller_player_partner.c    |  2 +-
 src/battle_controller_recorded_opponent.c |  4 +-
 src/battle_controller_recorded_player.c   |  4 +-
 src/battle_script_commands.c              | 28 ++++++-------
 src/battle_util.c                         |  2 +-
 8 files changed, 67 insertions(+), 70 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 27131adb3..31c88f6fb 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -2853,9 +2853,9 @@ static void BattleStartClearSetData(void)
         *(i + 3 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
     }
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
     {
-        *(gBattleStruct->field_294 + i) = 6;
+        *(gBattleStruct->AI_monToSwitchIntoId + i) = 6;
     }
 
     gBattleStruct->field_DF = 0;
@@ -3682,7 +3682,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     }
     for (i = 0; i < BATTLE_BANKS_COUNT; i++)
     {
-        *(gBattleStruct->field_5C + i) = 6;
+        *(gBattleStruct->monToSwitchIntoId + i) = 6;
         gActionForBanks[i] = ACTION_INIT_VALUE;
         gChosenMovesByBanks[i] = MOVE_NONE;
     }
@@ -3793,7 +3793,7 @@ void BattleTurnPassed(void)
     }
 
     for (i = 0; i < 4; i++)
-        *(gBattleStruct->field_5C + i) = 6;
+        *(gBattleStruct->monToSwitchIntoId + i) = 6;
 
     *(&gBattleStruct->field_91) = gAbsentBankFlags;
     BattleHandleAddTextPrinter(gText_EmptyString3, 0);
@@ -3884,7 +3884,7 @@ void sub_803BDA0(u8 bank)
         gUnknown_0203CF00[i] = *(bank * 3 + i + (u8*)(gBattleStruct->field_60));
 
     r4 = pokemon_order_func(gBattlePartyID[bank]);
-    r1 = pokemon_order_func(*(gBattleStruct->field_5C + bank));
+    r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + bank));
     sub_81B8FB0(r4, r1);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -3932,7 +3932,7 @@ static void HandleTurnActionSelectionState(void)
             gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
             break;
         case STATE_BEFORE_ACTION_CHOSEN: // choose an action
-            *(gBattleStruct->field_5C + gActiveBank) = 6;
+            *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI
                 || !(identity & BIT_MON)
                 || gBattleStruct->field_91 & gBitTable[GetBankByIdentity(identity ^ BIT_MON)]
@@ -4050,9 +4050,9 @@ static void HandleTurnActionSelectionState(void)
                     else
                     {
                         if (gActiveBank == 2 && gActionForBanks[0] == ACTION_SWITCH)
-                            EmitChoosePokemon(0, 0, *(gBattleStruct->field_5C + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
                         else if (gActiveBank == 3 && gActionForBanks[1] == ACTION_SWITCH)
-                            EmitChoosePokemon(0, 0, *(gBattleStruct->field_5C + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
                         else
                             EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
                     }
@@ -4339,7 +4339,7 @@ static void HandleTurnActionSelectionState(void)
             for (i = 0; i < gNoOfAllBanks; i++)
             {
                 if (gActionForBanks[i] == ACTION_SWITCH)
-                    sub_80571DC(i, *(gBattleStruct->field_5C + i));
+                    sub_80571DC(i, *(gBattleStruct->monToSwitchIntoId + i));
             }
         }
     }
@@ -4363,7 +4363,7 @@ static bool8 sub_803CDB8(void)
 
 static void sub_803CDF8(void)
 {
-    *(gBattleStruct->field_5C + gActiveBank) = gBattleBufferB[gActiveBank][1];
+    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = gBattleBufferB[gActiveBank][1];
     RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]);
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
@@ -5618,7 +5618,7 @@ static void HandleAction_NothingIsFainted(void)
 
 static void HandleAction_ActionFinished(void)
 {
-    *(gBattleStruct->field_5C + gBanksByTurnOrder[gCurrentTurnActionNumber]) = 6;
+    *(gBattleStruct->monToSwitchIntoId + gBanksByTurnOrder[gCurrentTurnActionNumber]) = 6;
     gCurrentTurnActionNumber++;
     gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
     SpecialStatusesClear();
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index a57df85fb..fcf6895b6 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -38,7 +38,7 @@ static bool8 ShouldSwitchIfPerishSong(void)
     if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG
         && gDisableStructs[gActiveBank].perishSong1 == 0)
     {
-        *(gBattleStruct->field_294 + gActiveBank) = 6;
+        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
@@ -120,7 +120,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
             if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % 3 < 2)
             {
                 // we found a mon
-                *(gBattleStruct->field_294 + gActiveBank) = i;
+                *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
                 EmitTwoReturnValues(1, ACTION_SWITCH, 0);
                 return TRUE;
             }
@@ -206,9 +206,9 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
             continue;
         if (i == gBattlePartyID[bankIn2])
             continue;
-        if (i == *(gBattleStruct->field_5C + bankIn1))
+        if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
             continue;
-        if (i == *(gBattleStruct->field_5C + bankIn2))
+        if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2))
             continue;
 
         species = GetMonData(&party[i], MON_DATA_SPECIES);
@@ -220,7 +220,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
         if (absorbingTypeAbility == monAbility && Random() & 1)
         {
             // we found a mon
-            *(gBattleStruct->field_294 + gActiveBank) = i;
+            *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
             EmitTwoReturnValues(1, ACTION_SWITCH, 0);
             return TRUE;
         }
@@ -240,13 +240,13 @@ static bool8 ShouldSwitchIfNaturalCure(void)
 
     if ((gUnknown_02024250[gActiveBank] == 0 || gUnknown_02024250[gActiveBank] == 0xFFFF) && Random() & 1)
     {
-        *(gBattleStruct->field_294 + gActiveBank) = 6;
+        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
     else if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0 && Random() & 1)
     {
-        *(gBattleStruct->field_294 + gActiveBank) = 6;
+        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
@@ -257,7 +257,7 @@ static bool8 ShouldSwitchIfNaturalCure(void)
         return TRUE;
     if (Random() & 1)
     {
-        *(gBattleStruct->field_294 + gActiveBank) = 6;
+        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
@@ -400,9 +400,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
             continue;
         if (i == gBattlePartyID[bankIn2])
             continue;
-        if (i == *(gBattleStruct->field_5C + bankIn1))
+        if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
             continue;
-        if (i == *(gBattleStruct->field_5C + bankIn2))
+        if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2))
             continue;
 
         species = GetMonData(&party[i], MON_DATA_SPECIES);
@@ -425,7 +425,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
                 moveFlags = AI_TypeCalc(move, gBattleMons[bankIn1].species, gBattleMons[bankIn1].ability);
                 if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % moduloPercent == 0)
                 {
-                    *(gBattleStruct->field_294 + gActiveBank) = i;
+                    *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
                     EmitTwoReturnValues(1, ACTION_SWITCH, 0);
                     return TRUE;
                 }
@@ -508,9 +508,9 @@ static bool8 ShouldSwitch(void)
             continue;
         if (i == gBattlePartyID[bankIn2])
             continue;
-        if (i == *(gBattleStruct->field_5C + bankIn1))
+        if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
             continue;
-        if (i == *(gBattleStruct->field_5C + bankIn2))
+        if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2))
             continue;
 
         availableToSwitch++;
@@ -554,7 +554,7 @@ void AI_TrySwitchOrUseItem(void)
     {
         if (ShouldSwitch())
         {
-            if (*(gBattleStruct->field_294 + gActiveBank) == 6)
+            if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) == 6)
             {
                 s32 monToSwitchId = GetMostSuitableMonToSwitchInto();
                 if (monToSwitchId == 6)
@@ -590,19 +590,19 @@ void AI_TrySwitchOrUseItem(void)
                             continue;
                         if (monToSwitchId == gBattlePartyID[bankIn2])
                             continue;
-                        if (monToSwitchId == *(gBattleStruct->field_5C + bankIn1))
+                        if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + bankIn1))
                             continue;
-                        if (monToSwitchId == *(gBattleStruct->field_5C + bankIn2))
+                        if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + bankIn2))
                             continue;
 
                         break;
                     }
                 }
 
-                *(gBattleStruct->field_294 + gActiveBank) = monToSwitchId;
+                *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = monToSwitchId;
             }
 
-            *(gBattleStruct->field_5C + gActiveBank) = *(gBattleStruct->field_294 + gActiveBank);
+            *(gBattleStruct->monToSwitchIntoId + gActiveBank) = *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank);
             return;
         }
         else if (ShouldUseItem())
@@ -614,28 +614,25 @@ void AI_TrySwitchOrUseItem(void)
     EmitTwoReturnValues(1, ACTION_USE_MOVE, (gActiveBank ^ BIT_SIDE) << 8);
 }
 
-#define TYPE_FORESIGHT  0xFE
-#define TYPE_ENDTABLE   0xFF
-
 static void ModulateByTypeEffectiveness(u8 atkType, u8 defType1, u8 defType2, u8 *var)
 {
     s32 i = 0;
 
-    while (gTypeEffectiveness[i] != TYPE_ENDTABLE)
+    while (TYPE_EFFECT_ATK_TYPE(i) != TYPE_ENDTABLE)
     {
-        if (gTypeEffectiveness[i] == TYPE_FORESIGHT)
+        if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
         {
             i += 3;
             continue;
         }
-        else if (gTypeEffectiveness[i] == atkType)
+        else if (TYPE_EFFECT_ATK_TYPE(i) == atkType)
         {
             // check type1
-            if (gTypeEffectiveness[i + 1] == defType1)
-                *var = (*var * gTypeEffectiveness[i + 2]) / 10;
+            if (TYPE_EFFECT_DEF_TYPE(i) == defType1)
+                *var = (*var * TYPE_EFFECT_MULTIPLIER(i)) / 10;
             // check type2
-            if (gTypeEffectiveness[i + 1] == defType2 && defType1 != defType2)
-                *var = (*var * gTypeEffectiveness[i + 2]) / 10;
+            if (TYPE_EFFECT_DEF_TYPE(i) == defType2 && defType1 != defType2)
+                *var = (*var * TYPE_EFFECT_MULTIPLIER(i)) / 10;
         }
         i += 3;
     }
@@ -654,8 +651,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
     u8 invalidMons;
     u16 move;
 
-    if (*(gBattleStruct->field_5C + gActiveBank) != 6)
-        return *(gBattleStruct->field_5C + gActiveBank);
+    if (*(gBattleStruct->monToSwitchIntoId + gActiveBank) != 6)
+        return *(gBattleStruct->monToSwitchIntoId + gActiveBank);
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
         return gBattlePartyID[gActiveBank] + 1;
 
@@ -711,8 +708,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
                 && !(gBitTable[i] & invalidMons)
                 && gBattlePartyID[bankIn1] != i
                 && gBattlePartyID[bankIn2] != i
-                && i != *(gBattleStruct->field_5C + bankIn1)
-                && i != *(gBattleStruct->field_5C + bankIn2))
+                && i != *(gBattleStruct->monToSwitchIntoId + bankIn1)
+                && i != *(gBattleStruct->monToSwitchIntoId + bankIn2))
             {
                 u8 type1 = gBaseStats[species].type1;
                 u8 type2 = gBaseStats[species].type2;
@@ -771,9 +768,9 @@ u8 GetMostSuitableMonToSwitchInto(void)
             continue;
         if (gBattlePartyID[bankIn2] == i)
             continue;
-        if (i == *(gBattleStruct->field_5C + bankIn1))
+        if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
             continue;
-        if (i == *(gBattleStruct->field_5C + bankIn2))
+        if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2))
             continue;
 
         for (j = 0; j < 4; j++)
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 831f434b0..0aac4cbe4 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1168,7 +1168,7 @@ static void OpponentHandleLoadMonSprite(void)
 
 static void OpponentHandleSwitchInAnim(void)
 {
-    *(gBattleStruct->field_5C + gActiveBank) = 6;
+    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
     gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
     sub_80613DC(gActiveBank, gBattleBufferA[gActiveBank][2]);
     gBattleBankFunc[gActiveBank] = sub_805FDF0;
@@ -1627,7 +1627,7 @@ static void OpponentHandleChoosePokemon(void)
 {
     s32 chosenMonId;
 
-    if (*(gBattleStruct->field_294 + gActiveBank) == 6)
+    if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) == 6)
     {
         chosenMonId = GetMostSuitableMonToSwitchInto();
 
@@ -1670,12 +1670,12 @@ static void OpponentHandleChoosePokemon(void)
     }
     else
     {
-        chosenMonId = *(gBattleStruct->field_294 + gActiveBank);
-        *(gBattleStruct->field_294 + gActiveBank) = 6;
+        chosenMonId = *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank);
+        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
     }
 
 
-    *(gBattleStruct->field_5C + gActiveBank) = chosenMonId;
+    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = chosenMonId;
     EmitChosenMonReturnValue(1, chosenMonId, NULL);
     OpponentBufferExecCompleted();
 }
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 6ace9121c..4d1afbf11 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -1581,7 +1581,7 @@ static void PlayerPartnerHandleChoosePokemon(void)
         }
     }
 
-    *(gBattleStruct->field_5C + gActiveBank) = chosenMonId;
+    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = chosenMonId;
     EmitChosenMonReturnValue(1, chosenMonId, NULL);
     PlayerPartnerBufferExecCompleted();
 }
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 914ad9c43..096d548a7 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -1474,8 +1474,8 @@ static void RecordedOpponentHandleChooseItem(void)
 
 static void RecordedOpponentHandleChoosePokemon(void)
 {
-    *(gBattleStruct->field_5C + gActiveBank) = RecordedBattle_ReadBankAction(gActiveBank);
-    EmitChosenMonReturnValue(1, *(gBattleStruct->field_5C + gActiveBank), NULL);
+    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = RecordedBattle_ReadBankAction(gActiveBank);
+    EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBank), NULL);
     RecordedOpponentBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 8db7b5626..108200a33 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -1492,8 +1492,8 @@ static void RecordedPlayerHandleChooseItem(void)
 
 static void RecordedPlayerHandleChoosePokemon(void)
 {
-    *(gBattleStruct->field_5C + gActiveBank) = RecordedBattle_ReadBankAction(gActiveBank);
-    EmitChosenMonReturnValue(1, *(gBattleStruct->field_5C + gActiveBank), NULL);
+    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = RecordedBattle_ReadBankAction(gActiveBank);
+    EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBank), NULL);
     RecordedPlayerBufferExecCompleted();
 }
 
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index dc725136c..b7a38e2f1 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -5330,7 +5330,7 @@ static void atk4C_get_switched_mon_data(void)
 
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-    gBattlePartyID[gActiveBank] = *(gBattleStruct->field_5C + gActiveBank);
+    gBattlePartyID[gActiveBank] = *(gBattleStruct->monToSwitchIntoId + gActiveBank);
 
     EmitGetMonData(0, REQUEST_ALL_BATTLE, gBitTable[gBattlePartyID[gActiveBank]]);
     MarkBufferBankForExecution(gActiveBank);
@@ -5574,7 +5574,7 @@ static void atk4F_jump_if_cannot_switch(void)
 static void sub_804CF10(u8 arg0)
 {
     *(gBattleStruct->field_58 + gActiveBank) = gBattlePartyID[gActiveBank];
-    *(gBattleStruct->field_5C + gActiveBank) = 6;
+    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
     gBattleStruct->field_93 &= ~(gBitTable[gActiveBank]);
 
     EmitChoosePokemon(0, 1, arg0, 0, gBattleStruct->field_60[gActiveBank]);
@@ -5638,7 +5638,7 @@ static void atk50_openpartyscreen(void)
                 }
                 else if (!gSpecialStatuses[gActiveBank].flag40)
                 {
-                    sub_804CF10(gBattleStruct->field_5C[2]);
+                    sub_804CF10(gBattleStruct->monToSwitchIntoId[2]);
                     gSpecialStatuses[gActiveBank].flag40 = 1;
                 }
                 else
@@ -5660,7 +5660,7 @@ static void atk50_openpartyscreen(void)
                 }
                 else if (!gSpecialStatuses[gActiveBank].flag40)
                 {
-                    sub_804CF10(gBattleStruct->field_5C[0]);
+                    sub_804CF10(gBattleStruct->monToSwitchIntoId[0]);
                     gSpecialStatuses[gActiveBank].flag40 = 1;
                 }
                 else if (!(flags & 1))
@@ -5681,7 +5681,7 @@ static void atk50_openpartyscreen(void)
                 }
                 else if (!gSpecialStatuses[gActiveBank].flag40)
                 {
-                    sub_804CF10(gBattleStruct->field_5C[3]);
+                    sub_804CF10(gBattleStruct->monToSwitchIntoId[3]);
                     gSpecialStatuses[gActiveBank].flag40 = 1;
                 }
                 else
@@ -5703,7 +5703,7 @@ static void atk50_openpartyscreen(void)
                 }
                 else if (!gSpecialStatuses[gActiveBank].flag40)
                 {
-                    sub_804CF10(gBattleStruct->field_5C[1]);
+                    sub_804CF10(gBattleStruct->monToSwitchIntoId[1]);
                     gSpecialStatuses[gActiveBank].flag40 = 1;
                 }
                 else if (!(flags & 2))
@@ -5766,7 +5766,7 @@ static void atk50_openpartyscreen(void)
                     }
                     else if (!gSpecialStatuses[gActiveBank].flag40)
                     {
-                        sub_804CF10(gBattleStruct->field_5C[0]);
+                        sub_804CF10(gBattleStruct->monToSwitchIntoId[0]);
                         gSpecialStatuses[gActiveBank].flag40 = 1;
                     }
                 }
@@ -5782,7 +5782,7 @@ static void atk50_openpartyscreen(void)
                     }
                     else if (!gSpecialStatuses[gActiveBank].flag40)
                     {
-                        sub_804CF10(gBattleStruct->field_5C[1]);
+                        sub_804CF10(gBattleStruct->monToSwitchIntoId[1]);
                         gSpecialStatuses[gActiveBank].flag40 = 1;
                     }
                 }
@@ -5836,10 +5836,10 @@ static void atk50_openpartyscreen(void)
         {
             gActiveBank = bank;
             *(gBattleStruct->field_58 + gActiveBank) = gBattlePartyID[gActiveBank];
-            *(gBattleStruct->field_5C + gActiveBank) = 6;
+            *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
             gBattleStruct->field_93 &= ~(gBitTable[gActiveBank]);
 
-            EmitChoosePokemon(0, hitmarkerFaintBits, *(gBattleStruct->field_5C + (gActiveBank ^ 2)), 0, gBattleStruct->field_60[gActiveBank]);
+            EmitChoosePokemon(0, hitmarkerFaintBits, *(gBattleStruct->monToSwitchIntoId + (gActiveBank ^ 2)), 0, gBattleStruct->field_60[gActiveBank]);
             MarkBufferBankForExecution(gActiveBank);
 
             gBattlescriptCurrInstr += 6;
@@ -5886,7 +5886,7 @@ static void atk51_switch_handle_order(void)
         {
             if (gBattleBufferB[i][0] == 0x22)
             {
-                *(gBattleStruct->field_5C + i) = gBattleBufferB[i][1];
+                *(gBattleStruct->monToSwitchIntoId + i) = gBattleBufferB[i][1];
                 if (!(gBattleStruct->field_93 & gBitTable[i]))
                 {
                     RecordedBattle_SetBankAction(i, gBattleBufferB[i][1]);
@@ -5908,7 +5908,7 @@ static void atk51_switch_handle_order(void)
         // fall through
     case 3:
         gBattleCommunication[0] = gBattleBufferB[gActiveBank][1];
-        *(gBattleStruct->field_5C + gActiveBank) = gBattleBufferB[gActiveBank][1];
+        *(gBattleStruct->monToSwitchIntoId + gActiveBank) = gBattleBufferB[gActiveBank][1];
 
         if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
@@ -5922,7 +5922,7 @@ static void atk51_switch_handle_order(void)
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
         {
-            sub_80571DC(gActiveBank, *(gBattleStruct->field_5C + gActiveBank));
+            sub_80571DC(gActiveBank, *(gBattleStruct->monToSwitchIntoId + gActiveBank));
         }
         else
         {
@@ -8029,7 +8029,7 @@ static void atk8F_forcerandomswitch(void)
                        || GetMonData(&party[i], MON_DATA_IS_EGG) == TRUE
                        || GetMonData(&party[i], MON_DATA_HP) == 0);
             }
-            *(gBattleStruct->field_5C + gBankTarget) = i;
+            *(gBattleStruct->monToSwitchIntoId + gBankTarget) = i;
 
             if (!sub_81B1250())
                 sub_803BDA0(gBankTarget);
diff --git a/src/battle_util.c b/src/battle_util.c
index 468b2c46d..b9b2f1e1d 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1805,7 +1805,7 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
              && GetMonData(&party[i], MON_DATA_SPECIES2) != 0
              && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG
             // FIXME: Using index[array] instead of array[index] is BAD!
-             && i != r1 && i != r2 && i != r7[gBattleStruct->field_5C] && i != r6[gBattleStruct->field_5C])
+             && i != r1 && i != r2 && i != r7[gBattleStruct->monToSwitchIntoId] && i != r6[gBattleStruct->monToSwitchIntoId])
                 break;
         }
         return (i == 6);
-- 
cgit v1.2.3


From 716590c165791ce33e18bd97c8ee2e26c580e5f8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 12 Nov 2017 17:11:06 +0100
Subject: one more battle label change

---
 src/battle_2.c               | 4 ++--
 src/battle_ai_switch_items.c | 2 +-
 src/battle_script_commands.c | 6 ++----
 src/battle_util.c            | 6 +++---
 4 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 31c88f6fb..703315374 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -2935,8 +2935,8 @@ void SwitchInClearSetData(void)
     {
         gDisableStructs[gActiveBank].substituteHP = disableStructCopy.substituteHP;
         gDisableStructs[gActiveBank].bankWithSureHit = disableStructCopy.bankWithSureHit;
-        gDisableStructs[gActiveBank].perishSong1 = disableStructCopy.perishSong1;
-        gDisableStructs[gActiveBank].perishSong2 = disableStructCopy.perishSong2;
+        gDisableStructs[gActiveBank].perishSongTimer1 = disableStructCopy.perishSongTimer1;
+        gDisableStructs[gActiveBank].perishSongTimer2 = disableStructCopy.perishSongTimer2;
         gDisableStructs[gActiveBank].bankPreventingEscape = disableStructCopy.bankPreventingEscape;
     }
 
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index fcf6895b6..75d144c3d 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -36,7 +36,7 @@ static bool8 ShouldUseItem(void);
 static bool8 ShouldSwitchIfPerishSong(void)
 {
     if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG
-        && gDisableStructs[gActiveBank].perishSong1 == 0)
+        && gDisableStructs[gActiveBank].perishSongTimer1 == 0)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index b7a38e2f1..9dec308bb 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -120,8 +120,6 @@ struct TrainerMoney
 extern const struct BattleMove gBattleMoves[];
 extern const struct BaseStats gBaseStats[];
 extern const u8 gTypeEffectiveness[336];
-extern const u16 gMissStringIds[];
-extern const u16 gTrappingMoves[];
 extern const struct TrainerMoney gTrainerMoneyTable[];
 extern const u8* const gBattleScriptsForMoveEffects[];
 
@@ -9180,8 +9178,8 @@ static void atkB2_setperishsong(void)
         else
         {
             gStatuses3[i] |= STATUS3_PERISH_SONG;
-            gDisableStructs[i].perishSong1 = 3;
-            gDisableStructs[i].perishSong2 = 3;
+            gDisableStructs[i].perishSongTimer1 = 3;
+            gDisableStructs[i].perishSongTimer2 = 3;
         }
     }
 
diff --git a/src/battle_util.c b/src/battle_util.c
index b9b2f1e1d..b5357a0e0 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1292,9 +1292,9 @@ bool8 sub_8041364(void)
                 gBattleTextBuff1[1] = 1;
                 gBattleTextBuff1[2] = 1;
                 gBattleTextBuff1[3] = 1;
-                gBattleTextBuff1[4] = gDisableStructs[gActiveBank].perishSong1;
+                gBattleTextBuff1[4] = gDisableStructs[gActiveBank].perishSongTimer1;
                 gBattleTextBuff1[5] = EOS;
-                if (gDisableStructs[gActiveBank].perishSong1 == 0)
+                if (gDisableStructs[gActiveBank].perishSongTimer1 == 0)
                 {
                     gStatuses3[gActiveBank] &= ~STATUS3_PERISH_SONG;
                     gBattleMoveDamage = gBattleMons[gActiveBank].hp;
@@ -1302,7 +1302,7 @@ bool8 sub_8041364(void)
                 }
                 else
                 {
-                    gDisableStructs[gActiveBank].perishSong1--;
+                    gDisableStructs[gActiveBank].perishSongTimer1--;
                     gBattlescriptCurrInstr = gUnknown_082DAF20;
                 }
                 BattleScriptExecute(gBattlescriptCurrInstr);
-- 
cgit v1.2.3


From c967ba1d5f82c69e75f8a697fee60ceae6ef3218 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 12 Nov 2017 18:41:04 +0100
Subject: dump couple of baseroms review changes

---
 src/berry_blender.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/berry_blender.c b/src/berry_blender.c
index 9d98f3fa7..0705812bf 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -49,7 +49,7 @@ static const u8 sUnusedText_LinkPartnerNotFound[] = _("Link partner(s) not found
 
 const u8 gText_BerryBlenderStart[] = _("Starting up the BERRY BLENDER.\pPlease select a BERRY from your BAG\nto put in the BERRY BLENDER.\p");
 const u8 gText_NewParagraph[] = _("\p");
-const u8 gText_wasMade[] = _(" was made!");
+const u8 gText_WasMade[] = _(" was made!");
 static const u8 sText_Mister[] = _("MISTER");
 static const u8 sText_Laddie[] = _("LADDIE");
 static const u8 sText_Lassie[] = _("LASSIE");
@@ -67,14 +67,14 @@ const u8* const sBlenderOpponentsNames[] =
     sText_Miss
 };
 
-static const u8 sText_PressA_ToStart[] = _("Press the A Button to start.");
+static const u8 sText_PressAToStart[] = _("Press the A Button to start.");
 static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while.");
 const u8 sText_CommunicationStandby[] = _("Communication standby…");
 const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?");
 const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p");
 const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p");
-const u8 sText_hasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER.");
-const u8 sText_someonesPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p");
+const u8 sText_HasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER.");
+const u8 ApostropheSPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p");
 const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING");
 static const u8 sText_BerryUsed[] = _("BERRY USED");
 const u8 sText_SpaceBerry[] = _(" BERRY");
-- 
cgit v1.2.3


From c4674735d20e163fb35cbd87088e6f029a14d5f8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 12 Nov 2017 22:59:36 +0100
Subject: start working on recorded battle

---
 src/recorded_battle.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 src/recorded_battle.c

(limited to 'src')

diff --git a/src/recorded_battle.c b/src/recorded_battle.c
new file mode 100644
index 000000000..882690d26
--- /dev/null
+++ b/src/recorded_battle.c
@@ -0,0 +1,132 @@
+#include "global.h"
+#include "battle.h"
+#include "recorded_battle.h"
+#include "main.h"
+#include "pokemon.h"
+#include "rng.h"
+#include "event_data.h"
+#include "link.h"
+#include "string_util.h"
+
+#define BANK_RECORD_SIZE 664
+
+extern u32 gBattleTypeFlags;
+
+struct PlayerInfo
+{
+    u32 trainerId;
+    u8 name[PLAYER_NAME_LENGTH];
+    u8 gender;
+    u16 field_E;
+    u16 language;
+};
+
+EWRAM_DATA u32 gRecordedBattleRngSeed = 0;
+EWRAM_DATA u32 gBattlePalaceMoveSelectionRngValue = 0;
+EWRAM_DATA u8 sBattleRecords[BATTLE_BANKS_COUNT][BANK_RECORD_SIZE] = {0};
+EWRAM_DATA u16 sRecordedBytesNo[BATTLE_BANKS_COUNT] = {0};
+EWRAM_DATA u16 gUnknown_0203C79C[4] = {0};
+EWRAM_DATA u16 gUnknown_0203C7A4[4] = {0};
+EWRAM_DATA u8 gUnknown_0203C7AC = 0;
+EWRAM_DATA u8 gUnknown_0203C7AD = 0;
+EWRAM_DATA u8 gUnknown_0203C7AE = 0;
+EWRAM_DATA u8 gUnknown_0203C7AF = 0;
+EWRAM_DATA MainCallback sRecordedBattle_Callback2 = NULL;
+EWRAM_DATA u8 gUnknown_0203C7B4 = 0;
+EWRAM_DATA u8 gUnknown_0203C7B5 = 0;
+EWRAM_DATA u8 gUnknown_0203C7B6 = 0;
+EWRAM_DATA u8 gUnknown_0203C7B7 = 0;
+EWRAM_DATA u32 sRecordedBattle_BattleFlags = 0;
+EWRAM_DATA u32 sRecordedBattle_AI_Scripts = 0;
+EWRAM_DATA struct Pokemon sSavedPlayerParty[PARTY_SIZE] = {0};
+EWRAM_DATA struct Pokemon sSavedOpponentParty[PARTY_SIZE] = {0};
+EWRAM_DATA u16 gUnknown_0203CC70[8] = {0};
+EWRAM_DATA struct PlayerInfo sRecordedBattle_Players[BATTLE_BANKS_COUNT] = {0};
+
+extern u8 gUnknown_0203CCD0;
+
+extern u32 sub_81A513C(void);
+
+void sub_8184DA4(u8 arg0)
+{
+    s32 i, j;
+
+    gUnknown_0203C7AC = arg0;
+    gUnknown_0203CCD0 = 0;
+
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    {
+        sRecordedBytesNo[i] = 0;
+        gUnknown_0203C79C[i] = 0;
+        gUnknown_0203C7A4[i] = 0;
+
+        if (arg0 == 1)
+        {
+            for (j = 0; j < BANK_RECORD_SIZE; j++)
+            {
+                sBattleRecords[i][j] |= 0xFF;
+            }
+            sRecordedBattle_BattleFlags = gBattleTypeFlags;
+            sRecordedBattle_AI_Scripts = gBattleResources->ai->aiFlags;
+        }
+    }
+}
+
+void sub_8184E58(void)
+{
+    s32 i, j;
+
+    if (gUnknown_0203C7AC == 1)
+    {
+        gRecordedBattleRngSeed = gRngValue;
+        gUnknown_0203C7AE = VarGet(VAR_FRONTIER_FACILITY);
+        gUnknown_0203C7AF = sub_81A513C();
+    }
+    else if (gUnknown_0203C7AC == 2)
+    {
+        gRngValue = gRecordedBattleRngSeed;
+    }
+
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        u8 linkPlayersCount;
+        u8 text[30];
+
+        gUnknown_0203C7B4 = GetMultiplayerId();
+        linkPlayersCount = GetLinkPlayerCount();
+
+        for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+        {
+            sRecordedBattle_Players[i].trainerId = gLinkPlayers[i].trainerId;
+            sRecordedBattle_Players[i].gender = gLinkPlayers[i].gender;
+            sRecordedBattle_Players[i].field_E = gLinkPlayers[i].lp_field_18;
+            sRecordedBattle_Players[i].language = gLinkPlayers[i].language;
+
+            if (i < linkPlayersCount)
+            {
+                StringCopy(text, gLinkPlayers[i].name);
+                StripExtCtrlCodes(text);
+                StringCopy(sRecordedBattle_Players[i].name, text);
+            }
+            else
+            {
+                for (j = 0; j < PLAYER_NAME_LENGTH; j++)
+                    sRecordedBattle_Players[i].name[j] = gLinkPlayers[i].name[j];
+            }
+        }
+    }
+    else
+    {
+        sRecordedBattle_Players[0].trainerId = (gSaveBlock2Ptr->playerTrainerId[0])
+                                    | (gSaveBlock2Ptr->playerTrainerId[1] << 8)
+                                    | (gSaveBlock2Ptr->playerTrainerId[2] << 16)
+                                    | (gSaveBlock2Ptr->playerTrainerId[3] << 24);
+
+        sRecordedBattle_Players[0].gender = gSaveBlock2Ptr->playerGender;
+        sRecordedBattle_Players[0].field_E = 0;
+        sRecordedBattle_Players[0].language = gGameLanguage;
+
+        for (i = 0; i < PLAYER_NAME_LENGTH; i++)
+            sRecordedBattle_Players[0].name[i] = gSaveBlock2Ptr->playerName[i];
+    }
+}
-- 
cgit v1.2.3


From 3b4366828637bcb6bc89f38516bc39d76ae81939 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 13 Nov 2017 00:10:34 +0100
Subject: more recorded battle done

---
 src/recorded_battle.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 113 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 882690d26..dfff37e90 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -7,6 +7,7 @@
 #include "event_data.h"
 #include "link.h"
 #include "string_util.h"
+#include "palette.h"
 
 #define BANK_RECORD_SIZE 664
 
@@ -42,11 +43,18 @@ EWRAM_DATA struct Pokemon sSavedPlayerParty[PARTY_SIZE] = {0};
 EWRAM_DATA struct Pokemon sSavedOpponentParty[PARTY_SIZE] = {0};
 EWRAM_DATA u16 gUnknown_0203CC70[8] = {0};
 EWRAM_DATA struct PlayerInfo sRecordedBattle_Players[BATTLE_BANKS_COUNT] = {0};
-
-extern u8 gUnknown_0203CCD0;
+EWRAM_DATA u8 gUnknown_0203CCD0 = 0;
+EWRAM_DATA u8 gUnknown_0203CCD1[8] = {0};
+EWRAM_DATA u8 gUnknown_0203CCD9 = 0;
+EWRAM_DATA u8 gUnknown_0203CCDA = 0;
+EWRAM_DATA u16 gUnknown_0203CCDC[6] = {0};
+EWRAM_DATA u8 gUnknown_0203CCE8 = 0;
 
 extern u32 sub_81A513C(void);
 
+// this file's functions
+static u8 sub_8185278(u8 *arg0, u8 *arg1, u8 *arg2);
+
 void sub_8184DA4(u8 arg0)
 {
     s32 i, j;
@@ -130,3 +138,106 @@ void sub_8184E58(void)
             sRecordedBattle_Players[0].name[i] = gSaveBlock2Ptr->playerName[i];
     }
 }
+
+void RecordedBattle_SetBankAction(u8 bank, u8 action)
+{
+    if (sRecordedBytesNo[bank] < BANK_RECORD_SIZE && gUnknown_0203C7AC != 2)
+    {
+        sBattleRecords[bank][sRecordedBytesNo[bank]++] = action;
+    }
+}
+
+void RecordedBattle_ClearBankAction(u8 bank, u8 bytesToClear)
+{
+    s32 i;
+
+    for (i = 0; i < bytesToClear; i++)
+    {
+        sRecordedBytesNo[bank]--;
+        sBattleRecords[bank][sRecordedBytesNo[bank]] |= 0xFF;
+        if (sRecordedBytesNo[bank] == 0)
+            break;
+    }
+}
+
+u8 RecordedBattle_ReadBankAction(u8 bank)
+{
+    // trying to read past array or invalid action byte, battle is over
+    if (sRecordedBytesNo[bank] >= BANK_RECORD_SIZE || sBattleRecords[bank][sRecordedBytesNo[bank]] == 0xFF)
+    {
+        gScriptResult = gBattleOutcome = BATTLE_PLAYER_TELEPORTED; // hah
+        ResetPaletteFadeControl();
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        SetMainCallback2(CB2_QuitRecordedBattle);
+        return 0xFF;
+    }
+    else
+    {
+        return sBattleRecords[bank][sRecordedBytesNo[bank]++];
+    }
+}
+
+u8 sub_81850D0(void)
+{
+    return gUnknown_0203C7AC;
+}
+
+u8 sub_81850DC(u8 *arg0)
+{
+    u8 i, j;
+    u8 ret = 0;
+
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    {
+        if (sRecordedBytesNo[i] != gUnknown_0203C79C[i])
+        {
+            arg0[ret++] = i;
+            arg0[ret++] = sRecordedBytesNo[i] - gUnknown_0203C79C[i];
+
+            for (j = 0; j < sRecordedBytesNo[i] - gUnknown_0203C79C[i]; j++)
+            {
+                arg0[ret++] = sBattleRecords[i][gUnknown_0203C79C[i] + j];
+            }
+
+            gUnknown_0203C79C[i] = sRecordedBytesNo[i];
+        }
+    }
+
+    return ret;
+}
+
+void sub_81851A8(u8 *arg0)
+{
+    s32 i;
+    u8 var1 = 2;
+    u8 var2;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
+        return;
+
+    for (i = 0; i < GetLinkPlayerCount(); i++)
+    {
+        if ((gLinkPlayers[i].version & 0xFF) != VERSION_EMERALD)
+            return;
+    }
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
+    {
+        for (var2 = *arg0; var2 != 0;)
+        {
+            u8 unkVar = sub_8185278(arg0, &var1, &var2);
+            u8 unkVar2 = sub_8185278(arg0, &var1, &var2);
+
+            for (i = 0; i < unkVar2; i++)
+            {
+                sBattleRecords[unkVar][gUnknown_0203C7A4[unkVar]++] = sub_8185278(arg0, &var1, &var2);
+            }
+        }
+    }
+}
+
+static u8 sub_8185278(u8 *arg0, u8 *arg1, u8 *arg2)
+{
+    (*arg2)--;
+    return arg0[(*arg1)++];
+}
-- 
cgit v1.2.3


From 8ceea171b34e30ca35f32f1876dcde740ce78936 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 13 Nov 2017 00:15:07 +0100
Subject: leave out pss for now

---
 src/pokemon_storage_system.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 8eeac96b1..f82a52d38 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -99,6 +99,7 @@ static u8 *StringCopyAndFillWithSpaces(u8 *dst, const u8 *src, u16 n)
     return str;
 }
 
+/* can't match
 static void sub_80C7128(u16 *dst, u16 dstToAdd, u16 dstToMul, const u16 *src, u16 srcToAdd, u16 srcToMul, u32 size, u16 count, u16 srcBy)
 {
     u16 i;
@@ -118,4 +119,4 @@ static void sub_80C7128(u16 *dst, u16 dstToAdd, u16 dstToMul, const u16 *src, u1
             src += srcBy;
         }
     }
-}
+}*/
-- 
cgit v1.2.3


From 1ca032c6ff72bb52c9b16d4a42ac7913521216f9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 12 Nov 2017 21:13:18 -0500
Subject: Address review items, 1

---
 src/field_region_map.c |   8 +--
 src/region_map.c       | 146 ++++++++++++++++++++++---------------------------
 2 files changed, 68 insertions(+), 86 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 776ca6934..9d530258d 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -56,11 +56,9 @@ static const struct BgTemplate gUnknown_085E5068[] = {
 };
 
 static const struct WindowTemplate gUnknown_085E5070[] = {
-    {
-        0, 17, 17, 12,  2, 15, 0x0001
-    }, {
-        0, 22,  1,  7,  2, 15, 0x0019
-    }, DUMMY_WIN_TEMPLATE
+    { 0, 17, 17, 12,  2, 15, 0x0001 },
+    { 0, 22,  1,  7,  2, 15, 0x0019 },
+    DUMMY_WIN_TEMPLATE
 };
 
 // .text
diff --git a/src/region_map.c b/src/region_map.c
index 5481606e9..1c9c9b8ed 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -108,51 +108,35 @@ static const u8 sRegionMapPlayerIcon_BrendanGfx[] = INCBIN_U8("graphics/pokenav/
 static const u16 sRegionMapPlayerIcon_MayPal[] = INCBIN_U16("graphics/pokenav/may_icon.gbapal");
 static const u8 sRegionMapPlayerIcon_MayGfx[] = INCBIN_U8("graphics/pokenav/may_icon.4bpp");
 
-static const u8 sRegionMap_MapSectionLayout[] = {
-    MAPSEC_NONE, MAPSEC_ROUTE_114, MAPSEC_ROUTE_114, MAPSEC_FALLARBOR_TOWN, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_FORTREE_CITY, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_NONE, MAPSEC_ROUTE_114, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_MT_CHIMNEY, MAPSEC_MT_CHIMNEY, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_ROUTE_115, MAPSEC_ROUTE_114, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_MT_CHIMNEY, MAPSEC_MT_CHIMNEY, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SAFARI_ZONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_ROUTE_115, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_LAVARIDGE_TOWN, MAPSEC_ROUTE_112, MAPSEC_ROUTE_112, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_LILYCOVE_CITY, MAPSEC_LILYCOVE_CITY, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_125, MAPSEC_ROUTE_125, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_ROUTE_115, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_122, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_125, MAPSEC_ROUTE_125, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_RUSTBORO_CITY, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_122, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_MOSSDEEP_CITY, MAPSEC_MOSSDEEP_CITY, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_RUSTBORO_CITY, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_VERDANTURF_TOWN, MAPSEC_ROUTE_117, MAPSEC_ROUTE_117, MAPSEC_ROUTE_117, MAPSEC_MAUVILLE_CITY, MAPSEC_MAUVILLE_CITY, MAPSEC_ROUTE_118, MAPSEC_ROUTE_118, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_ROUTE_104, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_SOOTOPOLIS_CITY, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_ROUTE_104, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_EVER_GRANDE_CITY,
-    MAPSEC_ROUTE_104, MAPSEC_PETALBURG_CITY, MAPSEC_ROUTE_102, MAPSEC_ROUTE_102, MAPSEC_OLDALE_TOWN, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_EVER_GRANDE_CITY,
-    MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_101, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SLATEPORT_CITY, MAPSEC_ROUTE_134, MAPSEC_ROUTE_134, MAPSEC_ROUTE_134, MAPSEC_ROUTE_133, MAPSEC_ROUTE_133, MAPSEC_ROUTE_133, MAPSEC_ROUTE_132, MAPSEC_ROUTE_132, MAPSEC_PACIFIDLOG_TOWN, MAPSEC_ROUTE_131, MAPSEC_ROUTE_131, MAPSEC_ROUTE_131, MAPSEC_ROUTE_130, MAPSEC_ROUTE_130, MAPSEC_ROUTE_130, MAPSEC_ROUTE_129, MAPSEC_ROUTE_129, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_LITTLEROOT_TOWN, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SLATEPORT_CITY, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_BATTLE_FRONTIER, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_ROUTE_106, MAPSEC_ROUTE_106, MAPSEC_ROUTE_106, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE,
-    MAPSEC_NONE, MAPSEC_NONE, MAPSEC_DEWFORD_TOWN, MAPSEC_ROUTE_107, MAPSEC_ROUTE_107, MAPSEC_ROUTE_107, MAPSEC_ROUTE_108, MAPSEC_ROUTE_108, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SOUTHERN_ISLAND, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE
-};
+static const u8 sRegionMap_MapSectionLayout[] = INCBIN_U8("graphics/pokenav/region_map_section_layout.bin");
 
 #include "data/region_map/region_map_entries.h"
 
 static const u16 sRegionMap_SpecialPlaceLocations[][2] = {
-    {MAPSEC_UNDERWATER_TERRA_CAVE, MAPSEC_ROUTE_105},
-    {MAPSEC_UNDERWATER_124, MAPSEC_ROUTE_124},
-    {MAPSEC_UNDERWATER_UNK1, MAPSEC_ROUTE_129},
-    {MAPSEC_UNDERWATER_125, MAPSEC_ROUTE_126},
-    {MAPSEC_UNDERWATER_126, MAPSEC_ROUTE_127},
-    {MAPSEC_UNDERWATER_127, MAPSEC_ROUTE_128},
-    {MAPSEC_UNDERWATER_129, MAPSEC_ROUTE_129},
-    {MAPSEC_UNDERWATER_SOOTOPOLIS, MAPSEC_SOOTOPOLIS_CITY},
-    {MAPSEC_UNDERWATER_128, MAPSEC_ROUTE_128},
-    {MAPSEC_AQUA_HIDEOUT, MAPSEC_LILYCOVE_CITY},
-    {MAPSEC_AQUA_HIDEOUT_OLD, MAPSEC_LILYCOVE_CITY},
-    {MAPSEC_MAGMA_HIDEOUT, MAPSEC_ROUTE_112},
+    {MAPSEC_UNDERWATER_TERRA_CAVE,     MAPSEC_ROUTE_105},
+    {MAPSEC_UNDERWATER_124,            MAPSEC_ROUTE_124},
+    {MAPSEC_UNDERWATER_UNK1,           MAPSEC_ROUTE_129},
+    {MAPSEC_UNDERWATER_125,            MAPSEC_ROUTE_126},
+    {MAPSEC_UNDERWATER_126,            MAPSEC_ROUTE_127},
+    {MAPSEC_UNDERWATER_127,            MAPSEC_ROUTE_128},
+    {MAPSEC_UNDERWATER_129,            MAPSEC_ROUTE_129},
+    {MAPSEC_UNDERWATER_SOOTOPOLIS,     MAPSEC_SOOTOPOLIS_CITY},
+    {MAPSEC_UNDERWATER_128,            MAPSEC_ROUTE_128},
+    {MAPSEC_AQUA_HIDEOUT,              MAPSEC_LILYCOVE_CITY},
+    {MAPSEC_AQUA_HIDEOUT_OLD,          MAPSEC_LILYCOVE_CITY},
+    {MAPSEC_MAGMA_HIDEOUT,             MAPSEC_ROUTE_112},
     {MAPSEC_UNDERWATER_SEALED_CHAMBER, MAPSEC_ROUTE_134},
-    {MAPSEC_PETALBURG_WOODS, MAPSEC_ROUTE_104},
-    {MAPSEC_JAGGED_PASS, MAPSEC_ROUTE_112},
-    {MAPSEC_MT_PYRE, MAPSEC_ROUTE_122},
-    {MAPSEC_SKY_PILLAR, MAPSEC_ROUTE_131},
-    {MAPSEC_MIRAGE_TOWER, MAPSEC_ROUTE_111},
-    {MAPSEC_TRAINER_HILL, MAPSEC_ROUTE_111},
-    {MAPSEC_DESERT_UNDERPASS, MAPSEC_ROUTE_114},
-    {MAPSEC_ALTERING_CAVE_2, MAPSEC_ROUTE_103},
-    {MAPSEC_ARTISAN_CAVE, MAPSEC_ROUTE_103},
-    {MAPSEC_ABANDONED_SHIP, MAPSEC_ROUTE_108},
-    {MAPSEC_NONE, MAPSEC_NONE}
+    {MAPSEC_PETALBURG_WOODS,           MAPSEC_ROUTE_104},
+    {MAPSEC_JAGGED_PASS,               MAPSEC_ROUTE_112},
+    {MAPSEC_MT_PYRE,                   MAPSEC_ROUTE_122},
+    {MAPSEC_SKY_PILLAR,                MAPSEC_ROUTE_131},
+    {MAPSEC_MIRAGE_TOWER,              MAPSEC_ROUTE_111},
+    {MAPSEC_TRAINER_HILL,              MAPSEC_ROUTE_111},
+    {MAPSEC_DESERT_UNDERPASS,          MAPSEC_ROUTE_114},
+    {MAPSEC_ALTERING_CAVE_2,           MAPSEC_ROUTE_103},
+    {MAPSEC_ARTISAN_CAVE,              MAPSEC_ROUTE_103},
+    {MAPSEC_ABANDONED_SHIP,            MAPSEC_ROUTE_108},
+    {MAPSEC_NONE,                      MAPSEC_NONE}
 };
 
 static const u16 sRegionMap_MarineCaveMapSecIds[] = {
@@ -313,8 +297,8 @@ static const u8 gUnknown_085A1E3C[][3] = {
 };
 
 static const u8 *const gUnknown_085A1ED4[] = {
-    gUnknown_085EC782,
-    gUnknown_085EC791
+    gText_PokemonLeague,
+    gText_PokemonCenter
 };
 
 static const struct {
@@ -733,8 +717,8 @@ void sub_8123418(void)
     }
     else
     {
-        gRegionMap->unk_03c = gRegionMap->scrollX * 256;
-        gRegionMap->unk_040 = gRegionMap->scrollY * 256;
+        gRegionMap->unk_03c = gRegionMap->scrollX * 0x100;
+        gRegionMap->unk_040 = gRegionMap->scrollY * 0x100;
         gRegionMap->unk_060 = 0;
         gRegionMap->unk_062 = 0;
         gRegionMap->unk_044 = -(gRegionMap->unk_03c / 16);
@@ -751,7 +735,7 @@ void sub_8123418(void)
 
 bool8 sub_8123514(void)
 {
-    bool8 r4;
+    bool8 retVal;
 
     if (gRegionMap->unk_06e >= 16)
     {
@@ -769,7 +753,7 @@ bool8 sub_8123514(void)
         gRegionMap->inputCallback = (gRegionMap->zoomed == FALSE) ? ProcessRegionMapInput_Full : ProcessRegionMapInput_Zoomed;
         CreateRegionMapCursor(gRegionMap->cursorTileTag, gRegionMap->cursorPaletteTag);
         UnhideRegionMapPlayerIcon();
-        r4 = FALSE;
+        retVal = FALSE;
     }
     else
     {
@@ -804,10 +788,10 @@ bool8 sub_8123514(void)
                 gRegionMap->unk_050 = 0;
             }
         }
-        r4 = TRUE;
+        retVal = TRUE;
     }
     CalcZoomScrollParams(gRegionMap->scrollX, gRegionMap->scrollY, 0x38, 0x48, gRegionMap->unk_04c >> 8, gRegionMap->unk_04c >> 8, 0);
-    return r4;
+    return retVal;
 }
 
 static void CalcZoomScrollParams(s16 scrollX, s16 scrollY, s16 c, s16 d, u16 e, u16 f, u8 rotation)
@@ -885,9 +869,9 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
     u16 mapHeight;
     u16 x;
     u16 y;
-    u16 r1;
-    u16 r9;
-    struct WarpData *r4;
+    u16 dimensionScale;
+    u16 xOnMap;
+    struct WarpData *storedWarp;
 
     if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_SS_TIDAL_CORRIDOR
         && (gSaveBlock1Ptr->location.mapNum == MAP_ID_SS_TIDAL_CORRIDOR
@@ -953,13 +937,13 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
             gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
             if (gRegionMap->mapSecId != MAPSEC_SS_TIDAL)
             {
-                r4 = &gSaveBlock1Ptr->warp4;
-                mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
+                storedWarp = &gSaveBlock1Ptr->warp4;
+                mapHeader = get_mapheader_by_bank_and_number(storedWarp->mapGroup, storedWarp->mapNum);
             }
             else
             {
-                r4 = &gSaveBlock1Ptr->warp2;
-                mapHeader = get_mapheader_by_bank_and_number(r4->mapGroup, r4->mapNum);
+                storedWarp = &gSaveBlock1Ptr->warp2;
+                mapHeader = get_mapheader_by_bank_and_number(storedWarp->mapGroup, storedWarp->mapNum);
                 gRegionMap->mapSecId = mapHeader->regionMapSectionId;
             }
             if (RegionMap_IsPlayerInCave(gRegionMap->mapSecId))
@@ -972,30 +956,30 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
             }
             mapWidth = mapHeader->mapData->width;
             mapHeight = mapHeader->mapData->height;
-            x = r4->x;
-            y = r4->y;
+            x = storedWarp->x;
+            y = storedWarp->y;
             break;
     }
 
-    r9 = x;
+    xOnMap = x;
 
-    r1 = mapWidth / gRegionMapEntries[gRegionMap->mapSecId].width;
-    if (r1 == 0)
+    dimensionScale = mapWidth / gRegionMapEntries[gRegionMap->mapSecId].width;
+    if (dimensionScale == 0)
     {
-        r1 = 1;
+        dimensionScale = 1;
     }
-    x /= r1;
+    x /= dimensionScale;
     if (x >= gRegionMapEntries[gRegionMap->mapSecId].width)
     {
         x = gRegionMapEntries[gRegionMap->mapSecId].width - 1;
     }
 
-    r1 = mapHeight / gRegionMapEntries[gRegionMap->mapSecId].height;
-    if (r1 == 0)
+    dimensionScale = mapHeight / gRegionMapEntries[gRegionMap->mapSecId].height;
+    if (dimensionScale == 0)
     {
-        r1 = 1;
+        dimensionScale = 1;
     }
-    y /= r1;
+    y /= dimensionScale;
     if (y >= gRegionMapEntries[gRegionMap->mapSecId].height)
     {
         y = gRegionMapEntries[gRegionMap->mapSecId].height - 1;
@@ -1032,15 +1016,15 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
             break;
         case MAPSEC_ROUTE_121:
             x = 0;
-            if (r9 > 14)
+            if (xOnMap > 14)
             {
                 x = 1;
             }
-            if (r9 > 0x1C)
+            if (xOnMap > 0x1C)
             {
                 x++;
             }
-            if (r9 > 0x36)
+            if (xOnMap > 0x36)
             {
                 x++;
             }
@@ -1059,14 +1043,14 @@ static void RegionMap_InitializeStateBasedOnSSTidalLocation(void)
     u16 x;
     u8 mapGroup;
     u8 mapNum;
-    u16 r1;
-    s16 sp2;
-    s16 sp4;
+    u16 dimensionScale;
+    s16 xOnMap;
+    s16 yOnMap;
     const struct MapHeader *mapHeader;
 
     y = 0;
     x = 0;
-    switch (GetSSTidalLocation(&mapGroup, &mapNum, &sp2, &sp4))
+    switch (GetSSTidalLocation(&mapGroup, &mapNum, &xOnMap, &yOnMap))
     {
         case 1:
             gRegionMap->mapSecId = MAPSEC_SLATEPORT_CITY;
@@ -1085,17 +1069,17 @@ static void RegionMap_InitializeStateBasedOnSSTidalLocation(void)
             mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum);
 
             gRegionMap->mapSecId = mapHeader->regionMapSectionId;
-            r1 = mapHeader->mapData->width / gRegionMapEntries[gRegionMap->mapSecId].width;
-            if (r1 == 0)
-                r1 = 1;
-            x = sp2 / r1;
+            dimensionScale = mapHeader->mapData->width / gRegionMapEntries[gRegionMap->mapSecId].width;
+            if (dimensionScale == 0)
+                dimensionScale = 1;
+            x = xOnMap / dimensionScale;
             if (x >= gRegionMapEntries[gRegionMap->mapSecId].width)
                 x = gRegionMapEntries[gRegionMap->mapSecId].width - 1;
 
-            r1 = mapHeader->mapData->height / gRegionMapEntries[gRegionMap->mapSecId].height;
-            if (r1 == 0)
-                r1 = 1;
-            y = sp4 / r1;
+            dimensionScale = mapHeader->mapData->height / gRegionMapEntries[gRegionMap->mapSecId].height;
+            if (dimensionScale == 0)
+                dimensionScale = 1;
+            y = yOnMap / dimensionScale;
             if (y >= gRegionMapEntries[gRegionMap->mapSecId].height)
                 y = gRegionMapEntries[gRegionMap->mapSecId].height - 1;
             break;
-- 
cgit v1.2.3


From 79609d52c8d8489b490589a1150b0754c0f61568 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 12 Nov 2017 21:39:44 -0500
Subject: MAPSEC_DYNAMIC

---
 src/region_map.c | 4 ++--
 src/tv.c         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/region_map.c b/src/region_map.c
index 1c9c9b8ed..3ca8f4add 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -935,7 +935,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
         case 8:
 
             gRegionMap->mapSecId = gMapHeader.regionMapSectionId;
-            if (gRegionMap->mapSecId != MAPSEC_SS_TIDAL)
+            if (gRegionMap->mapSecId != MAPSEC_DYNAMIC)
             {
                 storedWarp = &gSaveBlock1Ptr->warp4;
                 mapHeader = get_mapheader_by_bank_and_number(storedWarp->mapGroup, storedWarp->mapNum);
@@ -1516,7 +1516,7 @@ u8 *sub_81245DC(u8 *dest, u16 mapSecId)
 {
     switch (mapSecId)
     {
-        case MAPSEC_SS_TIDAL:
+        case MAPSEC_DYNAMIC:
             return StringCopy(dest, gText_Ferry);
         case MAPSEC_SECRET_BASE:
             return StringCopy(dest, gText_SecretBase);
diff --git a/src/tv.c b/src/tv.c
index 933b9c0b8..3a4ad6b5f 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -6435,7 +6435,7 @@ void DoTVShowTodaysRivalTrainer(void)
                 case MAPSEC_SECRET_BASE:
                     sTVShowState = 8;
                     break;
-                case MAPSEC_SS_TIDAL:
+                case MAPSEC_DYNAMIC:
                     switch (show->rivalTrainer.mapDataId)
                     {
                         case 0x115 ... 0x117:
@@ -6633,7 +6633,7 @@ void DoTVShowHoennTreasureInvestigators(void)
     {
         case 0:
             StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name);
-            if (show->treasureInvestigators.location == MAPSEC_SS_TIDAL)
+            if (show->treasureInvestigators.location == MAPSEC_DYNAMIC)
             {
                 switch (show->treasureInvestigators.mapDataId)
                 {
-- 
cgit v1.2.3


From 209b6eb467fbcd1e572e6f7fef98619b8c744a15 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 13 Nov 2017 18:07:23 +0100
Subject: more of recorded battle done

---
 src/battle_2.c                            |    4 +-
 src/battle_controller_recorded_opponent.c |    2 +-
 src/battle_controller_recorded_player.c   |    2 +-
 src/battle_controllers.c                  |    2 +-
 src/battle_message.c                      |    4 +-
 src/recorded_battle.c                     | 1391 ++++++++++++++++++++++++++++-
 src/save.c                                |    3 +-
 7 files changed, 1393 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index e4ee624fb..af5aa4d32 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -2811,7 +2811,7 @@ static void BattleStartClearSetData(void)
         if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gSaveBlock2Ptr->optionsBattleSceneOff == TRUE)
             gHitMarker |= HITMARKER_NO_ANIMATIONS;
     }
-    else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && sub_8185FB8())
+    else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && GetBattleStyleInRecordedBattle())
         gHitMarker |= HITMARKER_NO_ANIMATIONS;
 
     gBattleScripting.battleStyle = gSaveBlock2Ptr->optionsBattleStyle;
@@ -3928,7 +3928,7 @@ static void HandleTurnActionSelectionState(void)
         switch (gBattleCommunication[gActiveBank])
         {
         case STATE_TURN_START_RECORD: // recorded battle related on start of every turn
-            sub_8185FD0();
+            RecordedBattle_CopyBankMoves();
             gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
             break;
         case STATE_BEFORE_ACTION_CHOSEN: // choose an action
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 914ad9c43..b948a3f9e 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -1261,7 +1261,7 @@ static void RecordedOpponentHandleDrawTrainerPic(void)
         }
         else
         {
-            trainerPicId = PlayerGenderToFrontTrainerPicId(sub_8185F40());
+            trainerPicId = PlayerGenderToFrontTrainerPicId(GetActiveBankLinkPlayerGender());
         }
     }
     else
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 8db7b5626..663f64ee2 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -1229,7 +1229,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
     if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-            trainerPicId = sub_8185F40();
+            trainerPicId = GetActiveBankLinkPlayerGender();
         else
             trainerPicId = gLinkPlayers[gUnknown_0203C7B4].gender;
     }
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 5c874438e..858540a9f 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -113,7 +113,7 @@ void sub_8032768(void)
         sub_8184DA4(2);
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        sub_8185EB8();
+        RecordedBattle_SaveParties();
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         SetControllersVariablesInLinkBattle();
diff --git a/src/battle_message.c b/src/battle_message.c
index 52c0c7af5..8c833276e 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -58,7 +58,7 @@ extern const u8* GetTrainer1LoseText(void); // battle_setup
 extern const u8* GetTrainer2LoseText(void); // battle_setup
 extern void GetFrontierTrainerName(u8 *dst, u16 trainerId);
 extern s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, const u8 *str, s32 totalWidth, s16 letterSpacing);
-extern u8 sub_8185FC4(void);
+extern u8 GetTextSpeedInRecordedBattle(void);
 extern u8 sav2_get_text_speed(void);
 
 // this file's functions
@@ -2264,7 +2264,7 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1)
         if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
             speed = 1;
         else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
-            speed = sRecordedBattleTextSpeeds[sub_8185FC4()];
+            speed = sRecordedBattleTextSpeeds[GetTextSpeedInRecordedBattle()];
         else
             speed = sav2_get_text_speed();
 
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index dfff37e90..8ecf943cc 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -8,20 +8,77 @@
 #include "link.h"
 #include "string_util.h"
 #include "palette.h"
+#include "save.h"
+#include "malloc.h"
+#include "util.h"
+#include "task.h"
+#include "text.h"
 
 #define BANK_RECORD_SIZE 664
+#define ILLEGAL_BATTLE_TYPES ((BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_FIRST_BATTLE                  \
+                              | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER   \
+                              | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI           \
+                              | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE           \
+                              | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYORGE | BATTLE_TYPE_RAYQUAZA))
 
 extern u32 gBattleTypeFlags;
+extern u16 gTrainerBattleOpponent_A;
+extern u16 gTrainerBattleOpponent_B;
+extern u16 gPartnerTrainerId;
+extern u8 gActiveBank;
+extern u8 gNoOfAllBanks;
+extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
+extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
+extern u8 gUnknown_03001278;
+extern u8 gUnknown_03001279;
 
 struct PlayerInfo
 {
     u32 trainerId;
     u8 name[PLAYER_NAME_LENGTH];
     u8 gender;
-    u16 field_E;
+    u16 bank;
     u16 language;
 };
 
+struct MovePp
+{
+    u16 moves[4];
+    u8 pp[4];
+};
+
+struct RecordedBattleSave
+{
+    struct Pokemon playerParty[PARTY_SIZE];
+    struct Pokemon opponentParty[PARTY_SIZE];
+    u8 playersName[BATTLE_BANKS_COUNT][PLAYER_NAME_LENGTH];
+    u8 playersGender[BATTLE_BANKS_COUNT];
+    u32 playersTrainerId[BATTLE_BANKS_COUNT];
+    u8 playersLanguage[BATTLE_BANKS_COUNT];
+    u32 rngSeed;
+    u32 battleFlags;
+    u8 playersBank[BATTLE_BANKS_COUNT];
+    u16 opponentA;
+    u16 opponentB;
+    u16 partnerId;
+    u16 field_4FA;
+    u8 field_4FC;
+    u8 field_4FD;
+    u8 field_4FE;
+    u8 battleStyle : 1;
+    u8 textSpeed : 3;
+    u32 AI_scripts;
+    u8 field_504[8];
+    u8 field_50C;
+    u8 field_50D;
+    u16 field_50E[6];
+    u8 field_51A;
+    u8 field_51B;
+    u8 battleRecord[BATTLE_BANKS_COUNT][BANK_RECORD_SIZE];
+    u32 checksum;
+};
+
 EWRAM_DATA u32 gRecordedBattleRngSeed = 0;
 EWRAM_DATA u32 gBattlePalaceMoveSelectionRngValue = 0;
 EWRAM_DATA u8 sBattleRecords[BATTLE_BANKS_COUNT][BANK_RECORD_SIZE] = {0};
@@ -32,16 +89,16 @@ EWRAM_DATA u8 gUnknown_0203C7AC = 0;
 EWRAM_DATA u8 gUnknown_0203C7AD = 0;
 EWRAM_DATA u8 gUnknown_0203C7AE = 0;
 EWRAM_DATA u8 gUnknown_0203C7AF = 0;
-EWRAM_DATA MainCallback sRecordedBattle_Callback2 = NULL;
+EWRAM_DATA MainCallback sCallback2_AfterRecordedBattle = NULL;
 EWRAM_DATA u8 gUnknown_0203C7B4 = 0;
 EWRAM_DATA u8 gUnknown_0203C7B5 = 0;
-EWRAM_DATA u8 gUnknown_0203C7B6 = 0;
-EWRAM_DATA u8 gUnknown_0203C7B7 = 0;
+EWRAM_DATA u8 sRecordedBattle_BattleStyle = 0;
+EWRAM_DATA u8 sRecordedBattle_TextSpeed = 0;
 EWRAM_DATA u32 sRecordedBattle_BattleFlags = 0;
 EWRAM_DATA u32 sRecordedBattle_AI_Scripts = 0;
 EWRAM_DATA struct Pokemon sSavedPlayerParty[PARTY_SIZE] = {0};
 EWRAM_DATA struct Pokemon sSavedOpponentParty[PARTY_SIZE] = {0};
-EWRAM_DATA u16 gUnknown_0203CC70[8] = {0};
+EWRAM_DATA u16 sRecordedBattle_PlayerMonMoves[2][4] = {0};
 EWRAM_DATA struct PlayerInfo sRecordedBattle_Players[BATTLE_BANKS_COUNT] = {0};
 EWRAM_DATA u8 gUnknown_0203CCD0 = 0;
 EWRAM_DATA u8 gUnknown_0203CCD1[8] = {0};
@@ -51,9 +108,13 @@ EWRAM_DATA u16 gUnknown_0203CCDC[6] = {0};
 EWRAM_DATA u8 gUnknown_0203CCE8 = 0;
 
 extern u32 sub_81A513C(void);
+extern void PlayMapChosenOrBattleBGM(bool8);
 
 // this file's functions
 static u8 sub_8185278(u8 *arg0, u8 *arg1, u8 *arg2);
+static bool32 AllocTryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst);
+void RecordedBattle_RestoreSavedParties(void);
+static void CB2_RecordedBattle(void);
 
 void sub_8184DA4(u8 arg0)
 {
@@ -107,7 +168,7 @@ void sub_8184E58(void)
         {
             sRecordedBattle_Players[i].trainerId = gLinkPlayers[i].trainerId;
             sRecordedBattle_Players[i].gender = gLinkPlayers[i].gender;
-            sRecordedBattle_Players[i].field_E = gLinkPlayers[i].lp_field_18;
+            sRecordedBattle_Players[i].bank = gLinkPlayers[i].lp_field_18;
             sRecordedBattle_Players[i].language = gLinkPlayers[i].language;
 
             if (i < linkPlayersCount)
@@ -131,7 +192,7 @@ void sub_8184E58(void)
                                     | (gSaveBlock2Ptr->playerTrainerId[3] << 24);
 
         sRecordedBattle_Players[0].gender = gSaveBlock2Ptr->playerGender;
-        sRecordedBattle_Players[0].field_E = 0;
+        sRecordedBattle_Players[0].bank = 0;
         sRecordedBattle_Players[0].language = gGameLanguage;
 
         for (i = 0; i < PLAYER_NAME_LENGTH; i++)
@@ -241,3 +302,1319 @@ static u8 sub_8185278(u8 *arg0, u8 *arg1, u8 *arg2)
     (*arg2)--;
     return arg0[(*arg1)++];
 }
+
+bool32 CanCopyRecordedBattleSaveData(void)
+{
+    struct RecordedBattleSave *dst = AllocZeroed(sizeof(struct RecordedBattleSave));
+    bool32 ret = AllocTryCopyRecordedBattleSaveData(dst);
+    Free(dst);
+    return ret;
+}
+
+bool32 IsRecordedBattleSaveValid(struct RecordedBattleSave *save)
+{
+    if (save->battleFlags == 0)
+        return FALSE;
+    if (save->battleFlags & ILLEGAL_BATTLE_TYPES)
+        return FALSE;
+    if (CalcByteArraySum((void*)(save), sizeof(*save) - 4) != save->checksum)
+        return FALSE;
+
+    return TRUE;
+}
+
+bool32 sub_81852F0(struct RecordedBattleSave *battleSave, struct RecordedBattleSave *saveSection)
+{
+    memset(saveSection, 0, sizeof(struct SaveSection));
+    memcpy(saveSection, battleSave, sizeof(*battleSave));
+
+    saveSection->checksum = CalcByteArraySum((void*)(saveSection), sizeof(*saveSection) - 4);
+
+    if (sub_8153634(31, (void*)(saveSection)) != 1)
+        return FALSE;
+
+    return TRUE;
+}
+
+#ifdef NONMATCHING
+u32 MoveRecordedBattleToSaveData(void)
+{
+    s32 i, j;
+    u8 var = 0;
+    struct RecordedBattleSave *battleSave = AllocZeroed(sizeof(struct RecordedBattleSave));
+    struct SaveSection *savSection = AllocZeroed(sizeof(struct SaveSection));
+
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        battleSave->playerParty[i] = sSavedPlayerParty[i];
+        battleSave->opponentParty[i] = sSavedOpponentParty[i];
+    }
+
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    {
+        for (j = 0; j < PLAYER_NAME_LENGTH; j++)
+        {
+            battleSave->playersName[i][j] = sRecordedBattle_Players[i].name[j];
+        }
+        battleSave->playersGender[i] = sRecordedBattle_Players[i].gender;
+        battleSave->playersLanguage[i] = sRecordedBattle_Players[i].language;
+        battleSave->playersBank[i] = sRecordedBattle_Players[i].bank;
+        battleSave->playersTrainerId[i] = sRecordedBattle_Players[i].trainerId;
+    }
+
+    battleSave->rngSeed = gRecordedBattleRngSeed;
+
+    if (sRecordedBattle_BattleFlags & BATTLE_TYPE_LINK)
+    {
+        battleSave->battleFlags = (sRecordedBattle_BattleFlags & ~(BATTLE_TYPE_LINK | BATTLE_TYPE_20));
+        battleSave->battleFlags |= BATTLE_TYPE_x2000000;
+
+        if (sRecordedBattle_BattleFlags & BATTLE_TYPE_WILD)
+        {
+            battleSave->battleFlags |= BATTLE_TYPE_x80000000;
+        }
+        else if (sRecordedBattle_BattleFlags & BATTLE_TYPE_MULTI)
+        {
+            switch (sRecordedBattle_Players[0].bank)
+            {
+            case 0:
+            case 2:
+                if (!(sRecordedBattle_Players[gUnknown_0203C7B4].bank & 1))
+                    battleSave->battleFlags |= BATTLE_TYPE_x80000000;
+                break;
+            case 1:
+            case 3:
+                if ((sRecordedBattle_Players[gUnknown_0203C7B4].bank & 1))
+                    battleSave->battleFlags |= BATTLE_TYPE_x80000000;
+                break;
+            }
+        }
+    }
+    else
+    {
+        battleSave->battleFlags = sRecordedBattle_BattleFlags;
+    }
+
+    battleSave->opponentA = gTrainerBattleOpponent_A;
+    battleSave->opponentB = gTrainerBattleOpponent_B;
+    battleSave->partnerId = gPartnerTrainerId;
+    battleSave->field_4FA = gUnknown_0203C7B4;
+    battleSave->field_4FC = gSaveBlock2Ptr->field_CA9_b;
+    battleSave->field_4FD = gUnknown_0203C7AE;
+    battleSave->field_4FE = gUnknown_0203C7AF;
+    battleSave->battleStyle = gSaveBlock2Ptr->optionsBattleStyle;
+    battleSave->textSpeed = gSaveBlock2Ptr->optionsTextSpeed;
+    battleSave->AI_scripts = sRecordedBattle_AI_Scripts;
+
+    /* Can't match it without proper knowledge of the Saveblock 2.
+    if (gTrainerBattleOpponent_A >= 300 && gTrainerBattleOpponent_A <= 399)
+    {
+        for (i = 0; i < 8; i++)
+        {
+            battleSave->field_504[i] = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_A - 300].field_4[i];
+        }
+        battleSave->field_50C = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_A - 300].field_1;
+
+        if (gUnknown_0203CCE8 == 1)
+        {
+            for (i = 0; i < 6; i++)
+            {
+                battleSave->field_50E[i] = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_A - 300].field_28[i];
+            }
+        }
+        else
+        {
+            for (i = 0; i < 6; i++)
+            {
+                battleSave->field_50E[i] = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_A - 300].field_1C[i];
+            }
+        }
+        battleSave->field_51A = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_A - 300].field_E4;
+    }
+    else if (gTrainerBattleOpponent_B >= 300 && gTrainerBattleOpponent_B <= 399)
+    {
+        for (i = 0; i < 8; i++)
+        {
+            battleSave->field_504[i] = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_B - 300].field_4[i];
+        }
+        battleSave->field_50C = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_B - 300].field_1;
+
+        if (gUnknown_0203CCE8 == 1)
+        {
+            for (i = 0; i < 6; i++)
+            {
+                battleSave->field_50E[i] = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_B - 300].field_28[i];
+            }
+        }
+        else
+        {
+            for (i = 0; i < 6; i++)
+            {
+                battleSave->field_50E[i] = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_B - 300].field_1C[i];
+            }
+        }
+        battleSave->field_51A = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_B - 300].field_E4;
+    }
+    else if (gPartnerTrainerId >= 300 && gPartnerTrainerId <= 399)
+    {
+        for (i = 0; i < 8; i++)
+        {
+            battleSave->field_504[i] = gSaveBlock2Ptr->field_738[gPartnerTrainerId - 300].field_4[i];
+        }
+        battleSave->field_50C = gSaveBlock2Ptr->field_738[gPartnerTrainerId - 300].field_1;
+
+        if (gUnknown_0203CCE8 == 1)
+        {
+            for (i = 0; i < 6; i++)
+            {
+                battleSave->field_50E[i] = gSaveBlock2Ptr->field_738[gPartnerTrainerId - 300].field_28[i];
+            }
+        }
+        else
+        {
+            for (i = 0; i < 6; i++)
+            {
+                battleSave->field_50E[i] = gSaveBlock2Ptr->field_738[gPartnerTrainerId - 300].field_1C[i];
+            }
+        }
+        battleSave->field_51A = gSaveBlock2Ptr->field_738[gPartnerTrainerId - 300].field_E4;
+    }
+
+    */
+}
+
+#else
+__attribute__((naked))
+u32 MoveRecordedBattleToSaveData(void)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+	mov r7, r10\n\
+	mov r6, r9\n\
+	mov r5, r8\n\
+	push {r5-r7}\n\
+	sub sp, 0xC\n\
+	movs r0, 0\n\
+	str r0, [sp, 0x4]\n\
+	movs r0, 0xF8\n\
+	lsls r0, 4\n\
+	bl AllocZeroed\n\
+	adds r7, r0, 0\n\
+	movs r0, 0x80\n\
+	lsls r0, 5\n\
+	bl AllocZeroed\n\
+	str r0, [sp]\n\
+	movs r6, 0\n\
+_0818535E:\n\
+	movs r0, 0x64\n\
+	adds r4, r6, 0\n\
+	muls r4, r0\n\
+	adds r5, r7, r4\n\
+	ldr r1, =sSavedPlayerParty\n\
+	adds r1, r4, r1\n\
+	adds r0, r5, 0\n\
+	movs r2, 0x64\n\
+	bl memcpy\n\
+	movs r1, 0x96\n\
+	lsls r1, 2\n\
+	adds r5, r1\n\
+	ldr r0, =sSavedOpponentParty\n\
+	adds r4, r0\n\
+	adds r0, r5, 0\n\
+	adds r1, r4, 0\n\
+	movs r2, 0x64\n\
+	bl memcpy\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x5\n\
+	ble _0818535E\n\
+	movs r6, 0\n\
+	ldr r2, =gSaveBlock2Ptr\n\
+	mov r9, r2\n\
+	movs r3, 0x9A\n\
+	lsls r3, 3\n\
+	adds r3, r7, r3\n\
+	str r3, [sp, 0x8]\n\
+	ldr r5, =sRecordedBattle_Players\n\
+	mov r8, r6\n\
+	mov r12, r6\n\
+	movs r4, 0x96\n\
+	lsls r4, 3\n\
+	adds r4, r7\n\
+	mov r10, r4\n\
+	ldr r0, =0x000004e4\n\
+	adds r4, r7, r0\n\
+_081853AC:\n\
+	lsls r1, r6, 3\n\
+	ldr r0, =sRecordedBattle_Players\n\
+	adds r0, 0x4\n\
+	mov r3, r8\n\
+	adds r2, r3, r0\n\
+	add r1, r10\n\
+	movs r3, 0x7\n\
+_081853BA:\n\
+	ldrb r0, [r2]\n\
+	strb r0, [r1]\n\
+	adds r2, 0x1\n\
+	adds r1, 0x1\n\
+	subs r3, 0x1\n\
+	cmp r3, 0\n\
+	bge _081853BA\n\
+	ldr r0, [sp, 0x8]\n\
+	adds r1, r0, r6\n\
+	ldrb r0, [r5, 0xC]\n\
+	strb r0, [r1]\n\
+	ldrh r0, [r5, 0x10]\n\
+	strb r0, [r4]\n\
+	ldrh r0, [r5, 0xE]\n\
+	strb r0, [r4, 0xC]\n\
+	ldr r1, =0x000004d4\n\
+	adds r0, r7, r1\n\
+	add r0, r12\n\
+	ldr r1, [r5]\n\
+	str r1, [r0]\n\
+	adds r5, 0x14\n\
+	movs r2, 0x14\n\
+	add r8, r2\n\
+	movs r3, 0x4\n\
+	add r12, r3\n\
+	adds r4, 0x1\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x3\n\
+	ble _081853AC\n\
+	movs r4, 0x9D\n\
+	lsls r4, 3\n\
+	adds r1, r7, r4\n\
+	ldr r5, =gRecordedBattleRngSeed\n\
+	ldr r0, [r5]\n\
+	str r0, [r1]\n\
+	ldr r0, =sRecordedBattle_BattleFlags\n\
+	ldr r2, [r0]\n\
+	movs r0, 0x2\n\
+	ands r0, r2\n\
+	cmp r0, 0\n\
+	beq _081854DC\n\
+	ldr r1, =0x000004ec\n\
+	adds r3, r7, r1\n\
+	movs r1, 0x23\n\
+	negs r1, r1\n\
+	ands r1, r2\n\
+	movs r0, 0x80\n\
+	lsls r0, 18\n\
+	orrs r1, r0\n\
+	str r1, [r3]\n\
+	movs r0, 0x4\n\
+	ands r0, r2\n\
+	cmp r0, 0\n\
+	beq _08185454\n\
+	movs r0, 0x80\n\
+	lsls r0, 24\n\
+	orrs r1, r0\n\
+	str r1, [r3]\n\
+	b _081854E2\n\
+	.pool\n\
+_08185454:\n\
+	movs r0, 0x40\n\
+	ands r2, r0\n\
+	cmp r2, 0\n\
+	beq _081854E2\n\
+	ldr r2, =sRecordedBattle_Players\n\
+	ldrh r0, [r2, 0xE]\n\
+	cmp r0, 0x1\n\
+	beq _081854A8\n\
+	cmp r0, 0x1\n\
+	bgt _08185474\n\
+	cmp r0, 0\n\
+	beq _0818547E\n\
+	b _081854E2\n\
+	.pool\n\
+_08185474:\n\
+	cmp r0, 0x2\n\
+	beq _0818547E\n\
+	cmp r0, 0x3\n\
+	beq _081854A8\n\
+	b _081854E2\n\
+_0818547E:\n\
+	ldr r3, =gUnknown_0203C7B4\n\
+	ldrb r1, [r3]\n\
+	lsls r0, r1, 2\n\
+	adds r0, r1\n\
+	lsls r0, 2\n\
+	ldr r4, =sRecordedBattle_Players\n\
+	adds r0, r4\n\
+	ldrh r1, [r0, 0xE]\n\
+	movs r0, 0x1\n\
+	ands r0, r1\n\
+	cmp r0, 0\n\
+	bne _081854E2\n\
+	ldr r5, =0x000004ec\n\
+	adds r0, r7, r5\n\
+	b _081854C4\n\
+	.pool\n\
+_081854A8:\n\
+	ldr r0, =gUnknown_0203C7B4\n\
+	ldrb r1, [r0]\n\
+	lsls r0, r1, 2\n\
+	adds r0, r1\n\
+	lsls r0, 2\n\
+	ldr r1, =sRecordedBattle_Players\n\
+	adds r0, r1\n\
+	ldrh r1, [r0, 0xE]\n\
+	movs r0, 0x1\n\
+	ands r0, r1\n\
+	cmp r0, 0\n\
+	beq _081854E2\n\
+	ldr r2, =0x000004ec\n\
+	adds r0, r7, r2\n\
+_081854C4:\n\
+	ldr r1, [r0]\n\
+	movs r2, 0x80\n\
+	lsls r2, 24\n\
+	orrs r1, r2\n\
+	str r1, [r0]\n\
+	b _081854E2\n\
+	.pool\n\
+_081854DC:\n\
+	ldr r3, =0x000004ec\n\
+	adds r0, r7, r3\n\
+	str r2, [r0]\n\
+_081854E2:\n\
+	ldr r4, =gTrainerBattleOpponent_A\n\
+	ldrh r1, [r4]\n\
+	ldr r5, =0x000004f4\n\
+	adds r0, r7, r5\n\
+	strh r1, [r0]\n\
+	ldr r0, =gTrainerBattleOpponent_B\n\
+	ldrh r1, [r0]\n\
+	ldr r2, =0x000004f6\n\
+	adds r0, r7, r2\n\
+	strh r1, [r0]\n\
+	ldr r3, =gPartnerTrainerId\n\
+	ldrh r1, [r3]\n\
+	movs r4, 0x9F\n\
+	lsls r4, 3\n\
+	adds r0, r7, r4\n\
+	strh r1, [r0]\n\
+	ldr r5, =gUnknown_0203C7B4\n\
+	ldrb r1, [r5]\n\
+	adds r2, 0x4\n\
+	adds r0, r7, r2\n\
+	strh r1, [r0]\n\
+	mov r3, r9\n\
+	ldr r0, [r3]\n\
+	ldr r4, =0x00000ca9\n\
+	adds r0, r4\n\
+	ldrb r0, [r0]\n\
+	lsls r0, 30\n\
+	lsrs r0, 30\n\
+	ldr r5, =0x000004fc\n\
+	adds r1, r7, r5\n\
+	strb r0, [r1]\n\
+	ldr r0, =gUnknown_0203C7AE\n\
+	ldrb r1, [r0]\n\
+	adds r2, 0x3\n\
+	adds r0, r7, r2\n\
+	strb r1, [r0]\n\
+	ldr r3, =gUnknown_0203C7AF\n\
+	ldrb r1, [r3]\n\
+	ldr r4, =0x000004fe\n\
+	adds r0, r7, r4\n\
+	strb r1, [r0]\n\
+	mov r5, r9\n\
+	ldr r0, [r5]\n\
+	ldrb r1, [r0, 0x15]\n\
+	lsls r1, 29\n\
+	ldr r0, =0x000004ff\n\
+	adds r3, r7, r0\n\
+	lsrs r1, 31\n\
+	ldrb r2, [r3]\n\
+	movs r0, 0x2\n\
+	negs r0, r0\n\
+	ands r0, r2\n\
+	orrs r0, r1\n\
+	strb r0, [r3]\n\
+	ldr r1, [r5]\n\
+	ldrb r1, [r1, 0x14]\n\
+	lsls r1, 29\n\
+	lsrs r1, 28\n\
+	movs r2, 0xF\n\
+	negs r2, r2\n\
+	ands r0, r2\n\
+	orrs r0, r1\n\
+	strb r0, [r3]\n\
+	movs r2, 0xA0\n\
+	lsls r2, 3\n\
+	adds r1, r7, r2\n\
+	ldr r3, =sRecordedBattle_AI_Scripts\n\
+	ldr r0, [r3]\n\
+	str r0, [r1]\n\
+	ldr r4, =0xfffffed4\n\
+	adds r1, r4, 0\n\
+	ldr r5, =gTrainerBattleOpponent_A\n\
+	ldrh r5, [r5]\n\
+	adds r0, r1, r5\n\
+	lsls r0, 16\n\
+	lsrs r0, 16\n\
+	cmp r0, 0x63\n\
+	bls _08185580\n\
+	b _081856C4\n\
+_08185580:\n\
+	movs r6, 0\n\
+	ldr r0, =0x00000504\n\
+	adds r3, r7, r0\n\
+	mov r10, r9\n\
+	ldr r1, =gTrainerBattleOpponent_A\n\
+	mov r12, r1\n\
+	adds r2, r4, 0\n\
+	mov r8, r2\n\
+	ldr r4, =0x0000073c\n\
+_08185592:\n\
+	adds r2, r3, r6\n\
+	mov r5, r10\n\
+	ldr r1, [r5]\n\
+	mov r5, r12\n\
+	ldrh r0, [r5]\n\
+	add r0, r8\n\
+	movs r5, 0xEC\n\
+	muls r0, r5\n\
+	adds r0, r6, r0\n\
+	adds r1, r4\n\
+	adds r1, r0\n\
+	ldrb r0, [r1]\n\
+	strb r0, [r2]\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x7\n\
+	ble _08185592\n\
+	mov r0, r9\n\
+	ldr r2, [r0]\n\
+	ldr r1, =gTrainerBattleOpponent_A\n\
+	ldrh r0, [r1]\n\
+	ldr r3, =0xfffffed4\n\
+	adds r0, r3\n\
+	movs r1, 0xEC\n\
+	muls r0, r1\n\
+	adds r2, r0\n\
+	ldr r4, =0x00000739\n\
+	adds r2, r4\n\
+	ldrb r1, [r2]\n\
+	ldr r5, =0x0000050c\n\
+	adds r0, r7, r5\n\
+	strb r1, [r0]\n\
+	ldr r1, =gUnknown_0203CCE8\n\
+	ldrb r0, [r1]\n\
+	cmp r0, 0x1\n\
+	bne _08185664\n\
+	movs r6, 0\n\
+	ldr r2, =0x0000050e\n\
+	adds r4, r7, r2\n\
+	mov r10, r9\n\
+	ldr r5, =gTrainerBattleOpponent_A\n\
+	mov r8, r5\n\
+	adds r5, r3, 0\n\
+_081855E6:\n\
+	lsls r3, r6, 1\n\
+	mov r0, r10\n\
+	ldr r2, [r0]\n\
+	mov r1, r8\n\
+	ldrh r0, [r1]\n\
+	adds r0, r5\n\
+	movs r1, 0xEC\n\
+	muls r0, r1\n\
+	adds r3, r0\n\
+	movs r0, 0xEC\n\
+	lsls r0, 3\n\
+	adds r2, r0\n\
+	adds r2, r3\n\
+	ldrh r0, [r2]\n\
+	strh r0, [r4]\n\
+	adds r4, 0x2\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x5\n\
+	ble _081855E6\n\
+	b _08185696\n\
+	.pool\n\
+_08185664:\n\
+	movs r6, 0\n\
+	ldr r1, =0x0000050e\n\
+	adds r4, r7, r1\n\
+	mov r10, r9\n\
+	ldr r2, =gTrainerBattleOpponent_A\n\
+	mov r8, r2\n\
+	adds r5, r3, 0\n\
+_08185672:\n\
+	lsls r3, r6, 1\n\
+	mov r0, r10\n\
+	ldr r2, [r0]\n\
+	mov r1, r8\n\
+	ldrh r0, [r1]\n\
+	adds r0, r5\n\
+	movs r1, 0xEC\n\
+	muls r0, r1\n\
+	adds r3, r0\n\
+	ldr r0, =0x00000754\n\
+	adds r2, r0\n\
+	adds r2, r3\n\
+	ldrh r0, [r2]\n\
+	strh r0, [r4]\n\
+	adds r4, 0x2\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x5\n\
+	ble _08185672\n\
+_08185696:\n\
+	mov r1, r9\n\
+	ldr r2, [r1]\n\
+	ldr r3, =gTrainerBattleOpponent_A\n\
+	ldrh r0, [r3]\n\
+	ldr r4, =0xfffffed4\n\
+	adds r0, r4\n\
+	movs r1, 0xEC\n\
+	muls r0, r1\n\
+	adds r2, r0\n\
+	ldr r5, =0x0000081c\n\
+	adds r2, r5\n\
+	ldrb r1, [r2]\n\
+	b _08185856\n\
+	.pool\n\
+_081856C4:\n\
+	ldr r3, =gTrainerBattleOpponent_B\n\
+	ldrh r3, [r3]\n\
+	adds r0, r1, r3\n\
+	lsls r0, 16\n\
+	lsrs r0, 16\n\
+	cmp r0, 0x63\n\
+	bls _081856D4\n\
+	b _081857E4\n\
+_081856D4:\n\
+	movs r6, 0\n\
+	ldr r4, =0x00000504\n\
+	adds r3, r7, r4\n\
+	mov r10, r9\n\
+	ldr r5, =gTrainerBattleOpponent_B\n\
+	mov r12, r5\n\
+	ldr r0, =0xfffffed4\n\
+	mov r8, r0\n\
+	ldr r4, =0x0000073c\n\
+_081856E6:\n\
+	adds r2, r3, r6\n\
+	mov r5, r10\n\
+	ldr r1, [r5]\n\
+	mov r5, r12\n\
+	ldrh r0, [r5]\n\
+	add r0, r8\n\
+	movs r5, 0xEC\n\
+	muls r0, r5\n\
+	adds r0, r6, r0\n\
+	adds r1, r4\n\
+	adds r1, r0\n\
+	ldrb r0, [r1]\n\
+	strb r0, [r2]\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x7\n\
+	ble _081856E6\n\
+	mov r0, r9\n\
+	ldr r2, [r0]\n\
+	ldr r1, =gTrainerBattleOpponent_B\n\
+	ldrh r0, [r1]\n\
+	ldr r3, =0xfffffed4\n\
+	adds r0, r3\n\
+	movs r1, 0xEC\n\
+	muls r0, r1\n\
+	adds r2, r0\n\
+	ldr r4, =0x00000739\n\
+	adds r2, r4\n\
+	ldrb r1, [r2]\n\
+	ldr r5, =0x0000050c\n\
+	adds r0, r7, r5\n\
+	strb r1, [r0]\n\
+	ldr r1, =gUnknown_0203CCE8\n\
+	ldrb r0, [r1]\n\
+	cmp r0, 0x1\n\
+	bne _08185784\n\
+	movs r6, 0\n\
+	ldr r2, =0x0000050e\n\
+	adds r4, r7, r2\n\
+	mov r10, r9\n\
+	ldr r5, =gTrainerBattleOpponent_B\n\
+	mov r8, r5\n\
+	adds r5, r3, 0\n\
+_0818573A:\n\
+	lsls r3, r6, 1\n\
+	mov r0, r10\n\
+	ldr r2, [r0]\n\
+	mov r1, r8\n\
+	ldrh r0, [r1]\n\
+	adds r0, r5\n\
+	movs r1, 0xEC\n\
+	muls r0, r1\n\
+	adds r3, r0\n\
+	movs r0, 0xEC\n\
+	lsls r0, 3\n\
+	adds r2, r0\n\
+	adds r2, r3\n\
+	ldrh r0, [r2]\n\
+	strh r0, [r4]\n\
+	adds r4, 0x2\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x5\n\
+	ble _0818573A\n\
+	b _081857B6\n\
+	.pool\n\
+_08185784:\n\
+	movs r6, 0\n\
+	ldr r1, =0x0000050e\n\
+	adds r4, r7, r1\n\
+	mov r10, r9\n\
+	ldr r2, =gTrainerBattleOpponent_B\n\
+	mov r8, r2\n\
+	adds r5, r3, 0\n\
+_08185792:\n\
+	lsls r3, r6, 1\n\
+	mov r0, r10\n\
+	ldr r2, [r0]\n\
+	mov r1, r8\n\
+	ldrh r0, [r1]\n\
+	adds r0, r5\n\
+	movs r1, 0xEC\n\
+	muls r0, r1\n\
+	adds r3, r0\n\
+	ldr r0, =0x00000754\n\
+	adds r2, r0\n\
+	adds r2, r3\n\
+	ldrh r0, [r2]\n\
+	strh r0, [r4]\n\
+	adds r4, 0x2\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x5\n\
+	ble _08185792\n\
+_081857B6:\n\
+	mov r1, r9\n\
+	ldr r2, [r1]\n\
+	ldr r3, =gTrainerBattleOpponent_B\n\
+	ldrh r0, [r3]\n\
+	ldr r4, =0xfffffed4\n\
+	adds r0, r4\n\
+	movs r1, 0xEC\n\
+	muls r0, r1\n\
+	adds r2, r0\n\
+	ldr r5, =0x0000081c\n\
+	adds r2, r5\n\
+	ldrb r1, [r2]\n\
+	b _08185856\n\
+	.pool\n\
+_081857E4:\n\
+	ldr r3, =gPartnerTrainerId\n\
+	ldrh r3, [r3]\n\
+	adds r0, r1, r3\n\
+	lsls r0, 16\n\
+	lsrs r0, 16\n\
+	cmp r0, 0x63\n\
+	bhi _0818585C\n\
+	movs r6, 0\n\
+	ldr r4, =0x00000504\n\
+	adds r3, r7, r4\n\
+	mov r10, r9\n\
+	ldr r5, =gPartnerTrainerId\n\
+	mov r12, r5\n\
+	ldr r0, =0xfffffed4\n\
+	mov r8, r0\n\
+	ldr r4, =0x0000073c\n\
+_08185804:\n\
+	adds r2, r3, r6\n\
+	mov r5, r10\n\
+	ldr r1, [r5]\n\
+	mov r5, r12\n\
+	ldrh r0, [r5]\n\
+	add r0, r8\n\
+	movs r5, 0xEC\n\
+	muls r0, r5\n\
+	adds r0, r6, r0\n\
+	adds r1, r4\n\
+	adds r1, r0\n\
+	ldrb r0, [r1]\n\
+	strb r0, [r2]\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x7\n\
+	ble _08185804\n\
+	mov r0, r9\n\
+	ldr r1, [r0]\n\
+	ldr r2, =gPartnerTrainerId\n\
+	ldrh r0, [r2]\n\
+	ldr r3, =0xfffffed4\n\
+	adds r0, r3\n\
+	movs r2, 0xEC\n\
+	muls r0, r2\n\
+	adds r1, r0\n\
+	ldr r4, =0x00000739\n\
+	adds r1, r4\n\
+	ldrb r1, [r1]\n\
+	ldr r5, =0x0000050c\n\
+	adds r0, r7, r5\n\
+	strb r1, [r0]\n\
+	mov r0, r9\n\
+	ldr r1, [r0]\n\
+	ldr r4, =gPartnerTrainerId\n\
+	ldrh r0, [r4]\n\
+	adds r0, r3\n\
+	muls r0, r2\n\
+	adds r1, r0\n\
+	ldr r5, =0x0000081c\n\
+	adds r1, r5\n\
+	ldrb r1, [r1]\n\
+_08185856:\n\
+	ldr r2, =0x0000051a\n\
+	adds r0, r7, r2\n\
+	strb r1, [r0]\n\
+_0818585C:\n\
+	ldr r3, =gTrainerBattleOpponent_A\n\
+	ldrh r0, [r3]\n\
+	ldr r1, =0x0000018f\n\
+	cmp r0, r1\n\
+	bls _08185900\n\
+	mov r4, r9\n\
+	ldr r2, [r4]\n\
+	adds r1, r0, 0\n\
+	ldr r3, =0xfffffe70\n\
+	adds r1, r3\n\
+	lsls r0, r1, 4\n\
+	adds r0, r1\n\
+	lsls r0, 2\n\
+	adds r2, r0\n\
+	adds r2, 0xDC\n\
+	ldrb r0, [r2]\n\
+	lsls r0, 27\n\
+	lsrs r0, 27\n\
+	ldr r5, =0x0000050d\n\
+	adds r1, r7, r5\n\
+	strb r0, [r1]\n\
+	movs r6, 0\n\
+	ldr r0, =0x0000050e\n\
+	adds r4, r7, r0\n\
+	mov r10, r9\n\
+	ldr r1, =gTrainerBattleOpponent_A\n\
+	mov r8, r1\n\
+	adds r5, r3, 0\n\
+_08185894:\n\
+	lsls r3, r6, 1\n\
+	mov r0, r10\n\
+	ldr r2, [r0]\n\
+	mov r0, r8\n\
+	ldrh r1, [r0]\n\
+	adds r1, r5\n\
+	lsls r0, r1, 4\n\
+	adds r0, r1\n\
+	lsls r0, 2\n\
+	adds r3, r0\n\
+	movs r1, 0x82\n\
+	lsls r1, 1\n\
+	adds r2, r1\n\
+	adds r2, r3\n\
+	ldrh r0, [r2]\n\
+	strh r0, [r4]\n\
+	adds r4, 0x2\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x5\n\
+	ble _08185894\n\
+	mov r3, r9\n\
+	ldr r2, [r3]\n\
+	ldr r4, =gTrainerBattleOpponent_A\n\
+	ldrh r1, [r4]\n\
+	ldr r5, =0xfffffe70\n\
+	adds r1, r5\n\
+	b _081859AC\n\
+	.pool\n\
+_08185900:\n\
+	ldr r3, =gTrainerBattleOpponent_B\n\
+	ldrh r0, [r3]\n\
+	cmp r0, r1\n\
+	bls _0818597C\n\
+	mov r4, r9\n\
+	ldr r2, [r4]\n\
+	adds r1, r0, 0\n\
+	ldr r3, =0xfffffe70\n\
+	adds r1, r3\n\
+	lsls r0, r1, 4\n\
+	adds r0, r1\n\
+	lsls r0, 2\n\
+	adds r2, r0\n\
+	adds r2, 0xDC\n\
+	ldrb r0, [r2]\n\
+	lsls r0, 27\n\
+	lsrs r0, 27\n\
+	ldr r5, =0x0000050d\n\
+	adds r1, r7, r5\n\
+	strb r0, [r1]\n\
+	movs r6, 0\n\
+	ldr r0, =0x0000050e\n\
+	adds r4, r7, r0\n\
+	mov r10, r9\n\
+	ldr r1, =gTrainerBattleOpponent_B\n\
+	mov r8, r1\n\
+	adds r5, r3, 0\n\
+_08185936:\n\
+	lsls r3, r6, 1\n\
+	mov r0, r10\n\
+	ldr r2, [r0]\n\
+	mov r0, r8\n\
+	ldrh r1, [r0]\n\
+	adds r1, r5\n\
+	lsls r0, r1, 4\n\
+	adds r0, r1\n\
+	lsls r0, 2\n\
+	adds r3, r0\n\
+	movs r1, 0x82\n\
+	lsls r1, 1\n\
+	adds r2, r1\n\
+	adds r2, r3\n\
+	ldrh r0, [r2]\n\
+	strh r0, [r4]\n\
+	adds r4, 0x2\n\
+	adds r6, 0x1\n\
+	cmp r6, 0x5\n\
+	ble _08185936\n\
+	mov r3, r9\n\
+	ldr r2, [r3]\n\
+	ldr r4, =gTrainerBattleOpponent_B\n\
+	ldrh r1, [r4]\n\
+	ldr r5, =0xfffffe70\n\
+	adds r1, r5\n\
+	b _081859AC\n\
+	.pool\n\
+_0818597C:\n\
+	ldr r3, =gPartnerTrainerId\n\
+	ldrh r0, [r3]\n\
+	cmp r0, r1\n\
+	bls _081859C0\n\
+	mov r4, r9\n\
+	ldr r2, [r4]\n\
+	adds r1, r0, 0\n\
+	ldr r3, =0xfffffe70\n\
+	adds r1, r3\n\
+	lsls r0, r1, 4\n\
+	adds r0, r1\n\
+	lsls r0, 2\n\
+	adds r2, r0\n\
+	adds r2, 0xDC\n\
+	ldrb r0, [r2]\n\
+	lsls r0, 27\n\
+	lsrs r0, 27\n\
+	ldr r5, =0x0000050d\n\
+	adds r1, r7, r5\n\
+	strb r0, [r1]\n\
+	ldr r2, [r4]\n\
+	ldr r0, =gPartnerTrainerId\n\
+	ldrh r1, [r0]\n\
+	adds r1, r3\n\
+_081859AC:\n\
+	lsls r0, r1, 4\n\
+	adds r0, r1\n\
+	lsls r0, 2\n\
+	adds r2, r0\n\
+	ldr r1, =0x0000011b\n\
+	adds r0, r2, r1\n\
+	ldrb r1, [r0]\n\
+	ldr r2, =0x0000051b\n\
+	adds r0, r7, r2\n\
+	strb r1, [r0]\n\
+_081859C0:\n\
+	movs r6, 0\n\
+	ldr r3, =0x00000297\n\
+	mov r10, r3\n\
+	ldr r4, =sBattleRecords\n\
+	mov r9, r4\n\
+	movs r5, 0xA6\n\
+	lsls r5, 2\n\
+	mov r8, r5\n\
+	ldr r0, =0x0000051c\n\
+	adds r5, r7, r0\n\
+_081859D4:\n\
+	adds r4, r6, 0x1\n\
+	mov r0, r8\n\
+	muls r0, r6\n\
+	mov r1, r9\n\
+	adds r2, r0, r1\n\
+	adds r1, r0, r5\n\
+	mov r3, r10\n\
+	adds r3, 0x1\n\
+_081859E4:\n\
+	ldrb r0, [r2]\n\
+	strb r0, [r1]\n\
+	adds r2, 0x1\n\
+	adds r1, 0x1\n\
+	subs r3, 0x1\n\
+	cmp r3, 0\n\
+	bne _081859E4\n\
+	adds r6, r4, 0\n\
+	cmp r6, 0x3\n\
+	ble _081859D4\n\
+_081859F8:\n\
+	adds r0, r7, 0\n\
+	ldr r1, [sp]\n\
+	bl sub_81852F0\n\
+	adds r4, r0, 0\n\
+	cmp r4, 0x1\n\
+	beq _08185A14\n\
+	ldr r0, [sp, 0x4]\n\
+	adds r0, 0x1\n\
+	lsls r0, 24\n\
+	lsrs r0, 24\n\
+	str r0, [sp, 0x4]\n\
+	cmp r0, 0x2\n\
+	bls _081859F8\n\
+_08185A14:\n\
+	adds r0, r7, 0\n\
+	bl Free\n\
+	ldr r0, [sp]\n\
+	bl Free\n\
+	adds r0, r4, 0\n\
+	add sp, 0xC\n\
+	pop {r3-r5}\n\
+	mov r8, r3\n\
+	mov r9, r4\n\
+	mov r10, r5\n\
+	pop {r4-r7}\n\
+	pop {r1}\n\
+	bx r1\n\
+	.pool\n\
+        .syntax divided");
+}
+#endif // NONMATCHING
+
+bool32 TryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst, struct SaveSection *saveBuffer)
+{
+    if (TryCopySpecialSaveSection(SECTION_ID_RECORDED_BATTLE, (void*)(saveBuffer)) != 1)
+        return FALSE;
+
+    memcpy(dst, saveBuffer, sizeof(struct RecordedBattleSave));
+
+    if (!IsRecordedBattleSaveValid(dst))
+        return FALSE;
+
+    return TRUE;
+}
+
+static bool32 AllocTryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst)
+{
+    struct SaveSection *savBuffer = AllocZeroed(sizeof(struct SaveSection));
+    bool32 ret = TryCopyRecordedBattleSaveData(dst, savBuffer);
+    Free(savBuffer);
+
+    return ret;
+}
+
+static void CB2_RecordedBattleEnd(void)
+{
+    gSaveBlock2Ptr->frontierChosenLvl = gUnknown_0203C7AD;
+    gBattleOutcome = 0;
+    gBattleTypeFlags = 0;
+    gTrainerBattleOpponent_A = 0;
+    gTrainerBattleOpponent_B = 0;
+    gPartnerTrainerId = 0;
+
+    RecordedBattle_RestoreSavedParties();
+    SetMainCallback2(sCallback2_AfterRecordedBattle);
+}
+
+#define tFramesToWait data[0]
+
+static void Task_StartAfterCountdown(u8 taskId)
+{
+    if (--gTasks[taskId].tFramesToWait == 0)
+    {
+        gMain.savedCallback = CB2_RecordedBattleEnd;
+        SetMainCallback2(CB2_InitBattle);
+        DestroyTask(taskId);
+    }
+}
+
+static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src)
+{
+    bool8 var;
+    s32 i, j;
+
+    ZeroPlayerPartyMons();
+    ZeroEnemyPartyMons();
+
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        gPlayerParty[i] = src->playerParty[i];
+        gEnemyParty[i] = src->opponentParty[i];
+    }
+
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    {
+        for (var = FALSE, j = 0; j < PLAYER_NAME_LENGTH; j++)
+        {
+            gLinkPlayers[i].name[j] = src->playersName[i][j];
+            if (src->playersName[i][j] == EOS)
+                var = TRUE;
+        }
+        gLinkPlayers[i].gender = src->playersGender[i];
+        gLinkPlayers[i].language = src->playersLanguage[i];
+        gLinkPlayers[i].lp_field_18 = src->playersBank[i];
+        gLinkPlayers[i].trainerId = src->playersTrainerId[i];
+
+        if (var)
+            ConvertInternationalString(gLinkPlayers[i].name, gLinkPlayers[i].language);
+    }
+
+    gRecordedBattleRngSeed = src->rngSeed;
+    gBattleTypeFlags = src->battleFlags | BATTLE_TYPE_RECORDED;
+    gTrainerBattleOpponent_A = src->opponentA;
+    gTrainerBattleOpponent_B = src->opponentB;
+    gPartnerTrainerId = src->partnerId;
+    gUnknown_0203C7B4 = src->field_4FA;
+    gUnknown_0203C7AD = gSaveBlock2Ptr->frontierChosenLvl;
+    gUnknown_0203C7AE = src->field_4FD;
+    gUnknown_0203C7AF = src->field_4FE;
+    sRecordedBattle_BattleStyle = src->battleStyle;
+    sRecordedBattle_TextSpeed = src->textSpeed;
+    sRecordedBattle_AI_Scripts = src->AI_scripts;
+
+    for (i = 0; i < 8; i++)
+    {
+        gUnknown_0203CCD1[i] = src->field_504[i];
+    }
+
+    gUnknown_0203CCD9 = src->field_50C;
+    gUnknown_0203CCDA = src->field_50D;
+    gUnknown_03001278 = src->field_51A;
+    gUnknown_03001279 = src->field_51B;
+
+    for (i = 0; i < 6; i++)
+    {
+        gUnknown_0203CCDC[i] = src->field_50E[i];
+    }
+
+    gSaveBlock2Ptr->frontierChosenLvl = src->field_4FC;
+
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    {
+        for (j = 0; j < BANK_RECORD_SIZE; j++)
+        {
+            sBattleRecords[i][j] = src->battleRecord[i][j];
+        }
+    }
+}
+
+void PlayRecordedBattle(void (*CB2_After)(void))
+{
+    struct RecordedBattleSave *battleSave = AllocZeroed(sizeof(struct RecordedBattleSave));
+    if (AllocTryCopyRecordedBattleSaveData(battleSave) == TRUE)
+    {
+        u8 taskId;
+
+        RecordedBattle_SaveParties();
+        SetRecordedBattleVarsFromSave(battleSave);
+
+        taskId = CreateTask(Task_StartAfterCountdown, 1);
+        gTasks[taskId].tFramesToWait = 128;
+
+        sCallback2_AfterRecordedBattle = CB2_After;
+        PlayMapChosenOrBattleBGM(FALSE);
+        SetMainCallback2(CB2_RecordedBattle);
+    }
+    Free(battleSave);
+}
+
+#undef tFramesToWait
+
+static void CB2_RecordedBattle(void)
+{
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTasks();
+}
+
+u8 sub_8185EA0(void)
+{
+    return gUnknown_0203C7AE;
+}
+
+u8 sub_8185EAC(void)
+{
+    return gUnknown_0203C7AF;
+}
+
+void RecordedBattle_SaveParties(void)
+{
+    s32 i;
+
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        sSavedPlayerParty[i] = gPlayerParty[i];
+        sSavedOpponentParty[i] = gEnemyParty[i];
+    }
+}
+
+void RecordedBattle_RestoreSavedParties(void)
+{
+    s32 i;
+
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        gPlayerParty[i] = sSavedPlayerParty[i];
+        gEnemyParty[i] = sSavedOpponentParty[i];
+    }
+}
+
+u8 GetActiveBankLinkPlayerGender(void)
+{
+    s32 i;
+
+    for (i = 0; i < MAX_LINK_PLAYERS; i++)
+    {
+        if (gLinkPlayers[i].lp_field_18 == gActiveBank)
+            break;
+    }
+
+    if (i != MAX_LINK_PLAYERS)
+        return gLinkPlayers[i].gender;
+
+    return 0;
+}
+
+void sub_8185F84(void)
+{
+    gUnknown_0203C7B5 = 0;
+}
+
+void sub_8185F90(u16 arg0)
+{
+    gUnknown_0203C7B5 |= (arg0 & 0x8000) >> 0xF;
+}
+
+u8 sub_8185FAC(void)
+{
+    return gUnknown_0203C7B5;
+}
+
+u8 GetBattleStyleInRecordedBattle(void)
+{
+    return sRecordedBattle_BattleStyle;
+}
+
+u8 GetTextSpeedInRecordedBattle(void)
+{
+    return sRecordedBattle_TextSpeed;
+}
+
+void RecordedBattle_CopyBankMoves(void)
+{
+    s32 i;
+
+    if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
+        return;
+    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+        return;
+    if (gUnknown_0203C7AC == 2)
+        return;
+
+    for (i = 0; i < 4; i++)
+    {
+        sRecordedBattle_PlayerMonMoves[gActiveBank / 2][i] = gBattleMons[gActiveBank].moves[i];
+    }
+}
+
+#define ACTION_MOVE_CHANGE 6
+
+void sub_818603C(u8 arg0)
+{
+    s32 bank, j, k;
+
+    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+        return;
+
+    for (bank = 0; bank < gNoOfAllBanks; bank++)
+    {
+        if (GetBankSide(bank) != SIDE_OPPONENT) // player's side only
+        {
+            if (arg0 == 1)
+            {
+                for (j = 0; j < 4; j++)
+                {
+                    if (gBattleMons[bank].moves[j] != sRecordedBattle_PlayerMonMoves[bank / 2][j])
+                        break;
+                }
+                if (j != 4) // player's mon's move has been changed
+                {
+                    RecordedBattle_SetBankAction(bank, ACTION_MOVE_CHANGE);
+                    for (j = 0; j < 4; j++)
+                    {
+                        for (k = 0; k < 4; k++)
+                        {
+                            if (gBattleMons[bank].moves[j] == sRecordedBattle_PlayerMonMoves[bank / 2][k])
+                            {
+                                RecordedBattle_SetBankAction(bank, k);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (sBattleRecords[bank][sRecordedBytesNo[bank]] == ACTION_MOVE_CHANGE)
+                {
+                    u8 ppBonuses[4];
+                    u8 array1[4];
+                    u8 array2[4];
+                    struct MovePp movePp;
+                    u8 array3[8];
+                    u8 var;
+
+                    RecordedBattle_ReadBankAction(bank);
+                    for (j = 0; j < 4; j++)
+                    {
+                        ppBonuses[j] = ((gBattleMons[bank].ppBonuses & ((3 << (j << 1)))) >> (j << 1));
+                    }
+                    for (j = 0; j < 4; j++)
+                    {
+                        array1[j] = RecordedBattle_ReadBankAction(bank);
+                        movePp.moves[j] = gBattleMons[bank].moves[array1[j]];
+                        movePp.pp[j] = gBattleMons[bank].pp[array1[j]];
+                        array3[j] = ppBonuses[array1[j]];
+                        array2[j] = (gDisableStructs[bank].unk18_b & gBitTable[j]) >> j;
+                    }
+                    for (j = 0; j < 4; j++)
+                    {
+                        gBattleMons[bank].moves[j] = movePp.moves[j];
+                        gBattleMons[bank].pp[j] = movePp.pp[j];
+                    }
+                    gBattleMons[bank].ppBonuses = 0;
+                    gDisableStructs[bank].unk18_b = 0;
+                    for (j = 0; j < 4; j++)
+                    {
+                        gBattleMons[bank].ppBonuses |= (array3[j]) << (j << 1);
+                        gDisableStructs[bank].unk18_b |= (array2[j]) << (j);
+                    }
+
+                    if (!(gBattleMons[bank].status2 & STATUS2_TRANSFORMED))
+                    {
+                        for (j = 0; j < 4; j++)
+                        {
+                            ppBonuses[j] = ((GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_PP_BONUSES, NULL) & ((3 << (j << 1)))) >> (j << 1));
+                        }
+                        for (j = 0; j < 4; j++)
+                        {
+                            movePp.moves[j] = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_MOVE1 + array1[j], NULL);
+                            movePp.pp[j] = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_PP1 + array1[j], NULL);
+                            array3[j] = ppBonuses[array1[j]];
+                        }
+                        for (j = 0; j < 4; j++)
+                        {
+                            SetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_MOVE1 + j, &movePp.moves[j]);
+                            SetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_PP1 + j, &movePp.pp[j]);
+                        }
+                        var = 0;
+                        for (j = 0; j < 4; j++)
+                        {
+                            var |= (array3[j]) << (j << 1);
+                        }
+                        SetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_PP_BONUSES, &var);
+                    }
+
+                    gChosenMovesByBanks[bank] = gBattleMons[bank].moves[*(gBattleStruct->chosenMovePositions + bank)];
+                }
+            }
+        }
+    }
+}
diff --git a/src/save.c b/src/save.c
index 2c1b26ca9..528c67145 100644
--- a/src/save.c
+++ b/src/save.c
@@ -797,7 +797,7 @@ u16 sub_815355C(void)
     return 0;
 }
 
-u32 sub_81535DC(u8 sector, u8* dst)
+u32 TryCopySpecialSaveSection(u8 sector, u8* dst)
 {
     s32 i;
     s32 size;
@@ -826,6 +826,7 @@ u32 sub_8153634(u8 sector, u8* src)
 
     if (sector != 30 && sector != 31)
         return 0xFF;
+
     savDataBuffer = &gSaveDataBuffer;
     *(u32*)(savDataBuffer) = 0xB39D;
 
-- 
cgit v1.2.3


From ac681878951ff9f2708df8182e7c0cd20fc64f7b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 13 Nov 2017 18:18:12 +0100
Subject: review changes adding a pal file

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

(limited to 'src')

diff --git a/src/berry_blender.c b/src/berry_blender.c
index 0705812bf..cc56f15f7 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -37,7 +37,7 @@ const u8 sBlenderCenterMap[] = INCBIN_U8("graphics/berry_blender/center_map.bin"
 const u16 sBlenderOuterPal[] = INCBIN_U16("graphics/berry_blender/outer.gbapal");
 
 // unreferenced pals?
-static const u16 sUnknownPal_0[] = INCBIN_U16("graphics/unknown/8339514.gbapal");
+static const u16 sUnknownPal_0[] = INCBIN_U16("graphics/unknown/unknown_339514.gbapal");
 static const u16 sUnknownArray_1[224] = {0};
 
 // unused text?
-- 
cgit v1.2.3


From bb9c928330fb91426e2ad0c68e6f30f2a867d611 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 13 Nov 2017 18:30:17 +0100
Subject: starter choose review changes

---
 src/starter_choose.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/starter_choose.c b/src/starter_choose.c
index c730e0978..1f64a5db7 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -25,8 +25,6 @@
 #define STARTER_PKMN_POS_X 120
 #define STARTER_PKMN_POS_Y 64
 
-extern u16 sStarterChooseWindowId;
-
 // graphics
 extern const u32 gBirchHelpGfx[];
 extern const u32 gBirchBagTilemap[];
@@ -37,7 +35,7 @@ extern const u16 gBirchBagGrassPal[];
 extern const u8 gText_BirchInTrouble[];
 extern const u8 gText_ConfirmStarterChoice[];
 
-extern const u16 sStarterMons[STARTER_MON_COUNT];
+extern const u16 sStarterMon[STARTER_MON_COUNT];
 extern const struct BgTemplate gUnknown_085B1E00[3];
 extern const struct WindowTemplate gUnknown_085B1DCC[];
 extern const struct WindowTemplate gUnknown_085B1DDC;
@@ -78,11 +76,13 @@ static void CreateStarterPokemonLabel(u8 selection);
 static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y);
 static void StarterPokemonSpriteCallback(struct Sprite *sprite);
 
+static IWRAM_DATA u16 sStarterChooseWindowId;
+
 u16 GetStarterPokemon(u16 chosenStarterId)
 {
     if (chosenStarterId > STARTER_MON_COUNT)
         chosenStarterId = 0;
-    return sStarterMons[chosenStarterId];
+    return sStarterMon[chosenStarterId];
 }
 
 static void VblankCB_StarterChoose(void)
-- 
cgit v1.2.3


From 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 13 Nov 2017 19:01:23 +0100
Subject: recorded battle file is decompiled

---
 src/battle_2.c        |   1 -
 src/recorded_battle.c | 192 ++++++++++++++++++++++++++++++++------------------
 2 files changed, 124 insertions(+), 69 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index af5aa4d32..655010bd1 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -141,7 +141,6 @@ extern u8 gLastUsedAbility;
 extern u8 gUnknown_0203CF00[];
 extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
 extern const u8* gBattlescriptCurrInstr;
-extern u32 gBattlePalaceMoveSelectionRngValue;
 extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
 extern u8 gCurrentTurnActionNumber;
 extern u16 gDynamicBasePower;
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 8ecf943cc..12e9cce2d 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -81,31 +81,31 @@ struct RecordedBattleSave
 
 EWRAM_DATA u32 gRecordedBattleRngSeed = 0;
 EWRAM_DATA u32 gBattlePalaceMoveSelectionRngValue = 0;
-EWRAM_DATA u8 sBattleRecords[BATTLE_BANKS_COUNT][BANK_RECORD_SIZE] = {0};
-EWRAM_DATA u16 sRecordedBytesNo[BATTLE_BANKS_COUNT] = {0};
-EWRAM_DATA u16 gUnknown_0203C79C[4] = {0};
-EWRAM_DATA u16 gUnknown_0203C7A4[4] = {0};
-EWRAM_DATA u8 gUnknown_0203C7AC = 0;
-EWRAM_DATA u8 gUnknown_0203C7AD = 0;
-EWRAM_DATA u8 gUnknown_0203C7AE = 0;
-EWRAM_DATA u8 gUnknown_0203C7AF = 0;
-EWRAM_DATA MainCallback sCallback2_AfterRecordedBattle = NULL;
+EWRAM_DATA static u8 sBattleRecords[BATTLE_BANKS_COUNT][BANK_RECORD_SIZE] = {0};
+EWRAM_DATA static u16 sRecordedBytesNo[BATTLE_BANKS_COUNT] = {0};
+EWRAM_DATA static u16 sUnknown_0203C79C[4] = {0};
+EWRAM_DATA static u16 sUnknown_0203C7A4[4] = {0};
+EWRAM_DATA static u8 sUnknown_0203C7AC = 0;
+EWRAM_DATA static u8 sUnknown_0203C7AD = 0;
+EWRAM_DATA static u8 sUnknown_0203C7AE = 0;
+EWRAM_DATA static u8 sUnknown_0203C7AF = 0;
+EWRAM_DATA static MainCallback sCallback2_AfterRecordedBattle = NULL;
 EWRAM_DATA u8 gUnknown_0203C7B4 = 0;
-EWRAM_DATA u8 gUnknown_0203C7B5 = 0;
-EWRAM_DATA u8 sRecordedBattle_BattleStyle = 0;
-EWRAM_DATA u8 sRecordedBattle_TextSpeed = 0;
-EWRAM_DATA u32 sRecordedBattle_BattleFlags = 0;
-EWRAM_DATA u32 sRecordedBattle_AI_Scripts = 0;
-EWRAM_DATA struct Pokemon sSavedPlayerParty[PARTY_SIZE] = {0};
-EWRAM_DATA struct Pokemon sSavedOpponentParty[PARTY_SIZE] = {0};
-EWRAM_DATA u16 sRecordedBattle_PlayerMonMoves[2][4] = {0};
-EWRAM_DATA struct PlayerInfo sRecordedBattle_Players[BATTLE_BANKS_COUNT] = {0};
-EWRAM_DATA u8 gUnknown_0203CCD0 = 0;
-EWRAM_DATA u8 gUnknown_0203CCD1[8] = {0};
-EWRAM_DATA u8 gUnknown_0203CCD9 = 0;
-EWRAM_DATA u8 gUnknown_0203CCDA = 0;
-EWRAM_DATA u16 gUnknown_0203CCDC[6] = {0};
-EWRAM_DATA u8 gUnknown_0203CCE8 = 0;
+EWRAM_DATA static u8 sUnknown_0203C7B5 = 0;
+EWRAM_DATA static u8 sRecordedBattle_BattleStyle = 0;
+EWRAM_DATA static u8 sRecordedBattle_TextSpeed = 0;
+EWRAM_DATA static u32 sRecordedBattle_BattleFlags = 0;
+EWRAM_DATA static u32 sRecordedBattle_AI_Scripts = 0;
+EWRAM_DATA static struct Pokemon sSavedPlayerParty[PARTY_SIZE] = {0};
+EWRAM_DATA static struct Pokemon sSavedOpponentParty[PARTY_SIZE] = {0};
+EWRAM_DATA static u16 sRecordedBattle_PlayerMonMoves[2][4] = {0};
+EWRAM_DATA static struct PlayerInfo sRecordedBattle_Players[BATTLE_BANKS_COUNT] = {0};
+EWRAM_DATA static u8 sUnknown_0203CCD0 = 0;
+EWRAM_DATA static u8 sUnknown_0203CCD1[8] = {0};
+EWRAM_DATA static u8 sUnknown_0203CCD9 = 0;
+EWRAM_DATA static u8 sUnknown_0203CCDA = 0;
+EWRAM_DATA static u16 sUnknown_0203CCDC[6] = {0};
+EWRAM_DATA static u8 sUnknown_0203CCE8 = 0;
 
 extern u32 sub_81A513C(void);
 extern void PlayMapChosenOrBattleBGM(bool8);
@@ -113,21 +113,21 @@ extern void PlayMapChosenOrBattleBGM(bool8);
 // this file's functions
 static u8 sub_8185278(u8 *arg0, u8 *arg1, u8 *arg2);
 static bool32 AllocTryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst);
-void RecordedBattle_RestoreSavedParties(void);
+static void RecordedBattle_RestoreSavedParties(void);
 static void CB2_RecordedBattle(void);
 
 void sub_8184DA4(u8 arg0)
 {
     s32 i, j;
 
-    gUnknown_0203C7AC = arg0;
-    gUnknown_0203CCD0 = 0;
+    sUnknown_0203C7AC = arg0;
+    sUnknown_0203CCD0 = 0;
 
     for (i = 0; i < BATTLE_BANKS_COUNT; i++)
     {
         sRecordedBytesNo[i] = 0;
-        gUnknown_0203C79C[i] = 0;
-        gUnknown_0203C7A4[i] = 0;
+        sUnknown_0203C79C[i] = 0;
+        sUnknown_0203C7A4[i] = 0;
 
         if (arg0 == 1)
         {
@@ -145,13 +145,13 @@ void sub_8184E58(void)
 {
     s32 i, j;
 
-    if (gUnknown_0203C7AC == 1)
+    if (sUnknown_0203C7AC == 1)
     {
         gRecordedBattleRngSeed = gRngValue;
-        gUnknown_0203C7AE = VarGet(VAR_FRONTIER_FACILITY);
-        gUnknown_0203C7AF = sub_81A513C();
+        sUnknown_0203C7AE = VarGet(VAR_FRONTIER_FACILITY);
+        sUnknown_0203C7AF = sub_81A513C();
     }
-    else if (gUnknown_0203C7AC == 2)
+    else if (sUnknown_0203C7AC == 2)
     {
         gRngValue = gRecordedBattleRngSeed;
     }
@@ -202,7 +202,7 @@ void sub_8184E58(void)
 
 void RecordedBattle_SetBankAction(u8 bank, u8 action)
 {
-    if (sRecordedBytesNo[bank] < BANK_RECORD_SIZE && gUnknown_0203C7AC != 2)
+    if (sRecordedBytesNo[bank] < BANK_RECORD_SIZE && sUnknown_0203C7AC != 2)
     {
         sBattleRecords[bank][sRecordedBytesNo[bank]++] = action;
     }
@@ -240,7 +240,7 @@ u8 RecordedBattle_ReadBankAction(u8 bank)
 
 u8 sub_81850D0(void)
 {
-    return gUnknown_0203C7AC;
+    return sUnknown_0203C7AC;
 }
 
 u8 sub_81850DC(u8 *arg0)
@@ -250,17 +250,17 @@ u8 sub_81850DC(u8 *arg0)
 
     for (i = 0; i < BATTLE_BANKS_COUNT; i++)
     {
-        if (sRecordedBytesNo[i] != gUnknown_0203C79C[i])
+        if (sRecordedBytesNo[i] != sUnknown_0203C79C[i])
         {
             arg0[ret++] = i;
-            arg0[ret++] = sRecordedBytesNo[i] - gUnknown_0203C79C[i];
+            arg0[ret++] = sRecordedBytesNo[i] - sUnknown_0203C79C[i];
 
-            for (j = 0; j < sRecordedBytesNo[i] - gUnknown_0203C79C[i]; j++)
+            for (j = 0; j < sRecordedBytesNo[i] - sUnknown_0203C79C[i]; j++)
             {
-                arg0[ret++] = sBattleRecords[i][gUnknown_0203C79C[i] + j];
+                arg0[ret++] = sBattleRecords[i][sUnknown_0203C79C[i] + j];
             }
 
-            gUnknown_0203C79C[i] = sRecordedBytesNo[i];
+            sUnknown_0203C79C[i] = sRecordedBytesNo[i];
         }
     }
 
@@ -291,7 +291,7 @@ void sub_81851A8(u8 *arg0)
 
             for (i = 0; i < unkVar2; i++)
             {
-                sBattleRecords[unkVar][gUnknown_0203C7A4[unkVar]++] = sub_8185278(arg0, &var1, &var2);
+                sBattleRecords[unkVar][sUnknown_0203C7A4[unkVar]++] = sub_8185278(arg0, &var1, &var2);
             }
         }
     }
@@ -311,7 +311,7 @@ bool32 CanCopyRecordedBattleSaveData(void)
     return ret;
 }
 
-bool32 IsRecordedBattleSaveValid(struct RecordedBattleSave *save)
+static bool32 IsRecordedBattleSaveValid(struct RecordedBattleSave *save)
 {
     if (save->battleFlags == 0)
         return FALSE;
@@ -323,7 +323,7 @@ bool32 IsRecordedBattleSaveValid(struct RecordedBattleSave *save)
     return TRUE;
 }
 
-bool32 sub_81852F0(struct RecordedBattleSave *battleSave, struct RecordedBattleSave *saveSection)
+static bool32 sub_81852F0(struct RecordedBattleSave *battleSave, struct RecordedBattleSave *saveSection)
 {
     memset(saveSection, 0, sizeof(struct SaveSection));
     memcpy(saveSection, battleSave, sizeof(*battleSave));
@@ -400,8 +400,8 @@ u32 MoveRecordedBattleToSaveData(void)
     battleSave->partnerId = gPartnerTrainerId;
     battleSave->field_4FA = gUnknown_0203C7B4;
     battleSave->field_4FC = gSaveBlock2Ptr->field_CA9_b;
-    battleSave->field_4FD = gUnknown_0203C7AE;
-    battleSave->field_4FE = gUnknown_0203C7AF;
+    battleSave->field_4FD = sUnknown_0203C7AE;
+    battleSave->field_4FE = sUnknown_0203C7AF;
     battleSave->battleStyle = gSaveBlock2Ptr->optionsBattleStyle;
     battleSave->textSpeed = gSaveBlock2Ptr->optionsTextSpeed;
     battleSave->AI_scripts = sRecordedBattle_AI_Scripts;
@@ -415,7 +415,7 @@ u32 MoveRecordedBattleToSaveData(void)
         }
         battleSave->field_50C = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_A - 300].field_1;
 
-        if (gUnknown_0203CCE8 == 1)
+        if (sUnknown_0203CCE8 == 1)
         {
             for (i = 0; i < 6; i++)
             {
@@ -439,7 +439,7 @@ u32 MoveRecordedBattleToSaveData(void)
         }
         battleSave->field_50C = gSaveBlock2Ptr->field_738[gTrainerBattleOpponent_B - 300].field_1;
 
-        if (gUnknown_0203CCE8 == 1)
+        if (sUnknown_0203CCE8 == 1)
         {
             for (i = 0; i < 6; i++)
             {
@@ -463,7 +463,7 @@ u32 MoveRecordedBattleToSaveData(void)
         }
         battleSave->field_50C = gSaveBlock2Ptr->field_738[gPartnerTrainerId - 300].field_1;
 
-        if (gUnknown_0203CCE8 == 1)
+        if (sUnknown_0203CCE8 == 1)
         {
             for (i = 0; i < 6; i++)
             {
@@ -709,12 +709,12 @@ _081854E2:\n\
 	ldr r5, =0x000004fc\n\
 	adds r1, r7, r5\n\
 	strb r0, [r1]\n\
-	ldr r0, =gUnknown_0203C7AE\n\
+	ldr r0, =sUnknown_0203C7AE\n\
 	ldrb r1, [r0]\n\
 	adds r2, 0x3\n\
 	adds r0, r7, r2\n\
 	strb r1, [r0]\n\
-	ldr r3, =gUnknown_0203C7AF\n\
+	ldr r3, =sUnknown_0203C7AF\n\
 	ldrb r1, [r3]\n\
 	ldr r4, =0x000004fe\n\
 	adds r0, r7, r4\n\
@@ -799,7 +799,7 @@ _08185592:\n\
 	ldr r5, =0x0000050c\n\
 	adds r0, r7, r5\n\
 	strb r1, [r0]\n\
-	ldr r1, =gUnknown_0203CCE8\n\
+	ldr r1, =sUnknown_0203CCE8\n\
 	ldrb r0, [r1]\n\
 	cmp r0, 0x1\n\
 	bne _08185664\n\
@@ -925,7 +925,7 @@ _081856E6:\n\
 	ldr r5, =0x0000050c\n\
 	adds r0, r7, r5\n\
 	strb r1, [r0]\n\
-	ldr r1, =gUnknown_0203CCE8\n\
+	ldr r1, =sUnknown_0203CCE8\n\
 	ldrb r0, [r1]\n\
 	cmp r0, 0x1\n\
 	bne _08185784\n\
@@ -1278,7 +1278,7 @@ _08185A14:\n\
 }
 #endif // NONMATCHING
 
-bool32 TryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst, struct SaveSection *saveBuffer)
+static bool32 TryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst, struct SaveSection *saveBuffer)
 {
     if (TryCopySpecialSaveSection(SECTION_ID_RECORDED_BATTLE, (void*)(saveBuffer)) != 1)
         return FALSE;
@@ -1302,7 +1302,7 @@ static bool32 AllocTryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst)
 
 static void CB2_RecordedBattleEnd(void)
 {
-    gSaveBlock2Ptr->frontierChosenLvl = gUnknown_0203C7AD;
+    gSaveBlock2Ptr->frontierChosenLvl = sUnknown_0203C7AD;
     gBattleOutcome = 0;
     gBattleTypeFlags = 0;
     gTrainerBattleOpponent_A = 0;
@@ -1362,26 +1362,26 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src)
     gTrainerBattleOpponent_B = src->opponentB;
     gPartnerTrainerId = src->partnerId;
     gUnknown_0203C7B4 = src->field_4FA;
-    gUnknown_0203C7AD = gSaveBlock2Ptr->frontierChosenLvl;
-    gUnknown_0203C7AE = src->field_4FD;
-    gUnknown_0203C7AF = src->field_4FE;
+    sUnknown_0203C7AD = gSaveBlock2Ptr->frontierChosenLvl;
+    sUnknown_0203C7AE = src->field_4FD;
+    sUnknown_0203C7AF = src->field_4FE;
     sRecordedBattle_BattleStyle = src->battleStyle;
     sRecordedBattle_TextSpeed = src->textSpeed;
     sRecordedBattle_AI_Scripts = src->AI_scripts;
 
     for (i = 0; i < 8; i++)
     {
-        gUnknown_0203CCD1[i] = src->field_504[i];
+        sUnknown_0203CCD1[i] = src->field_504[i];
     }
 
-    gUnknown_0203CCD9 = src->field_50C;
-    gUnknown_0203CCDA = src->field_50D;
+    sUnknown_0203CCD9 = src->field_50C;
+    sUnknown_0203CCDA = src->field_50D;
     gUnknown_03001278 = src->field_51A;
     gUnknown_03001279 = src->field_51B;
 
     for (i = 0; i < 6; i++)
     {
-        gUnknown_0203CCDC[i] = src->field_50E[i];
+        sUnknown_0203CCDC[i] = src->field_50E[i];
     }
 
     gSaveBlock2Ptr->frontierChosenLvl = src->field_4FC;
@@ -1426,12 +1426,12 @@ static void CB2_RecordedBattle(void)
 
 u8 sub_8185EA0(void)
 {
-    return gUnknown_0203C7AE;
+    return sUnknown_0203C7AE;
 }
 
 u8 sub_8185EAC(void)
 {
-    return gUnknown_0203C7AF;
+    return sUnknown_0203C7AF;
 }
 
 void RecordedBattle_SaveParties(void)
@@ -1445,7 +1445,7 @@ void RecordedBattle_SaveParties(void)
     }
 }
 
-void RecordedBattle_RestoreSavedParties(void)
+static void RecordedBattle_RestoreSavedParties(void)
 {
     s32 i;
 
@@ -1474,17 +1474,17 @@ u8 GetActiveBankLinkPlayerGender(void)
 
 void sub_8185F84(void)
 {
-    gUnknown_0203C7B5 = 0;
+    sUnknown_0203C7B5 = 0;
 }
 
 void sub_8185F90(u16 arg0)
 {
-    gUnknown_0203C7B5 |= (arg0 & 0x8000) >> 0xF;
+    sUnknown_0203C7B5 |= (arg0 & 0x8000) >> 0xF;
 }
 
 u8 sub_8185FAC(void)
 {
-    return gUnknown_0203C7B5;
+    return sUnknown_0203C7B5;
 }
 
 u8 GetBattleStyleInRecordedBattle(void)
@@ -1505,7 +1505,7 @@ void RecordedBattle_CopyBankMoves(void)
         return;
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
         return;
-    if (gUnknown_0203C7AC == 2)
+    if (sUnknown_0203C7AC == 2)
         return;
 
     for (i = 0; i < 4; i++)
@@ -1618,3 +1618,59 @@ void sub_818603C(u8 arg0)
         }
     }
 }
+
+u32 GetAiScriptsInRecordedBattle(void)
+{
+    return sRecordedBattle_AI_Scripts;
+}
+
+void sub_8186444(void)
+{
+    sUnknown_0203CCD0 = 1;
+}
+
+bool8 sub_8186450(void)
+{
+    return (sUnknown_0203CCD0 == 0);
+}
+
+void sub_8186468(u8 *dst)
+{
+    s32 i;
+
+    for (i = 0; i < 8; i++)
+        dst[i] = sUnknown_0203CCD1[i];
+
+    dst[7] = EOS;
+    ConvertInternationalString(dst, gUnknown_03001278);
+}
+
+u8 sub_818649C(void)
+{
+    return sUnknown_0203CCD9;
+}
+
+u8 sub_81864A8(void)
+{
+    return sUnknown_0203CCDA;
+}
+
+u8 sub_81864B4(void)
+{
+    return gUnknown_03001278;
+}
+
+u8 sub_81864C0(void)
+{
+    return gUnknown_03001279;
+}
+
+void sub_81864CC(void)
+{
+    sUnknown_0203CCE8 = gBattleOutcome;
+}
+
+u16 *sub_81864E0(void)
+{
+    return sUnknown_0203CCDC;
+}
-- 
cgit v1.2.3


From ea575ee217233655291e3e577f439116b1c50907 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 13 Nov 2017 19:42:03 +0100
Subject: fix typo in a string

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

(limited to 'src')

diff --git a/src/berry_blender.c b/src/berry_blender.c
index cc56f15f7..8e5a51845 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -74,7 +74,7 @@ const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend anoth
 const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p");
 const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p");
 const u8 sText_HasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER.");
-const u8 ApostropheSPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p");
+const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p");
 const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING");
 static const u8 sText_BerryUsed[] = _("BERRY USED");
 const u8 sText_SpaceBerry[] = _(" BERRY");
-- 
cgit v1.2.3


From 5c44c640509f9a80d62ecb9cc5bccee20ca5b2b5 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 13 Nov 2017 21:55:38 +0100
Subject: add hof graphics

---
 src/hall_of_fame.c | 126 +----------------------------------------------------
 1 file changed, 2 insertions(+), 124 deletions(-)

(limited to 'src')

diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index e3ad88cfe..bc7177bd7 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -359,131 +359,9 @@ static const struct SpriteTemplate sSpriteTemplate_85E54D0 =
     .callback = sub_81751A4
 };
 
-// todo: dump actual graphics
-static const u32 sHallOfFame_Pal[] =
-{
-    0, 0x109F63B0, 0x5B6E, 0, 0, 0, 0, 0x7FFF2108
-};
+static const u16 sHallOfFame_Pal[] = INCBIN_U16("graphics/misc/japanese_hof.gbapal");
 
-// todo: dump actual graphics
-static const u32 sHallOfFame_Gfx[] =
-{
-    0x3A010,
-    0xF0000033,
-    0x11019001,
-    0x9001F011,
-    0x22220001,
-    0x44442222,
-    0xF0E04444,
-    0x70073007,
-    0x11113329,
-    0x13033331,
-    0x33333311,
-    0xF0030031,
-    0x1108049,
-    0x1111FFFF,
-    0x4913EEEE,
-    0xE10700F1,
-    0x110B00EE,
-    0x1D90EF,
-    0x1EFFF11E,
-    0x1EEEE11E,
-    0x1500EF4A,
-    0xB00EFEE,
-    0xF11F90FF,
-    0xFFF1FE01,
-    0xEEE1EEE1,
-    0xF1211200,
-    0x1E0300EE,
-    0x10E1EF11,
-    0x3B40D029,
-    0x1E7C00,
-    0xF3331178,
-    0x331100EF,
-    0x3331FEEF,
-    0x10E8F3EF,
-    0x105F9003,
-    0x7C003394,
-    0x3AE1133E,
-    0xC003EEE,
-    0x1800310,
-    0xEF8F10F1,
-    0xFEA30081,
-    0xE1FEEE1E,
-    0x33A300EF,
-    0x6800EEEF,
-    0x1EFE0130,
-    0x3009300,
-    0xF11EFF0A,
-    0xFFA1101E,
-    0x17EF0300,
-    0x80FEEEFE,
-    0x11313F,
-    0xD7006100,
-    0xEF332F,
-    0x8F00FF0A,
-    0x7B209F60,
-    0xEF440400,
-    0x3EFE2201,
-    0x33070013,
-    0xC0FE50F1,
-    0x110EF80,
-    0xFEF1EEF1,
-    0xF1EFFF00,
-    0xF1FEEEFF,
-    0x921EBF1,
-    0x111120A0,
-    0xF12601EE,
-    0x1107D00,
-    0x819100EB,
-    0xFE2D005D,
-    0x10FFB100,
-    0xFE3910AB,
-    0x9810B410,
-    0x3108F11,
-    0x89209F11,
-    0xA0EFF6A0,
-    0x1FE8D00,
-    0xE111F153,
-    0xF1AFE11E,
-    0x641011B3,
-    0x19110EF,
-    0x406FA07C,
-    0xA400CBB3,
-    0xEEFF0300,
-    0x611E2D01,
-    0x6314612F,
-    0x11470133,
-    0xE3EE3387,
-    0x23318810,
-    0x210170F7,
-    0x950087,
-    0xA00FF03,
-    0x1123FE0,
-    0xCC00F141,
-    0xFFFE1EEF,
-    0x8F3402EE,
-    0xF1EE1ED0,
-    0x10B7201E,
-    0x23CF0EE,
-    0x8301EF17,
-    0x1A011002,
-    0x20CC0133,
-    0x70A7017B,
-    0xF35701,
-    0x7C00EF80,
-    0xF1BA22EE,
-    0xDCED011D,
-    0x1009621,
-    0xE16000FE,
-    0xF1F9001F,
-    0xB42A5FE,
-    0x113FF1EE,
-    0xFEA702FF,
-    0xE04101,
-    0xD03F22BC,
-    1
-};
+static const u8 sHallOfFame_Gfx[] = INCBIN_U8("graphics/misc/japanese_hof.4bpp.lz");
 
 static const struct HallofFameMon sDummyFameMon =
 {
-- 
cgit v1.2.3


From a972de7bca29f890cc130d2029c29233de29c86e Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 14 Nov 2017 20:23:25 +0100
Subject: start working on daycare

---
 src/braille_puzzles.c        |   6 +-
 src/daycare.c                | 524 +++++++++++++++++++++++++++++++++++++++++++
 src/pokemon_summary_screen.c |  17 +-
 3 files changed, 535 insertions(+), 12 deletions(-)
 create mode 100644 src/daycare.c

(limited to 'src')

diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 9a6f0371c..bf419eee2 100755
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -13,7 +13,7 @@ extern void DrawWholeMapView(); // field_camera
 extern void SetCameraPanningCallback(void ( *callback)()); // field_camera
 extern void InstallCameraPanAheadCallback(void);
 extern void SetCameraPanning(s16 x, s16 y);
-extern u8 brm_get_pokemon_selection(void);
+extern u8 GetCursorSelectionMonId(void);
 extern void FieldEffectActiveListRemove(u8 id); // field_effect
 extern u8 oei_task_add(void);
 
@@ -220,7 +220,7 @@ bool8 ShouldDoBrailleStrengthEffect(void)
 
 void sub_8179834(void)
 {
-    gFieldEffectArguments[0] = brm_get_pokemon_selection();
+    gFieldEffectArguments[0] = GetCursorSelectionMonId();
     FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB);
 }
 
@@ -256,7 +256,7 @@ bool8 ShouldDoBrailleFlyEffect(void)
 
 void sub_8179918(void)
 {
-    gFieldEffectArguments[0] = brm_get_pokemon_selection();
+    gFieldEffectArguments[0] = GetCursorSelectionMonId();
     FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB);
 }
 
diff --git a/src/daycare.c b/src/daycare.c
new file mode 100644
index 000000000..c7b9dba8b
--- /dev/null
+++ b/src/daycare.c
@@ -0,0 +1,524 @@
+#include "global.h"
+#include "pokemon.h"
+#include "daycare.h"
+#include "string_util.h"
+#include "species.h"
+#include "items.h"
+#include "mail.h"
+#include "pokemon_storage_system.h"
+#include "event_data.h"
+#include "rng.h"
+#include "main.h"
+#include "moves.h"
+
+#define EGG_MOVES_ARRAY_COUNT       10
+
+extern u16 gMoveToLearn;
+
+extern u8 GetCursorSelectionMonId(void);
+
+// this file's functions
+static void ClearDaycareMonMisc(struct DaycareMiscMon *misc);
+
+#include "data/pokemon/egg_moves.h"
+
+u8 *GetMonNick(struct Pokemon *mon, u8 *dest)
+{
+    u8 nickname[POKEMON_NAME_LENGTH * 2];
+
+    GetMonData(mon, MON_DATA_NICKNAME, nickname);
+    return StringCopy10(dest, nickname);
+}
+
+u8 *GetBoxMonNick(struct BoxPokemon *mon, u8 *dest)
+{
+    u8 nickname[POKEMON_NAME_LENGTH * 2];
+
+    GetBoxMonData(mon, MON_DATA_NICKNAME, nickname);
+    return StringCopy10(dest, nickname);
+}
+
+u8 CountPokemonInDaycare(struct DayCare *daycare)
+{
+    u8 i, count;
+    count = 0;
+
+    for (i = 0; i < DAYCARE_MON_COUNT; i++)
+    {
+        if (GetBoxMonData(&daycare->mons[i].mon, MON_DATA_SPECIES) != 0)
+            count++;
+    }
+
+    return count;
+}
+
+void InitDaycareMailRecordMixing(struct DayCare *daycare, struct RecordMixingDayCareMail *daycareMail)
+{
+    u8 i;
+    u8 numDaycareMons = 0;
+
+    for (i = 0; i < DAYCARE_MON_COUNT; i++)
+    {
+        if (GetBoxMonData(&daycare->mons[i].mon, MON_DATA_SPECIES) != SPECIES_NONE)
+        {
+            numDaycareMons++;
+            if (GetBoxMonData(&daycare->mons[i].mon, MON_DATA_HELD_ITEM) == ITEM_NONE)
+            {
+                daycareMail->holdsItem[i] = FALSE;
+            }
+            else
+            {
+                daycareMail->holdsItem[i] = TRUE;
+            }
+        }
+        else
+        {
+            daycareMail->holdsItem[i] = TRUE;
+        }
+    }
+
+    daycareMail->numDaycareMons = numDaycareMons;
+}
+
+static s8 Daycare_FindEmptySpot(struct DayCare *daycare)
+{
+    u8 i;
+
+    for (i = 0; i < DAYCARE_MON_COUNT; i++)
+    {
+        if (GetBoxMonData(&daycare->mons[i].mon, MON_DATA_SPECIES) == 0)
+            return i;
+    }
+
+    return -1;
+}
+
+static void StorePokemonInDaycare(struct Pokemon *mon, struct DaycareMon *daycareMon)
+{
+    if (MonHasMail(mon))
+    {
+        u8 mailId;
+
+        StringCopy(daycareMon->misc.OT_name, gSaveBlock2Ptr->playerName);
+        GetMonNick(mon, daycareMon->misc.monName);
+        StripExtCtrlCodes(daycareMon->misc.monName);
+        daycareMon->misc.gameLanguage = LANGUAGE_ENGLISH;
+        daycareMon->misc.monLanguage = GetMonData(mon, MON_DATA_LANGUAGE);
+        mailId = GetMonData(mon, MON_DATA_MAIL);
+        daycareMon->misc.mail = gSaveBlock1Ptr->mail[mailId];
+        TakeMailFromMon(mon);
+    }
+
+    daycareMon->mon = mon->box;
+    BoxMonRestorePP(&daycareMon->mon);
+    daycareMon->steps = 0;
+    ZeroMonData(mon);
+    CompactPartySlots();
+    CalculatePlayerPartyCount();
+}
+
+static void StorePokemonInEmptyDaycareSlot(struct Pokemon *mon, struct DayCare *daycare)
+{
+    s8 slotId = Daycare_FindEmptySpot(daycare);
+    StorePokemonInDaycare(mon, &daycare->mons[slotId]);
+}
+
+void StoreSelectedPokemonInDaycare(void)
+{
+    u8 monId = GetCursorSelectionMonId();
+    StorePokemonInEmptyDaycareSlot(&gPlayerParty[monId], &gSaveBlock1Ptr->daycare);
+}
+
+// Shifts the second daycare pokemon slot into the first slot.
+static void ShiftDaycareSlots(struct DayCare *daycare)
+{
+    // This condition is only satisfied when the player takes out the first pokemon from the daycare.
+    if (GetBoxMonData(&daycare->mons[1].mon, MON_DATA_SPECIES) != 0
+        && GetBoxMonData(&daycare->mons[0].mon, MON_DATA_SPECIES) == 0)
+    {
+        daycare->mons[0].mon = daycare->mons[1].mon;
+        ZeroBoxMonData(&daycare->mons[1].mon);
+
+        daycare->mons[0].misc = daycare->mons[1].misc;
+        daycare->mons[0].steps = daycare->mons[1].steps;
+        daycare->mons[1].steps = 0;
+        ClearDaycareMonMisc(&daycare->mons[1].misc);
+    }
+}
+
+static void ApplyDaycareExperience(struct Pokemon *mon)
+{
+    s32 i;
+    bool8 firstMove;
+    u16 learnedMove;
+
+    for (i = 0; i < MAX_MON_LEVEL; i++)
+    {
+        // Add the mon's gained daycare experience level by level until it can't level up anymore.
+        if (TryIncrementMonLevel(mon))
+        {
+            // Teach the mon new moves it learned while in the daycare.
+            firstMove = TRUE;
+            while ((learnedMove = MonTryLearningNewMove(mon, firstMove)) != 0)
+            {
+                firstMove = FALSE;
+                if (learnedMove == 0xFFFF)
+                {
+                    // Mon already knows 4 moves.
+                    DeleteFirstMoveAndGiveMoveToMon(mon, gMoveToLearn);
+                }
+            }
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    // Re-calculate the mons stats at its new level.
+    CalculateMonStats(mon);
+}
+
+static u16 TakeSelectedPokemonFromDaycare(struct DaycareMon *daycareMon)
+{
+    u16 species;
+    u32 experience;
+    struct Pokemon pokemon;
+
+    GetBoxMonNick(&daycareMon->mon, gStringVar1);
+    species = GetBoxMonData(&daycareMon->mon, MON_DATA_SPECIES);
+    BoxMonToMon(&daycareMon->mon, &pokemon);
+
+    if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_MON_LEVEL)
+    {
+        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycareMon->steps;
+        SetMonData(&pokemon, MON_DATA_EXP, &experience);
+        ApplyDaycareExperience(&pokemon);
+    }
+
+    gPlayerParty[PARTY_SIZE - 1] = pokemon;
+    if (daycareMon->misc.mail.itemId)
+    {
+        GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycareMon->misc.mail);
+        ClearDaycareMonMisc(&daycareMon->misc);
+    }
+
+    ZeroBoxMonData(&daycareMon->mon);
+    daycareMon->steps = 0;
+    CompactPartySlots();
+    CalculatePlayerPartyCount();
+    return species;
+}
+
+static u16 TakeSelectedPokemonMonFromDaycareShiftSlots(struct DayCare *daycare, u8 slotId)
+{
+    u16 species = TakeSelectedPokemonFromDaycare(&daycare->mons[slotId]);
+    ShiftDaycareSlots(daycare);
+    return species;
+}
+
+u16 TakePokemonFromDaycare(void)
+{
+    return TakeSelectedPokemonMonFromDaycareShiftSlots(&gSaveBlock1Ptr->daycare, gSpecialVar_0x8004);
+}
+
+u8 GetLevelAfterDaycareSteps(struct BoxPokemon *mon, u32 steps)
+{
+    struct BoxPokemon tempMon = *mon;
+
+    u32 experience = GetBoxMonData(mon, MON_DATA_EXP) + steps;
+    SetBoxMonData(&tempMon, MON_DATA_EXP,  &experience);
+    return GetLevelFromBoxMonExp(&tempMon);
+}
+
+u8 GetNumLevelsGainedFromSteps(struct DaycareMon *daycareMon)
+{
+    u8 levelBefore;
+    u8 levelAfter;
+
+    levelBefore = GetLevelFromBoxMonExp(&daycareMon->mon);
+    levelAfter = GetLevelAfterDaycareSteps(&daycareMon->mon, daycareMon->steps);
+    return levelAfter - levelBefore;
+}
+
+u8 GetNumLevelsGainedForDaycareMon(struct DaycareMon *daycareMon)
+{
+    u8 numLevelsGained = GetNumLevelsGainedFromSteps(daycareMon);
+    ConvertIntToDecimalStringN(gStringVar2, numLevelsGained, STR_CONV_MODE_LEFT_ALIGN, 2);
+    GetBoxMonNick(&daycareMon->mon, gStringVar1);
+    return numLevelsGained;
+}
+
+static u32 GetDaycareCostForSelectedMon(struct DaycareMon *daycareMon)
+{
+    u32 cost;
+
+    u8 numLevelsGained = GetNumLevelsGainedFromSteps(daycareMon);
+    GetBoxMonNick(&daycareMon->mon, gStringVar1);
+    cost = 100 + 100 * numLevelsGained;
+    ConvertIntToDecimalStringN(gStringVar2, cost, STR_CONV_MODE_LEFT_ALIGN, 5);
+    return cost;
+}
+
+static u16 GetDaycareCostForMon(struct DayCare *daycare, u8 slotId)
+{
+    return GetDaycareCostForSelectedMon(&daycare->mons[slotId]);
+}
+
+void GetDaycareCost(void)
+{
+    gSpecialVar_0x8005 = GetDaycareCostForMon(&gSaveBlock1Ptr->daycare, gSpecialVar_0x8004);
+}
+
+static void Debug_AddDaycareSteps(u16 numSteps)
+{
+    gSaveBlock1Ptr->daycare.mons[0].steps += numSteps;
+    gSaveBlock1Ptr->daycare.mons[1].steps += numSteps;
+}
+
+u8 GetNumLevelsGainedFromDaycare(void)
+{
+    if (GetBoxMonData(&gSaveBlock1Ptr->daycare.mons[gSpecialVar_0x8004], MON_DATA_SPECIES) != 0)
+        return GetNumLevelsGainedForDaycareMon(&gSaveBlock1Ptr->daycare.mons[gSpecialVar_0x8004]);
+
+    return 0;
+}
+
+static void ClearDaycareMonMisc(struct DaycareMiscMon *misc)
+{
+    s32 i;
+
+    for (i = 0; i < OT_NAME_LENGTH + 1; i++)
+        misc->OT_name[i] = 0;
+    for (i = 0; i < POKEMON_NAME_LENGTH + 1; i++)
+        misc->monName[i] = 0;
+
+    ClearMailStruct(&misc->mail);
+}
+
+static void ClearDaycareMon(struct DaycareMon *daycareMon)
+{
+    ZeroBoxMonData(&daycareMon->mon);
+    daycareMon->steps = 0;
+    ClearDaycareMonMisc(&daycareMon->misc);
+}
+
+static void ClearAllDaycareData(struct DayCare *daycare)
+{
+    u8 i;
+
+    for (i = 0; i < DAYCARE_MON_COUNT; i++)
+        ClearDaycareMon(&daycare->mons[i]);
+
+    daycare->offspringPersonality = 0;
+    daycare->stepCounter = 0;
+}
+
+// Determines what the species of an Egg would be based on the given species.
+// It determines this by working backwards through the evolution chain of the
+// given species.
+u16 GetEggSpecies(u16 species)
+{
+    int i, j, k;
+    bool8 found;
+
+    // Working backwards up to 5 times seems arbitrary, since the maximum number
+    // of times would only be 3 for 3-stage evolutions.
+    for (i = 0; i < EVOS_PER_MON; i++)
+    {
+        found = FALSE;
+        for (j = 1; j < NUM_SPECIES; j++)
+        {
+            for (k = 0; k < EVOS_PER_MON; k++)
+            {
+                if (gEvolutionTable[j].evolutions[k].targetSpecies == species)
+                {
+                    species = j;
+                    found = TRUE;
+                    break;
+                }
+            }
+
+            if (found)
+                break;
+        }
+
+        if (j == NUM_SPECIES)
+            break;
+    }
+
+    return species;
+}
+
+static s32 GetSlotToInheritNature(struct DayCare *daycare)
+{
+    u32 species[DAYCARE_MON_COUNT];
+    s32 i, slot = -1, dittoCount;
+
+    // search for female gender
+    for (i = 0; i < DAYCARE_MON_COUNT; i++)
+    {
+        if (GetBoxMonGender(&daycare->mons[i].mon) == MON_FEMALE)
+            slot = i;
+    }
+
+    // search for ditto
+    for (dittoCount = 0, i = 0; i < DAYCARE_MON_COUNT; i++)
+    {
+        species[i] = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_SPECIES);
+        if (species[i] == SPECIES_DITTO)
+            dittoCount++, slot = i;
+    }
+
+    // coin flip on ...two Dittos
+    if (dittoCount == 2)
+    {
+        if (Random() >= USHRT_MAX / 2)
+            slot = 0;
+        else
+            slot = 1;
+    }
+
+    // nature inheritance only if holds everstone
+    if (GetBoxMonData(&daycare->mons[slot].mon, MON_DATA_HELD_ITEM) != ITEM_EVERSTONE
+        || Random() >= USHRT_MAX / 2)
+    {
+        return -1;
+    }
+
+    return slot;
+}
+
+static void _TriggerPendingDaycareEgg(struct DayCare *daycare)
+{
+    s32 natureSlot;
+    s32 natureTries = 0;
+
+    SeedRng2(gMain.vblankCounter2);
+    natureSlot = GetSlotToInheritNature(daycare);
+
+    if (natureSlot < 0)
+    {
+        daycare->offspringPersonality = (Random2() << 0x10) | ((Random() % 0xfffe) + 1);
+    }
+    else
+    {
+        u8 wantedNature = GetNatureFromPersonality(GetBoxMonData(&daycare->mons[natureSlot].mon, MON_DATA_PERSONALITY, NULL));
+        u32 personality;
+
+        do
+        {
+            personality = (Random2() << 0x10) | (Random());
+            if (wantedNature == GetNatureFromPersonality(personality) && personality != 0)
+                break; // we found a personality with the same nature
+
+            natureTries++;
+        } while (natureTries <= 2400);
+
+        daycare->offspringPersonality = personality;
+    }
+
+    FlagSet(FLAG_PENDING_DAYCARE_EGG);
+}
+
+static void _TriggerPendingDaycareMaleEgg(struct DayCare *daycare)
+{
+    daycare->offspringPersonality = (Random()) | (0x8000);
+    FlagSet(FLAG_PENDING_DAYCARE_EGG);
+}
+
+void TriggerPendingDaycareEgg(void)
+{
+    _TriggerPendingDaycareEgg(&gSaveBlock1Ptr->daycare);
+}
+
+void TriggerPendingDaycareMaleEgg(void)
+{
+    _TriggerPendingDaycareMaleEgg(&gSaveBlock1Ptr->daycare);
+}
+
+// Removes the selected index from the given IV list and shifts the remaining
+// elements to the left.
+void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
+{
+    s32 i, j;
+    u8 temp[NUM_STATS];
+
+    ivs[selectedIv] = 0xff;
+    for (i = 0; i < NUM_STATS; i++)
+    {
+        temp[i] = ivs[i];
+    }
+
+    j = 0;
+    for (i = 0; i < NUM_STATS; i++)
+    {
+        if (temp[i] != 0xff)
+            ivs[j++] = temp[i];
+    }
+}
+
+void InheritIVs(struct Pokemon *egg, struct DayCare *daycare)
+{
+    u8 i;
+    u8 selectedIvs[3];
+    u8 availableIVs[NUM_STATS];
+    u8 whichParent[ARRAY_COUNT(selectedIvs)];
+    u8 iv;
+
+    // Initialize a list of IV indices.
+    for (i = 0; i < NUM_STATS; i++)
+    {
+        availableIVs[i] = i;
+    }
+
+    // Select the 3 IVs that will be inherited.
+    for (i = 0; i < ARRAY_COUNT(selectedIvs); i++)
+    {
+        // Randomly pick an IV from the available list.
+        selectedIvs[i] = availableIVs[Random() % (NUM_STATS - i)];
+
+        // Remove the selected IV index from the available IV indices.
+        RemoveIVIndexFromList(availableIVs, i);
+    }
+
+    // Determine which parent each of the selected IVs should inherit from.
+    for (i = 0; i < ARRAY_COUNT(selectedIvs); i++)
+    {
+        whichParent[i] = Random() % 2;
+    }
+
+    // Set each of inherited IVs on the egg mon.
+    for (i = 0; i < ARRAY_COUNT(selectedIvs); i++)
+    {
+        switch (selectedIvs[i])
+        {
+            case 0:
+                iv = GetBoxMonData(&daycare->mons[whichParent[i]].mon, MON_DATA_HP_IV);
+                SetMonData(egg, MON_DATA_HP_IV, &iv);
+                break;
+            case 1:
+                iv = GetBoxMonData(&daycare->mons[whichParent[i]].mon, MON_DATA_ATK_IV);
+                SetMonData(egg, MON_DATA_ATK_IV, &iv);
+                break;
+            case 2:
+                iv = GetBoxMonData(&daycare->mons[whichParent[i]].mon, MON_DATA_DEF_IV);
+                SetMonData(egg, MON_DATA_DEF_IV, &iv);
+                break;
+            case 3:
+                iv = GetBoxMonData(&daycare->mons[whichParent[i]].mon, MON_DATA_SPEED_IV);
+                SetMonData(egg, MON_DATA_SPEED_IV, &iv);
+                break;
+            case 4:
+                iv = GetBoxMonData(&daycare->mons[whichParent[i]].mon, MON_DATA_SPATK_IV);
+                SetMonData(egg, MON_DATA_SPATK_IV, &iv);
+                break;
+            case 5:
+                iv = GetBoxMonData(&daycare->mons[whichParent[i]].mon, MON_DATA_SPDEF_IV);
+                SetMonData(egg, MON_DATA_SPDEF_IV, &iv);
+                break;
+        }
+    }
+}
+
+
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 838e91d90..d09cbc407 100755
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -97,7 +97,6 @@ extern u8 gUnknown_08D97D0C;
 extern void reset_temp_tile_data_buffers();
 extern void decompress_and_copy_tile_data_to_vram(u8 a, void* tiledata, u8 b, u8 c, u8 d);
 extern u8 free_temp_tile_data_buffers_if_possible();
-extern void sub_8069004(struct BoxPokemon* a, void* b);
 extern void sub_81C1E20(u8 taskId);
 extern u8 *GetMonNickname(struct Pokemon *mon, u8 *dest);
 extern u16 SpeciesToPokedexNum(u16 species);
@@ -667,7 +666,7 @@ void sub_81C0098(struct Pokemon *mon)
     else
     {
         struct BoxPokemon *boxMon = gUnknown_0203CF1C->unk0->boxMon;
-        sub_8069004(&boxMon[gUnknown_0203CF1C->unk40BE], mon);
+        BoxMonToMon(&boxMon[gUnknown_0203CF1C->unk40BE], mon);
     }
 }
 
@@ -1810,7 +1809,7 @@ void sub_81C171C(u8 taskId)
 void sub_81C174C(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    
+
     if (sub_81221EC() != 1)
     {
         if (gPaletteFade.active != 1)
@@ -1857,7 +1856,7 @@ void sub_81C174C(u8 taskId)
                 gUnknown_0203CF21 = 4;
                 gSpecialVar_0x8005 = 4;
                 sub_81C044C(taskId);
-            }   
+            }
         }
     }
 }
@@ -1907,7 +1906,7 @@ void sub_81C1940(u8 taskId)
         {
             if (gUnknown_0203CF1C->unk40C0 != 2)
             {
-                
+
                 ClearWindowTilemap(19);
                 if (!gSprites[gUnknown_0203CF1C->unk40D5].invisible)
                     ClearWindowTilemap(13);
@@ -2224,7 +2223,7 @@ void sub_81C1E20(u8 taskId)
         {
             if (gUnknown_0203CF1C->unk40C0 == 2)
                 PutWindowTilemap(14);
-            
+
         }
         else
         {
@@ -2277,7 +2276,7 @@ void sub_81C1F80(u8 taskId)
                 PutWindowTilemap(15);
             sub_81C240C(data[2]);
         }
-        else 
+        else
         {
             if (!gSprites[gUnknown_0203CF1C->unk40D5].invisible)
             {
@@ -3645,7 +3644,7 @@ void sub_81C3D54(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     s16 dataa = data[0] - 1;
-    
+
     switch (dataa)
     {
         case 0:
@@ -3676,4 +3675,4 @@ void sub_81C3D54(u8 taskId)
             return;
     }
     data[0]++;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 95949c772e38e60fa048fb6a91dcc864929c6e83 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 14 Nov 2017 21:43:23 +0100
Subject: more of daycare done

---
 src/daycare.c   | 298 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/egg_hatch.c |  17 ++--
 2 files changed, 306 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index c7b9dba8b..e497d4592 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -11,17 +11,29 @@
 #include "main.h"
 #include "moves.h"
 
-#define EGG_MOVES_ARRAY_COUNT       10
+#define EGG_MOVES_ARRAY_COUNT           10
+#define EGG_LVL_UP_MOVES_ARRAY_COUNT    50
 
 extern u16 gMoveToLearn;
 
 extern u8 GetCursorSelectionMonId(void);
+extern u16 ItemIdToBattleMoveId(u16);
 
 // this file's functions
 static void ClearDaycareMonMisc(struct DaycareMiscMon *misc);
+void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);
+
+// RAM buffers used to assist with BuildEggMoveset()
+EWRAM_DATA static u16 sHatchedEggLevelUpMoves[EGG_LVL_UP_MOVES_ARRAY_COUNT] = {0};
+EWRAM_DATA static u16 sHatchedEggFatherMoves[4] = {0};
+EWRAM_DATA static u16 sHatchedEggFinalMoves[4] = {0};
+EWRAM_DATA static u16 sHatchedEggEggMoves[EGG_MOVES_ARRAY_COUNT] = {0};
+EWRAM_DATA static u16 sHatchedEggMotherMoves[4] = {0};
 
 #include "data/pokemon/egg_moves.h"
 
+extern const u8 sJapaneseEggNickname[];
+
 u8 *GetMonNick(struct Pokemon *mon, u8 *dest)
 {
     u8 nickname[POKEMON_NAME_LENGTH * 2];
@@ -521,4 +533,288 @@ void InheritIVs(struct Pokemon *egg, struct DayCare *daycare)
     }
 }
 
+// Counts the number of egg moves a pokemon learns and stores the moves in
+// the given array.
+static u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves)
+{
+    u16 eggMoveIdx;
+    u16 numEggMoves;
+    u16 species;
+    u16 i;
+
+    numEggMoves = 0;
+    eggMoveIdx = 0;
+    species = GetMonData(pokemon, MON_DATA_SPECIES);
+    for (i = 0; i < ARRAY_COUNT(gEggMoves) - 1; i++)
+    {
+        if (gEggMoves[i] == species + EGG_MOVES_SPECIES_OFFSET)
+        {
+            eggMoveIdx = i + 1;
+            break;
+        }
+    }
+
+    for (i = 0; i < EGG_MOVES_ARRAY_COUNT; i++)
+    {
+        if (gEggMoves[eggMoveIdx + i] > EGG_MOVES_SPECIES_OFFSET)
+        {
+            // TODO: the curly braces around this if statement are required for a matching build.
+            break;
+        }
+
+        eggMoves[i] = gEggMoves[eggMoveIdx + i];
+        numEggMoves++;
+    }
+
+    return numEggMoves;
+}
+
+void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother)
+{
+    u16 numSharedParentMoves;
+    u32 numLevelUpMoves;
+    u16 numEggMoves;
+    u16 i, j;
+
+    numSharedParentMoves = 0;
+    for (i = 0; i < 4; i++)
+    {
+        sHatchedEggMotherMoves[i] = 0;
+        sHatchedEggFatherMoves[i] = 0;
+        sHatchedEggFinalMoves[i] = 0;
+    }
+    for (i = 0; i < EGG_MOVES_ARRAY_COUNT; i++)
+        sHatchedEggEggMoves[i] = 0;
+    for (i = 0; i < EGG_LVL_UP_MOVES_ARRAY_COUNT; i++)
+        sHatchedEggLevelUpMoves[i] = 0;
+
+    numLevelUpMoves = GetLevelUpMovesBySpecies(GetMonData(egg, MON_DATA_SPECIES), sHatchedEggLevelUpMoves);
+    for (i = 0; i < 4; i++)
+    {
+        sHatchedEggFatherMoves[i] = GetBoxMonData(father, MON_DATA_MOVE1 + i);
+        sHatchedEggMotherMoves[i] = GetBoxMonData(mother, MON_DATA_MOVE1 + i);
+    }
+
+    numEggMoves = GetEggMoves(egg, sHatchedEggEggMoves);
+
+    for (i = 0; i < 4; i++)
+    {
+        if (sHatchedEggFatherMoves[i] != MOVE_NONE)
+        {
+            for (j = 0; j < numEggMoves; j++)
+            {
+                if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j])
+                {
+                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff)
+                        DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
+                    break;
+                }
+            }
+        }
+        else
+        {
+            break;
+        }
+    }
+    for (i = 0; i < 4; i++)
+    {
+        if (sHatchedEggFatherMoves[i] != MOVE_NONE)
+        {
+            for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++)
+            {
+                if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01 + j) && CanMonLearnTMHM(egg, j))
+                {
+                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff)
+                        DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
+                }
+            }
+        }
+    }
+    for (i = 0; i < 4; i++)
+    {
+        if (sHatchedEggFatherMoves[i] == MOVE_NONE)
+            break;
+        for (j = 0; j < 4; j++)
+        {
+            if (sHatchedEggFatherMoves[i] == sHatchedEggMotherMoves[j] && sHatchedEggFatherMoves[i] != MOVE_NONE)
+                sHatchedEggFinalMoves[numSharedParentMoves++] = sHatchedEggFatherMoves[i];
+        }
+    }
+
+    for (i = 0; i < 4; i++)
+    {
+        if (sHatchedEggFinalMoves[i] == MOVE_NONE)
+            break;
+        for (j = 0; j < numLevelUpMoves; j++)
+        {
+            if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j])
+            {
+                if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xffff)
+                    DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]);
+                break;
+            }
+        }
+    }
+}
+
+void RemoveEggFromDayCare(struct DayCare *daycare)
+{
+    daycare->offspringPersonality = 0;
+    daycare->stepCounter = 0;
+}
+
+void RejectEggFromDayCare(void)
+{
+    RemoveEggFromDayCare(&gSaveBlock1Ptr->daycare);
+}
+
+void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare)
+{
+    u16 motherItem, fatherItem;
+    if (*species == SPECIES_WYNAUT || *species == SPECIES_AZURILL)
+    {
+        motherItem = GetBoxMonData(&daycare->mons[0].mon, MON_DATA_HELD_ITEM);
+        fatherItem = GetBoxMonData(&daycare->mons[1].mon, MON_DATA_HELD_ITEM);
+        if (*species == SPECIES_WYNAUT && motherItem != ITEM_LAX_INCENSE && fatherItem != ITEM_LAX_INCENSE)
+        {
+            *species = SPECIES_WOBBUFFET;
+        }
+
+        if (*species == SPECIES_AZURILL && motherItem != ITEM_SEA_INCENSE && fatherItem != ITEM_SEA_INCENSE)
+        {
+            *species = SPECIES_MARILL;
+        }
+    }
+}
+
+void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *daycare)
+{
+    u32 motherItem = GetBoxMonData(&daycare->mons[0].mon, MON_DATA_HELD_ITEM);
+    u32 fatherItem = GetBoxMonData(&daycare->mons[1].mon, MON_DATA_HELD_ITEM);
+
+    if (motherItem == ITEM_LIGHT_BALL || fatherItem == ITEM_LIGHT_BALL)
+    {
+        if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == 0xFFFF)
+            DeleteFirstMoveAndGiveMoveToMon(mon, MOVE_VOLT_TACKLE);
+    }
+}
+
+u16 DetermineEggSpeciesAndParentSlots(struct DayCare *daycare, u8 *parentSlots)
+{
+    u16 i;
+    u16 species[2];
+    u16 eggSpecies;
+
+    // Determine which of the daycare mons is the mother and father of the egg.
+    // The 0th index of the parentSlots array is considered the mother slot, and the
+    // 1st index is the father slot.
+    for (i = 0; i < 2; i++)
+    {
+        species[i] = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_SPECIES);
+        if (species[i] == SPECIES_DITTO)
+        {
+            parentSlots[0] = i ^ 1;
+            parentSlots[1] = i;
+        }
+        else if (GetBoxMonGender(&daycare->mons[i].mon) == MON_FEMALE)
+        {
+            parentSlots[0] = i;
+            parentSlots[1] = i ^ 1;
+        }
+    }
+
+    eggSpecies = GetEggSpecies(species[parentSlots[0]]);
+    if (eggSpecies == SPECIES_NIDORAN_F && daycare->offspringPersonality & 0x8000)
+    {
+        eggSpecies = SPECIES_NIDORAN_M;
+    }
+    if (eggSpecies == SPECIES_ILLUMISE && daycare->offspringPersonality & 0x8000)
+    {
+        eggSpecies = SPECIES_VOLBEAT;
+    }
+
+    // Make Ditto the "mother" slot if the other daycare mon is male.
+    if (species[parentSlots[1]] == SPECIES_DITTO && GetBoxMonGender(&daycare->mons[parentSlots[0]].mon) != MON_FEMALE)
+    {
+        u8 temp = parentSlots[1];
+        parentSlots[1] = parentSlots[0];
+        parentSlots[0] = temp;
+    }
+
+    return eggSpecies;
+}
+
+void _GiveEggFromDaycare(struct DayCare *daycare) // give_egg
+{
+    struct Pokemon egg;
+    u16 species;
+    u8 parentSlots[2]; // 0th index is "mother" daycare slot, 1st is "father"
+    bool8 isEgg;
+
+    species = DetermineEggSpeciesAndParentSlots(daycare, parentSlots);
+    AlterEggSpeciesWithIncenseItem(&species, daycare);
+    SetInitialEggData(&egg, species, daycare);
+    InheritIVs(&egg, daycare);
+    BuildEggMoveset(&egg, &daycare->mons[parentSlots[1]].mon, &daycare->mons[parentSlots[0]].mon);
+
+    if (species == SPECIES_PICHU)
+        GiveVoltTackleIfLightBall(&egg, daycare);
+
+    isEgg = TRUE;
+    SetMonData(&egg, MON_DATA_IS_EGG, &isEgg);
+    gPlayerParty[PARTY_SIZE - 1] = egg;
+    CompactPartySlots();
+    CalculatePlayerPartyCount();
+    RemoveEggFromDayCare(daycare);
+}
+
+void CreateEgg(struct Pokemon *mon, u16 species, bool8 setHotSpringsLocation)
+{
+    u8 metLevel;
+    u16 ball;
+    u8 language;
+    u8 metLocation;
+    u8 isEgg;
+
+    CreateMon(mon, species, EGG_HATCH_LEVEL, 0x20, FALSE, 0, FALSE, 0);
+    metLevel = 0;
+    ball = ITEM_POKE_BALL;
+    language = LANGUAGE_JAPANESE;
+    SetMonData(mon, MON_DATA_POKEBALL, &ball);
+    SetMonData(mon, MON_DATA_NICKNAME, sJapaneseEggNickname);
+    SetMonData(mon, MON_DATA_FRIENDSHIP, &gBaseStats[species].eggCycles);
+    SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel);
+    SetMonData(mon, MON_DATA_LANGUAGE, &language);
+    if (setHotSpringsLocation)
+    {
+        metLocation = 253; // hot springs; see PokemonSummaryScreen_PrintEggTrainerMemo
+        SetMonData(mon, MON_DATA_MET_LOCATION, &metLocation);
+    }
+
+    isEgg = TRUE;
+    SetMonData(mon, MON_DATA_IS_EGG, &isEgg);
+}
+
+void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare)
+{
+    u32 personality;
+    u16 ball;
+    u8 metLevel;
+    u8 language;
+
+    personality = daycare->offspringPersonality;
+    CreateMon(mon, species, EGG_HATCH_LEVEL, 0x20, TRUE, personality, FALSE, 0);
+    metLevel = 0;
+    ball = ITEM_POKE_BALL;
+    language = LANGUAGE_JAPANESE;
+    SetMonData(mon, MON_DATA_POKEBALL, &ball);
+    SetMonData(mon, MON_DATA_NICKNAME, sJapaneseEggNickname);
+    SetMonData(mon, MON_DATA_FRIENDSHIP, &gBaseStats[species].eggCycles);
+    SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel);
+    SetMonData(mon, MON_DATA_LANGUAGE, &language);
+}
 
+void GiveEggFromDaycare(void)
+{
+    _GiveEggFromDaycare(&gSaveBlock1Ptr->daycare);
+}
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 589e8901d..468138eb1 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -23,6 +23,7 @@
 #include "m4a.h"
 #include "window.h"
 #include "abilities.h"
+#include "daycare.h"
 #include "battle.h" // to get rid of later
 
 struct EggHatchData
@@ -327,7 +328,7 @@ static void CreatedHatchedMon(struct Pokemon *egg, struct Pokemon *temp)
     pokerus = GetMonData(egg, MON_DATA_POKERUS);
     obedience = GetMonData(egg, MON_DATA_OBEDIENCE);
 
-    CreateMon(temp, species, 5, 32, TRUE, personality, 0, 0);
+    CreateMon(temp, species, EGG_HATCH_LEVEL, 32, TRUE, personality, 0, 0);
 
     for (i = 0; i < 4; i++)
     {
@@ -393,19 +394,19 @@ void ScriptHatchMon(void)
     AddHatchedMonToParty(gSpecialVar_0x8004);
 }
 
-static bool8 sub_807158C(struct DaycareData* daycare, u8 daycareId)
+static bool8 sub_807158C(struct DayCare *daycare, u8 daycareId)
 {
     u8 nick[0x20];
-    struct DaycareMon* daycareMon = &daycare->mons[daycareId];
+    struct DaycareMon *daycareMon = &daycare->mons[daycareId];
 
     GetBoxMonNick(&daycareMon->mon, nick);
-    if (daycareMon->mail.itemId != 0
-        && (StringCompareWithoutExtCtrlCodes(nick, daycareMon->monName) != 0
-            || StringCompareWithoutExtCtrlCodes(gSaveBlock2Ptr->playerName, daycareMon->OT_name) != 0))
+    if (daycareMon->misc.mail.itemId != 0
+        && (StringCompareWithoutExtCtrlCodes(nick, daycareMon->misc.monName) != 0
+            || StringCompareWithoutExtCtrlCodes(gSaveBlock2Ptr->playerName, daycareMon->misc.OT_name) != 0))
     {
         StringCopy(gStringVar1, nick);
-        TVShowConvertInternationalString(gStringVar2, daycareMon->OT_name, daycareMon->language_maybe);
-        TVShowConvertInternationalString(gStringVar3, daycareMon->monName, daycareMon->unknown);
+        TVShowConvertInternationalString(gStringVar2, daycareMon->misc.OT_name, daycareMon->misc.gameLanguage);
+        TVShowConvertInternationalString(gStringVar3, daycareMon->misc.monName, daycareMon->misc.monLanguage);
         return TRUE;
     }
     return FALSE;
-- 
cgit v1.2.3


From 0310be30079c657f3a21da64683bdf9ac1d4d394 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 14 Nov 2017 23:25:07 +0100
Subject: more of daycare done

---
 src/daycare.c   | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/egg_hatch.c |  1 +
 2 files changed, 54 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index e497d4592..0baee1acc 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -10,6 +10,7 @@
 #include "rng.h"
 #include "main.h"
 #include "moves.h"
+#include "egg_hatch.h"
 
 #define EGG_MOVES_ARRAY_COUNT           10
 #define EGG_LVL_UP_MOVES_ARRAY_COUNT    50
@@ -22,6 +23,7 @@ extern u16 ItemIdToBattleMoveId(u16);
 // this file's functions
 static void ClearDaycareMonMisc(struct DaycareMiscMon *misc);
 void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);
+u8 GetDaycareCompatibilityScore(struct DayCare *daycare);
 
 // RAM buffers used to assist with BuildEggMoveset()
 EWRAM_DATA static u16 sHatchedEggLevelUpMoves[EGG_LVL_UP_MOVES_ARRAY_COUNT] = {0};
@@ -818,3 +820,54 @@ void GiveEggFromDaycare(void)
 {
     _GiveEggFromDaycare(&gSaveBlock1Ptr->daycare);
 }
+
+bool8 _DoEggActions_CheckHatch(struct DayCare *daycare)
+{
+    u32 i, validEggs = 0;
+
+    for (i = 0; i < DAYCARE_MON_COUNT; i++)
+    {
+        if (GetBoxMonData(&daycare->mons[i].mon, MON_DATA_SANITY_BIT2))
+            daycare->mons[i].steps++, validEggs++;
+    }
+
+    // try to trigger poke sex
+    if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == 0xFF)
+    {
+        u8 loveScore = GetDaycareCompatibilityScore(daycare);
+        if (loveScore > (Random() * 100u) / USHRT_MAX)
+            TriggerPendingDaycareEgg();
+    }
+
+    if (++daycare->stepCounter == 255) // hatch an egg
+    {
+        u32 steps;
+        u8 toSub = GetEggStepsToSubtract();
+
+        for (i = 0; i < gPlayerPartyCount; i++)
+        {
+            if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
+                continue;
+            if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_BIT1))
+                continue;
+
+            steps = GetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP);
+            if (steps != 0) // subtract needed steps
+            {
+                if (steps >= toSub)
+                    steps -= toSub;
+                else
+                    steps -= 1;
+
+                SetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP, &steps);
+            }
+            else // hatch the egg
+            {
+                gSpecialVar_0x8004 = i;
+                return TRUE;
+            }
+        }
+    }
+
+    return FALSE; // no hatching
+}
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 468138eb1..8c74ce68d 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "pokemon.h"
+#include "egg_hatch.h"
 #include "pokedex.h"
 #include "items.h"
 #include "script.h"
-- 
cgit v1.2.3


From 616edd6c3f591ed62f11aedbeb0dbc744fac4c07 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 15 Nov 2017 20:08:31 +0100
Subject: daycare file is decompiled

---
 src/daycare.c | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 400 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 0baee1acc..f8644b983 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -11,6 +11,13 @@
 #include "main.h"
 #include "moves.h"
 #include "egg_hatch.h"
+#include "text.h"
+#include "menu.h"
+#include "international_string_util.h"
+#include "script.h"
+#include "task.h"
+#include "window.h"
+#include "list_menu.h"
 
 #define EGG_MOVES_ARRAY_COUNT           10
 #define EGG_LVL_UP_MOVES_ARRAY_COUNT    50
@@ -19,6 +26,12 @@ extern u16 gMoveToLearn;
 
 extern u8 GetCursorSelectionMonId(void);
 extern u16 ItemIdToBattleMoveId(u16);
+extern s32 ListMenuHandleInput(u8);
+extern void sub_81AE6C8(u8, u16*, u16*);
+extern void sub_819746C(u8, bool8);
+extern void sub_81973FC(u8, bool8);
+extern void sub_81B9328(void);
+extern void c2_exit_to_overworld_2_switch(void);
 
 // this file's functions
 static void ClearDaycareMonMisc(struct DaycareMiscMon *misc);
@@ -34,6 +47,9 @@ EWRAM_DATA static u16 sHatchedEggMotherMoves[4] = {0};
 
 #include "data/pokemon/egg_moves.h"
 
+extern const struct WindowTemplate sDaycareLevelMenuWindowTemplate;
+extern const struct ListMenuTemplate sDaycareListMenuLevelTemplate;
+extern const u8 *sCompatibilityMessages[];
 extern const u8 sJapaneseEggNickname[];
 
 u8 *GetMonNick(struct Pokemon *mon, u8 *dest)
@@ -821,7 +837,7 @@ void GiveEggFromDaycare(void)
     _GiveEggFromDaycare(&gSaveBlock1Ptr->daycare);
 }
 
-bool8 _DoEggActions_CheckHatch(struct DayCare *daycare)
+static bool8 _DoEggActions_CheckHatch(struct DayCare *daycare)
 {
     u32 i, validEggs = 0;
 
@@ -871,3 +887,386 @@ bool8 _DoEggActions_CheckHatch(struct DayCare *daycare)
 
     return FALSE; // no hatching
 }
+
+bool8 DoEggActions_CheckHatch(void)
+{
+    return _DoEggActions_CheckHatch(&gSaveBlock1Ptr->daycare);
+}
+
+static bool8 IsEggPending(struct DayCare *daycare)
+{
+    return (daycare->offspringPersonality != 0);
+}
+
+// gStringVar1 = first mon's nickname
+// gStringVar2 = second mon's nickname
+// gStringVar3 = first mon trainer's name
+void _GetDaycareMonNicknames(struct DayCare *daycare)
+{
+    u8 text[12];
+    if (GetBoxMonData(&daycare->mons[0].mon, MON_DATA_SPECIES) != 0)
+    {
+        GetBoxMonNick(&daycare->mons[0].mon, gStringVar1);
+        GetBoxMonData(&daycare->mons[0].mon, MON_DATA_OT_NAME, text);
+        StringCopy(gStringVar3, text);
+    }
+
+    if (GetBoxMonData(&daycare->mons[1].mon, MON_DATA_SPECIES) != 0)
+    {
+        GetBoxMonNick(&daycare->mons[1].mon, gStringVar2);
+    }
+}
+
+u16 GetSelectedMonNickAndSpecies(void)
+{
+    GetBoxMonNick(&gPlayerParty[GetCursorSelectionMonId()].box, gStringVar1);
+    return GetBoxMonData(&gPlayerParty[GetCursorSelectionMonId()].box, MON_DATA_SPECIES);
+}
+
+void GetDaycareMonNicknames(void)
+{
+    _GetDaycareMonNicknames(&gSaveBlock1Ptr->daycare);
+}
+
+u8 GetDaycareState(void)
+{
+    // The daycare can be in 4 possible states:
+    //   0: default state--no deposited mons, no egg
+    //   1: there is an egg waiting for the player to pick it up
+    //   2: there is a single pokemon in the daycare
+    //   3: there are two pokemon in the daycare, no egg
+
+    u8 numMons;
+    if (IsEggPending(&gSaveBlock1Ptr->daycare))
+    {
+        // There is an Egg waiting for the player.
+        return 1;
+    }
+
+    numMons = CountPokemonInDaycare(&gSaveBlock1Ptr->daycare);
+    if (numMons != 0)
+    {
+        return numMons + 1;
+    }
+
+    return 0;
+}
+
+u8 GetDaycarePokemonCount(void)
+{
+    u8 ret = CountPokemonInDaycare(&gSaveBlock1Ptr->daycare);
+    if (ret)
+        return ret;
+
+    return 0;
+}
+
+static bool8 EggGroupsOverlap(u16 *eggGroups1, u16 *eggGroups2)
+{
+    // Determine if the two given egg group lists contain any of the
+    // same egg groups.
+    s32 i, j;
+
+    for (i = 0; i < 2; i++)
+    {
+        for (j = 0; j < 2; j++)
+        {
+            if (eggGroups1[i] == eggGroups2[j])
+                return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
+{
+    u32 i;
+    u16 eggGroups[2][2];
+    u16 species[2];
+    u32 trainerIds[2];
+    u32 genders[2];
+
+    for (i = 0; i < 2; i++)
+    {
+        u32 personality;
+
+        species[i] = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_SPECIES);
+        trainerIds[i] = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_OT_ID);
+        personality = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_PERSONALITY);
+        genders[i] = GetGenderFromSpeciesAndPersonality(species[i], personality);
+        eggGroups[i][0] = gBaseStats[species[i]].eggGroup1;
+        eggGroups[i][1] = gBaseStats[species[i]].eggGroup2;
+    }
+
+    // check unbreedable egg group
+    if (eggGroups[0][0] == EGG_GROUP_UNDISCOVERED || eggGroups[1][0] == EGG_GROUP_UNDISCOVERED)
+        return 0;
+    // two Ditto can't breed
+    if (eggGroups[0][0] == EGG_GROUP_DITTO && eggGroups[1][0] == EGG_GROUP_DITTO)
+        return 0;
+
+    // now that we checked, one ditto can breed with any other mon
+    if (eggGroups[0][0] == EGG_GROUP_DITTO || eggGroups[1][0] == EGG_GROUP_DITTO)
+    {
+        if (trainerIds[0] == trainerIds[1]) // same trainer
+            return 20;
+
+        return 50; // different trainers, more chance of poke sex
+    }
+    else
+    {
+        if (genders[0] == genders[1]) // no homo
+            return 0;
+        if (genders[0] == MON_GENDERLESS || genders[1] == MON_GENDERLESS)
+            return 0;
+        if (!EggGroupsOverlap(eggGroups[0], eggGroups[1])) // not compatible with each other
+            return 0;
+
+        if (species[0] == species[1]) // same species
+        {
+            if (trainerIds[0] == trainerIds[1]) // same species and trainer
+                return 50;
+
+            return 70; // different trainers, same species
+        }
+        else
+        {
+            if (trainerIds[0] != trainerIds[1]) // different trainers, different species
+                return 50;
+
+            return 20; // different species, same trainer
+        }
+    }
+}
+
+u8 GetDaycareCompatibilityScoreFromSave(void)
+{
+    return GetDaycareCompatibilityScore(&gSaveBlock1Ptr->daycare);
+}
+
+void SetDaycareCompatibilityString(void)
+{
+    u8 whichString;
+    u8 relationshipScore;
+
+    relationshipScore = GetDaycareCompatibilityScoreFromSave();
+    whichString = 0;
+    if (relationshipScore == 0)
+        whichString = 3;
+    if (relationshipScore == 20)
+        whichString = 2;
+    if (relationshipScore == 50)
+        whichString = 1;
+    if (relationshipScore == 70)
+        whichString = 0;
+
+    StringCopy(gStringVar4, sCompatibilityMessages[whichString]);
+}
+
+bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio)
+{
+    u8 i;
+    u8 symbolsCount[2]; // male, female
+    symbolsCount[0] = symbolsCount[1] = 0;
+
+    for (i = 0; name[i] != EOS; i++)
+    {
+        if (name[i] == CHAR_MALE)
+            symbolsCount[0]++;
+        if (name[i] == CHAR_FEMALE)
+            symbolsCount[1]++;
+    }
+
+    if (genderRatio == MON_MALE   && symbolsCount[0] != 0 && symbolsCount[1] == 0)
+        return TRUE;
+    if (genderRatio == MON_FEMALE && symbolsCount[1] != 0 && symbolsCount[0] == 0)
+        return TRUE;
+
+    return FALSE;
+}
+
+extern const u8 gText_MaleSymbol4[];
+extern const u8 gText_FemaleSymbol4[];
+extern const u8 gText_GenderlessSymbol[];
+extern const u8 gText_NewLine2[];
+extern const u8 gText_Exit4[];
+extern const u8 gText_Lv[];
+
+static u8 *AppendGenderSymbol(u8 *name, u8 gender)
+{
+    if (gender == MON_MALE)
+    {
+        if (!NameHasGenderSymbol(name, MON_MALE))
+            return StringAppend(name, gText_MaleSymbol4);
+    }
+    else if (gender == MON_FEMALE)
+    {
+        if (!NameHasGenderSymbol(name, MON_FEMALE))
+            return StringAppend(name, gText_FemaleSymbol4);
+    }
+
+    return StringAppend(name, gText_GenderlessSymbol);
+}
+
+u8 *AppendMonGenderSymbol(u8 *name, struct BoxPokemon *boxMon)
+{
+    return AppendGenderSymbol(name, GetBoxMonGender(boxMon));
+}
+
+static void GetDaycareLevelMenuText(struct DayCare *daycare, u8 *dest)
+{
+    u8 monNames[2][20];
+    u8 i;
+
+    *dest = EOS;
+    for (i = 0; i < 2; i++)
+    {
+        GetBoxMonNick(&daycare->mons[i].mon, monNames[i]);
+        AppendMonGenderSymbol(monNames[i], &daycare->mons[i].mon);
+    }
+
+    StringCopy(dest, monNames[0]);
+    StringAppend(dest, gText_NewLine2);
+    StringAppend(dest, monNames[1]);
+    StringAppend(dest, gText_NewLine2);
+    StringAppend(dest, gText_Exit4);
+}
+
+static void GetDaycareLevelMenuLevelText(struct DayCare *daycare, u8 *dest)
+{
+    u8 i;
+    u8 level;
+    u8 text[20];
+
+    *dest = EOS;
+    for (i = 0; i < 2; i++)
+    {
+        StringAppend(dest, gText_Lv);
+        level = GetLevelAfterDaycareSteps(&daycare->mons[i].mon, daycare->mons[i].steps);
+        ConvertIntToDecimalStringN(text, level, STR_CONV_MODE_LEFT_ALIGN, 3);
+        StringAppend(dest, text);
+        StringAppend(dest, gText_NewLine2);
+    }
+}
+
+void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y)
+{
+    struct TextSubPrinter printer;
+
+    printer.current_text_offset = text;
+    printer.windowId = windowId;
+    printer.fontId = 1;
+    printer.x = x;
+    printer.y = y;
+    printer.currentX = x;
+    printer.currentY = y;
+    printer.fontColor_l = 0;
+    gTextFlags.flag_1 = 0;
+    printer.letterSpacing = 0;
+    printer.lineSpacing = 1;
+    printer.fontColor_h = 2;
+    printer.bgColor = 1;
+    printer.shadowColor = 3;
+
+    AddTextPrinter(&printer, 0xFF, NULL);
+}
+
+void DaycarePrintMonNick(struct DayCare *daycare, u8 windowId, u32 daycareSlotId, u32 y)
+{
+    u8 nick[POKEMON_NAME_LENGTH * 2];
+
+    GetBoxMonNick(&daycare->mons[daycareSlotId].mon, nick);
+    AppendMonGenderSymbol(nick, &daycare->mons[daycareSlotId].mon);
+    DaycareAddTextPrinter(windowId, nick, 8, y);
+}
+
+void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycareSlotId, u32 y)
+{
+    u8 level;
+    u32 x;
+    u8 lvlText[12];
+    u8 intText[8];
+
+    StringCopy(lvlText, gText_Lv);
+    level = GetLevelAfterDaycareSteps(&daycare->mons[daycareSlotId].mon, daycare->mons[daycareSlotId].steps);
+    ConvertIntToDecimalStringN(intText, level, STR_CONV_MODE_LEFT_ALIGN, 3);
+    StringAppend(lvlText, intText);
+    x = GetStringRightAlignXOffset(1, lvlText, 112);
+    DaycareAddTextPrinter(windowId, lvlText, x, y);
+}
+
+void DaycarePrintMonInfo(u8 windowId, u32 daycareSlotId, u8 y)
+{
+    if (daycareSlotId < DAYCARE_MON_COUNT)
+    {
+        DaycarePrintMonNick(&gSaveBlock1Ptr->daycare, windowId, daycareSlotId, y);
+        DaycarePrintMonLvl(&gSaveBlock1Ptr->daycare, windowId, daycareSlotId, y);
+    }
+}
+
+#define tMenuListTaskId     data[0]
+#define tWindowId           data[1]
+
+void Task_HandleDaycareLevelMenuInput(u8 taskId)
+{
+    u32 var = ListMenuHandleInput(gTasks[taskId].tMenuListTaskId);
+
+    if (gMain.newKeys & A_BUTTON)
+    {
+        switch (var)
+        {
+        case 0:
+        case 1:
+            gSpecialVar_Result = var;
+            break;
+        case 5:
+            gSpecialVar_Result = 2;
+            break;
+        }
+        sub_81AE6C8(gTasks[taskId].tMenuListTaskId, NULL, NULL);
+        sub_819746C(gTasks[taskId].tWindowId, TRUE);
+        RemoveWindow(gTasks[taskId].tWindowId);
+        DestroyTask(taskId);
+        EnableBothScriptContexts();
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        gSpecialVar_Result = 2;
+        sub_81AE6C8(gTasks[taskId].tMenuListTaskId, NULL, NULL);
+        sub_819746C(gTasks[taskId].tWindowId, TRUE);
+        RemoveWindow(gTasks[taskId].tWindowId);
+        DestroyTask(taskId);
+        EnableBothScriptContexts();
+    }
+}
+
+void ShowDaycareLevelMenu(void)
+{
+    struct ListMenuTemplate menuTemplate;
+    u8 windowId;
+    u8 listMenuTaskId;
+    u8 daycareMenuTaskId;
+
+    windowId = AddWindow(&sDaycareLevelMenuWindowTemplate);
+    sub_81973FC(windowId, FALSE);
+
+    menuTemplate = sDaycareListMenuLevelTemplate;
+    menuTemplate.unk_10 = windowId;
+    listMenuTaskId = ListMenuInit(&menuTemplate, 0, 0);
+
+    CopyWindowToVram(windowId, 3);
+
+    daycareMenuTaskId = CreateTask(Task_HandleDaycareLevelMenuInput, 3);
+    gTasks[daycareMenuTaskId].tMenuListTaskId = listMenuTaskId;
+    gTasks[daycareMenuTaskId].tWindowId = windowId;
+}
+
+#undef tMenuListTaskId
+#undef tWindowId
+
+void ChooseSendDaycareMon(void)
+{
+    sub_81B9328();
+    gMain.savedCallback = c2_exit_to_overworld_2_switch;
+}
-- 
cgit v1.2.3


From ba00a1c688f84edcab44bd183d6dea4e2e7ba0be Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 15 Nov 2017 22:12:18 +0100
Subject: daycare file fully done

---
 src/daycare.c     | 120 +++++++++++++++++++++++++++++++++++++-----------------
 src/decoration.c  |  42 +++++++++----------
 src/secret_base.c |   8 ++--
 3 files changed, 106 insertions(+), 64 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index f8644b983..fcf577144 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -24,6 +24,20 @@
 
 extern u16 gMoveToLearn;
 
+// text
+extern const u8 gText_MaleSymbol4[];
+extern const u8 gText_FemaleSymbol4[];
+extern const u8 gText_GenderlessSymbol[];
+extern const u8 gText_NewLine2[];
+extern const u8 gText_Exit4[];
+extern const u8 gText_Lv[];
+extern const u8 gExpandedPlaceholder_Empty[];
+extern const u8 gText_Exit[];
+extern const u8 gDaycareText_GetAlongVeryWell[];
+extern const u8 gDaycareText_GetAlong[];
+extern const u8 gDaycareText_DontLikeOther[];
+extern const u8 gDaycareText_PlayOther[];
+
 extern u8 GetCursorSelectionMonId(void);
 extern u16 ItemIdToBattleMoveId(u16);
 extern s32 ListMenuHandleInput(u8);
@@ -31,12 +45,14 @@ extern void sub_81AE6C8(u8, u16*, u16*);
 extern void sub_819746C(u8, bool8);
 extern void sub_81973FC(u8, bool8);
 extern void sub_81B9328(void);
+extern void sub_81AF078(u32, bool8, struct ListMenu *);
 extern void c2_exit_to_overworld_2_switch(void);
 
 // this file's functions
 static void ClearDaycareMonMisc(struct DaycareMiscMon *misc);
-void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);
-u8 GetDaycareCompatibilityScore(struct DayCare *daycare);
+static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare);
+static u8 GetDaycareCompatibilityScore(struct DayCare *daycare);
+static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y);
 
 // RAM buffers used to assist with BuildEggMoveset()
 EWRAM_DATA static u16 sHatchedEggLevelUpMoves[EGG_LVL_UP_MOVES_ARRAY_COUNT] = {0};
@@ -47,10 +63,45 @@ EWRAM_DATA static u16 sHatchedEggMotherMoves[4] = {0};
 
 #include "data/pokemon/egg_moves.h"
 
-extern const struct WindowTemplate sDaycareLevelMenuWindowTemplate;
-extern const struct ListMenuTemplate sDaycareListMenuLevelTemplate;
-extern const u8 *sCompatibilityMessages[];
-extern const u8 sJapaneseEggNickname[];
+static const struct WindowTemplate sDaycareLevelMenuWindowTemplate = {0, 0xF, 1, 0xE, 6, 0xF, 8};
+
+static const struct ListMenuItem sLevelMenuItems[] =
+{
+    {gExpandedPlaceholder_Empty, 0},
+    {gExpandedPlaceholder_Empty, 1},
+    {gText_Exit, 5}
+};
+
+static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
+{
+    .items = sLevelMenuItems,
+    .unk_04 = sub_81AF078,
+    .unk_08 = DaycarePrintMonInfo,
+    .totalItems = 3,
+    .maxShowed = 3,
+    .unk_10 = 0,
+    .unk_11 = 0,
+    .unk_12 = 8,
+    .cursor_Y = 0,
+    .upText_Y = 1,
+    .cursorColor = 2,
+    .fillColor = 1,
+    .cursorShadowColor = 3,
+    .unk_16_0 = TRUE,
+    .spaceBetweenItems = 0,
+    .unk_16_7 = FALSE,
+    .unk_17_0 = 1
+};
+
+static const u8 *const sCompatibilityMessages[] =
+{
+    gDaycareText_GetAlongVeryWell,
+    gDaycareText_GetAlong,
+    gDaycareText_DontLikeOther,
+    gDaycareText_PlayOther
+};
+
+static const u8 sJapaneseEggNickname[] = _("タマゴ"); // "tamago" ("egg" in Japanese)
 
 u8 *GetMonNick(struct Pokemon *mon, u8 *dest)
 {
@@ -252,7 +303,7 @@ u16 TakePokemonFromDaycare(void)
     return TakeSelectedPokemonMonFromDaycareShiftSlots(&gSaveBlock1Ptr->daycare, gSpecialVar_0x8004);
 }
 
-u8 GetLevelAfterDaycareSteps(struct BoxPokemon *mon, u32 steps)
+static u8 GetLevelAfterDaycareSteps(struct BoxPokemon *mon, u32 steps)
 {
     struct BoxPokemon tempMon = *mon;
 
@@ -261,7 +312,7 @@ u8 GetLevelAfterDaycareSteps(struct BoxPokemon *mon, u32 steps)
     return GetLevelFromBoxMonExp(&tempMon);
 }
 
-u8 GetNumLevelsGainedFromSteps(struct DaycareMon *daycareMon)
+static u8 GetNumLevelsGainedFromSteps(struct DaycareMon *daycareMon)
 {
     u8 levelBefore;
     u8 levelAfter;
@@ -271,7 +322,7 @@ u8 GetNumLevelsGainedFromSteps(struct DaycareMon *daycareMon)
     return levelAfter - levelBefore;
 }
 
-u8 GetNumLevelsGainedForDaycareMon(struct DaycareMon *daycareMon)
+static u8 GetNumLevelsGainedForDaycareMon(struct DaycareMon *daycareMon)
 {
     u8 numLevelsGained = GetNumLevelsGainedFromSteps(daycareMon);
     ConvertIntToDecimalStringN(gStringVar2, numLevelsGained, STR_CONV_MODE_LEFT_ALIGN, 2);
@@ -347,7 +398,7 @@ static void ClearAllDaycareData(struct DayCare *daycare)
 // Determines what the species of an Egg would be based on the given species.
 // It determines this by working backwards through the evolution chain of the
 // given species.
-u16 GetEggSpecies(u16 species)
+static u16 GetEggSpecies(u16 species)
 {
     int i, j, k;
     bool8 found;
@@ -462,14 +513,14 @@ void TriggerPendingDaycareEgg(void)
     _TriggerPendingDaycareEgg(&gSaveBlock1Ptr->daycare);
 }
 
-void TriggerPendingDaycareMaleEgg(void)
+static void TriggerPendingDaycareMaleEgg(void)
 {
     _TriggerPendingDaycareMaleEgg(&gSaveBlock1Ptr->daycare);
 }
 
 // Removes the selected index from the given IV list and shifts the remaining
 // elements to the left.
-void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
+static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
 {
     s32 i, j;
     u8 temp[NUM_STATS];
@@ -488,7 +539,7 @@ void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
     }
 }
 
-void InheritIVs(struct Pokemon *egg, struct DayCare *daycare)
+static void InheritIVs(struct Pokemon *egg, struct DayCare *daycare)
 {
     u8 i;
     u8 selectedIvs[3];
@@ -587,7 +638,7 @@ static u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves)
     return numEggMoves;
 }
 
-void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother)
+static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother)
 {
     u16 numSharedParentMoves;
     u32 numLevelUpMoves;
@@ -675,7 +726,7 @@ void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxP
     }
 }
 
-void RemoveEggFromDayCare(struct DayCare *daycare)
+static void RemoveEggFromDayCare(struct DayCare *daycare)
 {
     daycare->offspringPersonality = 0;
     daycare->stepCounter = 0;
@@ -686,7 +737,7 @@ void RejectEggFromDayCare(void)
     RemoveEggFromDayCare(&gSaveBlock1Ptr->daycare);
 }
 
-void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare)
+static void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare)
 {
     u16 motherItem, fatherItem;
     if (*species == SPECIES_WYNAUT || *species == SPECIES_AZURILL)
@@ -705,7 +756,7 @@ void AlterEggSpeciesWithIncenseItem(u16 *species, struct DayCare *daycare)
     }
 }
 
-void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *daycare)
+static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *daycare)
 {
     u32 motherItem = GetBoxMonData(&daycare->mons[0].mon, MON_DATA_HELD_ITEM);
     u32 fatherItem = GetBoxMonData(&daycare->mons[1].mon, MON_DATA_HELD_ITEM);
@@ -717,7 +768,7 @@ void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *daycare)
     }
 }
 
-u16 DetermineEggSpeciesAndParentSlots(struct DayCare *daycare, u8 *parentSlots)
+static u16 DetermineEggSpeciesAndParentSlots(struct DayCare *daycare, u8 *parentSlots)
 {
     u16 i;
     u16 species[2];
@@ -762,7 +813,7 @@ u16 DetermineEggSpeciesAndParentSlots(struct DayCare *daycare, u8 *parentSlots)
     return eggSpecies;
 }
 
-void _GiveEggFromDaycare(struct DayCare *daycare) // give_egg
+static void _GiveEggFromDaycare(struct DayCare *daycare) // give_egg
 {
     struct Pokemon egg;
     u16 species;
@@ -813,7 +864,7 @@ void CreateEgg(struct Pokemon *mon, u16 species, bool8 setHotSpringsLocation)
     SetMonData(mon, MON_DATA_IS_EGG, &isEgg);
 }
 
-void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare)
+static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare)
 {
     u32 personality;
     u16 ball;
@@ -901,7 +952,7 @@ static bool8 IsEggPending(struct DayCare *daycare)
 // gStringVar1 = first mon's nickname
 // gStringVar2 = second mon's nickname
 // gStringVar3 = first mon trainer's name
-void _GetDaycareMonNicknames(struct DayCare *daycare)
+static void _GetDaycareMonNicknames(struct DayCare *daycare)
 {
     u8 text[12];
     if (GetBoxMonData(&daycare->mons[0].mon, MON_DATA_SPECIES) != 0)
@@ -952,7 +1003,7 @@ u8 GetDaycareState(void)
     return 0;
 }
 
-u8 GetDaycarePokemonCount(void)
+static u8 GetDaycarePokemonCount(void)
 {
     u8 ret = CountPokemonInDaycare(&gSaveBlock1Ptr->daycare);
     if (ret)
@@ -979,7 +1030,7 @@ static bool8 EggGroupsOverlap(u16 *eggGroups1, u16 *eggGroups2)
     return FALSE;
 }
 
-u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
+static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
 {
     u32 i;
     u16 eggGroups[2][2];
@@ -1040,7 +1091,7 @@ u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
     }
 }
 
-u8 GetDaycareCompatibilityScoreFromSave(void)
+static u8 GetDaycareCompatibilityScoreFromSave(void)
 {
     return GetDaycareCompatibilityScore(&gSaveBlock1Ptr->daycare);
 }
@@ -1086,13 +1137,6 @@ bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio)
     return FALSE;
 }
 
-extern const u8 gText_MaleSymbol4[];
-extern const u8 gText_FemaleSymbol4[];
-extern const u8 gText_GenderlessSymbol[];
-extern const u8 gText_NewLine2[];
-extern const u8 gText_Exit4[];
-extern const u8 gText_Lv[];
-
 static u8 *AppendGenderSymbol(u8 *name, u8 gender)
 {
     if (gender == MON_MALE)
@@ -1109,7 +1153,7 @@ static u8 *AppendGenderSymbol(u8 *name, u8 gender)
     return StringAppend(name, gText_GenderlessSymbol);
 }
 
-u8 *AppendMonGenderSymbol(u8 *name, struct BoxPokemon *boxMon)
+static u8 *AppendMonGenderSymbol(u8 *name, struct BoxPokemon *boxMon)
 {
     return AppendGenderSymbol(name, GetBoxMonGender(boxMon));
 }
@@ -1150,7 +1194,7 @@ static void GetDaycareLevelMenuLevelText(struct DayCare *daycare, u8 *dest)
     }
 }
 
-void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y)
+static void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y)
 {
     struct TextSubPrinter printer;
 
@@ -1172,7 +1216,7 @@ void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y)
     AddTextPrinter(&printer, 0xFF, NULL);
 }
 
-void DaycarePrintMonNick(struct DayCare *daycare, u8 windowId, u32 daycareSlotId, u32 y)
+static void DaycarePrintMonNick(struct DayCare *daycare, u8 windowId, u32 daycareSlotId, u32 y)
 {
     u8 nick[POKEMON_NAME_LENGTH * 2];
 
@@ -1181,7 +1225,7 @@ void DaycarePrintMonNick(struct DayCare *daycare, u8 windowId, u32 daycareSlotId
     DaycareAddTextPrinter(windowId, nick, 8, y);
 }
 
-void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycareSlotId, u32 y)
+static void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycareSlotId, u32 y)
 {
     u8 level;
     u32 x;
@@ -1196,9 +1240,9 @@ void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycareSlotId,
     DaycareAddTextPrinter(windowId, lvlText, x, y);
 }
 
-void DaycarePrintMonInfo(u8 windowId, u32 daycareSlotId, u8 y)
+static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y)
 {
-    if (daycareSlotId < DAYCARE_MON_COUNT)
+    if (daycareSlotId < (unsigned) DAYCARE_MON_COUNT)
     {
         DaycarePrintMonNick(&gSaveBlock1Ptr->daycare, windowId, daycareSlotId, y);
         DaycarePrintMonLvl(&gSaveBlock1Ptr->daycare, windowId, daycareSlotId, y);
@@ -1208,7 +1252,7 @@ void DaycarePrintMonInfo(u8 windowId, u32 daycareSlotId, u8 y)
 #define tMenuListTaskId     data[0]
 #define tWindowId           data[1]
 
-void Task_HandleDaycareLevelMenuInput(u8 taskId)
+static void Task_HandleDaycareLevelMenuInput(u8 taskId)
 {
     u32 var = ListMenuHandleInput(gTasks[taskId].tMenuListTaskId);
 
diff --git a/src/decoration.c b/src/decoration.c
index 37cabf652..1527ce378 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1,5 +1,3 @@
-
-// Includes
 #include "global.h"
 #include "decompress.h"
 #include "malloc.h"
@@ -68,27 +66,27 @@ struct DecorRearrangementDataBuffer {
 // Static RAM declarations
 
 EWRAM_DATA u8 *gCurDecorInventoryItems = NULL;
-EWRAM_DATA u8 sSecretBasePCMenuCursorPos = 0;
-EWRAM_DATA u8 sCurDecorCatCount = 0;
-EWRAM_DATA u8 sSecretBaseItemsIndicesBuffer[16] = {};
-EWRAM_DATA u8 sPlayerRoomItemsIndicesBuffer[12] = {};
-EWRAM_DATA u16 sSecretBasePCSelectDecorLineNo = 0;
-EWRAM_DATA u16 sSecretBasePCSelectDecorPageNo = 0;
+EWRAM_DATA static u8 sSecretBasePCMenuCursorPos = 0;
+EWRAM_DATA static u8 sCurDecorCatCount = 0;
+EWRAM_DATA static u8 sSecretBaseItemsIndicesBuffer[16] = {};
+EWRAM_DATA static u8 sPlayerRoomItemsIndicesBuffer[12] = {};
+EWRAM_DATA static u16 sSecretBasePCSelectDecorLineNo = 0;
+EWRAM_DATA static u16 sSecretBasePCSelectDecorPageNo = 0;
 EWRAM_DATA u8 gCurDecorationIndex = 0;
-EWRAM_DATA u8 sCurDecorationCategory = DECORCAT_DESK;
-EWRAM_DATA u32 filler_0203a174[2] = {};
+EWRAM_DATA static u8 sCurDecorationCategory = DECORCAT_DESK;
+EWRAM_DATA static u32 filler_0203a174[2] = {};
 EWRAM_DATA struct DecorPCPointers gUnknown_0203A17C = {};
-EWRAM_DATA u8 sDecorMenuWindowIndices[4] = {};
+EWRAM_DATA static u8 sDecorMenuWindowIndices[4] = {};
 EWRAM_DATA struct DecorPCBuffer *sDecorPCBuffer = NULL;
 EWRAM_DATA struct PlaceDecorationGraphicsDataBuffer sPlaceDecorationGraphicsDataBuffer = {};
-EWRAM_DATA u16 sCurDecorMapX = 0;
-EWRAM_DATA u16 sCurDecorMapY = 0;
-EWRAM_DATA u8 sDecor_CameraSpriteObjectIdx1 = 0;
-EWRAM_DATA u8 sDecor_CameraSpriteObjectIdx2 = 0;
-EWRAM_DATA u8 sDecorationLastDirectionMoved = 0;
-EWRAM_DATA struct OamData sDecorSelectorOam = {};
-EWRAM_DATA struct DecorRearrangementDataBuffer sDecorRearrangementDataBuffer[16] = {};
-EWRAM_DATA u8 sCurDecorSelectedInRearrangement = 0;
+EWRAM_DATA static u16 sCurDecorMapX = 0;
+EWRAM_DATA static u16 sCurDecorMapY = 0;
+EWRAM_DATA static u8 sDecor_CameraSpriteObjectIdx1 = 0;
+EWRAM_DATA static u8 sDecor_CameraSpriteObjectIdx2 = 0;
+EWRAM_DATA static u8 sDecorationLastDirectionMoved = 0;
+EWRAM_DATA static struct OamData sDecorSelectorOam = {};
+EWRAM_DATA static struct DecorRearrangementDataBuffer sDecorRearrangementDataBuffer[16] = {};
+EWRAM_DATA static u8 sCurDecorSelectedInRearrangement = 0;
 
 // Static ROM declarations
 
@@ -800,9 +798,9 @@ void sub_8127330(u8 taskId)
     sDecorPCBuffer->items[i].unk_04 = -2;
     gUnknown_03006310 = gUnknown_085A6BD0;
     gUnknown_03006310.unk_10 = sDecorMenuWindowIndices[1];
-    gUnknown_03006310.unk_0c = sDecorPCBuffer->unk_520;
-    gUnknown_03006310.unk_00 = sDecorPCBuffer->items;
-    gUnknown_03006310.unk_0e = sDecorPCBuffer->unk_521;
+    gUnknown_03006310.totalItems = sDecorPCBuffer->unk_520;
+    gUnknown_03006310.items = sDecorPCBuffer->items;
+    gUnknown_03006310.maxShowed = sDecorPCBuffer->unk_521;
 }
 
 void sub_8127454(u8 *dest, u16 decorId)
diff --git a/src/secret_base.c b/src/secret_base.c
index 89e276e80..de2b7221a 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1099,9 +1099,9 @@ void game_continue(u8 taskId)
     }
     gUnknown_03006310 = gUnknown_0858D07C;
     gUnknown_03006310.unk_10 = data[6];
-    gUnknown_03006310.unk_0c = data[0];
-    gUnknown_03006310.unk_00 = gUnknown_0203A020->items;
-    gUnknown_03006310.unk_0e = data[3];
+    gUnknown_03006310.totalItems = data[0];
+    gUnknown_03006310.items = gUnknown_0203A020->items;
+    gUnknown_03006310.maxShowed = data[3];
 }
 
 void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu)
@@ -1866,7 +1866,7 @@ void sub_80EAF80(void *records, size_t recordSize, u8 linkIdx)
 {
     struct SecretBaseRecordMixer mixers[3];
     u16 i;
-    
+
     if (FlagGet(0x60))
     {
         switch (GetLinkPlayerCount())
-- 
cgit v1.2.3


From a7f72e7da1aee75e57649e0864c2bcde06cc24c9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 16 Nov 2017 00:01:47 -0500
Subject: Remove spaces between incrementor and incrementee

---
 src/field_region_map.c | 12 ++++----
 src/heal_location.c    |  2 +-
 src/region_map.c       | 76 +++++++++++++++++++++++++-------------------------
 3 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'src')

diff --git a/src/field_region_map.c b/src/field_region_map.c
index 9d530258d..b7d677c90 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -121,7 +121,7 @@ static void FieldUpdateRegionMap(void)
             InitRegionMap(&sFieldRegionMapHandler->regionMap, 0);
             CreateRegionMapPlayerIcon(0, 0);
             CreateRegionMapCursor(1, 1);
-            sFieldRegionMapHandler->state ++;
+            sFieldRegionMapHandler->state++;
             break;
         case 1:
             SetWindowBorderStyle(1, 0, 0x27, 0xd);
@@ -131,18 +131,18 @@ static void FieldUpdateRegionMap(void)
             SetWindowBorderStyle(0, 0, 0x27, 0xd);
             PrintRegionMapSecName();
             BeginNormalPaletteFade(-1, 0, 16, 0, 0);
-            sFieldRegionMapHandler->state ++;
+            sFieldRegionMapHandler->state++;
             break;
         case 2:
             SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
             ShowBg(0);
             ShowBg(2);
-            sFieldRegionMapHandler->state ++;
+            sFieldRegionMapHandler->state++;
             break;
         case 3:
             if (!gPaletteFade.active)
             {
-                sFieldRegionMapHandler->state ++;
+                sFieldRegionMapHandler->state++;
             }
             break;
         case 4:
@@ -153,13 +153,13 @@ static void FieldUpdateRegionMap(void)
                     break;
                 case INPUT_EVENT_A_BUTTON:
                 case INPUT_EVENT_B_BUTTON:
-                    sFieldRegionMapHandler->state ++;
+                    sFieldRegionMapHandler->state++;
                     break;
             }
             break;
         case 5:
             BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-            sFieldRegionMapHandler->state ++;
+            sFieldRegionMapHandler->state++;
             break;
         case 6:
             if (!gPaletteFade.active)
diff --git a/src/heal_location.c b/src/heal_location.c
index e31a30fb4..efc534170 100644
--- a/src/heal_location.c
+++ b/src/heal_location.c
@@ -47,7 +47,7 @@ static u32 GetHealLocationIndexFromMapGroupAndNum(u16 mapGroup, u16 mapNum)
 {
     u32 i;
 
-    for (i = 0; i < NUM_HEAL_LOCATIONS; i ++)
+    for (i = 0; i < NUM_HEAL_LOCATIONS; i++)
     {
         if (sHealLocations[i].group == mapGroup && sHealLocations[i].map == mapNum)
         {
diff --git a/src/region_map.c b/src/region_map.c
index d409044c1..da96475c0 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -506,12 +506,12 @@ bool8 sub_8122DB0(void)
                 SetBgAttribute(gRegionMap->bgNum, BG_CTRL_ATTR_PRIORITY, 1);
                 SetBgAttribute(gRegionMap->bgNum, BG_CTRL_ATTR_SCREENSIZE, 1);
             }
-            gRegionMap->initStep ++;
+            gRegionMap->initStep++;
             return FALSE;
         default:
             return FALSE;
     }
-    gRegionMap->initStep ++;
+    gRegionMap->initStep++;
     return TRUE;
 }
 
@@ -595,19 +595,19 @@ static u8 MoveRegionMapCursor_Full(void)
     }
     if (gRegionMap->cursorDeltaX > 0)
     {
-        gRegionMap->cursorPosX ++;
+        gRegionMap->cursorPosX++;
     }
     if (gRegionMap->cursorDeltaX < 0)
     {
-        gRegionMap->cursorPosX --;
+        gRegionMap->cursorPosX--;
     }
     if (gRegionMap->cursorDeltaY > 0)
     {
-        gRegionMap->cursorPosY ++;
+        gRegionMap->cursorPosY++;
     }
     if (gRegionMap->cursorDeltaY < 0)
     {
-        gRegionMap->cursorPosY --;
+        gRegionMap->cursorPosY--;
     }
     mapSecId = GetRegionMapSectionIdAt_Internal(gRegionMap->cursorPosX, gRegionMap->cursorPosY);
     gRegionMap->iconDrawType = get_flagnr_blue_points(mapSecId);
@@ -673,7 +673,7 @@ static u8 MoveRegionMapCursor_Zoomed(void)
     gRegionMap->scrollY += gRegionMap->zoomedCursorDeltaY;
     gRegionMap->scrollX += gRegionMap->zoomedCursorDeltaX;
     RegionMap_SetBG2XAndBG2Y(gRegionMap->scrollX, gRegionMap->scrollY);
-    gRegionMap->zoomedCursorMovementFrameCounter ++;
+    gRegionMap->zoomedCursorMovementFrameCounter++;
     if (gRegionMap->zoomedCursorMovementFrameCounter == 8)
     {
         x = (gRegionMap->scrollX + 0x2c) / 8 + 1;
@@ -741,7 +741,7 @@ bool8 sub_8123514(void)
     {
         return 0;
     }
-    gRegionMap->unk_06e ++;
+    gRegionMap->unk_06e++;
     if (gRegionMap->unk_06e == 16)
     {
         gRegionMap->unk_044 = 0;
@@ -1145,14 +1145,14 @@ static u16 CorrectSpecialMapSecId_Internal(u16 mapSecId)
 {
     u32 i;
 
-    for (i = 0; i < 3; i ++)
+    for (i = 0; i < 3; i++)
     {
         if (sRegionMap_MarineCaveMapSecIds[i] == mapSecId)
         {
             return RegionMap_GetTerraCaveMapSecId();
         }
     }
-    for (i = 0; sRegionMap_SpecialPlaceLocations[i][0] != MAPSEC_NONE; i ++)
+    for (i = 0; sRegionMap_SpecialPlaceLocations[i][0] != MAPSEC_NONE; i++)
     {
         if (sRegionMap_SpecialPlaceLocations[i][0] == mapSecId)
         {
@@ -1192,7 +1192,7 @@ static bool32 RegionMap_IsPlayerInCave(u8 mapSecId)
 {
     u32 i;
 
-    for (i = 0; i < 1; i ++)
+    for (i = 0; i < 1; i++)
     {
         if (sRegionMap_MapSecAquaHideoutOld[i] == mapSecId)
         {
@@ -1235,7 +1235,7 @@ static void RegionMap_GetPositionOfCursorWithinMapSection(void)
         {
             if (RegionMap_IsMapSecIdInNextRow(y))
             {
-                y --;
+                y--;
                 x = MAPCURSOR_X_MAX + 1;
             }
             else
@@ -1245,10 +1245,10 @@ static void RegionMap_GetPositionOfCursorWithinMapSection(void)
         }
         else
         {
-            x --;
+            x--;
             if (GetRegionMapSectionIdAt_Internal(x, y) == gRegionMap->mapSecId)
             {
-                posWithinMapSec ++;
+                posWithinMapSec++;
             }
         }
     }
@@ -1259,11 +1259,11 @@ static bool8 RegionMap_IsMapSecIdInNextRow(u16 y)
 {
     u16 x;
 
-    if (y -- == 0)
+    if (y-- == 0)
     {
         return FALSE;
     }
-    for (x = MAPCURSOR_X_MIN; x <= MAPCURSOR_X_MAX; x ++)
+    for (x = MAPCURSOR_X_MIN; x <= MAPCURSOR_X_MAX; x++)
     {
         if (GetRegionMapSectionIdAt_Internal(x, y) == gRegionMap->mapSecId)
         {
@@ -1279,7 +1279,7 @@ static void SpriteCallback_CursorFull(struct Sprite *sprite)
     {
         sprite->pos1.x += 2 * gRegionMap->cursorDeltaX;
         sprite->pos1.y += 2 * gRegionMap->cursorDeltaY;
-        gRegionMap->cursorMovementFrameCounter --;
+        gRegionMap->cursorMovementFrameCounter--;
     }
 }
 
@@ -1460,7 +1460,7 @@ static void RegionMapPlayerIconSpriteCallback(struct Sprite *sprite)
 {
     if (gRegionMap->blinkPlayerIcon)
     {
-        if (++ sprite->data7 > 16)
+        if (++sprite->data7 > 16)
         {
             sprite->data7 = 0;
             sprite->invisible = sprite->invisible ? FALSE : TRUE;
@@ -1503,7 +1503,7 @@ u8 *GetMapName(u8 *dest, u16 regionMapId, u16 padLength)
     }
     if (padLength != 0)
     {
-        for (i = str - dest; i < padLength; i ++)
+        for (i = str - dest; i < padLength; i++)
         {
             *str++ = CHAR_SPACE;
         }
@@ -1554,7 +1554,7 @@ bool32 sub_8124668(u8 mapSecId)
 {
     u32 i;
 
-    for (i = 0; i < 3; i ++)
+    for (i = 0; i < 3; i++)
     {
         if (mapSecId == sRegionMapEventSectionIds[i])
         {
@@ -1590,23 +1590,23 @@ void MCB2_FlyMap(void)
                 ResetSpriteData();
                 FreeSpriteTileRanges();
                 FreeAllSpritePalettes();
-                gMain.state ++;
+                gMain.state++;
             }
             break;
         case 1:
             ResetBgsAndClearDma3BusyFlags(0);
             InitBgsFromTemplates(1, gUnknown_085A1EE4, 3);
-            gMain.state ++;
+            gMain.state++;
             break;
         case 2:
             InitWindows(gUnknown_085A1EF0);
             DeactivateAllTextPrinters();
-            gMain.state ++;
+            gMain.state++;
             break;
         case 3:
             sub_809882C(0, 0x65, 0xd0);
             clear_scheduled_bg_copies_to_vram();
-            gMain.state ++;
+            gMain.state++;
             break;
         case 4:
             InitRegionMap(&gUnknown_0203A148->regionMap, FALSE);
@@ -1616,15 +1616,15 @@ void MCB2_FlyMap(void)
             StringFill(gUnknown_0203A148->unk_a4c, CHAR_SPACE, 16);
             gUnknown_03001180 = TRUE;
             sub_8124904();
-            gMain.state ++;
+            gMain.state++;
             break;
         case 5:
             LZ77UnCompVram(sRegionMapFrameGfxLZ, (u16 *)BG_CHAR_ADDR(3));
-            gMain.state ++;
+            gMain.state++;
             break;
         case 6:
             LZ77UnCompVram(sRegionMapFrameTilemapLZ, (u16 *)BG_SCREEN_ADDR(30));
-            gMain.state ++;
+            gMain.state++;
             break;
         case 7:
             LoadPalette(sRegionMapFramePal, 0x10, 0x20);
@@ -1632,16 +1632,16 @@ void MCB2_FlyMap(void)
             FillWindowPixelBuffer(2, 0x00);
             PrintTextOnWindow(2, 1, gText_FlyToWhere, 0, 1, 0, NULL);
             schedule_bg_copy_tilemap_to_vram(0);
-            gMain.state ++;
+            gMain.state++;
             break;
         case 8:
             sub_8124A70();
-            gMain.state ++;
+            gMain.state++;
             break;
         case 9:
             BlendPalettes(-1, 16, 0);
             SetVBlankCallback(sub_81248C0);
-            gMain.state ++;
+            gMain.state++;
             break;
         case 10:
             SetGpuReg(REG_OFFSET_BLDCNT, 0);
@@ -1651,7 +1651,7 @@ void MCB2_FlyMap(void)
             ShowBg(2);
             sub_81248F4(sub_8124D14);
             SetMainCallback2(sub_81248D4);
-            gMain.state ++;
+            gMain.state++;
             break;
     }
 }
@@ -1686,7 +1686,7 @@ static void sub_8124904(void)
     if (gUnknown_0203A148->regionMap.iconDrawType > MAPSECTYPE_NONE && gUnknown_0203A148->regionMap.iconDrawType <= MAPSECTYPE_BATTLE_FRONTIER)
     {
         flag = FALSE;
-        for (i = 0; i < 1; i ++)
+        for (i = 0; i < 1; i++)
         {
             if (gUnknown_0203A148->regionMap.mapSecId == gUnknown_085A1EDC[i].mapSecId)
             {
@@ -1762,7 +1762,7 @@ static void sub_8124AD4(void)
     u8 spriteId;
 
     canFlyFlag = FLAG_VISITED_LITTLEROOT_TOWN;
-    for (i = 0; i < 16; i ++)
+    for (i = 0; i < 16; i++)
     {
         sub_8124630(i, &x, &y, &width, &height);
         x = (x + MAPCURSOR_X_MIN) * 8 + 4;
@@ -1794,7 +1794,7 @@ static void sub_8124AD4(void)
             StartSpriteAnim(&gSprites[spriteId], shape);
             gSprites[spriteId].data0 = i;
         }
-        canFlyFlag ++;
+        canFlyFlag++;
     }
 }
 
@@ -1808,7 +1808,7 @@ static void sub_8124BE4(void)
     u16 mapSecId;
     u8 spriteId;
 
-    for (i = 0; gUnknown_085A1F18[i][1] != MAPSEC_NONE; i ++)
+    for (i = 0; gUnknown_085A1F18[i][1] != MAPSEC_NONE; i++)
     {
         if (FlagGet(gUnknown_085A1F18[i][0]))
         {
@@ -1832,7 +1832,7 @@ static void sub_8124CBC(struct Sprite *sprite)
 {
     if (gUnknown_0203A148->regionMap.mapSecId == sprite->data0)
     {
-        if (++ sprite->data1 > 16)
+        if (++sprite->data1 > 16)
         {
             sprite->data1 = 0;
             sprite->invisible = sprite->invisible ? FALSE : TRUE;
@@ -1851,7 +1851,7 @@ static void sub_8124D14(void)
     {
         case 0:
             BeginNormalPaletteFade(-1, 0, 16, 0, 0);
-            gUnknown_0203A148->unk_004 ++;
+            gUnknown_0203A148->unk_004++;
             break;
         case 1:
             if (!UpdatePaletteFade())
@@ -1898,7 +1898,7 @@ static void sub_8124E0C(void)
     {
         case 0:
             BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-            gUnknown_0203A148->unk_004 ++;
+            gUnknown_0203A148->unk_004++;
             break;
         case 1:
             if (!UpdatePaletteFade())
-- 
cgit v1.2.3


From b37d8c0821997038c96723d85bcc95734af0c159 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 16 Nov 2017 20:38:10 +0100
Subject: start decompiling wild encounter

---
 src/wild_encounter.c | 483 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 483 insertions(+)
 create mode 100644 src/wild_encounter.c

(limited to 'src')

diff --git a/src/wild_encounter.c b/src/wild_encounter.c
new file mode 100644
index 000000000..7d4cc7794
--- /dev/null
+++ b/src/wild_encounter.c
@@ -0,0 +1,483 @@
+#include "global.h"
+#include "wild_encounter.h"
+#include "pokemon.h"
+#include "species.h"
+#include "metatile_behavior.h"
+#include "fieldmap.h"
+#include "rng.h"
+#include "map_constants.h"
+#include "field_player_avatar.h"
+#include "abilities.h"
+#include "event_data.h"
+#include "safari_zone.h"
+#include "pokeblock.h"
+
+EWRAM_DATA u8 sWildEncountersDisabled = 0;
+EWRAM_DATA u32 sFeebasRngValue = 0;
+
+#define NUM_FEEBAS_SPOTS 6
+
+extern const u16 gRoute119WaterTileData[];
+
+// this file's functions
+u16 FeebasRandom(void);
+void FeebasSeedRng(u16 seed);
+bool8 IsWildLevelAllowedByRepel(u8 level);
+void ApplyFluteEncounterRateMod(u32 *encRate);
+void ApplyCleanseTagEncounterRateMod(u32 *encRate);
+bool8 TryGetAbilityInfluencedWildMonIndex(const struct WildPokemon *wildMon, u8 type, u8 ability, u8 *monIndex);
+bool8 IsAbilityAllowingEncounter(u8 level);
+
+void DisableWildEncounters(bool8 disabled)
+{
+    sWildEncountersDisabled = disabled;
+}
+
+u16 GetRoute119WaterTileNum(s16 x, s16 y, u8 section)
+{
+    u16 xCur;
+    u16 yCur;
+    u16 yMin = gRoute119WaterTileData[section * 3 + 0];
+    u16 yMax = gRoute119WaterTileData[section * 3 + 1];
+    u16 tileNum = gRoute119WaterTileData[section * 3 + 2];
+
+    for (yCur = yMin; yCur <= yMax; yCur++)
+    {
+        for (xCur = 0; xCur < gMapHeader.mapData->width; xCur++)
+        {
+            u8 tileBehaviorId = MapGridGetMetatileBehaviorAt(xCur + 7, yCur + 7);
+            if (MetatileBehavior_IsSurfableAndNotWaterfall(tileBehaviorId) == TRUE)
+            {
+                tileNum++;
+                if (x == xCur && y == yCur)
+                    return tileNum;
+            }
+        }
+    }
+    return tileNum + 1;
+}
+
+bool8 CheckFeebas(void)
+{
+    u8 i;
+    u16 feebasSpots[NUM_FEEBAS_SPOTS];
+    s16 x;
+    s16 y;
+    u8 route119section = 0;
+    u16 waterTileNum;
+
+    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_ROUTE119
+     && gSaveBlock1Ptr->location.mapNum == MAP_ID_ROUTE119)
+    {
+        GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
+        x -= 7;
+        y -= 7;
+
+#ifdef NONMATCHING
+        if (y >= gRoute119WaterTileData[3 * 1 + 0] && y <= gRoute119WaterTileData[3 * 1 + 1])
+            route119section = 1;
+        if (y >= gRoute119WaterTileData[3 * 2 + 0] && y <= gRoute119WaterTileData[3 * 2 + 1])
+            route119section = 2;
+#else
+        {
+            register const u16 *arr asm("r0");
+            if (y >= (arr = gRoute119WaterTileData)[3 * 1 + 0] && y <= arr[3 * 1 + 1])
+                route119section = 1;
+            if (y >= arr[3 * 2 + 0] && y <= arr[3 * 2 + 1])
+                route119section = 2;
+        }
+#endif
+
+        if (Random() % 100 > 49) // 50% chance of encountering Feebas
+            return FALSE;
+
+        FeebasSeedRng(gSaveBlock1Ptr->easyChatPairs[0].unk2);
+        for (i = 0; i != NUM_FEEBAS_SPOTS;)
+        {
+            feebasSpots[i] = FeebasRandom() % 447;
+            if (feebasSpots[i] == 0)
+                feebasSpots[i] = 447;
+            if (feebasSpots[i] < 1 || feebasSpots[i] >= 4)
+                i++;
+        }
+        waterTileNum = GetRoute119WaterTileNum(x, y, route119section);
+        for (i = 0; i < NUM_FEEBAS_SPOTS; i++)
+        {
+            if (waterTileNum == feebasSpots[i])
+                return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+u16 FeebasRandom(void)
+{
+    sFeebasRngValue = 12345 + 0x41C64E6D * sFeebasRngValue;
+    return sFeebasRngValue >> 16;
+}
+
+void FeebasSeedRng(u16 seed)
+{
+    sFeebasRngValue = seed;
+}
+
+u8 ChooseWildMonIndex_Land(void)
+{
+    u8 rand = Random() % 100;
+
+    if (rand < 20)                  // 20% chance
+        return 0;
+    if (rand >= 20 && rand < 40)    // 20% chance
+        return 1;
+    if (rand >= 40 && rand < 50)    // 10% chance
+        return 2;
+    if (rand >= 50 && rand < 60)    // 10% chance
+        return 3;
+    if (rand >= 60 && rand < 70)    // 10% chance
+        return 4;
+    if (rand >= 70 && rand < 80)    // 10% chance
+        return 5;
+    if (rand >= 80 && rand < 85)    // 5% chance
+        return 6;
+    if (rand >= 85 && rand < 90)    // 5% chance
+        return 7;
+    if (rand >= 90 && rand < 94)    // 4% chance
+        return 8;
+    if (rand >= 94 && rand < 98)    // 4% chance
+        return 9;
+    if (rand == 98)                 // 1% chance
+        return 10;
+    else                            // 1% chance
+        return 11;
+}
+
+u8 ChooseWildMonIndex_WaterRock(void)
+{
+    u8 rand = Random() % 100;
+
+    if (rand < 60)                  // 60% chance
+        return 0;
+    if (rand >= 60 && rand < 90)    // 30% chance
+        return 1;
+    if (rand >= 90 && rand < 95)    // 5% chance
+        return 2;
+    if (rand >= 95 && rand < 99)    // 4% chance
+        return 3;
+    else                            // 1% chance
+        return 4;
+}
+
+enum
+{
+    OLD_ROD,
+    GOOD_ROD,
+    SUPER_ROD
+};
+
+u8 ChooseWildMonIndex_Fishing(u8 rod)
+{
+    u8 wildMonIndex = 0;
+    u8 rand = Random() % 100;
+
+    switch (rod)
+    {
+    case OLD_ROD:
+        if (rand < 70)  // 70% chance
+            wildMonIndex = 0;
+        else            // 30% chance
+            wildMonIndex = 1;
+        break;
+    case GOOD_ROD:
+        if (rand < 60)                  // 60% chance
+            wildMonIndex = 2;
+        if (rand >= 60 && rand < 80)    // 20% chance
+            wildMonIndex = 3;
+        if (rand >= 80 && rand < 100)   // 20% chance
+            wildMonIndex = 4;
+        break;
+    case SUPER_ROD:
+        if (rand < 40)                  // 40% chance
+            wildMonIndex = 5;
+        if (rand >= 40 && rand < 80)    // 40% chance
+            wildMonIndex = 6;
+        if (rand >= 80 && rand < 95)    // 15% chance
+            wildMonIndex = 7;
+        if (rand >= 95 && rand < 99)    // 4% chance
+            wildMonIndex = 8;
+        if (rand == 99)                 // 1% chance
+            wildMonIndex = 9;
+        break;
+    }
+    return wildMonIndex;
+}
+
+u8 ChooseWildMonLevel(const struct WildPokemon *wildPokemon)
+{
+    u8 min;
+    u8 max;
+    u8 range;
+    u8 rand;
+
+    // Make sure minimum level is less than maximum level
+    if (wildPokemon->maxLevel >= wildPokemon->minLevel)
+    {
+        min = wildPokemon->minLevel;
+        max = wildPokemon->maxLevel;
+    }
+    else
+    {
+        min = wildPokemon->maxLevel;
+        max = wildPokemon->minLevel;
+    }
+    range = max - min + 1;
+    rand = Random() % range;
+
+    // check ability for max level mon
+    if (!GetMonData(&gPlayerParty[0], MON_DATA_SANITY_BIT3))
+    {
+        u8 ability = GetMonAbility(&gPlayerParty[0]);
+        if (ability == ABILITY_HUSTLE || ability == ABILITY_VITAL_SPIRIT || ability == ABILITY_PRESSURE)
+        {
+            if (Random() % 2 == 0)
+                return max;
+
+            if (rand != 0)
+                rand--;
+        }
+    }
+
+    return min + rand;
+}
+
+u16 GetCurrentMapWildMonHeaderId(void)
+{
+    u16 i;
+
+    for (i = 0; ; i++)
+    {
+        const struct WildPokemonHeader *wildHeader = &gWildMonHeaders[i];
+        if (wildHeader->mapGroup == 0xFF)
+            break;
+
+        if (gWildMonHeaders[i].mapGroup == gSaveBlock1Ptr->location.mapGroup &&
+            gWildMonHeaders[i].mapNum == gSaveBlock1Ptr->location.mapNum)
+        {
+            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_ALTERING_CAVE &&
+                gSaveBlock1Ptr->location.mapNum == MAP_ID_ALTERING_CAVE)
+            {
+                u16 alteringCaveId = VarGet(VAR_ALTERING_CAVE_WILD_SET);
+                if (alteringCaveId > 8)
+                    alteringCaveId = 0;
+
+                i += alteringCaveId;
+            }
+
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+u8 PickWildMonNature(void)
+{
+    u8 i;
+    u8 j;
+    struct Pokeblock *safariPokeblock;
+    u8 natures[25];
+
+    if (GetSafariZoneFlag() == TRUE && Random() % 100 < 80)
+    {
+        safariPokeblock = SafariZoneGetActivePokeblock();
+        if (safariPokeblock != NULL)
+        {
+            for (i = 0; i < 25; i++)
+                natures[i] = i;
+            for (i = 0; i < 24; i++)
+            {
+                for (j = i + 1; j < 25; j++)
+                {
+                    if (Random() & 1)
+                    {
+                        u8 temp = natures[i];
+
+                        natures[i] = natures[j];
+                        natures[j] = temp;
+                    }
+                }
+            }
+            for (i = 0; i < 25; i++)
+            {
+                if (PokeblockGetGain(natures[i], safariPokeblock) > 0)
+                    return natures[i];
+            }
+        }
+    }
+    // check synchronize for a pokemon with the same ability
+    if (!GetMonData(&gPlayerParty[0], MON_DATA_SANITY_BIT3)
+        && GetMonAbility(&gPlayerParty[0]) == ABILITY_SYNCHRONIZE
+        && Random() % 2 == 0)
+    {
+        return GetMonData(&gPlayerParty[0], MON_DATA_PERSONALITY) % 25;
+    }
+
+    // random nature
+    return Random() % 25;
+}
+
+void CreateWildMon(u16 species, u8 level)
+{
+    bool32 checkCuteCharm;
+
+    ZeroEnemyPartyMons();
+    checkCuteCharm = TRUE;
+
+    switch (gBaseStats[species].genderRatio)
+    {
+    case MON_MALE:
+    case MON_FEMALE:
+    case MON_GENDERLESS:
+        checkCuteCharm = FALSE;
+        break;
+    }
+
+    if (checkCuteCharm
+        && !GetMonData(&gPlayerParty[0], MON_DATA_SANITY_BIT3)
+        && GetMonAbility(&gPlayerParty[0]) == ABILITY_CUTE_CHARM
+        && Random() % 3 != 0)
+    {
+        u16 leadingMonSpecies = GetMonData(&gPlayerParty[0], MON_DATA_SPECIES);
+        u32 leadingMonPersonality = GetMonData(&gPlayerParty[0], MON_DATA_PERSONALITY);
+        u8 gender = GetGenderFromSpeciesAndPersonality(leadingMonSpecies, leadingMonPersonality);
+
+        // misses mon is genderless check, although no genderless mon can have cute charm as ability
+        if (gender == MON_FEMALE)
+            gender = MON_MALE;
+        else
+            gender = MON_FEMALE;
+
+        CreateMonWithGenderNatureLetter(&gEnemyParty[0], species, level, 32, gender, PickWildMonNature(), 0);
+        return;
+    }
+
+    CreateMonWithNature(&gEnemyParty[0], species, level, 32, PickWildMonNature());
+}
+
+enum
+{
+    WILD_AREA_LAND,
+    WILD_AREA_WATER,
+    WILD_AREA_ROCKS,
+    WILD_AREA_FISHING,
+};
+
+#define WILD_CHECK_REPEL    0x1
+#define WILD_CHECK_KEEN_EYE 0x2
+
+bool8 TryGenerateWildMon(struct WildPokemonInfo *wildMonInfo, u8 area, u8 flags)
+{
+    u8 wildMonIndex = 0;
+    u8 level;
+
+    switch (area)
+    {
+    case WILD_AREA_LAND:
+        if (TryGetAbilityInfluencedWildMonIndex(wildMonInfo->wildPokemon, TYPE_STEEL, ABILITY_MAGNET_PULL, &wildMonIndex))
+            break;
+        if (TryGetAbilityInfluencedWildMonIndex(wildMonInfo->wildPokemon, TYPE_ELECTRIC, ABILITY_STATIC, &wildMonIndex))
+            break;
+
+        wildMonIndex = ChooseWildMonIndex_Land();
+        break;
+    case WILD_AREA_WATER:
+        if (TryGetAbilityInfluencedWildMonIndex(wildMonInfo->wildPokemon, TYPE_ELECTRIC, ABILITY_STATIC, &wildMonIndex))
+            break;
+
+        wildMonIndex = ChooseWildMonIndex_WaterRock();
+        break;
+    case WILD_AREA_ROCKS:
+        wildMonIndex = ChooseWildMonIndex_WaterRock();
+        break;
+    }
+
+    level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]);
+    if (flags & WILD_CHECK_REPEL && !IsWildLevelAllowedByRepel(level))
+        return FALSE;
+    if (gMapHeader.mapDataId != 0x166 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level))
+        return FALSE;
+
+    CreateWildMon(wildMonInfo->wildPokemon[wildMonIndex].species, level);
+    return TRUE;
+}
+
+u16 GenerateFishingWildMon(struct WildPokemonInfo *wildMonInfo, u8 rod)
+{
+    u8 wildMonIndex = ChooseWildMonIndex_Fishing(rod);
+    u8 level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]);
+
+    CreateWildMon(wildMonInfo->wildPokemon[wildMonIndex].species, level);
+    return wildMonInfo->wildPokemon[wildMonIndex].species;
+}
+
+bool8 SetUpMassOutbreakEncounter(u8 flags)
+{
+    u16 i;
+
+    if (flags & WILD_CHECK_REPEL && !IsWildLevelAllowedByRepel(gSaveBlock1Ptr->outbreakPokemonLevel))
+        return FALSE;
+
+    CreateWildMon(gSaveBlock1Ptr->outbreakPokemonSpecies, gSaveBlock1Ptr->outbreakPokemonLevel);
+    for (i = 0; i < 4; i++)
+        SetMonMoveSlot(&gEnemyParty[0], gSaveBlock1Ptr->outbreakPokemonMoves[i], i);
+
+    return TRUE;
+}
+
+bool8 DoMassOutbreakEncounterTest(void)
+{
+    if (gSaveBlock1Ptr->outbreakPokemonSpecies != 0
+     && gSaveBlock1Ptr->location.mapNum == gSaveBlock1Ptr->outbreakLocationMapNum
+     && gSaveBlock1Ptr->location.mapGroup == gSaveBlock1Ptr->outbreakLocationMapGroup)
+    {
+        if (Random() % 100 < gSaveBlock1Ptr->outbreakPokemonProbability)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 DoWildEncounterRateDiceRoll(u16 encounterRate)
+{
+    if (Random() % 2880 < encounterRate)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
+{
+    encounterRate *= 16;
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
+        encounterRate = encounterRate * 80 / 100;
+    ApplyFluteEncounterRateMod(&encounterRate);
+    ApplyCleanseTagEncounterRateMod(&encounterRate);
+    if (!ignoreAbility && !GetMonData(&gPlayerParty[0], MON_DATA_SANITY_BIT3))
+    {
+        u32 ability = GetMonAbility(&gPlayerParty[0]);
+
+        if (ability == ABILITY_STENCH && gMapHeader.mapDataId == 0x169)
+            encounterRate = encounterRate * 3 / 4;
+        else if (ability == ABILITY_STENCH)
+            encounterRate /= 2;
+        else if (ability == ABILITY_ILLUMINATE)
+            encounterRate *= 2;
+        else if (ability == ABILITY_WHITE_SMOKE)
+            encounterRate /= 2;
+        else if (ability == ABILITY_ARENA_TRAP)
+            encounterRate *= 2;
+        else if (ability == ABILITY_SAND_VEIL && gSaveBlock1Ptr->weather == 8)
+            encounterRate /= 2;
+    }
+    if (encounterRate > 2880)
+        encounterRate = 2880;
+    return DoWildEncounterRateDiceRoll(encounterRate);
+}
-- 
cgit v1.2.3


From a2a17bba926d1465108ab55c47f9145494ff78e5 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 17 Nov 2017 17:50:07 +0100
Subject: more work on wild encounter

---
 src/wild_encounter.c | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 256 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 7d4cc7794..6238f6aab 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -11,6 +11,8 @@
 #include "event_data.h"
 #include "safari_zone.h"
 #include "pokeblock.h"
+#include "battle_setup.h"
+#include "roamer.h"
 
 EWRAM_DATA u8 sWildEncountersDisabled = 0;
 EWRAM_DATA u32 sFeebasRngValue = 0;
@@ -18,6 +20,12 @@ EWRAM_DATA u32 sFeebasRngValue = 0;
 #define NUM_FEEBAS_SPOTS 6
 
 extern const u16 gRoute119WaterTileData[];
+extern const struct WildPokemonHeader gBattlePikeWildMonHeaders[];
+extern const struct WildPokemonHeader gBattlePyramidWildMonHeaders[];
+
+extern u8 GetBattlePikeWildMonHeaderId(void);
+extern bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate);
+extern void GenerateBattlePyramidWildMon(void);
 
 // this file's functions
 u16 FeebasRandom(void);
@@ -374,7 +382,7 @@ enum
 #define WILD_CHECK_REPEL    0x1
 #define WILD_CHECK_KEEN_EYE 0x2
 
-bool8 TryGenerateWildMon(struct WildPokemonInfo *wildMonInfo, u8 area, u8 flags)
+bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 area, u8 flags)
 {
     u8 wildMonIndex = 0;
     u8 level;
@@ -481,3 +489,250 @@ bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
         encounterRate = 2880;
     return DoWildEncounterRateDiceRoll(encounterRate);
 }
+
+bool8 DoGlobalWildEncounterDiceRoll(void)
+{
+    if (Random() % 100 >= 60)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+bool8 AreLegendariesInSootopolisPreventingEncounters(void)
+{
+    if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP_SOOTOPOLIS_CITY
+        || gSaveBlock1Ptr->location.mapNum != MAP_ID_SOOTOPOLIS_CITY)
+    {
+        return FALSE;
+    }
+
+    return FlagGet(FLAG_LEGENDARIES_IN_SOOTOPOLIS);
+}
+
+bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior)
+{
+    u16 headerId;
+    struct Roamer *roamer;
+
+    if (sWildEncountersDisabled == TRUE)
+        return FALSE;
+
+    headerId = GetCurrentMapWildMonHeaderId();
+    if (headerId == 0xFFFF) // invalid
+    {
+        if (gMapHeader.mapDataId == 0x166)
+        {
+            headerId = GetBattlePikeWildMonHeaderId();
+            if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
+                return FALSE;
+            if (DoWildEncounterRateTest(gBattlePikeWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE)
+                return FALSE;
+            if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_KEEN_EYE) != TRUE)
+                return FALSE;
+            if (!TryGenerateBattlePikeWildMon(TRUE))
+                return FALSE;
+
+            BattleSetup_StartBattlePikeWildBattle();
+            return TRUE;
+        }
+        if (gMapHeader.mapDataId == 0x169)
+        {
+            headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId;
+            if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
+                return FALSE;
+            if (DoWildEncounterRateTest(gBattlePyramidWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE)
+                return FALSE;
+            if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_KEEN_EYE) != TRUE)
+                return FALSE;
+
+            GenerateBattlePyramidWildMon();
+            BattleSetup_StartWildBattle();
+            return TRUE;
+        }
+    }
+    else
+    {
+        if (MetatileBehavior_IsLandWildEncounter(currMetaTileBehavior) == TRUE)
+        {
+            if (gWildMonHeaders[headerId].landMonsInfo == NULL)
+                return FALSE;
+            if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
+                return FALSE;
+            if (DoWildEncounterRateTest(gWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE)
+                return FALSE;
+
+            if (TryStartRoamerEncounter() == TRUE)
+            {
+                roamer = &gSaveBlock1Ptr->roamer;
+                if (!IsWildLevelAllowedByRepel(roamer->level))
+                    return FALSE;
+
+                BattleSetup_StartRoamerBattle();
+                return TRUE;
+            }
+            else
+            {
+                if (DoMassOutbreakEncounterTest() == TRUE && SetUpMassOutbreakEncounter(WILD_CHECK_REPEL | WILD_CHECK_KEEN_EYE) == TRUE)
+                {
+                    BattleSetup_StartWildBattle();
+                    return TRUE;
+                }
+
+                // try a regular wild land encounter
+                if (TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_REPEL | WILD_CHECK_KEEN_EYE) == TRUE)
+                {
+                    BattleSetup_StartWildBattle();
+                    return TRUE;
+                }
+
+                return FALSE;
+            }
+        }
+        else if (MetatileBehavior_IsWaterWildEncounter(currMetaTileBehavior) == TRUE
+                 || (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && MetatileBehavior_IsBridge(currMetaTileBehavior) == TRUE))
+        {
+            if (AreLegendariesInSootopolisPreventingEncounters() == TRUE)
+                return FALSE;
+            if (gWildMonHeaders[headerId].waterMonsInfo == NULL)
+                return FALSE;
+            if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
+                return FALSE;
+            if (DoWildEncounterRateTest(gWildMonHeaders[headerId].waterMonsInfo->encounterRate, FALSE) != TRUE)
+                return FALSE;
+
+            if (TryStartRoamerEncounter() == TRUE)
+            {
+                roamer = &gSaveBlock1Ptr->roamer;
+                if (!IsWildLevelAllowedByRepel(roamer->level))
+                    return FALSE;
+
+                BattleSetup_StartRoamerBattle();
+                return TRUE;
+            }
+            else // try a regular surfing encounter
+            {
+                if (TryGenerateWildMon(gWildMonHeaders[headerId].waterMonsInfo, WILD_AREA_WATER, WILD_CHECK_REPEL | WILD_CHECK_KEEN_EYE) == TRUE)
+                {
+                    BattleSetup_StartWildBattle();
+                    return TRUE;
+                }
+
+                return FALSE;
+            }
+        }
+    }
+
+    return FALSE;
+}
+
+void RockSmashWildEncounter(void)
+{
+    u16 headerId = GetCurrentMapWildMonHeaderId();
+
+    if (headerId != 0xFFFF)
+    {
+        const struct WildPokemonInfo *wildPokemonInfo = gWildMonHeaders[headerId].rockSmashMonsInfo;
+
+        if (wildPokemonInfo == NULL)
+        {
+            gSpecialVar_Result = FALSE;
+        }
+        else if (DoWildEncounterRateTest(wildPokemonInfo->encounterRate, 1) == TRUE
+         && TryGenerateWildMon(wildPokemonInfo, 2, WILD_CHECK_REPEL | WILD_CHECK_KEEN_EYE) == TRUE)
+        {
+            BattleSetup_StartWildBattle();
+            gSpecialVar_Result = TRUE;
+        }
+        else
+        {
+            gSpecialVar_Result = FALSE;
+        }
+    }
+    else
+    {
+        gSpecialVar_Result = FALSE;
+    }
+}
+
+bool8 SweetScentWildEncounter(void)
+{
+    s16 x, y;
+    u16 headerId;
+
+    PlayerGetDestCoords(&x, &y);
+    headerId = GetCurrentMapWildMonHeaderId();
+    if (headerId == 0xFFFF) // invalid
+    {
+        if (gMapHeader.mapDataId == 0x166)
+        {
+            headerId = GetBattlePikeWildMonHeaderId();
+            if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE)
+                return FALSE;
+
+            TryGenerateBattlePikeWildMon(FALSE);
+            BattleSetup_StartBattlePikeWildBattle();
+            return TRUE;
+        }
+        if (gMapHeader.mapDataId == 0x169)
+        {
+            headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId;
+            if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE)
+                return FALSE;
+
+            GenerateBattlePyramidWildMon();
+            BattleSetup_StartWildBattle();
+            return TRUE;
+        }
+    }
+    else
+    {
+        if (MetatileBehavior_IsLandWildEncounter(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
+        {
+            if (gWildMonHeaders[headerId].landMonsInfo == NULL)
+                return FALSE;
+
+            if (TryStartRoamerEncounter() == TRUE)
+            {
+                BattleSetup_StartRoamerBattle();
+                return TRUE;
+            }
+
+            if (DoMassOutbreakEncounterTest() == TRUE)
+                SetUpMassOutbreakEncounter(0);
+            else
+                TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0);
+
+            BattleSetup_StartWildBattle();
+            return TRUE;
+        }
+        else if (MetatileBehavior_IsWaterWildEncounter(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
+        {
+            if (AreLegendariesInSootopolisPreventingEncounters() == TRUE)
+                return FALSE;
+            if (gWildMonHeaders[headerId].waterMonsInfo == NULL)
+                return FALSE;
+
+            if (TryStartRoamerEncounter() == TRUE)
+            {
+                BattleSetup_StartRoamerBattle();
+                return TRUE;
+            }
+
+            TryGenerateWildMon(gWildMonHeaders[headerId].waterMonsInfo, WILD_AREA_WATER, 0);
+            BattleSetup_StartWildBattle();
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+bool8 DoesCurrentMapHaveFishingMons(void)
+{
+    u16 headerId = GetCurrentMapWildMonHeaderId();
+
+    if (headerId != 0xFFFF && gWildMonHeaders[headerId].fishingMonsInfo != NULL)
+        return TRUE;
+    else
+        return FALSE;
+}
-- 
cgit v1.2.3


From 6b075ae0ffc82a8aff6ae5812f9f6f7675c08031 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 17 Nov 2017 22:28:55 +0100
Subject: wild encounter file is decompiled

---
 src/tv.c             |   2 +-
 src/wild_encounter.c | 223 ++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 211 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/tv.c b/src/tv.c
index c1d648652..1d978b093 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1883,7 +1883,7 @@ void PutFishingAdviceShowOnTheAir(void)
     }
 }
 
-void sub_80EDA3C(u16 species)
+void SetPokemonAnglerSpecies(u16 species)
 {
     sPokemonAnglerSpecies = species;
 }
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 6238f6aab..d92f9daf3 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -13,28 +13,43 @@
 #include "pokeblock.h"
 #include "battle_setup.h"
 #include "roamer.h"
+#include "game_stat.h"
+#include "tv.h"
+#include "link.h"
+#include "script.h"
+#include "items.h"
 
-EWRAM_DATA u8 sWildEncountersDisabled = 0;
-EWRAM_DATA u32 sFeebasRngValue = 0;
+extern const u8 EventScript_RepelWoreOff[];
 
-#define NUM_FEEBAS_SPOTS 6
+#define NUM_FEEBAS_SPOTS    6
+
+#define LAND_WILD_COUNT     12
+#define WATER_WILD_COUNT    5
+#define ROCK_WILD_COUNT     5
+#define FISH_WILD_COUNT     10
 
 extern const u16 gRoute119WaterTileData[];
 extern const struct WildPokemonHeader gBattlePikeWildMonHeaders[];
 extern const struct WildPokemonHeader gBattlePyramidWildMonHeaders[];
+extern const struct WildPokemon gWildFeebasRoute119Data;
 
 extern u8 GetBattlePikeWildMonHeaderId(void);
 extern bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate);
 extern void GenerateBattlePyramidWildMon(void);
+extern bool8 InBattlePike(void);
+extern bool8 InBattlePyramid(void);
 
 // this file's functions
-u16 FeebasRandom(void);
-void FeebasSeedRng(u16 seed);
-bool8 IsWildLevelAllowedByRepel(u8 level);
-void ApplyFluteEncounterRateMod(u32 *encRate);
-void ApplyCleanseTagEncounterRateMod(u32 *encRate);
-bool8 TryGetAbilityInfluencedWildMonIndex(const struct WildPokemon *wildMon, u8 type, u8 ability, u8 *monIndex);
-bool8 IsAbilityAllowingEncounter(u8 level);
+static u16 FeebasRandom(void);
+static void FeebasSeedRng(u16 seed);
+static bool8 IsWildLevelAllowedByRepel(u8 level);
+static void ApplyFluteEncounterRateMod(u32 *encRate);
+static void ApplyCleanseTagEncounterRateMod(u32 *encRate);
+static bool8 TryGetAbilityInfluencedWildMonIndex(const struct WildPokemon *wildMon, u8 type, u8 ability, u8 *monIndex);
+static bool8 IsAbilityAllowingEncounter(u8 level);
+
+EWRAM_DATA u8 sWildEncountersDisabled = 0;
+EWRAM_DATA u32 sFeebasRngValue = 0;
 
 void DisableWildEncounters(bool8 disabled)
 {
@@ -118,13 +133,13 @@ bool8 CheckFeebas(void)
     return FALSE;
 }
 
-u16 FeebasRandom(void)
+static u16 FeebasRandom(void)
 {
     sFeebasRngValue = 12345 + 0x41C64E6D * sFeebasRngValue;
     return sFeebasRngValue >> 16;
 }
 
-void FeebasSeedRng(u16 seed)
+static void FeebasSeedRng(u16 seed)
 {
     sFeebasRngValue = seed;
 }
@@ -418,7 +433,7 @@ bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 area, u8
     return TRUE;
 }
 
-u16 GenerateFishingWildMon(struct WildPokemonInfo *wildMonInfo, u8 rod)
+u16 GenerateFishingWildMon(const struct WildPokemonInfo *wildMonInfo, u8 rod)
 {
     u8 wildMonIndex = ChooseWildMonIndex_Fishing(rod);
     u8 level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]);
@@ -736,3 +751,185 @@ bool8 DoesCurrentMapHaveFishingMons(void)
     else
         return FALSE;
 }
+
+void FishingWildEncounter(u8 rod)
+{
+    u16 species;
+
+    if (CheckFeebas() == TRUE)
+    {
+        u8 level = ChooseWildMonLevel(&gWildFeebasRoute119Data);
+
+        species = gWildFeebasRoute119Data.species;
+        CreateWildMon(species, level);
+    }
+    else
+    {
+        species = GenerateFishingWildMon(gWildMonHeaders[GetCurrentMapWildMonHeaderId()].fishingMonsInfo, rod);
+    }
+    IncrementGameStat(GAME_STAT_FISHING_CAPTURES);
+    SetPokemonAnglerSpecies(species);
+    BattleSetup_StartWildBattle();
+}
+
+u16 GetLocalWildMon(bool8 *isWaterMon)
+{
+    u16 headerId;
+    const struct WildPokemonInfo *landMonsInfo;
+    const struct WildPokemonInfo *waterMonsInfo;
+
+    *isWaterMon = FALSE;
+    headerId = GetCurrentMapWildMonHeaderId();
+    if (headerId == 0xFFFF)
+        return SPECIES_NONE;
+    landMonsInfo = gWildMonHeaders[headerId].landMonsInfo;
+    waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
+    // Neither
+    if (landMonsInfo == NULL && waterMonsInfo == NULL)
+        return SPECIES_NONE;
+    // Land Pokemon
+    if (landMonsInfo != NULL && waterMonsInfo == NULL)
+        return landMonsInfo->wildPokemon[ChooseWildMonIndex_Land()].species;
+    // Water Pokemon
+    if (landMonsInfo == NULL && waterMonsInfo != NULL)
+    {
+        *isWaterMon = TRUE;
+        return waterMonsInfo->wildPokemon[ChooseWildMonIndex_WaterRock()].species;
+    }
+    // Either land or water Pokemon
+    if ((Random() % 100) < 80)
+    {
+        return landMonsInfo->wildPokemon[ChooseWildMonIndex_Land()].species;
+    }
+    else
+    {
+        *isWaterMon = TRUE;
+        return waterMonsInfo->wildPokemon[ChooseWildMonIndex_WaterRock()].species;
+    }
+}
+
+u16 GetLocalWaterMon(void)
+{
+    u16 headerId = GetCurrentMapWildMonHeaderId();
+
+    if (headerId != 0xFFFF)
+    {
+        const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
+
+        if (waterMonsInfo)
+            return waterMonsInfo->wildPokemon[ChooseWildMonIndex_WaterRock()].species;
+    }
+    return SPECIES_NONE;
+}
+
+bool8 UpdateRepelCounter(void)
+{
+    u16 steps;
+
+    if (InBattlePike() || InBattlePyramid())
+        return FALSE;
+    if (InUnionRoom() == TRUE)
+        return FALSE;
+
+    steps = VarGet(VAR_REPEL_STEP_COUNT);
+
+    if (steps != 0)
+    {
+        steps--;
+        VarSet(VAR_REPEL_STEP_COUNT, steps);
+        if (steps == 0)
+        {
+            ScriptContext1_SetupScript(EventScript_RepelWoreOff);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static bool8 IsWildLevelAllowedByRepel(u8 wildLevel)
+{
+    u8 i;
+
+    if (!VarGet(VAR_REPEL_STEP_COUNT))
+        return TRUE;
+
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_HP) && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
+        {
+            u8 ourLevel = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
+
+            if (wildLevel < ourLevel)
+                return FALSE;
+            else
+                return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+static bool8 IsAbilityAllowingEncounter(u8 level)
+{
+    u8 ability;
+
+    if (GetMonData(&gPlayerParty[0], MON_DATA_SANITY_BIT3))
+        return TRUE;
+
+    ability = GetMonAbility(&gPlayerParty[0]);
+    if (ability == ABILITY_KEEN_EYE || ability == ABILITY_INTIMIDATE)
+    {
+        u8 playerMonLevel = GetMonData(&gPlayerParty[0], MON_DATA_LEVEL);
+        if (playerMonLevel > 5 && level <= playerMonLevel - 5 && !(Random() % 2))
+            return FALSE;
+    }
+
+    return TRUE;
+}
+
+static bool8 TryGetRandomWildMonIndexByType(const struct WildPokemon *wildMon, u8 type, u8 numMon, u8 *monIndex)
+{
+    u8 validIndexes[numMon]; // variable length array, an interesting feature
+    u8 i, validMonCount;
+
+    for (i = 0; i < numMon; i++)
+        validIndexes[i] = 0;
+
+    for (validMonCount = 0, i = 0; i < numMon; i++)
+    {
+        if (gBaseStats[wildMon[i].species].type1 == type || gBaseStats[wildMon[i].species].type2 == type)
+            validIndexes[validMonCount++] = i;
+    }
+
+    if (validMonCount == 0 || validMonCount == numMon)
+        return FALSE;
+
+    *monIndex = validIndexes[Random() % validMonCount];
+    return TRUE;
+}
+
+static bool8 TryGetAbilityInfluencedWildMonIndex(const struct WildPokemon *wildMon, u8 type, u8 ability, u8 *monIndex)
+{
+    if (GetMonData(&gPlayerParty[0], MON_DATA_SANITY_BIT3))
+        return FALSE;
+    if (GetMonAbility(&gPlayerParty[0]) != ability)
+        return FALSE;
+    if (Random() % 2 != 0)
+        return FALSE;
+
+    return TryGetRandomWildMonIndexByType(wildMon, type, LAND_WILD_COUNT, monIndex);
+}
+
+static void ApplyFluteEncounterRateMod(u32 *encRate)
+{
+    if (FlagGet(FLAG_SYS_ENC_UP_ITEM) == TRUE)
+        *encRate += *encRate / 2;
+    else if (FlagGet(FLAG_SYS_ENC_DOWN_ITEM) == TRUE)
+        *encRate = *encRate / 2;
+}
+
+static void ApplyCleanseTagEncounterRateMod(u32 *encRate)
+{
+    if (GetMonData(&gPlayerParty[0], MON_DATA_HELD_ITEM) == ITEM_CLEANSE_TAG)
+        *encRate = *encRate * 2 / 3;
+}
-- 
cgit v1.2.3


From ca43536242e66ed2d6ccee98215fbf4a59debd7a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 17 Nov 2017 22:33:36 +0100
Subject: make recorded battle compile

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

(limited to 'src')

diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index d7ef254a1..e843ff7cb 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -226,7 +226,7 @@ u8 RecordedBattle_ReadBankAction(u8 bank)
     // trying to read past array or invalid action byte, battle is over
     if (sRecordedBytesNo[bank] >= BANK_RECORD_SIZE || sBattleRecords[bank][sRecordedBytesNo[bank]] == 0xFF)
     {
-        gScriptResult = gBattleOutcome = BATTLE_PLAYER_TELEPORTED; // hah
+        gSpecialVar_Result = gBattleOutcome = BATTLE_PLAYER_TELEPORTED; // hah
         ResetPaletteFadeControl();
         BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
         SetMainCallback2(CB2_QuitRecordedBattle);
-- 
cgit v1.2.3


From f8b40754c70679bb3ec4c0611613a0658f679225 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 18 Nov 2017 12:27:10 +0100
Subject: wild encounter done

---
 src/wild_encounter.c | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index d92f9daf3..b4095aa17 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -23,11 +23,6 @@ extern const u8 EventScript_RepelWoreOff[];
 
 #define NUM_FEEBAS_SPOTS    6
 
-#define LAND_WILD_COUNT     12
-#define WATER_WILD_COUNT    5
-#define ROCK_WILD_COUNT     5
-#define FISH_WILD_COUNT     10
-
 extern const u16 gRoute119WaterTileData[];
 extern const struct WildPokemonHeader gBattlePikeWildMonHeaders[];
 extern const struct WildPokemonHeader gBattlePyramidWildMonHeaders[];
@@ -56,7 +51,7 @@ void DisableWildEncounters(bool8 disabled)
     sWildEncountersDisabled = disabled;
 }
 
-u16 GetRoute119WaterTileNum(s16 x, s16 y, u8 section)
+static u16 GetRoute119WaterTileNum(s16 x, s16 y, u8 section)
 {
     u16 xCur;
     u16 yCur;
@@ -80,7 +75,7 @@ u16 GetRoute119WaterTileNum(s16 x, s16 y, u8 section)
     return tileNum + 1;
 }
 
-bool8 CheckFeebas(void)
+static bool8 CheckFeebas(void)
 {
     u8 i;
     u16 feebasSpots[NUM_FEEBAS_SPOTS];
@@ -144,7 +139,7 @@ static void FeebasSeedRng(u16 seed)
     sFeebasRngValue = seed;
 }
 
-u8 ChooseWildMonIndex_Land(void)
+static u8 ChooseWildMonIndex_Land(void)
 {
     u8 rand = Random() % 100;
 
@@ -174,7 +169,7 @@ u8 ChooseWildMonIndex_Land(void)
         return 11;
 }
 
-u8 ChooseWildMonIndex_WaterRock(void)
+static u8 ChooseWildMonIndex_WaterRock(void)
 {
     u8 rand = Random() % 100;
 
@@ -197,7 +192,7 @@ enum
     SUPER_ROD
 };
 
-u8 ChooseWildMonIndex_Fishing(u8 rod)
+static u8 ChooseWildMonIndex_Fishing(u8 rod)
 {
     u8 wildMonIndex = 0;
     u8 rand = Random() % 100;
@@ -234,7 +229,7 @@ u8 ChooseWildMonIndex_Fishing(u8 rod)
     return wildMonIndex;
 }
 
-u8 ChooseWildMonLevel(const struct WildPokemon *wildPokemon)
+static u8 ChooseWildMonLevel(const struct WildPokemon *wildPokemon)
 {
     u8 min;
     u8 max;
@@ -272,7 +267,7 @@ u8 ChooseWildMonLevel(const struct WildPokemon *wildPokemon)
     return min + rand;
 }
 
-u16 GetCurrentMapWildMonHeaderId(void)
+static u16 GetCurrentMapWildMonHeaderId(void)
 {
     u16 i;
 
@@ -302,7 +297,7 @@ u16 GetCurrentMapWildMonHeaderId(void)
     return -1;
 }
 
-u8 PickWildMonNature(void)
+static u8 PickWildMonNature(void)
 {
     u8 i;
     u8 j;
@@ -348,7 +343,7 @@ u8 PickWildMonNature(void)
     return Random() % 25;
 }
 
-void CreateWildMon(u16 species, u8 level)
+static void CreateWildMon(u16 species, u8 level)
 {
     bool32 checkCuteCharm;
 
@@ -397,7 +392,7 @@ enum
 #define WILD_CHECK_REPEL    0x1
 #define WILD_CHECK_KEEN_EYE 0x2
 
-bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 area, u8 flags)
+static bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 area, u8 flags)
 {
     u8 wildMonIndex = 0;
     u8 level;
@@ -433,7 +428,7 @@ bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 area, u8
     return TRUE;
 }
 
-u16 GenerateFishingWildMon(const struct WildPokemonInfo *wildMonInfo, u8 rod)
+static u16 GenerateFishingWildMon(const struct WildPokemonInfo *wildMonInfo, u8 rod)
 {
     u8 wildMonIndex = ChooseWildMonIndex_Fishing(rod);
     u8 level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]);
@@ -442,7 +437,7 @@ u16 GenerateFishingWildMon(const struct WildPokemonInfo *wildMonInfo, u8 rod)
     return wildMonInfo->wildPokemon[wildMonIndex].species;
 }
 
-bool8 SetUpMassOutbreakEncounter(u8 flags)
+static bool8 SetUpMassOutbreakEncounter(u8 flags)
 {
     u16 i;
 
@@ -456,7 +451,7 @@ bool8 SetUpMassOutbreakEncounter(u8 flags)
     return TRUE;
 }
 
-bool8 DoMassOutbreakEncounterTest(void)
+static bool8 DoMassOutbreakEncounterTest(void)
 {
     if (gSaveBlock1Ptr->outbreakPokemonSpecies != 0
      && gSaveBlock1Ptr->location.mapNum == gSaveBlock1Ptr->outbreakLocationMapNum
@@ -468,7 +463,7 @@ bool8 DoMassOutbreakEncounterTest(void)
     return FALSE;
 }
 
-bool8 DoWildEncounterRateDiceRoll(u16 encounterRate)
+static bool8 DoWildEncounterRateDiceRoll(u16 encounterRate)
 {
     if (Random() % 2880 < encounterRate)
         return TRUE;
@@ -476,7 +471,7 @@ bool8 DoWildEncounterRateDiceRoll(u16 encounterRate)
         return FALSE;
 }
 
-bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
+static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
 {
     encounterRate *= 16;
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
@@ -505,7 +500,7 @@ bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
     return DoWildEncounterRateDiceRoll(encounterRate);
 }
 
-bool8 DoGlobalWildEncounterDiceRoll(void)
+static bool8 DoGlobalWildEncounterDiceRoll(void)
 {
     if (Random() % 100 >= 60)
         return FALSE;
@@ -513,7 +508,7 @@ bool8 DoGlobalWildEncounterDiceRoll(void)
         return TRUE;
 }
 
-bool8 AreLegendariesInSootopolisPreventingEncounters(void)
+static bool8 AreLegendariesInSootopolisPreventingEncounters(void)
 {
     if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP_SOOTOPOLIS_CITY
         || gSaveBlock1Ptr->location.mapNum != MAP_ID_SOOTOPOLIS_CITY)
-- 
cgit v1.2.3


From 8fd30813062f9588529461f44df333a6bcfde411 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 18 Nov 2017 16:11:34 +0100
Subject: start working on berry blender

---
 src/battle_message.c |   4 +-
 src/berry.c          |  22 +-
 src/berry_blender.c  | 947 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/decompress.c     |   5 +-
 src/m4a_4.c          |   4 +-
 5 files changed, 950 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/battle_message.c b/src/battle_message.c
index 4bd6ca5b7..1f39d5397 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -59,7 +59,7 @@ extern const u8* GetTrainer2LoseText(void); // battle_setup
 extern void GetFrontierTrainerName(u8 *dst, u16 trainerId);
 extern s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, const u8 *str, s32 totalWidth, s16 letterSpacing);
 extern u8 sub_8185FC4(void);
-extern u8 sav2_get_text_speed(void);
+extern u8 GetPlayerTextSpeed(void);
 
 // this file's functions
 static void sub_814F8F8(u8 *textPtr);
@@ -2266,7 +2266,7 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1)
         else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
             speed = sRecordedBattleTextSpeeds[sub_8185FC4()];
         else
-            speed = sav2_get_text_speed();
+            speed = GetPlayerTextSpeed();
 
         gTextFlags.flag_0 = 1;
     }
diff --git a/src/berry.c b/src/berry.c
index 6d1fd17a1..0c1553463 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -18,12 +18,6 @@ extern u16 gSpecialVar_ItemId;
 
 extern const u8 BerryTreeScript[];
 
-#define BERRY_NAME_LENGTH 6
-
-#define FIRST_BERRY ITEM_CHERI_BERRY
-#define LAST_BERRY ITEM_ENIGMA_BERRY
-
-
 static const u8 sBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers.");
 static const u8 sBerryDescriptionPart2_Cheri[] = _("The bright red BERRY is very spicy.");
 static const u8 sBerryDescriptionPart1_Chesto[] = _("The BERRY’s thick skin and fruit are");
@@ -1062,28 +1056,28 @@ u8 GetStageByBerryTreeId(u8 id)
 
 u8 ItemIdToBerryType(u16 item)
 {
-    u16 berry = item - FIRST_BERRY;
+    u16 berry = item - FIRST_BERRY_INDEX;
 
-    if (berry > LAST_BERRY - FIRST_BERRY)
+    if (berry > LAST_BERRY_INDEX - FIRST_BERRY_INDEX)
         return 1;
     else
-        return item - FIRST_BERRY + 1;
+        return ITEM_TO_BERRY(item);
 }
 
 u16 BerryTypeToItemId(u16 berry)
 {
     u16 item = berry - 1;
 
-    if (item > LAST_BERRY - FIRST_BERRY)
-        return FIRST_BERRY;
+    if (item > LAST_BERRY_INDEX - FIRST_BERRY_INDEX)
+        return FIRST_BERRY_INDEX;
     else
-        return berry + FIRST_BERRY - 1;
+        return berry + FIRST_BERRY_INDEX - 1;
 }
 
 void GetBerryNameByBerryType(u8 berry, u8 *string)
 {
-    memcpy(string, GetBerryInfo(berry)->name, BERRY_NAME_LENGTH);
-    string[BERRY_NAME_LENGTH] = EOS;
+    memcpy(string, GetBerryInfo(berry)->name, BERRY_NAME_COUNT - 1);
+    string[BERRY_NAME_COUNT - 1] = EOS;
 }
 
 void GetBerryCountStringByBerryType(u8 berry, u8* dest, u32 berryCount)
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 8e5a51845..f626fef91 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -3,15 +3,370 @@
 #include "window.h"
 #include "task.h"
 #include "sprite.h"
+#include "sound.h"
+#include "songs.h"
+#include "m4a.h"
+#include "bg.h"
+#include "palette.h"
+#include "decompress.h"
+#include "malloc.h"
+#include "gpu_regs.h"
+#include "text.h"
+#include "event_data.h"
+#include "main.h"
+#include "link.h"
+#include "new_menu_helpers.h"
+#include "item_menu_icons.h"
+#include "berry.h"
+#include "items.h"
+#include "string_util.h"
 
 // Static type declarations
+#define BLENDER_SCORE_BEST      0
+#define BLENDER_SCORE_GOOD      1
+#define BLENDER_SCORE_MISS      2
 
-// Static RAM declarations
-IWRAM_DATA void *berry_blender_c_unused_03000de4;
-IWRAM_DATA s16 gUnknown_03000DE8[8];
-IWRAM_DATA s16 gUnknown_03000DF8[6];
-IWRAM_DATA s16 gUnknown_03000E04;
-IWRAM_DATA s16 gUnknown_03000E06;
+#define BLENDER_MAX_PLAYERS     4
+#define BLENDER_SCORES_NO       3
+
+struct BlenderBerry
+{
+    u16 itemId;
+    u8 name[BERRY_NAME_COUNT];
+    u8 flavours[FLAVOUR_COUNT];
+    u8 smoothness;
+};
+
+struct BerryBlenderData
+{
+    u8 mainState;
+    u8 loadGfxState;
+    u8 field_02;
+    u8 field_03;
+    u8 field_04;
+    u8 field_05;
+    u8 field_06;
+    u8 field_07;
+    u8 field_08;
+    u8 field_09;
+    u8 field_0A;
+    u8 field_0B;
+    u8 field_0C;
+    u8 field_0D;
+    u8 field_0E;
+    u8 field_0F;
+
+    u8 field_10;
+    u8 field_11;
+    u8 field_12;
+    u8 field_13;
+    u8 field_14;
+    u8 field_15;
+    u8 field_16;
+    u8 field_17;
+    u8 field_18;
+    u8 field_19;
+    u8 field_1A;
+    u8 field_1B;
+    u8 field_1C;
+    u8 field_1D;
+    u8 field_1E;
+    u8 field_1F;
+
+    u8 field_20;
+    u8 field_21;
+    u8 field_22;
+    u8 field_23;
+    u8 field_24;
+    u8 field_25;
+    u8 field_26;
+    u8 field_27;
+    u8 field_28;
+    u8 field_29;
+    u8 field_2A;
+    u8 field_2B;
+    u8 field_2C;
+    u8 field_2D;
+    u8 field_2E;
+    u8 field_2F;
+
+    u8 field_30;
+    u8 field_31;
+    u8 field_32;
+    u8 field_33;
+    u8 field_34;
+    u8 field_35;
+    u8 field_36;
+    u8 field_37;
+    u8 field_38;
+    u8 field_39;
+    u8 field_3A;
+    u8 field_3B;
+    u8 field_3C;
+    u8 field_3D;
+    u8 field_3E;
+    u8 field_3F;
+
+    u8 field_40;
+    u8 field_41;
+    u8 field_42;
+    u8 field_43;
+    u8 field_44;
+    u8 field_45;
+    u8 field_46;
+    u8 field_47;
+    u8 field_48;
+    u8 field_49;
+    u16 arrowPos;
+    s16 field_4C;
+    s16 field_4E;
+
+    u8 syncArrowSpriteIds[BLENDER_MAX_PLAYERS];
+    u8 syncArrowSprite2Ids[BLENDER_MAX_PLAYERS];
+    u8 field_58;
+    u8 field_59;
+    u8 field_5A;
+    u8 field_5B;
+    u8 field_5C;
+    u8 field_5D;
+    u8 field_5E;
+    u8 field_5F;
+
+    u8 field_60;
+    u8 field_61;
+    u8 field_62;
+    u8 field_63;
+    u16 field_64[BLENDER_MAX_PLAYERS];
+    u8 field_6C;
+    u8 field_6D;
+    u8 field_6E;
+    u8 field_6F;
+
+    u16 field_70;
+    u8 field_72;
+    u8 field_73;
+    u16 chosenItemId[BLENDER_MAX_PLAYERS];
+    u8 playersNo;
+    u8 field_7D;
+    u8 field_7E;
+    u8 field_7F;
+
+    u8 field_80;
+    u8 field_81;
+    u8 field_82;
+    u8 field_83;
+    u8 field_84;
+    u8 field_85;
+    u8 field_86;
+    u8 field_87;
+    u8 field_88;
+    u8 field_89;
+    u8 field_8A;
+    u8 field_8B;
+    u8 field_8C;
+    u8 field_8D;
+    u8 field_8E;
+    u8 field_8F;
+
+    u8 field_90;
+    u8 field_91;
+    u8 field_92;
+    u8 field_93;
+    u8 field_94;
+    u8 field_95;
+    u8 field_96;
+    u8 field_97;
+    u8 field_98;
+    u8 field_99;
+    u8 field_9A;
+    u8 field_9B;
+    u8 field_9C;
+    u8 field_9D;
+    u8 field_9E;
+    u8 field_9F;
+
+    u8 field_A0;
+    u8 field_A1;
+    u8 field_A2;
+    u8 field_A3;
+    u8 field_A4;
+    u8 field_A5;
+    u8 field_A6;
+    u8 field_A7;
+    u8 field_A8;
+    u8 field_A9;
+    u8 field_AA;
+    u8 field_AB;
+    u8 field_AC;
+    u8 field_AD;
+    u8 field_AE;
+    u8 field_AF;
+
+    u8 field_B0;
+    u8 field_B1;
+    u8 field_B2;
+    u8 field_B3;
+    u8 field_B4;
+    u8 field_B5;
+    u8 field_B6;
+    u8 field_B7;
+    u8 field_B8;
+    u8 field_B9;
+    u8 field_BA;
+    u8 field_BB;
+    u8 field_BC;
+    u8 field_BD;
+    u8 field_BE;
+    u8 field_BF;
+
+    u8 field_C0;
+    u8 field_C1;
+    u8 field_C2;
+    u8 field_C3;
+    u8 field_C4;
+    u8 field_C5;
+    u8 field_C6;
+    u8 field_C7;
+    u8 field_C8;
+    u8 field_C9;
+    u8 field_CA;
+    u8 field_CB;
+    u8 field_CC;
+    u8 field_CD;
+    u8 field_CE;
+    u8 field_CF;
+
+    u8 field_D0;
+    u8 field_D1;
+    u8 field_D2;
+    u8 field_D3;
+    u8 field_D4;
+    u8 field_D5;
+    u8 field_D6;
+    u8 field_D7;
+    u8 field_D8;
+    u8 field_D9;
+    u8 field_DA;
+    u8 field_DB;
+    u8 field_DC;
+    u8 field_DD;
+    u8 field_DE;
+    u8 field_DF;
+
+    u8 field_E0;
+    u8 field_E1;
+    u8 field_E2;
+    u8 field_E3;
+    u8 field_E4;
+    u8 field_E5;
+    u8 field_E6;
+    u8 field_E7;
+    u8 field_E8;
+    u8 field_E9;
+    u8 field_EA;
+    u8 field_EB;
+    u8 field_EC;
+    u8 field_ED;
+    u8 field_EE;
+    u8 field_EF;
+
+    u8 field_F0;
+    u8 field_F1;
+    u8 field_F2;
+    u8 field_F3;
+    u8 field_F4;
+    u8 field_F5;
+    u8 field_F6;
+    u8 field_F7;
+    u8 field_F8;
+    u8 field_F9;
+    u8 field_FA;
+    u8 field_FB;
+    u8 field_FC;
+    u8 field_FD;
+    u8 field_FE;
+    u8 field_FF;
+
+    u8 field_100;
+    u8 field_101;
+    u8 field_102;
+    u8 field_103;
+    u32 gameFrameTime;
+    s32 framesToWait;
+    u32 field_10C;
+
+    u8 field_110;
+    u8 field_111;
+    u8 field_112;
+    u8 field_113;
+    u8 field_114;
+    u8 field_115;
+    u16 field_116;
+    u16 field_118;
+    u16 field_11A;
+    s16 field_11C;
+    s16 field_11E;
+
+    u8 field_120;
+    u8 field_121;
+    u8 field_122;
+    u8 field_123;
+    u16 scores[BLENDER_MAX_PLAYERS][BLENDER_SCORES_NO];
+    u8 field_13C;
+    u8 field_13D;
+    u8 field_13E;
+    u8 field_13F;
+
+    struct BgAffineSrcData bgAffineSrc;
+
+    u16 field_154;
+    u8 field_156;
+    u8 field_157;
+    struct BlenderBerry blendedBerries[BLENDER_MAX_PLAYERS];
+    u8 field_198;
+    u8 field_199;
+    u8 field_19A;
+    u8 field_19B;
+    u8 field_19C;
+    u8 field_19D;
+    u8 field_19E;
+    u8 field_19F;
+
+    u8 field_1A0;
+    u8 field_1A1;
+    u8 field_1A2;
+    u8 field_1A3;
+    u8 field_1A4;
+    u8 field_1A5;
+    u8 field_1A6;
+    u8 field_1A7;
+    u8 field_1A8;
+    u8 field_1A9;
+    u8 field_1AA;
+    u8 field_1AB;
+    u8 field_1AC;
+    u8 field_1AD;
+    u8 field_1AE;
+    u8 field_1AF;
+
+    u8 field_1B0;
+    u8 field_1B1;
+    u8 field_1B2;
+    u8 field_1B3;
+    u8 field_1B4;
+    u8 field_1B5;
+    u8 field_1B6;
+    u8 field_1B7;
+    u8 tilemapBuffers[2][0x800];
+    s16 textState;
+    void *tilesBuffer;
+    u8 field_11C0[0x20];
+};
+
+extern struct MusicPlayerInfo gMPlay_SE2;
+extern struct MusicPlayerInfo gMPlay_BGM;
+extern u16 gSpecialVar_ItemId;
+extern u8 gInGameOpponentsNo;
 
 // graphics
 extern const u8 gBerryBlenderArrowTiles[];
@@ -22,6 +377,20 @@ extern const u8 gBerryBlenderCountdownNumbersTiles[];
 extern const u16 gBerryBlenderMiscPalette[];
 extern const u16 gBerryBlenderArrowPalette[];
 
+// text
+extern const u8 gText_BerryBlenderStart[];
+
+extern void sub_81978B0(u16);
+extern void sub_800A418(void);
+extern u8 sub_800A9D8(void);
+extern bool8 sub_800A4D8(u8);
+extern void sub_8197DF8(u8 windowId, bool8 copyToVram);
+extern void sub_809882C(u8, u16, u8);
+extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8);
+extern void sub_81AABF0(void (*callback)(void));
+
+// this file's functions
+void BerryBlender_SetGpuRegs(void);
 void sub_8080EA4(u8 taskId);
 void sub_8080FD0(u8 taskId);
 void sub_80810F8(u8 taskId);
@@ -29,8 +398,30 @@ void sub_80833F8(struct Sprite *sprite);
 void sub_8082F68(struct Sprite *sprite);
 void sub_8083010(struct Sprite *sprite);
 void sub_80830C0(struct Sprite *sprite);
+void Blender_SetPlayerNamesLocal(u8 opponentsNum);
+void sub_807FAC8(void);
+void sub_8082D28(void);
+bool32 Blender_PrintText(s16 *textState, const u8 *string, u8 textSpeed);
+void sub_807FFA4(void);
+void sub_8080018(void);
+void sub_80808D4(void);
+void Blender_DummiedOutFunc(s16 a0, s16 a1);
+void sub_8081898(void);
+void sub_8082CB4(struct BgAffineSrcData *bgAffineSrc);
+bool8 sub_8083380(void);
+void sub_808074C(void);
+void sub_80807BC(void);
+void sub_8080588(void);
+
+extern struct BerryBlenderData *sBerryBlenderData;
+
+// Static RAM declarations
+IWRAM_DATA void *berry_blender_c_unused_03000de4;
+IWRAM_DATA s16 gUnknown_03000DE8[8];
+IWRAM_DATA s16 gUnknown_03000DF8[6];
+IWRAM_DATA s16 gUnknown_03000E04;
+IWRAM_DATA s16 gUnknown_03000E06;
 
-// .rodata
 // TODO: make those static once the file is decompiled
 const u16 sBlenderCenterPal[] = INCBIN_U16("graphics/berry_blender/center.gbapal");
 const u8 sBlenderCenterMap[] = INCBIN_U8("graphics/berry_blender/center_map.bin");
@@ -67,6 +458,16 @@ const u8* const sBlenderOpponentsNames[] =
     sText_Miss
 };
 
+enum
+{
+    BLENDER_MISTER,
+    BLENDER_LADDIE,
+    BLENDER_LASSIE,
+    BLENDER_MASTER,
+    BLENDER_DUDE,
+    BLENDER_MISS
+};
+
 static const u8 sText_PressAToStart[] = _("Press the A Button to start.");
 static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while.");
 const u8 sText_CommunicationStandby[] = _("Communication standby…");
@@ -91,7 +492,7 @@ const u8 sText_TheLevelIs[] = _("The level is ");
 const u8 sText_TheFeelIs[] = _(", and the feel is ");
 const u8 sText_Dot2[] = _(".");
 
-const struct BgTemplate gUnknown_08339974[3] =
+const struct BgTemplate sBerryBlenderBgTemplates[3] =
 {
     {
         .bg = 0,
@@ -122,7 +523,7 @@ const struct BgTemplate gUnknown_08339974[3] =
     }
 };
 
-const struct WindowTemplate gUnknown_08339980[] =
+static const struct WindowTemplate sBerryBlender_WindowTemplates[] =
 {
     {0, 1, 6, 7, 2, 0xE, 0x28},
     {0, 0x16, 6, 7, 2, 0xE, 0x36},
@@ -143,7 +544,7 @@ const s8 gUnknown_083399C0[][2] =
     {-1, -1}, {1, -1}, {-1, 1}, {1, 1}
 };
 
-const u8 sBlenderSyncArrowsPos[][2] =
+const u8 sBlenderSyncArrowsPos[BLENDER_MAX_PLAYERS][2] =
 {
     {72, 32}, {168, 32}, {72, 128}, {168, 128}
 };
@@ -594,4 +995,528 @@ static const u8 gUnknown_08339CD2[] =
 
 const struct WindowTemplate gUnknown_08339D14[] = {0, 6, 4, 0x12, 0xB, 0xF, 8};
 
-// .text
+// code
+
+void Blender_ControlHitPitch(void)
+{
+    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, 2 * (sBerryBlenderData->field_4C - 128));
+}
+
+void VBlankCB0_BerryBlender(void)
+{
+    BerryBlender_SetGpuRegs();
+    SetBgAffine(2, sBerryBlenderData->bgAffineSrc.texX, sBerryBlenderData->bgAffineSrc.texY,
+                sBerryBlenderData->bgAffineSrc.scrX, sBerryBlenderData->bgAffineSrc.scrY,
+                sBerryBlenderData->bgAffineSrc.sx, sBerryBlenderData->bgAffineSrc.sy,
+                sBerryBlenderData->bgAffineSrc.alpha);
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+extern const u8 sBlenderCenterGfx[];
+extern const u8 gUnknown_08D91DB8[];
+extern const u8 gUnknown_08D927EC[];
+
+bool8 LoadBerryBlenderGfx(void)
+{
+    switch (sBerryBlenderData->loadGfxState)
+    {
+    case 0:
+        sBerryBlenderData->tilesBuffer = AllocZeroed(sub_8034974(sBlenderCenterGfx) + 100);
+        LZDecompressWram(sBlenderCenterGfx, sBerryBlenderData->tilesBuffer);
+        sBerryBlenderData->loadGfxState++;
+        break;
+    case 1:
+        CopyToBgTilemapBuffer(2, sBlenderCenterMap, 0x400, 0);
+        CopyBgTilemapBufferToVram(2);
+        LoadPalette(sBlenderCenterPal, 0, 0x100);
+        sBerryBlenderData->loadGfxState++;
+        break;
+    case 2:
+        LoadBgTiles(2, sBerryBlenderData->tilesBuffer, sub_8034974(sBlenderCenterGfx), 0);
+        sBerryBlenderData->loadGfxState++;
+        break;
+    case 3:
+        LZDecompressWram(gUnknown_08D91DB8, sBerryBlenderData->tilesBuffer);
+        sBerryBlenderData->loadGfxState++;
+        break;
+    case 4:
+        LoadBgTiles(1, sBerryBlenderData->tilesBuffer, sub_8034974(gUnknown_08D91DB8), 0);
+        sBerryBlenderData->loadGfxState++;
+        break;
+    case 5:
+        LZDecompressWram(gUnknown_08D927EC, sBerryBlenderData->tilesBuffer);
+        sBerryBlenderData->loadGfxState++;
+        break;
+    case 6:
+        CopyToBgTilemapBuffer(1, sBerryBlenderData->tilesBuffer, sub_8034974(gUnknown_08D927EC), 0);
+        CopyBgTilemapBufferToVram(1);
+        sBerryBlenderData->loadGfxState++;
+        break;
+    case 7:
+        LoadPalette(sBlenderOuterPal, 0x80, 0x20);
+        sBerryBlenderData->loadGfxState++;
+        break;
+    case 8:
+        LoadSpriteSheet(&sSpriteSheet_BlenderArrow);
+        LoadSpriteSheet(&gUnknown_08339BD8);
+        LoadSpriteSheet(&gUnknown_08339B38);
+        sBerryBlenderData->loadGfxState++;
+        break;
+    case 9:
+        LoadSpriteSheet(&gUnknown_08339C24);
+        LoadSpriteSheet(&gUnknown_08339C58);
+        LoadSpritePalette(&sSpritePal_BlenderArrow);
+        LoadSpritePalette(&sSpritePal_BlenderMisc);
+        Free(sBerryBlenderData->tilesBuffer);
+        sBerryBlenderData->loadGfxState = 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+void sub_807F9D0(void)
+{
+    FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
+    CopyBgTilemapBufferToVram(0);
+    ShowBg(0);
+    ShowBg(1);
+    SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    ChangeBgX(1, 0, 0);
+    ChangeBgY(1, 0, 0);
+}
+
+void InitBerryBlenderWindows(void)
+{
+    if (InitWindows(sBerryBlender_WindowTemplates))
+    {
+        s32 i;
+
+        DeactivateAllTextPrinters();
+        for (i = 0; i < 5; i++)
+            FillWindowPixelBuffer(i, 0);
+
+        FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
+        sub_81978B0(0xE0);
+    }
+}
+
+void DoBerryBlending(void)
+{
+    if (sBerryBlenderData == NULL)
+        sBerryBlenderData = AllocZeroed(sizeof(*sBerryBlenderData));
+
+    sBerryBlenderData->field_63 = 0;
+    sBerryBlenderData->mainState = 0;
+    sBerryBlenderData->field_63 = 0;
+
+    Blender_SetPlayerNamesLocal(gSpecialVar_0x8004);
+    SetMainCallback2(sub_807FAC8);
+}
+
+void sub_807FAC8(void)
+{
+    s32 i;
+
+    switch (sBerryBlenderData->mainState)
+    {
+    case 0:
+        SetGpuReg(REG_OFFSET_DISPCNT, 0);
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        SetVBlankCallback(NULL);
+        ResetBgsAndClearDma3BusyFlags(0);
+        InitBgsFromTemplates(1, sBerryBlenderBgTemplates, ARRAY_COUNT(sBerryBlenderBgTemplates));
+        SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]);
+        SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]);
+        sub_809882C(0, 1, 0xD0);
+        copy_textbox_border_tile_patterns_to_vram(0, 0x14, 0xF0);
+        InitBerryBlenderWindows();
+
+        sBerryBlenderData->mainState++;
+        sBerryBlenderData->field_118 = 0;
+        sBerryBlenderData->field_116 = 0;
+        sBerryBlenderData->field_11A = 0x50;
+        sBerryBlenderData->field_11C = 0;
+        sBerryBlenderData->field_11E = 0;
+        sBerryBlenderData->loadGfxState = 0;
+
+        sub_8082D28();
+        break;
+    case 1:
+        if (LoadBerryBlenderGfx())
+        {
+            for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+            {
+                sBerryBlenderData->syncArrowSpriteIds[i] = CreateSprite(&sBlenderSyncArrow_SpriteTemplate, sBlenderSyncArrowsPos[i][0], sBlenderSyncArrowsPos[i][1], 1);
+                StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[i]], i + 8);
+            }
+            if (gReceivedRemoteLinkPlayers != 0 && gLinkVSyncDisabled)
+            {
+                sub_800E0E8();
+                sub_800DFB4(0, 0);
+            }
+            SetVBlankCallback(VBlankCB0_BerryBlender);
+            sBerryBlenderData->mainState++;
+        }
+        break;
+    case 2:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        sub_8082D28();
+        sBerryBlenderData->mainState++;
+        break;
+    case 3:
+        sub_807F9D0();
+        if (!gPaletteFade.active)
+            sBerryBlenderData->mainState++;
+        break;
+    case 4:
+        if (Blender_PrintText(&sBerryBlenderData->textState, gText_BerryBlenderStart, GetPlayerTextSpeed()))
+            sBerryBlenderData->mainState++;
+        break;
+    case 5:
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        sBerryBlenderData->mainState++;
+        break;
+    case 6:
+        if (!gPaletteFade.active)
+        {
+            FreeAllWindowBuffers();
+            UnsetBgTilemapBuffer(2);
+            UnsetBgTilemapBuffer(1);
+            SetVBlankCallback(NULL);
+            sub_81AABF0(sub_807FFA4);
+
+            sBerryBlenderData->mainState = 0;
+        }
+        break;
+    }
+
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+void sub_807FD08(struct Sprite* sprite)
+{
+    sprite->data1 += sprite->data6;
+    sprite->data2 -= sprite->data4;
+    sprite->data2 += sprite->data7;
+    sprite->data0 += sprite->data7;
+    sprite->data4--;
+
+    if (sprite->data0 < sprite->data2)
+    {
+        sprite->data3 = sprite->data4 = sprite->data3 - 1;
+
+        if (++sprite->data5 > 3)
+            DestroySprite(sprite);
+        else
+            PlaySE(SE_TB_KARA);
+    }
+    sprite->pos1.x = sprite->data1;
+    sprite->pos1.y = sprite->data2;
+}
+
+void sub_807FD64(struct Sprite* sprite, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6)
+{
+    sprite->data0 = a3;
+    sprite->data1 = a2;
+    sprite->data2 = a3;
+    sprite->data3 = a4;
+    sprite->data4 = 10;
+    sprite->data5 = 0;
+    sprite->data6 = a5;
+    sprite->data7 = a6;
+    sprite->callback = sub_807FD08;
+}
+
+void sub_807FD90(u16 a0, u8 a1)
+{
+    u8 spriteId = sub_80D511C(a0 + 123, 0, 80, a1 & 1);
+    sub_807FD64(&gSprites[spriteId], gUnknown_08339C78[a1][0], gUnknown_08339C78[a1][1], gUnknown_08339C78[a1][2], gUnknown_08339C78[a1][3], gUnknown_08339C78[a1][4]);
+}
+
+void Blender_CopyBerryData(struct BlenderBerry* berry, u16 itemId)
+{
+    const struct Berry *berryInfo = GetBerryInfo(ITEM_TO_BERRY(itemId));
+
+    berry->itemId = itemId;
+    StringCopy(berry->name, berryInfo->name);
+    berry->flavours[FLAVOUR_SPICY] = berryInfo->spicy;
+    berry->flavours[FLAVOUR_DRY] = berryInfo->dry;
+    berry->flavours[FLAVOUR_SWEET] = berryInfo->sweet;
+    berry->flavours[FLAVOUR_BITTER] = berryInfo->bitter;
+    berry->flavours[FLAVOUR_SOUR] = berryInfo->sour;
+    berry->smoothness = berryInfo->smoothness;
+}
+
+void Blender_SetPlayerNamesLocal(u8 opponentsNum)
+{
+    switch (opponentsNum)
+    {
+    case 0:
+        gInGameOpponentsNo = 0;
+        break;
+    case 1:
+        gInGameOpponentsNo = 1;
+        sBerryBlenderData->playersNo = 2;
+        StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName);
+
+        if (!FlagGet(FLAG_340))
+            StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]);
+        else
+            StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]);
+
+        gLinkPlayers[0].language = GAME_LANGUAGE;
+        gLinkPlayers[1].language = GAME_LANGUAGE;
+        break;
+    case 2:
+        gInGameOpponentsNo = 2;
+        sBerryBlenderData->playersNo = 3;
+        StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName);
+        StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_DUDE]);
+        StringCopy(gLinkPlayers[2].name, sBlenderOpponentsNames[BLENDER_LASSIE]);
+
+        gLinkPlayers[0].language = GAME_LANGUAGE;
+        gLinkPlayers[1].language = GAME_LANGUAGE;
+        gLinkPlayers[2].language = GAME_LANGUAGE;
+        break;
+    case 3:
+        gInGameOpponentsNo = 3;
+        sBerryBlenderData->playersNo = 4;
+        StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName);
+        StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISS]);
+        StringCopy(gLinkPlayers[2].name, sBlenderOpponentsNames[BLENDER_LADDIE]);
+        StringCopy(gLinkPlayers[3].name, sBlenderOpponentsNames[BLENDER_LASSIE]);
+
+        gLinkPlayers[0].language = GAME_LANGUAGE;
+        gLinkPlayers[1].language = GAME_LANGUAGE;
+        gLinkPlayers[2].language = GAME_LANGUAGE;
+        gLinkPlayers[3].language = GAME_LANGUAGE;
+        break;
+    }
+}
+
+void sub_807FFA4(void)
+{
+    s32 i;
+
+    SetGpuReg(REG_OFFSET_DISPCNT, 0);
+    if (sBerryBlenderData == NULL)
+        sBerryBlenderData = AllocZeroed(sizeof(*sBerryBlenderData));
+
+    sBerryBlenderData->mainState = 0;
+    sBerryBlenderData->field_10C = 0;
+
+    for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+        sBerryBlenderData->chosenItemId[i] = ITEM_NONE;
+
+    Blender_SetPlayerNamesLocal(gSpecialVar_0x8004);
+
+    if (gSpecialVar_0x8004 == 0)
+        SetMainCallback2(sub_8080018);
+    else
+        SetMainCallback2(sub_80808D4);
+}
+
+void sub_8080018(void)
+{
+    s32 i, j;
+
+    switch (sBerryBlenderData->mainState)
+    {
+    case 0:
+        sub_8080588();
+        gLinkType = 0x4422;
+        sBerryBlenderData->field_72 = 0;
+        for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+        {
+            sBerryBlenderData->field_64[i] = 0;
+            for (j = 0; j < 3; j++)
+            {
+                sBerryBlenderData->scores[i][j] = 0;
+            }
+        }
+        sBerryBlenderData->field_70 = 0;
+        sBerryBlenderData->field_4E = 0;
+        sBerryBlenderData->loadGfxState = 0;
+        sBerryBlenderData->mainState++;
+        break;
+    case 1:
+        if (LoadBerryBlenderGfx())
+        {
+            sBerryBlenderData->mainState++;
+            sub_8082D28();
+        }
+        break;
+    case 2:
+        for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+        {
+            sBerryBlenderData->syncArrowSprite2Ids[i] = CreateSprite(&sBlenderSyncArrow_SpriteTemplate, sBlenderSyncArrowsPos[i][0], sBlenderSyncArrowsPos[i][1], 1);
+            StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSprite2Ids[i]], i + 8);
+        }
+        if (gReceivedRemoteLinkPlayers != 0 && gLinkVSyncDisabled)
+        {
+            sub_800E0E8();
+            sub_800DFB4(0, 0);
+        }
+        sBerryBlenderData->mainState++;
+        break;
+    case 3:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        sBerryBlenderData->mainState++;
+        break;
+    case 4:
+        sub_807F9D0();
+        if (!gPaletteFade.active)
+        {
+            sBerryBlenderData->mainState++;
+        }
+        break;
+    case 5:
+        Blender_PrintText(&sBerryBlenderData->textState, sText_CommunicationStandby, 0);
+        sBerryBlenderData->mainState = 8;
+        sBerryBlenderData->framesToWait = 0;
+        break;
+    case 8:
+        sBerryBlenderData->mainState++;
+        sBerryBlenderData->field_114 = 0;
+        Blender_CopyBerryData(&sBerryBlenderData->blendedBerries[0], gSpecialVar_ItemId);
+        memcpy(gBlockSendBuffer, &sBerryBlenderData->blendedBerries[0], sizeof(struct BlenderBerry));
+        sub_800ADF8();
+        sBerryBlenderData->framesToWait = 0;
+        break;
+    case 9:
+        if (sub_800A520())
+        {
+            ResetBlockReceivedFlags();
+            if (GetMultiplayerId() == 0)
+                sub_800A4D8(4);
+            sBerryBlenderData->mainState++;
+        }
+        break;
+    case 10:
+        if (++sBerryBlenderData->framesToWait > 20)
+        {
+            sub_8197DF8(4, TRUE);
+            if (GetBlockReceivedStatus() == sub_800A9D8())
+            {
+                for (i = 0; i < GetLinkPlayerCount(); i++)
+                {
+                    memcpy(&sBerryBlenderData->blendedBerries[i], &gBlockRecvBuffer[i][0], sizeof(struct BlenderBerry));
+                    sBerryBlenderData->chosenItemId[i] = sBerryBlenderData->blendedBerries[i].itemId;
+                }
+
+                ResetBlockReceivedFlags();
+                sBerryBlenderData->mainState++;
+            }
+        }
+        break;
+    case 11:
+        sBerryBlenderData->playersNo = GetLinkPlayerCount();
+
+        for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+        {
+            if (sBerryBlenderData->field_114 == gUnknown_083399D0[sBerryBlenderData->playersNo - 2][i])
+            {
+                sub_807FD90(sBerryBlenderData->chosenItemId[sBerryBlenderData->field_114], i);
+                break;
+            }
+        }
+
+        sBerryBlenderData->framesToWait = 0;
+        sBerryBlenderData->mainState++;
+        sBerryBlenderData->field_114++;
+        break;
+    case 12:
+        if (++sBerryBlenderData->framesToWait > 60)
+        {
+            if (sBerryBlenderData->field_114 >= sBerryBlenderData->playersNo)
+            {
+                sBerryBlenderData->mainState++;
+                sBerryBlenderData->arrowPos = gUnknown_083399DC[gUnknown_083399E4[sBerryBlenderData->playersNo - 2]] - 22528;
+            }
+            else
+            {
+                sBerryBlenderData->mainState--;
+            }
+            sBerryBlenderData->framesToWait = 0;
+        }
+        break;
+    case 13:
+        if (sub_800A520())
+        {
+            sBerryBlenderData->mainState++;
+            sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
+            PlaySE(SE_RU_HYUU);
+            ShowBg(2);
+        }
+        break;
+    case 14:
+        SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
+        sBerryBlenderData->arrowPos += 0x200;
+        sBerryBlenderData->field_11A += 4;
+        if (sBerryBlenderData->field_11A > 255)
+        {
+            SetGpuRegBits(REG_OFFSET_BG2CNT, 2);
+            sBerryBlenderData->mainState++;
+            sBerryBlenderData->field_11A = 256;
+            sBerryBlenderData->arrowPos = gUnknown_083399DC[gUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
+            sBerryBlenderData->framesToWait = 0;
+            PlaySE(SE_TRACK_DOOR);
+            sub_808074C();
+            sub_80807BC();
+        }
+        sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
+        break;
+    case 15:
+        if (sub_8083380())
+        {
+            sBerryBlenderData->framesToWait = 0;
+            sBerryBlenderData->mainState++;
+        }
+        sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
+        break;
+    case 16:
+        CreateSprite(&gUnknown_08339C2C, 120, -16, 3);
+        sBerryBlenderData->mainState++;
+        break;
+    case 18:
+        sBerryBlenderData->mainState++;
+        break;
+    case 19:
+        sub_800ADF8();
+        sBerryBlenderData->mainState++;
+        break;
+    case 20:
+        if (sub_800A520())
+        {
+            sub_800A418();
+            sBerryBlenderData->mainState++;
+        }
+        break;
+    case 21:
+        sBerryBlenderData->field_4C = 128;
+        sBerryBlenderData->gameFrameTime = 0;
+        SetMainCallback2(sub_8081898);
+        if (GetCurrentMapMusic() != BGM_CYCLING)
+        {
+            sBerryBlenderData->field_154 = GetCurrentMapMusic();
+        }
+        PlayBGM(BGM_CYCLING);
+        break;
+    }
+
+    Blender_DummiedOutFunc(sBerryBlenderData->field_11C, sBerryBlenderData->field_11E);
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
diff --git a/src/decompress.c b/src/decompress.c
index 9210799ec..e2ae6ce83 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -459,10 +459,9 @@ _08034964:\n\
         .syntax divided");
 }
 
-u32 sub_8034974(void* ptr)
+u32 sub_8034974(const u8 *ptr)
 {
-    u8* ptr_ = (u8*)(ptr);
-    return (ptr_[3] << 16) | (ptr_[2] << 8) | (ptr_[1]);
+    return (ptr[3] << 16) | (ptr[2] << 8) | (ptr[1]);
 }
 
 bool8 LoadCompressedObjectPicUsingHeap(const struct CompressedSpriteSheet* src)
diff --git a/src/m4a_4.c b/src/m4a_4.c
index 99195ec00..e645fbef5 100644
--- a/src/m4a_4.c
+++ b/src/m4a_4.c
@@ -45,7 +45,7 @@ void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16
     mplayInfo->ident = ID_NUMBER;
 }
 
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 pitch)
+void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch)
 {
     s32 i;
     u32 bit;
@@ -66,7 +66,7 @@ void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16
         {
             if (track->flags & MPT_FLG_EXIST)
             {
-                track->keyShiftX = (s16)pitch >> 8;
+                track->keyShiftX = pitch >> 8;
                 track->pitX = pitch;
                 track->flags |= MPT_FLG_PITCHG;
             }
-- 
cgit v1.2.3


From 185402fe213935c577a64684e28df2a8850066c1 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 18 Nov 2017 21:38:57 +0100
Subject: more work on berry blender

---
 src/berry_blender.c | 686 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 658 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/berry_blender.c b/src/berry_blender.c
index f626fef91..21706d4dc 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -20,6 +20,8 @@
 #include "berry.h"
 #include "items.h"
 #include "string_util.h"
+#include "international_string_util.h"
+#include "rng.h"
 
 // Static type declarations
 #define BLENDER_SCORE_BEST      0
@@ -111,12 +113,10 @@ struct BerryBlenderData
     u8 field_41;
     u8 field_42;
     u8 field_43;
-    u8 field_44;
-    u8 field_45;
+    u16 field_44;
     u8 field_46;
     u8 field_47;
-    u8 field_48;
-    u8 field_49;
+    u16 field_48;
     u16 arrowPos;
     s16 field_4C;
     s16 field_4E;
@@ -165,23 +165,8 @@ struct BerryBlenderData
     u8 field_8B;
     u8 field_8C;
     u8 field_8D;
-    u8 field_8E;
-    u8 field_8F;
-
-    u8 field_90;
-    u8 field_91;
-    u8 field_92;
-    u8 field_93;
-    u8 field_94;
-    u8 field_95;
-    u8 field_96;
-    u8 field_97;
-    u8 field_98;
-    u8 field_99;
-    u8 field_9A;
-    u8 field_9B;
-    u8 field_9C;
-    u8 field_9D;
+    u16 field_8E[BLENDER_MAX_PLAYERS];
+    u16 field_96[BLENDER_MAX_PLAYERS];
     u8 field_9E;
     u8 field_9F;
 
@@ -307,9 +292,7 @@ struct BerryBlenderData
     s16 field_11C;
     s16 field_11E;
 
-    u8 field_120;
-    u8 field_121;
-    u8 field_122;
+    u8 field_120[3];
     u8 field_123;
     u16 scores[BLENDER_MAX_PLAYERS][BLENDER_SCORES_NO];
     u8 field_13C;
@@ -388,16 +371,19 @@ extern void sub_8197DF8(u8 windowId, bool8 copyToVram);
 extern void sub_809882C(u8, u16, u8);
 extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8);
 extern void sub_81AABF0(void (*callback)(void));
+extern void sub_800B4C0(void);
 
 // this file's functions
 void BerryBlender_SetGpuRegs(void);
 void sub_8080EA4(u8 taskId);
 void sub_8080FD0(u8 taskId);
 void sub_80810F8(u8 taskId);
+void sub_8081224(u8 taskId);
 void sub_80833F8(struct Sprite *sprite);
 void sub_8082F68(struct Sprite *sprite);
 void sub_8083010(struct Sprite *sprite);
 void sub_80830C0(struct Sprite *sprite);
+void sub_8082F9C(struct Sprite *sprite);
 void Blender_SetPlayerNamesLocal(u8 opponentsNum);
 void sub_807FAC8(void);
 void sub_8082D28(void);
@@ -410,8 +396,13 @@ void sub_8081898(void);
 void sub_8082CB4(struct BgAffineSrcData *bgAffineSrc);
 bool8 sub_8083380(void);
 void sub_808074C(void);
-void sub_80807BC(void);
+void Blender_PrintPlayerNames(void);
 void sub_8080588(void);
+void Blender_SetBankBerryData(u8 bank, u16 itemId);
+void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 width, s8 x, s8 y, s32 state);
+void sub_8080DF8(void);
+void sub_8082E84(void);
+void sub_80832BC(s16* a0, u16 a1);
 
 extern struct BerryBlenderData *sBerryBlenderData;
 
@@ -972,12 +963,12 @@ const s16 gUnknown_08339C78[][5] =
     {250, 140,  10,  -2,  -1},
 };
 
-const u8 gUnknown_08339CA0[][3] =
+static const u8 sOpponentBerrySets[][3] =
 {
     {4, 3, 2}, {0, 4, 3}, {1, 0, 4}, {2, 1, 0}, {3, 2, 1}, {0, 2, 3}, {1, 3, 4}, {2, 4, 0}, {3, 0, 1}, {4, 1, 2},
 };
 
-const u8 gUnknown_08339CBE[] = {30, 31, 32, 33, 34};
+static const u8 sSpecialOpponentBerrySets[] = {30, 31, 32, 33, 34};
 
 const u8 gUnknown_08339CC3[] = {1, 1, 2, 3, 4};
 
@@ -1471,7 +1462,7 @@ void sub_8080018(void)
             sBerryBlenderData->framesToWait = 0;
             PlaySE(SE_TRACK_DOOR);
             sub_808074C();
-            sub_80807BC();
+            Blender_PrintPlayerNames();
         }
         sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
         break;
@@ -1520,3 +1511,642 @@ void sub_8080018(void)
     RunTextPrinters();
     UpdatePaletteFade();
 }
+
+void sub_8080588(void)
+{
+    SetGpuReg(REG_OFFSET_DISPCNT, 0);
+
+    ResetSpriteData();
+    FreeAllSpritePalettes();
+    ResetTasks();
+
+    SetVBlankCallback(VBlankCB0_BerryBlender);
+
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(1, sBerryBlenderBgTemplates, ARRAY_COUNT(sBerryBlenderBgTemplates));
+
+    SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]);
+    SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]);
+
+    sub_809882C(0, 1, 0xD0);
+    copy_textbox_border_tile_patterns_to_vram(0, 0x14, 0xF0);
+    InitBerryBlenderWindows();
+
+    sBerryBlenderData->field_44 = 0;
+    sBerryBlenderData->field_4C = 0;
+    sBerryBlenderData->arrowPos = 0;
+    sBerryBlenderData->field_4E = 0;
+    sBerryBlenderData->field_11C = 0;
+    sBerryBlenderData->field_11E = 0;
+}
+
+u8 sub_8080624(u16 arrowPos, u8 playerId)
+{
+    u32 var1 = (arrowPos / 256) + 24;
+    u8 arrID = sBerryBlenderData->field_96[playerId];
+    u32 var2 = gUnknown_083399E7[arrID];
+
+    if (var1 >= var2 && var1 < var2 + 48)
+    {
+        if (var1 >= var2 + 20 && var1 < var2 + 28)
+            return 2;
+        else
+            return 1;
+    }
+
+    return 0;
+}
+
+void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, struct BlenderBerry* playerBerry)
+{
+    u16 opponentSetId = 0;
+    u16 opponentBerryId;
+    u16 var;
+    u16 i;
+
+    if (playerBerryItemId == ITEM_ENIGMA_BERRY)
+    {
+        for (i = 0; i < FLAVOUR_COUNT; i++)
+        {
+            if (playerBerry->flavours[opponentSetId] > playerBerry->flavours[i])
+                opponentSetId = i;
+        }
+        opponentSetId += 5;
+    }
+    else
+    {
+        opponentSetId = playerBerryItemId - FIRST_BERRY_INDEX;
+        if (opponentSetId >= 5)
+            opponentSetId = (opponentSetId % 5) + 5;
+    }
+    for (i = 0; i < playersNum - 1; i++)
+    {
+        opponentBerryId = sOpponentBerrySets[opponentSetId][i];
+        var = playerBerryItemId - 163;
+        if (!FlagGet(0x340) && gSpecialVar_0x8004 == 1)
+        {
+            opponentSetId %= 5;
+            opponentBerryId = sSpecialOpponentBerrySets[opponentSetId];
+            if (var <= 4)
+                opponentBerryId -= 5;
+        }
+        Blender_SetBankBerryData(i + 1, opponentBerryId + FIRST_BERRY_INDEX);
+    }
+}
+
+void sub_808074C(void)
+{
+    s32 i, j;
+
+    for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+    {
+        sBerryBlenderData->field_96[i] = 0xFF;
+        sBerryBlenderData->field_8E[i] = gUnknown_083399D0[sBerryBlenderData->playersNo - 2][i];
+    }
+    for (j = 0; j < BLENDER_MAX_PLAYERS; j++)
+    {
+        for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+        {
+            if (sBerryBlenderData->field_8E[i] == j)
+                sBerryBlenderData->field_96[j] = i;
+        }
+    }
+}
+
+void Blender_PrintPlayerNames(void)
+{
+    s32 i, width;
+    u32 multiplayerId = 0;
+    u8 text[20];
+
+    if (gReceivedRemoteLinkPlayers)
+        multiplayerId = GetMultiplayerId();
+
+    for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+    {
+        if (sBerryBlenderData->field_8E[i] != 0xFF)
+        {
+            sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]] = sBerryBlenderData->syncArrowSprite2Ids[i];
+            StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]]], i);
+
+            text[0] = EOS;
+            StringCopy(text, gLinkPlayers[sBerryBlenderData->field_8E[i]].name);
+            width = GetStringCenterAlignXOffset(1, text, 0x38);
+
+            if (multiplayerId == sBerryBlenderData->field_8E[i])
+                Blender_AddTextPrinter(i, text, width, 1, 0, 2);
+            else
+                Blender_AddTextPrinter(i, text, width, 1, 0, 1);
+
+            PutWindowTilemap(i);
+            CopyWindowToVram(i, 3);
+        }
+    }
+}
+
+void sub_80808D4(void)
+{
+    s32 i, j;
+
+    switch (sBerryBlenderData->mainState)
+    {
+    case 0:
+        sub_800B4C0();
+        sub_8080588();
+        Blender_SetBankBerryData(0, gSpecialVar_ItemId);
+        Blender_CopyBerryData(&sBerryBlenderData->blendedBerries[0], gSpecialVar_ItemId);
+        Blender_SetOpponentsBerryData(gSpecialVar_ItemId, sBerryBlenderData->playersNo, &sBerryBlenderData->blendedBerries[0]);
+
+        for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+        {
+            sBerryBlenderData->field_64[i] = 0;
+            for (j = 0; j < 3; j++)
+            {
+                sBerryBlenderData->scores[i][j] = 0;
+            }
+        }
+
+        sBerryBlenderData->field_70 = 0;
+        sBerryBlenderData->loadGfxState = 0;
+        gLinkType = 0x4422;
+        sBerryBlenderData->mainState++;
+        break;
+    case 1:
+        if (LoadBerryBlenderGfx())
+        {
+            sBerryBlenderData->mainState++;
+            sub_8082D28();
+        }
+        break;
+    case 2:
+        for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+        {
+            sBerryBlenderData->syncArrowSprite2Ids[i] = CreateSprite(&sBlenderSyncArrow_SpriteTemplate, sBlenderSyncArrowsPos[i][0], sBlenderSyncArrowsPos[i][1], 1);
+            StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSprite2Ids[i]], i + 8);
+        }
+        sBerryBlenderData->mainState++;
+        break;
+    case 3:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        sBerryBlenderData->mainState++;
+        sBerryBlenderData->framesToWait = 0;
+        break;
+    case 4:
+        if (++sBerryBlenderData->framesToWait == 2)
+            sub_807F9D0();
+        if (!gPaletteFade.active)
+            sBerryBlenderData->mainState = 8;
+        break;
+    case 8:
+        sBerryBlenderData->mainState = 11;
+        sBerryBlenderData->field_114 = 0;
+        break;
+    case 11:
+        for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+        {
+            u32 var = gUnknown_083399D0[sBerryBlenderData->playersNo - 2][i];
+            if (sBerryBlenderData->field_114 == var)
+            {
+                sub_807FD90(sBerryBlenderData->chosenItemId[sBerryBlenderData->field_114], i);
+                break;
+            }
+        }
+        sBerryBlenderData->framesToWait = 0;
+        sBerryBlenderData->mainState++;
+        sBerryBlenderData->field_114++;
+        break;
+    case 12:
+        if (++sBerryBlenderData->framesToWait > 60)
+        {
+            if (sBerryBlenderData->field_114 >= sBerryBlenderData->playersNo)
+            {
+                sBerryBlenderData->arrowPos = gUnknown_083399DC[gUnknown_083399E4[sBerryBlenderData->playersNo - 2]] - 22528;
+                sBerryBlenderData->mainState++;
+            }
+            else
+            {
+                sBerryBlenderData->mainState--;
+            }
+            sBerryBlenderData->framesToWait = 0;
+        }
+        break;
+    case 13:
+        sBerryBlenderData->mainState++;
+        sub_808074C();
+        PlaySE(SE_RU_HYUU);
+        sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
+        ShowBg(2);
+        break;
+    case 14:
+        SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
+        sBerryBlenderData->arrowPos += 0x200;
+        sBerryBlenderData->field_11A += 4;
+        if (sBerryBlenderData->field_11A > 255)
+        {
+            sBerryBlenderData->mainState++;
+            sBerryBlenderData->field_11A = 256;
+            sBerryBlenderData->arrowPos = gUnknown_083399DC[gUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
+            SetGpuRegBits(REG_OFFSET_BG2CNT, 2);
+            sBerryBlenderData->framesToWait = 0;
+            PlaySE(SE_TRACK_DOOR);
+            Blender_PrintPlayerNames();
+        }
+        sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
+        break;
+    case 15:
+        if (sub_8083380())
+        {
+            sBerryBlenderData->mainState++;
+        }
+        sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
+        break;
+    case 16:
+        CreateSprite(&gUnknown_08339C2C, 120, -16, 3);
+        sBerryBlenderData->mainState++;
+        break;
+    case 18:
+        sBerryBlenderData->mainState++;
+        break;
+    case 19:
+        sBerryBlenderData->mainState++;
+        break;
+    case 20:
+        sBerryBlenderData->mainState++;
+        break;
+    case 21:
+        sub_8080DF8();
+        sBerryBlenderData->field_4C = 128;
+        sBerryBlenderData->gameFrameTime = 0;
+        sBerryBlenderData->field_123 = 0;
+        sBerryBlenderData->field_72 = 0;
+        SetMainCallback2(sub_8081898);
+
+        if (gSpecialVar_0x8004 == 1)
+        {
+            if (!FlagGet(FLAG_340))
+                sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10);
+            else
+                sBerryBlenderData->field_120[0] = CreateTask(gUnknown_083399EC[0], 10);
+        }
+
+        if (gSpecialVar_0x8004 > 1)
+        {
+            for (i = 0; i < gSpecialVar_0x8004; i++)
+                sBerryBlenderData->field_120[i] = CreateTask(gUnknown_083399EC[i], 10 + i);
+        }
+
+        if (GetCurrentMapMusic() != BGM_CYCLING)
+            sBerryBlenderData->field_154 = GetCurrentMapMusic();
+
+        PlayBGM(BGM_CYCLING);
+        PlaySE(SE_MOTER);
+        Blender_ControlHitPitch();
+        break;
+    }
+
+    Blender_DummiedOutFunc(sBerryBlenderData->field_11C, sBerryBlenderData->field_11E);
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+void sub_8080DF8(void)
+{
+    s32 i;
+    for (i = 0; i < 4; i++)
+    {
+        gSendCmd[0] = 0;
+        gSendCmd[2] = 0;
+        gRecvCmds[i][0] = 0;
+        gRecvCmds[i][2] = 0;
+    }
+}
+
+void sub_8080E20(u8 taskId)
+{
+   if(++gTasks[taskId].data[0] > gTasks[taskId].data[1])
+   {
+        gRecvCmds[gTasks[taskId].data[2]][2] = 0x2345;
+        DestroyTask(taskId);
+   }
+}
+
+void sub_8080E6C(u8 a0, u8 a1)
+{
+    u8 taskId = CreateTask(sub_8080E20, 80);
+    gTasks[taskId].data[1] = a1;
+    gTasks[taskId].data[2] = a0;
+}
+
+void sub_8080EA4(u8 taskId)
+{
+    if (sub_8080624(sBerryBlenderData->arrowPos, 1) == 2)
+    {
+        if (gTasks[taskId].data[0] == 0)
+        {
+            if (sBerryBlenderData->field_123 == 0)
+            {
+                u8 rand = Random() / 655;
+                if (sBerryBlenderData->field_4C < 500)
+                {
+                    if (rand > 75)
+                        gRecvCmds[1][2] = 0x4523;
+                    else
+                        gRecvCmds[1][2] = 0x5432;
+
+                    gRecvCmds[1][2] = 0x5432;
+                }
+                else if (sBerryBlenderData->field_4C < 1500)
+                {
+                    if (rand > 80)
+                    {
+                        gRecvCmds[1][2] = 0x4523;
+                    }
+                    else
+                    {
+                        u8 value = rand - 21;
+                        if (value < 60)
+                            gRecvCmds[1][2] = 0x5432;
+                        else if (rand < 10)
+                            sub_8080E6C(1, 5);
+                    }
+                }
+                else if (rand <= 90)
+                {
+                    u8 value = rand - 71;
+                    if (value < 20)
+                        gRecvCmds[1][2] = 0x5432;
+                    else if (rand < 30)
+                        sub_8080E6C(1, 5);
+                }
+                else
+                {
+                    gRecvCmds[1][2] = 0x4523;
+                }
+            }
+            else
+            {
+                gRecvCmds[1][2] = 0x4523;
+            }
+
+            gTasks[taskId].data[0] = 1;
+        }
+    }
+    else
+    {
+        gTasks[taskId].data[0] = 0;
+    }
+}
+
+void sub_8080FD0(u8 taskId)
+{
+    u32 var1 = (sBerryBlenderData->arrowPos + 0x1800) & 0xFFFF;
+    u32 var2 = sBerryBlenderData->field_96[2] & 0xFF;
+    if ((var1 >> 8) > gUnknown_083399E7[var2] + 20 && (var1 >> 8) < gUnknown_083399E7[var2] + 40)
+    {
+        if (gTasks[taskId].data[0] == 0)
+        {
+            if (sBerryBlenderData->field_123 == 0)
+            {
+                u8 rand = Random() / 655;
+                if (sBerryBlenderData->field_4C < 500)
+                {
+                    if (rand > 66)
+                        gRecvCmds[2][2] = 0x4523;
+                    else
+                        gRecvCmds[2][2] = 0x5432;
+                }
+                else
+                {
+                    u8 value;
+                    if (rand > 65)
+                        gRecvCmds[2][2] = 0x4523;
+                    value = rand - 41;
+                    if (value < 25)
+                        gRecvCmds[2][2] = 0x5432;
+                    if (rand < 10)
+                        sub_8080E6C(2, 5);
+                }
+
+                gTasks[taskId].data[0] = 1;
+            }
+            else
+            {
+                gRecvCmds[2][2] = 0x4523;
+                gTasks[taskId].data[0] = 1;
+            }
+        }
+    }
+    else
+    {
+        gTasks[taskId].data[0] = 0;
+    }
+}
+
+void sub_80810F8(u8 taskId)
+{
+    u32 var1, var2;
+
+    var1 = (sBerryBlenderData->arrowPos + 0x1800) & 0xFFFF;
+    var2 = sBerryBlenderData->field_96[3] & 0xFF;
+    if ((var1 >> 8) > gUnknown_083399E7[var2] + 20 && (var1 >> 8) < gUnknown_083399E7[var2] + 40)
+    {
+        if (gTasks[taskId].data[0] == 0)
+        {
+            if (sBerryBlenderData->field_123 == 0)
+            {
+                u8 rand = (Random() / 655);
+                if (sBerryBlenderData->field_4C < 500)
+                {
+                    if (rand > 88)
+                        gRecvCmds[3][2] = 0x4523;
+                    else
+                        gRecvCmds[3][2] = 0x5432;
+                }
+                else
+                {
+                    if (rand > 60)
+                    {
+                        gRecvCmds[3][2] = 0x4523;
+                    }
+                    else
+                    {
+                        s8 value = rand - 56; // makes me wonder what the original code was
+                        u8 value2 = value;
+                        if (value2 < 5)
+                            gRecvCmds[3][2] = 0x5432;
+                    }
+                    if (rand < 5)
+                        sub_8080E6C(3, 5);
+                }
+                gTasks[taskId].data[0] = 1;
+            }
+            else
+            {
+                gRecvCmds[3][2] = 0x4523;
+                gTasks[taskId].data[0] = 1;
+            }
+        }
+    }
+    else
+    {
+        gTasks[taskId].data[0] = 0;
+    }
+}
+
+void sub_8081224(u8 taskId)
+{
+    if (sub_8080624(sBerryBlenderData->arrowPos, 1) == 2)
+    {
+        if (gTasks[taskId].data[0] == 0)
+        {
+            gRecvCmds[1][2] = 0x4523;
+            gTasks[taskId].data[0] = 1;
+        }
+    }
+    else
+    {
+        gTasks[taskId].data[0] = 0;
+    }
+}
+
+void sub_8081288(u16 a0, u8 a1)
+{
+    u8 spriteId;
+
+    spriteId = CreateSprite(&gUnknown_08339B40,
+                            sBlenderSyncArrowsPos[a1][0] - (10 * gUnknown_083399C0[a1][0]),
+                            sBlenderSyncArrowsPos[a1][1] - (10 * gUnknown_083399C0[a1][1]),
+                            1);
+    if (a0 == 0x4523)
+    {
+        StartSpriteAnim(&gSprites[spriteId], 2);
+        gSprites[spriteId].callback = sub_8082F9C;
+        PlaySE(SE_RU_GASHIN);
+    }
+    else if (a0 == 0x5432)
+    {
+        StartSpriteAnim(&gSprites[spriteId], 0);
+        PlaySE(SE_SEIKAI);
+    }
+    else if (a0 == 0x2345)
+    {
+        StartSpriteAnim(&gSprites[spriteId], 1);
+        PlaySE(SE_HAZURE);
+    }
+    sub_8082E84();
+}
+
+void sub_8081370(u16 a0)
+{
+    Blender_ControlHitPitch();
+    switch (a0)
+    {
+    case 0x4523:
+        if (sBerryBlenderData->field_4C < 1500)
+            sBerryBlenderData->field_4C += (384 / gUnknown_08339CC3[sBerryBlenderData->playersNo]);
+        else
+        {
+            sBerryBlenderData->field_4C += (128 / gUnknown_08339CC3[sBerryBlenderData->playersNo]);
+            sub_80832BC(&sBerryBlenderData->field_11C, (sBerryBlenderData->field_4C / 100) - 10);
+            sub_80832BC(&sBerryBlenderData->field_11E, (sBerryBlenderData->field_4C / 100) - 10);
+        }
+        break;
+    case 0x5432:
+        if (sBerryBlenderData->field_4C < 1500)
+            sBerryBlenderData->field_4C += (256 / gUnknown_08339CC3[sBerryBlenderData->playersNo]);
+        break;
+    case 0x2345:
+        sBerryBlenderData->field_4C -= (256 / gUnknown_08339CC3[sBerryBlenderData->playersNo]);
+        if (sBerryBlenderData->field_4C < 128)
+            sBerryBlenderData->field_4C = 128;
+        break;
+    }
+}
+
+bool32 sub_80814B0(u16 arg0, u16 arg1, u16 arg2)
+{
+    if (gReceivedRemoteLinkPlayers != 0 && gLinkVSyncDisabled)
+    {
+        if ((arg0 & 0xFF00) == arg2)
+            return TRUE;
+    }
+    else
+    {
+        if (arg0 == arg1)
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+/*
+void sub_80814B0(void)
+{
+    s32 i;
+
+    if (gSpecialVar_0x8004 != 0)
+    {
+        if (gSendCmd[2] != 0)
+        {
+            gRecvCmds[2][0] = gSendCmd[2];
+            gRecvCmds[0][0] = 0x4444;
+            gSendCmd[2] = 0;
+        }
+        for (i = 1; i < 4; i++)
+        {
+            if (gRecvCmds[2][i] != 0)
+                gRecvCmds[0][i] = 0x4444;
+        }
+    }
+    for (i = 0; i < gBerryBlenderData->playersNo; i++)
+    {
+        if (gRecvCmds[0][i] == 0x4444)
+        {
+            u32 var = gBerryBlenderData->field_A2[i];
+            if (gRecvCmds[2][i] == 0x4523)
+            {
+                sub_804FD30(0x4523);
+                gBerryBlenderData->field_13E += (gBerryBlenderData->field_56 / 55);
+                if (gBerryBlenderData->field_13E >= 1000)
+                    gBerryBlenderData->field_13E = 1000;
+                sub_804FC48(0x4523, var);
+                gBerryBlenderData->scores[i][BLENDER_SCORE_BEST]++;
+            }
+            else if (gRecvCmds[2][i] == 0x5432)
+            {
+                sub_804FD30(0x5432);
+                gBerryBlenderData->field_13E += (gBerryBlenderData->field_56 / 70);
+                sub_804FC48(0x5432, var);
+                gBerryBlenderData->scores[i][BLENDER_SCORE_GOOD]++;
+            }
+            else if (gRecvCmds[2][i] == 0x2345)
+            {
+                sub_804FC48(0x2345, var);
+                sub_804FD30(0x2345);
+                if (gBerryBlenderData->field_4.win_field_F > 1000)
+                    gBerryBlenderData->field_13E = 1000;
+                if (gBerryBlenderData->scores[i][BLENDER_SCORE_MISS] < 999)
+                    gBerryBlenderData->scores[i][BLENDER_SCORE_MISS]++;
+            }
+            if (gRecvCmds[2][i] == 0x2345 || gRecvCmds[2][i] == 0x4523 || gRecvCmds[2][i] == 0x5432)
+            {
+                if (gBerryBlenderData->field_56 > 1500)
+                    m4aMPlayTempoControl(&gMPlay_BGM, ((gBerryBlenderData->field_56 - 750) / 20) + 256);
+                else
+                    m4aMPlayTempoControl(&gMPlay_BGM, 256);
+            }
+        }
+    }
+    if (gSpecialVar_0x8004 != 0)
+    {
+        for (i = 0; i < gBerryBlenderData->playersNo; i++)
+        {
+            gRecvCmds[0][i] = 0;
+            gRecvCmds[2][i] = 0;
+        }
+    }
+}*/
+
-- 
cgit v1.2.3


From a3b5af17eabb255e983e61c6306e30f27de82524 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 19 Nov 2017 22:48:46 +0100
Subject: berry blender is done

---
 src/berry_blender.c             | 2437 +++++++++++++++++++++++++++++++--------
 src/berry_fix_program.c         |    3 +-
 src/clear_save_data_screen.c    |    2 +-
 src/decoration.c                |    1 +
 src/egg_hatch.c                 |    3 -
 src/international_string_util.c |    2 +-
 src/mail.c                      |    4 +-
 src/region_map.c                |    4 +-
 src/save_failed_screen.c        |    2 -
 src/text.c                      |    4 +-
 10 files changed, 1965 insertions(+), 497 deletions(-)

(limited to 'src')

diff --git a/src/berry_blender.c b/src/berry_blender.c
index 21706d4dc..869f8b834 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "berry_blender.h"
 #include "bg.h"
 #include "window.h"
 #include "task.h"
@@ -18,12 +19,16 @@
 #include "new_menu_helpers.h"
 #include "item_menu_icons.h"
 #include "berry.h"
+#include "item.h"
 #include "items.h"
 #include "string_util.h"
 #include "international_string_util.h"
 #include "rng.h"
+#include "menu.h"
+#include "pokeblock.h"
+#include "trig.h"
+#include "tv.h"
 
-// Static type declarations
 #define BLENDER_SCORE_BEST      0
 #define BLENDER_SCORE_GOOD      1
 #define BLENDER_SCORE_MISS      2
@@ -31,6 +36,14 @@
 #define BLENDER_MAX_PLAYERS     4
 #define BLENDER_SCORES_NO       3
 
+enum
+{
+    PLAY_AGAIN_OK,
+    DONT_PLAY_AGAIN,
+    CANT_PLAY_NO_BERRIES,
+    CANT_PLAY_NO_PKBLCK_SPACE
+};
+
 struct BlenderBerry
 {
     u16 itemId;
@@ -39,317 +52,87 @@ struct BlenderBerry
     u8 smoothness;
 };
 
+struct TimeAndRPM
+{
+    u32 time;
+    u16 max_RPM;
+};
+
+struct BlenderGameBlock
+{
+    struct TimeAndRPM timeRPM;
+    u16 scores[BLENDER_MAX_PLAYERS][BLENDER_SCORES_NO];
+};
+
+struct TvBlenderStruct
+{
+    u8 name[11];
+    u8 pokeblockFlavour;
+    u8 pokeblockColor;
+    u8 pokeblockSheen;
+};
+
 struct BerryBlenderData
 {
     u8 mainState;
     u8 loadGfxState;
-    u8 field_02;
-    u8 field_03;
-    u8 field_04;
-    u8 field_05;
-    u8 field_06;
-    u8 field_07;
-    u8 field_08;
-    u8 field_09;
-    u8 field_0A;
-    u8 field_0B;
-    u8 field_0C;
-    u8 field_0D;
-    u8 field_0E;
-    u8 field_0F;
-
-    u8 field_10;
-    u8 field_11;
-    u8 field_12;
-    u8 field_13;
-    u8 field_14;
-    u8 field_15;
-    u8 field_16;
-    u8 field_17;
-    u8 field_18;
-    u8 field_19;
-    u8 field_1A;
-    u8 field_1B;
-    u8 field_1C;
-    u8 field_1D;
-    u8 field_1E;
-    u8 field_1F;
-
-    u8 field_20;
-    u8 field_21;
-    u8 field_22;
-    u8 field_23;
-    u8 field_24;
-    u8 field_25;
-    u8 field_26;
-    u8 field_27;
-    u8 field_28;
-    u8 field_29;
-    u8 field_2A;
-    u8 field_2B;
-    u8 field_2C;
-    u8 field_2D;
-    u8 field_2E;
-    u8 field_2F;
-
-    u8 field_30;
-    u8 field_31;
-    u8 field_32;
-    u8 field_33;
-    u8 field_34;
-    u8 field_35;
-    u8 field_36;
-    u8 field_37;
-    u8 field_38;
-    u8 field_39;
-    u8 field_3A;
-    u8 field_3B;
-    u8 field_3C;
-    u8 field_3D;
-    u8 field_3E;
-    u8 field_3F;
-
-    u8 field_40;
-    u8 field_41;
-    u8 field_42;
-    u8 field_43;
+    u8 unused_02[0x42];
     u16 field_44;
-    u8 field_46;
-    u8 field_47;
-    u16 field_48;
+    u8 scoreIconIds[BLENDER_SCORES_NO];
     u16 arrowPos;
     s16 field_4C;
-    s16 field_4E;
-
+    u16 max_RPM;
     u8 syncArrowSpriteIds[BLENDER_MAX_PLAYERS];
     u8 syncArrowSprite2Ids[BLENDER_MAX_PLAYERS];
-    u8 field_58;
-    u8 field_59;
-    u8 field_5A;
-    u8 field_5B;
-    u8 field_5C;
-    u8 field_5D;
-    u8 field_5E;
-    u8 field_5F;
-
-    u8 field_60;
-    u8 field_61;
-    u8 field_62;
-    u8 field_63;
+    u8 unused_57[0xB];
+    u8 gameEndState;
     u16 field_64[BLENDER_MAX_PLAYERS];
-    u8 field_6C;
-    u8 field_6D;
-    u8 field_6E;
-    u8 field_6F;
-
-    u16 field_70;
+    u16 field_6C;
+    u16 field_6E;
+    u16 playAgainState;
     u8 field_72;
-    u8 field_73;
     u16 chosenItemId[BLENDER_MAX_PLAYERS];
     u8 playersNo;
-    u8 field_7D;
-    u8 field_7E;
-    u8 field_7F;
-
-    u8 field_80;
-    u8 field_81;
-    u8 field_82;
-    u8 field_83;
-    u8 field_84;
-    u8 field_85;
-    u8 field_86;
-    u8 field_87;
-    u8 field_88;
-    u8 field_89;
-    u8 field_8A;
-    u8 field_8B;
-    u8 field_8C;
-    u8 field_8D;
+    u8 unused_7D[0x10];
     u16 field_8E[BLENDER_MAX_PLAYERS];
     u16 field_96[BLENDER_MAX_PLAYERS];
-    u8 field_9E;
-    u8 field_9F;
-
-    u8 field_A0;
-    u8 field_A1;
-    u8 field_A2;
-    u8 field_A3;
-    u8 field_A4;
-    u8 field_A5;
-    u8 field_A6;
-    u8 field_A7;
-    u8 field_A8;
-    u8 field_A9;
-    u8 field_AA;
-    u8 field_AB;
-    u8 field_AC;
-    u8 field_AD;
-    u8 field_AE;
-    u8 field_AF;
-
-    u8 field_B0;
-    u8 field_B1;
-    u8 field_B2;
-    u8 field_B3;
-    u8 field_B4;
-    u8 field_B5;
-    u8 field_B6;
-    u8 field_B7;
-    u8 field_B8;
-    u8 field_B9;
-    u8 field_BA;
-    u8 field_BB;
-    u8 field_BC;
-    u8 field_BD;
-    u8 field_BE;
-    u8 field_BF;
-
-    u8 field_C0;
-    u8 field_C1;
-    u8 field_C2;
-    u8 field_C3;
-    u8 field_C4;
-    u8 field_C5;
-    u8 field_C6;
-    u8 field_C7;
-    u8 field_C8;
-    u8 field_C9;
-    u8 field_CA;
-    u8 field_CB;
-    u8 field_CC;
-    u8 field_CD;
-    u8 field_CE;
-    u8 field_CF;
-
-    u8 field_D0;
-    u8 field_D1;
-    u8 field_D2;
-    u8 field_D3;
-    u8 field_D4;
-    u8 field_D5;
-    u8 field_D6;
-    u8 field_D7;
-    u8 field_D8;
-    u8 field_D9;
-    u8 field_DA;
-    u8 field_DB;
-    u8 field_DC;
-    u8 field_DD;
-    u8 field_DE;
-    u8 field_DF;
-
-    u8 field_E0;
-    u8 field_E1;
-    u8 field_E2;
-    u8 field_E3;
-    u8 field_E4;
-    u8 field_E5;
-    u8 field_E6;
-    u8 field_E7;
-    u8 field_E8;
-    u8 field_E9;
-    u8 field_EA;
-    u8 field_EB;
-    u8 field_EC;
-    u8 field_ED;
-    u8 field_EE;
-    u8 field_EF;
-
-    u8 field_F0;
-    u8 field_F1;
-    u8 field_F2;
-    u8 field_F3;
-    u8 field_F4;
-    u8 field_F5;
-    u8 field_F6;
-    u8 field_F7;
-    u8 field_F8;
-    u8 field_F9;
-    u8 field_FA;
-    u8 field_FB;
-    u8 field_FC;
-    u8 field_FD;
-    u8 field_FE;
-    u8 field_FF;
-
-    u8 field_100;
-    u8 field_101;
-    u8 field_102;
-    u8 field_103;
+    u8 yesNoAnswer;
+    u8 stringVar[100];
     u32 gameFrameTime;
     s32 framesToWait;
     u32 field_10C;
-
-    u8 field_110;
-    u8 field_111;
-    u8 field_112;
-    u8 field_113;
+    u8 unused_110[4];
     u8 field_114;
-    u8 field_115;
     u16 field_116;
     u16 field_118;
     u16 field_11A;
-    s16 field_11C;
-    s16 field_11E;
-
+    u16 bg_X;
+    u16 bg_Y;
     u8 field_120[3];
     u8 field_123;
     u16 scores[BLENDER_MAX_PLAYERS][BLENDER_SCORES_NO];
-    u8 field_13C;
-    u8 field_13D;
-    u8 field_13E;
-    u8 field_13F;
-
+    u8 playerPlaces[BLENDER_MAX_PLAYERS];
     struct BgAffineSrcData bgAffineSrc;
-
     u16 field_154;
-    u8 field_156;
-    u8 field_157;
     struct BlenderBerry blendedBerries[BLENDER_MAX_PLAYERS];
-    u8 field_198;
-    u8 field_199;
-    u8 field_19A;
-    u8 field_19B;
-    u8 field_19C;
-    u8 field_19D;
-    u8 field_19E;
-    u8 field_19F;
-
-    u8 field_1A0;
-    u8 field_1A1;
-    u8 field_1A2;
-    u8 field_1A3;
+    struct TimeAndRPM smallBlock;
+    u32 field_1A0;
     u8 field_1A4;
-    u8 field_1A5;
-    u8 field_1A6;
-    u8 field_1A7;
-    u8 field_1A8;
-    u8 field_1A9;
-    u8 field_1AA;
-    u8 field_1AB;
-    u8 field_1AC;
-    u8 field_1AD;
-    u8 field_1AE;
-    u8 field_1AF;
-
-    u8 field_1B0;
-    u8 field_1B1;
-    u8 field_1B2;
-    u8 field_1B3;
-    u8 field_1B4;
-    u8 field_1B5;
-    u8 field_1B6;
-    u8 field_1B7;
+    struct TvBlenderStruct tvBlender;
     u8 tilemapBuffers[2][0x800];
     s16 textState;
     void *tilesBuffer;
-    u8 field_11C0[0x20];
+    struct BlenderGameBlock gameBlock;
 };
 
 extern struct MusicPlayerInfo gMPlay_SE2;
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern u16 gSpecialVar_ItemId;
 extern u8 gInGameOpponentsNo;
+extern u8 gUnknown_020322D5;
+extern u8 gResultsWindowId;
+
+extern const u8 * const gPokeblockNames[];
 
 // graphics
 extern const u8 gBerryBlenderArrowTiles[];
@@ -359,9 +142,15 @@ extern const u8 gBerryBlenderParticlesTiles[];
 extern const u8 gBerryBlenderCountdownNumbersTiles[];
 extern const u16 gBerryBlenderMiscPalette[];
 extern const u16 gBerryBlenderArrowPalette[];
+extern const u8 sBlenderCenterGfx[];
+extern const u8 gUnknown_08D91DB8[];
+extern const u8 gUnknown_08D927EC[];
 
 // text
-extern const u8 gText_BerryBlenderStart[];
+extern const u8 gText_SavingDontTurnOff2[];
+extern const u8 gText_Space[];
+extern const u8 gText_BlenderMaxSpeedRecord[];
+extern const u8 gText_234Players[];
 
 extern void sub_81978B0(u16);
 extern void sub_800A418(void);
@@ -372,51 +161,73 @@ extern void sub_809882C(u8, u16, u8);
 extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8);
 extern void sub_81AABF0(void (*callback)(void));
 extern void sub_800B4C0(void);
+extern void sub_8009F8C(void);
+extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
+extern void sub_8153430(void);
+extern bool8 sub_8153474(void);
+extern void sub_80EECEC(void);
 
 // this file's functions
-void BerryBlender_SetGpuRegs(void);
-void sub_8080EA4(u8 taskId);
-void sub_8080FD0(u8 taskId);
-void sub_80810F8(u8 taskId);
-void sub_8081224(u8 taskId);
-void sub_80833F8(struct Sprite *sprite);
-void sub_8082F68(struct Sprite *sprite);
-void sub_8083010(struct Sprite *sprite);
-void sub_80830C0(struct Sprite *sprite);
-void sub_8082F9C(struct Sprite *sprite);
-void Blender_SetPlayerNamesLocal(u8 opponentsNum);
-void sub_807FAC8(void);
-void sub_8082D28(void);
-bool32 Blender_PrintText(s16 *textState, const u8 *string, u8 textSpeed);
-void sub_807FFA4(void);
-void sub_8080018(void);
-void sub_80808D4(void);
-void Blender_DummiedOutFunc(s16 a0, s16 a1);
-void sub_8081898(void);
-void sub_8082CB4(struct BgAffineSrcData *bgAffineSrc);
-bool8 sub_8083380(void);
-void sub_808074C(void);
-void Blender_PrintPlayerNames(void);
-void sub_8080588(void);
-void Blender_SetBankBerryData(u8 bank, u16 itemId);
-void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 width, s8 x, s8 y, s32 state);
-void sub_8080DF8(void);
-void sub_8082E84(void);
-void sub_80832BC(s16* a0, u16 a1);
-
-extern struct BerryBlenderData *sBerryBlenderData;
-
-// Static RAM declarations
-IWRAM_DATA void *berry_blender_c_unused_03000de4;
-IWRAM_DATA s16 gUnknown_03000DE8[8];
-IWRAM_DATA s16 gUnknown_03000DF8[6];
-IWRAM_DATA s16 gUnknown_03000E04;
-IWRAM_DATA s16 gUnknown_03000E06;
-
-// TODO: make those static once the file is decompiled
-const u16 sBlenderCenterPal[] = INCBIN_U16("graphics/berry_blender/center.gbapal");
-const u8 sBlenderCenterMap[] = INCBIN_U8("graphics/berry_blender/center_map.bin");
-const u16 sBlenderOuterPal[] = INCBIN_U16("graphics/berry_blender/outer.gbapal");
+static void BerryBlender_SetBackgroundsPos(void);
+static void sub_8080EA4(u8 taskId);
+static void sub_8080FD0(u8 taskId);
+static void sub_80810F8(u8 taskId);
+static void sub_8081224(u8 taskId);
+static void sub_8083F3C(u8 taskId);
+static void sub_80833F8(struct Sprite *sprite);
+static void sub_8082F68(struct Sprite *sprite);
+static void sub_8083010(struct Sprite *sprite);
+static void sub_80830C0(struct Sprite *sprite);
+static void sub_8082F9C(struct Sprite *sprite);
+static void Blender_SetPlayerNamesLocal(u8 opponentsNum);
+static void sub_807FAC8(void);
+static void sub_8082D28(void);
+static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed);
+static void sub_807FFA4(void);
+static void sub_8080018(void);
+static void sub_80808D4(void);
+static void Blender_DummiedOutFunc(s16 a0, s16 a1);
+static void sub_8081898(void);
+static void sub_8082CB4(struct BgAffineSrcData *bgAffineSrc);
+static bool8 sub_8083380(void);
+static void sub_808074C(void);
+static void Blender_PrintPlayerNames(void);
+static void sub_8080588(void);
+static void Blender_SetBankBerryData(u8 bank, u16 itemId);
+static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s32 speed, s32 caseId);
+static void sub_8080DF8(void);
+static void sub_8082E84(void);
+static void sub_80832BC(s16* a0, u16 a1);
+static void sub_8083140(u16 a0, u16 a2);
+static void sub_8083230(u16 a0);
+static void sub_808330C(void);
+static void sub_8082AD4(void);
+static void CB2_HandleBlenderEndGame(void);
+static bool8 Blender_PrintBlendingRanking(void);
+static bool8 Blender_PrintBlendingResults(void);
+static void CB2_HandlePlayerPlayAgainChoice(void);
+static void CB2_HandlePlayerLinkPlayAgainChoice(void);
+static void sub_8083170(u16 a0, u16 a1);
+static void Blender_PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst);
+static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlenderStruct *a1);
+
+// ewram
+EWRAM_DATA static struct BerryBlenderData *sBerryBlenderData = NULL;
+EWRAM_DATA static s32 sUnknown_020322A8[5] = {0};
+EWRAM_DATA static s32 sUnknown_020322BC[5] = {0};
+EWRAM_DATA static u32 sUnknown_020322D0 = 0;
+
+// iwram
+IWRAM_DATA static s16 sUnknown_03000DE8[8];
+IWRAM_DATA static s16 sUnknown_03000DF8[6];
+IWRAM_DATA static s16 sUnknown_03000E04;
+IWRAM_DATA static s16 sUnknown_03000E06;
+
+// rom
+
+static const u16 sBlenderCenterPal[] = INCBIN_U16("graphics/berry_blender/center.gbapal");
+static const u8 sBlenderCenterMap[] = INCBIN_U8("graphics/berry_blender/center_map.bin");
+static const u16 sBlenderOuterPal[] = INCBIN_U16("graphics/berry_blender/outer.gbapal");
 
 // unreferenced pals?
 static const u16 sUnknownPal_0[] = INCBIN_U16("graphics/unknown/unknown_339514.gbapal");
@@ -429,9 +240,9 @@ static const u8 sUnusedText_Space[] = _(" ");
 static const u8 sUnusedText_Terminating[] = _("Terminating.");
 static const u8 sUnusedText_LinkPartnerNotFound[] = _("Link partner(s) not found.\nPlease try again.\p");
 
-const u8 gText_BerryBlenderStart[] = _("Starting up the BERRY BLENDER.\pPlease select a BERRY from your BAG\nto put in the BERRY BLENDER.\p");
-const u8 gText_NewParagraph[] = _("\p");
-const u8 gText_WasMade[] = _(" was made!");
+static const u8 sText_BerryBlenderStart[] = _("Starting up the BERRY BLENDER.\pPlease select a BERRY from your BAG\nto put in the BERRY BLENDER.\p");
+static const u8 sText_NewParagraph[] = _("\p");
+static const u8 sText_WasMade[] = _(" was made!");
 static const u8 sText_Mister[] = _("MISTER");
 static const u8 sText_Laddie[] = _("LADDIE");
 static const u8 sText_Lassie[] = _("LASSIE");
@@ -439,7 +250,7 @@ static const u8 sText_Master[] = _("MASTER");
 static const u8 sText_Dude[] = _("DUDE");
 static const u8 sText_Miss[] = _("MISS");
 
-const u8* const sBlenderOpponentsNames[] =
+static const u8* const sBlenderOpponentsNames[] =
 {
     sText_Mister,
     sText_Laddie,
@@ -461,29 +272,29 @@ enum
 
 static const u8 sText_PressAToStart[] = _("Press the A Button to start.");
 static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while.");
-const u8 sText_CommunicationStandby[] = _("Communication standby…");
-const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?");
-const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p");
-const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p");
-const u8 sText_HasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER.");
-const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p");
-const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING");
+static const u8 sText_CommunicationStandby[] = _("Communication standby…");
+static const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?");
+static const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p");
+static const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p");
+static const u8 sText_HasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER.");
+static const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p");
+static const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING");
 static const u8 sText_BerryUsed[] = _("BERRY USED");
-const u8 sText_SpaceBerry[] = _(" BERRY");
-const u8 sText_Time[] = _("Time:");
-const u8 sText_Min[] = _(" min. ");
-const u8 sText_Sec[] = _(" sec.");
-const u8 sText_MaximumSpeed[] = _("MAXIMUM SPEED");
-const u8 sText_RPM[] = _(" RPM");
-const u8 sText_Dot[] = _(".");
-const u8 sText_NewLine[] = _("\n");
+static const u8 sText_SpaceBerry[] = _(" BERRY");
+static const u8 sText_Time[] = _("Time:");
+static const u8 sText_Min[] = _(" min. ");
+static const u8 sText_Sec[] = _(" sec.");
+static const u8 sText_MaximumSpeed[] = _("MAXIMUM SPEED");
+static const u8 sText_RPM[] = _(" RPM");
+static const u8 sText_Dot[] = _(".");
+static const u8 sText_NewLine[] = _("\n");
 static const u8 sText_Space[] = _(" ");
-const u8 sText_Ranking[] = _("RANKING");
-const u8 sText_TheLevelIs[] = _("The level is ");
-const u8 sText_TheFeelIs[] = _(", and the feel is ");
-const u8 sText_Dot2[] = _(".");
+static const u8 sText_Ranking[] = _("RANKING");
+static const u8 sText_TheLevelIs[] = _("The level is ");
+static const u8 sText_TheFeelIs[] = _(", and the feel is ");
+static const u8 sText_Dot2[] = _(".");
 
-const struct BgTemplate sBerryBlenderBgTemplates[3] =
+static const struct BgTemplate sBerryBlenderBgTemplates[3] =
 {
     {
         .bg = 0,
@@ -525,31 +336,31 @@ static const struct WindowTemplate sBerryBlender_WindowTemplates[] =
     DUMMY_WIN_TEMPLATE
 };
 
-const struct WindowTemplate gUnknown_083399B8 =
+static const struct WindowTemplate sBlender_YesNoWindowTemplate =
 {
     0, 0x15, 9, 5, 4, 0xE, 0xCC
 };
 
-const s8 gUnknown_083399C0[][2] =
+static const s8 sUnknown_083399C0[][2] =
 {
     {-1, -1}, {1, -1}, {-1, 1}, {1, 1}
 };
 
-const u8 sBlenderSyncArrowsPos[BLENDER_MAX_PLAYERS][2] =
+static const u8 sBlenderSyncArrowsPos[BLENDER_MAX_PLAYERS][2] =
 {
     {72, 32}, {168, 32}, {72, 128}, {168, 128}
 };
 
-const u8 gUnknown_083399D0[3][4] =
+static const u8 sUnknown_083399D0[3][4] =
 {
     {-1, 0, 1, -1}, {-1, 0, 1, 2}, {0, 1, 2, 3}
 };
 
-const u16 gUnknown_083399DC[] = {0, 0xC000, 0x4000, 0x8000};
-const u8 gUnknown_083399E4[] = {1, 1, 0};
-const u8 gUnknown_083399E7[] = {32, 224, 96, 160, 0};
+static const u16 sUnknown_083399DC[] = {0, 0xC000, 0x4000, 0x8000};
+static const u8 sUnknown_083399E4[] = {1, 1, 0};
+static const u8 sUnknown_083399E7[] = {32, 224, 96, 160, 0};
 
-const TaskFunc gUnknown_083399EC[] =
+static const TaskFunc sUnknown_083399EC[] =
 {
     sub_8080EA4, sub_8080FD0, sub_80810F8
 };
@@ -671,22 +482,22 @@ static const union AnimCmd *const sSpriteAnimTable_82163AC[] =
     sSpriteAnim_82163A4
 };
 
-const struct SpriteSheet sSpriteSheet_BlenderArrow =
+static const struct SpriteSheet sSpriteSheet_BlenderArrow =
 {
     gBerryBlenderArrowTiles, 0x800, 46545
 };
 
-const struct SpritePalette sSpritePal_BlenderMisc =
+static const struct SpritePalette sSpritePal_BlenderMisc =
 {
     gBerryBlenderMiscPalette, 46546
 };
 
-const struct SpritePalette sSpritePal_BlenderArrow =
+static const struct SpritePalette sSpritePal_BlenderArrow =
 {
     gBerryBlenderArrowPalette, 12312
 };
 
-const struct SpriteTemplate sBlenderSyncArrow_SpriteTemplate =
+static const struct SpriteTemplate sBlenderSyncArrow_SpriteTemplate =
 {
     .tileTag = 46545,
     .paletteTag = 12312,
@@ -750,12 +561,12 @@ static const union AnimCmd *const sSpriteAnimTable_8216444[] =
     sSpriteAnim_821643C,
 };
 
-const struct SpriteSheet gUnknown_08339B38 =
+static const struct SpriteSheet sUnknown_08339B38 =
 {
     gBerryBlenderMarubatsuTiles, 0x200, 48888
 };
 
-const struct SpriteTemplate gUnknown_08339B40 =
+static const struct SpriteTemplate sUnknown_08339B40 =
 {
     .tileTag = 48888,
     .paletteTag = 46546,
@@ -837,12 +648,12 @@ static const union AnimCmd *const sSpriteAnimTable_82164E0[] =
     sSpriteAnim_82164D8,
 };
 
-const struct SpriteSheet gUnknown_08339BD8 =
+static const struct SpriteSheet sUnknown_08339BD8 =
 {
     gBerryBlenderParticlesTiles, 0xE0, 23456
 };
 
-const struct SpriteTemplate gUnknown_08339BE0 =
+static const struct SpriteTemplate sUnknown_08339BE0 =
 {
     .tileTag = 23456,
     .paletteTag = 46546,
@@ -895,12 +706,12 @@ static const union AnimCmd *const sSpriteAnimTable_8216534[] =
     sSpriteAnim_821652C,
 };
 
-const struct SpriteSheet gUnknown_08339C24 =
+static const struct SpriteSheet sUnknown_08339C24 =
 {
     gBerryBlenderCountdownNumbersTiles, 0x600, 12345
 };
 
-const struct SpriteTemplate gUnknown_08339C2C =
+static const struct SpriteTemplate sUnknown_08339C2C =
 {
     .tileTag = 12345,
     .paletteTag = 46546,
@@ -939,12 +750,12 @@ static const union AnimCmd *const sSpriteAnimTable_8216570[] =
     sSpriteAnim_8216568,
 };
 
-const struct SpriteSheet gUnknown_08339C58 =
+static const struct SpriteSheet sUnknown_08339C58 =
 {
     gBerryBlenderStartTiles, 0x400, 12346
 };
 
-const struct SpriteTemplate gUnknown_08339C60 =
+static const struct SpriteTemplate sUnknown_08339C60 =
 {
     .tileTag = 12346,
     .paletteTag = 46546,
@@ -955,7 +766,7 @@ const struct SpriteTemplate gUnknown_08339C60 =
     .callback = sub_80830C0
 };
 
-const s16 gUnknown_08339C78[][5] =
+static const s16 sUnknown_08339C78[][5] =
 {
     {-10,  20,  10,   2,   1},
     {250,  20,  10,  -2,   1},
@@ -970,11 +781,11 @@ static const u8 sOpponentBerrySets[][3] =
 
 static const u8 sSpecialOpponentBerrySets[] = {30, 31, 32, 33, 34};
 
-const u8 gUnknown_08339CC3[] = {1, 1, 2, 3, 4};
+static const u8 sUnknown_08339CC3[] = {1, 1, 2, 3, 4};
 
-const u8 gUnknown_08339CC8[] = {0x1C, 0x16, 0x13, 0x1A, 0x19, 0x0E, 0x0D, 0x0B, 0x07, 0x15};
+static const u8 sUnknown_08339CC8[] = {0x1C, 0x16, 0x13, 0x1A, 0x19, 0x0E, 0x0D, 0x0B, 0x07, 0x15};
 
-static const u8 gUnknown_08339CD2[] =
+static const u8 sUnknown_08339CD2[] =
 {
     0xfe, 0x02, 0x02, 0xce, 0xd0, 0x37, 0x44, 0x07, 0x1f, 0x0c, 0x10,
     0x00, 0xff, 0xfe, 0x91, 0x72, 0xce, 0xd0, 0x37, 0x44, 0x07, 0x1f,
@@ -984,18 +795,18 @@ static const u8 gUnknown_08339CD2[] =
     0x05, 0x03, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x02
 };
 
-const struct WindowTemplate gUnknown_08339D14[] = {0, 6, 4, 0x12, 0xB, 0xF, 8};
+static const struct WindowTemplate sBlenderRecordWindowTemplate = {0, 6, 4, 0x12, 0xB, 0xF, 8};
 
 // code
 
-void Blender_ControlHitPitch(void)
+static void Blender_ControlHitPitch(void)
 {
     m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, 2 * (sBerryBlenderData->field_4C - 128));
 }
 
-void VBlankCB0_BerryBlender(void)
+static void VBlankCB0_BerryBlender(void)
 {
-    BerryBlender_SetGpuRegs();
+    BerryBlender_SetBackgroundsPos();
     SetBgAffine(2, sBerryBlenderData->bgAffineSrc.texX, sBerryBlenderData->bgAffineSrc.texY,
                 sBerryBlenderData->bgAffineSrc.scrX, sBerryBlenderData->bgAffineSrc.scrY,
                 sBerryBlenderData->bgAffineSrc.sx, sBerryBlenderData->bgAffineSrc.sy,
@@ -1005,11 +816,7 @@ void VBlankCB0_BerryBlender(void)
     TransferPlttBuffer();
 }
 
-extern const u8 sBlenderCenterGfx[];
-extern const u8 gUnknown_08D91DB8[];
-extern const u8 gUnknown_08D927EC[];
-
-bool8 LoadBerryBlenderGfx(void)
+static bool8 LoadBerryBlenderGfx(void)
 {
     switch (sBerryBlenderData->loadGfxState)
     {
@@ -1051,13 +858,13 @@ bool8 LoadBerryBlenderGfx(void)
         break;
     case 8:
         LoadSpriteSheet(&sSpriteSheet_BlenderArrow);
-        LoadSpriteSheet(&gUnknown_08339BD8);
-        LoadSpriteSheet(&gUnknown_08339B38);
+        LoadSpriteSheet(&sUnknown_08339BD8);
+        LoadSpriteSheet(&sUnknown_08339B38);
         sBerryBlenderData->loadGfxState++;
         break;
     case 9:
-        LoadSpriteSheet(&gUnknown_08339C24);
-        LoadSpriteSheet(&gUnknown_08339C58);
+        LoadSpriteSheet(&sUnknown_08339C24);
+        LoadSpriteSheet(&sUnknown_08339C58);
         LoadSpritePalette(&sSpritePal_BlenderArrow);
         LoadSpritePalette(&sSpritePal_BlenderMisc);
         Free(sBerryBlenderData->tilesBuffer);
@@ -1068,7 +875,7 @@ bool8 LoadBerryBlenderGfx(void)
     return FALSE;
 }
 
-void sub_807F9D0(void)
+static void sub_807F9D0(void)
 {
     FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
     CopyBgTilemapBufferToVram(0);
@@ -1081,7 +888,7 @@ void sub_807F9D0(void)
     ChangeBgY(1, 0, 0);
 }
 
-void InitBerryBlenderWindows(void)
+static void InitBerryBlenderWindows(void)
 {
     if (InitWindows(sBerryBlender_WindowTemplates))
     {
@@ -1101,15 +908,15 @@ void DoBerryBlending(void)
     if (sBerryBlenderData == NULL)
         sBerryBlenderData = AllocZeroed(sizeof(*sBerryBlenderData));
 
-    sBerryBlenderData->field_63 = 0;
+    sBerryBlenderData->gameEndState = 0;
     sBerryBlenderData->mainState = 0;
-    sBerryBlenderData->field_63 = 0;
+    sBerryBlenderData->gameEndState = 0;
 
     Blender_SetPlayerNamesLocal(gSpecialVar_0x8004);
     SetMainCallback2(sub_807FAC8);
 }
 
-void sub_807FAC8(void)
+static void sub_807FAC8(void)
 {
     s32 i;
 
@@ -1132,8 +939,8 @@ void sub_807FAC8(void)
         sBerryBlenderData->field_118 = 0;
         sBerryBlenderData->field_116 = 0;
         sBerryBlenderData->field_11A = 0x50;
-        sBerryBlenderData->field_11C = 0;
-        sBerryBlenderData->field_11E = 0;
+        sBerryBlenderData->bg_X = 0;
+        sBerryBlenderData->bg_Y = 0;
         sBerryBlenderData->loadGfxState = 0;
 
         sub_8082D28();
@@ -1166,7 +973,7 @@ void sub_807FAC8(void)
             sBerryBlenderData->mainState++;
         break;
     case 4:
-        if (Blender_PrintText(&sBerryBlenderData->textState, gText_BerryBlenderStart, GetPlayerTextSpeed()))
+        if (Blender_PrintText(&sBerryBlenderData->textState, sText_BerryBlenderStart, GetPlayerTextSpeed()))
             sBerryBlenderData->mainState++;
         break;
     case 5:
@@ -1193,7 +1000,7 @@ void sub_807FAC8(void)
     UpdatePaletteFade();
 }
 
-void sub_807FD08(struct Sprite* sprite)
+static void sub_807FD08(struct Sprite* sprite)
 {
     sprite->data1 += sprite->data6;
     sprite->data2 -= sprite->data4;
@@ -1214,7 +1021,7 @@ void sub_807FD08(struct Sprite* sprite)
     sprite->pos1.y = sprite->data2;
 }
 
-void sub_807FD64(struct Sprite* sprite, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6)
+static void sub_807FD64(struct Sprite* sprite, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6)
 {
     sprite->data0 = a3;
     sprite->data1 = a2;
@@ -1227,13 +1034,13 @@ void sub_807FD64(struct Sprite* sprite, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6)
     sprite->callback = sub_807FD08;
 }
 
-void sub_807FD90(u16 a0, u8 a1)
+static void sub_807FD90(u16 a0, u8 a1)
 {
     u8 spriteId = sub_80D511C(a0 + 123, 0, 80, a1 & 1);
-    sub_807FD64(&gSprites[spriteId], gUnknown_08339C78[a1][0], gUnknown_08339C78[a1][1], gUnknown_08339C78[a1][2], gUnknown_08339C78[a1][3], gUnknown_08339C78[a1][4]);
+    sub_807FD64(&gSprites[spriteId], sUnknown_08339C78[a1][0], sUnknown_08339C78[a1][1], sUnknown_08339C78[a1][2], sUnknown_08339C78[a1][3], sUnknown_08339C78[a1][4]);
 }
 
-void Blender_CopyBerryData(struct BlenderBerry* berry, u16 itemId)
+static void Blender_CopyBerryData(struct BlenderBerry* berry, u16 itemId)
 {
     const struct Berry *berryInfo = GetBerryInfo(ITEM_TO_BERRY(itemId));
 
@@ -1247,7 +1054,7 @@ void Blender_CopyBerryData(struct BlenderBerry* berry, u16 itemId)
     berry->smoothness = berryInfo->smoothness;
 }
 
-void Blender_SetPlayerNamesLocal(u8 opponentsNum)
+static void Blender_SetPlayerNamesLocal(u8 opponentsNum)
 {
     switch (opponentsNum)
     {
@@ -1294,7 +1101,7 @@ void Blender_SetPlayerNamesLocal(u8 opponentsNum)
     }
 }
 
-void sub_807FFA4(void)
+static void sub_807FFA4(void)
 {
     s32 i;
 
@@ -1316,7 +1123,7 @@ void sub_807FFA4(void)
         SetMainCallback2(sub_80808D4);
 }
 
-void sub_8080018(void)
+static void sub_8080018(void)
 {
     s32 i, j;
 
@@ -1334,8 +1141,8 @@ void sub_8080018(void)
                 sBerryBlenderData->scores[i][j] = 0;
             }
         }
-        sBerryBlenderData->field_70 = 0;
-        sBerryBlenderData->field_4E = 0;
+        sBerryBlenderData->playAgainState = 0;
+        sBerryBlenderData->max_RPM = 0;
         sBerryBlenderData->loadGfxState = 0;
         sBerryBlenderData->mainState++;
         break;
@@ -1414,7 +1221,7 @@ void sub_8080018(void)
 
         for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
         {
-            if (sBerryBlenderData->field_114 == gUnknown_083399D0[sBerryBlenderData->playersNo - 2][i])
+            if (sBerryBlenderData->field_114 == sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i])
             {
                 sub_807FD90(sBerryBlenderData->chosenItemId[sBerryBlenderData->field_114], i);
                 break;
@@ -1431,7 +1238,7 @@ void sub_8080018(void)
             if (sBerryBlenderData->field_114 >= sBerryBlenderData->playersNo)
             {
                 sBerryBlenderData->mainState++;
-                sBerryBlenderData->arrowPos = gUnknown_083399DC[gUnknown_083399E4[sBerryBlenderData->playersNo - 2]] - 22528;
+                sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]] - 22528;
             }
             else
             {
@@ -1458,7 +1265,7 @@ void sub_8080018(void)
             SetGpuRegBits(REG_OFFSET_BG2CNT, 2);
             sBerryBlenderData->mainState++;
             sBerryBlenderData->field_11A = 256;
-            sBerryBlenderData->arrowPos = gUnknown_083399DC[gUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
+            sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
             sBerryBlenderData->framesToWait = 0;
             PlaySE(SE_TRACK_DOOR);
             sub_808074C();
@@ -1475,7 +1282,7 @@ void sub_8080018(void)
         sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
         break;
     case 16:
-        CreateSprite(&gUnknown_08339C2C, 120, -16, 3);
+        CreateSprite(&sUnknown_08339C2C, 120, -16, 3);
         sBerryBlenderData->mainState++;
         break;
     case 18:
@@ -1504,7 +1311,7 @@ void sub_8080018(void)
         break;
     }
 
-    Blender_DummiedOutFunc(sBerryBlenderData->field_11C, sBerryBlenderData->field_11E);
+    Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y);
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
@@ -1512,7 +1319,7 @@ void sub_8080018(void)
     UpdatePaletteFade();
 }
 
-void sub_8080588(void)
+static void sub_8080588(void)
 {
     SetGpuReg(REG_OFFSET_DISPCNT, 0);
 
@@ -1535,16 +1342,16 @@ void sub_8080588(void)
     sBerryBlenderData->field_44 = 0;
     sBerryBlenderData->field_4C = 0;
     sBerryBlenderData->arrowPos = 0;
-    sBerryBlenderData->field_4E = 0;
-    sBerryBlenderData->field_11C = 0;
-    sBerryBlenderData->field_11E = 0;
+    sBerryBlenderData->max_RPM = 0;
+    sBerryBlenderData->bg_X = 0;
+    sBerryBlenderData->bg_Y = 0;
 }
 
-u8 sub_8080624(u16 arrowPos, u8 playerId)
+static u8 sub_8080624(u16 arrowPos, u8 playerId)
 {
     u32 var1 = (arrowPos / 256) + 24;
     u8 arrID = sBerryBlenderData->field_96[playerId];
-    u32 var2 = gUnknown_083399E7[arrID];
+    u32 var2 = sUnknown_083399E7[arrID];
 
     if (var1 >= var2 && var1 < var2 + 48)
     {
@@ -1557,7 +1364,7 @@ u8 sub_8080624(u16 arrowPos, u8 playerId)
     return 0;
 }
 
-void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, struct BlenderBerry* playerBerry)
+static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, struct BlenderBerry* playerBerry)
 {
     u16 opponentSetId = 0;
     u16 opponentBerryId;
@@ -1594,14 +1401,14 @@ void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, struct
     }
 }
 
-void sub_808074C(void)
+static void sub_808074C(void)
 {
     s32 i, j;
 
     for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
     {
         sBerryBlenderData->field_96[i] = 0xFF;
-        sBerryBlenderData->field_8E[i] = gUnknown_083399D0[sBerryBlenderData->playersNo - 2][i];
+        sBerryBlenderData->field_8E[i] = sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i];
     }
     for (j = 0; j < BLENDER_MAX_PLAYERS; j++)
     {
@@ -1613,9 +1420,9 @@ void sub_808074C(void)
     }
 }
 
-void Blender_PrintPlayerNames(void)
+static void Blender_PrintPlayerNames(void)
 {
-    s32 i, width;
+    s32 i, xPos;
     u32 multiplayerId = 0;
     u8 text[20];
 
@@ -1631,12 +1438,12 @@ void Blender_PrintPlayerNames(void)
 
             text[0] = EOS;
             StringCopy(text, gLinkPlayers[sBerryBlenderData->field_8E[i]].name);
-            width = GetStringCenterAlignXOffset(1, text, 0x38);
+            xPos = GetStringCenterAlignXOffset(1, text, 0x38);
 
             if (multiplayerId == sBerryBlenderData->field_8E[i])
-                Blender_AddTextPrinter(i, text, width, 1, 0, 2);
+                Blender_AddTextPrinter(i, text, xPos, 1, 0, 2);
             else
-                Blender_AddTextPrinter(i, text, width, 1, 0, 1);
+                Blender_AddTextPrinter(i, text, xPos, 1, 0, 1);
 
             PutWindowTilemap(i);
             CopyWindowToVram(i, 3);
@@ -1644,7 +1451,7 @@ void Blender_PrintPlayerNames(void)
     }
 }
 
-void sub_80808D4(void)
+static void sub_80808D4(void)
 {
     s32 i, j;
 
@@ -1666,7 +1473,7 @@ void sub_80808D4(void)
             }
         }
 
-        sBerryBlenderData->field_70 = 0;
+        sBerryBlenderData->playAgainState = 0;
         sBerryBlenderData->loadGfxState = 0;
         gLinkType = 0x4422;
         sBerryBlenderData->mainState++;
@@ -1704,7 +1511,7 @@ void sub_80808D4(void)
     case 11:
         for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
         {
-            u32 var = gUnknown_083399D0[sBerryBlenderData->playersNo - 2][i];
+            u32 var = sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i];
             if (sBerryBlenderData->field_114 == var)
             {
                 sub_807FD90(sBerryBlenderData->chosenItemId[sBerryBlenderData->field_114], i);
@@ -1720,7 +1527,7 @@ void sub_80808D4(void)
         {
             if (sBerryBlenderData->field_114 >= sBerryBlenderData->playersNo)
             {
-                sBerryBlenderData->arrowPos = gUnknown_083399DC[gUnknown_083399E4[sBerryBlenderData->playersNo - 2]] - 22528;
+                sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]] - 22528;
                 sBerryBlenderData->mainState++;
             }
             else
@@ -1745,7 +1552,7 @@ void sub_80808D4(void)
         {
             sBerryBlenderData->mainState++;
             sBerryBlenderData->field_11A = 256;
-            sBerryBlenderData->arrowPos = gUnknown_083399DC[gUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
+            sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
             SetGpuRegBits(REG_OFFSET_BG2CNT, 2);
             sBerryBlenderData->framesToWait = 0;
             PlaySE(SE_TRACK_DOOR);
@@ -1761,7 +1568,7 @@ void sub_80808D4(void)
         sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
         break;
     case 16:
-        CreateSprite(&gUnknown_08339C2C, 120, -16, 3);
+        CreateSprite(&sUnknown_08339C2C, 120, -16, 3);
         sBerryBlenderData->mainState++;
         break;
     case 18:
@@ -1786,13 +1593,13 @@ void sub_80808D4(void)
             if (!FlagGet(FLAG_340))
                 sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10);
             else
-                sBerryBlenderData->field_120[0] = CreateTask(gUnknown_083399EC[0], 10);
+                sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10);
         }
 
         if (gSpecialVar_0x8004 > 1)
         {
             for (i = 0; i < gSpecialVar_0x8004; i++)
-                sBerryBlenderData->field_120[i] = CreateTask(gUnknown_083399EC[i], 10 + i);
+                sBerryBlenderData->field_120[i] = CreateTask(sUnknown_083399EC[i], 10 + i);
         }
 
         if (GetCurrentMapMusic() != BGM_CYCLING)
@@ -1804,7 +1611,7 @@ void sub_80808D4(void)
         break;
     }
 
-    Blender_DummiedOutFunc(sBerryBlenderData->field_11C, sBerryBlenderData->field_11E);
+    Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y);
     RunTasks();
     AnimateSprites();
     BuildOamBuffer();
@@ -1812,7 +1619,7 @@ void sub_80808D4(void)
     UpdatePaletteFade();
 }
 
-void sub_8080DF8(void)
+static void sub_8080DF8(void)
 {
     s32 i;
     for (i = 0; i < 4; i++)
@@ -1824,7 +1631,7 @@ void sub_8080DF8(void)
     }
 }
 
-void sub_8080E20(u8 taskId)
+static void sub_8080E20(u8 taskId)
 {
    if(++gTasks[taskId].data[0] > gTasks[taskId].data[1])
    {
@@ -1833,14 +1640,14 @@ void sub_8080E20(u8 taskId)
    }
 }
 
-void sub_8080E6C(u8 a0, u8 a1)
+static void sub_8080E6C(u8 a0, u8 a1)
 {
     u8 taskId = CreateTask(sub_8080E20, 80);
     gTasks[taskId].data[1] = a1;
     gTasks[taskId].data[2] = a0;
 }
 
-void sub_8080EA4(u8 taskId)
+static void sub_8080EA4(u8 taskId)
 {
     if (sub_8080624(sBerryBlenderData->arrowPos, 1) == 2)
     {
@@ -1900,11 +1707,11 @@ void sub_8080EA4(u8 taskId)
     }
 }
 
-void sub_8080FD0(u8 taskId)
+static void sub_8080FD0(u8 taskId)
 {
     u32 var1 = (sBerryBlenderData->arrowPos + 0x1800) & 0xFFFF;
     u32 var2 = sBerryBlenderData->field_96[2] & 0xFF;
-    if ((var1 >> 8) > gUnknown_083399E7[var2] + 20 && (var1 >> 8) < gUnknown_083399E7[var2] + 40)
+    if ((var1 >> 8) > sUnknown_083399E7[var2] + 20 && (var1 >> 8) < sUnknown_083399E7[var2] + 40)
     {
         if (gTasks[taskId].data[0] == 0)
         {
@@ -1945,13 +1752,13 @@ void sub_8080FD0(u8 taskId)
     }
 }
 
-void sub_80810F8(u8 taskId)
+static void sub_80810F8(u8 taskId)
 {
     u32 var1, var2;
 
     var1 = (sBerryBlenderData->arrowPos + 0x1800) & 0xFFFF;
     var2 = sBerryBlenderData->field_96[3] & 0xFF;
-    if ((var1 >> 8) > gUnknown_083399E7[var2] + 20 && (var1 >> 8) < gUnknown_083399E7[var2] + 40)
+    if ((var1 >> 8) > sUnknown_083399E7[var2] + 20 && (var1 >> 8) < sUnknown_083399E7[var2] + 40)
     {
         if (gTasks[taskId].data[0] == 0)
         {
@@ -1996,7 +1803,7 @@ void sub_80810F8(u8 taskId)
     }
 }
 
-void sub_8081224(u8 taskId)
+static void sub_8081224(u8 taskId)
 {
     if (sub_8080624(sBerryBlenderData->arrowPos, 1) == 2)
     {
@@ -2012,13 +1819,13 @@ void sub_8081224(u8 taskId)
     }
 }
 
-void sub_8081288(u16 a0, u8 a1)
+static void sub_8081288(u16 a0, u8 a1)
 {
     u8 spriteId;
 
-    spriteId = CreateSprite(&gUnknown_08339B40,
-                            sBlenderSyncArrowsPos[a1][0] - (10 * gUnknown_083399C0[a1][0]),
-                            sBlenderSyncArrowsPos[a1][1] - (10 * gUnknown_083399C0[a1][1]),
+    spriteId = CreateSprite(&sUnknown_08339B40,
+                            sBlenderSyncArrowsPos[a1][0] - (10 * sUnknown_083399C0[a1][0]),
+                            sBlenderSyncArrowsPos[a1][1] - (10 * sUnknown_083399C0[a1][1]),
                             1);
     if (a0 == 0x4523)
     {
@@ -2039,34 +1846,34 @@ void sub_8081288(u16 a0, u8 a1)
     sub_8082E84();
 }
 
-void sub_8081370(u16 a0)
+static void sub_8081370(u16 a0)
 {
     Blender_ControlHitPitch();
     switch (a0)
     {
     case 0x4523:
         if (sBerryBlenderData->field_4C < 1500)
-            sBerryBlenderData->field_4C += (384 / gUnknown_08339CC3[sBerryBlenderData->playersNo]);
+            sBerryBlenderData->field_4C += (384 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
         else
         {
-            sBerryBlenderData->field_4C += (128 / gUnknown_08339CC3[sBerryBlenderData->playersNo]);
-            sub_80832BC(&sBerryBlenderData->field_11C, (sBerryBlenderData->field_4C / 100) - 10);
-            sub_80832BC(&sBerryBlenderData->field_11E, (sBerryBlenderData->field_4C / 100) - 10);
+            sBerryBlenderData->field_4C += (128 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
+            sub_80832BC(&sBerryBlenderData->bg_X, (sBerryBlenderData->field_4C / 100) - 10);
+            sub_80832BC(&sBerryBlenderData->bg_Y, (sBerryBlenderData->field_4C / 100) - 10);
         }
         break;
     case 0x5432:
         if (sBerryBlenderData->field_4C < 1500)
-            sBerryBlenderData->field_4C += (256 / gUnknown_08339CC3[sBerryBlenderData->playersNo]);
+            sBerryBlenderData->field_4C += (256 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
         break;
     case 0x2345:
-        sBerryBlenderData->field_4C -= (256 / gUnknown_08339CC3[sBerryBlenderData->playersNo]);
+        sBerryBlenderData->field_4C -= (256 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
         if (sBerryBlenderData->field_4C < 128)
             sBerryBlenderData->field_4C = 128;
         break;
     }
 }
 
-bool32 sub_80814B0(u16 arg0, u16 arg1, u16 arg2)
+static bool32 sub_80814B0(u16 arg0, u16 arg1, u16 arg2)
 {
     if (gReceivedRemoteLinkPlayers != 0 && gLinkVSyncDisabled)
     {
@@ -2082,8 +1889,7 @@ bool32 sub_80814B0(u16 arg0, u16 arg1, u16 arg2)
     return FALSE;
 }
 
-/*
-void sub_80814B0(void)
+static void sub_80814F4(void)
 {
     s32 i;
 
@@ -2091,50 +1897,48 @@ void sub_80814B0(void)
     {
         if (gSendCmd[2] != 0)
         {
-            gRecvCmds[2][0] = gSendCmd[2];
+            gRecvCmds[0][2] = gSendCmd[2];
             gRecvCmds[0][0] = 0x4444;
             gSendCmd[2] = 0;
         }
         for (i = 1; i < 4; i++)
         {
-            if (gRecvCmds[2][i] != 0)
-                gRecvCmds[0][i] = 0x4444;
+            if (gRecvCmds[i][2] != 0)
+                gRecvCmds[i][0] = 0x4444;
         }
     }
-    for (i = 0; i < gBerryBlenderData->playersNo; i++)
+    for (i = 0; i < sBerryBlenderData->playersNo; i++)
     {
-        if (gRecvCmds[0][i] == 0x4444)
+        if (sub_80814B0(gRecvCmds[i][0], 0x4444, 0x4400))
         {
-            u32 var = gBerryBlenderData->field_A2[i];
-            if (gRecvCmds[2][i] == 0x4523)
+            u32 var = sBerryBlenderData->field_96[i];
+            if (gRecvCmds[i][2] == 0x4523)
             {
-                sub_804FD30(0x4523);
-                gBerryBlenderData->field_13E += (gBerryBlenderData->field_56 / 55);
-                if (gBerryBlenderData->field_13E >= 1000)
-                    gBerryBlenderData->field_13E = 1000;
-                sub_804FC48(0x4523, var);
-                gBerryBlenderData->scores[i][BLENDER_SCORE_BEST]++;
+                sub_8081370(0x4523);
+                sBerryBlenderData->field_116 += (sBerryBlenderData->field_4C / 55);
+                if (sBerryBlenderData->field_116 >= 1000)
+                    sBerryBlenderData->field_116 = 1000;
+                sub_8081288(0x4523, var);
+                sBerryBlenderData->scores[i][BLENDER_SCORE_BEST]++;
             }
-            else if (gRecvCmds[2][i] == 0x5432)
+            else if (gRecvCmds[i][2] == 0x5432)
             {
-                sub_804FD30(0x5432);
-                gBerryBlenderData->field_13E += (gBerryBlenderData->field_56 / 70);
-                sub_804FC48(0x5432, var);
-                gBerryBlenderData->scores[i][BLENDER_SCORE_GOOD]++;
+                sub_8081370(0x5432);
+                sBerryBlenderData->field_116 += (sBerryBlenderData->field_4C / 70);
+                sub_8081288(0x5432, var);
+                sBerryBlenderData->scores[i][BLENDER_SCORE_GOOD]++;
             }
-            else if (gRecvCmds[2][i] == 0x2345)
+            else if (gRecvCmds[i][2] == 0x2345)
             {
-                sub_804FC48(0x2345, var);
-                sub_804FD30(0x2345);
-                if (gBerryBlenderData->field_4.win_field_F > 1000)
-                    gBerryBlenderData->field_13E = 1000;
-                if (gBerryBlenderData->scores[i][BLENDER_SCORE_MISS] < 999)
-                    gBerryBlenderData->scores[i][BLENDER_SCORE_MISS]++;
+                sub_8081288(0x2345, var);
+                sub_8081370(0x2345);
+                if (sBerryBlenderData->scores[i][BLENDER_SCORE_MISS] < 999)
+                    sBerryBlenderData->scores[i][BLENDER_SCORE_MISS]++;
             }
-            if (gRecvCmds[2][i] == 0x2345 || gRecvCmds[2][i] == 0x4523 || gRecvCmds[2][i] == 0x5432)
+            if (gRecvCmds[i][2] == 0x2345 || gRecvCmds[2][i] == 0x4523 || gRecvCmds[2][i] == 0x5432) // could be a bug, 2 and i are reversed
             {
-                if (gBerryBlenderData->field_56 > 1500)
-                    m4aMPlayTempoControl(&gMPlay_BGM, ((gBerryBlenderData->field_56 - 750) / 20) + 256);
+                if (sBerryBlenderData->field_4C > 1500)
+                    m4aMPlayTempoControl(&gMPlay_BGM, ((sBerryBlenderData->field_4C - 750) / 20) + 256);
                 else
                     m4aMPlayTempoControl(&gMPlay_BGM, 256);
             }
@@ -2142,11 +1946,1684 @@ void sub_80814B0(void)
     }
     if (gSpecialVar_0x8004 != 0)
     {
-        for (i = 0; i < gBerryBlenderData->playersNo; i++)
+        for (i = 0; i < sBerryBlenderData->playersNo; i++)
+        {
+            gRecvCmds[i][0] = 0;
+            gRecvCmds[i][2] = 0;
+        }
+    }
+}
+
+static void sub_8081744(void)
+{
+    u8 var2;
+    bool8 A_pressed = FALSE;
+    u8 playerId = 0;
+
+    if (gReceivedRemoteLinkPlayers != 0)
+        playerId = GetMultiplayerId();
+
+    var2 = sBerryBlenderData->field_96[playerId];
+
+    if (sBerryBlenderData->gameEndState == 0)
+    {
+        if (gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_L_EQUALS_A && gMain.newKeys & A_BUTTON)
+        {
+            if ((gMain.heldKeysRaw & (A_BUTTON | L_BUTTON)) != (A_BUTTON | L_BUTTON))
+                A_pressed = TRUE;
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            A_pressed = TRUE;
+        }
+
+        if (A_pressed)
+        {
+            u8 var3;
+            StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[var2]]], var2 + 4);
+            var3 = sub_8080624(sBerryBlenderData->arrowPos, playerId);
+
+            if (var3 == 2)
+                gSendCmd[2] = 0x4523;
+            else if (var3 == 1)
+                gSendCmd[2] = 0x5432;
+            else
+                gSendCmd[2] = 0x2345;
+        }
+    }
+    if (++sBerryBlenderData->field_72 > 5)
+    {
+        if (sBerryBlenderData->field_4C > 128)
+            sBerryBlenderData->field_4C--;
+        sBerryBlenderData->field_72 = 0;
+    }
+    if (gUnknown_020322D5 && gMain.newKeys & L_BUTTON)
+        sBerryBlenderData->field_123 ^= 1;
+}
+
+static void sub_8081898(void)
+{
+    sub_8082D28();
+
+    if (sBerryBlenderData->gameFrameTime < (99 * 60 * 60) + (59 * 60)) // game time can't be longer than 99 minutes and 59 seconds, can't print 3 digits
+        sBerryBlenderData->gameFrameTime++;
+
+    sub_8081744();
+    SetLinkDebugValues((u16)(sBerryBlenderData->field_4C), sBerryBlenderData->field_116);
+    sub_80814F4();
+    sub_8083140(sBerryBlenderData->field_116, 1000);
+    sub_8083230(sBerryBlenderData->field_4C);
+    sub_808330C();
+    sub_8082AD4();
+    if (sBerryBlenderData->gameEndState == 0 && sBerryBlenderData->field_118 >= 1000)
+    {
+        sBerryBlenderData->field_116 = 1000;
+        sBerryBlenderData->gameEndState = 1;
+        SetMainCallback2(CB2_HandleBlenderEndGame);
+    }
+
+    Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y);
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+static void Blender_DummiedOutFunc(s16 a0, s16 a1)
+{
+
+}
+
+static bool8 sub_8081964(struct BlenderBerry* berries, u8 index1, u8 index2)
+{
+    if (berries[index1].itemId != berries[index2].itemId
+     || (StringCompare(berries[index1].name, berries[index2].name) == 0
+      && (berries[index1].flavours[FLAVOUR_SPICY] == berries[index2].flavours[FLAVOUR_SPICY]
+       && berries[index1].flavours[FLAVOUR_DRY] == berries[index2].flavours[FLAVOUR_DRY]
+       && berries[index1].flavours[FLAVOUR_SWEET] == berries[index2].flavours[FLAVOUR_SWEET]
+       && berries[index1].flavours[FLAVOUR_BITTER] == berries[index2].flavours[FLAVOUR_BITTER]
+       && berries[index1].flavours[FLAVOUR_SOUR] == berries[index2].flavours[FLAVOUR_SOUR]
+       && berries[index1].smoothness == berries[index2].smoothness)))
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static u32 Blender_GetPokeblockColor(struct BlenderBerry* berries, s16* a1, u8 playersNo, u8 a3)
+{
+    s16 vars[6];
+    s32 i;
+    s32 r6;
+    u8 r2;
+
+    for (i = 0; i < 6; i++)
+        vars[i] = a1[i];
+
+    r6 = 0;
+    for (i = 0; i < 5; i++)
+    {
+        if (vars[i] == 0)
+            r6++;
+    }
+    if (r6 == 5 || a3 > 3)
+        return 12;
+    for (i = 0; i < playersNo; i++)
+    {
+        for (r6 = 0; r6 < playersNo; r6++)
+        {
+            if (berries[i].itemId == berries[r6].itemId && i != r6
+                && (berries[i].itemId != ITEM_ENIGMA_BERRY || sub_8081964(berries, i, r6)))
+                    return 12;
+        }
+    }
+    r2 = 0;
+    for (r2 = 0, i = 0; i < 5; i++)
+    {
+        if (vars[i] > 0)
+            r2++;
+    }
+    if (r2 > 3)
+        return 13;
+    if (r2 == 3)
+        return 11;
+    for (i = 0; i < 5; i++)
+    {
+        if (vars[i] > 50)
+            return 14;
+    }
+    if (r2 == 1 && vars[0] > 0)
+        return 1;
+    if (r2 == 1 && vars[1] > 0)
+        return 2;
+    if (r2 == 1 && vars[2] > 0)
+        return 3;
+    if (r2 == 1 && vars[3] > 0)
+        return 4;
+    if (r2 == 1 && vars[4] > 0)
+        return 5;
+    if (r2 == 2)
+    {
+        s32 var = 0;
+        for (i = 0; i < 5; i++)
+        {
+            if (vars[i] > 0)
+                sUnknown_03000DF8[var++] = i;
+        }
+        if (vars[sUnknown_03000DF8[0]] >= vars[sUnknown_03000DF8[1]])
+        {
+            if (sUnknown_03000DF8[0] == 0)
+                return (sUnknown_03000DF8[1] << 16) | 6;
+            if (sUnknown_03000DF8[0] == 1)
+                return (sUnknown_03000DF8[1] << 16) | 7;
+            if (sUnknown_03000DF8[0] == 2)
+                return (sUnknown_03000DF8[1] << 16) | 8;
+            if (sUnknown_03000DF8[0] == 3)
+                return (sUnknown_03000DF8[1] << 16) | 9;
+            if (sUnknown_03000DF8[0] == 4)
+                return (sUnknown_03000DF8[1] << 16) | 10;
+        }
+        else
+        {
+            if (sUnknown_03000DF8[1] == 0)
+                return (sUnknown_03000DF8[0] << 16) | 6;
+            if (sUnknown_03000DF8[1] == 1)
+                return (sUnknown_03000DF8[0] << 16) | 7;
+            if (sUnknown_03000DF8[1] == 2)
+                return (sUnknown_03000DF8[0] << 16) | 8;
+            if (sUnknown_03000DF8[1] == 3)
+                return (sUnknown_03000DF8[0] << 16) | 9;
+            if (sUnknown_03000DF8[1] == 4)
+                return (sUnknown_03000DF8[0] << 16) | 10;
+        }
+    }
+    return 0;
+}
+
+static void sub_8081BB0(s16 value)
+{
+    sUnknown_03000E04 = value;
+}
+
+static s16 sub_8081BBC(void)
+{
+    return sUnknown_03000E04;
+}
+
+static void sub_8081BC8(s16 value)
+{
+    sUnknown_03000E06 = value;
+}
+
+static s16 sub_8081BD4(void)
+{
+    return sUnknown_03000E06;
+}
+
+static void Blender_CalculatePokeblock(struct BlenderBerry *berries, struct Pokeblock *pokeblock, u8 playersNo, u8 *flavours, u16 maxRPM)
+{
+    s32 i, j;
+    s32 multiuseVar, var2;
+    u8 var3;
+
+    for (i = 0; i < 6; i++)
+        sUnknown_03000DE8[i] = 0;
+
+    for (i = 0; i < playersNo; i++)
+    {
+        for (j = 0; j < 6; j++)
+            sUnknown_03000DE8[j] += berries[i].flavours[j];
+    }
+
+    multiuseVar = sUnknown_03000DE8[0];
+    sUnknown_03000DE8[0] -= sUnknown_03000DE8[1];
+    sUnknown_03000DE8[1] -= sUnknown_03000DE8[2];
+    sUnknown_03000DE8[2] -= sUnknown_03000DE8[3];
+    sUnknown_03000DE8[3] -= sUnknown_03000DE8[4];
+    sUnknown_03000DE8[4] -= multiuseVar;
+
+    multiuseVar = 0;
+    for (i = 0; i < 5; i++)
+    {
+        if (sUnknown_03000DE8[i] < 0)
+        {
+            sUnknown_03000DE8[i] = 0;
+            multiuseVar++;
+        }
+    }
+    var3 = multiuseVar;
+    for (i = 0; i < 5; i++)
+    {
+        if (sUnknown_03000DE8[i] > 0)
+        {
+            if (sUnknown_03000DE8[i] < multiuseVar)
+                sUnknown_03000DE8[i] = 0;
+            else
+                sUnknown_03000DE8[i] -= multiuseVar;
+        }
+    }
+    for (i = 0; i < 5; i++)
+    {
+        sUnknown_020322A8[i] = sUnknown_03000DE8[i];
+    }
+
+    multiuseVar = maxRPM / 333 + 100;
+    sUnknown_020322D0 = multiuseVar;
+
+    for (i = 0; i < 5; i++)
+    {
+        s32 r4;
+        s32 r5 = sUnknown_03000DE8[i];
+        r5 = (r5 * multiuseVar) / 10;
+        r4 = r5 % 10;
+        r5 /= 10;
+        if (r4 > 4)
+            r5++;
+        sUnknown_03000DE8[i] = r5;
+    }
+    for (i = 0; i < 5; i++)
+    {
+        sUnknown_020322BC[i] = sUnknown_03000DE8[i];
+    }
+
+    pokeblock->color = Blender_GetPokeblockColor(berries, &sUnknown_03000DE8[0], playersNo, var3);
+    sUnknown_03000DE8[5] = (sUnknown_03000DE8[5] / playersNo) - playersNo;
+
+    if (sUnknown_03000DE8[5] < 0)
+        sUnknown_03000DE8[5] = 0;
+
+    if (pokeblock->color == 12)
+    {
+        multiuseVar = Random() % 10;
+        for (i = 0; i < 5; i++)
         {
-            gRecvCmds[0][i] = 0;
-            gRecvCmds[2][i] = 0;
+            if ((sUnknown_08339CC8[multiuseVar] >> i) & 1)
+                sUnknown_03000DE8[i] = 2;
+            else
+                sUnknown_03000DE8[i] = 0;
         }
     }
-}*/
 
+    for (i = 0; i < 6; i++)
+    {
+        if (sUnknown_03000DE8[i] > 255)
+            sUnknown_03000DE8[i] = 255;
+    }
+
+    pokeblock->spicy = sUnknown_03000DE8[0];
+    pokeblock->dry = sUnknown_03000DE8[1];
+    pokeblock->sweet = sUnknown_03000DE8[2];
+    pokeblock->bitter = sUnknown_03000DE8[3];
+    pokeblock->sour = sUnknown_03000DE8[4];
+    pokeblock->feel = sUnknown_03000DE8[5];
+
+    for (i = 0; i < 6; i++)
+    {
+        flavours[i] = sUnknown_03000DE8[i];
+    }
+}
+
+static void BlenderDebug_CalculatePokeblock(struct BlenderBerry* berries, struct Pokeblock* pokeblock, u8 playersNo, u8* flavours, u16 a4)
+{
+    Blender_CalculatePokeblock(berries, pokeblock, playersNo, flavours, a4);
+}
+
+static void sub_8081E20(void)
+{
+    u32 frames = (u16)(sBerryBlenderData->gameFrameTime);
+    u16 max_RPM = sBerryBlenderData->max_RPM;
+    s16 var = 0;
+
+    if (frames < 900)
+        var = 5;
+    else if ((u16)(frames - 900) < 600)
+        var = 4;
+    else if ((u16)(frames - 1500) < 600)
+        var = 3;
+    else if ((u16)(frames - 2100) < 900)
+        var = 2;
+    else if ((u16)(frames - 3300) < 300)
+        var = 1;
+
+    sub_8081BC8(var);
+
+    var = 0;
+    if (max_RPM <= 64)
+    {
+        if (max_RPM >= 50 && max_RPM < 100)
+            var = -1;
+        else if (max_RPM >= 100 && max_RPM < 150)
+            var = -2;
+        else if (max_RPM >= 150 && max_RPM < 200)
+            var = -3;
+        else if (max_RPM >= 200 && max_RPM < 250)
+            var = -4;
+        else if (max_RPM >= 250 && max_RPM < 300)
+            var = -5;
+        else if (max_RPM >= 350 && max_RPM < 400)
+            var = -6;
+        else if (max_RPM >= 400 && max_RPM < 450)
+            var = -7;
+        else if (max_RPM >= 500 && max_RPM < 550)
+            var = -8;
+        else if (max_RPM >= 550 && max_RPM < 600)
+            var = -9;
+        else if (max_RPM >= 600)
+            var = -10;
+    }
+
+    sub_8081BB0(var);
+}
+
+static void sub_8081F94(u16 *a0)
+{
+    if (gReceivedRemoteLinkPlayers != 0 && gLinkVSyncDisabled)
+        *a0 = 0x2F00;
+    else
+        *a0 = 0x2FFF;
+}
+
+static void CB2_HandleBlenderEndGame(void)
+{
+    u8 i, j;
+
+    if (sBerryBlenderData->gameEndState < 3)
+        sub_8082D28();
+
+    GetMultiplayerId(); // unused return value
+
+    switch (sBerryBlenderData->gameEndState)
+    {
+    case 1:
+        m4aMPlayTempoControl(&gMPlay_BGM, 256);
+        for (i = 0; i < gSpecialVar_0x8004; i++)
+        {
+            DestroyTask(sBerryBlenderData->field_120[i]);
+        }
+        sBerryBlenderData->gameEndState++;
+        break;
+    case 2:
+        sBerryBlenderData->field_4C -= 32;
+        if (sBerryBlenderData->field_4C <= 0)
+        {
+            sub_8009F8C();
+            sBerryBlenderData->field_4C = 0;
+
+            if (gReceivedRemoteLinkPlayers != 0)
+                sBerryBlenderData->gameEndState++;
+            else
+                sBerryBlenderData->gameEndState = 5;
+
+            sBerryBlenderData->mainState = 0;
+            m4aMPlayStop(&gMPlay_SE2);
+        }
+        Blender_ControlHitPitch();
+        break;
+    case 3:
+        if (GetMultiplayerId() != 0)
+        {
+            sBerryBlenderData->gameEndState++;
+        }
+        else if (sub_800A520())
+        {
+            if (gReceivedRemoteLinkPlayers != 0 && gLinkVSyncDisabled)
+            {
+                sBerryBlenderData->gameBlock.timeRPM.time = sBerryBlenderData->gameFrameTime;
+                sBerryBlenderData->gameBlock.timeRPM.max_RPM = sBerryBlenderData->max_RPM;
+
+                for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+                {
+                    for (j = 0; j < BLENDER_SCORES_NO; j++)
+                        sBerryBlenderData->gameBlock.scores[i][j] = sBerryBlenderData->scores[i][j];
+                }
+
+                if (SendBlock(0, &sBerryBlenderData->gameBlock, sizeof(sBerryBlenderData->gameBlock)))
+                    sBerryBlenderData->gameEndState++;
+            }
+            else
+            {
+                sBerryBlenderData->smallBlock.time = sBerryBlenderData->gameFrameTime;
+                sBerryBlenderData->smallBlock.max_RPM = sBerryBlenderData->max_RPM;
+                if (SendBlock(0, &sBerryBlenderData->smallBlock, sizeof(sBerryBlenderData->smallBlock) + 32))
+                    sBerryBlenderData->gameEndState++;
+            }
+        }
+        break;
+    case 4:
+        if (GetBlockReceivedStatus())
+        {
+            ResetBlockReceivedFlags();
+            sBerryBlenderData->gameEndState++;
+
+            if (gReceivedRemoteLinkPlayers != 0 && gLinkVSyncDisabled)
+            {
+                struct BlenderGameBlock *receivedBlock = (struct BlenderGameBlock*)(&gBlockRecvBuffer);
+
+                sBerryBlenderData->max_RPM = receivedBlock->timeRPM.max_RPM;
+                sBerryBlenderData->gameFrameTime = receivedBlock->timeRPM.time;
+
+                for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+                {
+                    for (j = 0; j < BLENDER_SCORES_NO; j++)
+                        sBerryBlenderData->scores[i][j] = receivedBlock->scores[i][j];
+                }
+            }
+            else
+            {
+                struct TimeAndRPM *receivedBlock = (struct TimeAndRPM*)(&gBlockRecvBuffer);
+
+                sBerryBlenderData->max_RPM = receivedBlock->max_RPM;
+                sBerryBlenderData->gameFrameTime = receivedBlock->time;
+            }
+        }
+        break;
+    case 5:
+        if (Blender_PrintBlendingRanking())
+            sBerryBlenderData->gameEndState++;
+        break;
+    case 6:
+        if (Blender_PrintBlendingResults())
+        {
+            if (gInGameOpponentsNo == 0)
+                IncrementGameStat(GAME_STAT_POKEBLOCKS_WITH_FRIENDS);
+            else
+                IncrementGameStat(GAME_STAT_POKEBLOCKS);
+
+            sBerryBlenderData->gameEndState++;
+        }
+        break;
+    case 7:
+        if (Blender_PrintText(&sBerryBlenderData->textState, sText_WouldLikeToBlendAnotherBerry, GetPlayerTextSpeed()))
+            sBerryBlenderData->gameEndState++;
+        break;
+    case 9:
+        sBerryBlenderData->yesNoAnswer = 0;
+        CreateYesNoMenu(&sBlender_YesNoWindowTemplate, 1, 0xD, 0);
+        sBerryBlenderData->gameEndState++;
+        break;
+    case 10:
+        switch (sub_8198C58())
+        {
+        case 1:
+        case -1:
+            sBerryBlenderData->yesNoAnswer = 1;
+            sBerryBlenderData->gameEndState++;
+            for (i = 0; i <BLENDER_MAX_PLAYERS; i++)
+            {
+                if (sBerryBlenderData->field_8E[i] != 0xFF)
+                {
+                    PutWindowTilemap(i);
+                    CopyWindowToVram(i, 3);
+                }
+            }
+            break;
+        case 0:
+            sBerryBlenderData->yesNoAnswer = 0;
+            sBerryBlenderData->gameEndState++;
+            for (i = 0; i <BLENDER_MAX_PLAYERS; i++)
+            {
+                if (sBerryBlenderData->field_8E[i] != 0xFF)
+                {
+                    PutWindowTilemap(i);
+                    CopyWindowToVram(i, 3);
+                }
+            }
+            break;
+        }
+        break;
+    case 11:
+        sub_8081F94(&gSendCmd[0]);
+        if (sBerryBlenderData->yesNoAnswer == 0)
+        {
+            if (IsBagPocketNonEmpty(BAG_BERRIES) == FALSE) // no berries
+            {
+                sBerryBlenderData->playAgainState = CANT_PLAY_NO_BERRIES;
+                gSendCmd[1] = 0x9999;
+            }
+            else if (GetFirstFreePokeblockSlot() == -1) // no space for pokeblocks
+            {
+                sBerryBlenderData->playAgainState = CANT_PLAY_NO_PKBLCK_SPACE;
+                gSendCmd[1] = 0xAAAA;
+            }
+            else
+            {
+                sBerryBlenderData->playAgainState = PLAY_AGAIN_OK;
+                gSendCmd[1] = 0x7779;
+            }
+            sBerryBlenderData->gameEndState++;
+        }
+        else
+        {
+            sBerryBlenderData->playAgainState = DONT_PLAY_AGAIN;
+            gSendCmd[1] = 0x8888;
+            sBerryBlenderData->gameEndState++;
+        }
+        break;
+    case 12:
+        if (gInGameOpponentsNo)
+        {
+            SetMainCallback2(CB2_HandlePlayerPlayAgainChoice);
+            sBerryBlenderData->gameEndState = 0;
+            sBerryBlenderData->mainState = 0;
+        }
+        else
+        {
+            sBerryBlenderData->gameEndState++;
+        }
+        break;
+    case 8:
+        sBerryBlenderData->gameEndState++;
+        break;
+    case 13:
+        if (Blender_PrintText(&sBerryBlenderData->textState, sText_CommunicationStandby, GetPlayerTextSpeed()))
+        {
+            SetMainCallback2(CB2_HandlePlayerLinkPlayAgainChoice);
+            sBerryBlenderData->gameEndState = 0;
+            sBerryBlenderData->mainState = 0;
+        }
+        break;
+    }
+
+    sub_808330C();
+    sub_8083230(sBerryBlenderData->field_4C);
+    sub_8082AD4();
+    Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y);
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+static bool8 LinkPlayAgainHandleSaving(void)
+{
+    switch (sBerryBlenderData->field_1A0)
+    {
+    case 0:
+        sub_800ADF8();
+        sBerryBlenderData->field_1A0 = 1;
+        sBerryBlenderData->framesToWait = 0;
+        break;
+    case 1:
+        if (sub_800A520())
+        {
+            sBerryBlenderData->field_1A0++;
+            gSoftResetDisabled = TRUE;
+        }
+        break;
+    case 2:
+        sub_8153430();
+        sBerryBlenderData->field_1A0++;
+        sBerryBlenderData->framesToWait = 0;
+        break;
+    case 3:
+        if (++sBerryBlenderData->framesToWait == 10)
+        {
+            sub_800ADF8();
+            sBerryBlenderData->field_1A0++;
+        }
+        break;
+    case 4:
+        if (sub_800A520())
+        {
+            if (sub_8153474())
+            {
+                sBerryBlenderData->field_1A0 = 5;
+            }
+            else
+            {
+                sBerryBlenderData->framesToWait = 0;
+                sBerryBlenderData->field_1A0 = 3;
+            }
+        }
+        break;
+    case 5:
+        sBerryBlenderData->field_1A0++;
+        sBerryBlenderData->framesToWait = 0;
+        break;
+    case 6:
+        if (++sBerryBlenderData->framesToWait > 5)
+        {
+            gSoftResetDisabled = FALSE;
+            return TRUE;
+        }
+        break;
+    }
+
+    return FALSE;
+}
+
+static void CB2_HandlePlayerLinkPlayAgainChoice(void)
+{
+    switch (sBerryBlenderData->gameEndState)
+    {
+    case 0:
+        if (sBerryBlenderData->field_64[0] == 0x2222)
+        {
+            sBerryBlenderData->gameEndState = 5;
+        }
+        else if (sBerryBlenderData->field_64[0] == 0x1111)
+        {
+            if (sBerryBlenderData->field_6C == 0x9999)
+                sBerryBlenderData->gameEndState = 2;
+            else if (sBerryBlenderData->field_6C == 0xAAAA)
+                sBerryBlenderData->gameEndState = 1;
+            else
+                sBerryBlenderData->gameEndState = 5;
+        }
+        break;
+    case 1:
+        sBerryBlenderData->gameEndState = 3;
+        StringCopy(gStringVar4, gLinkPlayers[sBerryBlenderData->field_6E].name);
+        StringAppend(gStringVar4, sText_ApostropheSPokeblockCaseIsFull);
+        break;
+    case 2:
+        sBerryBlenderData->gameEndState++;
+        StringCopy(gStringVar4, gLinkPlayers[sBerryBlenderData->field_6E].name);
+        StringAppend(gStringVar4, sText_HasNoBerriesToPut);
+        break;
+    case 3:
+        if (Blender_PrintText(&sBerryBlenderData->textState, gStringVar4, GetPlayerTextSpeed()))
+        {
+            sBerryBlenderData->framesToWait = 0;
+            sBerryBlenderData->gameEndState++;
+        }
+        break;
+    case 4:
+        if (++sBerryBlenderData->framesToWait > 60)
+            sBerryBlenderData->gameEndState = 5;
+        break;
+    case 5:
+        Blender_PrintText(&sBerryBlenderData->textState, gText_SavingDontTurnOff2, 0);
+        sub_800ADF8();
+        sBerryBlenderData->gameEndState++;
+        break;
+    case 6:
+        if (sub_800A520())
+        {
+            sBerryBlenderData->framesToWait = 0;
+            sBerryBlenderData->gameEndState++;
+            sBerryBlenderData->field_1A0 = 0;
+        }
+        break;
+    case 7:
+        if (LinkPlayAgainHandleSaving())
+        {
+            PlaySE(SE_SAVE);
+            sBerryBlenderData->gameEndState++;
+        }
+        break;
+    case 8:
+        sBerryBlenderData->gameEndState++;
+        sub_800ADF8();
+        break;
+    case 9:
+        if (sub_800A520())
+        {
+            BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+            sBerryBlenderData->gameEndState++;
+        }
+        break;
+    case 10:
+        if (!gPaletteFade.active)
+        {
+            if (sBerryBlenderData->field_64[0] == 0x2222)
+            {
+                FreeAllWindowBuffers();
+                UnsetBgTilemapBuffer(2);
+                UnsetBgTilemapBuffer(1);
+                FREE_AND_SET_NULL(sBerryBlenderData);
+                SetMainCallback2(DoBerryBlending);
+            }
+            else
+            {
+                sBerryBlenderData->framesToWait = 0;
+                sBerryBlenderData->gameEndState++;
+            }
+        }
+        break;
+    case 11:
+        if (++sBerryBlenderData->framesToWait > 30)
+        {
+            sub_800AC34();
+            sBerryBlenderData->gameEndState++;
+        }
+        break;
+    case 12:
+        if (gReceivedRemoteLinkPlayers == 0)
+        {
+            FREE_AND_SET_NULL(sBerryBlenderData);
+            SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+        }
+        break;
+    }
+
+    sub_8082AD4();
+    Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y);
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+static void CB2_HandlePlayerPlayAgainChoice(void)
+{
+    switch (sBerryBlenderData->gameEndState)
+    {
+    case 0:
+        if (sBerryBlenderData->playAgainState == PLAY_AGAIN_OK || sBerryBlenderData->playAgainState == DONT_PLAY_AGAIN)
+            sBerryBlenderData->gameEndState = 9;
+        if (sBerryBlenderData->playAgainState == CANT_PLAY_NO_BERRIES)
+            sBerryBlenderData->gameEndState = 2;
+        if (sBerryBlenderData->playAgainState == CANT_PLAY_NO_PKBLCK_SPACE)
+            sBerryBlenderData->gameEndState = 1;
+        break;
+    case 1:
+        sBerryBlenderData->gameEndState = 3;
+        sBerryBlenderData->textState = 0;
+        StringCopy(gStringVar4, sText_YourPokeblockCaseIsFull);
+        break;
+    case 2:
+        sBerryBlenderData->gameEndState++;
+        sBerryBlenderData->textState = 0;
+        StringCopy(gStringVar4, sText_RunOutOfBerriesForBlending);
+        break;
+    case 3:
+        if (Blender_PrintText(&sBerryBlenderData->textState, gStringVar4, GetPlayerTextSpeed()))
+            sBerryBlenderData->gameEndState = 9;
+        break;
+    case 9:
+        BeginFastPaletteFade(3);
+        sBerryBlenderData->gameEndState++;
+        break;
+    case 10:
+        if (!gPaletteFade.active)
+        {
+            if (sBerryBlenderData->playAgainState == PLAY_AGAIN_OK)
+                SetMainCallback2(DoBerryBlending);
+            else
+                SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+
+            FreeAllWindowBuffers();
+            UnsetBgTilemapBuffer(2);
+            UnsetBgTilemapBuffer(1);
+            FREE_AND_SET_NULL(sBerryBlenderData);
+        }
+        break;
+    }
+
+    sub_8082AD4();
+    Blender_DummiedOutFunc(sBerryBlenderData->bg_X, sBerryBlenderData->bg_Y);
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+static void sub_8082AD4(void)
+{
+    if (gReceivedRemoteLinkPlayers)
+    {
+        if (sub_80814B0(gRecvCmds[0][0], 0x2FFF, 0x2F00))
+        {
+            if (gRecvCmds[0][1] == 0x1111)
+            {
+                switch (gRecvCmds[0][2])
+                {
+                case 0x8888:
+                    sBerryBlenderData->field_6C = 0x8888;
+                    sBerryBlenderData->field_6E = gRecvCmds[0][3];
+                    break;
+                case 0x9999:
+                    sBerryBlenderData->field_6C = 0x9999;
+                    sBerryBlenderData->field_6E = gRecvCmds[0][3];
+                    break;
+                case 0xAAAA:
+                    sBerryBlenderData->field_6C = 0xAAAA;
+                    sBerryBlenderData->field_6E = gRecvCmds[0][3];
+                    break;
+                }
+
+                sBerryBlenderData->field_64[0] = 0x1111;
+            }
+            else if (gRecvCmds[0][1] == 0x2222)
+            {
+                sBerryBlenderData->field_64[0] = 0x2222;
+            }
+        }
+        if (GetMultiplayerId() == 0 && sBerryBlenderData->field_64[0] != 0x1111 && sBerryBlenderData->field_64[0] != 0x2222)
+        {
+            u8 i;
+            for (i = 0; i < GetLinkPlayerCount(); i++)
+            {
+                if (sub_80814B0(gRecvCmds[i][0], 0x2FFF, 0x2F00))
+                {
+                    switch (gRecvCmds[i][1])
+                    {
+                    case 0x8888:
+                        sBerryBlenderData->field_64[i] = 0x8888;
+                        break;
+                    case 0x7779:
+                        sBerryBlenderData->field_64[i] = 0x7779;
+                        break;
+                    case 0x9999:
+                        sBerryBlenderData->field_64[i] = 0x9999;
+                        break;
+                    case 0xAAAA:
+                        sBerryBlenderData->field_64[i] = 0xAAAA;
+                        break;
+                    }
+                }
+            }
+            for (i = 0; i < GetLinkPlayerCount(); i++)
+            {
+                if (sBerryBlenderData->field_64[i] == 0)
+                    break;
+            }
+            if (i == GetLinkPlayerCount())
+            {
+                for (i = 0; i < GetLinkPlayerCount(); i++)
+                {
+                    if (sBerryBlenderData->field_64[i] != 0x7779)
+                        break;
+                }
+                sub_8081F94(&gSendCmd[0]);
+                if (i == GetLinkPlayerCount())
+                {
+                    gSendCmd[1] = 0x2222;
+                }
+                else
+                {
+                    gSendCmd[1] = 0x1111;
+                    gSendCmd[2] = sBerryBlenderData->field_64[i];
+                    gSendCmd[3] = i;
+                }
+            }
+        }
+    }
+}
+
+static void sub_8082CB4(struct BgAffineSrcData *dest)
+{
+    struct BgAffineSrcData affineSrc;
+
+    affineSrc.texX = 30720;
+    affineSrc.texY = 20480;
+    affineSrc.scrX = 120 - sBerryBlenderData->bg_X;
+    affineSrc.scrY = 80 - sBerryBlenderData->bg_Y;
+    affineSrc.sx = sBerryBlenderData->field_11A;
+    affineSrc.sy = sBerryBlenderData->field_11A;
+    affineSrc.alpha = sBerryBlenderData->arrowPos;
+
+    *dest = affineSrc;
+}
+
+u16 GetBlenderArrowPosition(void)
+{
+    return sBerryBlenderData->arrowPos;
+}
+
+static void sub_8082D28(void)
+{
+    u8 playerId = 0;
+
+    if (gReceivedRemoteLinkPlayers != 0)
+        playerId = GetMultiplayerId();
+
+    if (gLinkVSyncDisabled && gReceivedRemoteLinkPlayers != 0)
+    {
+        if (playerId == 0)
+        {
+            sBerryBlenderData->arrowPos += sBerryBlenderData->field_4C;
+            gSendCmd[5] = sBerryBlenderData->field_116;
+            gSendCmd[6] = sBerryBlenderData->arrowPos;
+            sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
+        }
+        else
+        {
+            if ((gRecvCmds[0][0] & 0xFF00) == 0x4400)
+            {
+                sBerryBlenderData->field_116 = gRecvCmds[0][5];
+                sBerryBlenderData->arrowPos = gRecvCmds[0][6];
+                sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
+            }
+        }
+    }
+    else
+    {
+        sBerryBlenderData->arrowPos += sBerryBlenderData->field_4C;
+        sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
+    }
+}
+
+static void BerryBlender_SetBackgroundsPos(void)
+{
+    SetGpuReg(REG_OFFSET_BG1HOFS, sBerryBlenderData->bg_X);
+    SetGpuReg(REG_OFFSET_BG1VOFS, sBerryBlenderData->bg_Y);
+
+    SetGpuReg(REG_OFFSET_BG0HOFS, sBerryBlenderData->bg_X);
+    SetGpuReg(REG_OFFSET_BG0VOFS, sBerryBlenderData->bg_Y);
+}
+
+static void sub_8082E3C(struct Sprite* sprite)
+{
+    sprite->data2 += sprite->data0;
+    sprite->data3 += sprite->data1;
+    sprite->pos2.x = sprite->data2 / 8;
+    sprite->pos2.y = sprite->data3 / 8;
+
+    if (sprite->animEnded)
+        DestroySprite(sprite);
+}
+
+static void sub_8082E84(void)
+{
+    s32 limit = (Random() % 2) + 1;
+    s32 i;
+
+    for (i = 0; i < limit; i++)
+    {
+        u16 rand;
+        s32 x, y;
+        u8 spriteId;
+
+        rand = sBerryBlenderData->arrowPos + (Random() % 20);
+
+        x = gSineTable[(rand & 0xFF) + 64] / 4;
+        y = gSineTable[(rand & 0xFF)] / 4;
+
+        spriteId = CreateSprite(&sUnknown_08339BE0, x + 120, y + 80, 1);
+        gSprites[spriteId].data0 = 16 - (Random() % 32);
+        gSprites[spriteId].data1 = 16 - (Random() % 32);
+
+        gSprites[spriteId].callback = sub_8082E3C;
+    }
+}
+
+static void sub_8082F68(struct Sprite* sprite)
+{
+    sprite->data0++;
+    sprite->pos2.y = -(sprite->data0 / 3);
+
+    if (sprite->animEnded)
+        DestroySprite(sprite);
+}
+
+static void sub_8082F9C(struct Sprite* sprite)
+{
+    sprite->data0++;
+    sprite->pos2.y = -(sprite->data0 * 2);
+
+    if (sprite->pos2.y < -12)
+        sprite->pos2.y = -12;
+    if (sprite->animEnded)
+        DestroySprite(sprite);
+}
+
+static void Blender_SetBankBerryData(u8 bank, u16 itemId)
+{
+    sBerryBlenderData->chosenItemId[bank] = itemId;
+    Blender_CopyBerryData(&sBerryBlenderData->blendedBerries[bank], itemId);
+}
+
+static void sub_8083010(struct Sprite* sprite)
+{
+    switch (sprite->data0)
+    {
+    case 0:
+        sprite->data1 += 8;
+        if (sprite->data1 > 88)
+        {
+            sprite->data1 = 88;
+            sprite->data0++;
+            PlaySE(SE_KON);
+        }
+        break;
+    case 1:
+        sprite->data2 += 1;
+        if (sprite->data2 > 20)
+        {
+            sprite->data0++;
+            sprite->data2 = 0;
+        }
+        break;
+    case 2:
+        sprite->data1 += 4;
+        if (sprite->data1 > 176)
+        {
+            if (++sprite->data3 == 3)
+            {
+                DestroySprite(sprite);
+                CreateSprite(&sUnknown_08339C60, 120, -20, 2);
+            }
+            else
+            {
+                sprite->data0 = 0;
+                sprite->data1 = -16;
+                StartSpriteAnim(sprite, sprite->data3);
+            }
+        }
+        break;
+    }
+
+    sprite->pos2.y = sprite->data1;
+}
+
+static void sub_80830C0(struct Sprite* sprite)
+{
+    switch (sprite->data0)
+    {
+    case 0:
+        sprite->data1 += 8;
+        if (sprite->data1 > 92)
+        {
+            sprite->data1 = 92;
+            sprite->data0++;
+            PlaySE(SE_PIN);
+        }
+        break;
+    case 1:
+        sprite->data2 += 1;
+        if (sprite->data2 > 20)
+            sprite->data0++;
+        break;
+    case 2:
+        sprite->data1 += 4;
+        if (sprite->data1 > 176)
+        {
+            sBerryBlenderData->mainState++;
+            DestroySprite(sprite);
+        }
+        break;
+    }
+
+    sprite->pos2.y = sprite->data1;
+}
+
+static void sub_8083140(u16 a0, u16 a1)
+{
+    if (sBerryBlenderData->field_118 < a0)
+    {
+        sBerryBlenderData->field_118 += 2;
+        sub_8083170(sBerryBlenderData->field_118, a1);
+    }
+}
+
+static void sub_8083170(u16 a0, u16 a1)
+{
+    s32 var1, var2, var3, var4;
+    u16 *vram;
+
+    vram = (u16*)(VRAM + 0x6000);
+    var1 = (a0 * 64) / a1;
+    var2 = var1 / 8;
+    for (var4 = 0; var4 < var2; var4++)
+    {
+        vram[11 + var4] = 0x80E9;
+        vram[43 + var4] = 0x80F9;
+    }
+    var3 = var1 % 8;
+    if (var3 != 0)
+    {
+        vram[11 + var4] = var3 + 0x80E1;
+        vram[43 + var4] = var3 + 0x80F1;
+        var4++;
+    }
+    for (; var4 < 8; var4++)
+    {
+        vram[11 + var4] = 0x80E1;
+        vram[43 + var4] = 0x80F1;
+    }
+}
+
+static u32 sub_8083210(u16 a0)
+{
+    return 0x57E40 * a0 / 0x10000;
+}
+
+static void sub_8083230(u16 a0)
+{
+    u8 i;
+    u8 palAdders[5];
+
+    u32 var = sub_8083210(a0);
+    if (sBerryBlenderData->max_RPM < var)
+        sBerryBlenderData->max_RPM = var;
+    for (i = 0; i < 5; i++)
+    {
+        palAdders[i] = var % 10;
+        var /= 10;
+    }
+    *((u16*)(VRAM + 0x6458)) = palAdders[4] + 0x8072;
+    *((u16*)(VRAM + 0x645A)) = palAdders[3] + 0x8072;
+    *((u16*)(VRAM + 0x645C)) = palAdders[2] + 0x8072;
+    *((u16*)(VRAM + 0x6460)) = palAdders[1] + 0x8072;
+    *((u16*)(VRAM + 0x6462)) = palAdders[0] + 0x8072;
+}
+
+static void sub_80832BC(s16* a0, u16 a1)
+{
+    if (*a0 == 0)
+        *a0 = (Random() % a1) - (a1 / 2);
+}
+
+static void sub_80832E8(s16* a0)
+{
+    if (*a0 < 0)
+        (*a0)++;
+    if (*a0 > 0)
+        (*a0)--;
+}
+
+static void sub_808330C(void)
+{
+    sub_80832E8(&sBerryBlenderData->bg_X);
+    sub_80832E8(&sBerryBlenderData->bg_Y);
+}
+
+static void sub_8083334(s16* a0, u16 a1)
+{
+    s32 var;
+
+    if (a1 < 10)
+        var = 16;
+    else
+        var = 8;
+
+    if (*a0 == 0)
+    {
+        *a0 = (Random() % var) - (var / 2);
+    }
+    else
+    {
+        if (*a0 < 0)
+            (*a0)++;
+        if (*a0 > 0)
+            (*a0)--;
+    }
+}
+
+static bool8 sub_8083380(void)
+{
+    if (sBerryBlenderData->framesToWait == 0)
+    {
+        sBerryBlenderData->bg_X = 0;
+        sBerryBlenderData->bg_Y = 0;
+    }
+
+    sBerryBlenderData->framesToWait++;
+    sub_8083334(&sBerryBlenderData->bg_X, sBerryBlenderData->framesToWait);
+    sub_8083334(&sBerryBlenderData->bg_Y, sBerryBlenderData->framesToWait);
+
+    if (sBerryBlenderData->framesToWait == 20)
+    {
+        sBerryBlenderData->bg_X = 0;
+        sBerryBlenderData->bg_Y = 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static void sub_80833F8(struct Sprite* sprite)
+{
+   sprite->pos2.x = -(sBerryBlenderData->bg_X);
+   sprite->pos2.y = -(sBerryBlenderData->bg_Y);
+}
+
+static void TryUpdateBerryBlenderRecord(void)
+{
+    if (gSaveBlock1Ptr->berryBlenderRecords[sBerryBlenderData->playersNo - 2] < sBerryBlenderData->max_RPM)
+        gSaveBlock1Ptr->berryBlenderRecords[sBerryBlenderData->playersNo - 2] = sBerryBlenderData->max_RPM;
+}
+
+static bool8 Blender_PrintBlendingResults(void)
+{
+    u16 i;
+    s32 xPos, yPos;
+
+    struct Pokeblock pokeblock;
+    u8 flavours[6];
+    u8 text[40];
+    u16 berryIds[4]; // unused
+
+    switch (sBerryBlenderData->mainState)
+    {
+    case 0:
+        sBerryBlenderData->mainState++;
+        sBerryBlenderData->framesToWait = 17;
+        break;
+    case 1:
+        sBerryBlenderData->framesToWait -= 10;
+        if (sBerryBlenderData->framesToWait < 0)
+        {
+            sBerryBlenderData->framesToWait = 0;
+            sBerryBlenderData->mainState++;
+        }
+        break;
+    case 2:
+        if (++sBerryBlenderData->framesToWait > 20)
+        {
+            for (i = 0; i < BLENDER_SCORES_NO; i++)
+                DestroySprite(&gSprites[sBerryBlenderData->scoreIconIds[i]]);
+
+            sBerryBlenderData->framesToWait = 0;
+            sBerryBlenderData->mainState++;
+        }
+        break;
+    case 3:
+        {
+            u16 minutes, seconds;
+            u8 *txtPtr;
+
+            xPos = GetStringCenterAlignXOffset(1, sText_BlendingResults, 0xA8);
+            Blender_AddTextPrinter(5, sText_BlendingResults, xPos, 1, TEXT_SPEED_FF, 0);
+
+            if (sBerryBlenderData->playersNo == 4)
+                yPos = 17;
+            else
+                yPos = 21;
+
+            for (i = 0; i < sBerryBlenderData->playersNo; yPos += 16, i++)
+            {
+                u8 place = sBerryBlenderData->playerPlaces[i];
+
+                ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, i + 1, STR_CONV_MODE_LEFT_ALIGN, 1);
+                StringAppend(sBerryBlenderData->stringVar, sText_Dot);
+                StringAppend(sBerryBlenderData->stringVar, gText_Space);
+                StringAppend(sBerryBlenderData->stringVar, gLinkPlayers[place].name);
+                Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 8, yPos, TEXT_SPEED_FF, 3);
+
+                StringCopy(sBerryBlenderData->stringVar, sBerryBlenderData->blendedBerries[place].name);
+                ConvertInternationalString(sBerryBlenderData->stringVar, gLinkPlayers[place].language);
+                StringAppend(sBerryBlenderData->stringVar, sText_SpaceBerry);
+                Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 0x54, yPos, TEXT_SPEED_FF, 3);
+            }
+
+            Blender_AddTextPrinter(5, sText_MaximumSpeed, 0, 0x51, TEXT_SPEED_FF, 3);
+            ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, sBerryBlenderData->max_RPM / 100, STR_CONV_MODE_RIGHT_ALIGN, 3);
+            StringAppend(sBerryBlenderData->stringVar, sText_Dot);
+
+            ConvertIntToDecimalStringN(text, sBerryBlenderData->max_RPM % 100, STR_CONV_MODE_LEADING_ZEROS, 2);
+            StringAppend(sBerryBlenderData->stringVar, text);
+            StringAppend(sBerryBlenderData->stringVar, sText_RPM);
+
+            xPos = GetStringRightAlignXOffset(1, sBerryBlenderData->stringVar, 0xA8);
+            Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, xPos, 0x51, TEXT_SPEED_FF, 3);
+            Blender_AddTextPrinter(5, sText_Time, 0, 0x61, TEXT_SPEED_FF, 3);
+
+            seconds = (sBerryBlenderData->gameFrameTime / 60) % 60;
+            minutes = (sBerryBlenderData->gameFrameTime / (60 * 60));
+
+            ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, minutes, STR_CONV_MODE_LEADING_ZEROS, 2);
+            txtPtr = StringAppend(sBerryBlenderData->stringVar, sText_Min);
+
+            ConvertIntToDecimalStringN(txtPtr, seconds, STR_CONV_MODE_LEADING_ZEROS, 2);
+            StringAppend(sBerryBlenderData->stringVar, sText_Sec);
+
+            xPos = GetStringRightAlignXOffset(1, sBerryBlenderData->stringVar, 0xA8);
+            Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, xPos, 0x61, TEXT_SPEED_FF, 3);
+
+            sBerryBlenderData->framesToWait = 0;
+            sBerryBlenderData->mainState++;
+
+            CopyWindowToVram(5, 2);
+        }
+        break;
+    case 4:
+        if (gMain.newKeys & A_BUTTON)
+            sBerryBlenderData->mainState++;
+        break;
+    case 5:
+        sub_8198070(5, 1);
+
+        for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
+        {
+            if (sBerryBlenderData->chosenItemId[i] != 0)
+                berryIds[i] = sBerryBlenderData->chosenItemId[i] - FIRST_BERRY_INDEX;
+            if (sBerryBlenderData->field_8E[i] != 0xFF)
+            {
+                PutWindowTilemap(i);
+                CopyWindowToVram(i, 3);
+            }
+        }
+
+        sub_8081E20();
+
+        Blender_CalculatePokeblock(sBerryBlenderData->blendedBerries, &pokeblock, sBerryBlenderData->playersNo, flavours, sBerryBlenderData->max_RPM);
+        Blender_PrintMadePokeblockString(&pokeblock, sBerryBlenderData->stringVar);
+        TryAddContestLinkTvShow(&pokeblock, &sBerryBlenderData->tvBlender);
+
+        CreateTask(sub_8083F3C, 6);
+        sub_80EECEC();
+
+        RemoveBagItem(gSpecialVar_ItemId, 1);
+        AddPokeblock(&pokeblock);
+
+        sBerryBlenderData->textState = 0;
+        sBerryBlenderData->mainState++;
+        break;
+    case 6:
+        if (Blender_PrintText(&sBerryBlenderData->textState, sBerryBlenderData->stringVar, GetPlayerTextSpeed()))
+        {
+            TryUpdateBerryBlenderRecord();
+            return TRUE;
+        }
+        break;
+    }
+
+    return FALSE;
+}
+
+static void Blender_PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst)
+{
+    u8 text[12];
+    u8 flavourLvl, feel;
+
+    dst[0] = EOS;
+    StringCopy(dst, gPokeblockNames[pokeblock->color]);
+    StringAppend(dst, sText_WasMade);
+    StringAppend(dst, sText_NewLine);
+
+    flavourLvl = GetHighestPokeblocksFlavourLevel(pokeblock);
+    feel = GetPokeblocksFeel(pokeblock);
+
+    StringAppend(dst, sText_TheLevelIs);
+    ConvertIntToDecimalStringN(text, flavourLvl, STR_CONV_MODE_LEFT_ALIGN, 3);
+    StringAppend(dst, text);
+
+    StringAppend(dst, sText_TheFeelIs);
+    ConvertIntToDecimalStringN(text, feel, STR_CONV_MODE_LEFT_ALIGN, 3);
+    StringAppend(dst, text);
+
+    StringAppend(dst, sText_Dot2);
+    StringAppend(dst, sText_NewParagraph);
+}
+
+static void Blender_SortBasedOnPoints(u8 *places, u8 playersNum, u32 *scores)
+{
+    s32 i, j;
+
+    for (i = 0; i < playersNum; i++)
+    {
+        for (j = 0; j < playersNum; j++)
+        {
+            if (scores[places[i]] > scores[places[j]])
+            {
+                u8 temp = places[i];
+                places[i] = places[j];
+                places[j] = temp;
+            }
+        }
+    }
+}
+
+static void Blender_SortScores(void)
+{
+    u8 playerId;
+    u8 i;
+    u8 places[BLENDER_MAX_PLAYERS];
+    u32 points[BLENDER_MAX_PLAYERS];
+
+    for (i = 0; i < sBerryBlenderData->playersNo; i++)
+        places[i] = i;
+    for (i = 0; i < sBerryBlenderData->playersNo; i++)
+    {
+        points[i] = 1000000 * sBerryBlenderData->scores[i][BLENDER_SCORE_BEST];
+        points[i] += 1000 * sBerryBlenderData->scores[i][BLENDER_SCORE_GOOD];
+        points[i] += 1000 - sBerryBlenderData->scores[i][BLENDER_SCORE_MISS];
+    }
+    Blender_SortBasedOnPoints(places, sBerryBlenderData->playersNo, points);
+    for (i = 0; i < sBerryBlenderData->playersNo; i++)
+        sBerryBlenderData->playerPlaces[i] = places[i];
+
+    if (gReceivedRemoteLinkPlayers == 0)
+        playerId = 0;
+    else
+        playerId = GetMultiplayerId();
+
+    for (i = 0; i < sBerryBlenderData->playersNo; i++)
+    {
+        if (sBerryBlenderData->playerPlaces[i] == playerId)
+            sBerryBlenderData->field_1A4 = i;
+    }
+}
+
+static bool8 Blender_PrintBlendingRanking(void)
+{
+    u16 i;
+    s32 xPos, yPos;
+
+    switch (sBerryBlenderData->mainState)
+    {
+    case 0:
+        sBerryBlenderData->mainState++;
+        sBerryBlenderData->framesToWait = 255;
+        break;
+    case 1:
+        sBerryBlenderData->framesToWait -= 10;
+        if (sBerryBlenderData->framesToWait < 0)
+        {
+            sBerryBlenderData->framesToWait = 0;
+            sBerryBlenderData->mainState++;
+        }
+        break;
+    case 2:
+        if (++sBerryBlenderData->framesToWait > 20)
+        {
+            sBerryBlenderData->framesToWait = 0;
+            sBerryBlenderData->mainState++;
+        }
+        break;
+    case 3:
+        SetWindowBorderStyle(5, 0, 1, 0xD);
+        xPos = GetStringCenterAlignXOffset(1, sText_Ranking, 0xA8);
+        Blender_AddTextPrinter(5, sText_Ranking, xPos, 1, TEXT_SPEED_FF, 0);
+
+        sBerryBlenderData->scoreIconIds[BLENDER_SCORE_BEST] = CreateSprite(&sUnknown_08339B40, 128, 52, 0);
+        StartSpriteAnim(&gSprites[sBerryBlenderData->scoreIconIds[BLENDER_SCORE_BEST]], 3);
+        gSprites[sBerryBlenderData->scoreIconIds[BLENDER_SCORE_BEST]].callback = SpriteCallbackDummy;
+
+        sBerryBlenderData->scoreIconIds[BLENDER_SCORE_GOOD] = CreateSprite(&sUnknown_08339B40, 160, 52, 0);
+        gSprites[sBerryBlenderData->scoreIconIds[BLENDER_SCORE_GOOD]].callback = SpriteCallbackDummy;
+
+        sBerryBlenderData->scoreIconIds[BLENDER_SCORE_MISS] = CreateSprite(&sUnknown_08339B40, 192, 52, 0);
+        StartSpriteAnim(&gSprites[sBerryBlenderData->scoreIconIds[BLENDER_SCORE_MISS]], 1);
+        gSprites[sBerryBlenderData->scoreIconIds[BLENDER_SCORE_MISS]].callback = SpriteCallbackDummy;
+
+        Blender_SortScores();
+
+        for (yPos = 0x29, i = 0; i < sBerryBlenderData->playersNo; yPos += 0x10, i++)
+        {
+            u8 place = sBerryBlenderData->playerPlaces[i];
+
+            ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, i + 1, STR_CONV_MODE_LEFT_ALIGN, 1);
+            StringAppend(sBerryBlenderData->stringVar, sText_Dot);
+            StringAppend(sBerryBlenderData->stringVar, gText_Space);
+            StringAppend(sBerryBlenderData->stringVar, gLinkPlayers[place].name);
+            Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 0, yPos, TEXT_SPEED_FF, 3);
+
+            ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, sBerryBlenderData->scores[place][BLENDER_SCORE_BEST], STR_CONV_MODE_RIGHT_ALIGN, 3);
+            Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 0x4E, yPos, TEXT_SPEED_FF, 3);
+
+            ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, sBerryBlenderData->scores[place][BLENDER_SCORE_GOOD], STR_CONV_MODE_RIGHT_ALIGN, 3);
+            Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 0x6E, yPos, TEXT_SPEED_FF, 3);
+
+            ConvertIntToDecimalStringN(sBerryBlenderData->stringVar, sBerryBlenderData->scores[place][BLENDER_SCORE_MISS], STR_CONV_MODE_RIGHT_ALIGN, 3);
+            Blender_AddTextPrinter(5, sBerryBlenderData->stringVar, 0x8E, yPos, TEXT_SPEED_FF, 3);
+        }
+
+        PutWindowTilemap(5);
+        CopyWindowToVram(5, 3);
+
+        sBerryBlenderData->framesToWait = 0;
+        sBerryBlenderData->mainState++;
+        break;
+    case 4:
+        if (++sBerryBlenderData->framesToWait > 20)
+            sBerryBlenderData->mainState++;
+        break;
+    case 5:
+        if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sBerryBlenderData->mainState++;
+        }
+        break;
+    case 6:
+        sBerryBlenderData->mainState = 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+void ShowBerryBlenderRecordWindow(void)
+{
+    s32 i;
+    s32 xPos, yPos;
+    struct WindowTemplate winTemplate;
+    u8 text[32];
+
+    winTemplate = sBlenderRecordWindowTemplate;
+    gResultsWindowId = AddWindow(&winTemplate);
+    sub_81973FC(gResultsWindowId, 0);
+    FillWindowPixelBuffer(gResultsWindowId, 0x11);
+
+    xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90);
+    PrintTextOnWindow(gResultsWindowId, 1, gText_BlenderMaxSpeedRecord, xPos, 1, 0, NULL);
+    PrintTextOnWindow(gResultsWindowId, 1, gText_234Players, 4, 0x29, 0, NULL);
+
+    for (i = 0, yPos = 0x29; i < BLENDER_SCORES_NO; i++)
+    {
+        u8 *txtPtr;
+        u32 record;
+
+        record = gSaveBlock1Ptr->berryBlenderRecords[i];
+
+        txtPtr = ConvertIntToDecimalStringN(text, record / 100, STR_CONV_MODE_RIGHT_ALIGN, 3);
+        txtPtr = StringAppend(txtPtr, sText_Dot);
+        txtPtr = ConvertIntToDecimalStringN(txtPtr, record % 100, STR_CONV_MODE_LEADING_ZEROS, 2);
+        txtPtr = StringAppend(txtPtr, sText_RPM);
+
+        xPos = GetStringRightAlignXOffset(1, text, 0x8C);
+        PrintTextOnWindow(gResultsWindowId, 1, text, xPos, yPos + (i * 16), 0, NULL);
+    }
+
+    PutWindowTilemap(gResultsWindowId);
+    CopyWindowToVram(gResultsWindowId, 3);
+}
+
+static void sub_8083F3C(u8 taskId)
+{
+    if (gTasks[taskId].data[0] == 0)
+    {
+        PlayFanfare(BGM_FANFA1);
+        gTasks[taskId].data[0]++;
+    }
+    if (IsFanfareTaskInactive())
+    {
+        PlayBGM(sBerryBlenderData->field_154);
+        DestroyTask(taskId);
+    }
+}
+
+static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlenderStruct *tvBlender)
+{
+    u8 flavourLevel = GetHighestPokeblocksFlavourLevel(pokeblock);
+    u16 sheen = (flavourLevel * 10) / GetPokeblocksFeel(pokeblock);
+
+    tvBlender->pokeblockSheen = sheen;
+    tvBlender->pokeblockColor = pokeblock->color;
+    tvBlender->name[0] = EOS;
+
+    if (gReceivedRemoteLinkPlayers != 0)
+    {
+        if (sBerryBlenderData->field_1A4 == 0 && sheen > 20)
+        {
+            StringCopy(tvBlender->name, gLinkPlayers[sBerryBlenderData->playerPlaces[sBerryBlenderData->playersNo - 1]].name);
+            tvBlender->pokeblockFlavour = GetPokeblocksFlavour(pokeblock);
+            if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavour,
+                                            tvBlender->pokeblockColor, tvBlender->pokeblockSheen,
+                                            gLinkPlayers[sBerryBlenderData->playerPlaces[sBerryBlenderData->playersNo - 1]].language))
+            {
+                return TRUE;
+            }
+
+            return FALSE;
+        }
+        else if (sBerryBlenderData->field_1A4 == sBerryBlenderData->playersNo - 1 && sheen <= 20)
+        {
+            StringCopy(tvBlender->name, gLinkPlayers[sBerryBlenderData->playerPlaces[0]].name);
+            tvBlender->pokeblockFlavour = GetPokeblocksFlavour(pokeblock);
+            if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavour,
+                                            tvBlender->pokeblockColor, tvBlender->pokeblockSheen,
+                                            gLinkPlayers[sBerryBlenderData->playerPlaces[0]].language))
+            {
+                return TRUE;
+            }
+
+            return FALSE;
+        }
+    }
+
+    return FALSE;
+}
+
+static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s32 speed, s32 caseId)
+{
+    struct TextColor txtColor;
+    u32 letterSpacing = 0;
+
+    switch (caseId)
+    {
+    case 0:
+    case 3:
+        txtColor.fgColor = 1;
+        txtColor.bgColor = 2;
+        txtColor.shadowColor = 3;
+        break;
+    case 1:
+        txtColor.fgColor = 0;
+        txtColor.bgColor = 2;
+        txtColor.shadowColor = 3;
+        break;
+    case 2:
+        txtColor.fgColor = 0;
+        txtColor.bgColor = 4;
+        txtColor.shadowColor = 5;
+        break;
+    }
+
+    if (caseId != 3)
+    {
+        FillWindowPixelBuffer(windowId, txtColor.fgColor | (txtColor.fgColor << 4));
+    }
+
+    AddTextPrinterParametrized2(windowId, 1, x, y, letterSpacing, 1, &txtColor, speed, string);
+}
+
+static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed)
+{
+    switch (*textState)
+    {
+    case 0:
+        sub_8197B1C(4, FALSE, 0x14, 0xF);
+        Blender_AddTextPrinter(4, string, 0, 1, textSpeed, 0);
+        PutWindowTilemap(4);
+        CopyWindowToVram(4, 3);
+        (*textState)++;
+        break;
+    case 1:
+        if (!IsTextPrinterActive(4))
+        {
+            *textState = 0;
+            return TRUE;
+        }
+        break;
+    }
+
+    return FALSE;
+}
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index eca20af9d..bba39c3eb 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -1,5 +1,3 @@
-
-// Includes
 #include "global.h"
 #include "gpu_regs.h"
 #include "multiboot.h"
@@ -10,6 +8,7 @@
 #include "task.h"
 #include "unknown_task.h"
 #include "window.h"
+#include "text.h"
 #include "menu.h"
 #include "m4a.h"
 
diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c
index 3192e0e11..d5e173ee8 100755
--- a/src/clear_save_data_screen.c
+++ b/src/clear_save_data_screen.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "task.h"
-#include "menu.h"
 #include "text.h"
+#include "menu.h"
 #include "sound.h"
 #include "main.h"
 #include "save.h"
diff --git a/src/decoration.c b/src/decoration.c
index adcdc583b..8093825f4 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "decompress.h"
 #include "malloc.h"
+#include "text.h"
 #include "string_util.h"
 #include "international_string_util.h"
 #include "script.h"
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index a3f7c2ab0..d9d77d2e9 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -57,8 +57,6 @@ extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle
 extern const u8 gText_HatchedFromEgg[];
 extern const u8 gText_NickHatchPrompt[];
 
-extern u8* GetMonNick(struct Pokemon* mon, u8* dst);
-extern u8* GetBoxMonNick(struct BoxPokemon* boxMon, u8* dst);
 extern u8 sav1_map_get_name(void);
 extern s8 sub_8198C58(void);
 extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8);
@@ -75,7 +73,6 @@ extern void play_some_sound(void);
 extern void copy_decompressed_tile_data_to_vram_autofree(u8 bg_id, const void* src, u16 size, u16 offset, u8 mode);
 extern void CreateYesNoMenu(const struct WindowTemplate*, u16, u8, u8);
 extern void DoNamingScreen(u8, const u8*, u16, u8, u32, MainCallback);
-extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor* colors, s8 speed, u8 *str);
 extern u16 sub_80D22D0(void);
 extern u8 CountPartyAliveNonEggMonsExcept(u8);
 
diff --git a/src/international_string_util.c b/src/international_string_util.c
index 81985d614..89b4a7a69 100644
--- a/src/international_string_util.c
+++ b/src/international_string_util.c
@@ -1,6 +1,6 @@
 #include "global.h"
-#include "international_string_util.h"
 #include "text.h"
+#include "international_string_util.h"
 
 extern s32 convert_pixel_width_to_tile_width(s32 a0); // script menu
 
diff --git a/src/mail.c b/src/mail.c
index 1ceb1be1a..dddc06feb 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -1,14 +1,12 @@
-
-// Includes
 #include "global.h"
 #include "main.h"
 #include "overworld.h"
 #include "task.h"
 #include "unknown_task.h"
 #include "palette.h"
+#include "text.h"
 #include "menu.h"
 #include "menu_helpers.h"
-#include "text.h"
 #include "text_window.h"
 #include "string_util.h"
 #include "international_string_util.h"
diff --git a/src/region_map.c b/src/region_map.c
index da96475c0..8c8f64df9 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1,7 +1,6 @@
-
-// Includes
 #include "global.h"
 #include "main.h"
+#include "text.h"
 #include "menu.h"
 #include "malloc.h"
 #include "gpu_regs.h"
@@ -17,7 +16,6 @@
 #include "string_util.h"
 #include "international_string_util.h"
 #include "strings.h"
-#include "text.h"
 #include "text_window.h"
 #include "songs.h"
 #include "m4a.h"
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 3f49b89e6..ef01f0293 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -13,8 +13,6 @@
 #define MSG_WIN_TOP 12
 #define CLOCK_WIN_TOP (MSG_WIN_TOP - 4)
 
-extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str);
-
 extern void (*gGameContinueCallback)(void);
 
 extern u32 gDamagedSaveSectors;
diff --git a/src/text.c b/src/text.c
index 8108a6867..7d688801c 100644
--- a/src/text.c
+++ b/src/text.c
@@ -190,7 +190,7 @@ bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*ca
     gTempTextPrinter.japanese = 0;
 
     GenerateFontHalfRowLookupTable(textSubPrinter->fontColor_h, textSubPrinter->bgColor, textSubPrinter->shadowColor);
-    if (speed != 0xFF && speed != 0x0)
+    if (speed != TEXT_SPEED_FF && speed != 0x0)
     {
         --gTempTextPrinter.text_speed;
         gTextPrinters[textSubPrinter->windowId] = gTempTextPrinter;
@@ -204,7 +204,7 @@ bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*ca
                 break;
         }
 
-        if (speed != 0xFF)
+        if (speed != TEXT_SPEED_FF)
           CopyWindowToVram(gTempTextPrinter.subPrinter.windowId, 2);
         gTextPrinters[textSubPrinter->windowId].sub_union.sub.active = 0;
     }
-- 
cgit v1.2.3


From 4e25ef10f2883ef228b7d6c26162d2b00dc3c291 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 20 Nov 2017 16:40:02 +0100
Subject: wild encounter review changes

---
 src/wild_encounter.c | 71 +++++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 34 deletions(-)

(limited to 'src')

diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index b4095aa17..ce1e02e5e 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -81,7 +81,7 @@ static bool8 CheckFeebas(void)
     u16 feebasSpots[NUM_FEEBAS_SPOTS];
     s16 x;
     s16 y;
-    u8 route119section = 0;
+    u8 route119Section = 0;
     u16 waterTileNum;
 
     if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_ROUTE119
@@ -93,16 +93,16 @@ static bool8 CheckFeebas(void)
 
 #ifdef NONMATCHING
         if (y >= gRoute119WaterTileData[3 * 1 + 0] && y <= gRoute119WaterTileData[3 * 1 + 1])
-            route119section = 1;
+            route119Section = 1;
         if (y >= gRoute119WaterTileData[3 * 2 + 0] && y <= gRoute119WaterTileData[3 * 2 + 1])
-            route119section = 2;
+            route119Section = 2;
 #else
         {
             register const u16 *arr asm("r0");
             if (y >= (arr = gRoute119WaterTileData)[3 * 1 + 0] && y <= arr[3 * 1 + 1])
-                route119section = 1;
+                route119Section = 1;
             if (y >= arr[3 * 2 + 0] && y <= arr[3 * 2 + 1])
-                route119section = 2;
+                route119Section = 2;
         }
 #endif
 
@@ -118,7 +118,7 @@ static bool8 CheckFeebas(void)
             if (feebasSpots[i] < 1 || feebasSpots[i] >= 4)
                 i++;
         }
-        waterTileNum = GetRoute119WaterTileNum(x, y, route119section);
+        waterTileNum = GetRoute119WaterTileNum(x, y, route119Section);
         for (i = 0; i < NUM_FEEBAS_SPOTS; i++)
         {
             if (waterTileNum == feebasSpots[i])
@@ -128,9 +128,12 @@ static bool8 CheckFeebas(void)
     return FALSE;
 }
 
+// The number 1103515245 comes from the example implementation of rand and srand
+// in the ISO C standard.
+
 static u16 FeebasRandom(void)
 {
-    sFeebasRngValue = 12345 + 0x41C64E6D * sFeebasRngValue;
+    sFeebasRngValue = (1103515245 * sFeebasRngValue) + 12345;
     return sFeebasRngValue >> 16;
 }
 
@@ -145,25 +148,25 @@ static u8 ChooseWildMonIndex_Land(void)
 
     if (rand < 20)                  // 20% chance
         return 0;
-    if (rand >= 20 && rand < 40)    // 20% chance
+    else if (rand >= 20 && rand < 40)    // 20% chance
         return 1;
-    if (rand >= 40 && rand < 50)    // 10% chance
+    else if (rand >= 40 && rand < 50)    // 10% chance
         return 2;
-    if (rand >= 50 && rand < 60)    // 10% chance
+    else if (rand >= 50 && rand < 60)    // 10% chance
         return 3;
-    if (rand >= 60 && rand < 70)    // 10% chance
+    else if (rand >= 60 && rand < 70)    // 10% chance
         return 4;
-    if (rand >= 70 && rand < 80)    // 10% chance
+    else if (rand >= 70 && rand < 80)    // 10% chance
         return 5;
-    if (rand >= 80 && rand < 85)    // 5% chance
+    else if (rand >= 80 && rand < 85)    // 5% chance
         return 6;
-    if (rand >= 85 && rand < 90)    // 5% chance
+    else if (rand >= 85 && rand < 90)    // 5% chance
         return 7;
-    if (rand >= 90 && rand < 94)    // 4% chance
+    else if (rand >= 90 && rand < 94)    // 4% chance
         return 8;
-    if (rand >= 94 && rand < 98)    // 4% chance
+    else if (rand >= 94 && rand < 98)    // 4% chance
         return 9;
-    if (rand == 98)                 // 1% chance
+    else if (rand == 98)                 // 1% chance
         return 10;
     else                            // 1% chance
         return 11;
@@ -175,11 +178,11 @@ static u8 ChooseWildMonIndex_WaterRock(void)
 
     if (rand < 60)                  // 60% chance
         return 0;
-    if (rand >= 60 && rand < 90)    // 30% chance
+    else if (rand >= 60 && rand < 90)    // 30% chance
         return 1;
-    if (rand >= 90 && rand < 95)    // 5% chance
+    else if (rand >= 90 && rand < 95)    // 5% chance
         return 2;
-    if (rand >= 95 && rand < 99)    // 4% chance
+    else if (rand >= 95 && rand < 99)    // 4% chance
         return 3;
     else                            // 1% chance
         return 4;
@@ -535,11 +538,11 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
             headerId = GetBattlePikeWildMonHeaderId();
             if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
                 return FALSE;
-            if (DoWildEncounterRateTest(gBattlePikeWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE)
+            else if (DoWildEncounterRateTest(gBattlePikeWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE)
                 return FALSE;
-            if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_KEEN_EYE) != TRUE)
+            else if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_KEEN_EYE) != TRUE)
                 return FALSE;
-            if (!TryGenerateBattlePikeWildMon(TRUE))
+            else if (!TryGenerateBattlePikeWildMon(TRUE))
                 return FALSE;
 
             BattleSetup_StartBattlePikeWildBattle();
@@ -550,9 +553,9 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
             headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId;
             if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
                 return FALSE;
-            if (DoWildEncounterRateTest(gBattlePyramidWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE)
+            else if (DoWildEncounterRateTest(gBattlePyramidWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE)
                 return FALSE;
-            if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_KEEN_EYE) != TRUE)
+            else if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_KEEN_EYE) != TRUE)
                 return FALSE;
 
             GenerateBattlePyramidWildMon();
@@ -566,9 +569,9 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
         {
             if (gWildMonHeaders[headerId].landMonsInfo == NULL)
                 return FALSE;
-            if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
+            else if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
                 return FALSE;
-            if (DoWildEncounterRateTest(gWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE)
+            else if (DoWildEncounterRateTest(gWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE)
                 return FALSE;
 
             if (TryStartRoamerEncounter() == TRUE)
@@ -603,11 +606,11 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
         {
             if (AreLegendariesInSootopolisPreventingEncounters() == TRUE)
                 return FALSE;
-            if (gWildMonHeaders[headerId].waterMonsInfo == NULL)
+            else if (gWildMonHeaders[headerId].waterMonsInfo == NULL)
                 return FALSE;
-            if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
+            else if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
                 return FALSE;
-            if (DoWildEncounterRateTest(gWildMonHeaders[headerId].waterMonsInfo->encounterRate, FALSE) != TRUE)
+            else if (DoWildEncounterRateTest(gWildMonHeaders[headerId].waterMonsInfo->encounterRate, FALSE) != TRUE)
                 return FALSE;
 
             if (TryStartRoamerEncounter() == TRUE)
@@ -783,10 +786,10 @@ u16 GetLocalWildMon(bool8 *isWaterMon)
     if (landMonsInfo == NULL && waterMonsInfo == NULL)
         return SPECIES_NONE;
     // Land Pokemon
-    if (landMonsInfo != NULL && waterMonsInfo == NULL)
+    else if (landMonsInfo != NULL && waterMonsInfo == NULL)
         return landMonsInfo->wildPokemon[ChooseWildMonIndex_Land()].species;
     // Water Pokemon
-    if (landMonsInfo == NULL && waterMonsInfo != NULL)
+    else if (landMonsInfo == NULL && waterMonsInfo != NULL)
     {
         *isWaterMon = TRUE;
         return waterMonsInfo->wildPokemon[ChooseWildMonIndex_WaterRock()].species;
@@ -907,9 +910,9 @@ static bool8 TryGetAbilityInfluencedWildMonIndex(const struct WildPokemon *wildM
 {
     if (GetMonData(&gPlayerParty[0], MON_DATA_SANITY_BIT3))
         return FALSE;
-    if (GetMonAbility(&gPlayerParty[0]) != ability)
+    else if (GetMonAbility(&gPlayerParty[0]) != ability)
         return FALSE;
-    if (Random() % 2 != 0)
+    else if (Random() % 2 != 0)
         return FALSE;
 
     return TryGetRandomWildMonIndexByType(wildMon, type, LAND_WILD_COUNT, monIndex);
-- 
cgit v1.2.3


From 161a37809bab3ab646c503a63d9ef258d9d518af Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 21 Nov 2017 21:25:01 -0500
Subject: nonmatching MoveSaveBlocks_ResetHeap (i tried...)

---
 src/load_save.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 139 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/load_save.c b/src/load_save.c
index 68d978e3d..d59a7c13e 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -4,7 +4,6 @@
 #include "main.h"
 #include "pokemon.h"
 #include "rng.h"
-#include "malloc.h"
 
 extern void* gUnknown_0203CF5C;
 
@@ -25,6 +24,8 @@ EWRAM_DATA u8 gSaveblock1_DMA[SAVEBLOCK_MOVE_RANGE] = {0};
 EWRAM_DATA struct PokemonStorage gPokemonStorage = {0};
 EWRAM_DATA u8 gSaveblock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0};
 
+extern void InitHeap(void *pointer, u32 size);
+
 void CheckForFlashMemory(void)
 {
     if (!IdentifyFlash())
@@ -60,18 +61,45 @@ void SetSaveBlocksPointers(u16 offset)
     SetDecorationInventoriesPointers();
 }
 
+// stuff i used to try and match MoveSaveBlocks_ResetHeap
 struct SaveBlocksInOne
 {
     struct SaveBlock2 sav2;
     struct SaveBlock1 sav1;
     struct PokemonStorage sav3;
 };
+
+extern struct SaveBlocksInOne gHeap;
+
+#define ewram_addr 0x02000000 // oh no...
+#define ewram_addr2 0x02000f2c
+#define ewram_addr3 0x02004cb4
+
+#define eSaveBlockCopy            (*(struct SaveBlocksInOne *)(ewram_addr + 0x0))
+#define eSaveBlock2Copy           (*(struct SaveBlock2 *)((void*)(ewram_addr + 0x0)))
+#define eSaveBlock1Copy           (*(struct SaveBlock1 *)((void*)(ewram_addr + sizeof(struct SaveBlock2))))
+#define eSaveBlock3Copy           (*(struct PokemonStorage *)((void*)(ewram_addr + sizeof(struct SaveBlock2) + sizeof(struct SaveBlock1))))
+
+#ifdef NONMATCHING // this is one devil of a motherfucker
 /*
+    The reason MoveSaveBlocks_ResetHeap mismatches is due to incorrect memcpys. Various
+    things have been tried, such as: direct struct copys, ewram casts, use of defining
+    the addresses manually, using memcpy anyway, delayed allocation of pointers at
+    the start of function, as seen above and below. Scope declaration has been used to try and
+    reproduce the correct macro thought to be used, but nothing has worked. It is worth
+    noting that at this point that the compiler will delay the allocation of the save block
+    pointers at the beginningto be allocated later: which might matter for matching this.
+    Due to loading shared ewram heap areas directly, it is very likely emerald used ewram
+    defines for this function, but there is no known example of a matching define.
+    In addition, dead code might be present in the form of a runtime variable used
+    to fix the address of the save blocks. This has been tested and is shown to affect
+    the registers as well.
+*/
 void MoveSaveBlocks_ResetHeap(void)
 {
     void *vblankCB, *hblankCB;
     u32 encryptionKey;
-    struct SaveBlocksInOne* copiedSavs;
+    struct SaveBlock1 **sav1Copy = &gSaveBlock1Ptr; // r10;
 
     // save interrupt functions and turn them off
     vblankCB = gMain.vblankCallback;
@@ -80,24 +108,22 @@ void MoveSaveBlocks_ResetHeap(void)
     gMain.hblankCallback = NULL;
     gUnknown_0203CF5C = NULL;
 
-    copiedSavs = (void*)(gHeap);
-
-    // copy saveblocks' content
-    copiedSavs->sav2 = *gSaveBlock2Ptr;
-    copiedSavs->sav1 = *gSaveBlock1Ptr;
-    copiedSavs->sav3 = *gPokemonStoragePtr;
+    // backup the saves.
+    eSaveBlock1Copy = **sav1Copy;
+    eSaveBlock2Copy = *gSaveBlock2Ptr;
+    eSaveBlock3Copy = *gPokemonStoragePtr;
 
     // change saveblocks' pointers
     // argument is a sum of the individual trainerId bytes
-    SetSaveBlocksPointers(copiedSavs->sav2.playerTrainerId[0] + copiedSavs->sav2.playerTrainerId[1] + copiedSavs->sav2.playerTrainerId[2] + copiedSavs->sav2.playerTrainerId[3]);
+    SetSaveBlocksPointers(eSaveBlock2Copy.playerTrainerId[0] + eSaveBlock2Copy.playerTrainerId[1] + eSaveBlock2Copy.playerTrainerId[2] + eSaveBlock2Copy.playerTrainerId[3]);
 
     // restore saveblock data since the pointers changed
-    *gSaveBlock2Ptr = copiedSavs->sav2;
-    *gSaveBlock1Ptr = copiedSavs->sav1;
-    *gPokemonStoragePtr = copiedSavs->sav3;
+    **sav1Copy = eSaveBlock1Copy;
+    *gSaveBlock2Ptr = eSaveBlock2Copy;
+    *gPokemonStoragePtr = eSaveBlock3Copy;
 
     // heap was destroyed in the copying process, so reset it
-    InitHeap(gHeap, sizeof(gHeap));
+    InitHeap((void*)(0x02000000), 0x1C000);
 
     // restore interrupt functions
     gMain.hblankCallback = hblankCB;
@@ -107,4 +133,103 @@ void MoveSaveBlocks_ResetHeap(void)
     encryptionKey = (Random() << 0x10) + (Random());
     ApplyNewEncyprtionKeyToAllEncryptedData(encryptionKey);
     gSaveBlock2Ptr->encryptionKey = encryptionKey;
-}*/
+}
+#else
+__attribute__((naked))
+void MoveSaveBlocks_ResetHeap(void)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x8\n\
+    ldr r5, =gMain\n\
+    ldr r0, [r5, 0xC]\n\
+    str r0, [sp]\n\
+    ldr r1, [r5, 0x10]\n\
+    str r1, [sp, 0x4]\n\
+    movs r0, 0\n\
+    str r0, [r5, 0xC]\n\
+    str r0, [r5, 0x10]\n\
+    ldr r1, =gUnknown_0203CF5C\n\
+    str r0, [r1]\n\
+    ldr r4, =0x02000000\n\
+    ldr r0, =gSaveBlock2Ptr\n\
+    ldr r1, [r0]\n\
+    ldr r6, =0x00000f2c\n\
+    adds r0, r4, 0\n\
+    adds r2, r6, 0\n\
+    bl memcpy\n\
+    ldr r1, =gSaveBlock1Ptr\n\
+    mov r10, r1\n\
+    ldr r1, [r1]\n\
+    ldr r7, =0x00003d88\n\
+    ldr r0, =0x02000f2c\n\
+    adds r2, r7, 0\n\
+    bl memcpy\n\
+    ldr r0, =gPokemonStoragePtr\n\
+    mov r8, r0\n\
+    ldr r1, [r0]\n\
+    ldr r0, =0x000083d0\n\
+    mov r9, r0\n\
+    ldr r0, =0x02004cb4\n\
+    mov r2, r9\n\
+    bl memcpy\n\
+    ldrb r1, [r4, 0xA]\n\
+    ldrb r0, [r4, 0xB]\n\
+    adds r1, r0\n\
+    ldrb r0, [r4, 0xC]\n\
+    adds r1, r0\n\
+    ldrb r0, [r4, 0xD]\n\
+    adds r0, r1\n\
+    bl SetSaveBlocksPointers\n\
+    ldr r1, =gSaveBlock2Ptr\n\
+    ldr r0, [r1]\n\
+    adds r1, r4, 0\n\
+    adds r2, r6, 0\n\
+    bl memcpy\n\
+    mov r1, r10\n\
+    ldr r0, [r1]\n\
+    ldr r1, =0x02000f2c\n\
+    adds r2, r7, 0\n\
+    bl memcpy\n\
+    mov r1, r8\n\
+    ldr r0, [r1]\n\
+    ldr r1, =0x02004cb4\n\
+    mov r2, r9\n\
+    bl memcpy\n\
+    movs r1, 0xE0\n\
+    lsls r1, 9\n\
+    adds r0, r4, 0\n\
+    bl InitHeap\n\
+    ldr r0, [sp, 0x4]\n\
+    str r0, [r5, 0x10]\n\
+    ldr r1, [sp]\n\
+    str r1, [r5, 0xC]\n\
+    bl Random\n\
+    adds r4, r0, 0\n\
+    bl Random\n\
+    lsls r4, 16\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    adds r4, r0\n\
+    adds r0, r4, 0\n\
+    bl ApplyNewEncyprtionKeyToAllEncryptedData\n\
+    ldr r1, =gSaveBlock2Ptr\n\
+    ldr r0, [r1]\n\
+    adds r0, 0xAC\n\
+    str r4, [r0]\n\
+    add sp, 0x8\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool\n\
+    .syntax divided\n");
+}
+#endif
-- 
cgit v1.2.3


From eff1ad330031633b2a28f2b9e8bc8f5e5258826a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 22 Nov 2017 20:10:35 -0500
Subject: Decompile field poison

---
 src/field_poison.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 src/field_poison.c

(limited to 'src')

diff --git a/src/field_poison.c b/src/field_poison.c
new file mode 100644
index 000000000..f9d7b1609
--- /dev/null
+++ b/src/field_poison.c
@@ -0,0 +1,157 @@
+#include "global.h"
+#include "string_util.h"
+#include "party_menu.h"
+#include "species.h"
+#include "task.h"
+#include "field_message_box.h"
+#include "strings.h"
+#include "rom_818CFC8.h"
+#include "battle_frontier_2.h"
+#include "pokenav.h"
+#include "event_data.h"
+#include "script.h"
+#include "fldeff_80F9BCC.h"
+
+static bool32 sub_80F9568(struct Pokemon *pokemon)
+{
+    u16 species = GetMonData(pokemon, MON_DATA_SPECIES2);
+    if (species == SPECIES_NONE || species == SPECIES_EGG)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+static bool32 sub_80F958C(void)
+{
+    int i;
+    struct Pokemon *pokemon;
+
+    for (pokemon = gPlayerParty, i = 0; i < PARTY_SIZE; i++, pokemon++)
+    {
+        if (sub_80F9568(pokemon) && GetMonData(pokemon, MON_DATA_HP) != 0)
+        {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+static void sub_80F95C0(u8 partyIdx)
+{
+    struct Pokemon *pokemon;
+    unsigned status;
+
+    pokemon = &gPlayerParty[partyIdx];
+    status = 0;
+    AdjustFriendship(pokemon, 0x07);
+    SetMonData(pokemon, MON_DATA_STATUS, &status);
+    GetMonData(pokemon, MON_DATA_NICKNAME, gStringVar1);
+    StringGetEnd10(gStringVar1);
+}
+
+static bool32 sub_80F960C(u8 partyIdx)
+{
+    struct Pokemon *pokemon;
+
+    pokemon = &gPlayerParty[partyIdx];
+    if (sub_80F9568(pokemon) && GetMonData(pokemon, MON_DATA_HP) == 0 && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == 1)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static void sub_80F9654(u8 taskId)
+{
+    s16 *data;
+
+    data = gTasks[taskId].data;
+    switch (data[0])
+    {
+        case 0:
+            for (; data[1] < PARTY_SIZE; data[1]++)
+            {
+                if (sub_80F960C(data[1]))
+                {
+                    sub_80F95C0(data[1]);
+                    ShowFieldMessage(gText_PkmnFainted3);
+                    data[0]++;
+                    return;
+                }
+            }
+            data[0] = 2;
+            break;
+        case 1:
+            if (IsFieldMessageBoxHidden())
+            {
+                data[0]--;
+            }
+            break;
+        case 2:
+            if (sub_80F958C())
+            {
+                if (InBattlePyramid() | InBattlePike() || sub_81D5C18())
+                {
+                    gSpecialVar_Result = 2;
+                }
+                else
+                {
+                    gSpecialVar_Result = 1;
+                }
+            }
+            else
+            {
+                gSpecialVar_Result = 0;
+            }
+            EnableBothScriptContexts();
+            DestroyTask(taskId);
+            break;
+    }
+}
+
+void sub_80F972C(void)
+{
+    CreateTask(sub_80F9654, 80);
+    ScriptContext1_Stop();
+}
+
+unsigned overworld_poison(void)
+{
+    int i;
+    unsigned cnt1;
+    unsigned cnt2;
+    unsigned hp;
+    struct Pokemon *pokemon;
+
+    pokemon = gPlayerParty;
+    cnt2 = 0;
+    cnt1 = 0;
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        if (GetMonData(pokemon, MON_DATA_SANITY_BIT2) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == 1)
+        {
+            hp = GetMonData(pokemon, MON_DATA_HP);
+            if (hp == 0 || --hp == 0)
+            {
+                cnt1++;
+            }
+            SetMonData(pokemon, MON_DATA_HP, &hp);
+            cnt2++;
+        }
+        pokemon++;
+    }
+    if (cnt1 != 0 || cnt2 != 0)
+    {
+        overworld_poison_effect();
+    }
+    if (cnt1 != 0)
+    {
+        return 2;
+    }
+    if (cnt2 != 0)
+    {
+        return 1;
+    }
+    return 0;
+}
-- 
cgit v1.2.3


From 9644f4498296040f8fba68ccd8fcc75758dbed2c Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Wed, 22 Nov 2017 21:06:30 -0500
Subject: finish load_save.c

---
 src/load_save.c | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 183 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/load_save.c b/src/load_save.c
index d59a7c13e..5eb160e5a 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "global.h"    
 #include "gba/flash_internal.h"
 #include "load_save.h"
 #include "main.h"
@@ -10,11 +10,27 @@ extern void* gUnknown_0203CF5C;
 extern bool16 IdentifyFlash(void);
 extern void SetBagItemsPointers(void);
 extern void SetDecorationInventoriesPointers(void);
+extern void ApplyNewEncyprtionKeyToGameStats(u32 key);
+extern void ApplyNewEncyprtionKeyToBagItems(u32 newKey);
+extern void ApplyNewEncyprtionKeyToBagItems_(u32 key);
+extern void ApplyNewEncyprtionKeyToBerryPowder(u32 key);
+extern void sub_8084FAC(int unused);
 
-void ApplyNewEncyprtionKeyToAllEncryptedData(u32 encryptionKey);
+// this is probably wrong or misleading due to it being used in ResetHeap...
+extern void InitHeap(void *pointer, u32 size);
 
 #define SAVEBLOCK_MOVE_RANGE    128
 
+struct LoadedSaveData
+{
+ /*0x0000*/ struct ItemSlot items[30];
+ /*0x0078*/ struct ItemSlot keyItems[30];
+ /*0x00F0*/ struct ItemSlot pokeBalls[16];
+ /*0x0130*/ struct ItemSlot TMsHMs[64];
+ /*0x0230*/ struct ItemSlot berries[46];
+ /*0x02E8*/ struct MailStruct mail[16];
+};
+
 EWRAM_DATA struct SaveBlock2 gSaveblock2 = {0};
 EWRAM_DATA u8 gSaveblock2_DMA[SAVEBLOCK_MOVE_RANGE] = {0};
 
@@ -24,7 +40,10 @@ EWRAM_DATA u8 gSaveblock1_DMA[SAVEBLOCK_MOVE_RANGE] = {0};
 EWRAM_DATA struct PokemonStorage gPokemonStorage = {0};
 EWRAM_DATA u8 gSaveblock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0};
 
-extern void InitHeap(void *pointer, u32 size);
+EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0};
+EWRAM_DATA u32 gLastEncryptionKey = {0};
+
+void ApplyNewEncyprtionKeyToAllEncryptedData(u32 encryptionKey);
 
 void CheckForFlashMemory(void)
 {
@@ -233,3 +252,164 @@ void MoveSaveBlocks_ResetHeap(void)
     .syntax divided\n");
 }
 #endif
+
+u8 sav2_x1_query_bit1(void)
+{
+    return gSaveBlock2Ptr->specialSaveWarp & 1;
+}
+
+void sav2_x9_clear_bit1(void)
+{
+    gSaveBlock2Ptr->specialSaveWarp &= ~1;
+}
+
+void sub_8076D48(void)
+{
+    gSaveBlock2Ptr->specialSaveWarp |= 1;
+}
+
+void sub_8076D5C(void)
+{
+    sub_8084FAC(0);
+    gSaveBlock2Ptr->specialSaveWarp |= 1;
+}
+
+void sav2_gender2_inplace_and_xFE(void)
+{
+    gSaveBlock2Ptr->specialSaveWarp &= ~1;
+}
+
+void copy_player_party_to_sav1(void) // SavePlayerParty
+{
+    int i;
+
+    gSaveBlock1Ptr->playerPartyCount = gPlayerPartyCount;
+
+    for (i = 0; i < 6; i++)
+        gSaveBlock1Ptr->playerParty[i] = gPlayerParty[i];
+}
+
+void copy_player_party_from_sav1(void) // LoadPlayerParty
+{
+    int i;
+
+    gPlayerPartyCount = gSaveBlock1Ptr->playerPartyCount;
+
+    for (i = 0; i < 6; i++)
+        gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i];
+}
+
+void save_serialize_npcs(void) // SaveMapObjects
+{
+    int i;
+
+    for (i = 0; i < 16; i++)
+        gSaveBlock1Ptr->mapObjects[i] = gMapObjects[i];
+}
+
+void save_deserialize_npcs(void) // LoadMapObjects
+{
+    int i;
+
+    for (i = 0; i < 16; i++)
+        gMapObjects[i] = gSaveBlock1Ptr->mapObjects[i];
+}
+
+void SaveSerializedGame(void)
+{
+    copy_player_party_to_sav1();
+    save_serialize_npcs();
+}
+
+void LoadSerializedGame(void)
+{
+    copy_player_party_from_sav1();
+    save_deserialize_npcs();
+}
+
+void copy_bags_and_unk_data_from_save_blocks(void)
+{
+    int i;
+    
+    // load player items.
+    for (i = 0; i < 30; i++)
+        gLoadedSaveData.items[i] = gSaveBlock1Ptr->bagPocket_Items[i];
+
+    // load player key items.
+    for (i = 0; i < 30; i++)
+        gLoadedSaveData.keyItems[i] = gSaveBlock1Ptr->bagPocket_KeyItems[i];
+
+    // load player pokeballs.
+    for (i = 0; i < 16; i++)
+        gLoadedSaveData.pokeBalls[i] = gSaveBlock1Ptr->bagPocket_PokeBalls[i];
+
+    // load player TMs and HMs.
+    for (i = 0; i < 64; i++)
+        gLoadedSaveData.TMsHMs[i] = gSaveBlock1Ptr->bagPocket_TMHM[i];
+
+    // load player berries.
+    for (i = 0; i < 46; i++)
+        gLoadedSaveData.berries[i] = gSaveBlock1Ptr->bagPocket_Berries[i];
+
+    // load mail.
+    for (i = 0; i < 16; i++)
+        gLoadedSaveData.mail[i] = gSaveBlock1Ptr->mail[i];
+
+    gLastEncryptionKey = gSaveBlock2Ptr->encryptionKey;
+}
+
+void copy_bags_and_unk_data_to_save_blocks(void)
+{
+    int i;
+    u32 encryptionKeyBackup;
+
+    // save player items.
+    for (i = 0; i < 30; i++)
+        gSaveBlock1Ptr->bagPocket_Items[i] = gLoadedSaveData.items[i];
+
+    // save player key items.
+    for (i = 0; i < 30; i++)
+        gSaveBlock1Ptr->bagPocket_KeyItems[i] = gLoadedSaveData.keyItems[i];
+
+    // save player pokeballs.
+    for (i = 0; i < 16; i++)
+        gSaveBlock1Ptr->bagPocket_PokeBalls[i] = gLoadedSaveData.pokeBalls[i];
+
+    // save player TMs and HMs.
+    for (i = 0; i < 64; i++)
+        gSaveBlock1Ptr->bagPocket_TMHM[i] = gLoadedSaveData.TMsHMs[i];
+
+    // save player berries.
+    for (i = 0; i < 46; i++)
+        gSaveBlock1Ptr->bagPocket_Berries[i] = gLoadedSaveData.berries[i];
+
+    // save mail.
+    for (i = 0; i < 16; i++)
+        gSaveBlock1Ptr->mail[i] = gLoadedSaveData.mail[i];
+
+    encryptionKeyBackup = gSaveBlock2Ptr->encryptionKey;
+    gSaveBlock2Ptr->encryptionKey = gLastEncryptionKey;
+    ApplyNewEncyprtionKeyToBagItems(encryptionKeyBackup);
+    gSaveBlock2Ptr->encryptionKey = encryptionKeyBackup; // updated twice?
+}
+
+void ApplyNewEncyprtionKeyToHword(u16 *hWord, u32 newKey)
+{
+    *hWord ^= gSaveBlock2Ptr->encryptionKey;
+    *hWord ^= newKey;
+}
+
+void ApplyNewEncyprtionKeyToWord(u32 *word, u32 newKey)
+{
+    *word ^= gSaveBlock2Ptr->encryptionKey;
+    *word ^= newKey;
+}
+
+void ApplyNewEncyprtionKeyToAllEncryptedData(u32 encryptionKey)
+{
+    ApplyNewEncyprtionKeyToGameStats(encryptionKey);
+    ApplyNewEncyprtionKeyToBagItems_(encryptionKey);
+    ApplyNewEncyprtionKeyToBerryPowder(encryptionKey);
+    ApplyNewEncyprtionKeyToWord(&gSaveBlock1Ptr->money, encryptionKey);
+    ApplyNewEncyprtionKeyToHword(&gSaveBlock1Ptr->coins, encryptionKey);
+}
-- 
cgit v1.2.3


From ef18d3b8ec2ec0e0c0d7f4c48c9da921e34c5b02 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 23 Nov 2017 11:23:05 -0500
Subject: Decompile asm/unk_text_util.s

---
 src/pokemon_summary_screen.c | 61 ++++++++++++++++++++++----------------------
 src/text.c                   |  4 +--
 src/unk_text_util.c          | 56 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 33 deletions(-)
 create mode 100644 src/unk_text_util.c

(limited to 'src')

diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index d09cbc407..e9cd3e215 100755
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -15,6 +15,7 @@
 #include "sound.h"
 #include "species.h"
 #include "sprite.h"
+#include "unk_text_util.h"
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
@@ -166,9 +167,7 @@ extern s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth);
 extern s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth);
 extern bool8 sub_81A6BF4();
 extern bool8 sub_81B9E94();
-extern void sub_81AFBF0();
-extern u8 sub_81AFC0C(u8 a, u8 *b);
-extern void sub_81AFC28(u8 *a, u8 *b);
+extern void UnkTextUtil_Reset();
 extern void sub_8124610(u8 *a, u8 b);
 extern int GetPlayerIDAsU32();
 extern u8 GetCurrentPpToMaxPpState(u8 a, u8 b);
@@ -2993,12 +2992,12 @@ void sub_81C307C()
 {
     struct PokeSummary *sum = &gUnknown_0203CF1C->summary;
     u8 *text;
-    sub_81AFBF0();
-    sub_81AFC0C(0, gUnknown_0861CE74);
-    sub_81AFC0C(1, gUnknown_0861CE7B);
+    UnkTextUtil_Reset();
+    UnkTextUtil_SetPtrI(0, gUnknown_0861CE74);
+    UnkTextUtil_SetPtrI(1, gUnknown_0861CE7B);
     sub_81C31C0();
     if (sub_81A6BF4() == TRUE || sub_81B9E94() == TRUE || sub_81C3304() == TRUE)
-        sub_81AFC28(gStringVar4, gText_XNature);
+        UnkTextUtil_StringExpandPlaceholders(gStringVar4, gText_XNature);
     else
     {
         u8 *alloced1 = Alloc(32);
@@ -3007,7 +3006,7 @@ void sub_81C307C()
         if (sum->metLocation <= 0xD4)
         {
             sub_8124610(alloced2, sum->metLocation);
-            sub_81AFC0C(4, alloced2);
+            UnkTextUtil_SetPtrI(4, alloced2);
         }
         if (sub_81C3220() == 1)
         {
@@ -3022,7 +3021,7 @@ void sub_81C307C()
             text = (sum->metLocation > 0xD4) ? gText_XNatureObtainedInTrade : gText_XNatureProbablyMetAt;
         else
             text = gText_XNatureObtainedInTrade;
-        sub_81AFC28(gStringVar4, text);
+        UnkTextUtil_StringExpandPlaceholders(gStringVar4, text);
         Free(alloced1);
         Free(alloced2);
     }
@@ -3036,8 +3035,8 @@ void sub_81C3194()
 void sub_81C31C0()
 {
     struct UnkSummaryStruct *sumStruct = gUnknown_0203CF1C;
-    sub_81AFC0C(2, gNatureNamePointers[sumStruct->summary.nature]);
-    sub_81AFC0C(5, gText_EmptyString5);
+    UnkTextUtil_SetPtrI(2, gNatureNamePointers[sumStruct->summary.nature]);
+    UnkTextUtil_SetPtrI(5, gText_EmptyString5);
 }
 
 void sub_81C31F0(u8 *a)
@@ -3046,7 +3045,7 @@ void sub_81C31F0(u8 *a)
     if (level == 0)
         level = 5;
     ConvertIntToDecimalStringN(a, level, 0, 3);
-    sub_81AFC0C(3, a);
+    UnkTextUtil_SetPtrI(3, a);
 }
 
 u8 sub_81C3220()
@@ -3301,12 +3300,12 @@ void sub_81C3710()
     ConvertIntToDecimalStringN(alloced2, gUnknown_0203CF1C->summary.maxHP, 1, 3);
     ConvertIntToDecimalStringN(alloced3, gUnknown_0203CF1C->summary.atk, 1, 7);
     ConvertIntToDecimalStringN(alloced4, gUnknown_0203CF1C->summary.def, 1, 7);
-    sub_81AFBF0();
-    sub_81AFC0C(0, alloced1);
-    sub_81AFC0C(1, alloced2);
-    sub_81AFC0C(2, alloced3);
-    sub_81AFC0C(3, alloced4);
-    sub_81AFC28(gStringVar4, gUnknown_0861CE82);
+    UnkTextUtil_Reset();
+    UnkTextUtil_SetPtrI(0, alloced1);
+    UnkTextUtil_SetPtrI(1, alloced2);
+    UnkTextUtil_SetPtrI(2, alloced3);
+    UnkTextUtil_SetPtrI(3, alloced4);
+    UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_0861CE82);
     Free(alloced1);
     Free(alloced2);
     Free(alloced3);
@@ -3323,11 +3322,11 @@ void sub_81C3808()
     ConvertIntToDecimalStringN(gStringVar1, gUnknown_0203CF1C->summary.spatk, 1, 3);
     ConvertIntToDecimalStringN(gStringVar2, gUnknown_0203CF1C->summary.spdef, 1, 3);
     ConvertIntToDecimalStringN(gStringVar3, gUnknown_0203CF1C->summary.speed, 1, 3);
-    sub_81AFBF0();
-    sub_81AFC0C(0, gStringVar1);
-    sub_81AFC0C(1, gStringVar2);
-    sub_81AFC0C(2, gStringVar3);
-    sub_81AFC28(gStringVar4, gUnknown_0861CE8E);
+    UnkTextUtil_Reset();
+    UnkTextUtil_SetPtrI(0, gStringVar1);
+    UnkTextUtil_SetPtrI(1, gStringVar2);
+    UnkTextUtil_SetPtrI(2, gStringVar3);
+    UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_0861CE8E);
 }
 
 void sub_81C3890()
@@ -3436,10 +3435,10 @@ void sub_81C3B08(u8 a)
         sub_81C25A4(r8, gMoveNames[move], 0, (a<<4) + 1, 0, 1);
         ConvertIntToDecimalStringN(gStringVar1, r10->summary.pp[a], 1, 2);
         ConvertIntToDecimalStringN(gStringVar2, r6, 1, 2);
-        sub_81AFBF0();
-        sub_81AFC0C(0, gStringVar1);
-        sub_81AFC0C(1, gStringVar2);
-        sub_81AFC28(gStringVar4, gUnknown_0861CE97);
+        UnkTextUtil_Reset();
+        UnkTextUtil_SetPtrI(0, gStringVar1);
+        UnkTextUtil_SetPtrI(1, gStringVar2);
+        UnkTextUtil_StringExpandPlaceholders(gStringVar4, gUnknown_0861CE97);
         text = gStringVar4;
         r5 = GetCurrentPpToMaxPpState(r10->summary.pp[a], r6) + 9;
         offset = GetStringRightAlignXOffset(1, text, 0x2C);
@@ -3531,17 +3530,17 @@ void sub_81C3B08(u8 a)
 	movs r2, 0x1\n\
 	movs r3, 0x2\n\
 	bl ConvertIntToDecimalStringN\n\
-	bl sub_81AFBF0\n\
+	bl UnkTextUtil_Reset\n\
 	movs r0, 0\n\
 	mov r1, r8\n\
-	bl sub_81AFC0C\n\
+	bl UnkTextUtil_SetPtrI\n\
 	movs r0, 0x1\n\
 	adds r1, r4, 0\n\
-	bl sub_81AFC0C\n\
+	bl UnkTextUtil_SetPtrI\n\
 	ldr r4, =gStringVar4\n\
 	ldr r1, =gUnknown_0861CE97\n\
 	adds r0, r4, 0\n\
-	bl sub_81AFC28\n\
+	bl UnkTextUtil_StringExpandPlaceholders\n\
 	adds r7, r4, 0\n\
 	ldrb r0, [r5]\n\
 	adds r1, r6, 0\n\
diff --git a/src/text.c b/src/text.c
index 8108a6867..4ebe5a422 100644
--- a/src/text.c
+++ b/src/text.c
@@ -13,7 +13,7 @@ extern void CopyWindowToVram(u8 windowId, u8 mode);
 extern u16 Font6Func(struct TextPrinter *textPrinter);
 extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
 extern void PlaySE(u16 songNum);
-extern u8* sub_81AFC74(u8 a1);
+extern u8* UnkTextUtil_GetPtrI(u8 a1);
 
 EWRAM_DATA struct TextPrinter gTempTextPrinter = {0};
 EWRAM_DATA struct TextPrinter gTextPrinters[NUM_TEXT_PRINTERS] = {0};
@@ -2932,7 +2932,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
                 }
             case 0xF7:
                 if (bufferPointer == NULL)
-                    bufferPointer = sub_81AFC74(*++str);
+                    bufferPointer = UnkTextUtil_GetPtrI(*++str);
                 while (*bufferPointer != 0xFF)
                 {
                     glyphWidth = func(*bufferPointer++, isJapanese);
diff --git a/src/unk_text_util.c b/src/unk_text_util.c
new file mode 100644
index 000000000..825b333bb
--- /dev/null
+++ b/src/unk_text_util.c
@@ -0,0 +1,56 @@
+#include "global.h"
+#include "text.h"
+#include "unk_text_util.h"
+#include "string_util.h"
+
+static EWRAM_DATA const u8 *sStringPointers[8] = {};
+
+void UnkTextUtil_Reset(void)
+{
+    const u8 **ptr;
+    u8 *fillval;
+    const u8 **ptr2;
+
+    ptr = sStringPointers;
+    fillval = NULL;
+    ptr2 = ptr + (ARRAY_COUNT(sStringPointers) - 1);
+    do
+    {
+        *ptr2-- = fillval;
+    } while ((int)ptr2 >= (int)ptr);
+}
+
+void UnkTextUtil_SetPtrI(u8 idx, const u8 *ptr)
+{
+    if (idx < ARRAY_COUNT(sStringPointers))
+    {
+        sStringPointers[idx] = ptr;
+    }
+}
+
+u8 *UnkTextUtil_StringExpandPlaceholders(u8 *dest, const u8 *src)
+{
+    while (*src != EOS)
+    {
+        if (*src != 0xF7)
+        {
+            *dest++ = *src++;
+        }
+        else
+        {
+            src++;
+            if (sStringPointers[*src] != NULL)
+            {
+                dest = StringCopy(dest, sStringPointers[*src]);
+            }
+            src++;
+        }
+    }
+    *dest = EOS;
+    return dest;
+}
+
+const u8 *UnkTextUtil_GetPtrI(u8 idx)
+{
+    return sStringPointers[idx];
+}
-- 
cgit v1.2.3


From e8b1059345c87b15c74262b2a761e5c7be526a5f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 23 Nov 2017 13:29:11 -0500
Subject: CHAR_SPECIAL_F7 constant

Preface for string decompilation
---
 src/unk_text_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/unk_text_util.c b/src/unk_text_util.c
index 825b333bb..2773522b2 100644
--- a/src/unk_text_util.c
+++ b/src/unk_text_util.c
@@ -32,7 +32,7 @@ u8 *UnkTextUtil_StringExpandPlaceholders(u8 *dest, const u8 *src)
 {
     while (*src != EOS)
     {
-        if (*src != 0xF7)
+        if (*src != CHAR_SPECIAL_F7)
         {
             *dest++ = *src++;
         }
-- 
cgit v1.2.3


From 89d938ea9e10a637563a5b4d0d19ddb4535bcf8e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 23 Nov 2017 13:53:51 -0500
Subject: Finish decompiling coins

---
 src/coins.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/coins.c b/src/coins.c
index e1694b29c..e313a4221 100644
--- a/src/coins.c
+++ b/src/coins.c
@@ -53,7 +53,6 @@ void SetCoins(u16 coinAmount)
     gSaveBlock1Ptr->coins = coinAmount ^ gSaveBlock2Ptr->encryptionKey;
 }
 
-/* Can't match it lol
 bool8 GiveCoins(u16 toAdd)
 {
     u16 newAmount;
@@ -67,10 +66,22 @@ bool8 GiveCoins(u16 toAdd)
     }
     else
     {
-        newAmount = ownedCoins + toAdd;
-        if (newAmount > MAX_COINS)
-            newAmount = MAX_COINS;
+        ownedCoins += toAdd;
+        if (ownedCoins > MAX_COINS)
+            ownedCoins = MAX_COINS;
+        newAmount = ownedCoins;
     }
     SetCoins(newAmount);
     return TRUE;
-}*/
+}
+
+bool8 TakeCoins(u16 toSub)
+{
+    u16 ownedCoins = GetCoins();
+    if (ownedCoins >= toSub)
+    {
+        SetCoins(ownedCoins - toSub);
+        return TRUE;
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From c5dcbb78ce0a2fc423190aa743907164b72997a7 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 23 Nov 2017 21:04:15 -0500
Subject: unk_81BAD84

---
 src/unk_81BAD84.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/unk_81BAD84.c

(limited to 'src')

diff --git a/src/unk_81BAD84.c b/src/unk_81BAD84.c
new file mode 100644
index 000000000..43cb9a4b0
--- /dev/null
+++ b/src/unk_81BAD84.c
@@ -0,0 +1,20 @@
+#include "global.h"
+
+extern const struct {
+    const u8 *unk_0;
+    const u8 *unk_4;
+    const u8 *unk_8;
+} gUnknown_08617128[];
+
+void sub_81BAD84(u32 idx)
+{
+    REG_DISPCNT = 0x0000;
+    REG_BG0HOFS = 0x0000;
+    REG_BG0VOFS = 0x0000;
+    REG_BLDCNT = 0x0000;
+    LZ77UnCompVram(gUnknown_08617128[idx].unk_0, (void *)BG_CHAR_ADDR(0));
+    LZ77UnCompVram(gUnknown_08617128[idx].unk_4, (void *)BG_SCREEN_ADDR(31));
+    CpuCopy16(gUnknown_08617128[idx].unk_8, (void *)PLTT, 0x200);
+    REG_BG0CNT = 0x1f00;
+    REG_DISPCNT = DISPCNT_BG0_ON;
+}
-- 
cgit v1.2.3


From 772da493f9ea0dcd8838dd927f1b70ff63228c21 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 23 Nov 2017 21:15:57 -0500
Subject: data/unk_81BAD84

---
 src/unk_81BAD84.c | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/unk_81BAD84.c b/src/unk_81BAD84.c
index 43cb9a4b0..9ba98dd87 100644
--- a/src/unk_81BAD84.c
+++ b/src/unk_81BAD84.c
@@ -1,10 +1,37 @@
 #include "global.h"
+#include "graphics.h"
 
-extern const struct {
-    const u8 *unk_0;
-    const u8 *unk_4;
-    const u8 *unk_8;
-} gUnknown_08617128[];
+const struct {
+    const u8 *gfx;
+    const u8 *tileMap;
+    const u16 *pltt;
+} gUnknown_08617128[] = {
+    {
+        gUnknown_08DD87C0,
+        gUnknown_08DD8EE0,
+        gUnknown_08DD8780
+    }, {
+        gUnknown_08DD90E0,
+        gUnknown_08DD9718,
+        gUnknown_08DD9080
+    }, {
+        gUnknown_08DD98B4,
+        gUnknown_08DD9E58,
+        gUnknown_08DD9874
+    }, {
+        gUnknown_08DDA02C,
+        gUnknown_08DDA63C,
+        gUnknown_08DD9FEC
+    }, {
+        gUnknown_08DDA840,
+        gUnknown_08DDAE40,
+        gUnknown_08DDA800
+    }, {
+        gUnknown_08DDB020,
+        gUnknown_08DDB2C4,
+        gUnknown_08DDAFE0
+    }
+};
 
 void sub_81BAD84(u32 idx)
 {
@@ -12,9 +39,9 @@ void sub_81BAD84(u32 idx)
     REG_BG0HOFS = 0x0000;
     REG_BG0VOFS = 0x0000;
     REG_BLDCNT = 0x0000;
-    LZ77UnCompVram(gUnknown_08617128[idx].unk_0, (void *)BG_CHAR_ADDR(0));
-    LZ77UnCompVram(gUnknown_08617128[idx].unk_4, (void *)BG_SCREEN_ADDR(31));
-    CpuCopy16(gUnknown_08617128[idx].unk_8, (void *)PLTT, 0x200);
+    LZ77UnCompVram(gUnknown_08617128[idx].gfx, (void *)BG_CHAR_ADDR(0));
+    LZ77UnCompVram(gUnknown_08617128[idx].tileMap, (void *)BG_SCREEN_ADDR(31));
+    CpuCopy16(gUnknown_08617128[idx].pltt, (void *)PLTT, 0x200);
     REG_BG0CNT = 0x1f00;
     REG_DISPCNT = DISPCNT_BG0_ON;
 }
-- 
cgit v1.2.3


From da04898840083653835db7ca997b6d57f1d3c353 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 23 Nov 2017 23:10:51 -0500
Subject: Clean up includes

---
 src/coins.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/coins.c b/src/coins.c
index e313a4221..50c31cac0 100644
--- a/src/coins.c
+++ b/src/coins.c
@@ -2,8 +2,9 @@
 #include "coins.h"
 #include "text.h"
 #include "window.h"
-#include "text_window.h"
+#include "strings.h"
 #include "string_util.h"
+#include "new_menu_helpers.h"
 #include "menu.h"
 #include "international_string_util.h"
 
@@ -11,10 +12,6 @@
 
 EWRAM_DATA u8 sCoinsWindowId = 0;
 
-extern void sub_819746C(u8 windowId, bool8 copyToVram);
-
-extern const u8 gText_Coins[];
-
 void PrintCoinsString(u32 coinAmount)
 {
     u32 xAlign;
-- 
cgit v1.2.3


From ab569cc466879939689b3ed945657a13a444bf66 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 14:57:00 -0500
Subject: clock.s

---
 src/clock.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 src/clock.c

(limited to 'src')

diff --git a/src/clock.c b/src/clock.c
new file mode 100644
index 000000000..2ba42f70d
--- /dev/null
+++ b/src/clock.c
@@ -0,0 +1,96 @@
+#include "global.h"
+#include "rom6.h"
+#include "event_data.h"
+#include "rtc.h"
+#include "lottery_corner.h"
+#include "dewford_trend.h"
+#include "tv.h"
+#include "field_screen.h"
+#include "berry.h"
+#include "main.h"
+#include "overworld.h"
+#include "wallclock.h"
+
+// static types
+
+// static declarations
+
+static void sub_809E7E8(struct Time *localTime);
+static void sub_809E858(struct Time *localTime);
+
+// rodata
+
+// text
+
+static void sub_809E778(void)
+{
+    FlagSet(FLAG_SYS_CLOCK_SET);
+    RtcCalcLocalTime();
+    gSaveBlock2Ptr->lastBerryTreeUpdate = gLocalTime;
+    VarSet(VAR_DAYS, gLocalTime.days);
+}
+
+void DoTimeBasedEvents(void)
+{
+    if (FlagGet(FLAG_SYS_CLOCK_SET) && !sub_813B9C0())
+    {
+        RtcCalcLocalTime();
+        sub_809E7E8(&gLocalTime);
+        sub_809E858(&gLocalTime);
+    }
+}
+
+static void sub_809E7E8(struct Time *localTime)
+{
+    u16 *days = GetVarPointer(VAR_DAYS);
+    u16 daysSince;
+
+    if (*days != localTime->days)
+    {
+        if (*days <= localTime->days)
+        {
+            daysSince = localTime->days - *days;
+            ClearUpperFlags();
+            sub_8122580(daysSince);
+            sub_80ED888(daysSince);
+            sub_80AEFBC(daysSince);
+            UpdatePartyPokerusTime(daysSince);
+            sub_8137904(daysSince);
+            sub_8137A20(daysSince);
+            sub_8139EF4(daysSince);
+            sub_813A7F4(daysSince);
+            sub_813945C(daysSince);
+            SetRandomLotteryNumber(daysSince);
+            *days = localTime->days;
+        }
+    }
+}
+
+static void sub_809E858(struct Time *localTime)
+{
+    struct Time difference;
+    int minutes;
+
+    CalcTimeDifference(&difference, &gSaveBlock2Ptr->lastBerryTreeUpdate, localTime);
+    minutes = 24 * 60 * difference.days + 60 * difference.hours + difference.minutes;
+    if (minutes != 0)
+    {
+        if (minutes >= 0)
+        {
+            BerryTreeTimeUpdate(minutes);
+            gSaveBlock2Ptr->lastBerryTreeUpdate = *localTime;
+        }
+    }
+}
+
+void sub_809E8B4(void)
+{
+    sub_809E778();
+    SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+}
+
+void Special_StartWallClock(void)
+{
+    SetMainCallback2(Cb2_StartWallClock);
+    gMain.savedCallback = sub_809E8B4;
+}
-- 
cgit v1.2.3


From f54f2c424ffdbdd9b9b3c4758bbbe245833f6436 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 18:00:26 -0500
Subject: LoadWallClockGraphics

---
 src/wallclock.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 src/wallclock.c

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
new file mode 100644
index 000000000..bbf8c656a
--- /dev/null
+++ b/src/wallclock.c
@@ -0,0 +1,83 @@
+#include "global.h"
+#include "main.h"
+#include "palette.h"
+#include "gpu_regs.h"
+#include "bg.h"
+#include "rtc.h"
+#include "clock.h"
+#include "wallclock.h"
+#include "event_data.h"
+#include "graphics.h"
+#include "text.h"
+#include "window.h"
+#include "text_window.h"
+#include "menu.h"
+#include "unknown_task.h"
+#include "task.h"
+#include "decompress.h"
+
+// static types
+
+// static declarations
+
+// rodata
+
+extern const u16 gUnknown_085B21D4[];
+extern const struct BgTemplate gUnknown_085B21FC[];
+extern const struct WindowTemplate gUnknown_085B21DC[];
+extern const struct CompressedSpriteSheet gUnknown_085B2208;
+extern const struct SpritePalette gUnknown_085B2218;
+
+// text
+
+void sub_81347B4(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void LoadWallClockGraphics(void)
+{
+    SetVBlankCallback(NULL);
+    SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
+    SetGpuReg(REG_OFFSET_BG3CNT, 0x0000);
+    SetGpuReg(REG_OFFSET_BG2CNT, 0x0000);
+    SetGpuReg(REG_OFFSET_BG1CNT, 0x0000);
+    SetGpuReg(REG_OFFSET_BG0CNT, 0x0000);
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    ChangeBgX(1, 0, 0);
+    ChangeBgY(1, 0, 0);
+    ChangeBgX(2, 0, 0);
+    ChangeBgY(2, 0, 0);
+    ChangeBgX(3, 0, 0);
+    ChangeBgY(3, 0, 0);
+    DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000);
+    DmaClear32(3, (void *)OAM, OAM_SIZE);
+    DmaClear16(3, (void *)PLTT, PLTT_SIZE);
+    LZ77UnCompVram(gUnknown_08DCC05C, (void *)VRAM);
+    if (gSpecialVar_0x8004 == 0)
+    {
+        LoadPalette(gUnknown_08DCC01C, 0x00, 0x20);
+    }
+    else
+    {
+        LoadPalette(gUnknown_08DCC03C, 0x00, 0x20);
+    }
+    LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 0x20);
+    LoadPalette(gUnknown_085B21D4, 0xc0, 0x08);
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_085B21FC, 3);
+    InitWindows(gUnknown_085B21DC);
+    DeactivateAllTextPrinters();
+    sub_809882C(0, 0x250, 0xd0);
+    clear_scheduled_bg_copies_to_vram();
+    remove_some_task();
+    ResetTasks();
+    ResetSpriteData();
+    ResetPaletteFade();
+    FreeAllSpritePalettes();
+    LoadCompressedObjectPic(&gUnknown_085B2208);
+    LoadSpritePalettes(&gUnknown_085B2218);
+}
-- 
cgit v1.2.3


From 2280614a1467f3823aa3817026289bb2b22cfcaf Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 19:06:01 -0500
Subject: Start decompiling data

---
 src/wallclock.c | 46 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index bbf8c656a..0c283e871 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -22,11 +22,45 @@
 
 // rodata
 
-extern const u16 gUnknown_085B21D4[];
-extern const struct BgTemplate gUnknown_085B21FC[];
-extern const struct WindowTemplate gUnknown_085B21DC[];
-extern const struct CompressedSpriteSheet gUnknown_085B2208;
-extern const struct SpritePalette gUnknown_085B2218;
+const u8 gUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz");
+const u16 gUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal");
+const struct WindowTemplate gUnknown_085B21DC[] = {
+    { 0x00, 0x03, 0x11, 0x18, 0x02, 0x0e, 0x200 },
+    { 0x02, 0x18, 0x10, 0x06, 0x02, 0x0c, 0x230 },
+    DUMMY_WIN_TEMPLATE
+};
+const struct WindowTemplate gUnknown_085B21F4 = {
+    0x00, 0x18, 0x09, 0x05, 0x04, 0x0e, 0x23c
+};
+const struct BgTemplate gUnknown_085B21FC[] = {
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .priority = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 8,
+        .priority = 1
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 7,
+        .priority = 2
+    }
+};
+const struct CompressedSpriteSheet gUnknown_085B2208 = {
+    gUnknown_085B1F58, 0x2000, 0x1000
+};
+const u32 filler_85B2210[2] = {};
+const struct SpritePalette gUnknown_085B2218[] = {
+    { gUnknown_08DCC01C, 0x1000 },
+    { gUnknown_08DCC03C, 0x1001 },
+    {}
+};
 
 // text
 
@@ -79,5 +113,5 @@ void LoadWallClockGraphics(void)
     ResetPaletteFade();
     FreeAllSpritePalettes();
     LoadCompressedObjectPic(&gUnknown_085B2208);
-    LoadSpritePalettes(&gUnknown_085B2218);
+    LoadSpritePalettes(gUnknown_085B2218);
 }
-- 
cgit v1.2.3


From 24009ea941abb81068745926ca9960acf927dd4e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 19:49:03 -0500
Subject: through Cb2_StartWallClock and associated data

---
 src/wallclock.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 133 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index 0c283e871..2676bbf53 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -14,12 +14,20 @@
 #include "menu.h"
 #include "unknown_task.h"
 #include "task.h"
+#include "strings.h"
 #include "decompress.h"
 
 // static types
 
 // static declarations
 
+void sub_8134C9C(void);
+void sub_8134CB8(u8 taskId);
+void sub_81351AC(struct Sprite *sprite);
+void sub_8135244(struct Sprite *sprite);
+void sub_81352DC(struct Sprite *sprite);
+void sub_8135380(struct Sprite *sprite);
+
 // rodata
 
 const u8 gUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz");
@@ -61,10 +69,84 @@ const struct SpritePalette gUnknown_085B2218[] = {
     { gUnknown_08DCC03C, 0x1001 },
     {}
 };
+static const struct OamData Unknown_085B2230 = {
+    .y = 0xa0,
+    .size = 3,
+    .priority = 1
+};
+static const union AnimCmd Unknown_085B2238[] = {
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_END
+};
+static const union AnimCmd Unknown_085B2240[] = {
+    ANIMCMD_FRAME(64, 30),
+    ANIMCMD_END
+};
+static const union AnimCmd *const gUnknown_085B2248[] = {
+    Unknown_085B2238
+};
+static const union AnimCmd *const gUnknown_085B224C[] = {
+    Unknown_085B2240
+};
+const struct SpriteTemplate gUnknown_085B2250 = {
+    0x1000,
+    0x1000,
+    &Unknown_085B2230,
+    gUnknown_085B2248,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    sub_81351AC
+};
+const struct SpriteTemplate gUnknown_085B2268 = {
+    0x1000,
+    0x1000,
+    &Unknown_085B2230,
+    gUnknown_085B224C,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    sub_8135244
+};
+static const struct OamData Unknown_085B2280 = {
+    .y = 0xa0,
+    .size = 1,
+    .priority = 3
+};
+static const union AnimCmd Unknown_085B2288[] = {
+    ANIMCMD_FRAME(0x84, 30),
+    ANIMCMD_END
+};
+static const union AnimCmd Unknown_085B2290[] = {
+    ANIMCMD_FRAME(0x80, 30),
+    ANIMCMD_END
+};
+static const union AnimCmd *const gUnknown_085B2298[] = {
+    Unknown_085B2288
+};
+static const union AnimCmd *const gUnknown_085B229C[] = {
+    Unknown_085B2290
+};
+const struct SpriteTemplate gUnknown_085B22A0 = {
+    0x1000,
+    0x1000,
+    &Unknown_085B2280,
+    gUnknown_085B2298,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    sub_81352DC
+};
+const struct SpriteTemplate gUnknown_085B22B8 = {
+    0x1000,
+    0x1000,
+    &Unknown_085B2280,
+    gUnknown_085B229C,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    sub_8135380
+};
 
 // text
 
-void sub_81347B4(void)
+static void sub_81347B4(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
@@ -115,3 +197,53 @@ void LoadWallClockGraphics(void)
     LoadCompressedObjectPic(&gUnknown_085B2208);
     LoadSpritePalettes(gUnknown_085B2218);
 }
+
+void sub_813498C(void)
+{
+    BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+    EnableInterrupts(INTR_FLAG_VBLANK);
+    SetVBlankCallback(sub_81347B4);
+    SetMainCallback2(sub_8134C9C);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0x0000);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0x0000);
+    SetGpuReg(REG_OFFSET_BLDY, 0x0000);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
+    ShowBg(0);
+    ShowBg(2);
+    ShowBg(3);
+}
+
+void Cb2_StartWallClock(void)
+{
+    u8 taskId;
+    u8 spriteId;
+
+    LoadWallClockGraphics();
+    LZ77UnCompVram(gUnknown_08DCC648, (u16 *)BG_SCREEN_ADDR(7));
+    taskId = CreateTask(sub_8134CB8, 0);
+    gTasks[taskId].data[2] = 10;
+    gTasks[taskId].data[3] = 0;
+    gTasks[taskId].data[4] = 0;
+    gTasks[taskId].data[5] = 0;
+    gTasks[taskId].data[6] = 0;
+    gTasks[taskId].data[0] = 0;
+    gTasks[taskId].data[1] = 0x12c;
+    spriteId = CreateSprite(&gUnknown_085B2250, 0x78, 0x50, 1);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+    gSprites[spriteId].oam.matrixNum = 0;
+    spriteId = CreateSprite(&gUnknown_085B2268, 0x78, 0x50, 0);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+    gSprites[spriteId].oam.matrixNum = 1;
+    spriteId = CreateSprite(&gUnknown_085B22A0, 0x78, 0x50, 2);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data1 = 0x2d;
+    spriteId = CreateSprite(&gUnknown_085B22B8, 0x78, 0x50, 2);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data1 = 0x5a;
+    sub_813498C();
+    PrintTextOnWindow(1, 1, gText_Confirm3, 0, 1, 0, NULL);
+    PutWindowTilemap(1);
+    schedule_bg_copy_tilemap_to_vram(2);
+}
-- 
cgit v1.2.3


From efd23cb91b402ff44cf8139490ae37cf6990d1be Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 20:06:29 -0500
Subject: Cb2_ViewWallClock

---
 src/wallclock.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index 2676bbf53..bb6f4cd19 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -23,6 +23,8 @@
 
 void sub_8134C9C(void);
 void sub_8134CB8(u8 taskId);
+void sub_8134F10(u8 taskId);
+void sub_8135130(u8 taskId);
 void sub_81351AC(struct Sprite *sprite);
 void sub_8135244(struct Sprite *sprite);
 void sub_81352DC(struct Sprite *sprite);
@@ -238,12 +240,53 @@ void Cb2_StartWallClock(void)
     gSprites[spriteId].oam.matrixNum = 1;
     spriteId = CreateSprite(&gUnknown_085B22A0, 0x78, 0x50, 2);
     gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = 0x2d;
+    gSprites[spriteId].data1 = 45;
     spriteId = CreateSprite(&gUnknown_085B22B8, 0x78, 0x50, 2);
     gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = 0x5a;
+    gSprites[spriteId].data1 = 90;
     sub_813498C();
     PrintTextOnWindow(1, 1, gText_Confirm3, 0, 1, 0, NULL);
     PutWindowTilemap(1);
     schedule_bg_copy_tilemap_to_vram(2);
 }
+
+void Cb2_ViewWallClock(void)
+{
+    u8 taskId;
+    u8 spriteId;
+    u8 r10;
+    u8 spc;
+
+    LoadWallClockGraphics();
+    LZ77UnCompVram(gUnknown_08DCC908, (u16 *)BG_SCREEN_ADDR(7));
+    taskId = CreateTask(sub_8134F10, 0);
+    sub_8135130(taskId);
+    if (gTasks[taskId].data[5] == 0)
+    {
+        r10 = 45;
+        spc = 90;
+    }
+    else
+    {
+        r10 = 90;
+        spc = 135;
+    }
+    spriteId = CreateSprite(&gUnknown_085B2250, 0x78, 0x50, 1);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+    gSprites[spriteId].oam.matrixNum = 0;
+    spriteId = CreateSprite(&gUnknown_085B2268, 0x78, 0x50, 0);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+    gSprites[spriteId].oam.matrixNum = 1;
+    spriteId = CreateSprite(&gUnknown_085B22A0, 0x78, 0x50, 2);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data1 = r10;
+    spriteId = CreateSprite(&gUnknown_085B22B8, 0x78, 0x50, 2);
+    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data1 = spc;
+    sub_813498C();
+    PrintTextOnWindow(1, 1, gText_Cancel4, 0, 1, 0, NULL);
+    PutWindowTilemap(1);
+    schedule_bg_copy_tilemap_to_vram(2);
+}
-- 
cgit v1.2.3


From 2746967bef9e82df0655391176283c064997cf7b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 20:46:29 -0500
Subject: through sub_8134CE8

---
 src/wallclock.c | 429 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 427 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index bb6f4cd19..b6e4096f9 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -21,9 +21,13 @@
 
 // static declarations
 
-void sub_8134C9C(void);
-void sub_8134CB8(u8 taskId);
+static void sub_8134C9C(void);
+static void sub_8134CB8(u8 taskId);
+void sub_8134DC4(u8 taskId);
+void sub_8134CE8(u8 taskId);
 void sub_8134F10(u8 taskId);
+u16 sub_8134FFC(u16 a0, u8 a1, u8 a2);
+void sub_813504C(u8 taskId, u8 a1);
 void sub_8135130(u8 taskId);
 void sub_81351AC(struct Sprite *sprite);
 void sub_8135244(struct Sprite *sprite);
@@ -145,6 +149,368 @@ const struct SpriteTemplate gUnknown_085B22B8 = {
     gDummySpriteAffineAnimTable,
     sub_8135380
 };
+const s8 gUnknown_085B22D0[][2] = {
+    { 0x00, -0x18},
+    { 0x01, -0x19},
+    { 0x01, -0x19},
+    { 0x02, -0x19},
+    { 0x02, -0x19},
+    { 0x02, -0x19},
+    { 0x03, -0x18},
+    { 0x03, -0x19},
+    { 0x04, -0x19},
+    { 0x04, -0x19},
+    { 0x04, -0x19},
+    { 0x05, -0x19},
+    { 0x05, -0x19},
+    { 0x06, -0x18},
+    { 0x06, -0x18},
+    { 0x06, -0x18},
+    { 0x07, -0x18},
+    { 0x07, -0x18},
+    { 0x07, -0x18},
+    { 0x08, -0x18},
+    { 0x08, -0x18},
+    { 0x09, -0x18},
+    { 0x09, -0x18},
+    { 0x0a, -0x17},
+    { 0x0a, -0x17},
+    { 0x0b, -0x16},
+    { 0x0b, -0x16},
+    { 0x0b, -0x16},
+    { 0x0c, -0x16},
+    { 0x0c, -0x15},
+    { 0x0d, -0x15},
+    { 0x0d, -0x15},
+    { 0x0d, -0x15},
+    { 0x0e, -0x15},
+    { 0x0e, -0x15},
+    { 0x0e, -0x14},
+    { 0x0e, -0x14},
+    { 0x0f, -0x14},
+    { 0x0f, -0x13},
+    { 0x10, -0x13},
+    { 0x10, -0x13},
+    { 0x10, -0x13},
+    { 0x10, -0x12},
+    { 0x10, -0x12},
+    { 0x11, -0x12},
+    { 0x11, -0x11},
+    { 0x11, -0x11},
+    { 0x12, -0x11},
+    { 0x12, -0x11},
+    { 0x12, -0x10},
+    { 0x12, -0x10},
+    { 0x13, -0x10},
+    { 0x13, -0x0f},
+    { 0x13, -0x0f},
+    { 0x14, -0x0f},
+    { 0x14, -0x0e},
+    { 0x14, -0x0e},
+    { 0x14, -0x0d},
+    { 0x14, -0x0d},
+    { 0x15, -0x0d},
+    { 0x15, -0x0d},
+    { 0x15, -0x0c},
+    { 0x16, -0x0c},
+    { 0x16, -0x0c},
+    { 0x16, -0x0b},
+    { 0x16, -0x0b},
+    { 0x16, -0x0a},
+    { 0x17, -0x0a},
+    { 0x17, -0x09},
+    { 0x17, -0x09},
+    { 0x17, -0x09},
+    { 0x17, -0x09},
+    { 0x17, -0x08},
+    { 0x17, -0x08},
+    { 0x17, -0x07},
+    { 0x17, -0x07},
+    { 0x17, -0x06},
+    { 0x18, -0x06},
+    { 0x18, -0x06},
+    { 0x19, -0x05},
+    { 0x19, -0x05},
+    { 0x18, -0x04},
+    { 0x19, -0x04},
+    { 0x18, -0x03},
+    { 0x19, -0x03},
+    { 0x19, -0x03},
+    { 0x19, -0x02},
+    { 0x19, -0x02},
+    { 0x18, -0x01},
+    { 0x19, -0x01},
+    { 0x18,  0x00},
+    { 0x18,  0x00},
+    { 0x18,  0x00},
+    { 0x18,  0x01},
+    { 0x18,  0x01},
+    { 0x19,  0x02},
+    { 0x18,  0x02},
+    { 0x19,  0x02},
+    { 0x18,  0x03},
+    { 0x18,  0x03},
+    { 0x19,  0x04},
+    { 0x18,  0x04},
+    { 0x18,  0x05},
+    { 0x18,  0x05},
+    { 0x18,  0x05},
+    { 0x18,  0x06},
+    { 0x17,  0x06},
+    { 0x17,  0x06},
+    { 0x17,  0x07},
+    { 0x17,  0x08},
+    { 0x17,  0x08},
+    { 0x17,  0x08},
+    { 0x17,  0x09},
+    { 0x17,  0x09},
+    { 0x17,  0x0a},
+    { 0x16,  0x0a},
+    { 0x16,  0x0a},
+    { 0x16,  0x0b},
+    { 0x16,  0x0b},
+    { 0x16,  0x0b},
+    { 0x16,  0x0c},
+    { 0x15,  0x0c},
+    { 0x15,  0x0c},
+    { 0x15,  0x0d},
+    { 0x14,  0x0d},
+    { 0x14,  0x0d},
+    { 0x13,  0x0d},
+    { 0x13,  0x0d},
+    { 0x13,  0x0e},
+    { 0x13,  0x0e},
+    { 0x13,  0x0f},
+    { 0x13,  0x0f},
+    { 0x12,  0x0f},
+    { 0x12,  0x10},
+    { 0x11,  0x10},
+    { 0x11,  0x10},
+    { 0x11,  0x11},
+    { 0x11,  0x11},
+    { 0x10,  0x11},
+    { 0x10,  0x12},
+    { 0x10,  0x12},
+    { 0x0f,  0x12},
+    { 0x0e,  0x12},
+    { 0x0f,  0x13},
+    { 0x0e,  0x13},
+    { 0x0e,  0x13},
+    { 0x0d,  0x13},
+    { 0x0d,  0x14},
+    { 0x0d,  0x14},
+    { 0x0d,  0x14},
+    { 0x0c,  0x14},
+    { 0x0c,  0x14},
+    { 0x0c,  0x15},
+    { 0x0b,  0x15},
+    { 0x0b,  0x15},
+    { 0x0b,  0x15},
+    { 0x0a,  0x15},
+    { 0x0a,  0x16},
+    { 0x0a,  0x16},
+    { 0x09,  0x16},
+    { 0x09,  0x16},
+    { 0x08,  0x16},
+    { 0x07,  0x16},
+    { 0x07,  0x17},
+    { 0x07,  0x17},
+    { 0x06,  0x17},
+    { 0x06,  0x17},
+    { 0x05,  0x17},
+    { 0x05,  0x17},
+    { 0x05,  0x18},
+    { 0x04,  0x18},
+    { 0x04,  0x18},
+    { 0x04,  0x18},
+    { 0x03,  0x18},
+    { 0x02,  0x18},
+    { 0x02,  0x18},
+    { 0x01,  0x18},
+    { 0x01,  0x18},
+    { 0x00,  0x18},
+    { 0x00,  0x18},
+    {-0x01,  0x17},
+    { 0x00,  0x18},
+    { 0x00,  0x18},
+    {-0x01,  0x18},
+    {-0x01,  0x18},
+    {-0x02,  0x18},
+    {-0x02,  0x18},
+    {-0x03,  0x18},
+    {-0x03,  0x18},
+    {-0x04,  0x18},
+    {-0x04,  0x18},
+    {-0x05,  0x18},
+    {-0x05,  0x17},
+    {-0x05,  0x17},
+    {-0x06,  0x17},
+    {-0x06,  0x17},
+    {-0x07,  0x17},
+    {-0x07,  0x17},
+    {-0x07,  0x17},
+    {-0x08,  0x17},
+    {-0x08,  0x16},
+    {-0x09,  0x16},
+    {-0x09,  0x16},
+    {-0x0a,  0x16},
+    {-0x0a,  0x16},
+    {-0x0a,  0x15},
+    {-0x0b,  0x15},
+    {-0x0b,  0x15},
+    {-0x0b,  0x15},
+    {-0x0b,  0x14},
+    {-0x0c,  0x14},
+    {-0x0c,  0x14},
+    {-0x0d,  0x14},
+    {-0x0d,  0x14},
+    {-0x0d,  0x13},
+    {-0x0e,  0x13},
+    {-0x0e,  0x13},
+    {-0x0e,  0x13},
+    {-0x0e,  0x12},
+    {-0x0f,  0x12},
+    {-0x0f,  0x12},
+    {-0x0f,  0x11},
+    {-0x10,  0x11},
+    {-0x10,  0x11},
+    {-0x11,  0x11},
+    {-0x11,  0x10},
+    {-0x11,  0x10},
+    {-0x12,  0x10},
+    {-0x11,  0x0f},
+    {-0x12,  0x0f},
+    {-0x12,  0x0f},
+    {-0x13,  0x0f},
+    {-0x13,  0x0e},
+    {-0x13,  0x0e},
+    {-0x13,  0x0d},
+    {-0x13,  0x0d},
+    {-0x14,  0x0d},
+    {-0x14,  0x0c},
+    {-0x14,  0x0c},
+    {-0x15,  0x0c},
+    {-0x15,  0x0c},
+    {-0x15,  0x0b},
+    {-0x15,  0x0b},
+    {-0x15,  0x0a},
+    {-0x15,  0x0a},
+    {-0x15,  0x09},
+    {-0x16,  0x09},
+    {-0x16,  0x09},
+    {-0x16,  0x08},
+    {-0x16,  0x08},
+    {-0x16,  0x07},
+    {-0x17,  0x07},
+    {-0x17,  0x07},
+    {-0x17,  0x06},
+    {-0x17,  0x06},
+    {-0x17,  0x05},
+    {-0x18,  0x05},
+    {-0x17,  0x04},
+    {-0x17,  0x04},
+    {-0x18,  0x04},
+    {-0x18,  0x04},
+    {-0x18,  0x03},
+    {-0x18,  0x03},
+    {-0x18,  0x02},
+    {-0x18,  0x02},
+    {-0x18,  0x01},
+    {-0x18,  0x01},
+    {-0x18,  0x01},
+    {-0x18,  0x00},
+    {-0x19,  0x00},
+    {-0x18, -0x01},
+    {-0x19, -0x01},
+    {-0x18, -0x01},
+    {-0x18, -0x02},
+    {-0x18, -0x02},
+    {-0x18, -0x03},
+    {-0x18, -0x03},
+    {-0x18, -0x04},
+    {-0x18, -0x04},
+    {-0x18, -0x04},
+    {-0x18, -0x05},
+    {-0x18, -0x05},
+    {-0x18, -0x06},
+    {-0x18, -0x06},
+    {-0x17, -0x06},
+    {-0x17, -0x07},
+    {-0x17, -0x07},
+    {-0x17, -0x08},
+    {-0x17, -0x08},
+    {-0x17, -0x09},
+    {-0x17, -0x09},
+    {-0x16, -0x09},
+    {-0x16, -0x09},
+    {-0x16, -0x0a},
+    {-0x16, -0x0a},
+    {-0x15, -0x0a},
+    {-0x15, -0x0b},
+    {-0x16, -0x0b},
+    {-0x16, -0x0c},
+    {-0x15, -0x0c},
+    {-0x15, -0x0d},
+    {-0x15, -0x0d},
+    {-0x14, -0x0d},
+    {-0x15, -0x0e},
+    {-0x14, -0x0e},
+    {-0x14, -0x0e},
+    {-0x13, -0x0e},
+    {-0x13, -0x0f},
+    {-0x13, -0x0f},
+    {-0x12, -0x10},
+    {-0x12, -0x10},
+    {-0x12, -0x10},
+    {-0x12, -0x11},
+    {-0x12, -0x11},
+    {-0x11, -0x11},
+    {-0x11, -0x12},
+    {-0x11, -0x12},
+    {-0x10, -0x12},
+    {-0x10, -0x12},
+    {-0x10, -0x13},
+    {-0x10, -0x13},
+    {-0x0f, -0x13},
+    {-0x0f, -0x13},
+    {-0x0f, -0x14},
+    {-0x0e, -0x14},
+    {-0x0e, -0x14},
+    {-0x0e, -0x15},
+    {-0x0d, -0x15},
+    {-0x0d, -0x15},
+    {-0x0d, -0x15},
+    {-0x0c, -0x15},
+    {-0x0c, -0x16},
+    {-0x0b, -0x16},
+    {-0x0b, -0x16},
+    {-0x0b, -0x16},
+    {-0x0a, -0x16},
+    {-0x0a, -0x16},
+    {-0x09, -0x16},
+    {-0x09, -0x17},
+    {-0x09, -0x17},
+    {-0x08, -0x17},
+    {-0x08, -0x17},
+    {-0x07, -0x17},
+    {-0x07, -0x17},
+    {-0x07, -0x18},
+    {-0x06, -0x18},
+    {-0x06, -0x18},
+    {-0x05, -0x18},
+    {-0x05, -0x18},
+    {-0x04, -0x18},
+    {-0x04, -0x18},
+    {-0x04, -0x18},
+    {-0x04, -0x19},
+    {-0x03, -0x19},
+    {-0x02, -0x19},
+    {-0x02, -0x18},
+    {-0x02, -0x18},
+    {-0x01, -0x19},
+    {-0x01, -0x19},
+    { 0x00, -0x19}
+};
 
 // text
 
@@ -290,3 +656,62 @@ void Cb2_ViewWallClock(void)
     PutWindowTilemap(1);
     schedule_bg_copy_tilemap_to_vram(2);
 }
+
+static void sub_8134C9C(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    do_scheduled_bg_tilemap_copies_to_vram();
+    UpdatePaletteFade();
+}
+
+static void sub_8134CB8(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        gTasks[taskId].func = sub_8134CE8;
+    }
+}
+
+void sub_8134CE8(u8 taskId)
+{
+    if (gTasks[taskId].data[0] % 6)
+    {
+        gTasks[taskId].data[0] = sub_8134FFC(gTasks[taskId].data[0], gTasks[taskId].data[4], gTasks[taskId].data[6]);
+    }
+    else
+    {
+        gTasks[taskId].data[0] = gTasks[taskId].data[3] * 6;
+        gTasks[taskId].data[1] = (gTasks[taskId].data[2] % 12) * 30 + (gTasks[taskId].data[3] / 10) * 5;
+        if (gMain.newKeys & A_BUTTON)
+        {
+            gTasks[taskId].func = sub_8134DC4;
+        }
+        else
+        {
+            gTasks[taskId].data[4] = 0;
+            if (gMain.heldKeys & DPAD_LEFT)
+            {
+                gTasks[taskId].data[4] = 1;
+            }
+            if (gMain.heldKeys & DPAD_RIGHT)
+            {
+                gTasks[taskId].data[4] = 2;
+            }
+            if (gTasks[taskId].data[4] != 0)
+            {
+                if (gTasks[taskId].data[6] <= 0xFE)
+                {
+                    gTasks[taskId].data[6]++;
+                }
+                gTasks[taskId].data[0] = sub_8134FFC(gTasks[taskId].data[0], gTasks[taskId].data[4], gTasks[taskId].data[6]);
+                sub_813504C(taskId, gTasks[taskId].data[4]);
+            }
+            else
+            {
+                gTasks[taskId].data[6] = 0;
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From b210d5f86b4c949b8e98c9117bc19b62fe0ed352 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 21:06:46 -0500
Subject: through c3_80BF560

---
 src/wallclock.c | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index b6e4096f9..1b11b3137 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -15,6 +15,8 @@
 #include "unknown_task.h"
 #include "task.h"
 #include "strings.h"
+#include "sound.h"
+#include "songs.h"
 #include "decompress.h"
 
 // static types
@@ -23,8 +25,10 @@
 
 static void sub_8134C9C(void);
 static void sub_8134CB8(u8 taskId);
-void sub_8134DC4(u8 taskId);
-void sub_8134CE8(u8 taskId);
+static void sub_8134CE8(u8 taskId);
+static void sub_8134DC4(u8 taskId);
+static void c3_80BF560(u8 taskId);
+void sub_8134EA4(u8 taskId);
 void sub_8134F10(u8 taskId);
 u16 sub_8134FFC(u16 a0, u8 a1, u8 a2);
 void sub_813504C(u8 taskId, u8 a1);
@@ -674,7 +678,7 @@ static void sub_8134CB8(u8 taskId)
     }
 }
 
-void sub_8134CE8(u8 taskId)
+static void sub_8134CE8(u8 taskId)
 {
     if (gTasks[taskId].data[0] % 6)
     {
@@ -715,3 +719,31 @@ void sub_8134CE8(u8 taskId)
         }
     }
 }
+
+static void sub_8134DC4(u8 taskId)
+{
+    SetWindowBorderStyle(0, FALSE, 0x250, 0x0d);
+    PrintTextOnWindow(0, 1, gText_IsThisTheCorrectTime, 0, 1, 0, NULL);
+    PutWindowTilemap(0);
+    schedule_bg_copy_tilemap_to_vram(0);
+    CreateYesNoMenu(&gUnknown_085B21F4, 0x250, 0x0d, 1);
+    gTasks[taskId].func = c3_80BF560;
+}
+
+static void c3_80BF560(u8 taskId)
+{
+    switch (sub_8198C58())
+    {
+        case 0:
+            PlaySE(SE_SELECT);
+            gTasks[taskId].func = sub_8134EA4;
+            break;
+        case 1:
+        case -1:
+            PlaySE(SE_SELECT);
+            sub_8198070(0, FALSE);
+            ClearWindowTilemap(0);
+            gTasks[taskId].func = sub_8134CE8;
+            break;
+    }
+}
-- 
cgit v1.2.3


From 4a81b595c358b0c136e262057765565dd38a168e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 21:11:32 -0500
Subject: through c2_080111BC

---
 src/wallclock.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index 1b11b3137..b14037c43 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -28,7 +28,8 @@ static void sub_8134CB8(u8 taskId);
 static void sub_8134CE8(u8 taskId);
 static void sub_8134DC4(u8 taskId);
 static void c3_80BF560(u8 taskId);
-void sub_8134EA4(u8 taskId);
+static void sub_8134EA4(u8 taskId);
+static void c2_080111BC(u8 taskId);
 void sub_8134F10(u8 taskId);
 u16 sub_8134FFC(u16 a0, u8 a1, u8 a2);
 void sub_813504C(u8 taskId, u8 a1);
@@ -747,3 +748,19 @@ static void c3_80BF560(u8 taskId)
             break;
     }
 }
+
+static void sub_8134EA4(u8 taskId)
+{
+    RtcInitLocalTimeOffset(gTasks[taskId].data[2], gTasks[taskId].data[3]);
+    BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+    gTasks[taskId].func = c2_080111BC;
+}
+
+static void c2_080111BC(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        FreeAllWindowBuffers();
+        SetMainCallback2(gMain.savedCallback);
+    }
+}
-- 
cgit v1.2.3


From 046e5ebf6963bbe5cc3b668c1511f1e1597a6da9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 21:17:50 -0500
Subject: through sub_8134FB0

---
 src/wallclock.c | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index b14037c43..af343d1fc 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -30,7 +30,10 @@ static void sub_8134DC4(u8 taskId);
 static void c3_80BF560(u8 taskId);
 static void sub_8134EA4(u8 taskId);
 static void c2_080111BC(u8 taskId);
-void sub_8134F10(u8 taskId);
+static void sub_8134F10(u8 taskId);
+static void sub_8134F40(u8 taskId);
+static void sub_8134F78(u8 taskId);
+static void sub_8134FB0(u8 taskId);
 u16 sub_8134FFC(u16 a0, u8 a1, u8 a2);
 void sub_813504C(u8 taskId, u8 a1);
 void sub_8135130(u8 taskId);
@@ -764,3 +767,34 @@ static void c2_080111BC(u8 taskId)
         SetMainCallback2(gMain.savedCallback);
     }
 }
+
+static void sub_8134F10(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        gTasks[taskId].func = sub_8134F40;
+    }
+}
+
+static void sub_8134F40(u8 taskId)
+{
+    sub_8135130(taskId);
+    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    {
+        gTasks[taskId].func = sub_8134F78;
+    }
+}
+
+static void sub_8134F78(u8 taskId)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+    gTasks[taskId].func = sub_8134FB0;
+}
+
+static void sub_8134FB0(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(gMain.savedCallback);
+    }
+}
-- 
cgit v1.2.3


From dfa5f24e59e0e49525a1287f37ba7452d9e7c37e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 21:27:05 -0500
Subject: sub_8134FFC

---
 src/wallclock.c | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index af343d1fc..51f6c530d 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -34,7 +34,7 @@ static void sub_8134F10(u8 taskId);
 static void sub_8134F40(u8 taskId);
 static void sub_8134F78(u8 taskId);
 static void sub_8134FB0(u8 taskId);
-u16 sub_8134FFC(u16 a0, u8 a1, u8 a2);
+static u16 sub_8134FFC(u16 a0, u8 a1, u8 a2);
 void sub_813504C(u8 taskId, u8 a1);
 void sub_8135130(u8 taskId);
 void sub_81351AC(struct Sprite *sprite);
@@ -798,3 +798,37 @@ static void sub_8134FB0(u8 taskId)
         SetMainCallback2(gMain.savedCallback);
     }
 }
+
+static u8 sub_8134FD4(u16 a0)
+{
+    if (a0 > 60)
+    {
+        return 6;
+    }
+    if (a0 > 30)
+    {
+        return 3;
+    }
+    if (a0 > 10)
+    {
+        return 2;
+    }
+    return 1;
+}
+
+static u16 sub_8134FFC(u16 a0, u8 a1, u8 a2)
+{
+    u8 r1 = sub_8134FD4(a2);
+    switch (a1)
+    {
+        case 1:
+            if (a0) a0 -= r1;
+            else a0 = 360 - r1;
+            break;
+        case 2:
+            if (a0 < 360 - r1) a0 += r1;
+            else a0 = 0;
+            break;
+    }
+    return a0;
+}
-- 
cgit v1.2.3


From 1b3fcb83f252c83c1d97a630ed381622fed74fd6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 21:37:42 -0500
Subject: sub_813504C

---
 src/wallclock.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index 51f6c530d..e35e6a075 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -34,8 +34,9 @@ static void sub_8134F10(u8 taskId);
 static void sub_8134F40(u8 taskId);
 static void sub_8134F78(u8 taskId);
 static void sub_8134FB0(u8 taskId);
-static u16 sub_8134FFC(u16 a0, u8 a1, u8 a2);
-void sub_813504C(u8 taskId, u8 a1);
+static u16 sub_8134FFC(u16 a0, u8 command, u8 a2);
+static bool32 sub_813504C(u8 taskId, u8 command);
+void sub_81350E8(u8 taskId, u8 command);
 void sub_8135130(u8 taskId);
 void sub_81351AC(struct Sprite *sprite);
 void sub_8135244(struct Sprite *sprite);
@@ -816,10 +817,10 @@ static u8 sub_8134FD4(u16 a0)
     return 1;
 }
 
-static u16 sub_8134FFC(u16 a0, u8 a1, u8 a2)
+static u16 sub_8134FFC(u16 a0, u8 command, u8 a2)
 {
     u8 r1 = sub_8134FD4(a2);
-    switch (a1)
+    switch (command)
     {
         case 1:
             if (a0) a0 -= r1;
@@ -832,3 +833,49 @@ static u16 sub_8134FFC(u16 a0, u8 a1, u8 a2)
     }
     return a0;
 }
+
+static bool32 sub_813504C(u8 taskId, u8 command)
+{
+    switch (command)
+    {
+        case 1:
+            if (gTasks[taskId].data[3] > 0)
+            {
+                gTasks[taskId].data[3]--;
+            }
+            else
+            {
+                gTasks[taskId].data[3] = 59;
+                if (gTasks[taskId].data[2] > 0)
+                {
+                    gTasks[taskId].data[2]--;
+                }
+                else
+                {
+                    gTasks[taskId].data[2] = 23;
+                }
+                sub_81350E8(taskId, command);
+            }
+            break;
+        case 2:
+            if (gTasks[taskId].data[3] < 59)
+            {
+                gTasks[taskId].data[3]++;
+            }
+            else
+            {
+                gTasks[taskId].data[3] = 0;
+                if (gTasks[taskId].data[2] < 23)
+                {
+                    gTasks[taskId].data[2]++;
+                }
+                else
+                {
+                    gTasks[taskId].data[2] = 0;
+                }
+                sub_81350E8(taskId, command);
+            }
+            break;
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From 23c7c6a41c2aca624fa6884d121976544cb9ad10 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 21:52:22 -0500
Subject: _12HourClockFixAMPM

---
 src/wallclock.c | 124 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 81 insertions(+), 43 deletions(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index e35e6a075..f43fa413f 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -21,6 +21,14 @@
 
 // static types
 
+#define WALL_CLOCK_TASK_MINUTE_HAND_ANGLE  0
+#define WALL_CLOCK_TASK_HOUR_HAND_ANGLE    1
+#define WALL_CLOCK_TASK_HOUR               2
+#define WALL_CLOCK_TASK_MINUTE             3
+#define WALL_CLOCK_TASK_SET_COMMAND        4
+#define WALL_CLOCK_TASK_12HRCLOCK_AM_PM    5
+#define WALL_CLOCK_TASK_SET_SPEED          6
+
 // static declarations
 
 static void sub_8134C9C(void);
@@ -34,9 +42,9 @@ static void sub_8134F10(u8 taskId);
 static void sub_8134F40(u8 taskId);
 static void sub_8134F78(u8 taskId);
 static void sub_8134FB0(u8 taskId);
-static u16 sub_8134FFC(u16 a0, u8 command, u8 a2);
-static bool32 sub_813504C(u8 taskId, u8 command);
-void sub_81350E8(u8 taskId, u8 command);
+static u16 GetClockHandAngle(u16 a0, u8 command, u8 a2);
+static bool32 MoveClockHand(u8 taskId, u8 command);
+static void _12HourClockFixAMPM(u8 taskId, u8 command);
 void sub_8135130(u8 taskId);
 void sub_81351AC(struct Sprite *sprite);
 void sub_8135244(struct Sprite *sprite);
@@ -598,13 +606,13 @@ void Cb2_StartWallClock(void)
     LoadWallClockGraphics();
     LZ77UnCompVram(gUnknown_08DCC648, (u16 *)BG_SCREEN_ADDR(7));
     taskId = CreateTask(sub_8134CB8, 0);
-    gTasks[taskId].data[2] = 10;
-    gTasks[taskId].data[3] = 0;
-    gTasks[taskId].data[4] = 0;
-    gTasks[taskId].data[5] = 0;
-    gTasks[taskId].data[6] = 0;
-    gTasks[taskId].data[0] = 0;
-    gTasks[taskId].data[1] = 0x12c;
+    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] = 10;
+    gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] = 0;
+    gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND] = 0;
+    gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = 0;
+    gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED] = 0;
+    gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] = 0;
+    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR_HAND_ANGLE] = 0x12c;
     spriteId = CreateSprite(&gUnknown_085B2250, 0x78, 0x50, 1);
     gSprites[spriteId].data0 = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
@@ -636,7 +644,7 @@ void Cb2_ViewWallClock(void)
     LZ77UnCompVram(gUnknown_08DCC908, (u16 *)BG_SCREEN_ADDR(7));
     taskId = CreateTask(sub_8134F10, 0);
     sub_8135130(taskId);
-    if (gTasks[taskId].data[5] == 0)
+    if (gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] == 0)
     {
         r10 = 45;
         spc = 90;
@@ -685,41 +693,41 @@ static void sub_8134CB8(u8 taskId)
 
 static void sub_8134CE8(u8 taskId)
 {
-    if (gTasks[taskId].data[0] % 6)
+    if (gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] % 6)
     {
-        gTasks[taskId].data[0] = sub_8134FFC(gTasks[taskId].data[0], gTasks[taskId].data[4], gTasks[taskId].data[6]);
+        gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] = GetClockHandAngle(gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE], gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND], gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED]);
     }
     else
     {
-        gTasks[taskId].data[0] = gTasks[taskId].data[3] * 6;
-        gTasks[taskId].data[1] = (gTasks[taskId].data[2] % 12) * 30 + (gTasks[taskId].data[3] / 10) * 5;
+        gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] = gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] * 6;
+        gTasks[taskId].data[WALL_CLOCK_TASK_HOUR_HAND_ANGLE] = (gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] % 12) * 30 + (gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] / 10) * 5;
         if (gMain.newKeys & A_BUTTON)
         {
             gTasks[taskId].func = sub_8134DC4;
         }
         else
         {
-            gTasks[taskId].data[4] = 0;
+            gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND] = 0;
             if (gMain.heldKeys & DPAD_LEFT)
             {
-                gTasks[taskId].data[4] = 1;
+                gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND] = 1;
             }
             if (gMain.heldKeys & DPAD_RIGHT)
             {
-                gTasks[taskId].data[4] = 2;
+                gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND] = 2;
             }
-            if (gTasks[taskId].data[4] != 0)
+            if (gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND] != 0)
             {
-                if (gTasks[taskId].data[6] <= 0xFE)
+                if (gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED] <= 0xFE)
                 {
-                    gTasks[taskId].data[6]++;
+                    gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED]++;
                 }
-                gTasks[taskId].data[0] = sub_8134FFC(gTasks[taskId].data[0], gTasks[taskId].data[4], gTasks[taskId].data[6]);
-                sub_813504C(taskId, gTasks[taskId].data[4]);
+                gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] = GetClockHandAngle(gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE], gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND], gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED]);
+                MoveClockHand(taskId, gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND]);
             }
             else
             {
-                gTasks[taskId].data[6] = 0;
+                gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED] = 0;
             }
         }
     }
@@ -755,7 +763,7 @@ static void c3_80BF560(u8 taskId)
 
 static void sub_8134EA4(u8 taskId)
 {
-    RtcInitLocalTimeOffset(gTasks[taskId].data[2], gTasks[taskId].data[3]);
+    RtcInitLocalTimeOffset(gTasks[taskId].data[WALL_CLOCK_TASK_HOUR], gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE]);
     BeginNormalPaletteFade(-1, 0, 0, 16, 0);
     gTasks[taskId].func = c2_080111BC;
 }
@@ -800,7 +808,7 @@ static void sub_8134FB0(u8 taskId)
     }
 }
 
-static u8 sub_8134FD4(u16 a0)
+static u8 GetClockHandAngleChange(u16 a0)
 {
     if (a0 > 60)
     {
@@ -817,9 +825,9 @@ static u8 sub_8134FD4(u16 a0)
     return 1;
 }
 
-static u16 sub_8134FFC(u16 a0, u8 command, u8 a2)
+static u16 GetClockHandAngle(u16 a0, u8 command, u8 a2)
 {
-    u8 r1 = sub_8134FD4(a2);
+    u8 r1 = GetClockHandAngleChange(a2);
     switch (command)
     {
         case 1:
@@ -834,48 +842,78 @@ static u16 sub_8134FFC(u16 a0, u8 command, u8 a2)
     return a0;
 }
 
-static bool32 sub_813504C(u8 taskId, u8 command)
+static bool32 MoveClockHand(u8 taskId, u8 command)
 {
     switch (command)
     {
         case 1:
-            if (gTasks[taskId].data[3] > 0)
+            if (gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] > 0)
             {
-                gTasks[taskId].data[3]--;
+                gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE]--;
             }
             else
             {
-                gTasks[taskId].data[3] = 59;
-                if (gTasks[taskId].data[2] > 0)
+                gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] = 59;
+                if (gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] > 0)
                 {
-                    gTasks[taskId].data[2]--;
+                    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR]--;
                 }
                 else
                 {
-                    gTasks[taskId].data[2] = 23;
+                    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] = 23;
                 }
-                sub_81350E8(taskId, command);
+                _12HourClockFixAMPM(taskId, command);
             }
             break;
         case 2:
-            if (gTasks[taskId].data[3] < 59)
+            if (gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] < 59)
             {
-                gTasks[taskId].data[3]++;
+                gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE]++;
             }
             else
             {
-                gTasks[taskId].data[3] = 0;
-                if (gTasks[taskId].data[2] < 23)
+                gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] = 0;
+                if (gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] < 23)
                 {
-                    gTasks[taskId].data[2]++;
+                    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR]++;
                 }
                 else
                 {
-                    gTasks[taskId].data[2] = 0;
+                    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] = 0;
                 }
-                sub_81350E8(taskId, command);
+                _12HourClockFixAMPM(taskId, command);
             }
             break;
     }
     return FALSE;
 }
+
+static void _12HourClockFixAMPM(u8 taskId, u8 command)
+{
+    u8 hours = gTasks[taskId].data[WALL_CLOCK_TASK_HOUR];
+    switch (command)
+    {
+        case 1:
+            switch (hours)
+            {
+                case 11:
+                    gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = FALSE;
+                    break;
+                case 23:
+                    gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = TRUE;
+                    break;
+            }
+            break;
+        case 2:
+            switch (hours)
+            {
+                case 0:
+                    gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = FALSE;
+                    break;
+                case 12:
+                    gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = TRUE;
+                    break;
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 53a7f188f834cf778eb3de604c73facba13e0c9f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 22:08:12 -0500
Subject: through sub_81351AC

---
 src/wallclock.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index f43fa413f..c54fd269e 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -17,6 +17,7 @@
 #include "strings.h"
 #include "sound.h"
 #include "songs.h"
+#include "trig.h"
 #include "decompress.h"
 
 // static types
@@ -45,8 +46,8 @@ static void sub_8134FB0(u8 taskId);
 static u16 GetClockHandAngle(u16 a0, u8 command, u8 a2);
 static bool32 MoveClockHand(u8 taskId, u8 command);
 static void _12HourClockFixAMPM(u8 taskId, u8 command);
-void sub_8135130(u8 taskId);
-void sub_81351AC(struct Sprite *sprite);
+static void sub_8135130(u8 taskId);
+static void sub_81351AC(struct Sprite *sprite);
 void sub_8135244(struct Sprite *sprite);
 void sub_81352DC(struct Sprite *sprite);
 void sub_8135380(struct Sprite *sprite);
@@ -917,3 +918,42 @@ static void _12HourClockFixAMPM(u8 taskId, u8 command)
             break;
     }
 }
+
+static void sub_8135130(u8 taskId)
+{
+    RtcCalcLocalTime();
+    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] = gLocalTime.hours;
+    gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] = gLocalTime.minutes;
+    gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] = gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] * 6;
+    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR_HAND_ANGLE] = (gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] % 12) * 30 + (gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] / 10) * 5;
+    if (gLocalTime.hours < 12)
+    {
+        gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = FALSE;
+    }
+    else
+    {
+        gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = TRUE;
+    }
+}
+
+static void sub_81351AC(struct Sprite *sprite)
+{
+    u16 angle = gTasks[sprite->data0].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE];
+    s16 sin = Sin2(angle) / 16;
+    s16 cos = Cos2(angle) / 16;
+    u16 xhat;
+    u16 yhat;
+    SetOamMatrix(0, cos, sin, -sin, cos);
+    xhat = gUnknown_085B22D0[angle][0];
+    yhat = gUnknown_085B22D0[angle][1];
+    if (xhat > 0x80)
+    {
+        xhat |= 0xff00;
+    }
+    if (yhat > 0x80)
+    {
+        yhat |= 0xff00;
+    }
+    sprite->pos2.x = xhat;
+    sprite->pos2.y = yhat;
+}
-- 
cgit v1.2.3


From 1063bcaab8cdcade543b79f0b97fec36b1ecfa30 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 22:28:13 -0500
Subject: through sub_81352DC

---
 src/wallclock.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index c54fd269e..6c78d72a1 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -48,8 +48,8 @@ static bool32 MoveClockHand(u8 taskId, u8 command);
 static void _12HourClockFixAMPM(u8 taskId, u8 command);
 static void sub_8135130(u8 taskId);
 static void sub_81351AC(struct Sprite *sprite);
-void sub_8135244(struct Sprite *sprite);
-void sub_81352DC(struct Sprite *sprite);
+static void sub_8135244(struct Sprite *sprite);
+static void sub_81352DC(struct Sprite *sprite);
 void sub_8135380(struct Sprite *sprite);
 
 // rodata
@@ -957,3 +957,53 @@ static void sub_81351AC(struct Sprite *sprite)
     sprite->pos2.x = xhat;
     sprite->pos2.y = yhat;
 }
+
+static void sub_8135244(struct Sprite *sprite)
+{
+    u16 angle = gTasks[sprite->data0].data[WALL_CLOCK_TASK_HOUR_HAND_ANGLE];
+    s16 sin = Sin2(angle) / 16;
+    s16 cos = Cos2(angle) / 16;
+    u16 xhat;
+    u16 yhat;
+    SetOamMatrix(1, cos, sin, -sin, cos);
+    xhat = gUnknown_085B22D0[angle][0];
+    yhat = gUnknown_085B22D0[angle][1];
+    if (xhat > 0x80)
+    {
+        xhat |= 0xff00;
+    }
+    if (yhat > 0x80)
+    {
+        yhat |= 0xff00;
+    }
+    sprite->pos2.x = xhat;
+    sprite->pos2.y = yhat;
+}
+
+static void sub_81352DC(struct Sprite *sprite)
+{
+    if (gTasks[sprite->data0].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM])
+    {
+        if ((u16)(sprite->data1 - 60) < 30)
+        {
+            sprite->data1 += 5;
+        }
+        if (sprite->data1 < 60)
+        {
+            sprite->data1++;
+        }
+    }
+    else
+    {
+        if ((u16)(sprite->data1 - 46) < 30)
+        {
+            sprite->data1 -= 5;
+        }
+        if (sprite->data1 > 75)
+        {
+            sprite->data1--;
+        }
+    }
+    sprite->pos2.x = Cos2(sprite->data1) * 30 / 0x1000;
+    sprite->pos2.y = Sin2(sprite->data1) * 30 / 0x1000;
+}
-- 
cgit v1.2.3


From f9c3aeb9194e7c670742dc9b99ca90131c24ddc1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 22:30:20 -0500
Subject: sub_8135380

---
 src/wallclock.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index 6c78d72a1..436c498f4 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -50,7 +50,7 @@ static void sub_8135130(u8 taskId);
 static void sub_81351AC(struct Sprite *sprite);
 static void sub_8135244(struct Sprite *sprite);
 static void sub_81352DC(struct Sprite *sprite);
-void sub_8135380(struct Sprite *sprite);
+static void sub_8135380(struct Sprite *sprite);
 
 // rodata
 
@@ -1007,3 +1007,31 @@ static void sub_81352DC(struct Sprite *sprite)
     sprite->pos2.x = Cos2(sprite->data1) * 30 / 0x1000;
     sprite->pos2.y = Sin2(sprite->data1) * 30 / 0x1000;
 }
+
+static void sub_8135380(struct Sprite *sprite)
+{
+    if (gTasks[sprite->data0].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM])
+    {
+        if ((u16)(sprite->data1 - 105) < 30)
+        {
+            sprite->data1 += 5;
+        }
+        if (sprite->data1 < 105)
+        {
+            sprite->data1++;
+        }
+    }
+    else
+    {
+        if ((u16)(sprite->data1 - 91) < 30)
+        {
+            sprite->data1 -= 5;
+        }
+        if (sprite->data1 > 120)
+        {
+            sprite->data1--;
+        }
+    }
+    sprite->pos2.x = Cos2(sprite->data1) * 30 / 0x1000;
+    sprite->pos2.y = Sin2(sprite->data1) * 30 / 0x1000;
+}
-- 
cgit v1.2.3


From 9840be1f0041e697f1aefbdc839a5227b7100112 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 24 Nov 2017 22:43:05 -0500
Subject: Slight cleanup

---
 src/wallclock.c | 65 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index 436c498f4..5b9e80317 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -30,6 +30,9 @@
 #define WALL_CLOCK_TASK_12HRCLOCK_AM_PM    5
 #define WALL_CLOCK_TASK_SET_SPEED          6
 
+#define TAG_GFX_WALL_CLOCK_HAND 0x1000
+#define TAG_PAL_WALL_CLOCK_HAND 0x1000
+
 // static declarations
 
 static void sub_8134C9C(void);
@@ -54,17 +57,17 @@ static void sub_8135380(struct Sprite *sprite);
 
 // rodata
 
-const u8 gUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz");
-const u16 gUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal");
-const struct WindowTemplate gUnknown_085B21DC[] = {
+static const u8 gUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz");
+static const u16 gUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal");
+static const struct WindowTemplate gUnknown_085B21DC[] = {
     { 0x00, 0x03, 0x11, 0x18, 0x02, 0x0e, 0x200 },
     { 0x02, 0x18, 0x10, 0x06, 0x02, 0x0c, 0x230 },
     DUMMY_WIN_TEMPLATE
 };
-const struct WindowTemplate gUnknown_085B21F4 = {
+static const struct WindowTemplate gUnknown_085B21F4 = {
     0x00, 0x18, 0x09, 0x05, 0x04, 0x0e, 0x23c
 };
-const struct BgTemplate gUnknown_085B21FC[] = {
+static const struct BgTemplate gUnknown_085B21FC[] = {
     {
         .bg = 0,
         .charBaseIndex = 2,
@@ -84,12 +87,12 @@ const struct BgTemplate gUnknown_085B21FC[] = {
         .priority = 2
     }
 };
-const struct CompressedSpriteSheet gUnknown_085B2208 = {
-    gUnknown_085B1F58, 0x2000, 0x1000
+static const struct CompressedSpriteSheet gUnknown_085B2208 = {
+    gUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND
 };
-const u32 filler_85B2210[2] = {};
-const struct SpritePalette gUnknown_085B2218[] = {
-    { gUnknown_08DCC01C, 0x1000 },
+static const u32 filler_85B2210[2] = {};
+static const struct SpritePalette gUnknown_085B2218[] = {
+    { gUnknown_08DCC01C, TAG_PAL_WALL_CLOCK_HAND },
     { gUnknown_08DCC03C, 0x1001 },
     {}
 };
@@ -112,18 +115,18 @@ static const union AnimCmd *const gUnknown_085B2248[] = {
 static const union AnimCmd *const gUnknown_085B224C[] = {
     Unknown_085B2240
 };
-const struct SpriteTemplate gUnknown_085B2250 = {
-    0x1000,
-    0x1000,
+static const struct SpriteTemplate gUnknown_085B2250 = {
+    TAG_GFX_WALL_CLOCK_HAND,
+    TAG_PAL_WALL_CLOCK_HAND,
     &Unknown_085B2230,
     gUnknown_085B2248,
     NULL,
     gDummySpriteAffineAnimTable,
     sub_81351AC
 };
-const struct SpriteTemplate gUnknown_085B2268 = {
-    0x1000,
-    0x1000,
+static const struct SpriteTemplate gUnknown_085B2268 = {
+    TAG_GFX_WALL_CLOCK_HAND,
+    TAG_PAL_WALL_CLOCK_HAND,
     &Unknown_085B2230,
     gUnknown_085B224C,
     NULL,
@@ -149,25 +152,25 @@ static const union AnimCmd *const gUnknown_085B2298[] = {
 static const union AnimCmd *const gUnknown_085B229C[] = {
     Unknown_085B2290
 };
-const struct SpriteTemplate gUnknown_085B22A0 = {
-    0x1000,
-    0x1000,
+static const struct SpriteTemplate gUnknown_085B22A0 = {
+    TAG_GFX_WALL_CLOCK_HAND,
+    TAG_PAL_WALL_CLOCK_HAND,
     &Unknown_085B2280,
     gUnknown_085B2298,
     NULL,
     gDummySpriteAffineAnimTable,
     sub_81352DC
 };
-const struct SpriteTemplate gUnknown_085B22B8 = {
-    0x1000,
-    0x1000,
+static const struct SpriteTemplate gUnknown_085B22B8 = {
+    TAG_GFX_WALL_CLOCK_HAND,
+    TAG_PAL_WALL_CLOCK_HAND,
     &Unknown_085B2280,
     gUnknown_085B229C,
     NULL,
     gDummySpriteAffineAnimTable,
     sub_8135380
 };
-const s8 gUnknown_085B22D0[][2] = {
+static const s8 sClockHandCoords[][2] = {
     { 0x00, -0x18},
     { 0x01, -0x19},
     { 0x01, -0x19},
@@ -944,8 +947,8 @@ static void sub_81351AC(struct Sprite *sprite)
     u16 xhat;
     u16 yhat;
     SetOamMatrix(0, cos, sin, -sin, cos);
-    xhat = gUnknown_085B22D0[angle][0];
-    yhat = gUnknown_085B22D0[angle][1];
+    xhat = sClockHandCoords[angle][0];
+    yhat = sClockHandCoords[angle][1];
     if (xhat > 0x80)
     {
         xhat |= 0xff00;
@@ -966,8 +969,8 @@ static void sub_8135244(struct Sprite *sprite)
     u16 xhat;
     u16 yhat;
     SetOamMatrix(1, cos, sin, -sin, cos);
-    xhat = gUnknown_085B22D0[angle][0];
-    yhat = gUnknown_085B22D0[angle][1];
+    xhat = sClockHandCoords[angle][0];
+    yhat = sClockHandCoords[angle][1];
     if (xhat > 0x80)
     {
         xhat |= 0xff00;
@@ -984,7 +987,7 @@ static void sub_81352DC(struct Sprite *sprite)
 {
     if (gTasks[sprite->data0].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM])
     {
-        if ((u16)(sprite->data1 - 60) < 30)
+        if (sprite->data1 >= 60 && sprite->data1 < 90)
         {
             sprite->data1 += 5;
         }
@@ -995,7 +998,7 @@ static void sub_81352DC(struct Sprite *sprite)
     }
     else
     {
-        if ((u16)(sprite->data1 - 46) < 30)
+        if (sprite->data1 >= 46 && sprite->data1 < 76)
         {
             sprite->data1 -= 5;
         }
@@ -1012,7 +1015,7 @@ static void sub_8135380(struct Sprite *sprite)
 {
     if (gTasks[sprite->data0].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM])
     {
-        if ((u16)(sprite->data1 - 105) < 30)
+        if (sprite->data1 >= 105 && sprite->data1 < 135)
         {
             sprite->data1 += 5;
         }
@@ -1023,7 +1026,7 @@ static void sub_8135380(struct Sprite *sprite)
     }
     else
     {
-        if ((u16)(sprite->data1 - 91) < 30)
+        if (sprite->data1 >= 91 && sprite->data1 < 121)
         {
             sprite->data1 -= 5;
         }
-- 
cgit v1.2.3


From 9151a6d0942c5211f648154bbc675ce4d3a495a7 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 25 Nov 2017 18:42:31 +0100
Subject: dump battlescripts, rename battlescripts

---
 src/battle_2.c                            |  48 +-
 src/battle_controller_link_opponent.c     |  12 +-
 src/battle_controller_link_partner.c      |  12 +-
 src/battle_controller_opponent.c          |  12 +-
 src/battle_controller_player.c            |  12 +-
 src/battle_controller_player_partner.c    |  12 +-
 src/battle_controller_recorded_opponent.c |  12 +-
 src/battle_controller_recorded_player.c   |  12 +-
 src/battle_controller_safari.c            |  12 +-
 src/battle_controller_wally.c             |  12 +-
 src/battle_controllers.c                  |   6 +-
 src/battle_script_commands.c              | 733 +++++++++++++-----------------
 src/battle_util.c                         | 198 ++------
 13 files changed, 439 insertions(+), 654 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 2be6f9d77..d7f051272 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -6,6 +6,7 @@
 #include "gpu_regs.h"
 #include "unknown_task.h"
 #include "battle_setup.h"
+#include "battle_scripts.h"
 #include "pokemon.h"
 #include "palette.h"
 #include "task.h"
@@ -178,31 +179,6 @@ extern const u8 gText_Ice[];
 extern const u8 gText_Confusion[];
 extern const u8 gText_Love[];
 
-// battlescripts
-extern const u8 gUnknown_082DB8BE[];
-extern const u8 gUnknown_082DB881[];
-extern const u8 BattleScript_ActionSelectionItemsCantBeUsed[];
-extern const u8 gUnknown_082DAB11[];
-extern const u8 gUnknown_082DB9BA[];
-extern const u8 gUnknown_082DAAFE[];
-extern const u8 gUnknown_082DAB0B[];
-extern const u8 BattleScript_FocusPunchSetUp[];
-extern const u8 BattleScript_LinkBattleWonOrLost[];
-extern const u8 BattleScript_FrontierTrainerBattleWon[];
-extern const u8 BattleScript_LocalTrainerBattleWon[];
-extern const u8 BattleScript_PayDayMoneyAndPickUpItems[];
-extern const u8 BattleScript_LocalBattleLost[];
-extern const u8 gUnknown_082DB9C8[];
-extern const u8 gUnknown_082DAA0B[];
-extern const u8 gUnknown_082DB9C1[];
-extern const u8 BattleScript_RanAwayUsingMonAbility[];
-extern const u8 BattleScript_SmokeBallEscape[];
-extern const u8 BattleScript_GotAwaySafely[];
-extern const u8 BattleScript_WildMonFled[];
-extern const u8 BattleScript_MoveUsedLoafingAround[];
-extern const u8 BattleScript_ActionSwitch[];
-extern const u8 BattleScript_PrintFailedToRunString[];
-
 // functions
 extern void dp12_8087EA4(void);
 extern void sub_80356D0(void);
@@ -3704,7 +3680,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
     {
         StopCryAndClearCrySongs();
-        BattleScriptExecute(gUnknown_082DB8BE);
+        BattleScriptExecute(BattleScript_82DB8BE);
     }
 }
 
@@ -3792,9 +3768,9 @@ void BattleTurnPassed(void)
     gRandomTurnNumber = Random();
 
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
-        BattleScriptExecute(gUnknown_082DB881);
+        BattleScriptExecute(BattleScript_82DB881);
     else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->field_DA == 0)
-        BattleScriptExecute(gUnknown_082DB8BE);
+        BattleScriptExecute(BattleScript_82DB8BE);
 }
 
 u8 IsRunningFromBattleImpossible(void)
@@ -4052,7 +4028,7 @@ static void HandleTurnActionSelectionState(void)
                 case ACTION_SAFARI_ZONE_BALL:
                     if (IsPlayerPartyAndPokemonStorageFull())
                     {
-                        gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DAB11;
+                        gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DAB11;
                         gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
                         *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                         *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4107,7 +4083,7 @@ static void HandleTurnActionSelectionState(void)
                     && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000)
                     && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
-                    gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB9BA;
+                    gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB9BA;
                     gBattleCommunication[gActiveBank] = 8;
                     *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                     *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4117,13 +4093,13 @@ static void HandleTurnActionSelectionState(void)
                          && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
                          && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
-                    BattleScriptExecute(gUnknown_082DAAFE);
+                    BattleScriptExecute(BattleScript_82DAAFE);
                     gBattleCommunication[gActiveBank] = 1;
                 }
                 else if (IsRunningFromBattleImpossible() != 0
                          && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
-                    gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DAB0B;
+                    gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DAB0B;
                     gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
                     *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                     *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4811,13 +4787,13 @@ static void HandleEndTurn_BattleLost(void)
         {
             if (gBattleOutcome & BATTLE_OUTCOME_BIT_x80)
             {
-                gBattlescriptCurrInstr = gUnknown_082DB9C8;
+                gBattlescriptCurrInstr = BattleScript_82DB9C8;
                 gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
                 gSaveBlock2Ptr->field_CA9_b = 1;
             }
             else
             {
-                gBattlescriptCurrInstr = gUnknown_082DAA0B;
+                gBattlescriptCurrInstr = BattleScript_82DAA0B;
                 gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
             }
         }
@@ -4843,13 +4819,13 @@ static void HandleEndTurn_RanFromBattle(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
-        gBattlescriptCurrInstr = gUnknown_082DB9C1;
+        gBattlescriptCurrInstr = BattleScript_82DB9C1;
         gBattleOutcome = BATTLE_FORFEITED;
         gSaveBlock2Ptr->field_CA9_b = 1;
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
     {
-        gBattlescriptCurrInstr = gUnknown_082DB9C1;
+        gBattlescriptCurrInstr = BattleScript_82DB9C1;
         gBattleOutcome = BATTLE_FORFEITED;
     }
     else
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 423d34d45..5758aba87 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -82,7 +82,7 @@ static void LinkOpponentHandleBallThrowAnim(void);
 static void LinkOpponentHandlePause(void);
 static void LinkOpponentHandleMoveAnimation(void);
 static void LinkOpponentHandlePrintString(void);
-static void LinkOpponentHandlePrintStringPlayerOnly(void);
+static void LinkOpponentHandlePrintSelectionString(void);
 static void LinkOpponentHandleChooseAction(void);
 static void LinkOpponentHandleUnknownYesNoBox(void);
 static void LinkOpponentHandleChooseMove(void);
@@ -108,7 +108,7 @@ static void LinkOpponentHandleCmd39(void);
 static void LinkOpponentHandleCmd40(void);
 static void LinkOpponentHandleHitAnimation(void);
 static void LinkOpponentHandleCmd42(void);
-static void LinkOpponentHandleEffectivenessSound(void);
+static void LinkOpponentHandlePlaySE(void);
 static void LinkOpponentHandlePlayFanfareOrBGM(void);
 static void LinkOpponentHandleFaintingCry(void);
 static void LinkOpponentHandleIntroSlide(void);
@@ -154,7 +154,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     LinkOpponentHandlePause,
     LinkOpponentHandleMoveAnimation,
     LinkOpponentHandlePrintString,
-    LinkOpponentHandlePrintStringPlayerOnly,
+    LinkOpponentHandlePrintSelectionString,
     LinkOpponentHandleChooseAction,
     LinkOpponentHandleUnknownYesNoBox,
     LinkOpponentHandleChooseMove,
@@ -180,7 +180,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     LinkOpponentHandleCmd40,
     LinkOpponentHandleHitAnimation,
     LinkOpponentHandleCmd42,
-    LinkOpponentHandleEffectivenessSound,
+    LinkOpponentHandlePlaySE,
     LinkOpponentHandlePlayFanfareOrBGM,
     LinkOpponentHandleFaintingCry,
     LinkOpponentHandleIntroSlide,
@@ -1505,7 +1505,7 @@ static void LinkOpponentHandlePrintString(void)
     sub_817C95C(*stringId);
 }
 
-static void LinkOpponentHandlePrintStringPlayerOnly(void)
+static void LinkOpponentHandlePrintSelectionString(void)
 {
     LinkOpponentBufferExecCompleted();
 }
@@ -1681,7 +1681,7 @@ static void LinkOpponentHandleCmd42(void)
     LinkOpponentBufferExecCompleted();
 }
 
-static void LinkOpponentHandleEffectivenessSound(void)
+static void LinkOpponentHandlePlaySE(void)
 {
     s8 pan;
 
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index e3bee98d9..1af6da1cd 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -78,7 +78,7 @@ static void LinkPartnerHandleBallThrowAnim(void);
 static void LinkPartnerHandlePause(void);
 static void LinkPartnerHandleMoveAnimation(void);
 static void LinkPartnerHandlePrintString(void);
-static void LinkPartnerHandlePrintStringPlayerOnly(void);
+static void LinkPartnerHandlePrintSelectionString(void);
 static void LinkPartnerHandleChooseAction(void);
 static void LinkPartnerHandleUnknownYesNoBox(void);
 static void LinkPartnerHandleChooseMove(void);
@@ -104,7 +104,7 @@ static void LinkPartnerHandleCmd39(void);
 static void LinkPartnerHandleCmd40(void);
 static void LinkPartnerHandleHitAnimation(void);
 static void LinkPartnerHandleCmd42(void);
-static void LinkPartnerHandleEffectivenessSound(void);
+static void LinkPartnerHandlePlaySE(void);
 static void LinkPartnerHandlePlayFanfareOrBGM(void);
 static void LinkPartnerHandleFaintingCry(void);
 static void LinkPartnerHandleIntroSlide(void);
@@ -149,7 +149,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     LinkPartnerHandlePause,
     LinkPartnerHandleMoveAnimation,
     LinkPartnerHandlePrintString,
-    LinkPartnerHandlePrintStringPlayerOnly,
+    LinkPartnerHandlePrintSelectionString,
     LinkPartnerHandleChooseAction,
     LinkPartnerHandleUnknownYesNoBox,
     LinkPartnerHandleChooseMove,
@@ -175,7 +175,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     LinkPartnerHandleCmd40,
     LinkPartnerHandleHitAnimation,
     LinkPartnerHandleCmd42,
-    LinkPartnerHandleEffectivenessSound,
+    LinkPartnerHandlePlaySE,
     LinkPartnerHandlePlayFanfareOrBGM,
     LinkPartnerHandleFaintingCry,
     LinkPartnerHandleIntroSlide,
@@ -1327,7 +1327,7 @@ static void LinkPartnerHandlePrintString(void)
     sub_817C95C(*stringId);
 }
 
-static void LinkPartnerHandlePrintStringPlayerOnly(void)
+static void LinkPartnerHandlePrintSelectionString(void)
 {
     LinkPartnerBufferExecCompleted();
 }
@@ -1503,7 +1503,7 @@ static void LinkPartnerHandleCmd42(void)
     LinkPartnerBufferExecCompleted();
 }
 
-static void LinkPartnerHandleEffectivenessSound(void)
+static void LinkPartnerHandlePlaySE(void)
 {
     s8 pan;
 
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 0aac4cbe4..d69de8c29 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -83,7 +83,7 @@ static void OpponentHandleBallThrow(void);
 static void OpponentHandlePause(void);
 static void OpponentHandleMoveAnimation(void);
 static void OpponentHandlePrintString(void);
-static void OpponentHandlePrintStringPlayerOnly(void);
+static void OpponentHandlePrintSelectionString(void);
 static void OpponentHandleChooseAction(void);
 static void OpponentHandleUnknownYesNoBox(void);
 static void OpponentHandleChooseMove(void);
@@ -109,7 +109,7 @@ static void OpponentHandleCmd39(void);
 static void OpponentHandleCmd40(void);
 static void OpponentHandleHitAnimation(void);
 static void OpponentHandleCmd42(void);
-static void OpponentHandleEffectivenessSound(void);
+static void OpponentHandlePlaySE(void);
 static void OpponentHandlePlayFanfareOrBGM(void);
 static void OpponentHandleFaintingCry(void);
 static void OpponentHandleIntroSlide(void);
@@ -155,7 +155,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     OpponentHandlePause,
     OpponentHandleMoveAnimation,
     OpponentHandlePrintString,
-    OpponentHandlePrintStringPlayerOnly,
+    OpponentHandlePrintSelectionString,
     OpponentHandleChooseAction,
     OpponentHandleUnknownYesNoBox,
     OpponentHandleChooseMove,
@@ -181,7 +181,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     OpponentHandleCmd40,
     OpponentHandleHitAnimation,
     OpponentHandleCmd42,
-    OpponentHandleEffectivenessSound,
+    OpponentHandlePlaySE,
     OpponentHandlePlayFanfareOrBGM,
     OpponentHandleFaintingCry,
     OpponentHandleIntroSlide,
@@ -1537,7 +1537,7 @@ static void OpponentHandlePrintString(void)
     sub_81A57E4(gActiveBank, *stringId);
 }
 
-static void OpponentHandlePrintStringPlayerOnly(void)
+static void OpponentHandlePrintSelectionString(void)
 {
     OpponentBufferExecCompleted();
 }
@@ -1826,7 +1826,7 @@ static void OpponentHandleCmd42(void)
     OpponentBufferExecCompleted();
 }
 
-static void OpponentHandleEffectivenessSound(void)
+static void OpponentHandlePlaySE(void)
 {
     s8 pan;
 
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 16c62c53b..7ea2abccf 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -102,7 +102,7 @@ static void PlayerHandleBallThrowAnim(void);
 static void PlayerHandlePause(void);
 static void PlayerHandleMoveAnimation(void);
 static void PlayerHandlePrintString(void);
-static void PlayerHandlePrintStringPlayerOnly(void);
+static void PlayerHandlePrintSelectionString(void);
 static void PlayerHandleChooseAction(void);
 static void PlayerHandleUnknownYesNoBox(void);
 static void PlayerHandleChooseMove(void);
@@ -128,7 +128,7 @@ static void PlayerHandleCmd39(void);
 static void PlayerHandleCmd40(void);
 static void PlayerHandleHitAnimation(void);
 static void PlayerHandleCmd42(void);
-static void PlayerHandleEffectivenessSound(void);
+static void PlayerHandlePlaySE(void);
 static void PlayerHandlePlayFanfareOrBGM(void);
 static void PlayerHandleFaintingCry(void);
 static void PlayerHandleIntroSlide(void);
@@ -189,7 +189,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     PlayerHandlePause,
     PlayerHandleMoveAnimation,
     PlayerHandlePrintString,
-    PlayerHandlePrintStringPlayerOnly,
+    PlayerHandlePrintSelectionString,
     PlayerHandleChooseAction,
     PlayerHandleUnknownYesNoBox,
     PlayerHandleChooseMove,
@@ -215,7 +215,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     PlayerHandleCmd40,
     PlayerHandleHitAnimation,
     PlayerHandleCmd42,
-    PlayerHandleEffectivenessSound,
+    PlayerHandlePlaySE,
     PlayerHandlePlayFanfareOrBGM,
     PlayerHandleFaintingCry,
     PlayerHandleIntroSlide,
@@ -2576,7 +2576,7 @@ static void PlayerHandlePrintString(void)
     sub_81A57E4(gActiveBank, *stringId);
 }
 
-static void PlayerHandlePrintStringPlayerOnly(void)
+static void PlayerHandlePrintSelectionString(void)
 {
     if (GetBankSide(gActiveBank) == SIDE_PLAYER)
         PlayerHandlePrintString();
@@ -2913,7 +2913,7 @@ static void PlayerHandleCmd42(void)
     PlayerBufferExecCompleted();
 }
 
-static void PlayerHandleEffectivenessSound(void)
+static void PlayerHandlePlaySE(void)
 {
     s8 pan;
 
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 0cd34442a..4cca5c002 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -78,7 +78,7 @@ static void PlayerPartnerHandleBallThrowAnim(void);
 static void PlayerPartnerHandlePause(void);
 static void PlayerPartnerHandleMoveAnimation(void);
 static void PlayerPartnerHandlePrintString(void);
-static void PlayerPartnerHandlePrintStringPlayerOnly(void);
+static void PlayerPartnerHandlePrintSelectionString(void);
 static void PlayerPartnerHandleChooseAction(void);
 static void PlayerPartnerHandleUnknownYesNoBox(void);
 static void PlayerPartnerHandleChooseMove(void);
@@ -104,7 +104,7 @@ static void PlayerPartnerHandleCmd39(void);
 static void PlayerPartnerHandleCmd40(void);
 static void PlayerPartnerHandleHitAnimation(void);
 static void PlayerPartnerHandleCmd42(void);
-static void PlayerPartnerHandleEffectivenessSound(void);
+static void PlayerPartnerHandlePlaySE(void);
 static void PlayerPartnerHandlePlayFanfareOrBGM(void);
 static void PlayerPartnerHandleFaintingCry(void);
 static void PlayerPartnerHandleIntroSlide(void);
@@ -155,7 +155,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     PlayerPartnerHandlePause,
     PlayerPartnerHandleMoveAnimation,
     PlayerPartnerHandlePrintString,
-    PlayerPartnerHandlePrintStringPlayerOnly,
+    PlayerPartnerHandlePrintSelectionString,
     PlayerPartnerHandleChooseAction,
     PlayerPartnerHandleUnknownYesNoBox,
     PlayerPartnerHandleChooseMove,
@@ -181,7 +181,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     PlayerPartnerHandleCmd40,
     PlayerPartnerHandleHitAnimation,
     PlayerPartnerHandleCmd42,
-    PlayerPartnerHandleEffectivenessSound,
+    PlayerPartnerHandlePlaySE,
     PlayerPartnerHandlePlayFanfareOrBGM,
     PlayerPartnerHandleFaintingCry,
     PlayerPartnerHandleIntroSlide,
@@ -1519,7 +1519,7 @@ static void PlayerPartnerHandlePrintString(void)
     gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter2;
 }
 
-static void PlayerPartnerHandlePrintStringPlayerOnly(void)
+static void PlayerPartnerHandlePrintSelectionString(void)
 {
     PlayerPartnerBufferExecCompleted();
 }
@@ -1756,7 +1756,7 @@ static void PlayerPartnerHandleCmd42(void)
     PlayerPartnerBufferExecCompleted();
 }
 
-static void PlayerPartnerHandleEffectivenessSound(void)
+static void PlayerPartnerHandlePlaySE(void)
 {
     s8 pan;
 
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index b55d644ac..027230be4 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -81,7 +81,7 @@ static void RecordedOpponentHandleBallThrowAnim(void);
 static void RecordedOpponentHandlePause(void);
 static void RecordedOpponentHandleMoveAnimation(void);
 static void RecordedOpponentHandlePrintString(void);
-static void RecordedOpponentHandlePrintStringPlayerOnly(void);
+static void RecordedOpponentHandlePrintSelectionString(void);
 static void RecordedOpponentHandleChooseAction(void);
 static void RecordedOpponentHandleUnknownYesNoBox(void);
 static void RecordedOpponentHandleChooseMove(void);
@@ -107,7 +107,7 @@ static void RecordedOpponentHandleCmd39(void);
 static void RecordedOpponentHandleCmd40(void);
 static void RecordedOpponentHandleHitAnimation(void);
 static void RecordedOpponentHandleCmd42(void);
-static void RecordedOpponentHandleEffectivenessSound(void);
+static void RecordedOpponentHandlePlaySE(void);
 static void RecordedOpponentHandlePlayFanfareOrBGM(void);
 static void RecordedOpponentHandleFaintingCry(void);
 static void RecordedOpponentHandleIntroSlide(void);
@@ -153,7 +153,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void
     RecordedOpponentHandlePause,
     RecordedOpponentHandleMoveAnimation,
     RecordedOpponentHandlePrintString,
-    RecordedOpponentHandlePrintStringPlayerOnly,
+    RecordedOpponentHandlePrintSelectionString,
     RecordedOpponentHandleChooseAction,
     RecordedOpponentHandleUnknownYesNoBox,
     RecordedOpponentHandleChooseMove,
@@ -179,7 +179,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void
     RecordedOpponentHandleCmd40,
     RecordedOpponentHandleHitAnimation,
     RecordedOpponentHandleCmd42,
-    RecordedOpponentHandleEffectivenessSound,
+    RecordedOpponentHandlePlaySE,
     RecordedOpponentHandlePlayFanfareOrBGM,
     RecordedOpponentHandleFaintingCry,
     RecordedOpponentHandleIntroSlide,
@@ -1435,7 +1435,7 @@ static void RecordedOpponentHandlePrintString(void)
     gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
 }
 
-static void RecordedOpponentHandlePrintStringPlayerOnly(void)
+static void RecordedOpponentHandlePrintSelectionString(void)
 {
     RecordedOpponentBufferExecCompleted();
 }
@@ -1625,7 +1625,7 @@ static void RecordedOpponentHandleCmd42(void)
     RecordedOpponentBufferExecCompleted();
 }
 
-static void RecordedOpponentHandleEffectivenessSound(void)
+static void RecordedOpponentHandlePlaySE(void)
 {
     s8 pan;
 
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 78e7497a5..f5f3ab3c0 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -81,7 +81,7 @@ static void RecordedPlayerHandleBallThrowAnim(void);
 static void RecordedPlayerHandlePause(void);
 static void RecordedPlayerHandleMoveAnimation(void);
 static void RecordedPlayerHandlePrintString(void);
-static void RecordedPlayerHandlePrintStringPlayerOnly(void);
+static void RecordedPlayerHandlePrintSelectionString(void);
 static void RecordedPlayerHandleChooseAction(void);
 static void RecordedPlayerHandleUnknownYesNoBox(void);
 static void RecordedPlayerHandleChooseMove(void);
@@ -107,7 +107,7 @@ static void RecordedPlayerHandleCmd39(void);
 static void RecordedPlayerHandleCmd40(void);
 static void RecordedPlayerHandleHitAnimation(void);
 static void RecordedPlayerHandleCmd42(void);
-static void RecordedPlayerHandleEffectivenessSound(void);
+static void RecordedPlayerHandlePlaySE(void);
 static void RecordedPlayerHandlePlayFanfareOrBGM(void);
 static void RecordedPlayerHandleFaintingCry(void);
 static void RecordedPlayerHandleIntroSlide(void);
@@ -152,7 +152,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void)
     RecordedPlayerHandlePause,
     RecordedPlayerHandleMoveAnimation,
     RecordedPlayerHandlePrintString,
-    RecordedPlayerHandlePrintStringPlayerOnly,
+    RecordedPlayerHandlePrintSelectionString,
     RecordedPlayerHandleChooseAction,
     RecordedPlayerHandleUnknownYesNoBox,
     RecordedPlayerHandleChooseMove,
@@ -178,7 +178,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void)
     RecordedPlayerHandleCmd40,
     RecordedPlayerHandleHitAnimation,
     RecordedPlayerHandleCmd42,
-    RecordedPlayerHandleEffectivenessSound,
+    RecordedPlayerHandlePlaySE,
     RecordedPlayerHandlePlayFanfareOrBGM,
     RecordedPlayerHandleFaintingCry,
     RecordedPlayerHandleIntroSlide,
@@ -1437,7 +1437,7 @@ static void RecordedPlayerHandlePrintString(void)
     gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
 }
 
-static void RecordedPlayerHandlePrintStringPlayerOnly(void)
+static void RecordedPlayerHandlePrintSelectionString(void)
 {
     RecordedPlayerBufferExecCompleted();
 }
@@ -1644,7 +1644,7 @@ static void RecordedPlayerHandleCmd42(void)
     RecordedPlayerBufferExecCompleted();
 }
 
-static void RecordedPlayerHandleEffectivenessSound(void)
+static void RecordedPlayerHandlePlaySE(void)
 {
     s8 pan;
 
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index a4f35bed1..635f5fef1 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -66,7 +66,7 @@ static void SafariHandleBallThrowAnim(void);
 static void SafariHandlePause(void);
 static void SafariHandleMoveAnimation(void);
 static void SafariHandlePrintString(void);
-static void SafariHandlePrintStringPlayerOnly(void);
+static void SafariHandlePrintSelectionString(void);
 static void SafariHandleChooseAction(void);
 static void SafariHandleUnknownYesNoBox(void);
 static void SafariHandleChooseMove(void);
@@ -92,7 +92,7 @@ static void SafariHandleCmd39(void);
 static void SafariHandleCmd40(void);
 static void SafariHandleHitAnimation(void);
 static void SafariHandleCmd42(void);
-static void SafariHandleEffectivenessSound(void);
+static void SafariHandlePlaySE(void);
 static void SafariHandlePlayFanfareOrBGM(void);
 static void SafariHandleFaintingCry(void);
 static void SafariHandleIntroSlide(void);
@@ -130,7 +130,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     SafariHandlePause,
     SafariHandleMoveAnimation,
     SafariHandlePrintString,
-    SafariHandlePrintStringPlayerOnly,
+    SafariHandlePrintSelectionString,
     SafariHandleChooseAction,
     SafariHandleUnknownYesNoBox,
     SafariHandleChooseMove,
@@ -156,7 +156,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     SafariHandleCmd40,
     SafariHandleHitAnimation,
     SafariHandleCmd42,
-    SafariHandleEffectivenessSound,
+    SafariHandlePlaySE,
     SafariHandlePlayFanfareOrBGM,
     SafariHandleFaintingCry,
     SafariHandleIntroSlide,
@@ -449,7 +449,7 @@ static void SafariHandlePrintString(void)
     gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
 }
 
-static void SafariHandlePrintStringPlayerOnly(void)
+static void SafariHandlePrintSelectionString(void)
 {
     if (GetBankSide(gActiveBank) == SIDE_PLAYER)
         SafariHandlePrintString();
@@ -607,7 +607,7 @@ static void SafariHandleCmd42(void)
     SafariBufferExecCompleted();
 }
 
-static void SafariHandleEffectivenessSound(void)
+static void SafariHandlePlaySE(void)
 {
     s8 pan;
 
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 4dac1d264..442e32cca 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -86,7 +86,7 @@ static void WallyHandleBallThrowAnim(void);
 static void WallyHandlePause(void);
 static void WallyHandleMoveAnimation(void);
 static void WallyHandlePrintString(void);
-static void WallyHandlePrintStringPlayerOnly(void);
+static void WallyHandlePrintSelectionString(void);
 static void WallyHandleChooseAction(void);
 static void WallyHandleUnknownYesNoBox(void);
 static void WallyHandleChooseMove(void);
@@ -112,7 +112,7 @@ static void WallyHandleCmd39(void);
 static void WallyHandleCmd40(void);
 static void WallyHandleHitAnimation(void);
 static void WallyHandleCmd42(void);
-static void WallyHandleEffectivenessSound(void);
+static void WallyHandlePlaySE(void);
 static void WallyHandlePlayFanfareOrBGM(void);
 static void WallyHandleFaintingCry(void);
 static void WallyHandleIntroSlide(void);
@@ -155,7 +155,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     WallyHandlePause,
     WallyHandleMoveAnimation,
     WallyHandlePrintString,
-    WallyHandlePrintStringPlayerOnly,
+    WallyHandlePrintSelectionString,
     WallyHandleChooseAction,
     WallyHandleUnknownYesNoBox,
     WallyHandleChooseMove,
@@ -181,7 +181,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     WallyHandleCmd40,
     WallyHandleHitAnimation,
     WallyHandleCmd42,
-    WallyHandleEffectivenessSound,
+    WallyHandlePlaySE,
     WallyHandlePlayFanfareOrBGM,
     WallyHandleFaintingCry,
     WallyHandleIntroSlide,
@@ -1211,7 +1211,7 @@ static void WallyHandlePrintString(void)
     gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
 }
 
-static void WallyHandlePrintStringPlayerOnly(void)
+static void WallyHandlePrintSelectionString(void)
 {
     if (GetBankSide(gActiveBank) == SIDE_PLAYER)
         WallyHandlePrintString();
@@ -1419,7 +1419,7 @@ static void WallyHandleCmd42(void)
     WallyBufferExecCompleted();
 }
 
-static void WallyHandleEffectivenessSound(void)
+static void WallyHandlePlaySE(void)
 {
     PlaySE(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
     WallyBufferExecCompleted();
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 858540a9f..ed48ec5d9 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -1140,10 +1140,10 @@ void EmitPrintString(u8 bufferId, u16 stringID)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, sizeof(struct StringInfoBattle) + 4);
 }
 
-void EmitPrintStringPlayerOnly(u8 bufferId, u16 stringID)
+void EmitPrintSelectionString(u8 bufferId, u16 stringID)
 {
     s32 i;
-    struct StringInfoBattle* stringInfo;
+    struct StringInfoBattle *stringInfo;
 
     gBattleBuffersTransferData[0] = CONTROLLER_PRINTSTRINGPLAYERONLY;
     gBattleBuffersTransferData[1] = CONTROLLER_PRINTSTRINGPLAYERONLY;
@@ -1427,7 +1427,7 @@ void EmitCmd42(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitEffectivenessSound(u8 bufferId, u16 songId)
+void EmitPlaySE(u8 bufferId, u16 songId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_EFFECTIVENESSSOUND;
     gBattleBuffersTransferData[1] = songId;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 6409ff56e..e0a61a612 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -3,6 +3,7 @@
 #include "battle_move_effects.h"
 #include "battle_message.h"
 #include "battle_ai_script_commands.h"
+#include "battle_scripts.h"
 #include "moves.h"
 #include "abilities.h"
 #include "item.h"
@@ -146,88 +147,6 @@ extern u8 sub_813B21C(void);
 extern u16 get_unknown_box_id(void);
 extern void sub_80356D0(void);
 
-// BattleScripts
-extern const u8 BattleScript_MoveEnd[];
-extern const u8 BattleScript_NoPPForMove[];
-extern const u8 BattleScript_MagicCoatBounce[];
-extern const u8 BattleScript_TookAttack[];
-extern const u8 BattleScript_SnatchedMove[];
-extern const u8 BattleScript_Pausex20[];
-extern const u8 BattleScript_SubstituteFade[];
-extern const u8 BattleScript_HangedOnMsg[];
-extern const u8 BattleScript_OneHitKOMsg[];
-extern const u8 BattleScript_EnduredMsg[];
-extern const u8 BattleScript_PSNPrevention[];
-extern const u8 BattleScript_BRNPrevention[];
-extern const u8 BattleScript_PRLZPrevention[];
-extern const u8 BattleScript_FlinchPrevention[];
-extern const u8 BattleScript_StatUp[];
-extern const u8 BattleScript_StatDown[];
-extern const u8 BattleScript_NoItemSteal[];
-extern const u8 BattleScript_ItemSteal[];
-extern const u8 BattleScript_RapidSpinAway[];
-extern const u8 BattleScript_TargetPRLZHeal[];
-extern const u8 BattleScript_KnockedOff[];
-extern const u8 BattleScript_StickyHoldActivates[];
-extern const u8 BattleScript_AllStatsUp[];
-extern const u8 BattleScript_AtkDefDown[];
-extern const u8 BattleScript_SAtkDown2[];
-extern const u8 BattleScript_LevelUp[];
-extern const u8 BattleScript_WrapFree[];
-extern const u8 BattleScript_LeechSeedFree[];
-extern const u8 BattleScript_SpikesFree[];
-extern const u8 BattleScript_ButItFailed[];
-extern const u8 BattleScript_ObliviousPreventsAttraction[];
-extern const u8 BattleScript_MistProtected[];
-extern const u8 BattleScript_AbilityNoStatLoss[];
-extern const u8 BattleScript_AbilityNoSpecificStatLoss[];
-extern const u8 BattleScript_TrainerBallBlock[];
-extern const u8 BattleScript_WallyBallThrow[];
-extern const u8 BattleScript_SuccessBallThrow[];
-extern const u8 BattleScript_ShakeBallThrow[];
-extern const u8 BattleScript_FaintAttacker[];
-extern const u8 BattleScript_FaintTarget[];
-extern const u8 BattleScript_DestinyBondTakesLife[];
-extern const u8 BattleScript_GrudgeTakesPp[];
-extern const u8 BattleScript_RageIsBuilding[];
-extern const u8 BattleScript_DefrostedViaFireMove[];
-extern const u8 gUnknown_082DB87D[];
-extern const u8 gUnknown_082DAE90[];
-extern const u8 gUnknown_082DAE59[];
-extern const u8 gUnknown_082DAEC7[];
-extern const u8 BattleScript_MoveEffectSleep[];
-extern const u8 BattleScript_MoveEffectPoison[];
-extern const u8 BattleScript_MoveEffectBurn[];
-extern const u8 BattleScript_MoveEffectFreeze[];
-extern const u8 BattleScript_MoveEffectParalysis[];
-extern const u8 BattleScript_MoveEffectToxic[];
-extern const u8 BattleScript_MoveEffectConfusion[];
-extern const u8 BattleScript_MoveEffectUproar[];
-extern const u8 BattleScript_MoveEffectPayDay[];
-extern const u8 BattleScript_MoveEffectWrap[];
-extern const u8 BattleScript_MoveEffectRecoil33[];
-extern const u8 BattleScript_DampStopsExplosion[];
-extern const u8 BattleScript_MistProtected[];
-extern const u8 BattleScript_AbilityNoStatLoss[];
-extern const u8 BattleScript_AbilityNoSpecificStatLoss[];
-extern const u8 BattleScript_ButItFailed[];
-extern const u8 gUnknown_082DADD8[];
-extern const u8 BattleScript_PrintPayDayMoneyString[];
-extern const u8 BattleScript_SturdyPreventsOHKO[];
-extern const u8 BattleScript_ObliviousPreventsAttraction[];
-extern const u8 BattleScript_PauseEffectivenessSoundResultMsgEndMove[];
-extern const u8 BattleScript_CastformChange[];
-extern const u8 BattleScript_TrainerBallBlock[];
-extern const u8 BattleScript_WallyBallThrow[];
-extern const u8 BattleScript_SuccessBallThrow[];
-extern const u8 BattleScript_ShakeBallThrow[];
-extern const u8 BattleScript_PresentDamageTarget[];
-extern const u8 BattleScript_AlreadyAtFullHp[];
-extern const u8 BattleScript_PresentHealTarget[];
-extern const u8 BattleScript_WrapFree[];
-extern const u8 BattleScript_LeechSeedFree[];
-extern const u8 BattleScript_SpikesFree[];
-
 // strings
 extern const u8 gText_BattleYesNoChoice[];
 
@@ -247,7 +166,7 @@ extern const u8 gText_BattleYesNoChoice[];
 
 // this file's functions
 static bool8 IsTwoTurnsMove(u16 move);
-static void DestinyBondFlagUpdate(void);
+static void TrySetDestinyBondToHappen(void);
 static u8 AttacksThisTurn(u8 bank, u16 move); // Note: returns 1 if it's a charging turn, otherwise 2.
 static void CheckWonderGuardAndLevitate(void);
 static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8, const u8* BS_ptr);
@@ -267,29 +186,29 @@ static void atk01_accuracycheck(void);
 static void atk02_attackstring(void);
 static void atk03_ppreduce(void);
 static void atk04_critcalc(void);
-static void atk05_damagecalc1(void);
+static void atk05_damagecalc(void);
 static void atk06_typecalc(void);
-static void atk07_dmg_adjustment(void);
-static void atk08_dmg_adjustment2(void);
+static void atk07_adjustnormaldamage(void);
+static void atk08_adjustnormaldamage2(void);
 static void atk09_attackanimation(void);
 static void atk0A_waitanimation(void);
 static void atk0B_healthbarupdate(void);
 static void atk0C_datahpupdate(void);
 static void atk0D_critmessage(void);
-static void atk0E_effectiveness_sound(void);
+static void atk0E_effectivenesssound(void);
 static void atk0F_resultmessage(void);
 static void atk10_printstring(void);
-static void atk11_printstring_playeronly(void);
+static void atk11_printselectionstring(void);
 static void atk12_waitmessage(void);
 static void atk13_printfromtable(void);
-static void atk14_printfromtable_playeronly(void);
+static void atk14_printselectionstringfromtable(void);
 static void atk15_seteffectwithchance(void);
 static void atk16_seteffectprimary(void);
 static void atk17_seteffectsecondary(void);
-static void atk18_status_effect_clear(void);
-static void atk19_faint_pokemon(void);
-static void atk1A_faint_animation(void);
-static void atk1B_faint_effects_clear(void);
+static void atk18_clearstatusfromeffect(void);
+static void atk19_tryfaintmon(void);
+static void atk1A_dofaintanimation(void);
+static void atk1B_cleareffectsonfaint(void);
 static void atk1C_jumpifstatus(void);
 static void atk1D_jumpifstatus2(void);
 static void atk1E_jumpifability(void);
@@ -299,9 +218,9 @@ static void atk21_jumpifstatus3(void);
 static void atk22_jumpiftype(void);
 static void atk23_getexp(void);
 static void atk24(void);
-static void atk25_move_values_cleanup(void);
-static void atk26_set_multihit(void);
-static void atk27_decrement_multihit(void);
+static void atk25_movevaluescleanup(void);
+static void atk26_setmultihit(void);
+static void atk27_decrementmultihit(void);
 static void atk28_goto(void);
 static void atk29_jumpifbyte(void);
 static void atk2A_jumpifhalfword(void);
@@ -312,7 +231,7 @@ static void atk2E_setbyte(void);
 static void atk2F_addbyte(void);
 static void atk30_subbyte(void);
 static void atk31_copyarray(void);
-static void atk32_copyarray_withindex(void);
+static void atk32_copyarraywithindex(void);
 static void atk33_orbyte(void);
 static void atk34_orhalfword(void);
 static void atk35_orword(void);
@@ -326,75 +245,75 @@ static void atk3C_return(void);
 static void atk3D_end(void);
 static void atk3E_end2(void);
 static void atk3F_end3(void);
-static void atk40_jump_if_move_affected_by_protect(void);
+static void atk40_jumpifaffectedbyprotect(void);
 static void atk41_call(void);
 static void atk42_jumpiftype2(void);
 static void atk43_jumpifabilitypresent(void);
-static void atk44_end_selection_script(void);
+static void atk44_endselectionscript(void);
 static void atk45_playanimation(void);
 static void atk46_playanimation2(void);
 static void atk47_setgraphicalstatchangevalues(void);
 static void atk48_playstatchangeanimation(void);
 static void atk49_moveend(void);
 static void atk4A_typecalc2(void);
-static void atk4B_return_atk_to_ball(void);
-static void atk4C_get_switched_mon_data(void);
-static void atk4D_switch_data_update(void);
-static void atk4E_switchin_anim(void);
-static void atk4F_jump_if_cannot_switch(void);
+static void atk4B_returnatktoball(void);
+static void atk4C_getswitchedmondata(void);
+static void atk4D_switchindataupdate(void);
+static void atk4E_switchinanim(void);
+static void atk4F_jumpifcantswitch(void);
 static void atk50_openpartyscreen(void);
-static void atk51_switch_handle_order(void);
-static void atk52_switch_in_effects(void);
-static void atk53_trainer_slide(void);
-static void atk54_effectiveness_sound(void);
-static void atk55_play_fanfare(void);
-static void atk56_fainting_cry(void);
+static void atk51_switchhandleorder(void);
+static void atk52_switchineffects(void);
+static void atk53_trainerslidein(void);
+static void atk54_playse(void);
+static void atk55_fanfare(void);
+static void atk56_playfaintcry(void);
 static void atk57(void);
-static void atk58_return_to_ball(void);
-static void atk59_learnmove_inbattle(void);
+static void atk58_returntoball(void);
+static void atk59_handlelearnnewmove(void);
 static void atk5A_yesnoboxlearnmove(void);
 static void atk5B_yesnoboxstoplearningmove(void);
 static void atk5C_hitanimation(void);
 static void atk5D_getmoneyreward(void);
-static void atk5E_8025A70(void);
-static void atk5F_8025B24(void);
-static void atk60_increment_gamestat(void);
-static void atk61_draw_party_status_summary(void);
-static void atk62_08025C6C(void);
+static void atk5E(void);
+static void atk5F(void);
+static void atk60_incrementgamestat(void);
+static void atk61_drawpartystatussummary(void);
+static void atk62(void);
 static void atk63_jumptorandomattack(void);
 static void atk64_statusanimation(void);
 static void atk65_status2animation(void);
 static void atk66_chosenstatusanimation(void);
 static void atk67_yesnobox(void);
-static void atk68_cancel_everyones_actions(void);
-static void atk69_dmg_adjustment3(void);
+static void atk68_cancelallactions(void);
+static void atk69_adjustsetdamage(void);
 static void atk6A_removeitem(void);
 static void atk6B_atknameinbuff1(void);
-static void atk6C_draw_lvlupbox(void);
-static void atk6D_reset_sentpokes_value(void);
-static void atk6E_set_atk_to_player0(void);
-static void atk6F_set_visible(void);
-static void atk70_record_last_used_ability(void);
-static void atk71_buffer_move_to_learn(void);
-static void atk72_jump_if_run_attempt_success(void);
-static void atk73_hp_thresholds(void);
-static void atk74_hp_thresholds2(void);
-static void atk75_item_effect_on_opponent(void);
+static void atk6C_drawlvlupbox(void);
+static void atk6D_resetsentmonsvalue(void);
+static void atk6E_setatktoplayer0(void);
+static void atk6F_makevisible(void);
+static void atk70_recordlastability(void);
+static void atk71_buffermovetolearn(void);
+static void atk72_jumpifplayerran(void);
+static void atk73_hpthresholds(void);
+static void atk74_hpthresholds2(void);
+static void atk75_useitemonopponent(void);
 static void atk76_various(void);
-static void atk77_set_protect_like(void);
+static void atk77_setprotectlike(void);
 static void atk78_faintifabilitynotdamp(void);
 static void atk79_setatkhptozero(void);
-static void atk7A_jumpwhiletargetvalid(void);
-static void atk7B_healhalfHP_if_possible(void);
+static void atk7A_jumpifnexttargetvalid(void);
+static void atk7B_tryhealhalfhealth(void);
 static void atk7C_trymirrormove(void);
-static void atk7D_set_rain(void);
+static void atk7D_setrain(void);
 static void atk7E_setreflect(void);
 static void atk7F_setseeded(void);
 static void atk80_manipulatedamage(void);
-static void atk81_setrest(void);
+static void atk81_trysetrest(void);
 static void atk82_jumpifnotfirstturn(void);
 static void atk83_nop(void);
-static void atk84_jump_if_cant_sleep(void);
+static void atk84_jumpifcantmakeasleep(void);
 static void atk85_stockpile(void);
 static void atk86_stockpiletobasedamage(void);
 static void atk87_stockpiletohpheal(void);
@@ -403,22 +322,22 @@ static void atk89_statbuffchange(void);
 static void atk8A_normalisebuffs(void);
 static void atk8B_setbide(void);
 static void atk8C_confuseifrepeatingattackends(void);
-static void atk8D_setmultihit_counter(void);
-static void atk8E_init_multihit_string(void);
+static void atk8D_setmultihitcounter(void);
+static void atk8E_initmultihitstring(void);
 static void atk8F_forcerandomswitch(void);
-static void atk90_conversion_type_change(void);
+static void atk90_tryconversiontypechange(void);
 static void atk91_givepaydaymoney(void);
 static void atk92_setlightscreen(void);
-static void atk93_ko_move(void);
+static void atk93_tryKO(void);
 static void atk94_damagetohalftargethp(void);
 static void atk95_setsandstorm(void);
 static void atk96_weatherdamage(void);
-static void atk97_try_infatuation(void);
-static void atk98_status_icon_update(void);
+static void atk97_tryinfatuating(void);
+static void atk98_updatestatusicon(void);
 static void atk99_setmist(void);
-static void atk9A_set_focusenergy(void);
+static void atk9A_setfocusenergy(void);
 static void atk9B_transformdataexecution(void);
-static void atk9C_set_substitute(void);
+static void atk9C_setsubstitute(void);
 static void atk9D_mimicattackcopy(void);
 static void atk9E_metronome(void);
 static void atk9F_dmgtolevel(void);
@@ -426,39 +345,39 @@ static void atkA0_psywavedamageeffect(void);
 static void atkA1_counterdamagecalculator(void);
 static void atkA2_mirrorcoatdamagecalculator(void);
 static void atkA3_disablelastusedattack(void);
-static void atkA4_setencore(void);
+static void atkA4_trysetencore(void);
 static void atkA5_painsplitdmgcalc(void);
 static void atkA6_settypetorandomresistance(void);
 static void atkA7_setalwayshitflag(void);
 static void atkA8_copymovepermanently(void);
 static void atkA9_sleeptalk_choose_move(void);
-static void atkAA_set_destinybond(void);
-static void atkAB_DestinyBondFlagUpdate(void);
+static void atkAA_setdestinybond(void);
+static void atkAB_trysetdestinybondtohappen(void);
 static void atkAC_remaininghptopower(void);
-static void atkAD_spite_ppreduce(void);
-static void atkAE_heal_party_status(void);
+static void atkAD_tryspiteppreduce(void);
+static void atkAE_healpartystatus(void);
 static void atkAF_cursetarget(void);
-static void atkB0_set_spikes(void);
-static void atkB1_set_foresight(void);
-static void atkB2_setperishsong(void);
+static void atkB0_trysetspikes(void);
+static void atkB1_setforesight(void);
+static void atkB2_trysetperishsong(void);
 static void atkB3_rolloutdamagecalculation(void);
 static void atkB4_jumpifconfusedandstatmaxed(void);
 static void atkB5_furycuttercalc(void);
 static void atkB6_happinesstodamagecalculation(void);
 static void atkB7_presentdamagecalculation(void);
-static void atkB8_set_safeguard(void);
+static void atkB8_setsafeguard(void);
 static void atkB9_magnitudedamagecalculation(void);
 static void atkBA_jumpifnopursuitswitchdmg(void);
 static void atkBB_setsunny(void);
 static void atkBC_maxattackhalvehp(void);
 static void atkBD_copyfoestats(void);
 static void atkBE_rapidspinfree(void);
-static void atkBF_set_defense_curl(void);
+static void atkBF_setdefensecurlbit(void);
 static void atkC0_recoverbasedonsunlight(void);
-static void atkC1_hidden_power_calc(void);
-static void atkC2_selectnexttarget(void);
-static void atkC3_setfutureattack(void);
-static void atkC4_beat_up(void);
+static void atkC1_hiddenpowercalc(void);
+static void atkC2_selectfirstvalidtarget(void);
+static void atkC3_trysetfutureattack(void);
+static void atkC4_trydobeatup(void);
 static void atkC5_setsemiinvulnerablebit(void);
 static void atkC6_clearsemiinvulnerablebit(void);
 static void atkC7_setminimize(void);
@@ -471,46 +390,46 @@ static void atkCD_cureifburnedparalysedorpoisoned(void);
 static void atkCE_settorment(void);
 static void atkCF_jumpifnodamage(void);
 static void atkD0_settaunt(void);
-static void atkD1_set_helpinghand(void);
-static void atkD2_swap_items(void);
-static void atkD3_copy_ability(void);
-static void atkD4_wish_effect(void);
-static void atkD5_setroots(void);
+static void atkD1_trysethelpinghand(void);
+static void atkD2_tryswapitems(void);
+static void atkD3_trycopyability(void);
+static void atkD4_trywish(void);
+static void atkD5_trysetroots(void);
 static void atkD6_doubledamagedealtifdamaged(void);
 static void atkD7_setyawn(void);
 static void atkD8_setdamagetohealthdifference(void);
 static void atkD9_scaledamagebyhealthratio(void);
-static void atkDA_abilityswap(void);
-static void atkDB_imprisoneffect(void);
-static void atkDC_setgrudge(void);
+static void atkDA_tryswapabilities(void);
+static void atkDB_tryimprision(void);
+static void atkDC_trysetgrudge(void);
 static void atkDD_weightdamagecalculation(void);
 static void atkDE_asistattackselect(void);
-static void atkDF_setmagiccoat(void);
-static void atkE0_setstealstatchange(void);
-static void atkE1_intimidate_string_loader(void);
-static void atkE2_switchout_abilities(void);
+static void atkDF_trysetmagiccoat(void);
+static void atkE0_trysetsnatch(void);
+static void atkE1_trygetintimidatetarget(void);
+static void atkE2_switchoutabilities(void);
 static void atkE3_jumpifhasnohp(void);
 static void atkE4_getsecretpowereffect(void);
 static void atkE5_pickup(void);
-static void atkE6_castform_change_animation(void);
-static void atkE7_castform_data_change(void);
+static void atkE6_docastformchangeanimation(void);
+static void atkE7_trycastformdatachange(void);
 static void atkE8_settypebasedhalvers(void);
 static void atkE9_setweatherballtype(void);
-static void atkEA_recycleitem(void);
+static void atkEA_tryrecycleitem(void);
 static void atkEB_settypetoterrain(void);
-static void atkEC_pursuit_sth(void);
-static void atkED_802B4B4(void);
+static void atkEC_pursuitrelated(void);
+static void atkEF_snatchsetbanks(void);
 static void atkEE_removelightscreenreflect(void);
 static void atkEF_pokeball_catch_calculation(void);
-static void atkF0_give_caught_mon(void);
-static void atkF1_set_caught_mon_dex_flags(void);
-static void atkF2_display_dex_info(void);
-static void atkF3_nickname_caught_poke(void);
+static void atkF0_givecaughtmon(void);
+static void atkF1_trysetcaughtmondexflags(void);
+static void atkF2_displaydexinfo(void);
+static void atkF3_trygivecaughtmonnick(void);
 static void atkF4_subattackerhpbydmg(void);
 static void atkF5_removeattackerstatus1(void);
-static void atkF6_action_finished(void);
-static void atkF7_turn_finished(void);
-static void atkF8_trainer_slide_back(void);
+static void atkF6_finishaction(void);
+static void atkF7_finishturn(void);
+static void atkF8_trainerslideout(void);
 
 void (* const gBattleScriptingCommandsTable[])(void) =
 {
@@ -519,29 +438,29 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk02_attackstring,
     atk03_ppreduce,
     atk04_critcalc,
-    atk05_damagecalc1,
+    atk05_damagecalc,
     atk06_typecalc,
-    atk07_dmg_adjustment,
-    atk08_dmg_adjustment2,
+    atk07_adjustnormaldamage,
+    atk08_adjustnormaldamage2,
     atk09_attackanimation,
     atk0A_waitanimation,
     atk0B_healthbarupdate,
     atk0C_datahpupdate,
     atk0D_critmessage,
-    atk0E_effectiveness_sound,
+    atk0E_effectivenesssound,
     atk0F_resultmessage,
     atk10_printstring,
-    atk11_printstring_playeronly,
+    atk11_printselectionstring,
     atk12_waitmessage,
     atk13_printfromtable,
-    atk14_printfromtable_playeronly,
+    atk14_printselectionstringfromtable,
     atk15_seteffectwithchance,
     atk16_seteffectprimary,
     atk17_seteffectsecondary,
-    atk18_status_effect_clear,
-    atk19_faint_pokemon,
-    atk1A_faint_animation,
-    atk1B_faint_effects_clear,
+    atk18_clearstatusfromeffect,
+    atk19_tryfaintmon,
+    atk1A_dofaintanimation,
+    atk1B_cleareffectsonfaint,
     atk1C_jumpifstatus,
     atk1D_jumpifstatus2,
     atk1E_jumpifability,
@@ -551,9 +470,9 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk22_jumpiftype,
     atk23_getexp,
     atk24,
-    atk25_move_values_cleanup,
-    atk26_set_multihit,
-    atk27_decrement_multihit,
+    atk25_movevaluescleanup,
+    atk26_setmultihit,
+    atk27_decrementmultihit,
     atk28_goto,
     atk29_jumpifbyte,
     atk2A_jumpifhalfword,
@@ -564,7 +483,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk2F_addbyte,
     atk30_subbyte,
     atk31_copyarray,
-    atk32_copyarray_withindex,
+    atk32_copyarraywithindex,
     atk33_orbyte,
     atk34_orhalfword,
     atk35_orword,
@@ -578,75 +497,75 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk3D_end,
     atk3E_end2,
     atk3F_end3,
-    atk40_jump_if_move_affected_by_protect,
+    atk40_jumpifaffectedbyprotect,
     atk41_call,
     atk42_jumpiftype2,
     atk43_jumpifabilitypresent,
-    atk44_end_selection_script,
+    atk44_endselectionscript,
     atk45_playanimation,
     atk46_playanimation2,
     atk47_setgraphicalstatchangevalues,
     atk48_playstatchangeanimation,
     atk49_moveend,
     atk4A_typecalc2,
-    atk4B_return_atk_to_ball,
-    atk4C_get_switched_mon_data,
-    atk4D_switch_data_update,
-    atk4E_switchin_anim,
-    atk4F_jump_if_cannot_switch,
+    atk4B_returnatktoball,
+    atk4C_getswitchedmondata,
+    atk4D_switchindataupdate,
+    atk4E_switchinanim,
+    atk4F_jumpifcantswitch,
     atk50_openpartyscreen,
-    atk51_switch_handle_order,
-    atk52_switch_in_effects,
-    atk53_trainer_slide,
-    atk54_effectiveness_sound,
-    atk55_play_fanfare,
-    atk56_fainting_cry,
+    atk51_switchhandleorder,
+    atk52_switchineffects,
+    atk53_trainerslidein,
+    atk54_playse,
+    atk55_fanfare,
+    atk56_playfaintcry,
     atk57,
-    atk58_return_to_ball,
-    atk59_learnmove_inbattle,
+    atk58_returntoball,
+    atk59_handlelearnnewmove,
     atk5A_yesnoboxlearnmove,
     atk5B_yesnoboxstoplearningmove,
     atk5C_hitanimation,
     atk5D_getmoneyreward,
-    atk5E_8025A70,
-    atk5F_8025B24,
-    atk60_increment_gamestat,
-    atk61_draw_party_status_summary,
-    atk62_08025C6C,
+    atk5E,
+    atk5F,
+    atk60_incrementgamestat,
+    atk61_drawpartystatussummary,
+    atk62,
     atk63_jumptorandomattack,
     atk64_statusanimation,
     atk65_status2animation,
     atk66_chosenstatusanimation,
     atk67_yesnobox,
-    atk68_cancel_everyones_actions,
-    atk69_dmg_adjustment3,
+    atk68_cancelallactions,
+    atk69_adjustsetdamage,
     atk6A_removeitem,
     atk6B_atknameinbuff1,
-    atk6C_draw_lvlupbox,
-    atk6D_reset_sentpokes_value,
-    atk6E_set_atk_to_player0,
-    atk6F_set_visible,
-    atk70_record_last_used_ability,
-    atk71_buffer_move_to_learn,
-    atk72_jump_if_run_attempt_success,
-    atk73_hp_thresholds,
-    atk74_hp_thresholds2,
-    atk75_item_effect_on_opponent,
+    atk6C_drawlvlupbox,
+    atk6D_resetsentmonsvalue,
+    atk6E_setatktoplayer0,
+    atk6F_makevisible,
+    atk70_recordlastability,
+    atk71_buffermovetolearn,
+    atk72_jumpifplayerran,
+    atk73_hpthresholds,
+    atk74_hpthresholds2,
+    atk75_useitemonopponent,
     atk76_various,
-    atk77_set_protect_like,
+    atk77_setprotectlike,
     atk78_faintifabilitynotdamp,
     atk79_setatkhptozero,
-    atk7A_jumpwhiletargetvalid,
-    atk7B_healhalfHP_if_possible,
+    atk7A_jumpifnexttargetvalid,
+    atk7B_tryhealhalfhealth,
     atk7C_trymirrormove,
-    atk7D_set_rain,
+    atk7D_setrain,
     atk7E_setreflect,
     atk7F_setseeded,
     atk80_manipulatedamage,
-    atk81_setrest,
+    atk81_trysetrest,
     atk82_jumpifnotfirstturn,
     atk83_nop,
-    atk84_jump_if_cant_sleep,
+    atk84_jumpifcantmakeasleep,
     atk85_stockpile,
     atk86_stockpiletobasedamage,
     atk87_stockpiletohpheal,
@@ -655,22 +574,22 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk8A_normalisebuffs,
     atk8B_setbide,
     atk8C_confuseifrepeatingattackends,
-    atk8D_setmultihit_counter,
-    atk8E_init_multihit_string,
+    atk8D_setmultihitcounter,
+    atk8E_initmultihitstring,
     atk8F_forcerandomswitch,
-    atk90_conversion_type_change,
+    atk90_tryconversiontypechange,
     atk91_givepaydaymoney,
     atk92_setlightscreen,
-    atk93_ko_move,
+    atk93_tryKO,
     atk94_damagetohalftargethp,
     atk95_setsandstorm,
     atk96_weatherdamage,
-    atk97_try_infatuation,
-    atk98_status_icon_update,
+    atk97_tryinfatuating,
+    atk98_updatestatusicon,
     atk99_setmist,
-    atk9A_set_focusenergy,
+    atk9A_setfocusenergy,
     atk9B_transformdataexecution,
-    atk9C_set_substitute,
+    atk9C_setsubstitute,
     atk9D_mimicattackcopy,
     atk9E_metronome,
     atk9F_dmgtolevel,
@@ -678,39 +597,39 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atkA1_counterdamagecalculator,
     atkA2_mirrorcoatdamagecalculator,
     atkA3_disablelastusedattack,
-    atkA4_setencore,
+    atkA4_trysetencore,
     atkA5_painsplitdmgcalc,
     atkA6_settypetorandomresistance,
     atkA7_setalwayshitflag,
     atkA8_copymovepermanently,
     atkA9_sleeptalk_choose_move,
-    atkAA_set_destinybond,
-    atkAB_DestinyBondFlagUpdate,
+    atkAA_setdestinybond,
+    atkAB_trysetdestinybondtohappen,
     atkAC_remaininghptopower,
-    atkAD_spite_ppreduce,
-    atkAE_heal_party_status,
+    atkAD_tryspiteppreduce,
+    atkAE_healpartystatus,
     atkAF_cursetarget,
-    atkB0_set_spikes,
-    atkB1_set_foresight,
-    atkB2_setperishsong,
+    atkB0_trysetspikes,
+    atkB1_setforesight,
+    atkB2_trysetperishsong,
     atkB3_rolloutdamagecalculation,
     atkB4_jumpifconfusedandstatmaxed,
     atkB5_furycuttercalc,
     atkB6_happinesstodamagecalculation,
     atkB7_presentdamagecalculation,
-    atkB8_set_safeguard,
+    atkB8_setsafeguard,
     atkB9_magnitudedamagecalculation,
     atkBA_jumpifnopursuitswitchdmg,
     atkBB_setsunny,
     atkBC_maxattackhalvehp,
     atkBD_copyfoestats,
     atkBE_rapidspinfree,
-    atkBF_set_defense_curl,
+    atkBF_setdefensecurlbit,
     atkC0_recoverbasedonsunlight,
-    atkC1_hidden_power_calc,
-    atkC2_selectnexttarget,
-    atkC3_setfutureattack,
-    atkC4_beat_up,
+    atkC1_hiddenpowercalc,
+    atkC2_selectfirstvalidtarget,
+    atkC3_trysetfutureattack,
+    atkC4_trydobeatup,
     atkC5_setsemiinvulnerablebit,
     atkC6_clearsemiinvulnerablebit,
     atkC7_setminimize,
@@ -723,46 +642,46 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atkCE_settorment,
     atkCF_jumpifnodamage,
     atkD0_settaunt,
-    atkD1_set_helpinghand,
-    atkD2_swap_items,
-    atkD3_copy_ability,
-    atkD4_wish_effect,
-    atkD5_setroots,
+    atkD1_trysethelpinghand,
+    atkD2_tryswapitems,
+    atkD3_trycopyability,
+    atkD4_trywish,
+    atkD5_trysetroots,
     atkD6_doubledamagedealtifdamaged,
     atkD7_setyawn,
     atkD8_setdamagetohealthdifference,
     atkD9_scaledamagebyhealthratio,
-    atkDA_abilityswap,
-    atkDB_imprisoneffect,
-    atkDC_setgrudge,
+    atkDA_tryswapabilities,
+    atkDB_tryimprision,
+    atkDC_trysetgrudge,
     atkDD_weightdamagecalculation,
     atkDE_asistattackselect,
-    atkDF_setmagiccoat,
-    atkE0_setstealstatchange,
-    atkE1_intimidate_string_loader,
-    atkE2_switchout_abilities,
+    atkDF_trysetmagiccoat,
+    atkE0_trysetsnatch,
+    atkE1_trygetintimidatetarget,
+    atkE2_switchoutabilities,
     atkE3_jumpifhasnohp,
     atkE4_getsecretpowereffect,
     atkE5_pickup,
-    atkE6_castform_change_animation,
-    atkE7_castform_data_change,
+    atkE6_docastformchangeanimation,
+    atkE7_trycastformdatachange,
     atkE8_settypebasedhalvers,
     atkE9_setweatherballtype,
-    atkEA_recycleitem,
+    atkEA_tryrecycleitem,
     atkEB_settypetoterrain,
-    atkEC_pursuit_sth,
-    atkED_802B4B4,
+    atkEC_pursuitrelated,
+    atkEF_snatchsetbanks,
     atkEE_removelightscreenreflect,
     atkEF_pokeball_catch_calculation,
-    atkF0_give_caught_mon,
-    atkF1_set_caught_mon_dex_flags,
-    atkF2_display_dex_info,
-    atkF3_nickname_caught_poke,
+    atkF0_givecaughtmon,
+    atkF1_trysetcaughtmondexflags,
+    atkF2_displaydexinfo,
+    atkF3_trygivecaughtmonnick,
     atkF4_subattackerhpbydmg,
     atkF5_removeattackerstatus1,
-    atkF6_action_finished,
-    atkF7_turn_finished,
-    atkF8_trainer_slide_back
+    atkF6_finishaction,
+    atkF7_finishturn,
+    atkF8_trainerslideout
 };
 
 struct StatFractions
@@ -1208,14 +1127,14 @@ static void JumpIfMoveFailed(u8 adder, u16 move)
     }
     else
     {
-        DestinyBondFlagUpdate();
+        TrySetDestinyBondToHappen();
         if (AbilityBattleEffects(ABILITYEFFECT_ABSORBING, gBankTarget, 0, 0, move))
             return;
     }
     gBattlescriptCurrInstr = BS_ptr;
 }
 
-static void atk40_jump_if_move_affected_by_protect(void)
+static void atk40_jumpifaffectedbyprotect(void)
 {
     if (TARGET_PROTECT_AFFECTED)
     {
@@ -1476,7 +1395,7 @@ static void atk04_critcalc(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk05_damagecalc1(void)
+static void atk05_damagecalc(void)
 {
     u16 sideStatus = gSideAffecting[GET_BANK_SIDE(gBankTarget)];
     gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankTarget], gCurrentMove,
@@ -1843,7 +1762,7 @@ static void Unused_ApplyRandomDmgMultiplier(void)
     ApplyRandomDmgMultiplier();
 }
 
-static void atk07_dmg_adjustment(void)
+static void atk07_adjustnormaldamage(void)
 {
     u8 holdEffect, quality;
 
@@ -1891,7 +1810,7 @@ static void atk07_dmg_adjustment(void)
         gBattlescriptCurrInstr++;
 }
 
-static void atk08_dmg_adjustment2(void) // The same as 0x7 except it doesn't check for false swipe move effect.
+static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't check for false swipe move effect.
 {
     u8 holdEffect, quality;
 
@@ -2172,7 +2091,7 @@ static void atk0D_critmessage(void)
     }
 }
 
-static void atk0E_effectiveness_sound(void)
+static void atk0E_effectivenesssound(void)
 {
     if (gBattleExecBuffer)
         return;
@@ -2183,11 +2102,11 @@ static void atk0E_effectiveness_sound(void)
         switch (gBattleMoveFlags & (u8)(~(MOVESTATUS_MISSED)))
         {
         case MOVESTATUS_SUPEREFFECTIVE:
-            EmitEffectivenessSound(0, SE_KOUKA_H);
+            EmitPlaySE(0, SE_KOUKA_H);
             MarkBufferBankForExecution(gActiveBank);
             break;
         case MOVESTATUS_NOTVERYEFFECTIVE:
-            EmitEffectivenessSound(0, SE_KOUKA_L);
+            EmitPlaySE(0, SE_KOUKA_L);
             MarkBufferBankForExecution(gActiveBank);
             break;
         case MOVESTATUS_NOTAFFECTED:
@@ -2200,17 +2119,17 @@ static void atk0E_effectiveness_sound(void)
         default:
             if (gBattleMoveFlags & MOVESTATUS_SUPEREFFECTIVE)
             {
-                EmitEffectivenessSound(0, SE_KOUKA_H);
+                EmitPlaySE(0, SE_KOUKA_H);
                 MarkBufferBankForExecution(gActiveBank);
             }
             else if (gBattleMoveFlags & MOVESTATUS_NOTVERYEFFECTIVE)
             {
-                EmitEffectivenessSound(0, SE_KOUKA_L);
+                EmitPlaySE(0, SE_KOUKA_L);
                 MarkBufferBankForExecution(gActiveBank);
             }
             else if (!(gBattleMoveFlags & (MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED)))
             {
-                EmitEffectivenessSound(0, SE_KOUKA_M);
+                EmitPlaySE(0, SE_KOUKA_M);
                 MarkBufferBankForExecution(gActiveBank);
             }
             break;
@@ -2319,11 +2238,11 @@ static void atk10_printstring(void)
     }
 }
 
-static void atk11_printstring_playeronly(void)
+static void atk11_printselectionstring(void)
 {
     gActiveBank = gBankAttacker;
 
-    EmitPrintStringPlayerOnly(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
+    EmitPrintSelectionString(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
     MarkBufferBankForExecution(gActiveBank);
 
     gBattlescriptCurrInstr += 3;
@@ -2365,7 +2284,7 @@ static void atk13_printfromtable(void)
     }
 }
 
-static void atk14_printfromtable_playeronly(void)
+static void atk14_printselectionstringfromtable(void)
 {
     if (gBattleExecBuffer == 0)
     {
@@ -2373,7 +2292,7 @@ static void atk14_printfromtable_playeronly(void)
         ptr += gBattleCommunication[MULTISTRING_CHOOSER];
 
         gActiveBank = gBankAttacker;
-        EmitPrintStringPlayerOnly(0, *ptr);
+        EmitPrintSelectionString(0, *ptr);
         MarkBufferBankForExecution(gActiveBank);
 
         gBattlescriptCurrInstr += 5;
@@ -3134,7 +3053,7 @@ static void atk17_seteffectsecondary(void)
     SetMoveEffect(FALSE, 0);
 }
 
-static void atk18_status_effect_clear(void)
+static void atk18_clearstatusfromeffect(void)
 {
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
 
@@ -3148,7 +3067,7 @@ static void atk18_status_effect_clear(void)
     gBattleScripting.field_16 = 0;
 }
 
-static void atk19_faint_pokemon(void)
+static void atk19_tryfaintmon(void)
 {
     const u8 *BS_ptr;
 
@@ -3235,7 +3154,7 @@ static void atk19_faint_pokemon(void)
     }
 }
 
-static void atk1A_faint_animation(void)
+static void atk1A_dofaintanimation(void)
 {
     if (gBattleExecBuffer == 0)
     {
@@ -3246,7 +3165,7 @@ static void atk1A_faint_animation(void)
     }
 }
 
-static void atk1B_faint_effects_clear(void)
+static void atk1B_cleareffectsonfaint(void)
 {
     if (gBattleExecBuffer == 0)
     {
@@ -4098,19 +4017,19 @@ static void MoveValuesCleanUp(void)
     gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT);
 }
 
-static void atk25_move_values_cleanup(void)
+static void atk25_movevaluescleanup(void)
 {
     MoveValuesCleanUp();
     gBattlescriptCurrInstr += 1;
 }
 
-static void atk26_set_multihit(void)
+static void atk26_setmultihit(void)
 {
     gMultiHitCounter = gBattlescriptCurrInstr[1];
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk27_decrement_multihit(void)
+static void atk27_decrementmultihit(void)
 {
     if (--gMultiHitCounter == 0)
         gBattlescriptCurrInstr += 5;
@@ -4320,7 +4239,7 @@ static void atk31_copyarray(void)
     gBattlescriptCurrInstr += 10;
 }
 
-static void atk32_copyarray_withindex(void)
+static void atk32_copyarraywithindex(void)
 {
     u8* dest = BS2ScriptReadPtr(gBattlescriptCurrInstr + 1);
     const u8* src = BS2ScriptReadPtr(gBattlescriptCurrInstr + 5);
@@ -4470,7 +4389,7 @@ static void atk43_jumpifabilitypresent(void)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atk44_end_selection_script(void)
+static void atk44_endselectionscript(void)
 {
     *(gBankAttacker + gBattleStruct->selectionScriptFinished) = TRUE;
 }
@@ -5190,7 +5109,7 @@ static void atk49_moveend(void)
                     gBattleScripting.atk49_state = 0;
                     MoveValuesCleanUp();
                     BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
-                    gBattlescriptCurrInstr = gUnknown_082DB87D;
+                    gBattlescriptCurrInstr = BattleScript_82DB87D;
                     return;
                 }
                 else
@@ -5310,7 +5229,7 @@ static void atk4A_typecalc2(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk4B_return_atk_to_ball(void)
+static void atk4B_returnatktoball(void)
 {
     gActiveBank = gBankAttacker;
     if (!(gHitMarker & HITMARKER_FAINTED(gActiveBank)))
@@ -5321,7 +5240,7 @@ static void atk4B_return_atk_to_ball(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk4C_get_switched_mon_data(void)
+static void atk4C_getswitchedmondata(void)
 {
     if (gBattleExecBuffer)
         return;
@@ -5336,7 +5255,7 @@ static void atk4C_get_switched_mon_data(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk4D_switch_data_update(void)
+static void atk4D_switchindataupdate(void)
 {
     struct BattlePokemon oldData;
     s32 i;
@@ -5389,7 +5308,7 @@ static void atk4D_switch_data_update(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk4E_switchin_anim(void)
+static void atk4E_switchinanim(void)
 {
     if (gBattleExecBuffer)
         return;
@@ -5415,7 +5334,7 @@ static void atk4E_switchin_anim(void)
         sub_81A56B4();
 }
 
-static void atk4F_jump_if_cannot_switch(void)
+static void atk4F_jumpifcantswitch(void)
 {
     s32 val = 0;
     s32 compareVar = 0;
@@ -5869,7 +5788,7 @@ static void atk50_openpartyscreen(void)
     }
 }
 
-static void atk51_switch_handle_order(void)
+static void atk51_switchhandleorder(void)
 {
     s32 i;
     if (gBattleExecBuffer)
@@ -5936,7 +5855,7 @@ static void atk51_switch_handle_order(void)
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk52_switch_in_effects(void)
+static void atk52_switchineffects(void)
 {
     s32 i;
 
@@ -5967,12 +5886,12 @@ static void atk52_switch_in_effects(void)
         gBattleScripting.bank = gActiveBank;
         BattleScriptPushCursor();
 
-        if (gBattlescriptCurrInstr[1] == 0)
-            gBattlescriptCurrInstr = gUnknown_082DAE90;
-        else if (gBattlescriptCurrInstr[1] == 1)
-            gBattlescriptCurrInstr = gUnknown_082DAE59;
+        if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
+            gBattlescriptCurrInstr = BattleScript_SpikesOnTarget;
+        else if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
+            gBattlescriptCurrInstr = BattleScript_SpikesOnAttacker;
         else
-            gBattlescriptCurrInstr = gUnknown_082DAEC7;
+            gBattlescriptCurrInstr = BattleScript_SpikesOngBank1;
     }
     else
     {
@@ -6017,7 +5936,7 @@ static void atk52_switch_in_effects(void)
     }
 }
 
-static void atk53_trainer_slide(void)
+static void atk53_trainerslidein(void)
 {
     gActiveBank = GetBankByIdentity(gBattlescriptCurrInstr[1]);
     EmitTrainerSlide(0);
@@ -6026,16 +5945,16 @@ static void atk53_trainer_slide(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk54_effectiveness_sound(void)
+static void atk54_playse(void)
 {
     gActiveBank = gBankAttacker;
-    EmitEffectivenessSound(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
+    EmitPlaySE(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
     MarkBufferBankForExecution(gActiveBank);
 
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk55_play_fanfare(void)
+static void atk55_fanfare(void)
 {
     gActiveBank = gBankAttacker;
     EmitPlayFanfareOrBGM(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1), FALSE);
@@ -6044,7 +5963,7 @@ static void atk55_play_fanfare(void)
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk56_fainting_cry(void)
+static void atk56_playfaintcry(void)
 {
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
     EmitFaintingCry(0);
@@ -6055,14 +5974,14 @@ static void atk56_fainting_cry(void)
 
 static void atk57(void)
 {
-    gActiveBank = GetBankByIdentity(0);
+    gActiveBank = GetBankByIdentity(IDENTITY_PLAYER_MON1);
     EmitCmd55(0, gBattleOutcome);
     MarkBufferBankForExecution(gActiveBank);
 
     gBattlescriptCurrInstr += 1;
 }
 
-static void atk58_return_to_ball(void)
+static void atk58_returntoball(void)
 {
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
     EmitReturnMonToBall(0, 1);
@@ -6071,7 +5990,7 @@ static void atk58_return_to_ball(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk59_learnmove_inbattle(void)
+static void atk59_handlelearnnewmove(void)
 {
     const u8* jumpPtr1 = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     const u8* jumpPtr2 = BSScriptReadPtr(gBattlescriptCurrInstr + 5);
@@ -6367,7 +6286,7 @@ static void atk5D_getmoneyreward(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk5E_8025A70(void)
+static void atk5E(void)
 {
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
 
@@ -6394,7 +6313,7 @@ static void atk5E_8025A70(void)
     }
 }
 
-static void atk5F_8025B24(void)
+static void atk5F(void)
 {
     gActiveBank = gBankAttacker;
     gBankAttacker = gBankTarget;
@@ -6408,7 +6327,7 @@ static void atk5F_8025B24(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk60_increment_gamestat(void)
+static void atk60_incrementgamestat(void)
 {
     if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
         IncrementGameStat(gBattlescriptCurrInstr[1]);
@@ -6416,7 +6335,7 @@ static void atk60_increment_gamestat(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk61_draw_party_status_summary(void)
+static void atk61_drawpartystatussummary(void)
 {
     s32 i;
     struct Pokemon* party;
@@ -6453,7 +6372,7 @@ static void atk61_draw_party_status_summary(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk62_08025C6C(void)
+static void atk62(void)
 {
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
     EmitCmd49(0);
@@ -6569,7 +6488,7 @@ static void atk67_yesnobox(void)
     }
 }
 
-static void atk68_cancel_everyones_actions(void)
+static void atk68_cancelallactions(void)
 {
     s32 i;
 
@@ -6579,7 +6498,7 @@ static void atk68_cancel_everyones_actions(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk69_dmg_adjustment3(void) // The same as 0x7, except there's no random damage multiplier.
+static void atk69_adjustsetdamage(void) // The same as 0x7, except there's no random damage multiplier.
 {
     u8 holdEffect, quality;
 
@@ -6648,7 +6567,7 @@ static void atk6B_atknameinbuff1(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk6C_draw_lvlupbox(void)
+static void atk6C_drawlvlupbox(void)
 {
     if (gBattleScripting.atk6C_state == 0)
     {
@@ -6922,19 +6841,19 @@ static bool32 IsMonGettingExpSentOut(void)
     return FALSE;
 }
 
-static void atk6D_reset_sentpokes_value(void)
+static void atk6D_resetsentmonsvalue(void)
 {
     ResetSentPokesToOpponentValue();
     gBattlescriptCurrInstr++;
 }
 
-static void atk6E_set_atk_to_player0(void)
+static void atk6E_setatktoplayer0(void)
 {
     gBankAttacker = GetBankByIdentity(0);
     gBattlescriptCurrInstr++;
 }
 
-static void atk6F_set_visible(void)
+static void atk6F_makevisible(void)
 {
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
     EmitSpriteInvisibility(0, FALSE);
@@ -6943,7 +6862,7 @@ static void atk6F_set_visible(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk70_record_last_used_ability(void)
+static void atk70_recordlastability(void)
 {
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
     RecordAbilityBattle(gActiveBank, gLastUsedAbility);
@@ -6955,13 +6874,13 @@ void BufferMoveToLearnIntoBattleTextBuff2(void)
     PREPARE_MOVE_BUFFER(gBattleTextBuff2, gMoveToLearn);
 }
 
-static void atk71_buffer_move_to_learn(void)
+static void atk71_buffermovetolearn(void)
 {
     BufferMoveToLearnIntoBattleTextBuff2();
     gBattlescriptCurrInstr++;
 }
 
-static void atk72_jump_if_run_attempt_success(void)
+static void atk72_jumpifplayerran(void)
 {
     if (TryRunFromBattle(gBank1))
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
@@ -6969,7 +6888,7 @@ static void atk72_jump_if_run_attempt_success(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atk73_hp_thresholds(void)
+static void atk73_hpthresholds(void)
 {
     u8 opposingBank;
     s32 result;
@@ -6996,7 +6915,7 @@ static void atk73_hp_thresholds(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk74_hp_thresholds2(void)
+static void atk74_hpthresholds2(void)
 {
     u8 opposingBank;
     s32 result;
@@ -7022,7 +6941,7 @@ static void atk74_hp_thresholds2(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk75_item_effect_on_opponent(void)
+static void atk75_useitemonopponent(void)
 {
     gBankInMenu = gBankAttacker;
     ExecuteTableBasedItemEffect(&gEnemyParty[gBattlePartyID[gBankAttacker]], gLastUsedItem, gBattlePartyID[gBankAttacker], 0, 1);
@@ -7044,13 +6963,13 @@ static void atk76_various(void)
         break;
     case VARIOUS_SET_MAGIC_COAT_TARGET:
         gBankAttacker = gBankTarget;
-        side = GetBankSide(gBankAttacker) ^ 1;
+        side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer != 0 && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
             gBankTarget = gSideTimers[side].followmeTarget;
         else
             gBankTarget = gActiveBank;
         break;
-    case VARIOUS_CAN_RUN_FROM_BATTLE:
+    case VARIOUS_IS_RUNNING_IMPOSSIBLE:
         gBattleCommunication[0] = IsRunningFromBattleImpossible();
         break;
     case VARIOUS_GET_MOVE_TARGET:
@@ -7209,7 +7128,7 @@ static void atk76_various(void)
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk77_set_protect_like(void) // protect and endure
+static void atk77_setprotectlike(void) // protect and endure
 {
     bool8 notLastTurn = TRUE;
     u16 lastMove = gUnknown_02024260[gBankAttacker];
@@ -7292,9 +7211,9 @@ static void atk79_setatkhptozero(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk7A_jumpwhiletargetvalid(void) // Used by intimidate to loop through all targets.
+static void atk7A_jumpifnexttargetvalid(void)
 {
-    const u8* jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
+    const u8 *jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
@@ -7312,10 +7231,12 @@ static void atk7A_jumpwhiletargetvalid(void) // Used by intimidate to loop throu
             gBattlescriptCurrInstr = jumpPtr;
     }
     else
+    {
         gBattlescriptCurrInstr += 5;
+    }
 }
 
-static void atk7B_healhalfHP_if_possible(void)
+static void atk7B_tryhealhalfhealth(void)
 {
     const u8* failPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
@@ -7383,7 +7304,7 @@ static void atk7C_trymirrormove(void)
     }
 }
 
-static void atk7D_set_rain(void)
+static void atk7D_setrain(void)
 {
     if (gBattleWeather & WEATHER_RAIN_ANY)
     {
@@ -7464,9 +7385,9 @@ static void atk80_manipulatedamage(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk81_setrest(void)
+static void atk81_trysetrest(void)
 {
-    const u8* failJump = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
+    const u8 *failJump = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     gActiveBank = gBankTarget = gBankAttacker;
     gBattleMoveDamage = gBattleMons[gBankTarget].maxHP * (-1);
 
@@ -7530,9 +7451,9 @@ bool8 UproarWakeUpCheck(u8 bank)
         return TRUE;
 }
 
-static void atk84_jump_if_cant_sleep(void)
+static void atk84_jumpifcantmakeasleep(void)
 {
-    const u8* jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
+    const u8 *jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
     if (UproarWakeUpCheck(gBankTarget))
     {
@@ -7844,7 +7765,7 @@ static void atk8C_confuseifrepeatingattackends(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk8D_setmultihit_counter(void)
+static void atk8D_setmultihitcounter(void)
 {
     if (gBattlescriptCurrInstr[1])
     {
@@ -7862,7 +7783,7 @@ static void atk8D_setmultihit_counter(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk8E_init_multihit_string(void)
+static void atk8E_initmultihitstring(void)
 {
     PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
 
@@ -7886,7 +7807,7 @@ static bool8 sub_8051064(void)
         *(gBattleStruct->field_58 + gBankTarget) = gBattlePartyID[gBankTarget];
     }
 
-    gBattlescriptCurrInstr = gUnknown_082DADD8;
+    gBattlescriptCurrInstr = BattleScript_82DADD8;
     return TRUE;
 }
 
@@ -8051,7 +7972,7 @@ static void atk8F_forcerandomswitch(void)
     }
 }
 
-static void atk90_conversion_type_change(void) // randomly changes user's type to one of its moves' type
+static void atk90_tryconversiontypechange(void) // randomly changes user's type to one of its moves' type
 {
     u8 validMoves = 0;
     u8 moveChecked;
@@ -8155,7 +8076,7 @@ static void atk92_setlightscreen(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk93_ko_move(void)
+static void atk93_tryKO(void)
 {
     u8 holdEffect, param;
 
@@ -8319,7 +8240,7 @@ static void atk96_weatherdamage(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk97_try_infatuation(void)
+static void atk97_tryinfatuating(void)
 {
     struct Pokemon *monAttacker, *monTarget;
     u16 speciesAttacker, speciesTarget;
@@ -8364,7 +8285,7 @@ static void atk97_try_infatuation(void)
     }
 }
 
-static void atk98_status_icon_update(void)
+static void atk98_updatestatusicon(void)
 {
     if (gBattleExecBuffer)
         return;
@@ -8414,7 +8335,7 @@ static void atk99_setmist(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk9A_set_focusenergy(void)
+static void atk9A_setfocusenergy(void)
 {
     if (gBattleMons[gBankAttacker].status2 & STATUS2_FOCUS_ENERGY)
     {
@@ -8473,7 +8394,7 @@ static void atk9B_transformdataexecution(void)
     }
 }
 
-static void atk9C_set_substitute(void)
+static void atk9C_setsubstitute(void)
 {
     u32 hp = gBattleMons[gBankAttacker].maxHP / 4;
     if (gBattleMons[gBankAttacker].maxHP / 4 == 0)
@@ -8673,7 +8594,7 @@ static void atkA3_disablelastusedattack(void)
     }
 }
 
-static void atkA4_setencore(void)
+static void atkA4_trysetencore(void)
 {
     s32 i;
 
@@ -8937,13 +8858,13 @@ static void atkA9_sleeptalk_choose_move(void)
     }
 }
 
-static void atkAA_set_destinybond(void)
+static void atkAA_setdestinybond(void)
 {
     gBattleMons[gBankAttacker].status2 |= STATUS2_DESTINY_BOND;
     gBattlescriptCurrInstr++;
 }
 
-static void DestinyBondFlagUpdate(void)
+static void TrySetDestinyBondToHappen(void)
 {
     u8 sideAttacker = GetBankSide(gBankAttacker);
     u8 sideTarget = GetBankSide(gBankTarget);
@@ -8955,9 +8876,9 @@ static void DestinyBondFlagUpdate(void)
     }
 }
 
-static void atkAB_DestinyBondFlagUpdate(void)
+static void atkAB_trysetdestinybondtohappen(void)
 {
-    DestinyBondFlagUpdate();
+    TrySetDestinyBondToHappen();
     gBattlescriptCurrInstr++;
 }
 
@@ -8976,7 +8897,7 @@ static void atkAC_remaininghptopower(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkAD_spite_ppreduce(void)
+static void atkAD_tryspiteppreduce(void)
 {
     if (gLastUsedMovesByBanks[gBankTarget] != 0
         && gLastUsedMovesByBanks[gBankTarget] != 0xFFFF)
@@ -9027,7 +8948,7 @@ static void atkAD_spite_ppreduce(void)
     }
 }
 
-static void atkAE_heal_party_status(void)
+static void atkAE_healpartystatus(void)
 {
     u32 zero = 0;
     u8 toHeal = 0;
@@ -9140,7 +9061,7 @@ static void atkAF_cursetarget(void)
     }
 }
 
-static void atkB0_set_spikes(void)
+static void atkB0_trysetspikes(void)
 {
     u8 targetSide = GetBankSide(gBankAttacker) ^ BIT_SIDE;
 
@@ -9157,13 +9078,13 @@ static void atkB0_set_spikes(void)
     }
 }
 
-static void atkB1_set_foresight(void)
+static void atkB1_setforesight(void)
 {
     gBattleMons[gBankTarget].status2 |= STATUS2_FORESIGHT;
     gBattlescriptCurrInstr++;
 }
 
-static void atkB2_setperishsong(void)
+static void atkB2_trysetperishsong(void)
 {
     s32 i;
     s32 notAffectedCount = 0;
@@ -9196,7 +9117,7 @@ static void atkB3_rolloutdamagecalculation(void)
     if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
     {
         CancelMultiTurnMoves(gBankAttacker);
-        gBattlescriptCurrInstr = BattleScript_PauseEffectivenessSoundResultMsgEndMove;
+        gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
     }
     else
     {
@@ -9240,7 +9161,7 @@ static void atkB5_furycuttercalc(void)
     if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
     {
         gDisableStructs[gBankAttacker].furyCutterCounter = 0;
-        gBattlescriptCurrInstr = BattleScript_PauseEffectivenessSoundResultMsgEndMove;
+        gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
     }
     else
     {
@@ -9286,7 +9207,7 @@ static void atkB7_presentdamagecalculation(void)
         gBattleMoveDamage *= -1;
     }
     if (rand < 204)
-        gBattlescriptCurrInstr = BattleScript_PresentDamageTarget;
+        gBattlescriptCurrInstr = BattleScript_HitFromCritCalc;
     else if (gBattleMons[gBankTarget].maxHP == gBattleMons[gBankTarget].hp)
         gBattlescriptCurrInstr = BattleScript_AlreadyAtFullHp;
     else
@@ -9296,7 +9217,7 @@ static void atkB7_presentdamagecalculation(void)
     }
 }
 
-static void atkB8_set_safeguard(void)
+static void atkB8_setsafeguard(void)
 {
     if (gSideAffecting[GET_BANK_SIDE(gBankAttacker)] & SIDE_STATUS_SAFEGUARD)
     {
@@ -9501,7 +9422,7 @@ static void atkBE_rapidspinfree(void)
     }
 }
 
-static void atkBF_set_defense_curl(void)
+static void atkBF_setdefensecurlbit(void)
 {
     gBattleMons[gBankAttacker].status2 |= STATUS2_DEFENSE_CURL;
     gBattlescriptCurrInstr++;
@@ -9533,7 +9454,7 @@ static void atkC0_recoverbasedonsunlight(void)
 }
 
 #ifdef NONMATCHING
-static void atkC1_hidden_power_calc(void)
+static void atkC1_hiddenpowercalc(void)
 {
     u32 powerBits = 0;
     u32 typeBits = 0;
@@ -9564,7 +9485,7 @@ static void atkC1_hidden_power_calc(void)
 
 #else
 __attribute__((naked))
-static void atkC1_hidden_power_calc(void)
+static void atkC1_hiddenpowercalc(void)
 {
     asm(".syntax unified\n\
         	push {r4-r7,lr}\n\
@@ -9707,7 +9628,7 @@ _080544F0:\n\
 }
 #endif // NONMATCHING
 
-static void atkC2_selectnexttarget(void)
+static void atkC2_selectfirstvalidtarget(void)
 {
     for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
     {
@@ -9719,7 +9640,7 @@ static void atkC2_selectnexttarget(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC3_setfutureattack(void)
+static void atkC3_trysetfutureattack(void)
 {
     if (gWishFutureKnock.futureSightCounter[gBankTarget] != 0)
     {
@@ -9747,9 +9668,9 @@ static void atkC3_setfutureattack(void)
     }
 }
 
-static void atkC4_beat_up(void)
+static void atkC4_trydobeatup(void)
 {
-    struct Pokemon* party;
+    struct Pokemon *party;
 
     if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
         party = gPlayerParty;
@@ -9950,7 +9871,7 @@ static void atkD0_settaunt(void)
     }
 }
 
-static void atkD1_set_helpinghand(void)
+static void atkD1_trysethelpinghand(void)
 {
     gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_MON);
 
@@ -9968,7 +9889,7 @@ static void atkD1_set_helpinghand(void)
     }
 }
 
-static void atkD2_swap_items(void) // trick
+static void atkD2_tryswapitems(void) // trick
 {
     // opponent can't swap items with player in regular battles
     if (gBattleTypeFlags & BATTLE_TYPE_x4000000
@@ -10055,7 +9976,7 @@ static void atkD2_swap_items(void) // trick
     }
 }
 
-static void atkD3_copy_ability(void) // role play
+static void atkD3_trycopyability(void) // role play
 {
     if (gBattleMons[gBankTarget].ability != 0
         && gBattleMons[gBankTarget].ability != ABILITY_WONDER_GUARD)
@@ -10070,7 +9991,7 @@ static void atkD3_copy_ability(void) // role play
     }
 }
 
-static void atkD4_wish_effect(void)
+static void atkD4_trywish(void)
 {
     switch (gBattlescriptCurrInstr[1])
     {
@@ -10103,7 +10024,7 @@ static void atkD4_wish_effect(void)
     }
 }
 
-static void atkD5_setroots(void) // ingrain
+static void atkD5_trysetroots(void) // ingrain
 {
     if (gStatuses3[gBankAttacker] & STATUS3_ROOTED)
     {
@@ -10168,7 +10089,7 @@ static void atkD9_scaledamagebyhealthratio(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkDA_abilityswap(void) // skill swap
+static void atkDA_tryswapabilities(void) // skill swap
 {
     if ((gBattleMons[gBankAttacker].ability == 0
          && gBattleMons[gBankTarget].ability == 0)
@@ -10188,7 +10109,7 @@ static void atkDA_abilityswap(void) // skill swap
     }
 }
 
-static void atkDB_imprisoneffect(void)
+static void atkDB_tryimprision(void)
 {
     if ((gStatuses3[gBankAttacker] & STATUS3_IMPRISONED_OTHERS))
     {
@@ -10230,7 +10151,7 @@ static void atkDB_imprisoneffect(void)
     }
 }
 
-static void atkDC_setgrudge(void)
+static void atkDC_trysetgrudge(void)
 {
     if (gStatuses3[gBankAttacker] & STATUS3_GRUDGE)
     {
@@ -10313,7 +10234,7 @@ static void atkDE_asistattackselect(void)
     }
 }
 
-static void atkDF_setmagiccoat(void)
+static void atkDF_trysetmagiccoat(void)
 {
     gBankTarget = gBankAttacker;
     gSpecialStatuses[gBankAttacker].flag20 = 1;
@@ -10328,7 +10249,7 @@ static void atkDF_setmagiccoat(void)
     }
 }
 
-static void atkE0_setstealstatchange(void) // snatch
+static void atkE0_trysetsnatch(void) // snatch
 {
     gSpecialStatuses[gBankAttacker].flag20 = 1;
     if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) // moves last turn
@@ -10342,7 +10263,7 @@ static void atkE0_setstealstatchange(void) // snatch
     }
 }
 
-static void atkE1_intimidate_string_loader(void)
+static void atkE1_trygetintimidatetarget(void)
 {
     u8 side;
 
@@ -10365,7 +10286,7 @@ static void atkE1_intimidate_string_loader(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atkE2_switchout_abilities(void)
+static void atkE2_switchoutabilities(void)
 {
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
 
@@ -10502,7 +10423,7 @@ static void atkE5_pickup(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkE6_castform_change_animation(void)
+static void atkE6_docastformchangeanimation(void)
 {
     gActiveBank = gBattleScripting.bank;
 
@@ -10515,7 +10436,7 @@ static void atkE6_castform_change_animation(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkE7_castform_data_change(void)
+static void atkE7_trycastformdatachange(void)
 {
     u8 form;
 
@@ -10578,7 +10499,7 @@ static void atkE9_setweatherballtype(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkEA_recycleitem(void)
+static void atkEA_tryrecycleitem(void)
 {
     u16 *usedHeldItem;
 
@@ -10619,7 +10540,7 @@ static void atkEB_settypetoterrain(void)
     }
 }
 
-static void atkEC_pursuit_sth(void)
+static void atkEC_pursuitrelated(void)
 {
     gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_MON);
 
@@ -10641,7 +10562,7 @@ static void atkEC_pursuit_sth(void)
     }
 }
 
-static void atkED_802B4B4(void)
+static void atkEF_snatchsetbanks(void)
 {
     gEffectBank = gBankAttacker;
 
@@ -10827,7 +10748,7 @@ static void atkEF_pokeball_catch_calculation(void)
     }
 }
 
-static void atkF0_give_caught_mon(void)
+static void atkF0_givecaughtmon(void)
 {
     if (GiveMonToPlayer(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY)
     {
@@ -10856,7 +10777,7 @@ static void atkF0_give_caught_mon(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkF1_set_caught_mon_dex_flags(void)
+static void atkF1_trysetcaughtmondexflags(void)
 {
     u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL);
     u32 personality = GetMonData(&gEnemyParty[0], MON_DATA_PERSONALITY, NULL);
@@ -10872,7 +10793,7 @@ static void atkF1_set_caught_mon_dex_flags(void)
     }
 }
 
-static void atkF2_display_dex_info(void)
+static void atkF2_displaydexinfo(void)
 {
     u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL);
 
@@ -10991,7 +10912,7 @@ void BattleDestroyYesNoCursorAt(u8 cursorPosition)
     CopyBgTilemapBufferToVram(0);
 }
 
-static void atkF3_nickname_caught_poke(void)
+static void atkF3_trygivecaughtmonnick(void)
 {
     switch (gBattleCommunication[MULTIUSE_STATE])
     {
@@ -11079,18 +11000,18 @@ static void atkF5_removeattackerstatus1(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkF6_action_finished(void)
+static void atkF6_finishaction(void)
 {
     gCurrentActionFuncId = ACTION_FINISHED;
 }
 
-static void atkF7_turn_finished(void)
+static void atkF7_finishturn(void)
 {
     gCurrentActionFuncId = ACTION_FINISHED;
     gCurrentTurnActionNumber = gNoOfAllBanks;
 }
 
-static void atkF8_trainer_slide_back(void)
+static void atkF8_trainerslideout(void)
 {
     gActiveBank = GetBankByIdentity(gBattlescriptCurrInstr[1]);
     EmitTrainerSlideBack(0);
diff --git a/src/battle_util.c b/src/battle_util.c
index ed3bdef98..0ec98d125 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -9,6 +9,7 @@
 #include "items.h"
 #include "util.h"
 #include "battle_move_effects.h"
+#include "battle_scripts.h"
 #include "rng.h"
 #include "text.h"
 #include "string_util.h"
@@ -60,119 +61,6 @@ extern u8 gSentPokesToOpponent[2];
 
 extern const struct BattleMove gBattleMoves[];
 
-// scripts
-extern const u8 gUnknown_082DAE2A[];
-extern const u8 gUnknown_082DAE1F[];
-extern const u8 gUnknown_082DB089[];
-extern const u8 gUnknown_082DB098[];
-extern const u8 gUnknown_082DB0AF[];
-extern const u8 gUnknown_082DB0A0[];
-extern const u8 gUnknown_082DB185[];
-extern const u8 gUnknown_082DB181[];
-extern const u8 gUnknown_082DB812[];
-extern const u8 gUnknown_082DB076[];
-extern const u8 BattleScript_NoMovesLeft[];
-extern const u8 gUnknown_082DACFA[];
-extern const u8 gUnknown_082DAD0B[];
-extern const u8 gUnknown_082DACC9[];
-extern const u8 gUnknown_082DAC47[];
-extern const u8 gUnknown_082DACE0[];
-extern const u8 gUnknown_082DACD2[];
-extern const u8 BattleScript_WishComesTrue[];
-extern const u8 gUnknown_082DACC9[];
-extern const u8 gUnknown_082DAC2C[];
-extern const u8 BattleScript_IngrainTurnHeal[];
-extern const u8 BattleScript_LeechSeedTurnDrain[];
-extern const u8 BattleScript_PoisonTurnDmg[];
-extern const u8 BattleScript_BurnTurnDmg[];
-extern const u8 BattleScript_NightmareTurnDmg[];
-extern const u8 BattleScript_CurseTurnDmg[];
-extern const u8 BattleScript_WrapTurnDmg[];
-extern const u8 BattleScript_WrapEnds[];
-extern const u8 gUnknown_082DB234[];
-extern const u8 gUnknown_082DB2A6[];
-extern const u8 BattleScript_ThrashConfuses[];
-extern const u8 BattleScript_DisabledNoMore[];
-extern const u8 BattleScript_EncoredNoMore[];
-extern const u8 BattleScript_YawnMakesAsleep[];
-extern const u8 gUnknown_082DAFE4[];
-extern const u8 gUnknown_082DB8F3[];
-extern const u8 gUnknown_082DAF05[];
-extern const u8 gUnknown_082DAF20[];
-extern const u8 gUnknown_082DA7C4[];
-extern const u8 gUnknown_082DA7CD[];
-extern const u8 BattleScript_MoveUsedWokeUp[];
-extern const u8 BattleScript_MoveUsedIsAsleep[];
-extern const u8 BattleScript_MoveUsedIsFrozen[];
-extern const u8 BattleScript_MoveUsedUnfroze[];
-extern const u8 BattleScript_MoveUsedLoafingAround[];
-extern const u8 BattleScript_MoveUsedMustRecharge[];
-extern const u8 BattleScript_MoveUsedFlinched[];
-extern const u8 BattleScript_MoveUsedIsDisabled[];
-extern const u8 BattleScript_MoveUsedIsTaunted[];
-extern const u8 BattleScript_MoveUsedIsImprisoned[];
-extern const u8 BattleScript_MoveUsedIsConfused[];
-extern const u8 BattleScript_MoveUsedIsConfusedNoMore[];
-extern const u8 BattleScript_MoveUsedIsParalyzed[];
-extern const u8 BattleScript_MoveUsedIsParalyzedCantAttack[];
-extern const u8 BattleScript_MoveUsedIsInLove[];
-extern const u8 BattleScript_BideStoringEnergy[];
-extern const u8 BattleScript_BideAttack[];
-extern const u8 BattleScript_BideNoEnergyToAttack[];
-extern const u8 gUnknown_082DACE7[];
-extern const u8 BattleScript_DrizzleActivates[];
-extern const u8 BattleScript_SandstreamActivates[];
-extern const u8 BattleScript_DroughtActivates[];
-extern const u8 BattleScript_CastformChange[];
-extern const u8 BattleScript_RainDishActivates[];
-extern const u8 BattleScript_ShedSkinActivates[];
-extern const u8 BattleScript_SpeedBoostActivates[];
-extern const u8 BattleScript_SoundproofProtected[];
-extern const u8 BattleScript_MoveHPDrain[];
-extern const u8 BattleScript_MoveHPDrain_PPLoss[];
-extern const u8 BattleScript_FlashFireBoost[];
-extern const u8 BattleScript_FlashFireBoost_PPLoss[];
-extern const u8 gUnknown_082DB592[];
-extern const u8 gUnknown_082DB591[];
-extern const u8 BattleScript_ColorChangeActivates[];
-extern const u8 BattleScript_RoughSkinActivates[];
-extern const u8 BattleScript_ApplySecondaryEffect[];
-extern const u8 BattleScript_CuteCharmActivates[];
-extern const u8 gUnknown_082DB68C[];
-extern const u8 BattleScript_SynchronizeActivates[];
-extern const u8 gUnknown_082DB4B8[];
-extern const u8 gUnknown_082DB4C1[];
-extern const u8 BattleScript_TraceActivates[];
-
-extern const u8 BattleScript_WhiteHerbEnd2[];
-extern const u8 BattleScript_WhiteHerbRet[];
-extern const u8 BattleScript_ItemHealHP_RemoveItem[];
-extern const u8 BattleScript_BerryPPHealEnd2[];
-extern const u8 BattleScript_ItemHealHP_End2[];
-extern const u8 BattleScript_BerryConfuseHealEnd2[];
-extern const u8 BattleScript_BerryStatRaiseEnd2[];
-extern const u8 BattleScript_BerryFocusEnergyEnd2[];
-extern const u8 BattleScript_BerryCurePrlzEnd2[];
-extern const u8 BattleScript_BerryCurePsnEnd2[];
-extern const u8 BattleScript_BerryCureBrnEnd2[];
-extern const u8 BattleScript_BerryCureFrzEnd2[];
-extern const u8 BattleScript_BerryCureSlpEnd2[];
-extern const u8 BattleScript_BerryCureConfusionEnd2[];
-extern const u8 BattleScript_BerryCureChosenStatusEnd2[];
-extern const u8 BattleScript_BerryCureParRet[];
-extern const u8 BattleScript_BerryCurePsnRet[];
-extern const u8 BattleScript_BerryCureBrnRet[];
-extern const u8 BattleScript_BerryCureFrzRet[];
-extern const u8 BattleScript_BerryCureSlpRet[];
-extern const u8 BattleScript_BerryCureConfusionRet[];
-extern const u8 BattleScript_BerryCureChosenStatusRet[];
-extern const u8 BattleScript_ItemHealHP_Ret[];
-
-extern const u8 gUnknown_082DB695[]; //disobedient while asleep
-extern const u8 gUnknown_082DB6A5[]; //disobedient, uses a random move
-extern const u8 gUnknown_082DB6D9[]; //disobedient, went to sleep
-extern const u8 gUnknown_082DB6F0[]; //disobedient, hits itself
-
 extern u8 weather_get_current(void);
 
 // rom const data
@@ -196,13 +84,13 @@ u8 GetBattleBank(u8 caseId)
     case BS_GET_EFFECT_BANK:
         ret = gEffectBank;
         break;
-    case 7:
+    case BS_GET_BANK_0:
         ret = 0;
         break;
     case BS_GET_SCRIPTING_BANK:
         ret = gBattleScripting.bank;
         break;
-    case 3:
+    case BS_GET_gBank1:
         ret = gBank1;
         break;
     case 5:
@@ -474,12 +362,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gUnknown_02024230[gActiveBank] = gUnknown_082DAE2A;
+            gUnknown_02024230[gActiveBank] = BattleScript_82DAE2A;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DAE1F;
+            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DAE1F;
             limitations = 1;
         }
     }
@@ -489,12 +377,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
         CancelMultiTurnMoves(gActiveBank);
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gUnknown_02024230[gActiveBank] = gUnknown_082DB098;
+            gUnknown_02024230[gActiveBank] = BattleScript_82DB098;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB089;
+            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB089;
             limitations++;
         }
     }
@@ -504,12 +392,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gUnknown_02024230[gActiveBank] = gUnknown_082DB0AF;
+            gUnknown_02024230[gActiveBank] = BattleScript_82DB0AF;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB0A0;
+            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB0A0;
             limitations++;
         }
     }
@@ -519,12 +407,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gUnknown_02024230[gActiveBank] = gUnknown_082DB185;
+            gUnknown_02024230[gActiveBank] = BattleScript_82DB185;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB181;
+            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB181;
             limitations++;
         }
     }
@@ -546,7 +434,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB812;
+            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB812;
             limitations++;
         }
     }
@@ -559,7 +447,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB076;
+            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB076;
             limitations++;
         }
     }
@@ -694,7 +582,7 @@ u8 UpdateTurnCounters(void)
                     if (--gSideTimers[sideBank].reflectTimer == 0)
                     {
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT;
-                        BattleScriptExecute(gUnknown_082DACFA);
+                        BattleScriptExecute(BattleScript_82DACFA);
                         gBattleTextBuff1[0] = 0xFD;
                         gBattleTextBuff1[1] = 2;
                         gBattleTextBuff1[2] = MOVE_REFLECT;
@@ -723,7 +611,7 @@ u8 UpdateTurnCounters(void)
                     if (--gSideTimers[sideBank].lightscreenTimer == 0)
                     {
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN;
-                        BattleScriptExecute(gUnknown_082DACFA);
+                        BattleScriptExecute(BattleScript_82DACFA);
                         gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
                         gBattleTextBuff1[0] = 0xFD;
                         gBattleTextBuff1[1] = 2;
@@ -752,7 +640,7 @@ u8 UpdateTurnCounters(void)
                  && --gSideTimers[sideBank].mistTimer == 0)
                 {
                     gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST;
-                    BattleScriptExecute(gUnknown_082DACFA);
+                    BattleScriptExecute(BattleScript_82DACFA);
                     gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
                     gBattleTextBuff1[0] = 0xFD;
                     gBattleTextBuff1[1] = 2;
@@ -781,7 +669,7 @@ u8 UpdateTurnCounters(void)
                     if (--gSideTimers[sideBank].safeguardTimer == 0)
                     {
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_SAFEGUARD;
-                        BattleScriptExecute(gUnknown_082DAD0B);
+                        BattleScriptExecute(BattleScript_82DAD0B);
                         effect++;
                     }
                 }
@@ -836,7 +724,7 @@ u8 UpdateTurnCounters(void)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                 else
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-                BattleScriptExecute(gUnknown_082DAC2C);
+                BattleScriptExecute(BattleScript_82DAC2C);
                 effect++;
             }
             gBattleStruct->turncountersTracker++;
@@ -847,10 +735,10 @@ u8 UpdateTurnCounters(void)
                 if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
                 {
                     gBattleWeather &= ~WEATHER_SANDSTORM_TEMPORARY;
-                    gBattlescriptCurrInstr = gUnknown_082DACC9;
+                    gBattlescriptCurrInstr = BattleScript_82DACC9;
                 }
                 else
-                    gBattlescriptCurrInstr = gUnknown_082DAC47;
+                    gBattlescriptCurrInstr = BattleScript_82DAC47;
 
                 gBattleScripting.animArg1 = 0xC;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -865,10 +753,10 @@ u8 UpdateTurnCounters(void)
                 if (!(gBattleWeather & WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
                 {
                     gBattleWeather &= ~WEATHER_SUN_TEMPORARY;
-                    gBattlescriptCurrInstr = gUnknown_082DACE0;
+                    gBattlescriptCurrInstr = BattleScript_82DACE0;
                 }
                 else
-                    gBattlescriptCurrInstr = gUnknown_082DACD2;
+                    gBattlescriptCurrInstr = BattleScript_82DACD2;
 
                 BattleScriptExecute(gBattlescriptCurrInstr);
                 effect++;
@@ -881,10 +769,10 @@ u8 UpdateTurnCounters(void)
                 if (--gWishFutureKnock.weatherDuration == 0)
                 {
                     gBattleWeather &= ~WEATHER_HAIL;
-                    gBattlescriptCurrInstr = gUnknown_082DACC9;
+                    gBattlescriptCurrInstr = BattleScript_82DACC9;
                 }
                 else
-                    gBattlescriptCurrInstr = gUnknown_082DAC47;
+                    gBattlescriptCurrInstr = BattleScript_82DAC47;
 
                 gBattleScripting.animArg1 = 0xD;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -1075,7 +963,7 @@ u8 TurnBasedEffects(void)
                             gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP);
                             gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                            BattleScriptExecute(gUnknown_082DB234);
+                            BattleScriptExecute(BattleScript_82DB234);
                             gActiveBank = gBankAttacker;
                             EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
                             MarkBufferBankForExecution(gActiveBank);
@@ -1106,7 +994,7 @@ u8 TurnBasedEffects(void)
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                             CancelMultiTurnMoves(gActiveBank);
                         }
-                        BattleScriptExecute(gUnknown_082DB2A6);
+                        BattleScriptExecute(BattleScript_82DB2A6);
                         effect = 1;
                     }
                 }
@@ -1259,7 +1147,7 @@ bool8 sub_8041364(void)
                 gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank];
                 gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank];
                 gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF;
-                BattleScriptExecute(gUnknown_082DAFE4);
+                BattleScriptExecute(BattleScript_82DAFE4);
 
                 if (gWishFutureKnock.futureSightCounter[gActiveBank] == 0
                  && gWishFutureKnock.futureSightCounter[gActiveBank ^ 2] == 0)
@@ -1298,12 +1186,12 @@ bool8 sub_8041364(void)
                 {
                     gStatuses3[gActiveBank] &= ~STATUS3_PERISH_SONG;
                     gBattleMoveDamage = gBattleMons[gActiveBank].hp;
-                    gBattlescriptCurrInstr = gUnknown_082DAF05;
+                    gBattlescriptCurrInstr = BattleScript_82DAF05;
                 }
                 else
                 {
                     gDisableStructs[gActiveBank].perishSongTimer1--;
-                    gBattlescriptCurrInstr = gUnknown_082DAF20;
+                    gBattlescriptCurrInstr = BattleScript_82DAF20;
                 }
                 BattleScriptExecute(gBattlescriptCurrInstr);
                 return 1;
@@ -1326,8 +1214,8 @@ bool8 sub_8041364(void)
             for (i = 0; i < 2; i++)
                 CancelMultiTurnMoves(i);
 
-            gBattlescriptCurrInstr = gUnknown_082DB8F3;
-            BattleScriptExecute(gUnknown_082DB8F3);
+            gBattlescriptCurrInstr = BattleScript_82DB8F3;
+            BattleScriptExecute(BattleScript_82DB8F3);
             gBattleStruct->field_1A0++;
             return 1;
         }
@@ -1367,7 +1255,7 @@ bool8 sub_8041728(void)
                  && !(gBattleStruct->field_DF & gBitTable[gBattlePartyID[gBattleStruct->field_4E]])
                  && !(gAbsentBankFlags & gBitTable[gBattleStruct->field_4E]))
                 {
-                    BattleScriptExecute(gUnknown_082DA7C4);
+                    BattleScriptExecute(BattleScript_82DA7C4);
                     gBattleStruct->field_4D = 2;
                     return TRUE;
                 }
@@ -1392,7 +1280,7 @@ bool8 sub_8041728(void)
                 if (gBattleMons[gBattleStruct->field_4E].hp == 0
                  && !(gAbsentBankFlags & gBitTable[gBattleStruct->field_4E]))
                 {
-                    BattleScriptExecute(gUnknown_082DA7CD);
+                    BattleScriptExecute(BattleScript_82DA7CD);
                     gBattleStruct->field_4D = 5;
                     return TRUE;
                 }
@@ -1961,7 +1849,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 if (effect)
                 {
                     gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current();
-                    BattleScriptPushCursorAndCallback(gUnknown_082DACE7);
+                    BattleScriptPushCursorAndCallback(BattleScript_82DACE7);
                 }
                 break;
             case ABILITY_DRIZZLE:
@@ -2167,9 +2055,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     if (gBattleMons[bank].maxHP == gBattleMons[bank].hp)
                     {
                         if ((gProtectStructs[gBankAttacker].notFirstStrike))
-                            gBattlescriptCurrInstr = gUnknown_082DB592;
+                            gBattlescriptCurrInstr = BattleScript_82DB592;
                         else
-                            gBattlescriptCurrInstr = gUnknown_082DB591;
+                            gBattlescriptCurrInstr = BattleScript_82DB591;
                     }
                     else
                     {
@@ -2380,7 +2268,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         }
 
                         BattleScriptPushCursor();
-                        gBattlescriptCurrInstr = gUnknown_082DB68C;
+                        gBattlescriptCurrInstr = BattleScript_82DB68C;
                         gBattleScripting.bank = bank;
                         gActiveBank = bank;
                         EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
@@ -2445,7 +2333,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 {
                     gLastUsedAbility = ABILITY_INTIMIDATE;
                     gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES);
-                    BattleScriptPushCursorAndCallback(gUnknown_082DB4B8);
+                    BattleScriptPushCursorAndCallback(BattleScript_82DB4B8);
                     gBattleStruct->intimidateBank = i;
                     effect++;
                     break;
@@ -2517,7 +2405,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     gLastUsedAbility = ABILITY_INTIMIDATE;
                     gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES);
                     BattleScriptPushCursor();
-                    gBattlescriptCurrInstr = gUnknown_082DB4C1;
+                    gBattlescriptCurrInstr = BattleScript_82DB4C1;
                     gBattleStruct->intimidateBank = i;
                     effect++;
                     break;
@@ -3536,7 +3424,7 @@ u8 IsPokeDisobedient(void)
         gBattleMons[gBankAttacker].status2 &= ~(STATUS2_RAGE);
     if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK))
     {
-        gBattlescriptCurrInstr = gUnknown_082DB695;
+        gBattlescriptCurrInstr = BattleScript_82DB695;
         return 1;
     }
 
@@ -3559,7 +3447,7 @@ u8 IsPokeDisobedient(void)
             } while (gBitTable[gCurrMovePos] & calc);
 
             gRandomMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
-            gBattlescriptCurrInstr = gUnknown_082DB6A5;
+            gBattlescriptCurrInstr = BattleScript_82DB6A5;
             gBankTarget = GetMoveTarget(gRandomMove, 0);
             gHitMarker |= HITMARKER_x200000;
             return 2;
@@ -3581,7 +3469,7 @@ u8 IsPokeDisobedient(void)
             }
             if (i == gNoOfAllBanks)
             {
-                gBattlescriptCurrInstr = gUnknown_082DB6D9;
+                gBattlescriptCurrInstr = BattleScript_82DB6D9;
                 return 1;
             }
         }
@@ -3590,7 +3478,7 @@ u8 IsPokeDisobedient(void)
         {
             gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankAttacker], MOVE_POUND, 0, 40, 0, gBankAttacker, gBankAttacker);
             gBankTarget = gBankAttacker;
-            gBattlescriptCurrInstr = gUnknown_082DB6F0;
+            gBattlescriptCurrInstr = BattleScript_82DB6F0;
             gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
             return 2;
         }
-- 
cgit v1.2.3


From 76f4a8b195932b4fbac9945eca8d97ffbbc0f84b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 26 Nov 2017 00:33:40 +0100
Subject: clean up and use names for printfromtable

---
 src/battle_message.c         | 280 +++++++++++++++++++++++++++++++++++--------
 src/battle_script_commands.c |   4 +-
 2 files changed, 232 insertions(+), 52 deletions(-)

(limited to 'src')

diff --git a/src/battle_message.c b/src/battle_message.c
index 9c37cf646..04eb5f655 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -932,58 +932,237 @@ const u16 gSandStormHailDmgStringIds[] =
     STRINGID_PKMNBUFFETEDBYSANDSTORM, STRINGID_PKMNPELTEDBYHAIL
 };
 
-// todo once battlescripts are dumped
-const u16 gTooLazyToSplitThemStringIds[] =
-{
-    STRINGID_SANDSTORMSUBSIDED, STRINGID_HAILSTOPPED, STRINGID_RAINCONTINUES, STRINGID_DOWNPOURCONTINUES,
-    STRINGID_RAINSTOPPED, STRINGID_PKMNPROTECTEDITSELF2, STRINGID_PKMNBRACEDITSELF,
-    STRINGID_BUTITFAILED, STRINGID_BUTITFAILED, STRINGID_PKMNRAISEDDEF,
-    STRINGID_PKMNRAISEDDEFALITTLE, STRINGID_PKMNRAISEDSPDEF, STRINGID_PKMNRAISEDSPDEFALITTLE,
-    STRINGID_PKMNCOVEREDBYVEIL, STRINGID_PKMNSEEDED, STRINGID_PKMNEVADEDATTACK,
+const u16 gSandStormHailEndStringIds[] =
+{
+    STRINGID_SANDSTORMSUBSIDED, STRINGID_HAILSTOPPED
+};
+
+const u16 gRainContinuesStringIds[] =
+{
+    STRINGID_RAINCONTINUES, STRINGID_DOWNPOURCONTINUES, STRINGID_RAINSTOPPED
+};
+
+const u16 gProtectLikeUsedStringIds[] =
+{
+    STRINGID_PKMNPROTECTEDITSELF2, STRINGID_PKMNBRACEDITSELF, STRINGID_BUTITFAILED
+};
+
+const u16 gReflectLightScreenSafeguardStringIds[] =
+{
+    STRINGID_BUTITFAILED, STRINGID_PKMNRAISEDDEF, STRINGID_PKMNRAISEDDEFALITTLE,
+    STRINGID_PKMNRAISEDSPDEF, STRINGID_PKMNRAISEDSPDEFALITTLE, STRINGID_PKMNCOVEREDBYVEIL
+};
+
+const u16 gLeechSeedStringIds[] =
+{
+    STRINGID_PKMNSEEDED, STRINGID_PKMNEVADEDATTACK,
     STRINGID_ITDOESNTAFFECT, STRINGID_PKMNSAPPEDBYLEECHSEED, STRINGID_ITSUCKEDLIQUIDOOZE,
-    STRINGID_PKMNWENTTOSLEEP, STRINGID_PKMNSLEPTHEALTHY, STRINGID_PKMNMAKINGUPROAR,
-    STRINGID_PKMNCALMEDDOWN, STRINGID_PKMNSTOCKPILED, STRINGID_PKMNCANTSTOCKPILE,
-    STRINGID_PKMNWOKEUP, STRINGID_PKMNWOKEUPINUPROAR, STRINGID_FAILEDTOSWALLOW,
-    STRINGID_PKMNHPFULL, STRINGID_PKMNCANTSLEEPINUPROAR2, STRINGID_UPROARKEPTPKMNAWAKE,
-    STRINGID_PKMNSTAYEDAWAKEUSING, STRINGID_PKMNSSTATCHANGED, STRINGID_PKMNSSTATCHANGED2,
-    STRINGID_STATSWONTINCREASE, STRINGID_EMPTYSTRING3, STRINGID_USINGXTHEYOFZN,
-    STRINGID_PKMNUSEDXTOGETPUMPED, STRINGID_PKMNSSTATCHANGED3, STRINGID_PKMNSSTATCHANGED4,
-    STRINGID_STATSWONTDECREASE, STRINGID_EMPTYSTRING3, STRINGID_PKMNWHIPPEDWHIRLWIND,
-    STRINGID_PKMNTOOKSUNLIGHT, STRINGID_PKMNLOWEREDHEAD, STRINGID_PKMNISGLOWING,
-    STRINGID_PKMNFLEWHIGH, STRINGID_PKMNDUGHOLE, STRINGID_PKMNHIDUNDERWATER,
-    STRINGID_PKMNSPRANGUP, STRINGID_PKMNSQUEEZEDBYBIND, STRINGID_PKMNWRAPPEDBY,
-    STRINGID_PKMNTRAPPEDINVORTEX, STRINGID_PKMNCLAMPED, STRINGID_PKMNTRAPPEDINVORTEX,
-    STRINGID_PKMNTRAPPEDBYSANDTOMB, STRINGID_PKMNSHROUDEDINMIST, STRINGID_BUTITFAILED,
-    STRINGID_PKMNGETTINGPUMPED, STRINGID_BUTITFAILED, STRINGID_PKMNTRANSFORMEDINTO,
-    STRINGID_BUTITFAILED, STRINGID_PKMNMADESUBSTITUTE, STRINGID_TOOWEAKFORSUBSTITUTE,
-    STRINGID_PKMNWASPOISONED, STRINGID_PKMNPOISONEDBY, STRINGID_PKMNWASPARALYZED,
-    STRINGID_PKMNWASPARALYZEDBY, STRINGID_PKMNFELLASLEEP, STRINGID_PKMNMADESLEEP,
-    STRINGID_PKMNWASBURNED, STRINGID_PKMNBURNEDBY, STRINGID_PKMNWASFROZEN,
-    STRINGID_PKMNFROZENBY, STRINGID_PKMNWASDEFROSTED2, STRINGID_PKMNWASDEFROSTEDBY,
-    STRINGID_ATTACKMISSED, STRINGID_PKMNUNAFFECTED, STRINGID_PKMNFELLINLOVE,
-    STRINGID_PKMNSXINFATUATEDY, STRINGID_PKMNENERGYDRAINED, STRINGID_ITSUCKEDLIQUIDOOZE,
-    STRINGID_ELECTRICITYWEAKENED, STRINGID_FIREWEAKENED, STRINGID_BELLCHIMED,
-    STRINGID_BELLCHIMED, STRINGID_BELLCHIMED, STRINGID_BELLCHIMED,
-    STRINGID_SOOTHINGAROMA, STRINGID_PKMNFORESAWATTACK, STRINGID_PKMNCHOSEXASDESTINY,
-    STRINGID_PKMNBROKEFREE, STRINGID_ITAPPEAREDCAUGHT, STRINGID_AARGHALMOSTHADIT,
-    STRINGID_SHOOTSOCLOSE, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
+};
+
+const u16 gRestUsedStringIds[] =
+{
+    STRINGID_PKMNWENTTOSLEEP, STRINGID_PKMNSLEPTHEALTHY
+};
+
+const u16 gUproarOvetTurnStringIds[] =
+{
+    STRINGID_PKMNMAKINGUPROAR, STRINGID_PKMNCALMEDDOWN
+};
+
+const u16 gStockpileUsedStringIds[] =
+{
+    STRINGID_PKMNSTOCKPILED, STRINGID_PKMNCANTSTOCKPILE,
+};
+
+const u16 gWokeUpStringIds[] =
+{
+    STRINGID_PKMNWOKEUP, STRINGID_PKMNWOKEUPINUPROAR
+};
+
+const u16 gSwallowFailStringIds[] =
+{
+    STRINGID_FAILEDTOSWALLOW, STRINGID_PKMNHPFULL
+};
+
+const u16 gUproarAwakeStringIds[] =
+{
+    STRINGID_PKMNCANTSLEEPINUPROAR2, STRINGID_UPROARKEPTPKMNAWAKE, STRINGID_PKMNSTAYEDAWAKEUSING
+};
+
+const u16 gStatUpStringIds[] =
+{
+    STRINGID_PKMNSSTATCHANGED, STRINGID_PKMNSSTATCHANGED2, STRINGID_STATSWONTINCREASE,
+    STRINGID_EMPTYSTRING3, STRINGID_USINGXTHEYOFZN, STRINGID_PKMNUSEDXTOGETPUMPED
+};
+
+const u16 gStatDownStringIds[] =
+{
+    STRINGID_PKMNSSTATCHANGED3, STRINGID_PKMNSSTATCHANGED4, STRINGID_STATSWONTDECREASE, STRINGID_EMPTYSTRING3
+};
+
+const u16 gFirstTurnOfTwoStringIds[] =
+{
+    STRINGID_PKMNWHIPPEDWHIRLWIND, STRINGID_PKMNTOOKSUNLIGHT, STRINGID_PKMNLOWEREDHEAD, STRINGID_PKMNISGLOWING,
+    STRINGID_PKMNFLEWHIGH, STRINGID_PKMNDUGHOLE, STRINGID_PKMNHIDUNDERWATER, STRINGID_PKMNSPRANGUP
+};
+
+const u16 gWrappedStringIds[] =
+{
+    STRINGID_PKMNSQUEEZEDBYBIND, STRINGID_PKMNWRAPPEDBY, STRINGID_PKMNTRAPPEDINVORTEX,
+    STRINGID_PKMNCLAMPED, STRINGID_PKMNTRAPPEDINVORTEX, STRINGID_PKMNTRAPPEDBYSANDTOMB
+};
+
+const u16 gMistUsedStringIds[] =
+{
+    STRINGID_PKMNSHROUDEDINMIST, STRINGID_BUTITFAILED
+};
+
+const u16 gFocusEnergyUsedStringIds[] =
+{
+    STRINGID_PKMNGETTINGPUMPED, STRINGID_BUTITFAILED
+};
+
+const u16 gTransformUsedStringIds[] =
+{
+    STRINGID_PKMNTRANSFORMEDINTO, STRINGID_BUTITFAILED
+};
+
+const u16 gSubsituteUsedStringIds[] =
+{
+    STRINGID_PKMNMADESUBSTITUTE, STRINGID_TOOWEAKFORSUBSTITUTE
+};
+
+const u16 gGotPoisonedStringIds[] =
+{
+    STRINGID_PKMNWASPOISONED, STRINGID_PKMNPOISONEDBY
+};
+
+const u16 gGotParalyzedStringIds[] =
+{
+    STRINGID_PKMNWASPARALYZED, STRINGID_PKMNWASPARALYZEDBY
+};
+
+const u16 gFellAsleepStringIds[] =
+{
+    STRINGID_PKMNFELLASLEEP, STRINGID_PKMNMADESLEEP,
+};
+
+const u16 gGotBurnedStringIds[] =
+{
+    STRINGID_PKMNWASBURNED, STRINGID_PKMNBURNEDBY
+};
+
+const u16 gGotFrozenStringIds[] =
+{
+    STRINGID_PKMNWASFROZEN, STRINGID_PKMNFROZENBY
+};
+
+const u16 gGotDefrostedStringIds[] =
+{
+    STRINGID_PKMNWASDEFROSTED2, STRINGID_PKMNWASDEFROSTEDBY
+};
+
+const u16 gKOFailedStringIds[] =
+{
+    STRINGID_ATTACKMISSED, STRINGID_PKMNUNAFFECTED
+};
+
+const u16 gAttractUsedStringIds[] =
+{
+    STRINGID_PKMNFELLINLOVE, STRINGID_PKMNSXINFATUATEDY
+};
+
+const u16 gLeechSeedDrainStringIds[] =
+{
+    STRINGID_PKMNENERGYDRAINED, STRINGID_ITSUCKEDLIQUIDOOZE
+};
+
+const u16 gSportsUsedStringIds[] =
+{
+    STRINGID_ELECTRICITYWEAKENED, STRINGID_FIREWEAKENED
+};
+
+const u16 gPartyStatusHealStringIds[] =
+{
+    STRINGID_BELLCHIMED, STRINGID_BELLCHIMED, STRINGID_BELLCHIMED, STRINGID_BELLCHIMED,
+    // interesting how there are four instances of the same string
+    STRINGID_SOOTHINGAROMA
+};
+
+const u16 gFutureMoveUsedStringIds[] =
+{
+    STRINGID_PKMNFORESAWATTACK, STRINGID_PKMNCHOSEXASDESTINY
+};
+
+const u16 gBallEscapeStringIds[] =
+{
+    STRINGID_PKMNBROKEFREE, STRINGID_ITAPPEAREDCAUGHT, STRINGID_AARGHALMOSTHADIT, STRINGID_SHOOTSOCLOSE
+};
+
+const u16 gWeatherContinuesStringIds[] =
+{
     STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
     STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
-    STRINGID_SANDSTORMISRAGING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
-    STRINGID_ITISRAINING, STRINGID_SUNLIGHTSTRONG, STRINGID_ITISRAINING,
-    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_PKMNLOAFING,
-    STRINGID_PKMNWONTOBEY, STRINGID_PKMNTURNEDAWAY, STRINGID_PKMNPRETENDNOTNOTICE,
-    STRINGID_PKMNINCAPABLEOFPOWER, STRINGID_CREPTCLOSER, STRINGID_CANTGETCLOSER,
-    STRINGID_PKMNCURIOUSABOUTX, STRINGID_PKMNENTHRALLEDBYX, STRINGID_PKMNIGNOREDX,
+    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_SANDSTORMISRAGING,
+    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
+    STRINGID_SUNLIGHTSTRONG, STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING
+};
+
+const u16 gInobedientStringIds[] =
+{
+    STRINGID_PKMNLOAFING, STRINGID_PKMNWONTOBEY, STRINGID_PKMNTURNEDAWAY,
+    STRINGID_PKMNPRETENDNOTNOTICE, STRINGID_PKMNINCAPABLEOFPOWER
+};
+
+const u16 gSafariGetNearStringIds[] =
+{
+    STRINGID_CREPTCLOSER, STRINGID_CANTGETCLOSER
+};
+
+const u16 gSafariPokeblockResultStringIds[] =
+{
+    STRINGID_PKMNCURIOUSABOUTX, STRINGID_PKMNENTHRALLEDBYX, STRINGID_PKMNIGNOREDX
+};
+
+const u16 gTrainerItemCuredStatusStringIds[] =
+{
     STRINGID_PKMNSITEMSNAPPEDOUT, STRINGID_PKMNSITEMCUREDPARALYSIS, STRINGID_PKMNSITEMDEFROSTEDIT,
-    STRINGID_PKMNSITEMHEALEDBURN, STRINGID_PKMNSITEMCUREDPOISON, STRINGID_PKMNSITEMWOKEIT,
-    STRINGID_PKMNSITEMCUREDPROBLEM, STRINGID_PKMNSITEMNORMALIZEDSTATUS, STRINGID_PKMNSXPREVENTSBURNS,
-    STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY, STRINGID_PKMNPREVENTSPARALYSISWITH,
-    STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY, STRINGID_PKMNPREVENTSPOISONINGWITH,
-    STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY, STRINGID_PKMNOBTAINEDX,
-    STRINGID_PKMNOBTAINEDX2, STRINGID_PKMNOBTAINEDXYOBTAINEDZ, STRINGID_PKMNRAISEDFIREPOWERWITH,
-    STRINGID_PKMNSXMADEYINEFFECTIVE, STRINGID_PKMNTRANSFERREDSOMEONESPC, STRINGID_PKMNTRANSFERREDLANETTESPC,
-    STRINGID_PKMNBOXSOMEONESPCFULL, STRINGID_PKMNBOXLANETTESPCFULL,
+    STRINGID_PKMNSITEMHEALEDBURN, STRINGID_PKMNSITEMCUREDPOISON, STRINGID_PKMNSITEMWOKEIT
+};
+
+const u16 gBerryEffectStringIds[] =
+{
+    STRINGID_PKMNSITEMCUREDPROBLEM, STRINGID_PKMNSITEMNORMALIZEDSTATUS
+};
+
+const u16 gBRNPreventionStringIds[] =
+{
+    STRINGID_PKMNSXPREVENTSBURNS, STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY
+};
+
+const u16 gPRLZPreventionStringIds[] =
+{
+    STRINGID_PKMNPREVENTSPARALYSISWITH, STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY
+};
+
+const u16 gPSNPreventionStringIds[] =
+{
+    STRINGID_PKMNPREVENTSPOISONINGWITH, STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY
+};
+
+const u16 gItemSwapStringIds[] =
+{
+    STRINGID_PKMNOBTAINEDX, STRINGID_PKMNOBTAINEDX2, STRINGID_PKMNOBTAINEDXYOBTAINEDZ
+};
+
+const u16 gFlashFireStringIds[] =
+{
+    STRINGID_PKMNRAISEDFIREPOWERWITH, STRINGID_PKMNSXMADEYINEFFECTIVE
+};
+
+const u16 gCaughtMonStringIds[] =
+{
+    STRINGID_PKMNTRANSFERREDSOMEONESPC, STRINGID_PKMNTRANSFERREDLANETTESPC, STRINGID_PKMNBOXSOMEONESPCFULL, STRINGID_PKMNBOXLANETTESPCFULL,
 };
 
 const u16 gTrappingMoves[] =
@@ -1102,9 +1281,10 @@ const u8 gText_PkmnGettingIntoPosition[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is
 const u8 gText_PkmnBeganGrowlingDeeply[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} began growling deeply!");
 const u8 gText_PkmnEagerForMore[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is eager for more!");
 
-const u16 gUnknown_085CCF0A[] =
+const u16 gStringIds_85CCF0A[] =
 {
-    0x016E, 0x016F, 0x0170, 0x0171
+    STRINGID_GLINTAPPEARSINEYE, STRINGID_PKMNGETTINGINTOPOSITION,
+    STRINGID_PKMNBEGANGROWLINGDEEPLY, STRINGID_PKMNEAGERFORMORE
 };
 
 const u8 gText_RefIfNothingIsDecided[] = _("REFEREE: If nothing is decided in\n3 turns, we will go to judging!");
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index e0a61a612..ded0629f2 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -8783,7 +8783,7 @@ static bool8 IsTwoTurnsMove(u16 move)
         || gBattleMoves[move].effect == EFFECT_RAZOR_WIND
         || gBattleMoves[move].effect == EFFECT_SKY_ATTACK
         || gBattleMoves[move].effect == EFFECT_SOLARBEAM
-        || gBattleMoves[move].effect == EFFECT_FLY
+        || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE
         || gBattleMoves[move].effect == EFFECT_BIDE)
         return TRUE;
     else
@@ -8810,7 +8810,7 @@ static u8 AttacksThisTurn(u8 bank, u16 move) // Note: returns 1 if it's a chargi
         || gBattleMoves[move].effect == EFFECT_RAZOR_WIND
         || gBattleMoves[move].effect == EFFECT_SKY_ATTACK
         || gBattleMoves[move].effect == EFFECT_SOLARBEAM
-        || gBattleMoves[move].effect == EFFECT_FLY
+        || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE
         || gBattleMoves[move].effect == EFFECT_BIDE)
     {
         if ((gHitMarker & HITMARKER_x8000000))
-- 
cgit v1.2.3


From 938d346b6d905709deed5336086c888c98a24247 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 26 Nov 2017 01:19:57 +0100
Subject: fixes and labels

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

(limited to 'src')

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index ded0629f2..dcc7c783c 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -350,7 +350,7 @@ static void atkA5_painsplitdmgcalc(void);
 static void atkA6_settypetorandomresistance(void);
 static void atkA7_setalwayshitflag(void);
 static void atkA8_copymovepermanently(void);
-static void atkA9_sleeptalk_choose_move(void);
+static void atkA9_trychoosesleeptalkmove(void);
 static void atkAA_setdestinybond(void);
 static void atkAB_trysetdestinybondtohappen(void);
 static void atkAC_remaininghptopower(void);
@@ -420,7 +420,7 @@ static void atkEB_settypetoterrain(void);
 static void atkEC_pursuitrelated(void);
 static void atkEF_snatchsetbanks(void);
 static void atkEE_removelightscreenreflect(void);
-static void atkEF_pokeball_catch_calculation(void);
+static void atkEF_handleballthrow(void);
 static void atkF0_givecaughtmon(void);
 static void atkF1_trysetcaughtmondexflags(void);
 static void atkF2_displaydexinfo(void);
@@ -602,7 +602,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atkA6_settypetorandomresistance,
     atkA7_setalwayshitflag,
     atkA8_copymovepermanently,
-    atkA9_sleeptalk_choose_move,
+    atkA9_trychoosesleeptalkmove,
     atkAA_setdestinybond,
     atkAB_trysetdestinybondtohappen,
     atkAC_remaininghptopower,
@@ -672,7 +672,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atkEC_pursuitrelated,
     atkEF_snatchsetbanks,
     atkEE_removelightscreenreflect,
-    atkEF_pokeball_catch_calculation,
+    atkEF_handleballthrow,
     atkF0_givecaughtmon,
     atkF1_trysetcaughtmondexflags,
     atkF2_displaydexinfo,
@@ -8819,7 +8819,7 @@ static u8 AttacksThisTurn(u8 bank, u16 move) // Note: returns 1 if it's a chargi
     return 2;
 }
 
-static void atkA9_sleeptalk_choose_move(void)
+static void atkA9_trychoosesleeptalkmove(void)
 {
     s32 i;
     u8 unusableMovesBits = 0;
@@ -10597,7 +10597,7 @@ static void atkEE_removelightscreenreflect(void) // brick break
     gBattlescriptCurrInstr++;
 }
 
-static void atkEF_pokeball_catch_calculation(void)
+static void atkEF_handleballthrow(void)
 {
     u8 ballMultiplier = 0;
 
-- 
cgit v1.2.3


From cc572f7c00b7a07161b5298868bcb495b7c87b61 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 26 Nov 2017 11:55:17 +0100
Subject: clear battle code and battlescripts

---
 src/battle_script_commands.c |  28 +++++-----
 src/battle_util.c            | 122 ++++++++++++++++---------------------------
 2 files changed, 58 insertions(+), 92 deletions(-)

(limited to 'src')

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index dcc7c783c..c864c5a4f 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -214,7 +214,7 @@ static void atk1D_jumpifstatus2(void);
 static void atk1E_jumpifability(void);
 static void atk1F_jumpifsideaffecting(void);
 static void atk20_jumpifstat(void);
-static void atk21_jumpifstatus3(void);
+static void atk21_jumpifstatus3condition(void);
 static void atk22_jumpiftype(void);
 static void atk23_getexp(void);
 static void atk24(void);
@@ -466,7 +466,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     atk1E_jumpifability,
     atk1F_jumpifsideaffecting,
     atk20_jumpifstat,
-    atk21_jumpifstatus3,
+    atk21_jumpifstatus3condition,
     atk22_jumpiftype,
     atk23_getexp,
     atk24,
@@ -3314,10 +3314,10 @@ static void atk20_jumpifstat(void)
         gBattlescriptCurrInstr += 9;
 }
 
-static void atk21_jumpifstatus3(void)
+static void atk21_jumpifstatus3condition(void)
 {
     u32 flags;
-    const u8* jumpPtr;
+    const u8 *jumpPtr;
 
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
     flags = BS2ScriptRead32(gBattlescriptCurrInstr + 2);
@@ -7557,9 +7557,9 @@ static void atk88_negativedamage(void)
     gBattlescriptCurrInstr++;
 }
 
-static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8* BS_ptr)
+static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
 {
-    bool8 certain = 0;
+    bool8 certain = FALSE;
     bool8 notProtectAffected = FALSE;
     u32 index;
 
@@ -7667,15 +7667,15 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8* BS_ptr)
             if (statValue == -2)
             {
                 gBattleTextBuff2[1] = B_BUFF_STRING;
-                gBattleTextBuff2[2] = 0xD3; // harshly
-                gBattleTextBuff2[3] = 0xD3 >> 8;
+                gBattleTextBuff2[2] = STRINGID_STATHARSHLY;
+                gBattleTextBuff2[3] = STRINGID_STATHARSHLY >> 8;
                 index = 4;
             }
             gBattleTextBuff2[index] = B_BUFF_STRING;
             index++;
-            gBattleTextBuff2[index] = 0xD4; // fell
+            gBattleTextBuff2[index] = STRINGID_STATFELL;
             index++;
-            gBattleTextBuff2[index] = 0xD4 >> 8;
+            gBattleTextBuff2[index] = STRINGID_STATFELL >> 8;
             index++;
             gBattleTextBuff2[index] = B_BUFF_EOS;
 
@@ -7694,15 +7694,15 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8* BS_ptr)
         if (statValue == 2)
         {
             gBattleTextBuff2[1] = B_BUFF_STRING;
-            gBattleTextBuff2[2] = 0xD1; // sharply
-            gBattleTextBuff2[3] = 0xD1 >> 8;
+            gBattleTextBuff2[2] = STRINGID_STATSHARPLY;
+            gBattleTextBuff2[3] = STRINGID_STATSHARPLY >> 8;
             index = 4;
         }
         gBattleTextBuff2[index] = B_BUFF_STRING;
         index++;
-        gBattleTextBuff2[index] = 0xD2; // rose
+        gBattleTextBuff2[index] = STRINGID_STATROSE;
         index++;
-        gBattleTextBuff2[index] = 0xD2 >> 8;
+        gBattleTextBuff2[index] = STRINGID_STATROSE >> 8;
         index++;
         gBattleTextBuff2[index] = B_BUFF_EOS;
 
diff --git a/src/battle_util.c b/src/battle_util.c
index 0ec98d125..6164565bd 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -14,6 +14,7 @@
 #include "text.h"
 #include "string_util.h"
 #include "battle_message.h"
+#include "battle_string_ids.h"
 #include "battle_ai_script_commands.h"
 #include "battle_controllers.h"
 #include "event_data.h"
@@ -2615,7 +2616,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 gBattleStruct->moneyMultiplier = 2;
             break;
         case HOLD_EFFECT_RESTORE_STATS:
-            for (i = 0; i < 8; i++)
+            for (i = 0; i < BATTLE_STATS_NO; i++)
             {
                 if (gBattleMons[bank].statStages[i] < 6)
                 {
@@ -2652,19 +2653,19 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_RESTORE_PP:
                 if (!moveTurn)
                 {
-                    struct Pokemon* poke;
+                    struct Pokemon *mon;
                     u8 ppBonuses;
                     u16 move;
 
                     if (GetBankSide(bank) == SIDE_PLAYER)
-                        poke = &gPlayerParty[gBattlePartyID[bank]];
+                        mon = &gPlayerParty[gBattlePartyID[bank]];
                     else
-                        poke = &gEnemyParty[gBattlePartyID[bank]];
+                        mon = &gEnemyParty[gBattlePartyID[bank]];
                     for (i = 0; i < 4; i++)
                     {
-                        move = GetMonData(poke, MON_DATA_MOVE1 + i);
-                        changedPP = GetMonData(poke, MON_DATA_PP1 + i);
-                        ppBonuses = GetMonData(poke, MON_DATA_PP_BONUSES);
+                        move = GetMonData(mon, MON_DATA_MOVE1 + i);
+                        changedPP = GetMonData(mon, MON_DATA_PP1 + i);
+                        ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES);
                         if (move && changedPP == 0)
                             break;
                     }
@@ -2675,11 +2676,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                             changedPP = maxPP;
                         else
                             changedPP = changedPP + bankQuality;
-                        gBattleTextBuff1[0] = 0xFD;
-                        gBattleTextBuff1[1] = 2;
-                        gBattleTextBuff1[2] = move;
-                        gBattleTextBuff1[3] = move >> 8;
-                        gBattleTextBuff1[4] = 0xFF;
+
+                        PREPARE_MOVE_BUFFER(gBattleTextBuff1, move);
+
                         BattleScriptExecute(BattleScript_BerryPPHealEnd2);
                         EmitSetMonData(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
                         MarkBufferBankForExecution(gActiveBank);
@@ -2688,7 +2687,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_RESTORE_STATS:
-                for (i = 0; i < 8; i++)
+                for (i = 0; i < BATTLE_STATS_NO; i++)
                 {
                     if (gBattleMons[bank].statStages[i] < 6)
                     {
@@ -2722,10 +2721,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_CONFUSE_SPICY:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
                 {
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 8;
-                    gBattleTextBuff1[2] = FLAVOR_SPICY;
-                    gBattleTextBuff1[3] = EOS;
+                    PREPARE_FLAVOUR_BUFFER(gBattleTextBuff1, FLAVOR_SPICY);
+
                     gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
@@ -2742,10 +2739,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_CONFUSE_DRY:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
                 {
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 8;
-                    gBattleTextBuff1[2] = FLAVOR_DRY;
-                    gBattleTextBuff1[3] = EOS;
+                    PREPARE_FLAVOUR_BUFFER(gBattleTextBuff1, FLAVOR_DRY);
+
                     gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
@@ -2762,10 +2757,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_CONFUSE_SWEET:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
                 {
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 8;
-                    gBattleTextBuff1[2] = FLAVOR_SWEET;
-                    gBattleTextBuff1[3] = EOS;
+                    PREPARE_FLAVOUR_BUFFER(gBattleTextBuff1, FLAVOR_SWEET);
+
                     gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
@@ -2782,10 +2775,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_CONFUSE_BITTER:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
                 {
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 8;
-                    gBattleTextBuff1[2] = FLAVOR_BITTER;
-                    gBattleTextBuff1[3] = EOS;
+                    PREPARE_FLAVOUR_BUFFER(gBattleTextBuff1, FLAVOR_BITTER);
+
                     gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
@@ -2802,10 +2793,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_CONFUSE_SOUR:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
                 {
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 8;
-                    gBattleTextBuff1[2] = FLAVOR_SOUR;
-                    gBattleTextBuff1[3] = EOS;
+                    PREPARE_FLAVOUR_BUFFER(gBattleTextBuff1, FLAVOR_SOUR);
+
                     gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
@@ -2823,19 +2812,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_ATTACK_UP:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_ATK] < 0xC)
                 {
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 5;
-                    gBattleTextBuff1[2] = STAT_STAGE_ATK;
-                    gBattleTextBuff1[3] = EOS;
-
-                    gBattleTextBuff2[0] = 0xFD;
-                    gBattleTextBuff2[1] = 0;
-                    gBattleTextBuff2[2] = 0xD2;
-                    gBattleTextBuff2[3] = 0xD2 >> 8;
-                    gBattleTextBuff2[4] = EOS;
+                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_ATK);
+                    PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE);
 
                     gEffectBank = bank;
-                    gBattleScripting.statChanger = 0x10 + STAT_STAGE_ATK;
+                    SET_STATCHANGER(STAT_STAGE_ATK, 1, FALSE);
                     gBattleScripting.animArg1 = 0xE + STAT_STAGE_ATK;
                     gBattleScripting.animArg2 = 0;
                     BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
@@ -2845,13 +2826,10 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_DEFENSE_UP:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_DEF] < 0xC)
                 {
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 5;
-                    gBattleTextBuff1[2] = STAT_STAGE_DEF;
-                    gBattleTextBuff1[3] = EOS;
+                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_DEF);
 
                     gEffectBank = bank;
-                    gBattleScripting.statChanger = 0x10 + STAT_STAGE_DEF;
+                    SET_STATCHANGER(STAT_STAGE_DEF, 1, FALSE);
                     gBattleScripting.animArg1 = 0xE + STAT_STAGE_DEF;
                     gBattleScripting.animArg2 = 0;
                     BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
@@ -2861,13 +2839,10 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_SPEED_UP:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPEED] < 0xC)
                 {
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 5;
-                    gBattleTextBuff1[2] = STAT_STAGE_SPEED;
-                    gBattleTextBuff1[3] = EOS;
+                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_SPEED);
 
                     gEffectBank = bank;
-                    gBattleScripting.statChanger = 0x10 + STAT_STAGE_SPEED;
+                    SET_STATCHANGER(STAT_STAGE_SPEED, 1, FALSE);
                     gBattleScripting.animArg1 = 0xE + STAT_STAGE_SPEED;
                     gBattleScripting.animArg2 = 0;
                     BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
@@ -2877,13 +2852,10 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_SP_ATTACK_UP:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPATK] < 0xC)
                 {
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 5;
-                    gBattleTextBuff1[2] = STAT_STAGE_SPATK;
-                    gBattleTextBuff1[3] = EOS;
+                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_SPATK);
 
                     gEffectBank = bank;
-                    gBattleScripting.statChanger = 0x10 + STAT_STAGE_SPATK;
+                    SET_STATCHANGER(STAT_STAGE_SPATK, 1, FALSE);
                     gBattleScripting.animArg1 = 0xE + STAT_STAGE_SPATK;
                     gBattleScripting.animArg2 = 0;
                     BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
@@ -2893,13 +2865,10 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_SP_DEFENSE_UP:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPDEF] < 0xC)
                 {
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 5;
-                    gBattleTextBuff1[2] = STAT_STAGE_SPDEF;
-                    gBattleTextBuff1[3] = EOS;
+                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_SPDEF);
 
                     gEffectBank = bank;
-                    gBattleScripting.statChanger = 0x10 + STAT_STAGE_SPDEF;
+                    SET_STATCHANGER(STAT_STAGE_SPDEF, 1, FALSE);
                     gBattleScripting.animArg1 = 0xE + STAT_STAGE_SPDEF;
                     gBattleScripting.animArg2 = 0;
                     BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
@@ -2929,22 +2898,19 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                             i = Random() % 5;
                         } while (gBattleMons[bank].statStages[STAT_STAGE_ATK + i] == 0xC);
 
-                        gBattleTextBuff1[0] = 0xFD;
-                        gBattleTextBuff1[1] = 5;
-                        gBattleTextBuff1[2] = i + 1;
-                        gBattleTextBuff1[3] = EOS;
-
-                        gBattleTextBuff2[0] = 0xFD;
-                        gBattleTextBuff2[1] = 0;
-                        gBattleTextBuff2[2] = 0xD1;
-                        gBattleTextBuff2[3] = 0xD1 >> 8;
-                        gBattleTextBuff2[4] = 0;
-                        gBattleTextBuff2[5] = 0xD2;
-                        gBattleTextBuff2[6] = 0xD2 >> 8;
+                        PREPARE_STAT_BUFFER(gBattleTextBuff1, i + 1);
+
+                        gBattleTextBuff2[0] = B_BUFF_PLACEHOLDER_BEGIN;
+                        gBattleTextBuff2[1] = B_BUFF_STRING;
+                        gBattleTextBuff2[2] = STRINGID_STATSHARPLY;
+                        gBattleTextBuff2[3] = STRINGID_STATSHARPLY >> 8;
+                        gBattleTextBuff2[4] = B_BUFF_STRING;
+                        gBattleTextBuff2[5] = STRINGID_STATROSE;
+                        gBattleTextBuff2[6] = STRINGID_STATROSE >> 8;
                         gBattleTextBuff2[7] = EOS;
 
                         gEffectBank = bank;
-                        gBattleScripting.statChanger = 0x21 + i;
+                        SET_STATCHANGER(i + 1, 2, FALSE);
                         gBattleScripting.animArg1 = 0x21 + i + 6;
                         gBattleScripting.animArg2 = 0;
                         BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
@@ -3197,7 +3163,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_RESTORE_STATS:
-                for (i = 0; i < 8; i++)
+                for (i = 0; i < BATTLE_STATS_NO; i++)
                 {
                     if (gBattleMons[bank].statStages[i] < 6)
                     {
-- 
cgit v1.2.3


From 9886eeb5d8b0a19e31537fbc3e1245f20577d513 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 26 Nov 2017 13:26:58 +0100
Subject: fix, rename, label battle labels and battlescripts

---
 src/battle_2.c               |  44 ++++++++---------
 src/battle_ai_switch_items.c |  32 ++++++-------
 src/battle_controllers.c     |   6 +--
 src/battle_script_commands.c |  82 ++++++++++++++++----------------
 src/battle_util.c            | 110 +++++++++++++++++--------------------------
 5 files changed, 124 insertions(+), 150 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index d7f051272..dffebabe7 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -123,11 +123,11 @@ extern s32 gBattleMoveDamage;
 extern const u8* gUnknown_02024230[BATTLE_BANKS_COUNT];
 extern u16 gUnknownMovesUsedByBanks[BATTLE_BANKS_COUNT];
 extern u16 gLastUsedMovesByBanks[BATTLE_BANKS_COUNT];
-extern u16 gUnknown_02024250[BATTLE_BANKS_COUNT];
+extern u16 gTurnMovesHitWith[BATTLE_BANKS_COUNT];
 extern u16 gUnknown_02024258[BATTLE_BANKS_COUNT];
 extern u16 gUnknown_02024260[BATTLE_BANKS_COUNT];
 extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
-extern u8 gUnknown_02024270[BATTLE_BANKS_COUNT];
+extern u8 gTurnMovesHitBy[BATTLE_BANKS_COUNT];
 extern u8 gUnknown_02024284[BATTLE_BANKS_COUNT];
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
 extern u16 gSideAffecting[2];
@@ -149,7 +149,7 @@ extern u16 gDynamicBasePower;
 extern u8 gCritMultiplier;
 extern u8 gCurrMovePos;
 extern u8 gUnknown_020241E9;
-extern u16 gLastUsedMove;
+extern u16 gOriginallyUsedMove;
 
 extern const struct BattleMove gBattleMoves[];
 extern const u16 gUnknown_08C004E0[]; // battle textbox palette
@@ -461,7 +461,7 @@ static void sub_8036A5C(void)
     u32 status = 0;
     s32 i;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
         hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
@@ -1878,7 +1878,7 @@ static void sub_8038B94(u8 taskId)
     }
 
     r7 = 0;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         u16 species = GetMonData(&sp4[i], MON_DATA_SPECIES2);
         u16 hp = GetMonData(&sp4[i], MON_DATA_HP);
@@ -1902,7 +1902,7 @@ static void sub_8038B94(u8 taskId)
     gTasks[taskId].data[3] = r7;
 
     r7 = 0;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         u16 species = GetMonData(&sp8[i], MON_DATA_SPECIES2);
         u16 hp = GetMonData(&sp8[i], MON_DATA_HP);
@@ -2741,13 +2741,13 @@ static void BattleStartClearSetData(void)
         for (j = 0; j < sizeof(struct DisableStruct); j++)
             dataPtr[j] = 0;
 
-        gDisableStructs[i].isFirstTurn= 2;
+        gDisableStructs[i].isFirstTurn = 2;
         gUnknown_02024284[i] = 0;
         gLastUsedMovesByBanks[i] = 0;
-        gUnknown_02024250[i] = 0;
+        gTurnMovesHitWith[i] = 0;
         gUnknown_02024258[i] = 0;
         gUnknown_02024260[i] = 0;
-        gUnknown_02024270[i] = 0xFF;
+        gTurnMovesHitBy[i] = 0xFF;
         gLockedMoves[i] = 0;
         gUnknownMovesUsedByBanks[i] = 0;
         gBattleResources->flags->flags[i] = 0;
@@ -2911,11 +2911,11 @@ void SwitchInClearSetData(void)
     gDisableStructs[gActiveBank].isFirstTurn= 2;
     gDisableStructs[gActiveBank].truantUnknownBit = disableStructCopy.truantUnknownBit;
     gLastUsedMovesByBanks[gActiveBank] = 0;
-    gUnknown_02024250[gActiveBank] = 0;
+    gTurnMovesHitWith[gActiveBank] = 0;
     gUnknown_02024258[gActiveBank] = 0;
     gUnknown_02024260[gActiveBank] = 0;
     gUnknownMovesUsedByBanks[gActiveBank] = 0;
-    gUnknown_02024270[gActiveBank] = 0xFF;
+    gTurnMovesHitBy[gActiveBank] = 0xFF;
 
     *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 0) = 0;
     *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 1) = 0;
@@ -3003,11 +3003,11 @@ void FaintClearSetData(void)
     gDisableStructs[gActiveBank].isFirstTurn = 2;
 
     gLastUsedMovesByBanks[gActiveBank] = 0;
-    gUnknown_02024250[gActiveBank] = 0;
+    gTurnMovesHitWith[gActiveBank] = 0;
     gUnknown_02024258[gActiveBank] = 0;
     gUnknown_02024260[gActiveBank] = 0;
     gUnknownMovesUsedByBanks[gActiveBank] = 0;
-    gUnknown_02024270[gActiveBank] = 0xFF;
+    gTurnMovesHitBy[gActiveBank] = 0xFF;
 
     *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 0) = 0;
     *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 1) = 0;
@@ -5048,19 +5048,19 @@ static void HandleAction_UseMove(void)
     if (gProtectStructs[gBankAttacker].onlyStruggle)
     {
         gProtectStructs[gBankAttacker].onlyStruggle = 0;
-        gCurrentMove = gLastUsedMove = MOVE_STRUGGLE;
+        gCurrentMove = gOriginallyUsedMove = MOVE_STRUGGLE;
         gHitMarker |= HITMARKER_NO_PPDEDUCT;
         *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
     }
     else if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE)
     {
-        gCurrentMove = gLastUsedMove = gLockedMoves[gBankAttacker];
+        gCurrentMove = gOriginallyUsedMove = gLockedMoves[gBankAttacker];
     }
     // encore forces you to use the same move
     else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
              && gDisableStructs[gBankAttacker].encoredMove == gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
     {
-        gCurrentMove = gLastUsedMove = gDisableStructs[gBankAttacker].encoredMove;
+        gCurrentMove = gOriginallyUsedMove = gDisableStructs[gBankAttacker].encoredMove;
         gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
         *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
@@ -5069,7 +5069,7 @@ static void HandleAction_UseMove(void)
              && gDisableStructs[gBankAttacker].encoredMove != gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
     {
         gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
-        gCurrentMove = gLastUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gCurrentMove = gOriginallyUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
         gDisableStructs[gBankAttacker].encoredMove = MOVE_NONE;
         gDisableStructs[gBankAttacker].encoredMovePos = 0;
         gDisableStructs[gBankAttacker].encoreTimer1 = 0;
@@ -5077,12 +5077,12 @@ static void HandleAction_UseMove(void)
     }
     else if (gBattleMons[gBankAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBankAttacker])
     {
-        gCurrentMove = gLastUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gCurrentMove = gOriginallyUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
         *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
     else
     {
-        gCurrentMove = gLastUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gCurrentMove = gOriginallyUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
     }
 
     if (gBattleMons[gBankAttacker].hp != 0)
@@ -5122,7 +5122,7 @@ static void HandleAction_UseMove(void)
         }
         if (var == 4)
         {
-            if (gBattleMoves[gLastUsedMove].target & MOVE_TARGET_RANDOM)
+            if (gBattleMoves[gOriginallyUsedMove].target & MOVE_TARGET_RANDOM)
             {
                 if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
                 {
@@ -5167,7 +5167,7 @@ static void HandleAction_UseMove(void)
         }
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-             && gBattleMoves[gLastUsedMove].target & MOVE_TARGET_RANDOM)
+             && gBattleMoves[gOriginallyUsedMove].target & MOVE_TARGET_RANDOM)
     {
         if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
         {
@@ -5600,7 +5600,7 @@ static void HandleAction_ActionFinished(void)
     gBattleMoveFlags = 0;
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
-    gUnknown_02024250[gBankAttacker] = 0;
+    gTurnMovesHitWith[gBankAttacker] = 0;
     gUnknown_02024258[gBankAttacker] = 0;
     gBattleStruct->dynamicMoveType = 0;
     gDynamicBasePower = 0;
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 75d144c3d..f43b9b6b2 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -16,8 +16,8 @@ extern u32 gBattleTypeFlags;
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u16 gUnknown_02024250[BATTLE_BANKS_COUNT];
-extern u8 gUnknown_02024270[BATTLE_BANKS_COUNT];
+extern u16 gTurnMovesHitWith[BATTLE_BANKS_COUNT];
+extern u8 gTurnMovesHitBy[BATTLE_BANKS_COUNT];
 extern u16 gDynamicBasePower;
 extern u8 gBattleMoveFlags;
 extern u8 gCritMultiplier;
@@ -141,11 +141,11 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
 
     if (HasSuperEffectiveMoveAgainstOpponents(TRUE) && Random() % 3 != 0)
         return FALSE;
-    if (gUnknown_02024250[gActiveBank] == 0)
+    if (gTurnMovesHitWith[gActiveBank] == 0)
         return FALSE;
-    if (gUnknown_02024250[gActiveBank] == 0xFFFF)
+    if (gTurnMovesHitWith[gActiveBank] == 0xFFFF)
         return FALSE;
-    if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0)
+    if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].power == 0)
         return FALSE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -162,11 +162,11 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
         bankIn2 = gActiveBank;
     }
 
-    if (gBattleMoves[gUnknown_02024250[gActiveBank]].type == TYPE_FIRE)
+    if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].type == TYPE_FIRE)
         absorbingTypeAbility = ABILITY_FLASH_FIRE;
-    else if (gBattleMoves[gUnknown_02024250[gActiveBank]].type == TYPE_WATER)
+    else if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].type == TYPE_WATER)
         absorbingTypeAbility = ABILITY_WATER_ABSORB;
-    else if (gBattleMoves[gUnknown_02024250[gActiveBank]].type == TYPE_ELECTRIC)
+    else if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].type == TYPE_ELECTRIC)
         absorbingTypeAbility = ABILITY_VOLT_ABSORB;
     else
         return FALSE;
@@ -238,13 +238,13 @@ static bool8 ShouldSwitchIfNaturalCure(void)
     if (gBattleMons[gActiveBank].hp < gBattleMons[gActiveBank].maxHP / 2)
         return FALSE;
 
-    if ((gUnknown_02024250[gActiveBank] == 0 || gUnknown_02024250[gActiveBank] == 0xFFFF) && Random() & 1)
+    if ((gTurnMovesHitWith[gActiveBank] == 0 || gTurnMovesHitWith[gActiveBank] == 0xFFFF) && Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
-    else if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0 && Random() & 1)
+    else if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].power == 0 && Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
@@ -345,13 +345,13 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
     u16 move;
     u8 moveFlags;
 
-    if (gUnknown_02024250[gActiveBank] == 0)
+    if (gTurnMovesHitWith[gActiveBank] == 0)
         return FALSE;
-    if (gUnknown_02024250[gActiveBank] == 0xFFFF)
+    if (gTurnMovesHitWith[gActiveBank] == 0xFFFF)
         return FALSE;
-    if (gUnknown_02024270[gActiveBank] == 0xFF)
+    if (gTurnMovesHitBy[gActiveBank] == 0xFF)
         return FALSE;
-    if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0)
+    if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].power == 0)
         return FALSE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -411,10 +411,10 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
         else
             monAbility = gBaseStats[species].ability1;
 
-        moveFlags = AI_TypeCalc(gUnknown_02024250[gActiveBank], species, monAbility);
+        moveFlags = AI_TypeCalc(gTurnMovesHitWith[gActiveBank], species, monAbility);
         if (moveFlags & flags)
         {
-            bankIn1 = gUnknown_02024270[gActiveBank];
+            bankIn1 = gTurnMovesHitBy[gActiveBank];
 
             for (j = 0; j < 4; j++)
             {
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index ed48ec5d9..45ed8a73a 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -38,7 +38,7 @@ extern u8 gEffectBank;
 extern u16 gBattleWeather;
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gCurrentMove;
-extern u16 gLastUsedMove;
+extern u16 gOriginallyUsedMove;
 extern u16 gLastUsedItem;
 extern u8 gBattleOutcome;
 extern u8 gLastUsedAbility;
@@ -1120,7 +1120,7 @@ void EmitPrintString(u8 bufferId, u16 stringID)
 
     stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]);
     stringInfo->currentMove = gCurrentMove;
-    stringInfo->lastMove = gLastUsedMove;
+    stringInfo->lastMove = gOriginallyUsedMove;
     stringInfo->lastItem = gLastUsedItem;
     stringInfo->lastAbility = gLastUsedAbility;
     stringInfo->scrActive = gBattleScripting.bank;
@@ -1152,7 +1152,7 @@ void EmitPrintSelectionString(u8 bufferId, u16 stringID)
 
     stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]);
     stringInfo->currentMove = gCurrentMove;
-    stringInfo->lastMove = gLastUsedMove;
+    stringInfo->lastMove = gOriginallyUsedMove;
     stringInfo->lastItem = gLastUsedItem;
     stringInfo->lastAbility = gLastUsedAbility;
     stringInfo->scrActive = gBattleScripting.bank;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c864c5a4f..9ab9160a4 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -74,10 +74,10 @@ extern u8 gCurrentActionFuncId;
 extern u32 gHitMarker;
 extern u8 gBattleMoveFlags;
 extern u8 gBattleCommunication[];
-extern u16 gUnknown_02024250[4];
+extern u16 gTurnMovesHitWith[4];
 extern u16 gUnknown_02024258[4];
 extern u16 gUnknown_02024260[4];
-extern u8 gUnknown_02024270[4];
+extern u8 gTurnMovesHitBy[4];
 extern u8 gStringBank;
 extern u16 gDynamicBasePower;
 extern u16 gLastUsedItem;
@@ -99,7 +99,7 @@ extern u8 gCurrentTurnActionNumber;
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
 extern u16 gPartnerTrainerId;
-extern u16 gLastUsedMove;
+extern u16 gOriginallyUsedMove;
 extern u16 gUnknownMovesUsedByBanks[BATTLE_BANKS_COUNT];
 extern u16 gLastUsedMovesByBanks[BATTLE_BANKS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
@@ -1105,7 +1105,7 @@ static void atk00_attackcanceler(void)
     {
         CancelMultiTurnMoves(gBankAttacker);
         gBattleMoveFlags |= MOVESTATUS_MISSED;
-        gUnknown_02024250[gBankTarget] = 0;
+        gTurnMovesHitWith[gBankTarget] = 0;
         gUnknown_02024258[gBankTarget] = 0;
         gBattleCommunication[6] = 1;
         gBattlescriptCurrInstr++;
@@ -1121,7 +1121,7 @@ static void JumpIfMoveFailed(u8 adder, u16 move)
     const void* BS_ptr = gBattlescriptCurrInstr + adder;
     if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
     {
-        gUnknown_02024250[gBankTarget] = 0;
+        gTurnMovesHitWith[gBankTarget] = 0;
         gUnknown_02024258[gBankTarget] = 0;
         BS_ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -1484,7 +1484,7 @@ static void atk06_typecalc(void)
     {
         gLastUsedAbility = gBattleMons[gBankTarget].ability;
         gBattleMoveFlags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED);
-        gUnknown_02024250[gBankTarget] = 0;
+        gTurnMovesHitWith[gBankTarget] = 0;
         gUnknown_02024258[gBankTarget] = 0;
         gBattleCommunication[6] = moveType;
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
@@ -1520,7 +1520,7 @@ static void atk06_typecalc(void)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
         gBattleMoveFlags |= MOVESTATUS_MISSED;
-        gUnknown_02024250[gBankTarget] = 0;
+        gTurnMovesHitWith[gBankTarget] = 0;
         gUnknown_02024258[gBankTarget] = 0;
         gBattleCommunication[6] = 3;
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
@@ -4860,10 +4860,10 @@ static void atk49_moveend(void)
 
     effect = FALSE;
 
-    if (gLastUsedMove == 0xFFFF)
+    if (gOriginallyUsedMove == 0xFFFF)
         lastMove = 0;
     else
-        lastMove = gLastUsedMove;
+        lastMove = gOriginallyUsedMove;
 
     arg1 = gBattlescriptCurrInstr[1];
     arg2 = gBattlescriptCurrInstr[2];
@@ -4934,14 +4934,14 @@ static void atk49_moveend(void)
             break;
         case 6: // update choice band move
             if (!(gHitMarker & HITMARKER_OBEYS) || holdEffectAtk != HOLD_EFFECT_CHOICE_BAND
-                || gLastUsedMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF))
+                || gOriginallyUsedMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF))
                     goto LOOP;
-            if (gLastUsedMove == MOVE_BATON_PASS && !(gBattleMoveFlags & MOVESTATUS_FAILED))
+            if (gOriginallyUsedMove == MOVE_BATON_PASS && !(gBattleMoveFlags & MOVESTATUS_FAILED))
             {
                 gBattleScripting.atk49_state++;
                 break;
             }
-            *choicedMoveAtk = gLastUsedMove;
+            *choicedMoveAtk = gOriginallyUsedMove;
             LOOP:
             {
                 for (i = 0; i < 4; i++)
@@ -5036,7 +5036,7 @@ static void atk49_moveend(void)
             }
             if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED)
             {
-                gUnknownMovesUsedByBanks[gBankAttacker] = gLastUsedMove;
+                gUnknownMovesUsedByBanks[gBankAttacker] = gOriginallyUsedMove;
             }
             if (!(gAbsentBankFlags & gBitTable[gBankAttacker])
                 && !(gBattleStruct->field_91 & gBitTable[gBankAttacker])
@@ -5044,7 +5044,7 @@ static void atk49_moveend(void)
             {
                 if (gHitMarker & HITMARKER_OBEYS)
                 {
-                    gLastUsedMovesByBanks[gBankAttacker] = gLastUsedMove;
+                    gLastUsedMovesByBanks[gBankAttacker] = gOriginallyUsedMove;
                     gUnknown_02024260[gBankAttacker] = gCurrentMove;
                 }
                 else
@@ -5054,23 +5054,23 @@ static void atk49_moveend(void)
                 }
 
                 if (!(gHitMarker & HITMARKER_FAINTED(gBankTarget)))
-                    gUnknown_02024270[gBankTarget] = gBankAttacker;
+                    gTurnMovesHitBy[gBankTarget] = gBankAttacker;
 
                 if (gHitMarker & HITMARKER_OBEYS && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
                 {
-                    if (gLastUsedMove == 0xFFFF)
+                    if (gOriginallyUsedMove == 0xFFFF)
                     {
-                        gUnknown_02024250[gBankTarget] = gLastUsedMove;
+                        gTurnMovesHitWith[gBankTarget] = gOriginallyUsedMove;
                     }
                     else
                     {
-                        gUnknown_02024250[gBankTarget] = gCurrentMove;
+                        gTurnMovesHitWith[gBankTarget] = gCurrentMove;
                         GET_MOVE_TYPE(gCurrentMove, gUnknown_02024258[gBankTarget]);
                     }
                 }
                 else
                 {
-                    gUnknown_02024250[gBankTarget] = 0xFFFF;
+                    gTurnMovesHitWith[gBankTarget] = 0xFFFF;
                 }
             }
             gBattleScripting.atk49_state++;
@@ -5083,16 +5083,16 @@ static void atk49_moveend(void)
             {
                 u8 target, attacker;
 
-                *(gBattleStruct->mirrorMoves + gBankTarget * 2 + 0) = gLastUsedMove;
-                *(gBattleStruct->mirrorMoves + gBankTarget * 2 + 1) = gLastUsedMove >> 8;
+                *(gBattleStruct->mirrorMoves + gBankTarget * 2 + 0) = gOriginallyUsedMove;
+                *(gBattleStruct->mirrorMoves + gBankTarget * 2 + 1) = gOriginallyUsedMove >> 8;
 
                 target = gBankTarget;
                 attacker = gBankAttacker;
-                *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = gLastUsedMove;
+                *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = gOriginallyUsedMove;
 
                 target = gBankTarget;
                 attacker = gBankAttacker;
-                *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = gLastUsedMove >> 8;
+                *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = gOriginallyUsedMove >> 8;
             }
             gBattleScripting.atk49_state++;
             break;
@@ -5144,7 +5144,7 @@ static void atk4A_typecalc2(void)
     {
         gLastUsedAbility = gBattleMons[gBankTarget].ability;
         gBattleMoveFlags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED);
-        gUnknown_02024250[gBankTarget] = 0;
+        gTurnMovesHitWith[gBankTarget] = 0;
         gBattleCommunication[6] = moveType;
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
     }
@@ -5219,7 +5219,7 @@ static void atk4A_typecalc2(void)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
         gBattleMoveFlags |= MOVESTATUS_MISSED;
-        gUnknown_02024250[gBankTarget] = 0;
+        gTurnMovesHitWith[gBankTarget] = 0;
         gBattleCommunication[6] = 3;
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
     }
@@ -5452,10 +5452,10 @@ static void atk4F_jumpifcantswitch(void)
     {
         if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
         {
-            r7 = GetBankByIdentity(1);
+            r7 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
 
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                compareVar = GetBankByIdentity(3);
+                compareVar = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
             else
                 compareVar = r7;
 
@@ -5463,10 +5463,10 @@ static void atk4F_jumpifcantswitch(void)
         }
         else
         {
-            r7 = GetBankByIdentity(0);
+            r7 = GetBankByIdentity(IDENTITY_PLAYER_MON1);
 
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                compareVar = GetBankByIdentity(2);
+                compareVar = GetBankByIdentity(IDENTITY_PLAYER_MON2);
             else
                 compareVar = r7;
 
@@ -6009,7 +6009,7 @@ static void atk59_handlelearnnewmove(void)
     }
     else
     {
-        gActiveBank = GetBankByIdentity(0);
+        gActiveBank = GetBankByIdentity(IDENTITY_PLAYER_MON1);
 
         if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterId
             && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
@@ -6018,7 +6018,7 @@ static void atk59_handlelearnnewmove(void)
         }
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
-            gActiveBank = GetBankByIdentity(2);
+            gActiveBank = GetBankByIdentity(IDENTITY_PLAYER_MON2);
             if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterId
                 && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
             {
@@ -6386,7 +6386,7 @@ static void atk63_jumptorandomattack(void)
     if (gBattlescriptCurrInstr[1] != 0)
         gCurrentMove = gRandomMove;
     else
-        gLastUsedMove = gCurrentMove = gRandomMove;
+        gOriginallyUsedMove = gCurrentMove = gRandomMove;
 
     gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
 }
@@ -6849,7 +6849,7 @@ static void atk6D_resetsentmonsvalue(void)
 
 static void atk6E_setatktoplayer0(void)
 {
-    gBankAttacker = GetBankByIdentity(0);
+    gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
     gBattlescriptCurrInstr++;
 }
 
@@ -8352,7 +8352,7 @@ static void atk9A_setfocusenergy(void)
 
 static void atk9B_transformdataexecution(void)
 {
-    gLastUsedMove = 0xFFFF;
+    gOriginallyUsedMove = 0xFFFF;
     gBattlescriptCurrInstr++;
     if (gBattleMons[gBankTarget].status2 & STATUS2_TRANSFORMED
         || gStatuses3[gBankTarget] & STATUS3_SEMI_INVULNERABLE)
@@ -8432,7 +8432,7 @@ static bool8 IsMoveUncopyableByMimic(u16 move)
 
 static void atk9D_mimicattackcopy(void)
 {
-    gLastUsedMove = 0xFFFF;
+    gOriginallyUsedMove = 0xFFFF;
 
     if (IsMoveUncopyableByMimic(gLastUsedMovesByBanks[gBankTarget])
         || gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED
@@ -8652,13 +8652,13 @@ static void atkA5_painsplitdmgcalc(void)
 
 static void atkA6_settypetorandomresistance(void) // conversion 2
 {
-    if (gUnknown_02024250[gBankAttacker] == 0
-        || gUnknown_02024250[gBankAttacker] == 0xFFFF)
+    if (gTurnMovesHitWith[gBankAttacker] == 0
+        || gTurnMovesHitWith[gBankAttacker] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
-    else if (IsTwoTurnsMove(gUnknown_02024250[gBankAttacker])
-            && gBattleMons[gUnknown_02024270[gBankAttacker]].status2 & STATUS2_MULTIPLETURNS)
+    else if (IsTwoTurnsMove(gTurnMovesHitWith[gBankAttacker])
+            && gBattleMons[gTurnMovesHitBy[gBankAttacker]].status2 & STATUS2_MULTIPLETURNS)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8726,7 +8726,7 @@ static void atkA7_setalwayshitflag(void)
 
 static void atkA8_copymovepermanently(void) // sketch
 {
-    gLastUsedMove = 0xFFFF;
+    gOriginallyUsedMove = 0xFFFF;
 
     if (!(gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED)
         && gUnknownMovesUsedByBanks[gBankTarget] != MOVE_STRUGGLE
@@ -9024,7 +9024,7 @@ static void atkAE_healpartystatus(void)
         gBattleMons[gBankAttacker].status1 = 0;
         gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
 
-        gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2);
+        gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_MON);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
             && !(gAbsentBankFlags & gBitTable[gActiveBank]))
         {
diff --git a/src/battle_util.c b/src/battle_util.c
index 6164565bd..7f5d31b6f 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -459,7 +459,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
 u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check)
 {
     u8 holdEffect;
-    u16* choicedMove = &gBattleStruct->choicedMove[bank];
+    u16 *choicedMove = &gBattleStruct->choicedMove[bank];
     s32 i;
 
     if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY)
@@ -584,11 +584,7 @@ u8 UpdateTurnCounters(void)
                     {
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT;
                         BattleScriptExecute(BattleScript_82DACFA);
-                        gBattleTextBuff1[0] = 0xFD;
-                        gBattleTextBuff1[1] = 2;
-                        gBattleTextBuff1[2] = MOVE_REFLECT;
-                        gBattleTextBuff1[3] = MOVE_REFLECT >> 8;
-                        gBattleTextBuff1[4] = EOS;
+                        PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_REFLECT);
                         effect++;
                     }
                 }
@@ -614,11 +610,7 @@ u8 UpdateTurnCounters(void)
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN;
                         BattleScriptExecute(BattleScript_82DACFA);
                         gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
-                        gBattleTextBuff1[0] = 0xFD;
-                        gBattleTextBuff1[1] = 2;
-                        gBattleTextBuff1[2] = MOVE_LIGHT_SCREEN;
-                        gBattleTextBuff1[3] = MOVE_LIGHT_SCREEN >> 8;
-                        gBattleTextBuff1[4] = EOS;
+                        PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_LIGHT_SCREEN);
                         effect++;
                     }
                 }
@@ -643,11 +635,7 @@ u8 UpdateTurnCounters(void)
                     gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST;
                     BattleScriptExecute(BattleScript_82DACFA);
                     gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
-                    gBattleTextBuff1[0] = 0xFD;
-                    gBattleTextBuff1[1] = 2;
-                    gBattleTextBuff1[2] = MOVE_MIST;
-                    gBattleTextBuff1[3] = MOVE_MIST >> 8;
-                    gBattleTextBuff1[4] = EOS;
+                    PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_MIST);
                     effect++;
                 }
                 gBattleStruct->turnSideTracker++;
@@ -773,9 +761,10 @@ u8 UpdateTurnCounters(void)
                     gBattlescriptCurrInstr = BattleScript_82DACC9;
                 }
                 else
+                {
                     gBattlescriptCurrInstr = BattleScript_82DAC47;
-
-                gBattleScripting.animArg1 = 0xD;
+                }
+                gBattleScripting.animArg1 = B_ANIM_HAIL_CONTINUES;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                 BattleScriptExecute(gBattlescriptCurrInstr);
                 effect++;
@@ -870,7 +859,7 @@ u8 TurnBasedEffects(void)
                     gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    if ((gBattleMons[gActiveBank].status1 & 0xF00) != 0xF00) //not 16 turns
+                    if ((gBattleMons[gActiveBank].status1 & 0xF00) != 0xF00) // not 16 turns
                         gBattleMons[gActiveBank].status1 += 0x100;
                     gBattleMoveDamage *= (gBattleMons[gActiveBank].status1 & 0xF00) >> 8;
                     BattleScriptExecute(BattleScript_PoisonTurnDmg);
@@ -929,8 +918,8 @@ u8 TurnBasedEffects(void)
                         // This is the only way I could get this array access to match.
                         gBattleScripting.animArg1 = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 0);
                         gBattleScripting.animArg2 = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 1);
-                        gBattleTextBuff1[0] = 0xFD;
-                        gBattleTextBuff1[1] = 2;
+                        gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN;
+                        gBattleTextBuff1[1] = B_BUFF_MOVE;
                         gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 0);
                         gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 1);
                         gBattleTextBuff1[4] = EOS;
@@ -941,8 +930,8 @@ u8 TurnBasedEffects(void)
                     }
                     else  // broke free
                     {
-                        gBattleTextBuff1[0] = 0xFD;
-                        gBattleTextBuff1[1] = 2;
+                        gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN;
+                        gBattleTextBuff1[1] = B_BUFF_MOVE;
                         gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 0);
                         gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 1);
                         gBattleTextBuff1[4] = EOS;
@@ -1014,7 +1003,7 @@ u8 TurnBasedEffects(void)
                         gBattleMons[gActiveBank].status2 &= ~(STATUS2_MULTIPLETURNS);
                         if (!(gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION))
                         {
-                            gBattleCommunication[MOVE_EFFECT_BYTE] = 0x47;
+                            gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER;
                             SetMoveEffect(1, 0);
                             if (gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION)
                                 BattleScriptExecute(BattleScript_ThrashConfuses);
@@ -1139,11 +1128,8 @@ bool8 sub_8041364(void)
                 else
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
 
-                gBattleTextBuff1[0] = 0xFD;
-                gBattleTextBuff1[1] = 2;
-                gBattleTextBuff1[2] = gWishFutureKnock.futureSightMove[gActiveBank];
-                gBattleTextBuff1[3] = gWishFutureKnock.futureSightMove[gActiveBank] >> 8;
-                gBattleTextBuff1[4] = EOS;
+                PREPARE_MOVE_BUFFER(gBattleTextBuff1, gWishFutureKnock.futureSightMove[gActiveBank]);
+
                 gBankTarget = gActiveBank;
                 gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank];
                 gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank];
@@ -1151,11 +1137,11 @@ bool8 sub_8041364(void)
                 BattleScriptExecute(BattleScript_82DAFE4);
 
                 if (gWishFutureKnock.futureSightCounter[gActiveBank] == 0
-                 && gWishFutureKnock.futureSightCounter[gActiveBank ^ 2] == 0)
+                 && gWishFutureKnock.futureSightCounter[gActiveBank ^ BIT_MON] == 0)
                 {
-                    gSideAffecting[GetBankIdentity(gBankTarget) & 1] &= ~SIDE_STATUS_FUTUREATTACK;
+                    gSideAffecting[GET_BANK_SIDE(gBankTarget)] &= ~(SIDE_STATUS_FUTUREATTACK);
                 }
-                return 1;
+                return TRUE;
             }
         }
         // Why do I have to keep doing this to match?
@@ -1177,12 +1163,7 @@ bool8 sub_8041364(void)
             gBattleStruct->field_1A1++;
             if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG)
             {
-                gBattleTextBuff1[0] = 0xFD;
-                gBattleTextBuff1[1] = 1;
-                gBattleTextBuff1[2] = 1;
-                gBattleTextBuff1[3] = 1;
-                gBattleTextBuff1[4] = gDisableStructs[gActiveBank].perishSongTimer1;
-                gBattleTextBuff1[5] = EOS;
+                PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gActiveBank].perishSongTimer1);
                 if (gDisableStructs[gActiveBank].perishSongTimer1 == 0)
                 {
                     gStatuses3[gActiveBank] &= ~STATUS3_PERISH_SONG;
@@ -1195,7 +1176,7 @@ bool8 sub_8041364(void)
                     gBattlescriptCurrInstr = BattleScript_82DAF20;
                 }
                 BattleScriptExecute(gBattlescriptCurrInstr);
-                return 1;
+                return TRUE;
             }
         }
         // Hm...
@@ -1218,14 +1199,14 @@ bool8 sub_8041364(void)
             gBattlescriptCurrInstr = BattleScript_82DB8F3;
             BattleScriptExecute(BattleScript_82DB8F3);
             gBattleStruct->field_1A0++;
-            return 1;
+            return TRUE;
         }
         break;
     }
 
     gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_x20);
 
-    return 0;
+    return FALSE;
 }
 
 #define sub_8041728_MAX_CASE 7
@@ -1572,7 +1553,7 @@ u8 AtkCanceller_UnableToUseMove(void)
             }
             gBattleStruct->atkCancellerTracker++;
             break;
-        case 14: // last case
+        case ATKCANCELLER_MAX_CASE:
             break;
         }
 
@@ -1674,14 +1655,14 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
     {
         if (GetBankSide(bank) == SIDE_OPPONENT)
         {
-            r7 = GetBankByIdentity(1);
-            r6 = GetBankByIdentity(3);
+            r7 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+            r6 = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
             party = gEnemyParty;
         }
         else
         {
-            r7 = GetBankByIdentity(0);
-            r6 = GetBankByIdentity(2);
+            r7 = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+            r6 = GetBankByIdentity(IDENTITY_PLAYER_MON2);
             party = gPlayerParty;
         }
         if (r1 == 6)
@@ -1799,10 +1780,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
         else
             move = gCurrentMove;
 
-        if (gBattleStruct->dynamicMoveType)
-            moveType = gBattleStruct->dynamicMoveType & 0x3F;
-        else
-            moveType = gBattleMoves[move].type;
+        GET_MOVE_TYPE(move, moveType);
 
         switch (caseID)
         {
@@ -2525,7 +2503,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
     return effect;
 }
 
-void BattleScriptExecute(const u8* BS_ptr)
+void BattleScriptExecute(const u8 *BS_ptr)
 {
     gBattlescriptCurrInstr = BS_ptr;
     BATTLE_CALLBACKS_STACK->function[BATTLE_CALLBACKS_STACK->size++] = gBattleMainFunc;
@@ -2533,7 +2511,7 @@ void BattleScriptExecute(const u8* BS_ptr)
     gCurrentActionFuncId = 0;
 }
 
-void BattleScriptPushCursorAndCallback(const u8* BS_ptr)
+void BattleScriptPushCursorAndCallback(const u8 *BS_ptr)
 {
     BattleScriptPushCursor();
     gBattlescriptCurrInstr = BS_ptr;
@@ -3265,7 +3243,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     switch (moveTarget)
     {
     case MOVE_TARGET_SELECTED:
-        side = GetBankSide(gBankAttacker) ^ 1;
+        side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
             targetBank = gSideTimers[side].followmeTarget;
         else
@@ -3279,7 +3257,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
                 && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBankAttacker, ABILITY_LIGHTNING_ROD, 0, 0)
                 && gBattleMons[targetBank].ability != ABILITY_LIGHTNING_ROD)
             {
-                targetBank ^= 2;
+                targetBank ^= BIT_MON;
                 RecordAbilityBattle(targetBank, gBattleMons[targetBank].ability);
                 gSpecialStatuses[targetBank].lightningRodRedirected = 1;
             }
@@ -3289,12 +3267,12 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     case MOVE_TARGET_BOTH:
     case MOVE_TARGET_FOES_AND_ALLY:
     case MOVE_TARGET_OPPONENTS_FIELD:
-        targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1);
+        targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
         if (gAbsentBankFlags & gBitTable[targetBank])
-            targetBank ^= 2;
+            targetBank ^= BIT_MON;
         break;
     case MOVE_TARGET_RANDOM:
-        side = GetBankSide(gBankAttacker) ^ 1;
+        side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
             targetBank = gSideTimers[side].followmeTarget;
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & MOVE_TARGET_RANDOM)
@@ -3302,22 +3280,22 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
             if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
             {
                 if (Random() & 1)
-                    targetBank = GetBankByIdentity(1);
+                    targetBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
                 else
-                    targetBank = GetBankByIdentity(3);
+                    targetBank = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
             }
             else
             {
                 if (Random() & 1)
-                    targetBank = GetBankByIdentity(0);
+                    targetBank = GetBankByIdentity(IDENTITY_PLAYER_MON1);
                 else
-                    targetBank = GetBankByIdentity(2);
+                    targetBank = GetBankByIdentity(IDENTITY_PLAYER_MON2);
             }
             if (gAbsentBankFlags & gBitTable[targetBank])
-                targetBank ^= 2;
+                targetBank ^= BIT_MON;
         }
         else
-            targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1);
+            targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
         break;
     case MOVE_TARGET_USER:
     case MOVE_TARGET_x10:
@@ -3325,11 +3303,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
         break;
     }
 
-    #ifndef NONMATCHING
-        MEME_ACCESS_U8(BattleStruct, gBattleStruct, gBankAttacker, moveTarget, targetBank);
-    #else
-        gBattleStruct->moveTarget[gBankAttacker] = targetBank;
-    #endif // NONMATCHING
+    *(gBattleStruct->moveTarget + gBankAttacker) = targetBank;
 
     return targetBank;
 }
-- 
cgit v1.2.3


From 8c30c42c36b7904c223277b9739f5a7e78be1793 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 26 Nov 2017 14:17:02 +0100
Subject: more labelling and changes

---
 src/battle_2.c                  |  68 ++++++++++-----------
 src/battle_ai_script_commands.c |  12 ++--
 src/battle_ai_switch_items.c    |  32 +++++-----
 src/battle_controllers.c        |   4 +-
 src/battle_message.c            |   6 +-
 src/battle_script_commands.c    | 128 ++++++++++++++++++++--------------------
 src/battle_util.c               |  16 ++---
 7 files changed, 133 insertions(+), 133 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index dffebabe7..53437811a 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -120,14 +120,14 @@ extern u32 gBattleExecBuffer;
 extern u8 gMultiHitCounter;
 extern u8 gBattleMoveFlags;
 extern s32 gBattleMoveDamage;
-extern const u8* gUnknown_02024230[BATTLE_BANKS_COUNT];
-extern u16 gUnknownMovesUsedByBanks[BATTLE_BANKS_COUNT];
-extern u16 gLastUsedMovesByBanks[BATTLE_BANKS_COUNT];
-extern u16 gTurnMovesHitWith[BATTLE_BANKS_COUNT];
-extern u16 gUnknown_02024258[BATTLE_BANKS_COUNT];
-extern u16 gUnknown_02024260[BATTLE_BANKS_COUNT];
+extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
+extern u16 gOriginallyLastPrintedMoves[BATTLE_BANKS_COUNT];
+extern u16 gOriginallyLastMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastHitByType[BATTLE_BANKS_COUNT];
+extern u16 gLastMoves[BATTLE_BANKS_COUNT];
 extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
-extern u8 gTurnMovesHitBy[BATTLE_BANKS_COUNT];
+extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
 extern u8 gUnknown_02024284[BATTLE_BANKS_COUNT];
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
 extern u16 gSideAffecting[2];
@@ -2743,15 +2743,15 @@ static void BattleStartClearSetData(void)
 
         gDisableStructs[i].isFirstTurn = 2;
         gUnknown_02024284[i] = 0;
-        gLastUsedMovesByBanks[i] = 0;
-        gTurnMovesHitWith[i] = 0;
-        gUnknown_02024258[i] = 0;
-        gUnknown_02024260[i] = 0;
-        gTurnMovesHitBy[i] = 0xFF;
+        gOriginallyLastMoves[i] = 0;
+        gLastLandedMoves[i] = 0;
+        gLastHitByType[i] = 0;
+        gLastMoves[i] = 0;
+        gLastHitBy[i] = 0xFF;
         gLockedMoves[i] = 0;
-        gUnknownMovesUsedByBanks[i] = 0;
+        gOriginallyLastPrintedMoves[i] = 0;
         gBattleResources->flags->flags[i] = 0;
-        gUnknown_02024230[i] = 0;
+        gSelectionBattleScripts[i] = 0;
     }
 
     for (i = 0; i < 2; i++)
@@ -2908,14 +2908,14 @@ void SwitchInClearSetData(void)
     }
 
     gBattleMoveFlags = 0;
-    gDisableStructs[gActiveBank].isFirstTurn= 2;
+    gDisableStructs[gActiveBank].isFirstTurn = 2;
     gDisableStructs[gActiveBank].truantUnknownBit = disableStructCopy.truantUnknownBit;
-    gLastUsedMovesByBanks[gActiveBank] = 0;
-    gTurnMovesHitWith[gActiveBank] = 0;
-    gUnknown_02024258[gActiveBank] = 0;
-    gUnknown_02024260[gActiveBank] = 0;
-    gUnknownMovesUsedByBanks[gActiveBank] = 0;
-    gTurnMovesHitBy[gActiveBank] = 0xFF;
+    gOriginallyLastMoves[gActiveBank] = 0;
+    gLastLandedMoves[gActiveBank] = 0;
+    gLastHitByType[gActiveBank] = 0;
+    gLastMoves[gActiveBank] = 0;
+    gOriginallyLastPrintedMoves[gActiveBank] = 0;
+    gLastHitBy[gActiveBank] = 0xFF;
 
     *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 0) = 0;
     *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 1) = 0;
@@ -3002,12 +3002,12 @@ void FaintClearSetData(void)
 
     gDisableStructs[gActiveBank].isFirstTurn = 2;
 
-    gLastUsedMovesByBanks[gActiveBank] = 0;
-    gTurnMovesHitWith[gActiveBank] = 0;
-    gUnknown_02024258[gActiveBank] = 0;
-    gUnknown_02024260[gActiveBank] = 0;
-    gUnknownMovesUsedByBanks[gActiveBank] = 0;
-    gTurnMovesHitBy[gActiveBank] = 0xFF;
+    gOriginallyLastMoves[gActiveBank] = 0;
+    gLastLandedMoves[gActiveBank] = 0;
+    gLastHitByType[gActiveBank] = 0;
+    gLastMoves[gActiveBank] = 0;
+    gOriginallyLastPrintedMoves[gActiveBank] = 0;
+    gLastHitBy[gActiveBank] = 0xFF;
 
     *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 0) = 0;
     *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 1) = 0;
@@ -3189,7 +3189,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
-        for (i = 0; i < 6; i++)
+        for (i = 0; i < PARTY_SIZE; i++)
         {
             if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
              || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
@@ -3207,7 +3207,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
         EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
         MarkBufferBankForExecution(gActiveBank);
 
-        for (i = 0; i < 6; i++)
+        for (i = 0; i < PARTY_SIZE; i++)
         {
             if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
              || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
@@ -5217,11 +5217,11 @@ static void HandleAction_UseMove(void)
             gCurrentActionFuncId = 12;
             return;
         }
-        else if (gUnknown_02024230[gBankAttacker] != NULL)
+        else if (gSelectionBattleScripts[gBankAttacker] != NULL)
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            gBattlescriptCurrInstr = gUnknown_02024230[gBankAttacker];
-            gUnknown_02024230[gBankAttacker] = NULL;
+            gBattlescriptCurrInstr = gSelectionBattleScripts[gBankAttacker];
+            gSelectionBattleScripts[gBankAttacker] = NULL;
         }
         else
         {
@@ -5600,8 +5600,8 @@ static void HandleAction_ActionFinished(void)
     gBattleMoveFlags = 0;
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
-    gTurnMovesHitWith[gBankAttacker] = 0;
-    gUnknown_02024258[gBankAttacker] = 0;
+    gLastLandedMoves[gBankAttacker] = 0;
+    gLastHitByType[gBankAttacker] = 0;
     gBattleStruct->dynamicMoveType = 0;
     gDynamicBasePower = 0;
     gBattleScripting.atk49_state = 0;
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 24377eacc..5fde5669e 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -58,7 +58,7 @@ extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gCurrentMove;
 extern u8 gBankTarget;
 extern u8 gAbsentBankFlags;
-extern u16 gLastUsedMovesByBanks[BATTLE_BANKS_COUNT];
+extern u16 gOriginallyLastMoves[BATTLE_BANKS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
@@ -633,12 +633,12 @@ static void RecordLastUsedMoveByTarget(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == gLastUsedMovesByBanks[gBankTarget])
+        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == gOriginallyLastMoves[gBankTarget])
             break;
-        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] != gLastUsedMovesByBanks[gBankTarget]  // HACK: This redundant condition is a hack to make the asm match.
+        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] != gOriginallyLastMoves[gBankTarget]  // HACK: This redundant condition is a hack to make the asm match.
          && gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == 0)
         {
-            gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] = gLastUsedMovesByBanks[gBankTarget];
+            gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] = gOriginallyLastMoves[gBankTarget];
             break;
         }
     }
@@ -1252,9 +1252,9 @@ static void BattleAICmd_is_most_powerful_move(void)
 static void BattleAICmd_get_last_used_bank_move(void)
 {
     if (gAIScriptPtr[1] == AI_USER)
-        AI_THINKING_STRUCT->funcResult = gLastUsedMovesByBanks[sBank_AI];
+        AI_THINKING_STRUCT->funcResult = gOriginallyLastMoves[sBank_AI];
     else
-        AI_THINKING_STRUCT->funcResult = gLastUsedMovesByBanks[gBankTarget];
+        AI_THINKING_STRUCT->funcResult = gOriginallyLastMoves[gBankTarget];
 
     gAIScriptPtr += 2;
 }
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index f43b9b6b2..f5b6c7fe4 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -16,8 +16,8 @@ extern u32 gBattleTypeFlags;
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u16 gTurnMovesHitWith[BATTLE_BANKS_COUNT];
-extern u8 gTurnMovesHitBy[BATTLE_BANKS_COUNT];
+extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
+extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
 extern u16 gDynamicBasePower;
 extern u8 gBattleMoveFlags;
 extern u8 gCritMultiplier;
@@ -141,11 +141,11 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
 
     if (HasSuperEffectiveMoveAgainstOpponents(TRUE) && Random() % 3 != 0)
         return FALSE;
-    if (gTurnMovesHitWith[gActiveBank] == 0)
+    if (gLastLandedMoves[gActiveBank] == 0)
         return FALSE;
-    if (gTurnMovesHitWith[gActiveBank] == 0xFFFF)
+    if (gLastLandedMoves[gActiveBank] == 0xFFFF)
         return FALSE;
-    if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].power == 0)
+    if (gBattleMoves[gLastLandedMoves[gActiveBank]].power == 0)
         return FALSE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -162,11 +162,11 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
         bankIn2 = gActiveBank;
     }
 
-    if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].type == TYPE_FIRE)
+    if (gBattleMoves[gLastLandedMoves[gActiveBank]].type == TYPE_FIRE)
         absorbingTypeAbility = ABILITY_FLASH_FIRE;
-    else if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].type == TYPE_WATER)
+    else if (gBattleMoves[gLastLandedMoves[gActiveBank]].type == TYPE_WATER)
         absorbingTypeAbility = ABILITY_WATER_ABSORB;
-    else if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].type == TYPE_ELECTRIC)
+    else if (gBattleMoves[gLastLandedMoves[gActiveBank]].type == TYPE_ELECTRIC)
         absorbingTypeAbility = ABILITY_VOLT_ABSORB;
     else
         return FALSE;
@@ -238,13 +238,13 @@ static bool8 ShouldSwitchIfNaturalCure(void)
     if (gBattleMons[gActiveBank].hp < gBattleMons[gActiveBank].maxHP / 2)
         return FALSE;
 
-    if ((gTurnMovesHitWith[gActiveBank] == 0 || gTurnMovesHitWith[gActiveBank] == 0xFFFF) && Random() & 1)
+    if ((gLastLandedMoves[gActiveBank] == 0 || gLastLandedMoves[gActiveBank] == 0xFFFF) && Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
-    else if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].power == 0 && Random() & 1)
+    else if (gBattleMoves[gLastLandedMoves[gActiveBank]].power == 0 && Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
@@ -345,13 +345,13 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
     u16 move;
     u8 moveFlags;
 
-    if (gTurnMovesHitWith[gActiveBank] == 0)
+    if (gLastLandedMoves[gActiveBank] == 0)
         return FALSE;
-    if (gTurnMovesHitWith[gActiveBank] == 0xFFFF)
+    if (gLastLandedMoves[gActiveBank] == 0xFFFF)
         return FALSE;
-    if (gTurnMovesHitBy[gActiveBank] == 0xFF)
+    if (gLastHitBy[gActiveBank] == 0xFF)
         return FALSE;
-    if (gBattleMoves[gTurnMovesHitWith[gActiveBank]].power == 0)
+    if (gBattleMoves[gLastLandedMoves[gActiveBank]].power == 0)
         return FALSE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -411,10 +411,10 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
         else
             monAbility = gBaseStats[species].ability1;
 
-        moveFlags = AI_TypeCalc(gTurnMovesHitWith[gActiveBank], species, monAbility);
+        moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBank], species, monAbility);
         if (moveFlags & flags)
         {
-            bankIn1 = gTurnMovesHitBy[gActiveBank];
+            bankIn1 = gLastHitBy[gActiveBank];
 
             for (j = 0; j < 4; j++)
             {
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 45ed8a73a..b3fb91b42 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -1120,7 +1120,7 @@ void EmitPrintString(u8 bufferId, u16 stringID)
 
     stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]);
     stringInfo->currentMove = gCurrentMove;
-    stringInfo->lastMove = gOriginallyUsedMove;
+    stringInfo->originallyUsedMove = gOriginallyUsedMove;
     stringInfo->lastItem = gLastUsedItem;
     stringInfo->lastAbility = gLastUsedAbility;
     stringInfo->scrActive = gBattleScripting.bank;
@@ -1152,7 +1152,7 @@ void EmitPrintSelectionString(u8 bufferId, u16 stringID)
 
     stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]);
     stringInfo->currentMove = gCurrentMove;
-    stringInfo->lastMove = gOriginallyUsedMove;
+    stringInfo->originallyUsedMove = gOriginallyUsedMove;
     stringInfo->lastItem = gLastUsedItem;
     stringInfo->lastAbility = gLastUsedAbility;
     stringInfo->scrActive = gBattleScripting.bank;
diff --git a/src/battle_message.c b/src/battle_message.c
index 04eb5f655..35b9004ac 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1916,11 +1916,11 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 else
                     toCpy = gMoveNames[gStringInfo->currentMove];
                 break;
-            case B_TXT_LAST_MOVE: // last used move name
-                if (gStringInfo->lastMove > LAST_MOVE_INDEX)
+            case B_TXT_LAST_MOVE: // originally used move name
+                if (gStringInfo->originallyUsedMove > LAST_MOVE_INDEX)
                     toCpy = gText_UnknownMoveTypes[gBattleStruct->stringMoveType];
                 else
-                    toCpy = gMoveNames[gStringInfo->lastMove];
+                    toCpy = gMoveNames[gStringInfo->originallyUsedMove];
                 break;
             case B_TXT_LAST_ITEM: // last used item
                 if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 9ab9160a4..0e6209ed8 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -74,10 +74,10 @@ extern u8 gCurrentActionFuncId;
 extern u32 gHitMarker;
 extern u8 gBattleMoveFlags;
 extern u8 gBattleCommunication[];
-extern u16 gTurnMovesHitWith[4];
-extern u16 gUnknown_02024258[4];
-extern u16 gUnknown_02024260[4];
-extern u8 gTurnMovesHitBy[4];
+extern u16 gLastLandedMoves[4];
+extern u16 gLastHitByType[4];
+extern u16 gLastMoves[4];
+extern u8 gLastHitBy[4];
 extern u8 gStringBank;
 extern u16 gDynamicBasePower;
 extern u16 gLastUsedItem;
@@ -100,8 +100,8 @@ extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u16 gOriginallyUsedMove;
-extern u16 gUnknownMovesUsedByBanks[BATTLE_BANKS_COUNT];
-extern u16 gLastUsedMovesByBanks[BATTLE_BANKS_COUNT];
+extern u16 gOriginallyLastPrintedMoves[BATTLE_BANKS_COUNT];
+extern u16 gOriginallyLastMoves[BATTLE_BANKS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u8 gUnknown_020241E9;
@@ -1105,8 +1105,8 @@ static void atk00_attackcanceler(void)
     {
         CancelMultiTurnMoves(gBankAttacker);
         gBattleMoveFlags |= MOVESTATUS_MISSED;
-        gTurnMovesHitWith[gBankTarget] = 0;
-        gUnknown_02024258[gBankTarget] = 0;
+        gLastLandedMoves[gBankTarget] = 0;
+        gLastHitByType[gBankTarget] = 0;
         gBattleCommunication[6] = 1;
         gBattlescriptCurrInstr++;
     }
@@ -1118,11 +1118,11 @@ static void atk00_attackcanceler(void)
 
 static void JumpIfMoveFailed(u8 adder, u16 move)
 {
-    const void* BS_ptr = gBattlescriptCurrInstr + adder;
+    const u8 *BS_ptr = gBattlescriptCurrInstr + adder;
     if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
     {
-        gTurnMovesHitWith[gBankTarget] = 0;
-        gUnknown_02024258[gBankTarget] = 0;
+        gLastLandedMoves[gBankTarget] = 0;
+        gLastHitByType[gBankTarget] = 0;
         BS_ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
@@ -1484,8 +1484,8 @@ static void atk06_typecalc(void)
     {
         gLastUsedAbility = gBattleMons[gBankTarget].ability;
         gBattleMoveFlags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED);
-        gTurnMovesHitWith[gBankTarget] = 0;
-        gUnknown_02024258[gBankTarget] = 0;
+        gLastLandedMoves[gBankTarget] = 0;
+        gLastHitByType[gBankTarget] = 0;
         gBattleCommunication[6] = moveType;
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
     }
@@ -1520,8 +1520,8 @@ static void atk06_typecalc(void)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
         gBattleMoveFlags |= MOVESTATUS_MISSED;
-        gTurnMovesHitWith[gBankTarget] = 0;
-        gUnknown_02024258[gBankTarget] = 0;
+        gLastLandedMoves[gBankTarget] = 0;
+        gLastHitByType[gBankTarget] = 0;
         gBattleCommunication[6] = 3;
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
     }
@@ -4856,14 +4856,14 @@ static void atk49_moveend(void)
     u8 holdEffectAtk;
     u16 *choicedMoveAtk;
     u8 arg1, arg2;
-    u16 lastMove;
+    u16 originallyUsedMove;
 
     effect = FALSE;
 
     if (gOriginallyUsedMove == 0xFFFF)
-        lastMove = 0;
+        originallyUsedMove = 0;
     else
-        lastMove = gOriginallyUsedMove;
+        originallyUsedMove = gOriginallyUsedMove;
 
     arg1 = gBattlescriptCurrInstr[1];
     arg2 = gBattlescriptCurrInstr[2];
@@ -5036,48 +5036,48 @@ static void atk49_moveend(void)
             }
             if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED)
             {
-                gUnknownMovesUsedByBanks[gBankAttacker] = gOriginallyUsedMove;
+                gOriginallyLastPrintedMoves[gBankAttacker] = gOriginallyUsedMove;
             }
             if (!(gAbsentBankFlags & gBitTable[gBankAttacker])
                 && !(gBattleStruct->field_91 & gBitTable[gBankAttacker])
-                && gBattleMoves[lastMove].effect != EFFECT_BATON_PASS)
+                && gBattleMoves[originallyUsedMove].effect != EFFECT_BATON_PASS)
             {
                 if (gHitMarker & HITMARKER_OBEYS)
                 {
-                    gLastUsedMovesByBanks[gBankAttacker] = gOriginallyUsedMove;
-                    gUnknown_02024260[gBankAttacker] = gCurrentMove;
+                    gOriginallyLastMoves[gBankAttacker] = gOriginallyUsedMove;
+                    gLastMoves[gBankAttacker] = gCurrentMove;
                 }
                 else
                 {
-                    gLastUsedMovesByBanks[gBankAttacker] = 0xFFFF;
-                    gUnknown_02024260[gBankAttacker] = 0xFFFF;
+                    gOriginallyLastMoves[gBankAttacker] = 0xFFFF;
+                    gLastMoves[gBankAttacker] = 0xFFFF;
                 }
 
                 if (!(gHitMarker & HITMARKER_FAINTED(gBankTarget)))
-                    gTurnMovesHitBy[gBankTarget] = gBankAttacker;
+                    gLastHitBy[gBankTarget] = gBankAttacker;
 
                 if (gHitMarker & HITMARKER_OBEYS && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
                 {
                     if (gOriginallyUsedMove == 0xFFFF)
                     {
-                        gTurnMovesHitWith[gBankTarget] = gOriginallyUsedMove;
+                        gLastLandedMoves[gBankTarget] = gOriginallyUsedMove;
                     }
                     else
                     {
-                        gTurnMovesHitWith[gBankTarget] = gCurrentMove;
-                        GET_MOVE_TYPE(gCurrentMove, gUnknown_02024258[gBankTarget]);
+                        gLastLandedMoves[gBankTarget] = gCurrentMove;
+                        GET_MOVE_TYPE(gCurrentMove, gLastHitByType[gBankTarget]);
                     }
                 }
                 else
                 {
-                    gTurnMovesHitWith[gBankTarget] = 0xFFFF;
+                    gLastLandedMoves[gBankTarget] = 0xFFFF;
                 }
             }
             gBattleScripting.atk49_state++;
             break;
         case 15: // mirror move
             if (!(gAbsentBankFlags & gBitTable[gBankAttacker]) && !(gBattleStruct->field_91 & gBitTable[gBankAttacker])
-                && gBattleMoves[lastMove].flags & FLAG_MIRROR_MOVE_AFFECTED && gHitMarker & HITMARKER_OBEYS
+                && gBattleMoves[originallyUsedMove].flags & FLAG_MIRROR_MOVE_AFFECTED && gHitMarker & HITMARKER_OBEYS
                 && gBankAttacker != gBankTarget && !(gHitMarker & HITMARKER_FAINTED(gBankTarget))
                 && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
             {
@@ -5144,7 +5144,7 @@ static void atk4A_typecalc2(void)
     {
         gLastUsedAbility = gBattleMons[gBankTarget].ability;
         gBattleMoveFlags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED);
-        gTurnMovesHitWith[gBankTarget] = 0;
+        gLastLandedMoves[gBankTarget] = 0;
         gBattleCommunication[6] = moveType;
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
     }
@@ -5219,7 +5219,7 @@ static void atk4A_typecalc2(void)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
         gBattleMoveFlags |= MOVESTATUS_MISSED;
-        gTurnMovesHitWith[gBankTarget] = 0;
+        gLastLandedMoves[gBankTarget] = 0;
         gBattleCommunication[6] = 3;
         RecordAbilityBattle(gBankTarget, gLastUsedAbility);
     }
@@ -7131,7 +7131,7 @@ static void atk76_various(void)
 static void atk77_setprotectlike(void) // protect and endure
 {
     bool8 notLastTurn = TRUE;
-    u16 lastMove = gUnknown_02024260[gBankAttacker];
+    u16 lastMove = gLastMoves[gBankAttacker];
 
     if (lastMove != MOVE_PROTECT && lastMove != MOVE_DETECT && lastMove != MOVE_ENDURE)
         gDisableStructs[gBankAttacker].protectUses = 0;
@@ -8434,10 +8434,10 @@ static void atk9D_mimicattackcopy(void)
 {
     gOriginallyUsedMove = 0xFFFF;
 
-    if (IsMoveUncopyableByMimic(gLastUsedMovesByBanks[gBankTarget])
+    if (IsMoveUncopyableByMimic(gOriginallyLastMoves[gBankTarget])
         || gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED
-        || gLastUsedMovesByBanks[gBankTarget] == 0
-        || gLastUsedMovesByBanks[gBankTarget] == 0xFFFF)
+        || gOriginallyLastMoves[gBankTarget] == 0
+        || gOriginallyLastMoves[gBankTarget] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8447,20 +8447,20 @@ static void atk9D_mimicattackcopy(void)
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMons[gBankAttacker].moves[i] == gLastUsedMovesByBanks[gBankTarget])
+            if (gBattleMons[gBankAttacker].moves[i] == gOriginallyLastMoves[gBankTarget])
                 break;
         }
 
         if (i == 4)
         {
-            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gLastUsedMovesByBanks[gBankTarget];
-            if (gBattleMoves[gLastUsedMovesByBanks[gBankTarget]].pp < 5)
-                gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gLastUsedMovesByBanks[gBankTarget]].pp;
+            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gOriginallyLastMoves[gBankTarget];
+            if (gBattleMoves[gOriginallyLastMoves[gBankTarget]].pp < 5)
+                gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gOriginallyLastMoves[gBankTarget]].pp;
             else
                 gBattleMons[gBankAttacker].pp[gCurrMovePos] = 5;
 
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastUsedMovesByBanks[gBankTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gOriginallyLastMoves[gBankTarget])
 
             gDisableStructs[gBankAttacker].unk18_b |= gBitTable[gCurrMovePos];
             gBattlescriptCurrInstr += 5;
@@ -8575,7 +8575,7 @@ static void atkA3_disablelastusedattack(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBankTarget].moves[i] == gLastUsedMovesByBanks[gBankTarget])
+        if (gBattleMons[gBankTarget].moves[i] == gOriginallyLastMoves[gBankTarget])
             break;
     }
     if (gDisableStructs[gBankTarget].disabledMove == 0
@@ -8600,13 +8600,13 @@ static void atkA4_trysetencore(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBankTarget].moves[i] == gLastUsedMovesByBanks[gBankTarget])
+        if (gBattleMons[gBankTarget].moves[i] == gOriginallyLastMoves[gBankTarget])
             break;
     }
 
-    if (gLastUsedMovesByBanks[gBankTarget] == MOVE_STRUGGLE
-        || gLastUsedMovesByBanks[gBankTarget] == MOVE_ENCORE
-        || gLastUsedMovesByBanks[gBankTarget] == MOVE_MIRROR_MOVE)
+    if (gOriginallyLastMoves[gBankTarget] == MOVE_STRUGGLE
+        || gOriginallyLastMoves[gBankTarget] == MOVE_ENCORE
+        || gOriginallyLastMoves[gBankTarget] == MOVE_MIRROR_MOVE)
     {
         i = 4;
     }
@@ -8652,13 +8652,13 @@ static void atkA5_painsplitdmgcalc(void)
 
 static void atkA6_settypetorandomresistance(void) // conversion 2
 {
-    if (gTurnMovesHitWith[gBankAttacker] == 0
-        || gTurnMovesHitWith[gBankAttacker] == 0xFFFF)
+    if (gLastLandedMoves[gBankAttacker] == 0
+        || gLastLandedMoves[gBankAttacker] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
-    else if (IsTwoTurnsMove(gTurnMovesHitWith[gBankAttacker])
-            && gBattleMons[gTurnMovesHitBy[gBankAttacker]].status2 & STATUS2_MULTIPLETURNS)
+    else if (IsTwoTurnsMove(gLastLandedMoves[gBankAttacker])
+            && gBattleMons[gLastHitBy[gBankAttacker]].status2 & STATUS2_MULTIPLETURNS)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8672,7 +8672,7 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
 
             i *= 3;
 
-            if (TYPE_EFFECT_ATK_TYPE(i) == gUnknown_02024258[gBankAttacker]
+            if (TYPE_EFFECT_ATK_TYPE(i) == gLastHitByType[gBankAttacker]
                 && TYPE_EFFECT_MULTIPLIER(i) <= TYPE_MUL_NOT_EFFECTIVE
                 && gBattleMons[gBankAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
                 && gBattleMons[gBankAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
@@ -8695,7 +8695,7 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
             case TYPE_FORESIGHT:
                 break;
             default:
-                if (TYPE_EFFECT_ATK_TYPE(j) == gUnknown_02024258[gBankAttacker]
+                if (TYPE_EFFECT_ATK_TYPE(j) == gLastHitByType[gBankAttacker]
                     && TYPE_EFFECT_MULTIPLIER(j) <= 5
                     && gBattleMons[gBankAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
                     && gBattleMons[gBankAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
@@ -8729,10 +8729,10 @@ static void atkA8_copymovepermanently(void) // sketch
     gOriginallyUsedMove = 0xFFFF;
 
     if (!(gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED)
-        && gUnknownMovesUsedByBanks[gBankTarget] != MOVE_STRUGGLE
-        && gUnknownMovesUsedByBanks[gBankTarget] != 0
-        && gUnknownMovesUsedByBanks[gBankTarget] != 0xFFFF
-        && gUnknownMovesUsedByBanks[gBankTarget] != MOVE_SKETCH)
+        && gOriginallyLastPrintedMoves[gBankTarget] != MOVE_STRUGGLE
+        && gOriginallyLastPrintedMoves[gBankTarget] != 0
+        && gOriginallyLastPrintedMoves[gBankTarget] != 0xFFFF
+        && gOriginallyLastPrintedMoves[gBankTarget] != MOVE_SKETCH)
     {
         s32 i;
 
@@ -8740,7 +8740,7 @@ static void atkA8_copymovepermanently(void) // sketch
         {
             if (gBattleMons[gBankAttacker].moves[i] == MOVE_SKETCH)
                 continue;
-            if (gBattleMons[gBankAttacker].moves[i] == gUnknownMovesUsedByBanks[gBankTarget])
+            if (gBattleMons[gBankAttacker].moves[i] == gOriginallyLastPrintedMoves[gBankTarget])
                 break;
         }
 
@@ -8752,8 +8752,8 @@ static void atkA8_copymovepermanently(void) // sketch
         {
             struct MovePpInfo movePpData;
 
-            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gUnknownMovesUsedByBanks[gBankTarget];
-            gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gUnknownMovesUsedByBanks[gBankTarget]].pp;
+            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gOriginallyLastPrintedMoves[gBankTarget];
+            gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gOriginallyLastPrintedMoves[gBankTarget]].pp;
             gActiveBank = gBankAttacker;
 
             for (i = 0; i < 4; i++)
@@ -8766,7 +8766,7 @@ static void atkA8_copymovepermanently(void) // sketch
             EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct MovePpInfo), &movePpData);
             MarkBufferBankForExecution(gActiveBank);
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gUnknownMovesUsedByBanks[gBankTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gOriginallyLastPrintedMoves[gBankTarget])
 
             gBattlescriptCurrInstr += 5;
         }
@@ -8899,14 +8899,14 @@ static void atkAC_remaininghptopower(void)
 
 static void atkAD_tryspiteppreduce(void)
 {
-    if (gLastUsedMovesByBanks[gBankTarget] != 0
-        && gLastUsedMovesByBanks[gBankTarget] != 0xFFFF)
+    if (gOriginallyLastMoves[gBankTarget] != 0
+        && gOriginallyLastMoves[gBankTarget] != 0xFFFF)
     {
         s32 i;
 
         for (i = 0; i < 4; i++)
         {
-            if (gLastUsedMovesByBanks[gBankTarget] == gBattleMons[gBankTarget].moves[i])
+            if (gOriginallyLastMoves[gBankTarget] == gBattleMons[gBankTarget].moves[i])
                 break;
         }
 
@@ -8916,7 +8916,7 @@ static void atkAD_tryspiteppreduce(void)
             if (gBattleMons[gBankTarget].pp[i] < ppToDeduct)
                 ppToDeduct = gBattleMons[gBankTarget].pp[i];
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastUsedMovesByBanks[gBankTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gOriginallyLastMoves[gBankTarget])
 
             ConvertIntToDecimalStringN(gBattleTextBuff2, ppToDeduct, 0, 1);
 
diff --git a/src/battle_util.c b/src/battle_util.c
index 7f5d31b6f..9f2bf2797 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -23,7 +23,7 @@
 
 extern const u8* gBattlescriptCurrInstr;
 extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
-extern const u8* gUnknown_02024230[BATTLE_BANKS_COUNT];
+extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u8 gActiveBank;
 extern u8 gStringBank;
@@ -43,7 +43,7 @@ extern s32 gBattleMoveDamage;
 extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern u32 gBattleTypeFlags;
-extern u16 gLastUsedMovesByBanks[BATTLE_BANKS_COUNT];
+extern u16 gOriginallyLastMoves[BATTLE_BANKS_COUNT];
 extern u32 gHitMarker;
 extern u8 gEffectBank;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
@@ -363,7 +363,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gUnknown_02024230[gActiveBank] = BattleScript_82DAE2A;
+            gSelectionBattleScripts[gActiveBank] = BattleScript_82DAE2A;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -373,12 +373,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
         }
     }
 
-    if (move == gLastUsedMovesByBanks[gActiveBank] && move != MOVE_STRUGGLE && (gBattleMons[gActiveBank].status2 & STATUS2_TORMENT))
+    if (move == gOriginallyLastMoves[gActiveBank] && move != MOVE_STRUGGLE && (gBattleMons[gActiveBank].status2 & STATUS2_TORMENT))
     {
         CancelMultiTurnMoves(gActiveBank);
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gUnknown_02024230[gActiveBank] = BattleScript_82DB098;
+            gSelectionBattleScripts[gActiveBank] = BattleScript_82DB098;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -393,7 +393,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gUnknown_02024230[gActiveBank] = BattleScript_82DB0AF;
+            gSelectionBattleScripts[gActiveBank] = BattleScript_82DB0AF;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -408,7 +408,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gUnknown_02024230[gActiveBank] = BattleScript_82DB185;
+            gSelectionBattleScripts[gActiveBank] = BattleScript_82DB185;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -477,7 +477,7 @@ u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check)
             unusableMoves |= gBitTable[i];
         if (gBattleMons[bank].moves[i] == gDisableStructs[bank].disabledMove && check & MOVE_LIMITATION_DISABLED)
             unusableMoves |= gBitTable[i];
-        if (gBattleMons[bank].moves[i] == gLastUsedMovesByBanks[bank] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[bank].status2 & STATUS2_TORMENT)
+        if (gBattleMons[bank].moves[i] == gOriginallyLastMoves[bank] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[bank].status2 & STATUS2_TORMENT)
             unusableMoves |= gBitTable[i];
         if (gDisableStructs[bank].tauntTimer1 && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[bank].moves[i]].power == 0)
             unusableMoves |= gBitTable[i];
-- 
cgit v1.2.3


From 1bb5b1fd07260cd027d9504a0debfdc294cebc9f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 26 Nov 2017 17:15:28 +0100
Subject: more battle labels

---
 src/battle_2.c    |  28 ++++----
 src/battle_util.c | 210 ++++++++++++++++++++++++++++--------------------------
 2 files changed, 123 insertions(+), 115 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 53437811a..b03e96622 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -120,7 +120,7 @@ extern u32 gBattleExecBuffer;
 extern u8 gMultiHitCounter;
 extern u8 gBattleMoveFlags;
 extern s32 gBattleMoveDamage;
-extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
+extern const u8* gPalaceSelectionBattleScripts[BATTLE_BANKS_COUNT];
 extern u16 gOriginallyLastPrintedMoves[BATTLE_BANKS_COUNT];
 extern u16 gOriginallyLastMoves[BATTLE_BANKS_COUNT];
 extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
@@ -141,7 +141,7 @@ extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
 extern u8 gCurrentActionFuncId;
 extern u8 gLastUsedAbility;
 extern u8 gUnknown_0203CF00[];
-extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
+extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
 extern const u8* gBattlescriptCurrInstr;
 extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
 extern u8 gCurrentTurnActionNumber;
@@ -2751,7 +2751,7 @@ static void BattleStartClearSetData(void)
         gLockedMoves[i] = 0;
         gOriginallyLastPrintedMoves[i] = 0;
         gBattleResources->flags->flags[i] = 0;
-        gSelectionBattleScripts[i] = 0;
+        gPalaceSelectionBattleScripts[i] = 0;
     }
 
     for (i = 0; i < 2; i++)
@@ -3983,7 +3983,7 @@ static void HandleTurnActionSelectionState(void)
                                             | BATTLE_TYPE_x2000000))
                     {
                         RecordedBattle_ClearBankAction(gActiveBank, 1);
-                        gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_ActionSelectionItemsCantBeUsed;
+                        gSelectionBattleScripts[gActiveBank] = BattleScript_ActionSelectionItemsCantBeUsed;
                         gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
                         *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                         *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4028,7 +4028,7 @@ static void HandleTurnActionSelectionState(void)
                 case ACTION_SAFARI_ZONE_BALL:
                     if (IsPlayerPartyAndPokemonStorageFull())
                     {
-                        gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DAB11;
+                        gSelectionBattleScripts[gActiveBank] = BattleScript_PrintFullBox;
                         gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
                         *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                         *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4083,7 +4083,7 @@ static void HandleTurnActionSelectionState(void)
                     && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000)
                     && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
-                    gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB9BA;
+                    gSelectionBattleScripts[gActiveBank] = BattleScript_82DB9BA;
                     gBattleCommunication[gActiveBank] = 8;
                     *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                     *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4099,7 +4099,7 @@ static void HandleTurnActionSelectionState(void)
                 else if (IsRunningFromBattleImpossible() != 0
                          && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
-                    gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DAB0B;
+                    gSelectionBattleScripts[gActiveBank] = BattleScript_82DAB0B;
                     gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
                     *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                     *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4252,12 +4252,12 @@ static void HandleTurnActionSelectionState(void)
             else
             {
                 gBankAttacker = gActiveBank;
-                gBattlescriptCurrInstr = gBattlescriptPtrsForSelection[gActiveBank];
+                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBank];
                 if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
                 {
                     gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
                 }
-                gBattlescriptPtrsForSelection[gActiveBank] = gBattlescriptCurrInstr;
+                gSelectionBattleScripts[gActiveBank] = gBattlescriptCurrInstr;
             }
             break;
         case STATE_WAIT_SET_BEFORE_ACTION:
@@ -4284,12 +4284,12 @@ static void HandleTurnActionSelectionState(void)
             else
             {
                 gBankAttacker = gActiveBank;
-                gBattlescriptCurrInstr = gBattlescriptPtrsForSelection[gActiveBank];
+                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBank];
                 if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
                 {
                     gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
                 }
-                gBattlescriptPtrsForSelection[gActiveBank] = gBattlescriptCurrInstr;
+                gSelectionBattleScripts[gActiveBank] = gBattlescriptCurrInstr;
             }
             break;
         }
@@ -5217,11 +5217,11 @@ static void HandleAction_UseMove(void)
             gCurrentActionFuncId = 12;
             return;
         }
-        else if (gSelectionBattleScripts[gBankAttacker] != NULL)
+        else if (gPalaceSelectionBattleScripts[gBankAttacker] != NULL)
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            gBattlescriptCurrInstr = gSelectionBattleScripts[gBankAttacker];
-            gSelectionBattleScripts[gBankAttacker] = NULL;
+            gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBankAttacker];
+            gPalaceSelectionBattleScripts[gBankAttacker] = NULL;
         }
         else
         {
diff --git a/src/battle_util.c b/src/battle_util.c
index 9f2bf2797..021251b35 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -22,8 +22,8 @@
 #include "link.h"
 
 extern const u8* gBattlescriptCurrInstr;
-extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
 extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
+extern const u8* gPalaceSelectionBattleScripts[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u8 gActiveBank;
 extern u8 gStringBank;
@@ -363,12 +363,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gSelectionBattleScripts[gActiveBank] = BattleScript_82DAE2A;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DAE2A;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DAE1F;
+            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingDisabledMove;
             limitations = 1;
         }
     }
@@ -378,12 +378,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
         CancelMultiTurnMoves(gActiveBank);
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gSelectionBattleScripts[gActiveBank] = BattleScript_82DB098;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DB098;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB089;
+            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingTormentedMove;
             limitations++;
         }
     }
@@ -393,12 +393,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gSelectionBattleScripts[gActiveBank] = BattleScript_82DB0AF;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DB0AF;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB0A0;
+            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingNotAllowedMoveTaunt;
             limitations++;
         }
     }
@@ -408,12 +408,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gSelectionBattleScripts[gActiveBank] = BattleScript_82DB185;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DB185;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB181;
+            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingImprisionedMove;
             limitations++;
         }
     }
@@ -435,7 +435,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB812;
+            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingNotAllowedMoveChoiceItem;
             limitations++;
         }
     }
@@ -448,7 +448,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         }
         else
         {
-            gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_82DB076;
+            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingMoveWithNoPP;
             limitations++;
         }
     }
@@ -499,7 +499,7 @@ bool8 AreAllMovesUnusable(void)
     if (unusable == 0xF) // all moves are unusable
     {
         gProtectStructs[gActiveBank].onlyStruggle = 1;
-        gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_NoMovesLeft;
+        gSelectionBattleScripts[gActiveBank] = BattleScript_NoMovesLeft;
     }
     else
     {
@@ -583,7 +583,7 @@ u8 UpdateTurnCounters(void)
                     if (--gSideTimers[sideBank].reflectTimer == 0)
                     {
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT;
-                        BattleScriptExecute(BattleScript_82DACFA);
+                        BattleScriptExecute(BattleScript_SideStatusWoreOff);
                         PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_REFLECT);
                         effect++;
                     }
@@ -608,7 +608,7 @@ u8 UpdateTurnCounters(void)
                     if (--gSideTimers[sideBank].lightscreenTimer == 0)
                     {
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN;
-                        BattleScriptExecute(BattleScript_82DACFA);
+                        BattleScriptExecute(BattleScript_SideStatusWoreOff);
                         gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
                         PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_LIGHT_SCREEN);
                         effect++;
@@ -633,7 +633,7 @@ u8 UpdateTurnCounters(void)
                  && --gSideTimers[sideBank].mistTimer == 0)
                 {
                     gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST;
-                    BattleScriptExecute(BattleScript_82DACFA);
+                    BattleScriptExecute(BattleScript_SideStatusWoreOff);
                     gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
                     PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_MIST);
                     effect++;
@@ -658,7 +658,7 @@ u8 UpdateTurnCounters(void)
                     if (--gSideTimers[sideBank].safeguardTimer == 0)
                     {
                         gSideAffecting[sideBank] &= ~SIDE_STATUS_SAFEGUARD;
-                        BattleScriptExecute(BattleScript_82DAD0B);
+                        BattleScriptExecute(BattleScript_SafeguardEnds);
                         effect++;
                     }
                 }
@@ -710,10 +710,15 @@ u8 UpdateTurnCounters(void)
                         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                 }
                 else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR)
+                {
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
+                }
                 else
+                {
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-                BattleScriptExecute(BattleScript_82DAC2C);
+                }
+
+                BattleScriptExecute(BattleScript_RainContinuesOrEnds);
                 effect++;
             }
             gBattleStruct->turncountersTracker++;
@@ -724,12 +729,14 @@ u8 UpdateTurnCounters(void)
                 if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
                 {
                     gBattleWeather &= ~WEATHER_SANDSTORM_TEMPORARY;
-                    gBattlescriptCurrInstr = BattleScript_82DACC9;
+                    gBattlescriptCurrInstr = BattleScript_SandStormHailEnds;
                 }
                 else
-                    gBattlescriptCurrInstr = BattleScript_82DAC47;
+                {
+                    gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues;
+                }
 
-                gBattleScripting.animArg1 = 0xC;
+                gBattleScripting.animArg1 = B_ANIM_SANDSTORM_CONTINUES;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                 BattleScriptExecute(gBattlescriptCurrInstr);
                 effect++;
@@ -742,10 +749,12 @@ u8 UpdateTurnCounters(void)
                 if (!(gBattleWeather & WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
                 {
                     gBattleWeather &= ~WEATHER_SUN_TEMPORARY;
-                    gBattlescriptCurrInstr = BattleScript_82DACE0;
+                    gBattlescriptCurrInstr = BattleScript_SunlightFaded;
                 }
                 else
-                    gBattlescriptCurrInstr = BattleScript_82DACD2;
+                {
+                    gBattlescriptCurrInstr = BattleScript_SunlightContinues;
+                }
 
                 BattleScriptExecute(gBattlescriptCurrInstr);
                 effect++;
@@ -758,12 +767,13 @@ u8 UpdateTurnCounters(void)
                 if (--gWishFutureKnock.weatherDuration == 0)
                 {
                     gBattleWeather &= ~WEATHER_HAIL;
-                    gBattlescriptCurrInstr = BattleScript_82DACC9;
+                    gBattlescriptCurrInstr = BattleScript_SandStormHailEnds;
                 }
                 else
                 {
-                    gBattlescriptCurrInstr = BattleScript_82DAC47;
+                    gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues;
                 }
+
                 gBattleScripting.animArg1 = B_ANIM_HAIL_CONTINUES;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                 BattleScriptExecute(gBattlescriptCurrInstr);
@@ -1828,7 +1838,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 if (effect)
                 {
                     gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current();
-                    BattleScriptPushCursorAndCallback(BattleScript_82DACE7);
+                    BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts);
                 }
                 break;
             case ABILITY_DRIZZLE:
@@ -2034,9 +2044,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     if (gBattleMons[bank].maxHP == gBattleMons[bank].hp)
                     {
                         if ((gProtectStructs[gBankAttacker].notFirstStrike))
-                            gBattlescriptCurrInstr = BattleScript_82DB592;
+                            gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless;
                         else
-                            gBattlescriptCurrInstr = BattleScript_82DB591;
+                            gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless_PPLoss;
                     }
                     else
                     {
@@ -2174,86 +2184,84 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_IMMUNITY: // 5
+            for (bank = 0; bank < gNoOfAllBanks; bank++)
             {
-                for (bank = 0; bank < gNoOfAllBanks; bank++)
+                switch (gBattleMons[bank].ability)
                 {
-                    switch (gBattleMons[bank].ability)
+                case ABILITY_IMMUNITY:
+                    if (gBattleMons[bank].status1 & (STATUS_POISON | STATUS_TOXIC_POISON | STATUS_TOXIC_COUNTER))
                     {
-                    case ABILITY_IMMUNITY:
-                        if (gBattleMons[bank].status1 & (STATUS_POISON | STATUS_TOXIC_POISON | STATUS_TOXIC_COUNTER))
-                        {
-                            StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
-                            effect = 1;
-                        }
-                        break;
-                    case ABILITY_OWN_TEMPO:
-                        if (gBattleMons[bank].status2 & STATUS2_CONFUSION)
-                        {
-                            StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn);
-                            effect = 2;
-                        }
-                        break;
-                    case ABILITY_LIMBER:
-                        if (gBattleMons[bank].status1 & STATUS_PARALYSIS)
-                        {
-                            StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
-                            effect = 1;
-                        }
-                        break;
-                    case ABILITY_INSOMNIA:
-                    case ABILITY_VITAL_SPIRIT:
-                        if (gBattleMons[bank].status1 & STATUS_SLEEP)
-                        {
-                            gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
-                            StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
-                            effect = 1;
-                        }
-                        break;
-                    case ABILITY_WATER_VEIL:
-                        if (gBattleMons[bank].status1 & STATUS_BURN)
-                        {
-                            StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
-                            effect = 1;
-                        }
+                        StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
+                        effect = 1;
+                    }
+                    break;
+                case ABILITY_OWN_TEMPO:
+                    if (gBattleMons[bank].status2 & STATUS2_CONFUSION)
+                    {
+                        StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn);
+                        effect = 2;
+                    }
+                    break;
+                case ABILITY_LIMBER:
+                    if (gBattleMons[bank].status1 & STATUS_PARALYSIS)
+                    {
+                        StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
+                        effect = 1;
+                    }
+                    break;
+                case ABILITY_INSOMNIA:
+                case ABILITY_VITAL_SPIRIT:
+                    if (gBattleMons[bank].status1 & STATUS_SLEEP)
+                    {
+                        gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
+                        StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
+                        effect = 1;
+                    }
+                    break;
+                case ABILITY_WATER_VEIL:
+                    if (gBattleMons[bank].status1 & STATUS_BURN)
+                    {
+                        StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
+                        effect = 1;
+                    }
+                    break;
+                case ABILITY_MAGMA_ARMOR:
+                    if (gBattleMons[bank].status1 & STATUS_FREEZE)
+                    {
+                        StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
+                        effect = 1;
+                    }
+                    break;
+                case ABILITY_OBLIVIOUS:
+                    if (gBattleMons[bank].status2 & STATUS2_INFATUATION)
+                    {
+                        StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
+                        effect = 3;
+                    }
+                    break;
+                }
+                if (effect)
+                {
+                    switch (effect)
+                    {
+                    case 1: // status cleared
+                        gBattleMons[bank].status1 = 0;
                         break;
-                    case ABILITY_MAGMA_ARMOR:
-                        if (gBattleMons[bank].status1 & STATUS_FREEZE)
-                        {
-                            StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
-                            effect = 1;
-                        }
+                    case 2: // get rid of confusion
+                        gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
                         break;
-                    case ABILITY_OBLIVIOUS:
-                        if (gBattleMons[bank].status2 & STATUS2_INFATUATION)
-                        {
-                            StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
-                            effect = 3;
-                        }
+                    case 3: // get rid of infatuation
+                        gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION);
                         break;
                     }
-                    if (effect)
-                    {
-                        switch (effect)
-                        {
-                        case 1: // status cleared
-                            gBattleMons[bank].status1 = 0;
-                            break;
-                        case 2: // get rid of confusion
-                            gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
-                            break;
-                        case 3: // get rid of infatuation
-                            gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION);
-                            break;
-                        }
 
-                        BattleScriptPushCursor();
-                        gBattlescriptCurrInstr = BattleScript_82DB68C;
-                        gBattleScripting.bank = bank;
-                        gActiveBank = bank;
-                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-                        MarkBufferBankForExecution(gActiveBank);
-                        return effect;
-                    }
+                    BattleScriptPushCursor();
+                    gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus;
+                    gBattleScripting.bank = bank;
+                    gActiveBank = bank;
+                    EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
+                    MarkBufferBankForExecution(gActiveBank);
+                    return effect;
                 }
             }
             break;
@@ -3387,7 +3395,7 @@ u8 IsPokeDisobedient(void)
             } while (gBitTable[gCurrMovePos] & calc);
 
             gRandomMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
-            gBattlescriptCurrInstr = BattleScript_82DB6A5;
+            gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove;
             gBankTarget = GetMoveTarget(gRandomMove, 0);
             gHitMarker |= HITMARKER_x200000;
             return 2;
@@ -3409,7 +3417,7 @@ u8 IsPokeDisobedient(void)
             }
             if (i == gNoOfAllBanks)
             {
-                gBattlescriptCurrInstr = BattleScript_82DB6D9;
+                gBattlescriptCurrInstr = BattleScript_IgnoresAndFallsAsleep;
                 return 1;
             }
         }
-- 
cgit v1.2.3


From 59f64c622bf2ed7a0fcc6d45975813bc55c84141 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 26 Nov 2017 17:26:11 +0100
Subject: name more battlescripts

---
 src/battle_2.c       |  8 ++++----
 src/battle_message.c |  2 +-
 src/battle_util.c    | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index b03e96622..8afca2f10 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -4083,7 +4083,7 @@ static void HandleTurnActionSelectionState(void)
                     && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000)
                     && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
-                    gSelectionBattleScripts[gActiveBank] = BattleScript_82DB9BA;
+                    gSelectionBattleScripts[gActiveBank] = BattleScript_AskIfWantsToForfeitMatch;
                     gBattleCommunication[gActiveBank] = 8;
                     *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                     *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4093,13 +4093,13 @@ static void HandleTurnActionSelectionState(void)
                          && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
                          && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
-                    BattleScriptExecute(BattleScript_82DAAFE);
+                    BattleScriptExecute(BattleScript_PrintCantRunFromTrainer);
                     gBattleCommunication[gActiveBank] = 1;
                 }
-                else if (IsRunningFromBattleImpossible() != 0
+                else if (IsRunningFromBattleImpossible()
                          && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                 {
-                    gSelectionBattleScripts[gActiveBank] = BattleScript_82DAB0B;
+                    gSelectionBattleScripts[gActiveBank] = BattleScript_PrintCantEscapeFromBattle;
                     gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
                     *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                     *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
diff --git a/src/battle_message.c b/src/battle_message.c
index 35b9004ac..0dc468eca 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -964,7 +964,7 @@ const u16 gRestUsedStringIds[] =
     STRINGID_PKMNWENTTOSLEEP, STRINGID_PKMNSLEPTHEALTHY
 };
 
-const u16 gUproarOvetTurnStringIds[] =
+const u16 gUproarOverTurnStringIds[] =
 {
     STRINGID_PKMNMAKINGUPROAR, STRINGID_PKMNCALMEDDOWN
 };
diff --git a/src/battle_util.c b/src/battle_util.c
index 021251b35..904dfc032 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -963,7 +963,7 @@ u8 TurnBasedEffects(void)
                             gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP);
                             gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                            BattleScriptExecute(BattleScript_82DB234);
+                            BattleScriptExecute(BattleScript_MonWokeUpInUproar);
                             gActiveBank = gBankAttacker;
                             EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
                             MarkBufferBankForExecution(gActiveBank);
@@ -994,7 +994,7 @@ u8 TurnBasedEffects(void)
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                             CancelMultiTurnMoves(gActiveBank);
                         }
-                        BattleScriptExecute(BattleScript_82DB2A6);
+                        BattleScriptExecute(BattleScript_PrintUproarOverTurns);
                         effect = 1;
                     }
                 }
@@ -1144,7 +1144,7 @@ bool8 sub_8041364(void)
                 gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank];
                 gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank];
                 gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF;
-                BattleScriptExecute(BattleScript_82DAFE4);
+                BattleScriptExecute(BattleScript_MonTookFutureAttack);
 
                 if (gWishFutureKnock.futureSightCounter[gActiveBank] == 0
                  && gWishFutureKnock.futureSightCounter[gActiveBank ^ BIT_MON] == 0)
@@ -1178,12 +1178,12 @@ bool8 sub_8041364(void)
                 {
                     gStatuses3[gActiveBank] &= ~STATUS3_PERISH_SONG;
                     gBattleMoveDamage = gBattleMons[gActiveBank].hp;
-                    gBattlescriptCurrInstr = BattleScript_82DAF05;
+                    gBattlescriptCurrInstr = BattleScript_PerishSongTakesLife;
                 }
                 else
                 {
                     gDisableStructs[gActiveBank].perishSongTimer1--;
-                    gBattlescriptCurrInstr = BattleScript_82DAF20;
+                    gBattlescriptCurrInstr = BattleScript_PerishSongCountGoesDown;
                 }
                 BattleScriptExecute(gBattlescriptCurrInstr);
                 return TRUE;
-- 
cgit v1.2.3


From d48392e677f3b77b34d4b125b90a74be86b19a2d Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 26 Nov 2017 18:07:00 +0100
Subject: change battle variables names

---
 src/battle_2.c                  | 42 +++++++++---------
 src/battle_ai_script_commands.c | 12 ++---
 src/battle_controllers.c        |  6 +--
 src/battle_script_commands.c    | 98 ++++++++++++++++++++---------------------
 src/battle_util.c               |  6 +--
 5 files changed, 82 insertions(+), 82 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 8afca2f10..eead4d7a9 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -121,11 +121,11 @@ extern u8 gMultiHitCounter;
 extern u8 gBattleMoveFlags;
 extern s32 gBattleMoveDamage;
 extern const u8* gPalaceSelectionBattleScripts[BATTLE_BANKS_COUNT];
-extern u16 gOriginallyLastPrintedMoves[BATTLE_BANKS_COUNT];
-extern u16 gOriginallyLastMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastPrintedMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastMoves[BATTLE_BANKS_COUNT];
 extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
 extern u16 gLastHitByType[BATTLE_BANKS_COUNT];
-extern u16 gLastMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastResultingMoves[BATTLE_BANKS_COUNT];
 extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
 extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
 extern u8 gUnknown_02024284[BATTLE_BANKS_COUNT];
@@ -149,7 +149,7 @@ extern u16 gDynamicBasePower;
 extern u8 gCritMultiplier;
 extern u8 gCurrMovePos;
 extern u8 gUnknown_020241E9;
-extern u16 gOriginallyUsedMove;
+extern u16 gChosenMove;
 
 extern const struct BattleMove gBattleMoves[];
 extern const u16 gUnknown_08C004E0[]; // battle textbox palette
@@ -2743,13 +2743,13 @@ static void BattleStartClearSetData(void)
 
         gDisableStructs[i].isFirstTurn = 2;
         gUnknown_02024284[i] = 0;
-        gOriginallyLastMoves[i] = 0;
+        gLastMoves[i] = 0;
         gLastLandedMoves[i] = 0;
         gLastHitByType[i] = 0;
-        gLastMoves[i] = 0;
+        gLastResultingMoves[i] = 0;
         gLastHitBy[i] = 0xFF;
         gLockedMoves[i] = 0;
-        gOriginallyLastPrintedMoves[i] = 0;
+        gLastPrintedMoves[i] = 0;
         gBattleResources->flags->flags[i] = 0;
         gPalaceSelectionBattleScripts[i] = 0;
     }
@@ -2910,11 +2910,11 @@ void SwitchInClearSetData(void)
     gBattleMoveFlags = 0;
     gDisableStructs[gActiveBank].isFirstTurn = 2;
     gDisableStructs[gActiveBank].truantUnknownBit = disableStructCopy.truantUnknownBit;
-    gOriginallyLastMoves[gActiveBank] = 0;
+    gLastMoves[gActiveBank] = 0;
     gLastLandedMoves[gActiveBank] = 0;
     gLastHitByType[gActiveBank] = 0;
-    gLastMoves[gActiveBank] = 0;
-    gOriginallyLastPrintedMoves[gActiveBank] = 0;
+    gLastResultingMoves[gActiveBank] = 0;
+    gLastPrintedMoves[gActiveBank] = 0;
     gLastHitBy[gActiveBank] = 0xFF;
 
     *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 0) = 0;
@@ -3002,11 +3002,11 @@ void FaintClearSetData(void)
 
     gDisableStructs[gActiveBank].isFirstTurn = 2;
 
-    gOriginallyLastMoves[gActiveBank] = 0;
+    gLastMoves[gActiveBank] = 0;
     gLastLandedMoves[gActiveBank] = 0;
     gLastHitByType[gActiveBank] = 0;
-    gLastMoves[gActiveBank] = 0;
-    gOriginallyLastPrintedMoves[gActiveBank] = 0;
+    gLastResultingMoves[gActiveBank] = 0;
+    gLastPrintedMoves[gActiveBank] = 0;
     gLastHitBy[gActiveBank] = 0xFF;
 
     *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 0) = 0;
@@ -5048,19 +5048,19 @@ static void HandleAction_UseMove(void)
     if (gProtectStructs[gBankAttacker].onlyStruggle)
     {
         gProtectStructs[gBankAttacker].onlyStruggle = 0;
-        gCurrentMove = gOriginallyUsedMove = MOVE_STRUGGLE;
+        gCurrentMove = gChosenMove = MOVE_STRUGGLE;
         gHitMarker |= HITMARKER_NO_PPDEDUCT;
         *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
     }
     else if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE)
     {
-        gCurrentMove = gOriginallyUsedMove = gLockedMoves[gBankAttacker];
+        gCurrentMove = gChosenMove = gLockedMoves[gBankAttacker];
     }
     // encore forces you to use the same move
     else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
              && gDisableStructs[gBankAttacker].encoredMove == gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
     {
-        gCurrentMove = gOriginallyUsedMove = gDisableStructs[gBankAttacker].encoredMove;
+        gCurrentMove = gChosenMove = gDisableStructs[gBankAttacker].encoredMove;
         gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
         *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
@@ -5069,7 +5069,7 @@ static void HandleAction_UseMove(void)
              && gDisableStructs[gBankAttacker].encoredMove != gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
     {
         gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
-        gCurrentMove = gOriginallyUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
         gDisableStructs[gBankAttacker].encoredMove = MOVE_NONE;
         gDisableStructs[gBankAttacker].encoredMovePos = 0;
         gDisableStructs[gBankAttacker].encoreTimer1 = 0;
@@ -5077,12 +5077,12 @@ static void HandleAction_UseMove(void)
     }
     else if (gBattleMons[gBankAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBankAttacker])
     {
-        gCurrentMove = gOriginallyUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
         *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
     else
     {
-        gCurrentMove = gOriginallyUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
     }
 
     if (gBattleMons[gBankAttacker].hp != 0)
@@ -5122,7 +5122,7 @@ static void HandleAction_UseMove(void)
         }
         if (var == 4)
         {
-            if (gBattleMoves[gOriginallyUsedMove].target & MOVE_TARGET_RANDOM)
+            if (gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
             {
                 if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
                 {
@@ -5167,7 +5167,7 @@ static void HandleAction_UseMove(void)
         }
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-             && gBattleMoves[gOriginallyUsedMove].target & MOVE_TARGET_RANDOM)
+             && gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
     {
         if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
         {
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 5fde5669e..97226f5c9 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -58,7 +58,7 @@ extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gCurrentMove;
 extern u8 gBankTarget;
 extern u8 gAbsentBankFlags;
-extern u16 gOriginallyLastMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastMoves[BATTLE_BANKS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
@@ -633,12 +633,12 @@ static void RecordLastUsedMoveByTarget(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == gOriginallyLastMoves[gBankTarget])
+        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == gLastMoves[gBankTarget])
             break;
-        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] != gOriginallyLastMoves[gBankTarget]  // HACK: This redundant condition is a hack to make the asm match.
+        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] != gLastMoves[gBankTarget]  // HACK: This redundant condition is a hack to make the asm match.
          && gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == 0)
         {
-            gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] = gOriginallyLastMoves[gBankTarget];
+            gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] = gLastMoves[gBankTarget];
             break;
         }
     }
@@ -1252,9 +1252,9 @@ static void BattleAICmd_is_most_powerful_move(void)
 static void BattleAICmd_get_last_used_bank_move(void)
 {
     if (gAIScriptPtr[1] == AI_USER)
-        AI_THINKING_STRUCT->funcResult = gOriginallyLastMoves[sBank_AI];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[sBank_AI];
     else
-        AI_THINKING_STRUCT->funcResult = gOriginallyLastMoves[gBankTarget];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[gBankTarget];
 
     gAIScriptPtr += 2;
 }
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index b3fb91b42..2d373e876 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -38,7 +38,7 @@ extern u8 gEffectBank;
 extern u16 gBattleWeather;
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gCurrentMove;
-extern u16 gOriginallyUsedMove;
+extern u16 gChosenMove;
 extern u16 gLastUsedItem;
 extern u8 gBattleOutcome;
 extern u8 gLastUsedAbility;
@@ -1120,7 +1120,7 @@ void EmitPrintString(u8 bufferId, u16 stringID)
 
     stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]);
     stringInfo->currentMove = gCurrentMove;
-    stringInfo->originallyUsedMove = gOriginallyUsedMove;
+    stringInfo->originallyUsedMove = gChosenMove;
     stringInfo->lastItem = gLastUsedItem;
     stringInfo->lastAbility = gLastUsedAbility;
     stringInfo->scrActive = gBattleScripting.bank;
@@ -1152,7 +1152,7 @@ void EmitPrintSelectionString(u8 bufferId, u16 stringID)
 
     stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]);
     stringInfo->currentMove = gCurrentMove;
-    stringInfo->originallyUsedMove = gOriginallyUsedMove;
+    stringInfo->originallyUsedMove = gChosenMove;
     stringInfo->lastItem = gLastUsedItem;
     stringInfo->lastAbility = gLastUsedAbility;
     stringInfo->scrActive = gBattleScripting.bank;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 0e6209ed8..59bb58868 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -76,7 +76,7 @@ extern u8 gBattleMoveFlags;
 extern u8 gBattleCommunication[];
 extern u16 gLastLandedMoves[4];
 extern u16 gLastHitByType[4];
-extern u16 gLastMoves[4];
+extern u16 gLastResultingMoves[4];
 extern u8 gLastHitBy[4];
 extern u8 gStringBank;
 extern u16 gDynamicBasePower;
@@ -99,9 +99,9 @@ extern u8 gCurrentTurnActionNumber;
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
 extern u16 gPartnerTrainerId;
-extern u16 gOriginallyUsedMove;
-extern u16 gOriginallyLastPrintedMoves[BATTLE_BANKS_COUNT];
-extern u16 gOriginallyLastMoves[BATTLE_BANKS_COUNT];
+extern u16 gChosenMove;
+extern u16 gLastPrintedMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastMoves[BATTLE_BANKS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u8 gUnknown_020241E9;
@@ -4860,10 +4860,10 @@ static void atk49_moveend(void)
 
     effect = FALSE;
 
-    if (gOriginallyUsedMove == 0xFFFF)
+    if (gChosenMove == 0xFFFF)
         originallyUsedMove = 0;
     else
-        originallyUsedMove = gOriginallyUsedMove;
+        originallyUsedMove = gChosenMove;
 
     arg1 = gBattlescriptCurrInstr[1];
     arg2 = gBattlescriptCurrInstr[2];
@@ -4934,14 +4934,14 @@ static void atk49_moveend(void)
             break;
         case 6: // update choice band move
             if (!(gHitMarker & HITMARKER_OBEYS) || holdEffectAtk != HOLD_EFFECT_CHOICE_BAND
-                || gOriginallyUsedMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF))
+                || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF))
                     goto LOOP;
-            if (gOriginallyUsedMove == MOVE_BATON_PASS && !(gBattleMoveFlags & MOVESTATUS_FAILED))
+            if (gChosenMove == MOVE_BATON_PASS && !(gBattleMoveFlags & MOVESTATUS_FAILED))
             {
                 gBattleScripting.atk49_state++;
                 break;
             }
-            *choicedMoveAtk = gOriginallyUsedMove;
+            *choicedMoveAtk = gChosenMove;
             LOOP:
             {
                 for (i = 0; i < 4; i++)
@@ -5036,7 +5036,7 @@ static void atk49_moveend(void)
             }
             if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED)
             {
-                gOriginallyLastPrintedMoves[gBankAttacker] = gOriginallyUsedMove;
+                gLastPrintedMoves[gBankAttacker] = gChosenMove;
             }
             if (!(gAbsentBankFlags & gBitTable[gBankAttacker])
                 && !(gBattleStruct->field_91 & gBitTable[gBankAttacker])
@@ -5044,13 +5044,13 @@ static void atk49_moveend(void)
             {
                 if (gHitMarker & HITMARKER_OBEYS)
                 {
-                    gOriginallyLastMoves[gBankAttacker] = gOriginallyUsedMove;
-                    gLastMoves[gBankAttacker] = gCurrentMove;
+                    gLastMoves[gBankAttacker] = gChosenMove;
+                    gLastResultingMoves[gBankAttacker] = gCurrentMove;
                 }
                 else
                 {
-                    gOriginallyLastMoves[gBankAttacker] = 0xFFFF;
                     gLastMoves[gBankAttacker] = 0xFFFF;
+                    gLastResultingMoves[gBankAttacker] = 0xFFFF;
                 }
 
                 if (!(gHitMarker & HITMARKER_FAINTED(gBankTarget)))
@@ -5058,9 +5058,9 @@ static void atk49_moveend(void)
 
                 if (gHitMarker & HITMARKER_OBEYS && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
                 {
-                    if (gOriginallyUsedMove == 0xFFFF)
+                    if (gChosenMove == 0xFFFF)
                     {
-                        gLastLandedMoves[gBankTarget] = gOriginallyUsedMove;
+                        gLastLandedMoves[gBankTarget] = gChosenMove;
                     }
                     else
                     {
@@ -5083,16 +5083,16 @@ static void atk49_moveend(void)
             {
                 u8 target, attacker;
 
-                *(gBattleStruct->mirrorMoves + gBankTarget * 2 + 0) = gOriginallyUsedMove;
-                *(gBattleStruct->mirrorMoves + gBankTarget * 2 + 1) = gOriginallyUsedMove >> 8;
+                *(gBattleStruct->mirrorMoves + gBankTarget * 2 + 0) = gChosenMove;
+                *(gBattleStruct->mirrorMoves + gBankTarget * 2 + 1) = gChosenMove >> 8;
 
                 target = gBankTarget;
                 attacker = gBankAttacker;
-                *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = gOriginallyUsedMove;
+                *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = gChosenMove;
 
                 target = gBankTarget;
                 attacker = gBankAttacker;
-                *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = gOriginallyUsedMove >> 8;
+                *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = gChosenMove >> 8;
             }
             gBattleScripting.atk49_state++;
             break;
@@ -6386,7 +6386,7 @@ static void atk63_jumptorandomattack(void)
     if (gBattlescriptCurrInstr[1] != 0)
         gCurrentMove = gRandomMove;
     else
-        gOriginallyUsedMove = gCurrentMove = gRandomMove;
+        gChosenMove = gCurrentMove = gRandomMove;
 
     gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
 }
@@ -7131,7 +7131,7 @@ static void atk76_various(void)
 static void atk77_setprotectlike(void) // protect and endure
 {
     bool8 notLastTurn = TRUE;
-    u16 lastMove = gLastMoves[gBankAttacker];
+    u16 lastMove = gLastResultingMoves[gBankAttacker];
 
     if (lastMove != MOVE_PROTECT && lastMove != MOVE_DETECT && lastMove != MOVE_ENDURE)
         gDisableStructs[gBankAttacker].protectUses = 0;
@@ -8352,7 +8352,7 @@ static void atk9A_setfocusenergy(void)
 
 static void atk9B_transformdataexecution(void)
 {
-    gOriginallyUsedMove = 0xFFFF;
+    gChosenMove = 0xFFFF;
     gBattlescriptCurrInstr++;
     if (gBattleMons[gBankTarget].status2 & STATUS2_TRANSFORMED
         || gStatuses3[gBankTarget] & STATUS3_SEMI_INVULNERABLE)
@@ -8432,12 +8432,12 @@ static bool8 IsMoveUncopyableByMimic(u16 move)
 
 static void atk9D_mimicattackcopy(void)
 {
-    gOriginallyUsedMove = 0xFFFF;
+    gChosenMove = 0xFFFF;
 
-    if (IsMoveUncopyableByMimic(gOriginallyLastMoves[gBankTarget])
+    if (IsMoveUncopyableByMimic(gLastMoves[gBankTarget])
         || gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED
-        || gOriginallyLastMoves[gBankTarget] == 0
-        || gOriginallyLastMoves[gBankTarget] == 0xFFFF)
+        || gLastMoves[gBankTarget] == 0
+        || gLastMoves[gBankTarget] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8447,20 +8447,20 @@ static void atk9D_mimicattackcopy(void)
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMons[gBankAttacker].moves[i] == gOriginallyLastMoves[gBankTarget])
+            if (gBattleMons[gBankAttacker].moves[i] == gLastMoves[gBankTarget])
                 break;
         }
 
         if (i == 4)
         {
-            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gOriginallyLastMoves[gBankTarget];
-            if (gBattleMoves[gOriginallyLastMoves[gBankTarget]].pp < 5)
-                gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gOriginallyLastMoves[gBankTarget]].pp;
+            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gLastMoves[gBankTarget];
+            if (gBattleMoves[gLastMoves[gBankTarget]].pp < 5)
+                gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBankTarget]].pp;
             else
                 gBattleMons[gBankAttacker].pp[gCurrMovePos] = 5;
 
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gOriginallyLastMoves[gBankTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBankTarget])
 
             gDisableStructs[gBankAttacker].unk18_b |= gBitTable[gCurrMovePos];
             gBattlescriptCurrInstr += 5;
@@ -8575,7 +8575,7 @@ static void atkA3_disablelastusedattack(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBankTarget].moves[i] == gOriginallyLastMoves[gBankTarget])
+        if (gBattleMons[gBankTarget].moves[i] == gLastMoves[gBankTarget])
             break;
     }
     if (gDisableStructs[gBankTarget].disabledMove == 0
@@ -8600,13 +8600,13 @@ static void atkA4_trysetencore(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBankTarget].moves[i] == gOriginallyLastMoves[gBankTarget])
+        if (gBattleMons[gBankTarget].moves[i] == gLastMoves[gBankTarget])
             break;
     }
 
-    if (gOriginallyLastMoves[gBankTarget] == MOVE_STRUGGLE
-        || gOriginallyLastMoves[gBankTarget] == MOVE_ENCORE
-        || gOriginallyLastMoves[gBankTarget] == MOVE_MIRROR_MOVE)
+    if (gLastMoves[gBankTarget] == MOVE_STRUGGLE
+        || gLastMoves[gBankTarget] == MOVE_ENCORE
+        || gLastMoves[gBankTarget] == MOVE_MIRROR_MOVE)
     {
         i = 4;
     }
@@ -8726,13 +8726,13 @@ static void atkA7_setalwayshitflag(void)
 
 static void atkA8_copymovepermanently(void) // sketch
 {
-    gOriginallyUsedMove = 0xFFFF;
+    gChosenMove = 0xFFFF;
 
     if (!(gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED)
-        && gOriginallyLastPrintedMoves[gBankTarget] != MOVE_STRUGGLE
-        && gOriginallyLastPrintedMoves[gBankTarget] != 0
-        && gOriginallyLastPrintedMoves[gBankTarget] != 0xFFFF
-        && gOriginallyLastPrintedMoves[gBankTarget] != MOVE_SKETCH)
+        && gLastPrintedMoves[gBankTarget] != MOVE_STRUGGLE
+        && gLastPrintedMoves[gBankTarget] != 0
+        && gLastPrintedMoves[gBankTarget] != 0xFFFF
+        && gLastPrintedMoves[gBankTarget] != MOVE_SKETCH)
     {
         s32 i;
 
@@ -8740,7 +8740,7 @@ static void atkA8_copymovepermanently(void) // sketch
         {
             if (gBattleMons[gBankAttacker].moves[i] == MOVE_SKETCH)
                 continue;
-            if (gBattleMons[gBankAttacker].moves[i] == gOriginallyLastPrintedMoves[gBankTarget])
+            if (gBattleMons[gBankAttacker].moves[i] == gLastPrintedMoves[gBankTarget])
                 break;
         }
 
@@ -8752,8 +8752,8 @@ static void atkA8_copymovepermanently(void) // sketch
         {
             struct MovePpInfo movePpData;
 
-            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gOriginallyLastPrintedMoves[gBankTarget];
-            gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gOriginallyLastPrintedMoves[gBankTarget]].pp;
+            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBankTarget];
+            gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBankTarget]].pp;
             gActiveBank = gBankAttacker;
 
             for (i = 0; i < 4; i++)
@@ -8766,7 +8766,7 @@ static void atkA8_copymovepermanently(void) // sketch
             EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct MovePpInfo), &movePpData);
             MarkBufferBankForExecution(gActiveBank);
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gOriginallyLastPrintedMoves[gBankTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBankTarget])
 
             gBattlescriptCurrInstr += 5;
         }
@@ -8899,14 +8899,14 @@ static void atkAC_remaininghptopower(void)
 
 static void atkAD_tryspiteppreduce(void)
 {
-    if (gOriginallyLastMoves[gBankTarget] != 0
-        && gOriginallyLastMoves[gBankTarget] != 0xFFFF)
+    if (gLastMoves[gBankTarget] != 0
+        && gLastMoves[gBankTarget] != 0xFFFF)
     {
         s32 i;
 
         for (i = 0; i < 4; i++)
         {
-            if (gOriginallyLastMoves[gBankTarget] == gBattleMons[gBankTarget].moves[i])
+            if (gLastMoves[gBankTarget] == gBattleMons[gBankTarget].moves[i])
                 break;
         }
 
@@ -8916,7 +8916,7 @@ static void atkAD_tryspiteppreduce(void)
             if (gBattleMons[gBankTarget].pp[i] < ppToDeduct)
                 ppToDeduct = gBattleMons[gBankTarget].pp[i];
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gOriginallyLastMoves[gBankTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBankTarget])
 
             ConvertIntToDecimalStringN(gBattleTextBuff2, ppToDeduct, 0, 1);
 
diff --git a/src/battle_util.c b/src/battle_util.c
index 904dfc032..94c51c0f8 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -43,7 +43,7 @@ extern s32 gBattleMoveDamage;
 extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern u32 gBattleTypeFlags;
-extern u16 gOriginallyLastMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastMoves[BATTLE_BANKS_COUNT];
 extern u32 gHitMarker;
 extern u8 gEffectBank;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
@@ -373,7 +373,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         }
     }
 
-    if (move == gOriginallyLastMoves[gActiveBank] && move != MOVE_STRUGGLE && (gBattleMons[gActiveBank].status2 & STATUS2_TORMENT))
+    if (move == gLastMoves[gActiveBank] && move != MOVE_STRUGGLE && (gBattleMons[gActiveBank].status2 & STATUS2_TORMENT))
     {
         CancelMultiTurnMoves(gActiveBank);
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
@@ -477,7 +477,7 @@ u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check)
             unusableMoves |= gBitTable[i];
         if (gBattleMons[bank].moves[i] == gDisableStructs[bank].disabledMove && check & MOVE_LIMITATION_DISABLED)
             unusableMoves |= gBitTable[i];
-        if (gBattleMons[bank].moves[i] == gOriginallyLastMoves[bank] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[bank].status2 & STATUS2_TORMENT)
+        if (gBattleMons[bank].moves[i] == gLastMoves[bank] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[bank].status2 & STATUS2_TORMENT)
             unusableMoves |= gBitTable[i];
         if (gDisableStructs[bank].tauntTimer1 && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[bank].moves[i]].power == 0)
             unusableMoves |= gBitTable[i];
-- 
cgit v1.2.3


From 77a6c30bd4511063e5a3e0a512583836e92c8293 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 26 Nov 2017 21:04:00 +0100
Subject: make various macros

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

(limited to 'src')

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 59bb58868..d9b35c053 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -5992,8 +5992,8 @@ static void atk58_returntoball(void)
 
 static void atk59_handlelearnnewmove(void)
 {
-    const u8* jumpPtr1 = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
-    const u8* jumpPtr2 = BSScriptReadPtr(gBattlescriptCurrInstr + 5);
+    const u8 *jumpPtr1 = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
+    const u8 *jumpPtr2 = BSScriptReadPtr(gBattlescriptCurrInstr + 5);
 
     u16 ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterId], gBattlescriptCurrInstr[9]);
     while (ret == 0xFFFE)
-- 
cgit v1.2.3


From 237261e193d75addf47fc0736b2d9ed10c8d3195 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 27 Nov 2017 20:03:41 +0100
Subject: berry blender review changes

---
 src/battle_message.c |  2 +-
 src/battle_util.c    | 10 +++---
 src/berry_blender.c  | 94 ++++++++++++++++++++++++++--------------------------
 src/pokemon_3.c      |  4 +--
 4 files changed, 55 insertions(+), 55 deletions(-)

(limited to 'src')

diff --git a/src/battle_message.c b/src/battle_message.c
index acdb18699..65ff19741 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -2118,7 +2118,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
             StringGetEnd10(dst);
             srcID += 3;
             break;
-        case B_BUFF_NEGATIVE_FLAVOUR: // flavour table
+        case B_BUFF_NEGATIVE_FLAVOR: // flavor table
             StringAppend(dst, gPokeblockWasTooXStringTable[src[srcID + 1]]);
             srcID += 2;
             break;
diff --git a/src/battle_util.c b/src/battle_util.c
index ed3bdef98..07e6ff654 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2844,7 +2844,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
-                    if (GetFlavourRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SPICY) < 0)
+                    if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SPICY) < 0)
                         BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
                         BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
@@ -2864,7 +2864,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
-                    if (GetFlavourRelationByPersonality(gBattleMons[bank].personality, FLAVOR_DRY) < 0)
+                    if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_DRY) < 0)
                         BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
                         BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
@@ -2884,7 +2884,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
-                    if (GetFlavourRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SWEET) < 0)
+                    if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SWEET) < 0)
                         BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
                         BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
@@ -2904,7 +2904,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
-                    if (GetFlavourRelationByPersonality(gBattleMons[bank].personality, FLAVOR_BITTER) < 0)
+                    if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_BITTER) < 0)
                         BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
                         BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
@@ -2924,7 +2924,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
                         gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
                     gBattleMoveDamage *= -1;
-                    if (GetFlavourRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SOUR) < 0)
+                    if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SOUR) < 0)
                         BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
                         BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 869f8b834..aa333ebaf 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -48,7 +48,7 @@ struct BlenderBerry
 {
     u16 itemId;
     u8 name[BERRY_NAME_COUNT];
-    u8 flavours[FLAVOUR_COUNT];
+    u8 flavors[FLAVOR_COUNT];
     u8 smoothness;
 };
 
@@ -67,7 +67,7 @@ struct BlenderGameBlock
 struct TvBlenderStruct
 {
     u8 name[11];
-    u8 pokeblockFlavour;
+    u8 pokeblockFlavor;
     u8 pokeblockColor;
     u8 pokeblockSheen;
 };
@@ -1046,11 +1046,11 @@ static void Blender_CopyBerryData(struct BlenderBerry* berry, u16 itemId)
 
     berry->itemId = itemId;
     StringCopy(berry->name, berryInfo->name);
-    berry->flavours[FLAVOUR_SPICY] = berryInfo->spicy;
-    berry->flavours[FLAVOUR_DRY] = berryInfo->dry;
-    berry->flavours[FLAVOUR_SWEET] = berryInfo->sweet;
-    berry->flavours[FLAVOUR_BITTER] = berryInfo->bitter;
-    berry->flavours[FLAVOUR_SOUR] = berryInfo->sour;
+    berry->flavors[FLAVOR_SPICY] = berryInfo->spicy;
+    berry->flavors[FLAVOR_DRY] = berryInfo->dry;
+    berry->flavors[FLAVOR_SWEET] = berryInfo->sweet;
+    berry->flavors[FLAVOR_BITTER] = berryInfo->bitter;
+    berry->flavors[FLAVOR_SOUR] = berryInfo->sour;
     berry->smoothness = berryInfo->smoothness;
 }
 
@@ -1260,11 +1260,11 @@ static void sub_8080018(void)
         SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
         sBerryBlenderData->arrowPos += 0x200;
         sBerryBlenderData->field_11A += 4;
-        if (sBerryBlenderData->field_11A > 255)
+        if (sBerryBlenderData->field_11A > 0xFF)
         {
             SetGpuRegBits(REG_OFFSET_BG2CNT, 2);
             sBerryBlenderData->mainState++;
-            sBerryBlenderData->field_11A = 256;
+            sBerryBlenderData->field_11A = 0x100;
             sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
             sBerryBlenderData->framesToWait = 0;
             PlaySE(SE_TRACK_DOOR);
@@ -1349,11 +1349,11 @@ static void sub_8080588(void)
 
 static u8 sub_8080624(u16 arrowPos, u8 playerId)
 {
-    u32 var1 = (arrowPos / 256) + 24;
+    u32 var1 = (arrowPos / 0x100) + 0x18;
     u8 arrID = sBerryBlenderData->field_96[playerId];
     u32 var2 = sUnknown_083399E7[arrID];
 
-    if (var1 >= var2 && var1 < var2 + 48)
+    if (var1 >= var2 && var1 < var2 + 0x30)
     {
         if (var1 >= var2 + 20 && var1 < var2 + 28)
             return 2;
@@ -1373,9 +1373,9 @@ static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum,
 
     if (playerBerryItemId == ITEM_ENIGMA_BERRY)
     {
-        for (i = 0; i < FLAVOUR_COUNT; i++)
+        for (i = 0; i < FLAVOR_COUNT; i++)
         {
-            if (playerBerry->flavours[opponentSetId] > playerBerry->flavours[i])
+            if (playerBerry->flavors[opponentSetId] > playerBerry->flavors[i])
                 opponentSetId = i;
         }
         opponentSetId += 5;
@@ -1548,10 +1548,10 @@ static void sub_80808D4(void)
         SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
         sBerryBlenderData->arrowPos += 0x200;
         sBerryBlenderData->field_11A += 4;
-        if (sBerryBlenderData->field_11A > 255)
+        if (sBerryBlenderData->field_11A > 0xFF)
         {
             sBerryBlenderData->mainState++;
-            sBerryBlenderData->field_11A = 256;
+            sBerryBlenderData->field_11A = 0x100;
             sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
             SetGpuRegBits(REG_OFFSET_BG2CNT, 2);
             sBerryBlenderData->framesToWait = 0;
@@ -1582,7 +1582,7 @@ static void sub_80808D4(void)
         break;
     case 21:
         sub_8080DF8();
-        sBerryBlenderData->field_4C = 128;
+        sBerryBlenderData->field_4C = 0x80;
         sBerryBlenderData->gameFrameTime = 0;
         sBerryBlenderData->field_123 = 0;
         sBerryBlenderData->field_72 = 0;
@@ -1853,7 +1853,7 @@ static void sub_8081370(u16 a0)
     {
     case 0x4523:
         if (sBerryBlenderData->field_4C < 1500)
-            sBerryBlenderData->field_4C += (384 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
+            sBerryBlenderData->field_4C += (0x180 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
         else
         {
             sBerryBlenderData->field_4C += (128 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
@@ -1863,12 +1863,12 @@ static void sub_8081370(u16 a0)
         break;
     case 0x5432:
         if (sBerryBlenderData->field_4C < 1500)
-            sBerryBlenderData->field_4C += (256 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
+            sBerryBlenderData->field_4C += (0x100 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
         break;
     case 0x2345:
-        sBerryBlenderData->field_4C -= (256 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
-        if (sBerryBlenderData->field_4C < 128)
-            sBerryBlenderData->field_4C = 128;
+        sBerryBlenderData->field_4C -= (0x100 / sUnknown_08339CC3[sBerryBlenderData->playersNo]);
+        if (sBerryBlenderData->field_4C < 0x80)
+            sBerryBlenderData->field_4C = 0x80;
         break;
     }
 }
@@ -1940,7 +1940,7 @@ static void sub_80814F4(void)
                 if (sBerryBlenderData->field_4C > 1500)
                     m4aMPlayTempoControl(&gMPlay_BGM, ((sBerryBlenderData->field_4C - 750) / 20) + 256);
                 else
-                    m4aMPlayTempoControl(&gMPlay_BGM, 256);
+                    m4aMPlayTempoControl(&gMPlay_BGM, 0x100);
             }
         }
     }
@@ -2039,11 +2039,11 @@ static bool8 sub_8081964(struct BlenderBerry* berries, u8 index1, u8 index2)
 {
     if (berries[index1].itemId != berries[index2].itemId
      || (StringCompare(berries[index1].name, berries[index2].name) == 0
-      && (berries[index1].flavours[FLAVOUR_SPICY] == berries[index2].flavours[FLAVOUR_SPICY]
-       && berries[index1].flavours[FLAVOUR_DRY] == berries[index2].flavours[FLAVOUR_DRY]
-       && berries[index1].flavours[FLAVOUR_SWEET] == berries[index2].flavours[FLAVOUR_SWEET]
-       && berries[index1].flavours[FLAVOUR_BITTER] == berries[index2].flavours[FLAVOUR_BITTER]
-       && berries[index1].flavours[FLAVOUR_SOUR] == berries[index2].flavours[FLAVOUR_SOUR]
+      && (berries[index1].flavors[FLAVOR_SPICY] == berries[index2].flavors[FLAVOR_SPICY]
+       && berries[index1].flavors[FLAVOR_DRY] == berries[index2].flavors[FLAVOR_DRY]
+       && berries[index1].flavors[FLAVOR_SWEET] == berries[index2].flavors[FLAVOR_SWEET]
+       && berries[index1].flavors[FLAVOR_BITTER] == berries[index2].flavors[FLAVOR_BITTER]
+       && berries[index1].flavors[FLAVOR_SOUR] == berries[index2].flavors[FLAVOR_SOUR]
        && berries[index1].smoothness == berries[index2].smoothness)))
         return TRUE;
     else
@@ -2160,7 +2160,7 @@ static s16 sub_8081BD4(void)
     return sUnknown_03000E06;
 }
 
-static void Blender_CalculatePokeblock(struct BlenderBerry *berries, struct Pokeblock *pokeblock, u8 playersNo, u8 *flavours, u16 maxRPM)
+static void Blender_CalculatePokeblock(struct BlenderBerry *berries, struct Pokeblock *pokeblock, u8 playersNo, u8 *flavors, u16 maxRPM)
 {
     s32 i, j;
     s32 multiuseVar, var2;
@@ -2172,7 +2172,7 @@ static void Blender_CalculatePokeblock(struct BlenderBerry *berries, struct Poke
     for (i = 0; i < playersNo; i++)
     {
         for (j = 0; j < 6; j++)
-            sUnknown_03000DE8[j] += berries[i].flavours[j];
+            sUnknown_03000DE8[j] += berries[i].flavors[j];
     }
 
     multiuseVar = sUnknown_03000DE8[0];
@@ -2259,13 +2259,13 @@ static void Blender_CalculatePokeblock(struct BlenderBerry *berries, struct Poke
 
     for (i = 0; i < 6; i++)
     {
-        flavours[i] = sUnknown_03000DE8[i];
+        flavors[i] = sUnknown_03000DE8[i];
     }
 }
 
-static void BlenderDebug_CalculatePokeblock(struct BlenderBerry* berries, struct Pokeblock* pokeblock, u8 playersNo, u8* flavours, u16 a4)
+static void BlenderDebug_CalculatePokeblock(struct BlenderBerry* berries, struct Pokeblock* pokeblock, u8 playersNo, u8* flavors, u16 a4)
 {
-    Blender_CalculatePokeblock(berries, pokeblock, playersNo, flavours, a4);
+    Blender_CalculatePokeblock(berries, pokeblock, playersNo, flavors, a4);
 }
 
 static void sub_8081E20(void)
@@ -2849,10 +2849,10 @@ static void sub_8082CB4(struct BgAffineSrcData *dest)
 {
     struct BgAffineSrcData affineSrc;
 
-    affineSrc.texX = 30720;
-    affineSrc.texY = 20480;
-    affineSrc.scrX = 120 - sBerryBlenderData->bg_X;
-    affineSrc.scrY = 80 - sBerryBlenderData->bg_Y;
+    affineSrc.texX = 0x7800;
+    affineSrc.texY = 0x5000;
+    affineSrc.scrX = 0x78 - sBerryBlenderData->bg_X;
+    affineSrc.scrY = 0x50 - sBerryBlenderData->bg_Y;
     affineSrc.sx = sBerryBlenderData->field_11A;
     affineSrc.sy = sBerryBlenderData->field_11A;
     affineSrc.alpha = sBerryBlenderData->arrowPos;
@@ -3185,7 +3185,7 @@ static bool8 Blender_PrintBlendingResults(void)
     s32 xPos, yPos;
 
     struct Pokeblock pokeblock;
-    u8 flavours[6];
+    u8 flavors[6];
     u8 text[40];
     u16 berryIds[4]; // unused
 
@@ -3292,7 +3292,7 @@ static bool8 Blender_PrintBlendingResults(void)
 
         sub_8081E20();
 
-        Blender_CalculatePokeblock(sBerryBlenderData->blendedBerries, &pokeblock, sBerryBlenderData->playersNo, flavours, sBerryBlenderData->max_RPM);
+        Blender_CalculatePokeblock(sBerryBlenderData->blendedBerries, &pokeblock, sBerryBlenderData->playersNo, flavors, sBerryBlenderData->max_RPM);
         Blender_PrintMadePokeblockString(&pokeblock, sBerryBlenderData->stringVar);
         TryAddContestLinkTvShow(&pokeblock, &sBerryBlenderData->tvBlender);
 
@@ -3320,18 +3320,18 @@ static bool8 Blender_PrintBlendingResults(void)
 static void Blender_PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst)
 {
     u8 text[12];
-    u8 flavourLvl, feel;
+    u8 flavorLvl, feel;
 
     dst[0] = EOS;
     StringCopy(dst, gPokeblockNames[pokeblock->color]);
     StringAppend(dst, sText_WasMade);
     StringAppend(dst, sText_NewLine);
 
-    flavourLvl = GetHighestPokeblocksFlavourLevel(pokeblock);
+    flavorLvl = GetHighestPokeblocksFlavorLevel(pokeblock);
     feel = GetPokeblocksFeel(pokeblock);
 
     StringAppend(dst, sText_TheLevelIs);
-    ConvertIntToDecimalStringN(text, flavourLvl, STR_CONV_MODE_LEFT_ALIGN, 3);
+    ConvertIntToDecimalStringN(text, flavorLvl, STR_CONV_MODE_LEFT_ALIGN, 3);
     StringAppend(dst, text);
 
     StringAppend(dst, sText_TheFeelIs);
@@ -3532,8 +3532,8 @@ static void sub_8083F3C(u8 taskId)
 
 static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlenderStruct *tvBlender)
 {
-    u8 flavourLevel = GetHighestPokeblocksFlavourLevel(pokeblock);
-    u16 sheen = (flavourLevel * 10) / GetPokeblocksFeel(pokeblock);
+    u8 flavorLevel = GetHighestPokeblocksFlavorLevel(pokeblock);
+    u16 sheen = (flavorLevel * 10) / GetPokeblocksFeel(pokeblock);
 
     tvBlender->pokeblockSheen = sheen;
     tvBlender->pokeblockColor = pokeblock->color;
@@ -3544,8 +3544,8 @@ static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlen
         if (sBerryBlenderData->field_1A4 == 0 && sheen > 20)
         {
             StringCopy(tvBlender->name, gLinkPlayers[sBerryBlenderData->playerPlaces[sBerryBlenderData->playersNo - 1]].name);
-            tvBlender->pokeblockFlavour = GetPokeblocksFlavour(pokeblock);
-            if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavour,
+            tvBlender->pokeblockFlavor = GetPokeblocksFlavor(pokeblock);
+            if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavor,
                                             tvBlender->pokeblockColor, tvBlender->pokeblockSheen,
                                             gLinkPlayers[sBerryBlenderData->playerPlaces[sBerryBlenderData->playersNo - 1]].language))
             {
@@ -3557,8 +3557,8 @@ static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlen
         else if (sBerryBlenderData->field_1A4 == sBerryBlenderData->playersNo - 1 && sheen <= 20)
         {
             StringCopy(tvBlender->name, gLinkPlayers[sBerryBlenderData->playerPlaces[0]].name);
-            tvBlender->pokeblockFlavour = GetPokeblocksFlavour(pokeblock);
-            if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavour,
+            tvBlender->pokeblockFlavor = GetPokeblocksFlavor(pokeblock);
+            if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavor,
                                             tvBlender->pokeblockColor, tvBlender->pokeblockSheen,
                                             gLinkPlayers[sBerryBlenderData->playerPlaces[0]].language))
             {
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 01dfc954a..1fafee810 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1297,13 +1297,13 @@ bool8 IsPokeSpriteNotFlipped(u16 species)
     return gBaseStats[species].noFlip;
 }
 
-s8 GetMonFlavourRelation(struct Pokemon *mon, u8 a2)
+s8 GetMonFlavorRelation(struct Pokemon *mon, u8 a2)
 {
     u8 nature = GetNature(mon);
     return gPokeblockFlavorCompatibilityTable[nature * 5 + a2];
 }
 
-s8 GetFlavourRelationByPersonality(u32 personality, u8 a2)
+s8 GetFlavorRelationByPersonality(u32 personality, u8 a2)
 {
     u8 nature = GetNatureFromPersonality(personality);
     return gPokeblockFlavorCompatibilityTable[nature * 5 + a2];
-- 
cgit v1.2.3


From e6bcfee6680bd29c15ef5084665a05e5a2ae5a4e Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 27 Nov 2017 15:20:10 -0500
Subject: Encyprtion

---
 src/item.c      | 10 +++++-----
 src/load_save.c | 32 ++++++++++++++++----------------
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/item.c b/src/item.c
index 32347623e..5cf9edf6c 100644
--- a/src/item.c
+++ b/src/item.c
@@ -5,7 +5,7 @@
 #include "text.h"
 #include "event_data.h"
 
-extern void ApplyNewEncyprtionKeyToHword(u16* hword, u32 newKey);
+extern void ApplyNewEncryptionKeyToHword(u16* hword, u32 newKey);
 extern bool8 InBattlePyramid(void);
 
 extern const u8 gText_PokeBalls[];
@@ -45,19 +45,19 @@ void SetBagItemId(u16* slot, u16 newItemId)
     *slot = newItemId;
 }
 
-void ApplyNewEncyprtionKeyToBagItems(u32 newKey)
+void ApplyNewEncryptionKeyToBagItems(u32 newKey)
 {
     u32 pocket, item;
     for (pocket = 0; pocket < 5; pocket++)
     {
         for (item = 0; item < gBagPockets[pocket].capacity; item++)
-            ApplyNewEncyprtionKeyToHword(&(gBagPockets[pocket].itemSlots[item].quantity), newKey);
+            ApplyNewEncryptionKeyToHword(&(gBagPockets[pocket].itemSlots[item].quantity), newKey);
     }
 }
 
-void ApplyNewEncyprtionKeyToBagItems_(u32 newKey) // really GF?
+void ApplyNewEncryptionKeyToBagItems_(u32 newKey) // really GF?
 {
-    ApplyNewEncyprtionKeyToBagItems(newKey);
+    ApplyNewEncryptionKeyToBagItems(newKey);
 }
 
 // TODO: move those max values to defines
diff --git a/src/load_save.c b/src/load_save.c
index 5eb160e5a..1d78bda50 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -10,10 +10,10 @@ extern void* gUnknown_0203CF5C;
 extern bool16 IdentifyFlash(void);
 extern void SetBagItemsPointers(void);
 extern void SetDecorationInventoriesPointers(void);
-extern void ApplyNewEncyprtionKeyToGameStats(u32 key);
-extern void ApplyNewEncyprtionKeyToBagItems(u32 newKey);
-extern void ApplyNewEncyprtionKeyToBagItems_(u32 key);
-extern void ApplyNewEncyprtionKeyToBerryPowder(u32 key);
+extern void ApplyNewEncryptionKeyToGameStats(u32 key);
+extern void ApplyNewEncryptionKeyToBagItems(u32 newKey);
+extern void ApplyNewEncryptionKeyToBagItems_(u32 key);
+extern void ApplyNewEncryptionKeyToBerryPowder(u32 key);
 extern void sub_8084FAC(int unused);
 
 // this is probably wrong or misleading due to it being used in ResetHeap...
@@ -43,7 +43,7 @@ EWRAM_DATA u8 gSaveblock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0};
 EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0};
 EWRAM_DATA u32 gLastEncryptionKey = {0};
 
-void ApplyNewEncyprtionKeyToAllEncryptedData(u32 encryptionKey);
+void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
 
 void CheckForFlashMemory(void)
 {
@@ -150,7 +150,7 @@ void MoveSaveBlocks_ResetHeap(void)
 
     // create a new encryption key
     encryptionKey = (Random() << 0x10) + (Random());
-    ApplyNewEncyprtionKeyToAllEncryptedData(encryptionKey);
+    ApplyNewEncryptionKeyToAllEncryptedData(encryptionKey);
     gSaveBlock2Ptr->encryptionKey = encryptionKey;
 }
 #else
@@ -235,7 +235,7 @@ void MoveSaveBlocks_ResetHeap(void)
     lsrs r0, 16\n\
     adds r4, r0\n\
     adds r0, r4, 0\n\
-    bl ApplyNewEncyprtionKeyToAllEncryptedData\n\
+    bl ApplyNewEncryptionKeyToAllEncryptedData\n\
     ldr r1, =gSaveBlock2Ptr\n\
     ldr r0, [r1]\n\
     adds r0, 0xAC\n\
@@ -389,27 +389,27 @@ void copy_bags_and_unk_data_to_save_blocks(void)
 
     encryptionKeyBackup = gSaveBlock2Ptr->encryptionKey;
     gSaveBlock2Ptr->encryptionKey = gLastEncryptionKey;
-    ApplyNewEncyprtionKeyToBagItems(encryptionKeyBackup);
+    ApplyNewEncryptionKeyToBagItems(encryptionKeyBackup);
     gSaveBlock2Ptr->encryptionKey = encryptionKeyBackup; // updated twice?
 }
 
-void ApplyNewEncyprtionKeyToHword(u16 *hWord, u32 newKey)
+void ApplyNewEncryptionKeyToHword(u16 *hWord, u32 newKey)
 {
     *hWord ^= gSaveBlock2Ptr->encryptionKey;
     *hWord ^= newKey;
 }
 
-void ApplyNewEncyprtionKeyToWord(u32 *word, u32 newKey)
+void ApplyNewEncryptionKeyToWord(u32 *word, u32 newKey)
 {
     *word ^= gSaveBlock2Ptr->encryptionKey;
     *word ^= newKey;
 }
 
-void ApplyNewEncyprtionKeyToAllEncryptedData(u32 encryptionKey)
+void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey)
 {
-    ApplyNewEncyprtionKeyToGameStats(encryptionKey);
-    ApplyNewEncyprtionKeyToBagItems_(encryptionKey);
-    ApplyNewEncyprtionKeyToBerryPowder(encryptionKey);
-    ApplyNewEncyprtionKeyToWord(&gSaveBlock1Ptr->money, encryptionKey);
-    ApplyNewEncyprtionKeyToHword(&gSaveBlock1Ptr->coins, encryptionKey);
+    ApplyNewEncryptionKeyToGameStats(encryptionKey);
+    ApplyNewEncryptionKeyToBagItems_(encryptionKey);
+    ApplyNewEncryptionKeyToBerryPowder(encryptionKey);
+    ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->money, encryptionKey);
+    ApplyNewEncryptionKeyToHword(&gSaveBlock1Ptr->coins, encryptionKey);
 }
-- 
cgit v1.2.3


From 7144b3b7afc60597168fd85d31f333bb3a4b1826 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 27 Nov 2017 21:24:34 +0100
Subject: fix flavour flavor not building, fuccing americans

---
 src/battle_util.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/battle_util.c b/src/battle_util.c
index a24688bde..5c305a4e4 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -20,6 +20,7 @@
 #include "event_data.h"
 #include "calculate_base_damage.h"
 #include "link.h"
+#include "berry.h"
 
 extern const u8* gBattlescriptCurrInstr;
 extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
@@ -2537,15 +2538,6 @@ enum
     ITEM_STATS_CHANGE, // 5
 };
 
-enum
-{
-    FLAVOR_SPICY, // 0
-    FLAVOR_DRY, // 1
-    FLAVOR_SWEET, // 2
-    FLAVOR_BITTER, // 3
-    FLAVOR_SOUR, // 4
-};
-
 u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
 {
     int i = 0;
@@ -2707,7 +2699,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_CONFUSE_SPICY:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
                 {
-                    PREPARE_FLAVOUR_BUFFER(gBattleTextBuff1, FLAVOR_SPICY);
+                    PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SPICY);
 
                     gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
@@ -2725,7 +2717,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_CONFUSE_DRY:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
                 {
-                    PREPARE_FLAVOUR_BUFFER(gBattleTextBuff1, FLAVOR_DRY);
+                    PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_DRY);
 
                     gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
@@ -2743,7 +2735,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_CONFUSE_SWEET:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
                 {
-                    PREPARE_FLAVOUR_BUFFER(gBattleTextBuff1, FLAVOR_SWEET);
+                    PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SWEET);
 
                     gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
@@ -2761,7 +2753,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_CONFUSE_BITTER:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
                 {
-                    PREPARE_FLAVOUR_BUFFER(gBattleTextBuff1, FLAVOR_BITTER);
+                    PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_BITTER);
 
                     gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
@@ -2779,7 +2771,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_CONFUSE_SOUR:
                 if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
                 {
-                    PREPARE_FLAVOUR_BUFFER(gBattleTextBuff1, FLAVOR_SOUR);
+                    PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SOUR);
 
                     gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
-- 
cgit v1.2.3


From 10470ef536132c317f0c478e42ad37657a0f00aa Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 28 Nov 2017 23:02:09 +0100
Subject: start working on battle setup

---
 src/battle_setup.c | 586 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/pokemon_3.c    |   2 +-
 src/safari_zone.c  |   2 +-
 3 files changed, 588 insertions(+), 2 deletions(-)
 create mode 100644 src/battle_setup.c

(limited to 'src')

diff --git a/src/battle_setup.c b/src/battle_setup.c
new file mode 100644
index 000000000..310616b60
--- /dev/null
+++ b/src/battle_setup.c
@@ -0,0 +1,586 @@
+#include "global.h"
+#include "battle.h"
+#include "battle_setup.h"
+#include "battle_transition.h"
+#include "main.h"
+#include "task.h"
+#include "pokemon_3.h"
+#include "safari_zone.h"
+#include "script.h"
+#include "game_stat.h"
+#include "event_data.h"
+#include "species.h"
+#include "songs.h"
+#include "metatile_behavior.h"
+#include "map_constants.h"
+#include "field_player_avatar.h"
+#include "fieldmap.h"
+#include "trainer_classes.h"
+#include "trainer_ids.h"
+
+extern bool8 InBattlePyramid(void);
+extern bool8 InBattlePike(void);
+extern bool32 FieldPoisonEffectIsRunning(void);
+extern void overworld_free_bg_tilemaps(void);
+extern void prev_quest_postbuffer_cursor_backup_reset(void);
+extern void ResetPoisonStepCounter(void);
+extern void sub_81BE72C(void);
+extern void FreezeMapObjects(void);
+extern void sub_808BCF4(void);
+extern void sub_80EECC8(void);
+extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
+extern void c2_exit_to_overworld_2_switch(void);
+extern void CB2_WhiteOut(void);
+extern void sub_80AF6F0(void);
+extern u8 GetSav1Weather(void);
+extern u8 Overworld_GetFlashLevel(void);
+
+extern u32 gBattleTypeFlags;
+extern u8 gBattleOutcome;
+extern void (*gFieldCallback)(void);
+extern u16 gTrainerBattleOpponent_A;
+extern u16 gTrainerBattleOpponent_B;
+
+// this file's functions
+void DoBattlePikeWildBattle(void);
+void DoSafariBattle(void);
+void DoStandardWildBattle(void);
+void CB2_EndWildBattle(void);
+void CB2_EndScriptedWildBattle(void);
+u8 GetWildBattleTransition(void);
+u8 GetTrainerBattleTransition(void);
+u8 sub_80B100C(u8 arg0);
+void sub_80B1218(void);
+void sub_80B1234(void);
+bool32 IsPlayerDefeated(u8 battleOutcome);
+
+// const rom data
+
+// The first transition is used if the enemy pokemon are lower level than our pokemon.
+// Otherwise, the second transition is used.
+static const u8 sBattleTransitionTable_Wild[][2] =
+{
+    {B_TRANSITION_SLICE,               B_TRANSITION_WHITEFADE},     // Normal
+    {B_TRANSITION_CLOCKWISE_BLACKFADE, B_TRANSITION_GRID_SQUARES},  // Cave
+    {B_TRANSITION_BLUR,                B_TRANSITION_GRID_SQUARES},  // Cave with flash used
+    {B_TRANSITION_WAVE,                B_TRANSITION_RIPPLE},        // Water
+};
+
+static const u8 sBattleTransitionTable_Trainer[][2] =
+{
+    {B_TRANSITION_POKEBALLS_TRAIL, B_TRANSITION_SHARDS},        // Normal
+    {B_TRANSITION_SHUFFLE,         B_TRANSITION_BIG_POKEBALL},  // Cave
+    {B_TRANSITION_BLUR,            B_TRANSITION_GRID_SQUARES},  // Cave with flash used
+    {B_TRANSITION_SWIRL,           B_TRANSITION_RIPPLE},        // Water
+};
+
+#define tState data[0]
+#define tTransition data[1]
+
+void Task_BattleStart(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    switch (tState)
+    {
+    case 0:
+        if (!FieldPoisonEffectIsRunning()) // is poison not active?
+        {
+            BattleTransition_StartOnField(tTransition);
+            sub_81BE72C();
+            tState++; // go to case 1.
+        }
+        break;
+    case 1:
+        if (IsBattleTransitionDone() == TRUE)
+        {
+            overworld_free_bg_tilemaps();
+            SetMainCallback2(CB2_InitBattle);
+            prev_quest_postbuffer_cursor_backup_reset();
+            ResetPoisonStepCounter();
+            DestroyTask(taskId);
+        }
+        break;
+    }
+}
+
+void CreateBattleStartTask(u8 transition, u16 song)
+{
+    u8 taskId = CreateTask(Task_BattleStart, 1);
+
+    gTasks[taskId].tTransition = transition;
+    PlayMapChosenOrBattleBGM(song);
+}
+
+#undef tState
+#undef tTransition
+
+void BattleSetup_StartWildBattle(void)
+{
+    if (GetSafariZoneFlag())
+        DoSafariBattle();
+    else
+        DoStandardWildBattle();
+}
+
+void BattleSetup_StartBattlePikeWildBattle(void)
+{
+    DoBattlePikeWildBattle();
+}
+
+void DoStandardWildBattle(void)
+{
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    sub_808BCF4();
+    gMain.savedCallback = CB2_EndWildBattle;
+    gBattleTypeFlags = 0;
+    if (InBattlePyramid())
+    {
+        VarSet(VAR_0x400E, 0);
+        gBattleTypeFlags |= BATTLE_TYPE_PYRAMID;
+    }
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
+    sub_80EECC8();
+    sub_80B1218();
+}
+
+void BattleSetup_StartRoamerBattle(void)
+{
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    sub_808BCF4();
+    gMain.savedCallback = CB2_EndWildBattle;
+    gBattleTypeFlags = BATTLE_TYPE_ROAMER;
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
+    sub_80EECC8();
+    sub_80B1218();
+}
+
+void DoSafariBattle(void)
+{
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    sub_808BCF4();
+    gMain.savedCallback = CB2_EndSafariBattle;
+    gBattleTypeFlags = BATTLE_TYPE_SAFARI;
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
+}
+
+void DoBattlePikeWildBattle(void)
+{
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    sub_808BCF4();
+    gMain.savedCallback = CB2_EndWildBattle;
+    gBattleTypeFlags = BATTLE_TYPE_PIKE;
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
+    sub_80EECC8();
+    sub_80B1218();
+}
+
+void DoTrainerBattle(void)
+{
+    CreateBattleStartTask(GetTrainerBattleTransition(), 0);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
+    sub_80B1234();
+}
+
+void sub_80B0828(void)
+{
+    if (InBattlePyramid())
+        CreateBattleStartTask(sub_80B100C(10), 0);
+    else
+        CreateBattleStartTask(sub_80B100C(11), 0);
+
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
+    sub_80B1234();
+}
+
+// Initiates battle where Wally catches Ralts
+void StartWallyTutorialBattle(void)
+{
+    CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5);
+    ScriptContext2_Enable();
+    gMain.savedCallback = c2_exit_to_overworld_1_continue_scripts_restart_music;
+    gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL;
+    CreateBattleStartTask(B_TRANSITION_SLICE, 0);
+}
+
+void BattleSetup_StartScriptedWildBattle(void)
+{
+    ScriptContext2_Enable();
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
+    gBattleTypeFlags = 0;
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
+    sub_80EECC8();
+    sub_80B1218();
+}
+
+void BattleSetup_StartLatiBattle(void)
+{
+    ScriptContext2_Enable();
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
+    gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
+    CreateBattleStartTask(GetWildBattleTransition(), 0);
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
+    sub_80EECC8();
+    sub_80B1218();
+}
+
+void BattleSetup_StartLegendaryBattle(void)
+{
+    ScriptContext2_Enable();
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
+    gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
+
+    switch (GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL))
+    {
+    default:
+    case SPECIES_GROUDON:
+        gBattleTypeFlags |= BATTLE_TYPE_GROUDON;
+        CreateBattleStartTask(B_TRANSITION_GROUDON, BGM_BATTLE34);
+        break;
+    case SPECIES_KYOGRE:
+        gBattleTypeFlags |= BATTLE_TYPE_KYORGE;
+        CreateBattleStartTask(B_TRANSITION_KYORGE, BGM_BATTLE34);
+        break;
+    case SPECIES_RAYQUAZA:
+        gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA;
+        CreateBattleStartTask(B_TRANSITION_RAYQUAZA, BGM_BATTLE_LEGENDARY);
+        break;
+    case SPECIES_DEOXYS:
+        CreateBattleStartTask(B_TRANSITION_BLUR, BGM_FRLG_BATTLE_DEOXYS);
+        break;
+    case SPECIES_LUGIA:
+    case SPECIES_HO_OH:
+        CreateBattleStartTask(B_TRANSITION_BLUR, BGM_FRLG_BATTLE_LEGENDARY);
+        break;
+    case SPECIES_MEW:
+        CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, BGM_BATTLE_MEW);
+        break;
+    }
+
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
+    sub_80EECC8();
+    sub_80B1218();
+}
+
+void StartGroudonKyogreBattle(void)
+{
+    ScriptContext2_Enable();
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
+    gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
+
+    if (gGameVersion == VERSION_RUBY)
+        CreateBattleStartTask(B_TRANSITION_SHARDS, BGM_BATTLE34); // GROUDON
+    else
+        CreateBattleStartTask(B_TRANSITION_RIPPLE, BGM_BATTLE34); // KYOGRE
+
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
+    sub_80EECC8();
+    sub_80B1218();
+}
+
+void StartRegiBattle(void)
+{
+    u8 transitionId;
+    u16 species;
+
+    ScriptContext2_Enable();
+    gMain.savedCallback = CB2_EndScriptedWildBattle;
+    gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
+
+    species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES);
+    switch (species)
+    {
+    case SPECIES_REGIROCK:
+        transitionId = B_TRANSITION_REGIROCK;
+        break;
+    case SPECIES_REGICE:
+        transitionId = B_TRANSITION_REGICE;
+        break;
+    case SPECIES_REGISTEEL:
+        transitionId = B_TRANSITION_REGISTEEL;
+        break;
+    default:
+        transitionId = B_TRANSITION_GRID_SQUARES;
+        break;
+    }
+    CreateBattleStartTask(transitionId, BGM_BATTLE36);
+
+    IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+    IncrementGameStat(GAME_STAT_WILD_BATTLES);
+    sub_80EECC8();
+    sub_80B1218();
+}
+
+void CB2_EndWildBattle(void)
+{
+    CpuFill16(0, (void*)(BG_PLTT), BG_PLTT_SIZE);
+    ResetOamRange(0, 128);
+
+    if (IsPlayerDefeated(gBattleOutcome) == TRUE && !InBattlePyramid() && !InBattlePike())
+    {
+        SetMainCallback2(CB2_WhiteOut);
+    }
+    else
+    {
+        SetMainCallback2(c2_exit_to_overworld_2_switch);
+        gFieldCallback = sub_80AF6F0;
+    }
+}
+
+void CB2_EndScriptedWildBattle(void)
+{
+    CpuFill16(0, (void*)(BG_PLTT), BG_PLTT_SIZE);
+    ResetOamRange(0, 128);
+
+    if (IsPlayerDefeated(gBattleOutcome) == TRUE)
+    {
+        if (InBattlePyramid())
+            SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+        else
+            SetMainCallback2(CB2_WhiteOut);
+    }
+    else
+    {
+        SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+    }
+}
+
+u8 BattleSetup_GetTerrainId(void)
+{
+    u16 tileBehavior;
+    s16 x, y;
+
+    PlayerGetDestCoords(&x, &y);
+    tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+
+    if (MetatileBehavior_IsTallGrass(tileBehavior))
+        return BATTLE_TERRAIN_GRASS;
+    if (MetatileBehavior_IsLongGrass(tileBehavior))
+        return BATTLE_TERRAIN_LONG_GRASS;
+    if (MetatileBehavior_IsSandOrDeepSand(tileBehavior))
+        return BATTLE_TERRAIN_SAND;
+
+    switch (gMapHeader.mapType)
+    {
+    case MAP_TYPE_TOWN:
+    case MAP_TYPE_CITY:
+    case MAP_TYPE_ROUTE:
+        break;
+    case MAP_TYPE_UNDERGROUND:
+        if (MetatileBehavior_IsMB_0B(tileBehavior))
+            return BATTLE_TERRAIN_BUILDING;
+        if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
+            return BATTLE_TERRAIN_POND;
+        return BATTLE_TERRAIN_CAVE;
+    case MAP_TYPE_INDOOR:
+    case MAP_TYPE_SECRET_BASE:
+        return BATTLE_TERRAIN_BUILDING;
+    case MAP_TYPE_UNDERWATER:
+        return BATTLE_TERRAIN_UNDERWATER;
+    case MAP_TYPE_6:
+        if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
+            return BATTLE_TERRAIN_WATER;
+        return BATTLE_TERRAIN_PLAIN;
+    }
+    if (MetatileBehavior_IsDeepOrOceanWater(tileBehavior))
+        return BATTLE_TERRAIN_WATER;
+    if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
+        return BATTLE_TERRAIN_POND;
+    if (MetatileBehavior_IsMountain(tileBehavior))
+        return BATTLE_TERRAIN_MOUNTAIN;
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+    {
+        if (MetatileBehavior_GetBridgeSth(tileBehavior))
+            return BATTLE_TERRAIN_POND;
+        if (MetatileBehavior_IsBridge(tileBehavior) == TRUE)
+            return BATTLE_TERRAIN_WATER;
+    }
+    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_ROUTE113 && gSaveBlock1Ptr->location.mapNum == MAP_ID_ROUTE113)
+        return BATTLE_TERRAIN_SAND;
+    if (GetSav1Weather() == 8)
+        return BATTLE_TERRAIN_SAND;
+
+    return BATTLE_TERRAIN_PLAIN;
+}
+
+u8 GetBattleTransitionTypeByMap(void)
+{
+    u16 tileBehavior;
+    s16 x, y;
+
+    PlayerGetDestCoords(&x, &y);
+    tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+    if (Overworld_GetFlashLevel())
+        return B_TRANSITION_SHUFFLE;
+    if (!MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
+    {
+        switch (gMapHeader.mapType)
+        {
+        case MAP_TYPE_UNDERGROUND:
+            return B_TRANSITION_SWIRL;
+        case MAP_TYPE_UNDERWATER:
+            return B_TRANSITION_BIG_POKEBALL;
+        default:
+            return B_TRANSITION_BLUR;
+        }
+    }
+    return B_TRANSITION_BIG_POKEBALL;
+}
+
+u16 GetSumOfPlayerPartyLevel(u8 numMons)
+{
+    u8 sum = 0;
+    int i;
+
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        u32 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
+
+        if (species != SPECIES_EGG && species != SPECIES_NONE && GetMonData(&gPlayerParty[i], MON_DATA_HP) != 0)
+        {
+            sum += GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
+            if (--numMons == 0)
+                break;
+        }
+    }
+    return sum;
+}
+
+u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
+{
+    u8 i;
+    u8 sum;
+    u32 count = numMons;
+
+    if (gTrainers[opponentId].partySize < count)
+        count = gTrainers[opponentId].partySize;
+
+    sum = 0;
+
+    switch (gTrainers[opponentId].partyFlags)
+    {
+    case 0:
+        {
+            const struct TrainerMonNoItemDefaultMoves *party;
+            party = gTrainers[opponentId].party.NoItemDefaultMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].lvl;
+        }
+        break;
+    case PARTY_FLAG_CUSTOM_MOVES:
+        {
+            const struct TrainerMonNoItemCustomMoves *party;
+            party = gTrainers[opponentId].party.NoItemCustomMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].lvl;
+        }
+        break;
+    case PARTY_FLAG_HAS_ITEM:
+        {
+            const struct TrainerMonItemDefaultMoves *party;
+            party = gTrainers[opponentId].party.ItemDefaultMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].lvl;
+        }
+        break;
+    case PARTY_FLAG_CUSTOM_MOVES | PARTY_FLAG_HAS_ITEM:
+        {
+            const struct TrainerMonItemCustomMoves *party;
+            party = gTrainers[opponentId].party.ItemCustomMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].lvl;
+        }
+        break;
+    }
+
+    return sum;
+}
+
+u8 GetWildBattleTransition(void)
+{
+    u8 transitionType = GetBattleTransitionTypeByMap();
+    u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
+    u8 playerLevel = GetSumOfPlayerPartyLevel(1);
+
+    if (enemyLevel < playerLevel)
+    {
+        if (InBattlePyramid())
+            return B_TRANSITION_BLUR;
+        else
+            return sBattleTransitionTable_Wild[transitionType][0];
+    }
+    else
+    {
+        if (InBattlePyramid())
+            return B_TRANSITION_GRID_SQUARES;
+        else
+            return sBattleTransitionTable_Wild[transitionType][1];
+    }
+}
+
+u8 GetTrainerBattleTransition(void)
+{
+    u8 minPartyCount;
+    u8 transitionType;
+    u8 enemyLevel;
+    u8 playerLevel;
+
+    if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT)
+        return B_TRANSITION_STEVEN;
+
+    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR)
+    {
+        if (gTrainerBattleOpponent_A == TRAINER_ID_SIDNEY)
+            return B_TRANSITION_SYDNEY;
+        if (gTrainerBattleOpponent_A == TRAINER_ID_PHOEBE)
+            return B_TRANSITION_PHOEBE;
+        if (gTrainerBattleOpponent_A == TRAINER_ID_GLACIA)
+            return B_TRANSITION_GLACIA;
+        if (gTrainerBattleOpponent_A == TRAINER_ID_DRAKE)
+            return B_TRANSITION_DRAKE;
+        return B_TRANSITION_STEVEN;
+    }
+
+    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION)
+        return B_TRANSITION_STEVEN;
+
+    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_TEAM_MAGMA
+        || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_MAGMA_LEADER
+        || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_MAGMA_ADMIN)
+        return B_TRANSITION_MAGMA;
+
+    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_TEAM_AQUA
+        || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_AQUA_LEADER
+        || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_AQUA_ADMIN)
+        return B_TRANSITION_AQUA;
+
+    if (gTrainers[gTrainerBattleOpponent_A].doubleBattle == TRUE)
+        minPartyCount = 2; // double battles always at least have 2 pokemon.
+    else
+        minPartyCount = 1;
+
+    transitionType = GetBattleTransitionTypeByMap();
+    enemyLevel = GetSumOfEnemyPartyLevel(gTrainerBattleOpponent_A, minPartyCount);
+    playerLevel = GetSumOfPlayerPartyLevel(minPartyCount);
+    if (enemyLevel < playerLevel) // is wild mon level than the player's mon level?
+        return sBattleTransitionTable_Trainer[transitionType][0];
+    else
+        return sBattleTransitionTable_Trainer[transitionType][1];
+}
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 1fafee810..b7a95fc64 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1396,7 +1396,7 @@ static s32 GetWildMonTableIdInAlteringCave(u16 species)
 
 void SetWildMonHeldItem(void)
 {
-    if (!(gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID | BATTLE_TYPE_x100000)))
+    if (!(gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID | BATTLE_TYPE_PIKE)))
     {
         u16 rnd = Random() % 100;
         u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, 0);
diff --git a/src/safari_zone.c b/src/safari_zone.c
index d3d40af28..38abcdd4c 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -105,7 +105,7 @@ void SafariZoneRetirePrompt(void)
     ScriptContext1_SetupScript(EventScript_2A4B6F);
 }
 
-void sub_80FC190(void)
+void CB2_EndSafariBattle(void)
 {
     sSafariZoneFleedMons += gBattleResults.field_1F;
     if (gBattleOutcome == BATTLE_CAUGHT)
-- 
cgit v1.2.3


From 921011592cbe9018f558b7977525e49252274947 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 29 Nov 2017 08:30:18 -0500
Subject: unsigned -> unsigned int; create header

---
 src/field_poison.c | 51 +++++++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/field_poison.c b/src/field_poison.c
index f9d7b1609..d953ab29c 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -10,7 +10,9 @@
 #include "pokenav.h"
 #include "event_data.h"
 #include "script.h"
+#include "battle.h"
 #include "fldeff_80F9BCC.h"
+#include "field_poison.h"
 
 static bool32 sub_80F9568(struct Pokemon *pokemon)
 {
@@ -39,11 +41,8 @@ static bool32 sub_80F958C(void)
 
 static void sub_80F95C0(u8 partyIdx)
 {
-    struct Pokemon *pokemon;
-    unsigned status;
-
-    pokemon = &gPlayerParty[partyIdx];
-    status = 0;
+    struct Pokemon *pokemon = gPlayerParty + partyIdx;
+    unsigned int status = STATUS_NONE;
     AdjustFriendship(pokemon, 0x07);
     SetMonData(pokemon, MON_DATA_STATUS, &status);
     GetMonData(pokemon, MON_DATA_NICKNAME, gStringVar1);
@@ -52,10 +51,8 @@ static void sub_80F95C0(u8 partyIdx)
 
 static bool32 sub_80F960C(u8 partyIdx)
 {
-    struct Pokemon *pokemon;
-
-    pokemon = &gPlayerParty[partyIdx];
-    if (sub_80F9568(pokemon) && GetMonData(pokemon, MON_DATA_HP) == 0 && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == 1)
+    struct Pokemon *pokemon = gPlayerParty + partyIdx;
+    if (sub_80F9568(pokemon) && GetMonData(pokemon, MON_DATA_HP) == 0 && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
     {
         return TRUE;
     }
@@ -64,9 +61,7 @@ static bool32 sub_80F960C(u8 partyIdx)
 
 static void sub_80F9654(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     switch (data[0])
     {
         case 0:
@@ -116,42 +111,38 @@ void sub_80F972C(void)
     ScriptContext1_Stop();
 }
 
-unsigned overworld_poison(void)
+unsigned int overworld_poison(void)
 {
     int i;
-    unsigned cnt1;
-    unsigned cnt2;
-    unsigned hp;
-    struct Pokemon *pokemon;
-
-    pokemon = gPlayerParty;
-    cnt2 = 0;
-    cnt1 = 0;
+    unsigned int hp;
+    struct Pokemon *pokemon = gPlayerParty;
+    unsigned int numPoisoned = 0;
+    unsigned int numFainted = 0;
     for (i = 0; i < PARTY_SIZE; i++)
     {
-        if (GetMonData(pokemon, MON_DATA_SANITY_BIT2) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == 1)
+        if (GetMonData(pokemon, MON_DATA_SANITY_BIT2) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
         {
             hp = GetMonData(pokemon, MON_DATA_HP);
             if (hp == 0 || --hp == 0)
             {
-                cnt1++;
+                numFainted++;
             }
             SetMonData(pokemon, MON_DATA_HP, &hp);
-            cnt2++;
+            numPoisoned++;
         }
         pokemon++;
     }
-    if (cnt1 != 0 || cnt2 != 0)
+    if (numFainted != 0 || numPoisoned != 0)
     {
         overworld_poison_effect();
     }
-    if (cnt1 != 0)
+    if (numFainted != 0)
     {
-        return 2;
+        return FLDPSN_FNT;
     }
-    if (cnt2 != 0)
+    if (numPoisoned != 0)
     {
-        return 1;
+        return FLDPSN_PSN;
     }
-    return 0;
+    return FLDPSN_NONE;
 }
-- 
cgit v1.2.3


From e8ecb01ab2f7d7e67a525621e6ea7ada08c52952 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 29 Nov 2017 19:54:15 +0100
Subject: more work on battle setup

---
 src/battle_setup.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 223 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 310616b60..3121e9262 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -17,6 +17,12 @@
 #include "fieldmap.h"
 #include "trainer_classes.h"
 #include "trainer_ids.h"
+#include "rng.h"
+#include "starter_choose.h"
+#include "script_pokemon_80F8.h"
+#include "items.h"
+#include "palette.h"
+#include "window.h"
 
 extern bool8 InBattlePyramid(void);
 extern bool8 InBattlePike(void);
@@ -30,16 +36,18 @@ extern void sub_808BCF4(void);
 extern void sub_80EECC8(void);
 extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
 extern void c2_exit_to_overworld_2_switch(void);
+extern void Overworld_ClearSavedMusic(void);
 extern void CB2_WhiteOut(void);
 extern void sub_80AF6F0(void);
+extern void PlayBattleBGM(void);
+extern void sub_81DA57C(void);
 extern u8 GetSav1Weather(void);
 extern u8 Overworld_GetFlashLevel(void);
 
 extern u32 gBattleTypeFlags;
 extern u8 gBattleOutcome;
 extern void (*gFieldCallback)(void);
-extern u16 gTrainerBattleOpponent_A;
-extern u16 gTrainerBattleOpponent_B;
+extern u8 gApproachingTrainerId;
 
 // this file's functions
 void DoBattlePikeWildBattle(void);
@@ -49,10 +57,29 @@ void CB2_EndWildBattle(void);
 void CB2_EndScriptedWildBattle(void);
 u8 GetWildBattleTransition(void);
 u8 GetTrainerBattleTransition(void);
-u8 sub_80B100C(u8 arg0);
+u8 sub_80B100C(s32 arg0);
 void sub_80B1218(void);
 void sub_80B1234(void);
-bool32 IsPlayerDefeated(u8 battleOutcome);
+void CB2_GiveStarter(void);
+void CB2_StartFirstBattle(void);
+void CB2_EndFirstBattle(void);
+bool32 IsPlayerDefeated(u32 battleOutcome);
+
+// ewram data
+EWRAM_DATA u16 sTrainerBattleMode = 0;
+EWRAM_DATA u16 gTrainerBattleOpponent_A = 0;
+EWRAM_DATA u16 gTrainerBattleOpponent_B = 0;
+EWRAM_DATA u16 gPartnerTrainerId = 0;
+EWRAM_DATA u16 sTrainerMapObjectLocalId = 0;
+EWRAM_DATA u8 *sTrainerAIntroSpeech = NULL;
+EWRAM_DATA u8 *sTrainerBIntroSpeech = NULL;
+EWRAM_DATA u8 *sTrainerADefeatSpeech = NULL;
+EWRAM_DATA u8 *sTrainerBDefeatSpeech = NULL;
+EWRAM_DATA u8 *sTrainerVictorySpeech = NULL;
+EWRAM_DATA u8 *sTrainerCannotBattleSpeech = NULL;
+EWRAM_DATA u8 *gUnknown_02038BEC = NULL;
+EWRAM_DATA u8 *gUnknown_02038BF0 = NULL;
+EWRAM_DATA u8 *gUnknown_02038BF4 = NULL;
 
 // const rom data
 
@@ -74,6 +101,21 @@ static const u8 sBattleTransitionTable_Trainer[][2] =
     {B_TRANSITION_SWIRL,           B_TRANSITION_RIPPLE},        // Water
 };
 
+static const u8 sUnknown_0854FE98[] =
+{
+    0x1d, 0x1e, 0x1f, 0x20, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29
+};
+
+static const u8 sUnknown_0854FEA4[] =
+{
+    0x1f, 0x20, 0x21
+};
+
+static const u8 sUnknown_0854FEA7[] =
+{
+    0x1d, 0x1f, 0x20, 0x21
+};
+
 #define tState data[0]
 #define tTransition data[1]
 
@@ -579,8 +621,184 @@ u8 GetTrainerBattleTransition(void)
     transitionType = GetBattleTransitionTypeByMap();
     enemyLevel = GetSumOfEnemyPartyLevel(gTrainerBattleOpponent_A, minPartyCount);
     playerLevel = GetSumOfPlayerPartyLevel(minPartyCount);
-    if (enemyLevel < playerLevel) // is wild mon level than the player's mon level?
+
+    if (enemyLevel < playerLevel)
         return sBattleTransitionTable_Trainer[transitionType][0];
     else
         return sBattleTransitionTable_Trainer[transitionType][1];
 }
+
+u8 sub_80B100C(s32 arg0)
+{
+    u16 var;
+    u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
+    u8 playerLevel = GetSumOfPlayerPartyLevel(1);
+
+    if (enemyLevel < playerLevel)
+    {
+        switch (arg0)
+        {
+        case 11:
+        case 12:
+        case 13:
+            return B_TRANSITION_POKEBALLS_TRAIL;
+        case 10:
+            return sUnknown_0854FEA4[Random() % ARRAY_COUNT(sUnknown_0854FEA4)];
+        case 3:
+            return sUnknown_0854FEA7[Random() % ARRAY_COUNT(sUnknown_0854FEA7)];
+        }
+
+        if (VarGet(VAR_0x40CE) != 3)
+            return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)];
+    }
+    else
+    {
+        switch (arg0)
+        {
+        case 11:
+        case 12:
+        case 13:
+            return B_TRANSITION_BIG_POKEBALL;
+        case 10:
+            return sUnknown_0854FEA4[Random() % ARRAY_COUNT(sUnknown_0854FEA4)];
+        case 3:
+            return sUnknown_0854FEA7[Random() % ARRAY_COUNT(sUnknown_0854FEA7)];
+        }
+
+        if (VarGet(VAR_0x40CE) != 3)
+            return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)];
+    }
+
+    var = gSaveBlock2Ptr->field_CB4[gSaveBlock2Ptr->battlePyramidWildHeaderId * 2 + 0]
+        + gSaveBlock2Ptr->field_CB4[gSaveBlock2Ptr->battlePyramidWildHeaderId * 2 + 1];
+
+    return sUnknown_0854FE98[var % ARRAY_COUNT(sUnknown_0854FE98)];
+}
+
+void ChooseStarter(void)
+{
+    SetMainCallback2(CB2_ChooseStarter);
+    gMain.savedCallback = CB2_GiveStarter;
+}
+
+void CB2_GiveStarter(void)
+{
+    u16 starterMon;
+
+    *GetVarPointer(VAR_STARTER_ID) = gSpecialVar_Result;
+    starterMon = GetStarterPokemon(gSpecialVar_Result);
+    ScriptGiveMon(starterMon, 5, 0, 0, 0, 0);
+    ResetTasks();
+    PlayBattleBGM();
+    SetMainCallback2(CB2_StartFirstBattle);
+    BattleTransition_Start(B_TRANSITION_BLUR);
+}
+
+void CB2_StartFirstBattle(void)
+{
+    UpdatePaletteFade();
+    RunTasks();
+
+    if (IsBattleTransitionDone() == TRUE)
+    {
+        gBattleTypeFlags = BATTLE_TYPE_FIRST_BATTLE;
+        gMain.savedCallback = CB2_EndFirstBattle;
+        FreeAllWindowBuffers();
+        SetMainCallback2(CB2_InitBattle);
+        prev_quest_postbuffer_cursor_backup_reset();
+        ResetPoisonStepCounter();
+        IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
+        IncrementGameStat(GAME_STAT_WILD_BATTLES);
+        sub_80EECC8();
+        sub_80B1218();
+    }
+}
+
+void CB2_EndFirstBattle(void)
+{
+    Overworld_ClearSavedMusic();
+    SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+}
+
+void sub_80B1218(void)
+{
+    if (GetGameStat(GAME_STAT_WILD_BATTLES) % 60 == 0)
+        sub_81DA57C();
+}
+
+void sub_80B1234(void)
+{
+    if (GetGameStat(GAME_STAT_TRAINER_BATTLES) % 20 == 0)
+        sub_81DA57C();
+}
+
+// why not just use the macros? maybe its because they didnt want to uncast const every time?
+u32 TrainerBattleLoadArg32(const u8 *ptr)
+{
+    return T1_READ_32(ptr);
+}
+
+u16 TrainerBattleLoadArg16(const u8 *ptr)
+{
+    return T1_READ_16(ptr);
+}
+
+u8 TrainerBattleLoadArg8(const u8 *ptr)
+{
+    return T1_READ_8(ptr);
+}
+
+u16 GetTrainerAFlag(void)
+{
+    return FLAG_TRAINER_FLAG_START + gTrainerBattleOpponent_A;
+}
+
+u16 GetTrainerBFlag(void)
+{
+    return FLAG_TRAINER_FLAG_START + gTrainerBattleOpponent_B;
+}
+
+bool32 IsPlayerDefeated(u32 battleOutcome)
+{
+    switch (battleOutcome)
+    {
+    case BATTLE_LOST:
+    case BATTLE_DREW:
+        return TRUE;
+    case BATTLE_WON:
+    case BATTLE_RAN:
+    case BATTLE_PLAYER_TELEPORTED:
+    case BATTLE_POKE_FLED:
+    case BATTLE_CAUGHT:
+        return FALSE;
+    default:
+        return FALSE;
+    }
+}
+
+void ResetTrainerOpponentIds(void)
+{
+    gTrainerBattleOpponent_A = 0;
+    gTrainerBattleOpponent_B = 0;
+}
+
+void InitTrainerBattleVariables(void)
+{
+    sTrainerBattleMode = 0;
+    if (gApproachingTrainerId == 0)
+    {
+        sTrainerAIntroSpeech = NULL;
+        sTrainerADefeatSpeech = NULL;
+        gUnknown_02038BF0 = NULL;
+    }
+    else
+    {
+        sTrainerBIntroSpeech = NULL;
+        sTrainerBDefeatSpeech = NULL;
+        gUnknown_02038BF4 = NULL;
+    }
+    sTrainerMapObjectLocalId = 0;
+    sTrainerVictorySpeech = NULL;
+    sTrainerCannotBattleSpeech = NULL;
+    gUnknown_02038BEC = NULL;
+}
-- 
cgit v1.2.3


From 646664ff29afd8627626274a4fc12b05d584fe2c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 1 Dec 2017 21:25:13 +0100
Subject: battle setup file is decompiled

---
 src/battle_message.c |    7 +-
 src/battle_setup.c   | 1200 +++++++++++++++++++++++++++++++++++++++++++++++---
 src/pokemon_2.c      |    2 +-
 src/scrcmd.c         |   32 +-
 src/secret_base.c    |    2 +-
 src/trainer_see.c    |   68 +++
 6 files changed, 1229 insertions(+), 82 deletions(-)
 create mode 100644 src/trainer_see.c

(limited to 'src')

diff --git a/src/battle_message.c b/src/battle_message.c
index 77f7cc722..5faf60290 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -12,6 +12,7 @@
 #include "window.h"
 #include "palette.h"
 #include "battle_controllers.h"
+#include "battle_setup.h"
 
 extern u16 gLastUsedItem;
 extern u8 gLastUsedAbility;
@@ -54,8 +55,6 @@ extern void sub_81D5554(u8 *txtPtr, u16 trainerId); // pokenav
 extern void GetEreaderTrainerName(u8 *txtPtr);
 extern void sub_81A36D0(u8 arg0, u16 trainerId); // battle_frontier_2
 extern void sub_81D572C(u8 arg0, u16 trainerId); // pokenav
-extern const u8* GetTrainer1LoseText(void); // battle_setup
-extern const u8* GetTrainer2LoseText(void); // battle_setup
 extern void GetFrontierTrainerName(u8 *dst, u16 trainerId);
 extern s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, const u8 *str, s32 totalWidth, s16 letterSpacing);
 extern u8 GetTextSpeedInRecordedBattle(void);
@@ -2068,7 +2067,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 }
                 else
                 {
-                    toCpy = GetTrainer1LoseText();
+                    toCpy = GetTrainerALoseText();
                 }
                 break;
             case B_TXT_TRAINER1_WIN_TEXT: // trainerA win text
@@ -2165,7 +2164,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 }
                 else
                 {
-                    toCpy = GetTrainer2LoseText();
+                    toCpy = GetTrainerBLoseText();
                 }
                 break;
             case B_TXT_TRAINER2_WIN_TEXT:
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 3121e9262..bcb883ca1 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -23,9 +23,36 @@
 #include "items.h"
 #include "palette.h"
 #include "window.h"
+#include "field_map_obj.h"
+#include "event_scripts.h"
+#include "trainer_see.h"
+#include "field_message_box.h"
+#include "trainer.h"
+#include "sound.h"
+#include "strings.h"
+#include "secret_base.h"
+#include "string_util.h"
+
+enum
+{
+    TRAINER_PARAM_LOAD_VAL_8BIT,
+    TRAINER_PARAM_LOAD_VAL_16BIT,
+    TRAINER_PARAM_LOAD_VAL_32BIT,
+    TRAINER_PARAM_CLEAR_VAL_8BIT,
+    TRAINER_PARAM_CLEAR_VAL_16BIT,
+    TRAINER_PARAM_CLEAR_VAL_32BIT,
+    TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR,
+};
+
+struct TrainerBattleParameter
+{
+    void *varPtr;
+    u8 ptrType;
+};
 
 extern bool8 InBattlePyramid(void);
 extern bool8 InBattlePike(void);
+extern bool32 InTrainerHill(void);
 extern bool32 FieldPoisonEffectIsRunning(void);
 extern void overworld_free_bg_tilemaps(void);
 extern void prev_quest_postbuffer_cursor_backup_reset(void);
@@ -43,43 +70,66 @@ extern void PlayBattleBGM(void);
 extern void sub_81DA57C(void);
 extern u8 GetSav1Weather(void);
 extern u8 Overworld_GetFlashLevel(void);
+extern u16 sub_81A9AA8(u8 localId);
+extern u16 sub_81D6180(u8 localId);
+extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjId);
+extern bool8 GetTrainerHillTrainerFlag(u8 mapObjId);
+extern bool8 sub_81D5C18(void);
+extern void sub_816306C(u8 a0);
+extern void sub_8163048(u8 a0);
+extern void sub_81A9B04(void);
+extern void sub_81D639C(void);
+extern void sub_81D6384(void);
+extern void sub_81D61E8(void);
+extern void sub_80982B8(void);
+extern void sub_81A9EDC(u16 a0);
+extern void sub_81D572C(u8 a0, u16 arg1);
 
 extern u32 gBattleTypeFlags;
 extern u8 gBattleOutcome;
 extern void (*gFieldCallback)(void);
 extern u8 gApproachingTrainerId;
+extern u8 gNoOfApproachingTrainers;
+extern u16 gUnknown_03006080;
 
 // this file's functions
-void DoBattlePikeWildBattle(void);
-void DoSafariBattle(void);
-void DoStandardWildBattle(void);
-void CB2_EndWildBattle(void);
-void CB2_EndScriptedWildBattle(void);
-u8 GetWildBattleTransition(void);
-u8 GetTrainerBattleTransition(void);
-u8 sub_80B100C(s32 arg0);
-void sub_80B1218(void);
-void sub_80B1234(void);
-void CB2_GiveStarter(void);
-void CB2_StartFirstBattle(void);
-void CB2_EndFirstBattle(void);
-bool32 IsPlayerDefeated(u32 battleOutcome);
+static void DoBattlePikeWildBattle(void);
+static void DoSafariBattle(void);
+static void DoStandardWildBattle(void);
+static void CB2_EndWildBattle(void);
+static void CB2_EndScriptedWildBattle(void);
+static u8 GetWildBattleTransition(void);
+static u8 GetTrainerBattleTransition(void);
+static void sub_80B1218(void);
+static void sub_80B1234(void);
+static void CB2_GiveStarter(void);
+static void CB2_StartFirstBattle(void);
+static void CB2_EndFirstBattle(void);
+static void CB2_EndTrainerBattle(void);
+static bool32 IsPlayerDefeated(u32 battleOutcome);
+static u16 GetRematchTrainerId(u16 trainerId);
+static void RegisterTrainerInMatchCall(void);
+static void HandleRematchVarsOnBattleEnd(void);
+static const u8 *GetIntroSpeechOfApproachingTrainer(void);
+static const u8 *GetTrainerCantBattleSpeech(void);
 
 // ewram data
-EWRAM_DATA u16 sTrainerBattleMode = 0;
+EWRAM_DATA static u16 sTrainerBattleMode = 0;
 EWRAM_DATA u16 gTrainerBattleOpponent_A = 0;
 EWRAM_DATA u16 gTrainerBattleOpponent_B = 0;
 EWRAM_DATA u16 gPartnerTrainerId = 0;
-EWRAM_DATA u16 sTrainerMapObjectLocalId = 0;
-EWRAM_DATA u8 *sTrainerAIntroSpeech = NULL;
-EWRAM_DATA u8 *sTrainerBIntroSpeech = NULL;
-EWRAM_DATA u8 *sTrainerADefeatSpeech = NULL;
-EWRAM_DATA u8 *sTrainerBDefeatSpeech = NULL;
-EWRAM_DATA u8 *sTrainerVictorySpeech = NULL;
-EWRAM_DATA u8 *sTrainerCannotBattleSpeech = NULL;
-EWRAM_DATA u8 *gUnknown_02038BEC = NULL;
-EWRAM_DATA u8 *gUnknown_02038BF0 = NULL;
-EWRAM_DATA u8 *gUnknown_02038BF4 = NULL;
+EWRAM_DATA static u16 sTrainerMapObjectLocalId = 0;
+EWRAM_DATA static u8 *sTrainerAIntroSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerBIntroSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerADefeatSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerBDefeatSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerVictorySpeech = NULL;
+EWRAM_DATA static u8 *sTrainerCannotBattleSpeech = NULL;
+EWRAM_DATA static u8 *sTrainerBattleEndScript = NULL;
+EWRAM_DATA static u8 *sTrainerABattleScriptRetAddr = NULL;
+EWRAM_DATA static u8 *sTrainerBBattleScriptRetAddr = NULL;
+EWRAM_DATA static bool8 sShouldCheckTrainerBScript = FALSE;
+EWRAM_DATA static u8 sNoOfPossibleTrainerRetScripts = 0;
 
 // const rom data
 
@@ -103,23 +153,204 @@ static const u8 sBattleTransitionTable_Trainer[][2] =
 
 static const u8 sUnknown_0854FE98[] =
 {
-    0x1d, 0x1e, 0x1f, 0x20, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29
+    B_TRANSITION_29, B_TRANSITION_30, B_TRANSITION_31, B_TRANSITION_32,
+    B_TRANSITION_34, B_TRANSITION_35, B_TRANSITION_36, B_TRANSITION_37,
+    B_TRANSITION_38, B_TRANSITION_39, B_TRANSITION_40, B_TRANSITION_41
 };
 
 static const u8 sUnknown_0854FEA4[] =
 {
-    0x1f, 0x20, 0x21
+    B_TRANSITION_31, B_TRANSITION_32, B_TRANSITION_33
 };
 
 static const u8 sUnknown_0854FEA7[] =
 {
-    0x1d, 0x1f, 0x20, 0x21
+    B_TRANSITION_29, B_TRANSITION_31, B_TRANSITION_32, B_TRANSITION_33
+};
+
+static const struct TrainerBattleParameter sOrdinaryBattleParams[] =
+{
+    {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,   TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerABattleScriptRetAddr, TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleEndScript,      TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
+};
+
+static const struct TrainerBattleParameter sContinueScriptBattleParams[] =
+{
+    {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,   TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerABattleScriptRetAddr, TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleEndScript,      TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
+};
+
+static const struct TrainerBattleParameter sDoubleBattleParams[] =
+{
+    {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,   TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerABattleScriptRetAddr, TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleEndScript,      TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
+};
+
+static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] =
+{
+    {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerAIntroSpeech,         TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,   TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerABattleScriptRetAddr, TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleEndScript,      TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
+};
+
+static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] =
+{
+    {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent_A,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerAIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerADefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,   TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerABattleScriptRetAddr, TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleEndScript,      TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
+};
+
+static const struct TrainerBattleParameter sTrainerBOrdinaryBattleParams[] =
+{
+    {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent_B,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerBIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,   TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBBattleScriptRetAddr, TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBattleEndScript,      TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
+};
+
+static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[] =
+{
+    {&sTrainerBattleMode,           TRAINER_PARAM_LOAD_VAL_8BIT},
+    {&gTrainerBattleOpponent_B,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerMapObjectLocalId,     TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerBIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerVictorySpeech,        TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerCannotBattleSpeech,   TRAINER_PARAM_CLEAR_VAL_32BIT},
+    {&sTrainerBBattleScriptRetAddr, TRAINER_PARAM_LOAD_VAL_32BIT},
+    {&sTrainerBattleEndScript,      TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR},
+};
+
+const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES] =
+{
+    {{0x0025, 0x0028, 0x0029, 0x002a, 0x002b}, 0x0000, 0x0021},
+    {{0x02e1, 0x032c, 0x032d, 0x032e, 0x032f}, 0x0000, 0x0014},
+    {{0x002c, 0x002f, 0x0030, 0x0031, 0x0032}, 0x0000, 0x001a},
+    {{0x0039, 0x003c, 0x003d, 0x003e, 0x003f}, 0x0000, 0x0018},
+    {{0x0040, 0x0043, 0x0044, 0x0045, 0x0046}, 0x0000, 0x0018},
+    {{0x02af, 0x02b0, 0x02b1, 0x02b2, 0x02b3}, 0x0000, 0x0027},
+    {{0x02ff, 0x033c, 0x033d, 0x033e, 0x033f}, 0x0000, 0x0024},
+    {{0x005e, 0x0065, 0x0066, 0x0067, 0x0068}, 0x0000, 0x001a},
+    {{0x004e, 0x0054, 0x0055, 0x0056, 0x0057}, 0x0000, 0x001a},
+    {{0x006c, 0x006e, 0x006f, 0x0070, 0x0071}, 0x0018, 0x0014},
+    {{0x0072, 0x0078, 0x0079, 0x007a, 0x007b}, 0x0000, 0x0013},
+    {{0x0090, 0x034c, 0x034d, 0x034e, 0x034f}, 0x0018, 0x0038},
+    {{0x007f, 0x0084, 0x0085, 0x0086, 0x0087}, 0x0000, 0x0024},
+    {{0x0088, 0x008b, 0x008c, 0x008d, 0x008e}, 0x0000, 0x0013},
+    {{0x008f, 0x0093, 0x0094, 0x0095, 0x0096}, 0x0000, 0x001d},
+    {{0x009b, 0x00af, 0x00b0, 0x00b1, 0x00b2}, 0x0000, 0x0016},
+    {{0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb}, 0x0000, 0x001e},
+    {{0x02a0, 0x0338, 0x0339, 0x033a, 0x033b}, 0x0000, 0x002a},
+    {{0x00c3, 0x0340, 0x0341, 0x0342, 0x0343}, 0x0000, 0x0026},
+    {{0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8}, 0x0000, 0x0021},
+    {{0x00ce, 0x00cf, 0x00d0, 0x00d1, 0x00d2}, 0x0000, 0x001d},
+    {{0x00d8, 0x00db, 0x00dc, 0x00dd, 0x00de}, 0x0018, 0x000d},
+    {{0x02a9, 0x02aa, 0x02ab, 0x02ac, 0x02ad}, 0x0018, 0x0001},
+    {{0x00e2, 0x00e4, 0x00e5, 0x00e6, 0x00e7}, 0x0000, 0x0023},
+    {{0x00ee, 0x00ef, 0x00f0, 0x00f1, 0x00f2}, 0x0000, 0x0026},
+    {{0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd}, 0x0000, 0x0026},
+    {{0x00fe, 0x0101, 0x0102, 0x0103, 0x0104}, 0x0000, 0x0024},
+    {{0x0118, 0x011a, 0x011b, 0x011c, 0x011d}, 0x0000, 0x001f},
+    {{0x0111, 0x0114, 0x0115, 0x0116, 0x0117}, 0x0000, 0x001f},
+    {{0x011f, 0x0120, 0x0121, 0x0122, 0x0123}, 0x0000, 0x0020},
+    {{0x012e, 0x012f, 0x0130, 0x0131, 0x0132}, 0x0000, 0x0019},
+    {{0x0125, 0x0127, 0x0128, 0x0129, 0x012a}, 0x0000, 0x0012},
+    {{0x0133, 0x0134, 0x0135, 0x0136, 0x0137}, 0x0000, 0x001e},
+    {{0x0139, 0x013a, 0x013b, 0x013c, 0x013d}, 0x0018, 0x000c},
+    {{0x013e, 0x0148, 0x0149, 0x014a, 0x014b}, 0x0000, 0x0011},
+    {{0x0153, 0x015a, 0x015b, 0x015c, 0x015d}, 0x0000, 0x0015},
+    {{0x0178, 0x017b, 0x017c, 0x017d, 0x017e}, 0x0000, 0x002b},
+    {{0x0171, 0x0172, 0x0173, 0x0174, 0x0175}, 0x0000, 0x0020},
+    {{0x0166, 0x0168, 0x0169, 0x016a, 0x016b}, 0x0000, 0x0019},
+    {{0x016c, 0x016d, 0x016e, 0x016f, 0x0170}, 0x0000, 0x0020},
+    {{0x0182, 0x0184, 0x0185, 0x0186, 0x0187}, 0x0000, 0x002b},
+    {{0x0161, 0x0162, 0x0163, 0x0164, 0x0165}, 0x0000, 0x0019},
+    {{0x0179, 0x0334, 0x0335, 0x0336, 0x0337}, 0x0000, 0x0029},
+    {{0x0188, 0x0189, 0x018a, 0x018b, 0x018c}, 0x0018, 0x0001},
+    {{0x0196, 0x0199, 0x019a, 0x019b, 0x019c}, 0x0000, 0x0023},
+    {{0x01a3, 0x01a5, 0x01a6, 0x01a7, 0x01a8}, 0x0000, 0x001c},
+    {{0x01ab, 0x01ae, 0x01af, 0x01b0, 0x01b1}, 0x0000, 0x001e},
+    {{0x01b2, 0x01b5, 0x01b6, 0x01b7, 0x01b8}, 0x0000, 0x001c},
+    {{0x01c1, 0x01d1, 0x01d2, 0x01d3, 0x01d4}, 0x0000, 0x0027},
+    {{0x01da, 0x01dd, 0x01de, 0x01df, 0x01e0}, 0x0018, 0x000d},
+    {{0x01e1, 0x01e2, 0x01e7, 0x01e8, 0x01e9}, 0x0000, 0x0012},
+    {{0x01ec, 0x01f1, 0x01f2, 0x01f3, 0x01f4}, 0x0000, 0x0028},
+    {{0x02e4, 0x0330, 0x0331, 0x0332, 0x0333}, 0x0000, 0x0017},
+    {{0x0200, 0x0203, 0x0204, 0x0205, 0x0206}, 0x0000, 0x0019},
+    {{0x0221, 0x0224, 0x0225, 0x0226, 0x0227}, 0x0000, 0x0020},
+    {{0x021a, 0x021d, 0x021e, 0x021f, 0x0220}, 0x0000, 0x0020},
+    {{0x0009, 0x0348, 0x0349, 0x034a, 0x034b}, 0x0018, 0x0011},
+    {{0x022f, 0x0232, 0x0233, 0x0234, 0x0235}, 0x0000, 0x0022},
+    {{0x0228, 0x022b, 0x022c, 0x022d, 0x022e}, 0x0000, 0x0022},
+    {{0x025c, 0x025f, 0x0260, 0x0261, 0x0262}, 0x0000, 0x0013},
+    {{0x026d, 0x026e, 0x026f, 0x0270, 0x0271}, 0x0018, 0x000b},
+    {{0x0273, 0x027c, 0x027d, 0x027e, 0x027f}, 0x0000, 0x001b},
+    {{0x0001, 0x0344, 0x0345, 0x0346, 0x0347}, 0x0018, 0x000c},
+    {{0x0282, 0x0283, 0x0284, 0x0285, 0x0286}, 0x0018, 0x003e},
+    {{0x0291, 0x0292, 0x0293, 0x0294, 0x0294}, 0x0018, 0x002b},
+    {{0x0109, 0x0302, 0x0303, 0x0304, 0x0305}, 0x0000, 0x0003},
+    {{0x010a, 0x0306, 0x0307, 0x0308, 0x0309}, 0x0000, 0x000b},
+    {{0x010b, 0x030a, 0x030b, 0x030c, 0x030d}, 0x0000, 0x0002},
+    {{0x010c, 0x030e, 0x030f, 0x0310, 0x0311}, 0x0000, 0x000c},
+    {{0x010d, 0x0312, 0x0313, 0x0314, 0x0315}, 0x0000, 0x0000},
+    {{0x010e, 0x0316, 0x0317, 0x0318, 0x0319}, 0x0000, 0x0004},
+    {{0x010f, 0x031a, 0x031b, 0x031c, 0x031d}, 0x0000, 0x0006},
+    {{0x0110, 0x031e, 0x031f, 0x0320, 0x0321}, 0x0000, 0x0007},
+    {{0x0105, 0x0105, 0x0105, 0x0105, 0x0105}, 0x0000, 0x0008},
+    {{0x0106, 0x0106, 0x0106, 0x0106, 0x0106}, 0x0000, 0x0008},
+    {{0x0107, 0x0107, 0x0107, 0x0107, 0x0107}, 0x0000, 0x0008},
+    {{0x0108, 0x0108, 0x0108, 0x0108, 0x0108}, 0x0000, 0x0008},
+    {{0x014f, 0x014f, 0x014f, 0x014f, 0x014f}, 0x0000, 0x0008},
+};
+
+static const u16 sBadgeFlags[8] =
+{
+    FLAG_BADGE01_GET, FLAG_BADGE02_GET, FLAG_BADGE03_GET, FLAG_BADGE04_GET,
+    FLAG_BADGE05_GET, FLAG_BADGE06_GET, FLAG_BADGE07_GET, FLAG_BADGE08_GET,
 };
 
 #define tState data[0]
 #define tTransition data[1]
 
-void Task_BattleStart(u8 taskId)
+static void Task_BattleStart(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -146,7 +377,7 @@ void Task_BattleStart(u8 taskId)
     }
 }
 
-void CreateBattleStartTask(u8 transition, u16 song)
+static void CreateBattleStartTask(u8 transition, u16 song)
 {
     u8 taskId = CreateTask(Task_BattleStart, 1);
 
@@ -170,7 +401,7 @@ void BattleSetup_StartBattlePikeWildBattle(void)
     DoBattlePikeWildBattle();
 }
 
-void DoStandardWildBattle(void)
+static void DoStandardWildBattle(void)
 {
     ScriptContext2_Enable();
     FreezeMapObjects();
@@ -203,7 +434,7 @@ void BattleSetup_StartRoamerBattle(void)
     sub_80B1218();
 }
 
-void DoSafariBattle(void)
+static void DoSafariBattle(void)
 {
     ScriptContext2_Enable();
     FreezeMapObjects();
@@ -213,7 +444,7 @@ void DoSafariBattle(void)
     CreateBattleStartTask(GetWildBattleTransition(), 0);
 }
 
-void DoBattlePikeWildBattle(void)
+static void DoBattlePikeWildBattle(void)
 {
     ScriptContext2_Enable();
     FreezeMapObjects();
@@ -227,7 +458,7 @@ void DoBattlePikeWildBattle(void)
     sub_80B1218();
 }
 
-void DoTrainerBattle(void)
+static void DoTrainerBattle(void)
 {
     CreateBattleStartTask(GetTrainerBattleTransition(), 0);
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
@@ -235,7 +466,7 @@ void DoTrainerBattle(void)
     sub_80B1234();
 }
 
-void sub_80B0828(void)
+static void sub_80B0828(void)
 {
     if (InBattlePyramid())
         CreateBattleStartTask(sub_80B100C(10), 0);
@@ -370,7 +601,7 @@ void StartRegiBattle(void)
     sub_80B1218();
 }
 
-void CB2_EndWildBattle(void)
+static void CB2_EndWildBattle(void)
 {
     CpuFill16(0, (void*)(BG_PLTT), BG_PLTT_SIZE);
     ResetOamRange(0, 128);
@@ -386,7 +617,7 @@ void CB2_EndWildBattle(void)
     }
 }
 
-void CB2_EndScriptedWildBattle(void)
+static void CB2_EndScriptedWildBattle(void)
 {
     CpuFill16(0, (void*)(BG_PLTT), BG_PLTT_SIZE);
     ResetOamRange(0, 128);
@@ -462,7 +693,7 @@ u8 BattleSetup_GetTerrainId(void)
     return BATTLE_TERRAIN_PLAIN;
 }
 
-u8 GetBattleTransitionTypeByMap(void)
+static u8 GetBattleTransitionTypeByMap(void)
 {
     u16 tileBehavior;
     s16 x, y;
@@ -486,7 +717,7 @@ u8 GetBattleTransitionTypeByMap(void)
     return B_TRANSITION_BIG_POKEBALL;
 }
 
-u16 GetSumOfPlayerPartyLevel(u8 numMons)
+static u16 GetSumOfPlayerPartyLevel(u8 numMons)
 {
     u8 sum = 0;
     int i;
@@ -505,7 +736,7 @@ u16 GetSumOfPlayerPartyLevel(u8 numMons)
     return sum;
 }
 
-u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
+static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
 {
     u8 i;
     u8 sum;
@@ -555,7 +786,7 @@ u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
     return sum;
 }
 
-u8 GetWildBattleTransition(void)
+static u8 GetWildBattleTransition(void)
 {
     u8 transitionType = GetBattleTransitionTypeByMap();
     u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
@@ -577,7 +808,7 @@ u8 GetWildBattleTransition(void)
     }
 }
 
-u8 GetTrainerBattleTransition(void)
+static u8 GetTrainerBattleTransition(void)
 {
     u8 minPartyCount;
     u8 transitionType;
@@ -585,7 +816,7 @@ u8 GetTrainerBattleTransition(void)
     u8 playerLevel;
 
     if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT)
-        return B_TRANSITION_STEVEN;
+        return B_TRANSITION_CHAMPION;
 
     if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR)
     {
@@ -597,11 +828,11 @@ u8 GetTrainerBattleTransition(void)
             return B_TRANSITION_GLACIA;
         if (gTrainerBattleOpponent_A == TRAINER_ID_DRAKE)
             return B_TRANSITION_DRAKE;
-        return B_TRANSITION_STEVEN;
+        return B_TRANSITION_CHAMPION;
     }
 
     if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION)
-        return B_TRANSITION_STEVEN;
+        return B_TRANSITION_CHAMPION;
 
     if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_TEAM_MAGMA
         || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_MAGMA_LEADER
@@ -681,7 +912,7 @@ void ChooseStarter(void)
     gMain.savedCallback = CB2_GiveStarter;
 }
 
-void CB2_GiveStarter(void)
+static void CB2_GiveStarter(void)
 {
     u16 starterMon;
 
@@ -694,7 +925,7 @@ void CB2_GiveStarter(void)
     BattleTransition_Start(B_TRANSITION_BLUR);
 }
 
-void CB2_StartFirstBattle(void)
+static void CB2_StartFirstBattle(void)
 {
     UpdatePaletteFade();
     RunTasks();
@@ -714,51 +945,51 @@ void CB2_StartFirstBattle(void)
     }
 }
 
-void CB2_EndFirstBattle(void)
+static void CB2_EndFirstBattle(void)
 {
     Overworld_ClearSavedMusic();
     SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
 }
 
-void sub_80B1218(void)
+static void sub_80B1218(void)
 {
     if (GetGameStat(GAME_STAT_WILD_BATTLES) % 60 == 0)
         sub_81DA57C();
 }
 
-void sub_80B1234(void)
+static void sub_80B1234(void)
 {
     if (GetGameStat(GAME_STAT_TRAINER_BATTLES) % 20 == 0)
         sub_81DA57C();
 }
 
 // why not just use the macros? maybe its because they didnt want to uncast const every time?
-u32 TrainerBattleLoadArg32(const u8 *ptr)
+static u32 TrainerBattleLoadArg32(const u8 *ptr)
 {
     return T1_READ_32(ptr);
 }
 
-u16 TrainerBattleLoadArg16(const u8 *ptr)
+static u16 TrainerBattleLoadArg16(const u8 *ptr)
 {
     return T1_READ_16(ptr);
 }
 
-u8 TrainerBattleLoadArg8(const u8 *ptr)
+static u8 TrainerBattleLoadArg8(const u8 *ptr)
 {
     return T1_READ_8(ptr);
 }
 
-u16 GetTrainerAFlag(void)
+static u16 GetTrainerAFlag(void)
 {
     return FLAG_TRAINER_FLAG_START + gTrainerBattleOpponent_A;
 }
 
-u16 GetTrainerBFlag(void)
+static u16 GetTrainerBFlag(void)
 {
     return FLAG_TRAINER_FLAG_START + gTrainerBattleOpponent_B;
 }
 
-bool32 IsPlayerDefeated(u32 battleOutcome)
+static bool32 IsPlayerDefeated(u32 battleOutcome)
 {
     switch (battleOutcome)
     {
@@ -782,23 +1013,872 @@ void ResetTrainerOpponentIds(void)
     gTrainerBattleOpponent_B = 0;
 }
 
-void InitTrainerBattleVariables(void)
+static void InitTrainerBattleVariables(void)
 {
     sTrainerBattleMode = 0;
     if (gApproachingTrainerId == 0)
     {
         sTrainerAIntroSpeech = NULL;
         sTrainerADefeatSpeech = NULL;
-        gUnknown_02038BF0 = NULL;
+        sTrainerABattleScriptRetAddr = NULL;
     }
     else
     {
         sTrainerBIntroSpeech = NULL;
         sTrainerBDefeatSpeech = NULL;
-        gUnknown_02038BF4 = NULL;
+        sTrainerBBattleScriptRetAddr = NULL;
     }
     sTrainerMapObjectLocalId = 0;
     sTrainerVictorySpeech = NULL;
     sTrainerCannotBattleSpeech = NULL;
-    gUnknown_02038BEC = NULL;
+    sTrainerBattleEndScript = NULL;
+}
+
+static inline void SetU8(void *ptr, u8 value)
+{
+    *(u8*)(ptr) = value;
+}
+
+static inline void SetU16(void *ptr, u16 value)
+{
+    *(u16*)(ptr) = value;
+}
+
+static inline void SetU32(void *ptr, u32 value)
+{
+    *(u32*)(ptr) = value;
+}
+
+static inline void SetPtr(const void *ptr, const void* value)
+{
+    *(const void**)(ptr) = value;
+}
+
+static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, const u8 *data)
+{
+    while (1)
+    {
+        switch (specs->ptrType)
+        {
+        case TRAINER_PARAM_LOAD_VAL_8BIT:
+            SetU8(specs->varPtr, TrainerBattleLoadArg8(data));
+            data += 1;
+            break;
+        case TRAINER_PARAM_LOAD_VAL_16BIT:
+            SetU16(specs->varPtr, TrainerBattleLoadArg16(data));
+            data += 2;
+            break;
+        case TRAINER_PARAM_LOAD_VAL_32BIT:
+            SetU32(specs->varPtr, TrainerBattleLoadArg32(data));
+            data += 4;
+            break;
+        case TRAINER_PARAM_CLEAR_VAL_8BIT:
+            SetU8(specs->varPtr, 0);
+            break;
+        case TRAINER_PARAM_CLEAR_VAL_16BIT:
+            SetU16(specs->varPtr, 0);
+            break;
+        case TRAINER_PARAM_CLEAR_VAL_32BIT:
+            SetU32(specs->varPtr, 0);
+            break;
+        case TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR:
+            SetPtr(specs->varPtr, data);
+            return;
+        }
+        specs++;
+    }
+}
+
+void SetMapVarsToTrainer(void)
+{
+    if (sTrainerMapObjectLocalId != 0)
+    {
+        gSpecialVar_LastTalked = sTrainerMapObjectLocalId;
+        gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(sTrainerMapObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+    }
+}
+
+const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
+{
+    InitTrainerBattleVariables();
+    sTrainerBattleMode = TrainerBattleLoadArg8(data);
+
+    switch (sTrainerBattleMode)
+    {
+    case 3:
+        TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data);
+        return EventScript_2713C2;
+    case 4:
+        TrainerBattleLoadArgs(sDoubleBattleParams, data);
+        SetMapVarsToTrainer();
+        return EventScript_TryDoDoubleTrainerBattle;
+    case 2:
+        if (gApproachingTrainerId == 0)
+        {
+            TrainerBattleLoadArgs(sContinueScriptBattleParams, data);
+            SetMapVarsToTrainer();
+        }
+        else
+        {
+            TrainerBattleLoadArgs(sTrainerBContinueScriptBattleParams, data);
+        }
+        return EventScript_271362;
+    case 1:
+        TrainerBattleLoadArgs(sContinueScriptBattleParams, data);
+        SetMapVarsToTrainer();
+        return EventScript_271362;
+    case 6:
+    case 8:
+        TrainerBattleLoadArgs(sContinueScriptDoubleBattleParams, data);
+        SetMapVarsToTrainer();
+        return EventScript_TryDoDoubleTrainerBattle;
+    case 7:
+        TrainerBattleLoadArgs(sDoubleBattleParams, data);
+        SetMapVarsToTrainer();
+        gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A);
+        return EventScript_TryDoDoubleRematchBattle;
+    case 5:
+        TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
+        SetMapVarsToTrainer();
+        gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A);
+        return EventScript_2713D1;
+    case 9:
+        if (gApproachingTrainerId == 0)
+        {
+            TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
+            SetMapVarsToTrainer();
+            gTrainerBattleOpponent_A = sub_81A9AA8(gSpecialVar_LastTalked);
+        }
+        else
+        {
+            TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data);
+            gTrainerBattleOpponent_B = sub_81A9AA8(gSpecialVar_LastTalked);
+        }
+        return EventScript_271362;
+    case 10:
+        TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
+        return NULL;
+    case 11:
+        TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data);
+        return NULL;
+    case 12:
+        if (gApproachingTrainerId == 0)
+        {
+            TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
+            SetMapVarsToTrainer();
+            gTrainerBattleOpponent_A = sub_81D6180(gSpecialVar_LastTalked);
+        }
+        else
+        {
+            TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data);
+            gTrainerBattleOpponent_B = sub_81D6180(gSpecialVar_LastTalked);
+        }
+        return EventScript_271362;
+    default:
+        if (gApproachingTrainerId == 0)
+        {
+            TrainerBattleLoadArgs(sOrdinaryBattleParams, data);
+            SetMapVarsToTrainer();
+        }
+        else
+        {
+            TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data);
+        }
+        return EventScript_271362;
+    }
+}
+
+void ConfigureAndSetUpOneTrainerBattle(u8 trainerMapObjId, const u8 *trainerScript)
+{
+    gSelectedMapObject = trainerMapObjId;
+    gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId;
+    BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
+    ScriptContext1_SetupScript(EventScript_271354);
+    ScriptContext2_Enable();
+}
+
+void ConfigureTwoTrainersBattle(u8 trainerMapObjId, const u8 *trainerScript)
+{
+    gSelectedMapObject = trainerMapObjId;
+    gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId;
+    BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
+}
+
+void SetUpTwoTrainersBattle(void)
+{
+    ScriptContext1_SetupScript(EventScript_271354);
+    ScriptContext2_Enable();
+}
+
+bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
+{
+    u32 flag = TrainerBattleLoadArg16(data + 2);
+    return FlagGet(FLAG_TRAINER_FLAG_START + flag);
+}
+
+void sub_80B16D8(void)
+{
+    struct MapObject *mapObject = &gMapObjects[gSelectedMapObject];
+
+    npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->mapobj_unk_18));
+}
+
+u8 GetTrainerBattleMode(void)
+{
+    return sTrainerBattleMode;
+}
+
+bool8 GetTrainerFlag(void)
+{
+    if (InBattlePyramid())
+        return GetBattlePyramidTrainerFlag(gSelectedMapObject);
+    else if (InTrainerHill())
+        return GetTrainerHillTrainerFlag(gSelectedMapObject);
+    else
+        return FlagGet(GetTrainerAFlag());
+}
+
+static void SetBattledTrainersFlags(void)
+{
+    if (gTrainerBattleOpponent_B != 0)
+        FlagSet(GetTrainerBFlag());
+    FlagSet(GetTrainerAFlag());
+}
+
+static void SetBattledTrainerFlag(void)
+{
+    FlagSet(GetTrainerAFlag());
+}
+
+bool8 HasTrainerBeenFought(u16 trainerId)
+{
+    return FlagGet(FLAG_TRAINER_FLAG_START + trainerId);
+}
+
+void SetTrainerFlag(u16 trainerId)
+{
+    FlagSet(FLAG_TRAINER_FLAG_START + trainerId);
+}
+
+void ClearTrainerFlag(u16 trainerId)
+{
+    FlagClear(FLAG_TRAINER_FLAG_START + trainerId);
+}
+
+void BattleSetup_StartTrainerBattle(void)
+{
+    if (gNoOfApproachingTrainers == 2)
+        gBattleTypeFlags = (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TRAINER);
+    else
+        gBattleTypeFlags = (BATTLE_TYPE_TRAINER);
+
+    if (InBattlePyramid())
+    {
+        VarSet(VAR_0x400E, 0);
+        gBattleTypeFlags |= BATTLE_TYPE_PYRAMID;
+
+        if (gNoOfApproachingTrainers == 2)
+        {
+            sub_816306C(1);
+            ZeroMonData(&gEnemyParty[1]);
+            ZeroMonData(&gEnemyParty[2]);
+            ZeroMonData(&gEnemyParty[4]);
+            ZeroMonData(&gEnemyParty[5]);
+        }
+        else
+        {
+            sub_8163048(1);
+            ZeroMonData(&gEnemyParty[1]);
+            ZeroMonData(&gEnemyParty[2]);
+        }
+
+        sub_81A9B04();
+    }
+    else if (sub_81D5C18())
+    {
+        gBattleTypeFlags |= BATTLE_TYPE_x4000000;
+
+        if (gNoOfApproachingTrainers == 2)
+            sub_81D639C();
+        else
+            sub_81D6384();
+
+        sub_81D61E8();
+    }
+
+    sNoOfPossibleTrainerRetScripts = gNoOfApproachingTrainers;
+    gNoOfApproachingTrainers = 0;
+    sShouldCheckTrainerBScript = FALSE;
+    gUnknown_03006080 = 0;
+    gMain.savedCallback = CB2_EndTrainerBattle;
+
+    if (InBattlePyramid() || sub_81D5C18())
+        sub_80B0828();
+    else
+        DoTrainerBattle();
+
+    ScriptContext1_Stop();
+}
+
+static void CB2_EndTrainerBattle(void)
+{
+    if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT)
+    {
+        SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+    }
+    else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
+    {
+        if (InBattlePyramid() || sub_81D5C18())
+            SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+        else
+            SetMainCallback2(CB2_WhiteOut);
+    }
+    else
+    {
+        SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+        if (!InBattlePyramid() && !sub_81D5C18())
+        {
+            RegisterTrainerInMatchCall();
+            SetBattledTrainersFlags();
+        }
+    }
+}
+
+static void CB2_EndRematchBattle(void)
+{
+    if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT)
+    {
+        SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+    }
+    else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
+    {
+        SetMainCallback2(CB2_WhiteOut);
+    }
+    else
+    {
+        SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+        RegisterTrainerInMatchCall();
+        SetBattledTrainersFlags();
+        HandleRematchVarsOnBattleEnd();
+    }
+}
+
+void BattleSetup_StartRematchBattle(void)
+{
+    gBattleTypeFlags = BATTLE_TYPE_TRAINER;
+    gMain.savedCallback = CB2_EndRematchBattle;
+    DoTrainerBattle();
+    ScriptContext1_Stop();
+}
+
+void ShowTrainerIntroSpeech(void)
+{
+    if (InBattlePyramid())
+    {
+        if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1)
+            sub_81A9EDC(sub_81A9AA8(gSpecialVar_LastTalked));
+        else
+            sub_81A9EDC(sub_81A9AA8(gMapObjects[gApproachingTrainers[gApproachingTrainerId].mapObjectId].localId));
+
+        sub_80982B8();
+    }
+    else if (sub_81D5C18())
+    {
+        if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1)
+            sub_81D572C(2, sub_81D6180(gSpecialVar_LastTalked));
+        else
+            sub_81D572C(2, sub_81D6180(gMapObjects[gApproachingTrainers[gApproachingTrainerId].mapObjectId].localId));
+
+        sub_80982B8();
+    }
+    else
+    {
+        ShowFieldMessage(GetIntroSpeechOfApproachingTrainer());
+    }
+}
+
+const u8 *BattleSetup_GetScriptAddrAfterBattle(void)
+{
+    if (sTrainerBattleEndScript != NULL)
+        return sTrainerBattleEndScript;
+    else
+        return EventScript_TestSignpostMsg;
+}
+
+const u8 *BattleSetup_GetTrainerPostBattleScript(void)
+{
+    if (sShouldCheckTrainerBScript)
+    {
+        sShouldCheckTrainerBScript = FALSE;
+        if (sTrainerBBattleScriptRetAddr != NULL)
+        {
+            gUnknown_03006080 = 1;
+            return sTrainerBBattleScriptRetAddr;
+        }
+    }
+    else
+    {
+        if (sTrainerABattleScriptRetAddr != NULL)
+        {
+            gUnknown_03006080 = 0;
+            return sTrainerABattleScriptRetAddr;
+        }
+    }
+
+    return EventScript_TryGetTrainerScript;
+}
+
+void ShowTrainerCantBattleSpeech(void)
+{
+    ShowFieldMessage(GetTrainerCantBattleSpeech());
+}
+
+void SetUpTrainerEncounterMusic(void)
+{
+    u16 trainerId;
+    u16 music;
+
+    if (gApproachingTrainerId == 0)
+        trainerId = gTrainerBattleOpponent_A;
+    else
+        trainerId = gTrainerBattleOpponent_B;
+
+    if (sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC
+        && sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC)
+    {
+        switch (GetTrainerEncounterMusicId(trainerId))
+        {
+        case TRAINER_ENCOUNTER_MUSIC_MALE:
+            music = BGM_BOYEYE;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_FEMALE:
+            music = BGM_GIRLEYE;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_GIRL:
+            music = BGM_SYOUJOEYE;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_INTENSE:
+            music = BGM_HAGESHII;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_COOL:
+            music = BGM_KAKKOII;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_AQUA:
+            music = BGM_AQA_0;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_MAGMA:
+            music = BGM_MGM0;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_SWIMMER:
+            music = BGM_SWIMEYE;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_TWINS:
+            music = BGM_HUTAGO;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR:
+            music = BGM_SITENNOU;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_HIKER:
+            music = BGM_YAMA_EYE;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER:
+            music = BGM_INTER_V;
+            break;
+        case TRAINER_ENCOUNTER_MUSIC_RICH:
+            music = BGM_TEST;
+            break;
+        default:
+            music = BGM_AYASII;
+        }
+        PlayNewMapMusic(music);
+    }
+}
+
+static const u8 *ReturnEmptyStringIfNull(const u8 *string)
+{
+    if (string == NULL)
+        return gText_EmptyString2;
+    else
+        return string;
+}
+
+static const u8 *GetIntroSpeechOfApproachingTrainer(void)
+{
+    if (gApproachingTrainerId == 0)
+        return ReturnEmptyStringIfNull(sTrainerAIntroSpeech);
+    else
+        return ReturnEmptyStringIfNull(sTrainerBIntroSpeech);
+}
+
+const u8 *GetTrainerALoseText(void)
+{
+    const u8 *string;
+
+    if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT)
+        string = GetSecretBaseTrainerLoseText();
+    else
+        string = sTrainerADefeatSpeech;
+
+    StringExpandPlaceholders(gStringVar4, ReturnEmptyStringIfNull(string));
+    return gStringVar4;
+}
+
+const u8 *GetTrainerBLoseText(void)
+{
+    StringExpandPlaceholders(gStringVar4, ReturnEmptyStringIfNull(sTrainerBDefeatSpeech));
+    return gStringVar4;
+}
+
+const u8 *GetTrainerWonSpeech(void)
+{
+    return ReturnEmptyStringIfNull(sTrainerVictorySpeech);
+}
+
+static const u8 *GetTrainerCantBattleSpeech(void)
+{
+    return ReturnEmptyStringIfNull(sTrainerCannotBattleSpeech);
+}
+
+static s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId)
+{
+    s32 i;
+
+    for (i = 0; i < REMATCH_TABLE_ENTRIES; i++)
+    {
+        if (table[i].trainerIds[0] == trainerId)
+            return i;
+    }
+
+    return -1;
+}
+
+static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId)
+{
+    s32 i, j;
+
+    for (i = 0; i < REMATCH_TABLE_ENTRIES; i++)
+    {
+        for (j = 0; j < REMATCHES_COUNT; j++)
+        {
+            if (table[i].trainerIds[j] == 0)
+                break;
+            if (table[i].trainerIds[j] == trainerId)
+                return i;
+        }
+    }
+
+    return -1;
+}
+
+static bool32 sub_80B1D94(s32 rematchTableId)
+{
+    if (rematchTableId >= REMATCH_ELITE_FOUR_ENTRIES)
+        return TRUE;
+    else if (rematchTableId == REMATCH_WALLY_ENTRY)
+        return (FlagGet(FLAG_7E) == FALSE);
+    else
+        return FALSE;
+}
+
+static void SetRematchIdForTrainer(const struct RematchTrainer *table, u32 tableId)
+{
+    s32 i;
+
+    for (i = 1; i < REMATCHES_COUNT; i++)
+    {
+        u16 trainerId = table[tableId].trainerIds[i];
+
+        if (trainerId == 0)
+            break;
+        if (!HasTrainerBeenFought(trainerId))
+            break;
+    }
+
+    gSaveBlock1Ptr->trainerRematches[tableId] = i;
+}
+
+static bool32 UpdateRandomTrainerRematches(const struct RematchTrainer *table, u16 mapGroup, u16 mapNum)
+{
+    s32 i;
+    bool32 ret = FALSE;
+
+    for (i = 0; i <= REMATCH_WALLY_ENTRY; i++)
+    {
+        if (table[i].mapGroup == mapGroup && table[i].mapNum == mapNum && !sub_80B1D94(i))
+        {
+            if (gSaveBlock1Ptr->trainerRematches[i] != 0)
+            {
+                // Trainer already wants a rematch. Don't bother updating it
+                ret = TRUE;
+            }
+            else if (FlagGet(FLAG_MATCH_CALL_REGISTERED + i)
+             && (Random() % 100) <= 30)  // 31% chance of getting a rematch
+            {
+                SetRematchIdForTrainer(table, i);
+                ret = TRUE;
+            }
+        }
+    }
+
+    return ret;
+}
+
+void UpdateRematchIfDefeated(s32 rematchTableId)
+{
+    if (HasTrainerBeenFought(gRematchTable[rematchTableId].trainerIds[0]) == TRUE)
+        SetRematchIdForTrainer(gRematchTable, rematchTableId);
+}
+
+static bool32 DoesSomeoneWantRematchIn_(const struct RematchTrainer *table, u16 mapGroup, u16 mapNum)
+{
+    s32 i;
+
+    for (i = 0; i < REMATCH_TABLE_ENTRIES; i++)
+    {
+        if (table[i].mapGroup == mapGroup && table[i].mapNum == mapNum && gSaveBlock1Ptr->trainerRematches[i] != 0)
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+static bool32 IsRematchTrainerIn_(const struct RematchTrainer *table, u16 mapGroup, u16 mapNum)
+{
+    s32 i;
+
+    for (i = 0; i < REMATCH_TABLE_ENTRIES; i++)
+    {
+        if (table[i].mapGroup == mapGroup && table[i].mapNum == mapNum)
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+static bool8 IsFirstTrainerIdReadyForRematch(const struct RematchTrainer *table, u16 firstBattleTrainerId)
+{
+    s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
+
+    if (tableId == -1)
+        return FALSE;
+    if (tableId >= 100)
+        return FALSE;
+    if (gSaveBlock1Ptr->trainerRematches[tableId] == 0)
+        return FALSE;
+
+    return TRUE;
+}
+
+static bool8 IsTrainerReadyForRematch_(const struct RematchTrainer *table, u16 trainerId)
+{
+    s32 tableId = TrainerIdToRematchTableId(table, trainerId);
+
+    if (tableId == -1)
+        return FALSE;
+    if (tableId >= 100)
+        return FALSE;
+    if (gSaveBlock1Ptr->trainerRematches[tableId] == 0)
+        return FALSE;
+
+    return TRUE;
+}
+
+static u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 firstBattleTrainerId)
+{
+    const struct RematchTrainer *trainerEntry;
+    s32 i;
+    s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
+
+    if (tableId == -1)
+        return FALSE;
+
+    trainerEntry = &table[tableId];
+    for (i = 1; i < REMATCHES_COUNT; i++)
+    {
+        if (trainerEntry->trainerIds[i] == 0) // previous entry was this trainer's last one
+            return trainerEntry->trainerIds[i - 1];
+        if (!HasTrainerBeenFought(trainerEntry->trainerIds[i]))
+            return trainerEntry->trainerIds[i];
+    }
+
+    return trainerEntry->trainerIds[REMATCHES_COUNT - 1]; // already beaten at max stage
+}
+
+static u16 GetLastBeatenRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 firstBattleTrainerId)
+{
+    const struct RematchTrainer *trainerEntry;
+    s32 i;
+    s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
+
+    if (tableId == -1)
+        return FALSE;
+
+    trainerEntry = &table[tableId];
+    for (i = 1; i < REMATCHES_COUNT; i++)
+    {
+        if (trainerEntry->trainerIds[i] == 0) // previous entry was this trainer's last one
+            return trainerEntry->trainerIds[i - 1];
+        if (!HasTrainerBeenFought(trainerEntry->trainerIds[i]))
+            return trainerEntry->trainerIds[i - 1];
+    }
+
+    return trainerEntry->trainerIds[REMATCHES_COUNT - 1]; // already beaten at max stage
+}
+
+static void ClearTrainerWantRematchState(const struct RematchTrainer *table, u16 firstBattleTrainerId)
+{
+    s32 tableId = TrainerIdToRematchTableId(table, firstBattleTrainerId);
+
+    if (tableId != -1)
+        gSaveBlock1Ptr->trainerRematches[tableId] = 0;
+}
+
+static u32 GetTrainerMatchCallFlag(u32 trainerId)
+{
+    s32 i;
+
+    for (i = 0; i < REMATCH_TABLE_ENTRIES; i++)
+    {
+        if (gRematchTable[i].trainerIds[0] == trainerId)
+            return FLAG_MATCH_CALL_REGISTERED + i;
+    }
+
+    return 0xFFFF;
+}
+
+static void RegisterTrainerInMatchCall(void)
+{
+    if (FlagGet(FLAG_HAS_MATCH_CALL))
+    {
+        u32 matchCallFlagId = GetTrainerMatchCallFlag(gTrainerBattleOpponent_A);
+        if (matchCallFlagId != 0xFFFF)
+            FlagSet(matchCallFlagId);
+    }
+}
+
+static bool8 WasSecondRematchWon(const struct RematchTrainer *table, u16 firstBattleTrainerId)
+{
+    s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
+
+    if (tableId == -1)
+        return FALSE;
+    if (!HasTrainerBeenFought(table[tableId].trainerIds[1]))
+        return FALSE;
+
+    return TRUE;
+}
+
+static bool32 HasAtLeastFiveBadges(void)
+{
+    s32 i, count;
+
+    for (count = 0, i = 0; i < ARRAY_COUNT(sBadgeFlags); i++)
+    {
+        if (FlagGet(sBadgeFlags[i]) == TRUE)
+        {
+            if (++count >= 5)
+                return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+#define STEP_COUNTER_MAX 255
+
+void IncrementRematchStepCounter(void)
+{
+    if (HasAtLeastFiveBadges())
+    {
+        if (gSaveBlock1Ptr->trainerRematchStepCounter >= STEP_COUNTER_MAX)
+            gSaveBlock1Ptr->trainerRematchStepCounter = STEP_COUNTER_MAX;
+        else
+            gSaveBlock1Ptr->trainerRematchStepCounter++;
+    }
+}
+
+static bool32 IsRematchStepCounterMaxed(void)
+{
+    if (HasAtLeastFiveBadges() && gSaveBlock1Ptr->trainerRematchStepCounter >= STEP_COUNTER_MAX)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum)
+{
+    if (IsRematchStepCounterMaxed() && UpdateRandomTrainerRematches(gRematchTable, mapGroup, mapNum) == TRUE)
+        gSaveBlock1Ptr->trainerRematchStepCounter = 0;
+}
+
+bool32 DoesSomeoneWantRematchIn(u16 mapGroup, u16 mapNum)
+{
+    return DoesSomeoneWantRematchIn_(gRematchTable, mapGroup, mapNum);
+}
+
+bool32 IsRematchTrainerIn(u16 mapGroup, u16 mapNum)
+{
+    return IsRematchTrainerIn_(gRematchTable, mapGroup, mapNum);
+}
+
+static u16 GetRematchTrainerId(u16 trainerId)
+{
+    return GetRematchTrainerIdFromTable(gRematchTable, trainerId);
+}
+
+u16 GetLastBeatenRematchTrainerId(u16 trainerId)
+{
+    return GetLastBeatenRematchTrainerIdFromTable(gRematchTable, trainerId);
+}
+
+bool8 ShouldTryRematchBattle(void)
+{
+    if (IsFirstTrainerIdReadyForRematch(gRematchTable, gTrainerBattleOpponent_A))
+        return TRUE;
+
+    return WasSecondRematchWon(gRematchTable, gTrainerBattleOpponent_A);
+}
+
+bool8 IsTrainerReadyForRematch(void)
+{
+    return IsTrainerReadyForRematch_(gRematchTable, gTrainerBattleOpponent_A);
+}
+
+static void HandleRematchVarsOnBattleEnd(void)
+{
+    ClearTrainerWantRematchState(gRematchTable, gTrainerBattleOpponent_A);
+    SetBattledTrainersFlags();
+}
+
+void ShouldTryGetTrainerScript(void)
+{
+    if (sNoOfPossibleTrainerRetScripts > 1)
+    {
+        sNoOfPossibleTrainerRetScripts = 0;
+        sShouldCheckTrainerBScript = TRUE;
+        gSpecialVar_Result = TRUE;
+    }
+    else
+    {
+        sShouldCheckTrainerBScript = FALSE;
+        gSpecialVar_Result = FALSE;
+    }
+}
+
+u16 CountBattledRematchTeams(u16 trainerId)
+{
+    s32 i;
+
+    if (HasTrainerBeenFought(gRematchTable[trainerId].trainerIds[0]) != TRUE)
+        return 0;
+
+    for (i = 1; i < REMATCHES_COUNT; i++)
+    {
+        if (gRematchTable[trainerId].trainerIds[i] == 0)
+            break;
+        if (!HasTrainerBeenFought(gRematchTable[trainerId].trainerIds[i]))
+            break;
+    }
+
+    return i;
 }
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 7014be492..4602b2f7a 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -1155,7 +1155,7 @@ u8 GetMonsStateToDoubles_2(void)
     s32 aliveCount = 0;
     s32 i;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         u32 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL);
         if (species != SPECIES_EGG && species != SPECIES_NONE
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 183b9bab5..f292bd769 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -656,7 +656,7 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx)
 bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
 {
     u8 mode = ScriptReadByte(ctx);
-    
+
     switch (mode)
     {
         case 1:
@@ -1445,7 +1445,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx)
     u8 top = ScriptReadByte(ctx);
     u8 multichoiceId = ScriptReadByte(ctx);
     u8 ignoreBPress = ScriptReadByte(ctx);
-    
+
     /*if (Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE)
     {
         ScriptContext1_Stop();
@@ -1501,31 +1501,31 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
     u8 y;
 
     StringExpandPlaceholders(gStringVar4, ptr + 6);
-    
+
     width = GetStringWidth(6, gStringVar4, -1) / 8;
-    
+
     if (width > 0x1C)
         width = 0x1C;
-    
+
     for (i = 0, height = 4; gStringVar4[i] != 0xFF;)
     {
         if (gStringVar4[i++] == 0xFE)
             height += 3;
     }
-    
+
     if (height > 0x12)
         height = 0x12;
-    
+
     x = width + 2;
     temp1 = (0x1E - x) / 2;
     x = temp1 + 1;
     temp1 = ((x - temp1 - 1) * 8 + 3);
-    
+
     y = height + 2;
     temp2 = (0x14 - y) / 2;
     y = temp2 + 2;
     temp2 = ((y - temp2 - 1) * 8);
-    
+
     sub_8198A50(&template1, 0, x, y, width, height, 0xF, 0x1);
     template2 = template1;
     gUnknown_03000F30 = AddWindow(&template2);
@@ -1924,7 +1924,7 @@ bool8 ScrCmd_hidemoneybox(struct ScriptContext *ctx)
 {
     /*u8 x = ScriptReadByte(ctx);
     u8 y = ScriptReadByte(ctx);*/
-    
+
     HideMoneyBox();
     return FALSE;
 }
@@ -1979,13 +1979,13 @@ bool8 ScrCmd_dotrainerbattle(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_ontrainerbattleend(struct ScriptContext *ctx)
+bool8 ScrCmd_gotobattleendscript(struct ScriptContext *ctx)
 {
     ctx->scriptPtr = BattleSetup_GetScriptAddrAfterBattle();
     return FALSE;
 }
 
-bool8 ScrCmd_ontrainerbattleendgoto(struct ScriptContext *ctx)
+bool8 ScrCmd_gototrainerscript(struct ScriptContext *ctx)
 {
     ctx->scriptPtr = BattleSetup_GetTrainerPostBattleScript();
     return FALSE;
@@ -1995,7 +1995,7 @@ bool8 ScrCmd_checktrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
 
-    ctx->comparisonResult = HasTrainerAlreadyBeenFought(index);
+    ctx->comparisonResult = HasTrainerBeenFought(index);
     return FALSE;
 }
 
@@ -2003,7 +2003,7 @@ bool8 ScrCmd_settrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
 
-    trainer_flag_set(index);
+    SetTrainerFlag(index);
     return FALSE;
 }
 
@@ -2011,7 +2011,7 @@ bool8 ScrCmd_cleartrainerflag(struct ScriptContext *ctx)
 {
     u16 index = VarGet(ScriptReadHalfword(ctx));
 
-    trainer_flag_clear(index);
+    ClearTrainerFlag(index);
     return FALSE;
 }
 
@@ -2374,7 +2374,7 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
 bool8 ScrCmd_cmdCF(struct ScriptContext *ctx)
 {
     const u8* v1 = sub_8099244();
-    
+
     if (v1)
     {
         ((u8*)gUnknown_020375C0) = ctx->scriptPtr;
diff --git a/src/secret_base.c b/src/secret_base.c
index de2b7221a..0550d7786 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1282,7 +1282,7 @@ u8 sub_80EA20C(u8 secretBaseRecordId)
     return (gSaveBlock1Ptr->secretBases[secretBaseRecordId].trainerId[0] % 5) + (gSaveBlock1Ptr->secretBases[secretBaseRecordId].gender * 5);
 }
 
-const u8 *sub_80EA250(void)
+const u8 *GetSecretBaseTrainerLoseText(void)
 {
     u8 param;
 
diff --git a/src/trainer_see.c b/src/trainer_see.c
new file mode 100644
index 000000000..c469e11ed
--- /dev/null
+++ b/src/trainer_see.c
@@ -0,0 +1,68 @@
+#include "global.h"
+#include "trainer_see.h"
+#include "battle_setup.h"
+
+extern u8 gApproachingTrainerId;
+extern u8 gNoOfApproachingTrainers;
+extern u8 gUnknown_030060AC;
+extern u16 gUnknown_03006080;
+
+// this file's functions
+u8 CheckIfTrainerWantsBattle(u8 mapObjectId);
+
+bool8 CheckForTrainersWantingBattle(void)
+{
+    u8 i;
+
+    gNoOfApproachingTrainers = 0;
+    gApproachingTrainerId = 0;
+
+    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+    {
+        u8 retVal;
+
+        if (!gMapObjects[i].active)
+            continue;
+        if (gMapObjects[i].trainerType != 1 && gMapObjects[i].trainerType != 3)
+            continue;
+
+        retVal = CheckIfTrainerWantsBattle(i);
+        if (retVal == 2)
+            break; // two trainers has been found
+
+        if (retVal == 0) // no trainers
+            continue;
+
+        if (gNoOfApproachingTrainers > 1)
+            break;
+        if (GetMonsStateToDoubles_2() != 0) // one trainer found and cant have a double battle
+            break;
+    }
+
+    if (gNoOfApproachingTrainers == 1)
+    {
+        ResetTrainerOpponentIds();
+        ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].mapObjectId,
+                                          gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr);
+        gUnknown_030060AC = 1;
+        return TRUE;
+    }
+    else if (gNoOfApproachingTrainers == 2)
+    {
+        ResetTrainerOpponentIds();
+        for (i = 0; i < gNoOfApproachingTrainers; i++, gApproachingTrainerId++)
+        {
+            ConfigureTwoTrainersBattle(gApproachingTrainers[i].mapObjectId,
+                                       gApproachingTrainers[i].trainerScriptPtr);
+        }
+        SetUpTwoTrainersBattle();
+        gApproachingTrainerId = 0;
+        gUnknown_030060AC = 1;
+        return TRUE;
+    }
+    else
+    {
+        gUnknown_030060AC = 0;
+        return FALSE;
+    }
+}
-- 
cgit v1.2.3


From 273474d57a39014654e60df151604ed5a28aeb57 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 2 Dec 2017 00:03:46 +0100
Subject: give names to some battlescripts

---
 src/battle_ai_script_commands.c |  1 -
 src/battle_script_commands.c    | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 97226f5c9..c2e89f68d 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -12,7 +12,6 @@
 
 #define AIScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24)
 #define AIScriptRead16(ptr) ((ptr)[0] | (ptr)[1] << 8)
-#define AIScriptRead8(ptr) ((ptr)[0])
 #define AIScriptReadPtr(ptr) (const u8*) AIScriptRead32(ptr)
 
 #define AI_ACTION_DONE          0x0001
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index d9b35c053..c64fb99ef 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -6383,7 +6383,7 @@ static void atk62(void)
 
 static void atk63_jumptorandomattack(void)
 {
-    if (gBattlescriptCurrInstr[1] != 0)
+    if (gBattlescriptCurrInstr[1])
         gCurrentMove = gRandomMove;
     else
         gChosenMove = gCurrentMove = gRandomMove;
@@ -7790,7 +7790,7 @@ static void atk8E_initmultihitstring(void)
     gBattlescriptCurrInstr++;
 }
 
-static bool8 sub_8051064(void)
+static bool8 TryDoForceSwitchOut(void)
 {
     if (gBattleMons[gBankAttacker].level >= gBattleMons[gBankTarget].level)
     {
@@ -7807,7 +7807,7 @@ static bool8 sub_8051064(void)
         *(gBattleStruct->field_58 + gBankTarget) = gBattlePartyID[gBankTarget];
     }
 
-    gBattlescriptCurrInstr = BattleScript_82DADD8;
+    gBattlescriptCurrInstr = BattleScript_SuccessForceOut;
     return TRUE;
 }
 
@@ -7935,7 +7935,7 @@ static void atk8F_forcerandomswitch(void)
         }
         else
         {
-            if (sub_8051064())
+            if (TryDoForceSwitchOut())
             {
                 do
                 {
@@ -7968,7 +7968,7 @@ static void atk8F_forcerandomswitch(void)
     }
     else
     {
-        sub_8051064();
+        TryDoForceSwitchOut();
     }
 }
 
@@ -9306,7 +9306,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
             gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2);
     }
 
-    if (gActionForBanks[gBankTarget] == 0
+    if (gActionForBanks[gBankTarget] == ACTION_USE_MOVE
         && gBankAttacker == *(gBattleStruct->moveTarget + gBankTarget)
         && !(gBattleMons[gBankTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE))
         && gBattleMons[gBankAttacker].hp
-- 
cgit v1.2.3


From d75e7ace1dd034273ca47473a2f543904f823f53 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 2 Dec 2017 14:08:55 +0100
Subject: label battle stuff

---
 src/battle_2.c               |  20 ++++-----
 src/battle_script_commands.c |   2 +-
 src/battle_util.c            | 100 +++++++++++++++++++++----------------------
 src/battle_util2.c           |   8 +---
 src/evolution_scene.c        |  45 +++++++++----------
 5 files changed, 86 insertions(+), 89 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index eead4d7a9..9bb41461d 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -3668,10 +3668,10 @@ static void TryDoEventsBeforeFirstTurn(void)
 
     *(&gBattleStruct->turnEffectsTracker) = 0;
     *(&gBattleStruct->turnEffectsBank) = 0;
-    *(&gBattleStruct->field_1A0) = 0;
-    *(&gBattleStruct->field_1A1) = 0;
+    *(&gBattleStruct->wishPerishSongState) = 0;
+    *(&gBattleStruct->wishPerishSongBank) = 0;
     gBattleScripting.atk49_state = 0;
-    gBattleStruct->field_4D = 0;
+    gBattleStruct->faintedActionsState = 0;
     gBattleStruct->turncountersTracker = 0;
     gBattleMoveFlags = 0;
 
@@ -3701,8 +3701,8 @@ static void HandleEndTurn_ContinueBattle(void)
         }
         gBattleStruct->turnEffectsTracker = 0;
         gBattleStruct->turnEffectsBank = 0;
-        gBattleStruct->field_1A0 = 0;
-        gBattleStruct->field_1A1 = 0;
+        gBattleStruct->wishPerishSongState = 0;
+        gBattleStruct->wishPerishSongBank = 0;
         gBattleStruct->turncountersTracker = 0;
         gBattleMoveFlags = 0;
     }
@@ -3720,10 +3720,10 @@ void BattleTurnPassed(void)
         if (TurnBasedEffects() != 0)
             return;
     }
-    if (sub_8041728() != 0)
+    if (HandleFaintedMonActions() != 0)
         return;
-    gBattleStruct->field_4D = 0;
-    if (sub_8041364() != 0)
+    gBattleStruct->faintedActionsState = 0;
+    if (HandleWishPerishSongOnTurnEnd() != 0)
         return;
 
     TurnValuesCleanUp(FALSE);
@@ -5565,9 +5565,9 @@ static void HandleAction_Action9(void)
 
 static void HandleAction_Action11(void)
 {
-    if (!sub_8041728())
+    if (!HandleFaintedMonActions())
     {
-        gBattleStruct->field_4D = 0;
+        gBattleStruct->faintedActionsState = 0;
         gCurrentActionFuncId = ACTION_FINISHED;
     }
 }
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c64fb99ef..54811a90d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -1053,7 +1053,7 @@ static void atk00_attackcanceler(void)
 
     if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
-        i = IsPokeDisobedient(); // why use the 'i' variable...?
+        i = IsMonDisobedient(); // why use the 'i' variable...?
         switch (i)
         {
         case 0:
diff --git a/src/battle_util.c b/src/battle_util.c
index 5c305a4e4..c08833858 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1113,23 +1113,23 @@ u8 TurnBasedEffects(void)
     return 0;
 }
 
-bool8 sub_8041364(void)
+bool8 HandleWishPerishSongOnTurnEnd(void)
 {
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
 
-    switch (gBattleStruct->field_1A0)
+    switch (gBattleStruct->wishPerishSongState)
     {
     case 0:
-        while (gBattleStruct->field_1A1 < gNoOfAllBanks)
+        while (gBattleStruct->wishPerishSongBank < gNoOfAllBanks)
         {
-            gActiveBank = gBattleStruct->field_1A1;
+            gActiveBank = gBattleStruct->wishPerishSongBank;
             if (gAbsentBankFlags & gBitTable[gActiveBank])
             {
-                gBattleStruct->field_1A1++;
+                gBattleStruct->wishPerishSongBank++;
                 continue;
             }
 
-            gBattleStruct->field_1A1++;
+            gBattleStruct->wishPerishSongBank++;
             if (gWishFutureKnock.futureSightCounter[gActiveBank] != 0
              && --gWishFutureKnock.futureSightCounter[gActiveBank] == 0
              && gBattleMons[gActiveBank].hp != 0)
@@ -1157,21 +1157,21 @@ bool8 sub_8041364(void)
         }
         // Why do I have to keep doing this to match?
         {
-            u8* var = &gBattleStruct->field_1A0;
-            *var = 1;
-            gBattleStruct->field_1A1 = 0;
+            u8 *state = &gBattleStruct->wishPerishSongState;
+            *state = 1;
+            gBattleStruct->wishPerishSongBank = 0;
         }
         // fall through
     case 1:
-        while (gBattleStruct->field_1A1 < gNoOfAllBanks)
+        while (gBattleStruct->wishPerishSongBank < gNoOfAllBanks)
         {
-            gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->field_1A1];
+            gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->wishPerishSongBank];
             if (gAbsentBankFlags & gBitTable[gActiveBank])
             {
-                gBattleStruct->field_1A1++;
+                gBattleStruct->wishPerishSongBank++;
                 continue;
             }
-            gBattleStruct->field_1A1++;
+            gBattleStruct->wishPerishSongBank++;
             if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG)
             {
                 PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gActiveBank].perishSongTimer1);
@@ -1192,9 +1192,9 @@ bool8 sub_8041364(void)
         }
         // Hm...
         {
-            u8* var = &gBattleStruct->field_1A0;
-            *var = 2;
-            gBattleStruct->field_1A1 = 0;
+            u8 *state = &gBattleStruct->wishPerishSongState;
+            *state = 2;
+            gBattleStruct->wishPerishSongBank = 0;
         }
         // fall through
     case 2:
@@ -1209,7 +1209,7 @@ bool8 sub_8041364(void)
 
             gBattlescriptCurrInstr = BattleScript_82DB8F3;
             BattleScriptExecute(BattleScript_82DB8F3);
-            gBattleStruct->field_1A0++;
+            gBattleStruct->wishPerishSongState++;
             return TRUE;
         }
         break;
@@ -1220,20 +1220,20 @@ bool8 sub_8041364(void)
     return FALSE;
 }
 
-#define sub_8041728_MAX_CASE 7
+#define FAINTED_ACTIONS_MAX_CASE 7
 
-bool8 sub_8041728(void)
+bool8 HandleFaintedMonActions(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
         return FALSE;
     do
     {
         int i;
-        switch (gBattleStruct->field_4D)
+        switch (gBattleStruct->faintedActionsState)
         {
         case 0:
-            gBattleStruct->field_4E = 0;
-            gBattleStruct->field_4D++;
+            gBattleStruct->faintedActionsBank = 0;
+            gBattleStruct->faintedActionsState++;
             for (i = 0; i < gNoOfAllBanks; i++)
             {
                 if (gAbsentBankFlags & gBitTable[i] && !sub_80423F4(i, 6, 6))
@@ -1243,58 +1243,58 @@ bool8 sub_8041728(void)
         case 1:
             do
             {
-                gBank1 = gBankTarget = gBattleStruct->field_4E;
-                if (gBattleMons[gBattleStruct->field_4E].hp == 0
-                 && !(gBattleStruct->field_DF & gBitTable[gBattlePartyID[gBattleStruct->field_4E]])
-                 && !(gAbsentBankFlags & gBitTable[gBattleStruct->field_4E]))
+                gBank1 = gBankTarget = gBattleStruct->faintedActionsBank;
+                if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
+                 && !(gBattleStruct->field_DF & gBitTable[gBattlePartyID[gBattleStruct->faintedActionsBank]])
+                 && !(gAbsentBankFlags & gBitTable[gBattleStruct->faintedActionsBank]))
                 {
-                    BattleScriptExecute(BattleScript_82DA7C4);
-                    gBattleStruct->field_4D = 2;
+                    BattleScriptExecute(BattleScript_GiveExp);
+                    gBattleStruct->faintedActionsState = 2;
                     return TRUE;
                 }
-            } while (++gBattleStruct->field_4E != gNoOfAllBanks);
-            gBattleStruct->field_4D = 3;
+            } while (++gBattleStruct->faintedActionsBank != gNoOfAllBanks);
+            gBattleStruct->faintedActionsState = 3;
             break;
         case 2:
             sub_803F9EC(gBank1);
-            if (++gBattleStruct->field_4E == gNoOfAllBanks)
-                gBattleStruct->field_4D = 3;
+            if (++gBattleStruct->faintedActionsBank == gNoOfAllBanks)
+                gBattleStruct->faintedActionsState = 3;
             else
-                gBattleStruct->field_4D = 1;
+                gBattleStruct->faintedActionsState = 1;
             break;
         case 3:
-            gBattleStruct->field_4E = 0;
-            gBattleStruct->field_4D++;
+            gBattleStruct->faintedActionsBank = 0;
+            gBattleStruct->faintedActionsState++;
             // fall through
         case 4:
             do
             {
-                gBank1 = gBankTarget = gBattleStruct->field_4E;
-                if (gBattleMons[gBattleStruct->field_4E].hp == 0
-                 && !(gAbsentBankFlags & gBitTable[gBattleStruct->field_4E]))
+                gBank1 = gBankTarget = gBattleStruct->faintedActionsBank;
+                if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
+                 && !(gAbsentBankFlags & gBitTable[gBattleStruct->faintedActionsBank]))
                 {
-                    BattleScriptExecute(BattleScript_82DA7CD);
-                    gBattleStruct->field_4D = 5;
+                    BattleScriptExecute(BattleScript_HandleFaintedMon);
+                    gBattleStruct->faintedActionsState = 5;
                     return TRUE;
                 }
-            } while (++gBattleStruct->field_4E != gNoOfAllBanks);
-            gBattleStruct->field_4D = 6;
+            } while (++gBattleStruct->faintedActionsBank != gNoOfAllBanks);
+            gBattleStruct->faintedActionsState = 6;
             break;
         case 5:
-            if (++gBattleStruct->field_4E == gNoOfAllBanks)
-                gBattleStruct->field_4D = 6;
+            if (++gBattleStruct->faintedActionsBank == gNoOfAllBanks)
+                gBattleStruct->faintedActionsState = 6;
             else
-                gBattleStruct->field_4D = 4;
+                gBattleStruct->faintedActionsState = 4;
             break;
         case 6:
             if (AbilityBattleEffects(ABILITYEFFECT_INTIMIDATE1, 0, 0, 0, 0) || AbilityBattleEffects(ABILITYEFFECT_TRACE, 0, 0, 0, 0) || ItemBattleEffects(1, 0, 1) || AbilityBattleEffects(ABILITYEFFECT_FORECAST, 0, 0, 0, 0))
                 return TRUE;
-            gBattleStruct->field_4D++;
+            gBattleStruct->faintedActionsState++;
             break;
-        case 7:
+        case FAINTED_ACTIONS_MAX_CASE:
             break;
         }
-    } while (gBattleStruct->field_4D != sub_8041728_MAX_CASE);
+    } while (gBattleStruct->faintedActionsState != FAINTED_ACTIONS_MAX_CASE);
     return FALSE;
 }
 
@@ -3182,7 +3182,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED
                     && gBattleMons[gBankTarget].hp)
                 {
-                    gBattleCommunication[MOVE_EFFECT_BYTE] = 8;
+                    gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_FLINCH;
                     BattleScriptPushCursor();
                     SetMoveEffect(0, 0);
                     BattleScriptPop();
@@ -3318,7 +3318,7 @@ static bool32 HasObedientBitSet(u8 bank)
     return GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_OBEDIENCE, NULL);
 }
 
-u8 IsPokeDisobedient(void)
+u8 IsMonDisobedient(void)
 {
     s32 rnd;
     s32 calc;
diff --git a/src/battle_util2.c b/src/battle_util2.c
index e119c85d7..4854bb5bb 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -6,19 +6,15 @@
 #include "event_data.h"
 #include "abilities.h"
 #include "rng.h"
+#include "battle_scripts.h"
 
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern u8 gUnknown_0203CF00[];
-extern const u8* gBattlescriptCurrInstr;
+extern const u8 *gBattlescriptCurrInstr;
 extern u8 gBattleCommunication[];
 extern u8 gActiveBank;
 
-extern const u8 BattleScript_MoveUsedWokeUp[];
-extern const u8 BattleScript_MoveUsedIsFrozen[];
-extern const u8 BattleScript_MoveUsedUnfroze[];
-extern const u8 BattleScript_MoveUsedIsAsleep[];
-
 extern void sub_81D55D0(void);
 extern void sub_81D5694(void);
 extern u8 pokemon_order_func(u8);
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 68731a14a..452035b54 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -21,6 +21,7 @@
 #include "songs.h"
 #include "overworld.h"
 #include "battle_message.h"
+#include "battle_string_ids.h"
 #include "gpu_regs.h"
 #include "bg.h"
 #include "link.h"
@@ -771,7 +772,7 @@ static void Task_EvolutionScene(u8 taskID)
         {
             BufferMoveToLearnIntoBattleTextBuff2();
             PlayFanfare(BGM_FANFA1);
-            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
             BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
             gTasks[taskID].tState++;
@@ -788,7 +789,7 @@ static void Task_EvolutionScene(u8 taskID)
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
                 BufferMoveToLearnIntoBattleTextBuff2();
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[4]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_ID_ADDER]);
                 BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -796,7 +797,7 @@ static void Task_EvolutionScene(u8 taskID)
         case 1:
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[5]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_ID_ADDER]);
                 BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -804,7 +805,7 @@ static void Task_EvolutionScene(u8 taskID)
         case 2:
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[6]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]);
                 BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
                 gTasks[taskID].tData7 = 5;
                 gTasks[taskID].tData8 = 10;
@@ -881,7 +882,7 @@ static void Task_EvolutionScene(u8 taskID)
                     u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
                     if (IsHMMove2(move))
                     {
-                        BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[307]);
+                        BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_ID_ADDER]);
                         BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
                         gTasks[taskID].tLearnMoveState = 12;
                     }
@@ -897,14 +898,14 @@ static void Task_EvolutionScene(u8 taskID)
             }
             break;
         case 7:
-            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[207]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_ID_ADDER]);
             BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
             gTasks[taskID].tLearnMoveState++;
             break;
         case 8:
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[7]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_ID_ADDER]);
                 BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -912,20 +913,20 @@ static void Task_EvolutionScene(u8 taskID)
         case 9:
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[208]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_ID_ADDER]);
                 BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
                 gTasks[taskID].tState = 20;
             }
             break;
         case 10:
-            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[8]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]);
             BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
             gTasks[taskID].tData7 = 11;
             gTasks[taskID].tData8 = 0;
             gTasks[taskID].tLearnMoveState = 3;
             break;
         case 11:
-            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[9]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_ID_ADDER]);
             BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
             gTasks[taskID].tState = 15;
             break;
@@ -1116,7 +1117,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         {
             BufferMoveToLearnIntoBattleTextBuff2();
             PlayFanfare(BGM_FANFA1);
-            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
             sub_807F1A8(0, gDisplayedStringBattle, 1);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
             gTasks[taskID].tState++;
@@ -1133,7 +1134,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
                 BufferMoveToLearnIntoBattleTextBuff2();
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[4]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_ID_ADDER]);
                 sub_807F1A8(0, gDisplayedStringBattle, 1);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -1141,7 +1142,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         case 1:
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[5]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_ID_ADDER]);
                 sub_807F1A8(0, gDisplayedStringBattle, 1);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -1149,7 +1150,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         case 2:
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[6]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]);
                 sub_807F1A8(0, gDisplayedStringBattle, 1);
                 gTasks[taskID].tData7 = 5;
                 gTasks[taskID].tData8 = 9;
@@ -1170,7 +1171,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             {
             case 0:
                 sEvoCursorPos = 0;
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[292]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]);
                 sub_807F1A8(0, gDisplayedStringBattle, 1);
                 gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7;
                 if (gTasks[taskID].tLearnMoveState == 5)
@@ -1179,7 +1180,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             case 1:
             case -1:
                 sEvoCursorPos = 1;
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[292]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]);
                 sub_807F1A8(0, gDisplayedStringBattle, 1);
                 gTasks[taskID].tLearnMoveState = gTasks[taskID].tData8;
                 break;
@@ -1215,7 +1216,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
                     u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
                     if (IsHMMove2(move))
                     {
-                        BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[307]);
+                        BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_ID_ADDER]);
                         sub_807F1A8(0, gDisplayedStringBattle, 1);
                         gTasks[taskID].tLearnMoveState = 11;
                     }
@@ -1225,7 +1226,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
 
                         RemoveMonPPBonus(mon, var);
                         SetMonMoveSlot(mon, gMoveToLearn, var);
-                        BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[207]);
+                        BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_ID_ADDER]);
                         sub_807F1A8(0, gDisplayedStringBattle, 1);
                         gTasks[taskID].tLearnMoveState++;
                     }
@@ -1235,7 +1236,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         case 7:
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[7]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_ID_ADDER]);
                 sub_807F1A8(0, gDisplayedStringBattle, 1);
                 gTasks[taskID].tLearnMoveState++;
             }
@@ -1243,20 +1244,20 @@ static void Task_TradeEvolutionScene(u8 taskID)
         case 8:
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
-                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[208]);
+                BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_ID_ADDER]);
                 sub_807F1A8(0, gDisplayedStringBattle, 1);
                 gTasks[taskID].tState = 18;
             }
             break;
         case 9:
-            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[8]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]);
             sub_807F1A8(0, gDisplayedStringBattle, 1);
             gTasks[taskID].tData7 = 10;
             gTasks[taskID].tData8 = 0;
             gTasks[taskID].tLearnMoveState = 3;
             break;
         case 10:
-            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[9]);
+            BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_ID_ADDER]);
             sub_807F1A8(0, gDisplayedStringBattle, 1);
             gTasks[taskID].tState = 13;
             break;
-- 
cgit v1.2.3


From c27f7a8131d4ebf9e01d7f4fecaf5cc5616866d8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 2 Dec 2017 19:39:07 +0100
Subject: start working on pokeball

---
 src/battle_anim.c                         |   2 +-
 src/battle_controller_link_opponent.c     |  16 +-
 src/battle_controller_link_partner.c      |  14 +-
 src/battle_controller_opponent.c          |  16 +-
 src/battle_controller_player.c            |  14 +-
 src/battle_controller_player_partner.c    |  14 +-
 src/battle_controller_recorded_opponent.c |  16 +-
 src/battle_controller_recorded_player.c   |  18 +-
 src/battle_controller_wally.c             |  12 +-
 src/battle_gfx_sfx_util.c                 |   4 +-
 src/pokeball.c                            | 637 ++++++++++++++++++++++++++++++
 src/reshow_battle_screen.c                |   6 +-
 12 files changed, 703 insertions(+), 66 deletions(-)
 create mode 100644 src/pokeball.c

(limited to 'src')

diff --git a/src/battle_anim.c b/src/battle_anim.c
index fa3ac73be..2eec0bed5 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -423,7 +423,7 @@ static void ScriptCmd_createsprite(void)
     if (subpriority < 3)
         subpriority = 3;
 
-    CreateSpriteAndAnimate(template, sub_80A5C6C(gAnimBankTarget, 2), sub_80A5C6C(gAnimBankTarget, 3), subpriority);
+    CreateSpriteAndAnimate(template, GetBankPosition(gAnimBankTarget, 2), GetBankPosition(gAnimBankTarget, 3), subpriority);
     gAnimVisualTaskCount++;
 }
 
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 5758aba87..e691af6a1 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -310,14 +310,14 @@ static void sub_8064734(void)
 {
     bool32 r10 = FALSE;
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
     {
         sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
     }
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
     {
@@ -325,7 +325,7 @@ static void sub_8064734(void)
     }
 
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80)
         {
@@ -527,14 +527,14 @@ static void sub_8064E50(void)
 
 static void sub_8064F40(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80)
     {
         sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
         SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
@@ -1163,7 +1163,7 @@ static void LinkOpponentHandleLoadMonSprite(void)
     sub_806A068(species, GetBankIdentity(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               sub_80A5C6C(gActiveBank, 2),
+                                               GetBankPosition(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
 
@@ -1197,7 +1197,7 @@ static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      sub_80A5C6C(bank, 2),
+      GetBankPosition(bank, 2),
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
@@ -1213,7 +1213,7 @@ static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = sub_80753E8(0, 0xFE);
+    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
 }
 
 static void LinkOpponentHandleReturnMonToBall(void)
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 1af6da1cd..02159970e 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -267,8 +267,8 @@ static void sub_814B004(void)
 
 static void sub_814B0E8(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive
         && gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
         && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
         && ++gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 != 1)
@@ -412,13 +412,13 @@ static void sub_814B5A8(void)
 static void sub_814B69C(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
         gBattleBankFunc[gActiveBank] = sub_814B5A8;
@@ -1049,7 +1049,7 @@ static void LinkPartnerHandleLoadMonSprite(void)
     sub_806A068(species, GetBankIdentity(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               sub_80A5C6C(gActiveBank, 2),
+                                               GetBankPosition(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
@@ -1080,7 +1080,7 @@ static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      sub_80A5C6C(bank, 2),
+      GetBankPosition(bank, 2),
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
@@ -1096,7 +1096,7 @@ static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = sub_80753E8(0, 0xFF);
+    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
 static void LinkPartnerHandleReturnMonToBall(void)
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index d69de8c29..7338fdb00 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -318,11 +318,11 @@ static void sub_805F560(void)
     bool32 sp = FALSE;
     bool32 r10 = FALSE;
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
         sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
-    if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI) && IsDoubleBattle() && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
+    if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI) && IsDoubleBattle() && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
         sub_8172EF0(gActiveBank ^ BIT_MON, &gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80)
         {
@@ -509,11 +509,11 @@ static void sub_805FD00(void)
 
 static void sub_805FDF0(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
         sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
 
     if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
         SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
@@ -1151,7 +1151,7 @@ static void OpponentHandleLoadMonSprite(void)
     sub_806A068(species, GetBankIdentity(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               sub_80A5C6C(gActiveBank, 2),
+                                               GetBankPosition(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
 
@@ -1186,7 +1186,7 @@ static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
     sub_806A068(species, GetBankIdentity(bank));
 
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
-                                        sub_80A5C6C(bank, 2),
+                                        GetBankPosition(bank, 2),
                                         GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
@@ -1203,7 +1203,7 @@ static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = sub_80753E8(0, 0xFE);
+    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
 }
 
 static void OpponentHandleReturnMonToBall(void)
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 7ea2abccf..7c97c83bb 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -1023,12 +1023,12 @@ static void sub_8058B40(void)
     bool32 r9 = FALSE;
     bool32 r8 = FALSE;
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
         sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
         sub_8172EF0(gActiveBank ^ BIT_MON, &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80)
         {
@@ -1127,13 +1127,13 @@ static void sub_8058FC0(void)
 static void sub_805902C(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
         UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
@@ -2237,7 +2237,7 @@ static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      sub_80A5C6C(bank, 2),
+      GetBankPosition(bank, 2),
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
@@ -2253,7 +2253,7 @@ static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = sub_80753E8(0, 0xFF);
+    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
 static void PlayerHandleReturnMonToBall(void)
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 4cca5c002..c05c3dcf8 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -282,8 +282,8 @@ static void sub_81BAF48(void)
 
 static void sub_81BB02C(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive
         && gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
         && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
         && ++gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 != 1)
@@ -599,13 +599,13 @@ static void sub_81BB9F4(void)
 static void sub_81BBAE8(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
         gBattleBankFunc[gActiveBank] = sub_81BB9F4;
@@ -1236,7 +1236,7 @@ static void PlayerPartnerHandleLoadMonSprite(void)
     sub_806A068(species, GetBankIdentity(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               sub_80A5C6C(gActiveBank, 2),
+                                               GetBankPosition(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
@@ -1267,7 +1267,7 @@ static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      sub_80A5C6C(bank, 2),
+      GetBankPosition(bank, 2),
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
@@ -1283,7 +1283,7 @@ static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = sub_80753E8(0, 0xFF);
+    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
 static void PlayerPartnerHandleReturnMonToBall(void)
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 027230be4..d400d74b6 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -298,12 +298,12 @@ static void sub_818686C(void)
     bool32 r9 = FALSE;
     bool32 r8 = FALSE;
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
         sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
         sub_8172EF0(gActiveBank ^ BIT_MON, &gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80)
         {
@@ -512,14 +512,14 @@ static void sub_8186F94(void)
 
 static void sub_8187084(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80)
     {
         sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
         SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
@@ -1148,7 +1148,7 @@ static void RecordedOpponentHandleLoadMonSprite(void)
     sub_806A068(species, GetBankIdentity(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               sub_80A5C6C(gActiveBank, 2),
+                                               GetBankPosition(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
 
@@ -1183,7 +1183,7 @@ static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
     sub_806A068(species, GetBankIdentity(bank));
 
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
-                                        sub_80A5C6C(bank, 2),
+                                        GetBankPosition(bank, 2),
                                         GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
@@ -1199,7 +1199,7 @@ static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = sub_80753E8(0, 0xFE);
+    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
 }
 
 static void RecordedOpponentHandleReturnMonToBall(void)
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index f5f3ab3c0..5c25ddf88 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -314,19 +314,19 @@ static void sub_8189D40(void)
     if (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON1)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
         {
             sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
         }
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8)
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
         {
             sub_8172EF0(gActiveBank ^ BIT_MON, &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
         }
     }
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80)
         {
@@ -497,13 +497,13 @@ static void sub_818A37C(void)
 static void sub_818A470(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
         gBattleBankFunc[gActiveBank] = sub_818A37C;
@@ -1134,7 +1134,7 @@ static void RecordedPlayerHandleLoadMonSprite(void)
     sub_806A068(species, GetBankIdentity(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               sub_80A5C6C(gActiveBank, 2),
+                                               GetBankPosition(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
@@ -1165,7 +1165,7 @@ static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      sub_80A5C6C(bank, 2),
+      GetBankPosition(bank, 2),
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
@@ -1181,7 +1181,7 @@ static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = sub_80753E8(0, 0xFF);
+    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
 static void RecordedPlayerHandleReturnMonToBall(void)
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 442e32cca..7aec76ffa 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -321,13 +321,13 @@ static void CompleteOnChosenItem(void)
 
 static void sub_816864C(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
         sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
         sub_8172EF0(gActiveBank ^ BIT_MON, &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x8
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x8
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive
         && gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
         && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
     {
@@ -1495,7 +1495,7 @@ static void sub_816AA80(u8 bank)
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     sub_806A068(species, GetBankIdentity(bank));
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
-                                        sub_80A5C6C(bank, 2),
+                                        GetBankPosition(bank, 2),
                                         GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
@@ -1509,7 +1509,7 @@ static void sub_816AA80(u8 bank)
     StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-    gSprites[gUnknown_03005D7C[bank]].data0 = sub_80753E8(0, 0xFF);
+    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
 static void sub_816AC04(u8 taskId)
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 99a82f3ca..8ab9b541a 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -1143,13 +1143,13 @@ void LoadAndCreateEnemyShadowSprites(void)
     LoadCompressedObjectPic(&gSpriteSheet_EnemyShadow);
 
     bank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
-    gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, sub_80A5C6C(bank, 0), sub_80A5C6C(bank, 1) + 29, 0xC8);
+    gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankPosition(bank, 0), GetBankPosition(bank, 1) + 29, 0xC8);
     gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data0 = bank;
 
     if (IsDoubleBattle())
     {
         bank = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
-        gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, sub_80A5C6C(bank, 0), sub_80A5C6C(bank, 1) + 29, 0xC8);
+        gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankPosition(bank, 0), GetBankPosition(bank, 1) + 29, 0xC8);
         gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data0 = bank;
     }
 }
diff --git a/src/pokeball.c b/src/pokeball.c
new file mode 100644
index 000000000..93ef60c9f
--- /dev/null
+++ b/src/pokeball.c
@@ -0,0 +1,637 @@
+#include "global.h"
+#include "sprite.h"
+#include "pokeball.h"
+#include "battle.h"
+#include "battle_anim.h"
+#include "task.h"
+#include "sound.h"
+#include "songs.h"
+#include "trig.h"
+#include "main.h"
+#include "m4a.h"
+
+extern bool8 gDoingBattleAnim;
+extern u8 gActiveBank;
+extern u8 gBankTarget;
+extern u16 gBattlePartyID[];
+extern u8 gBankSpriteIds[];
+extern struct MusicPlayerInfo gMPlay_BGM;
+
+// this file's functions
+void Task_DoPokeballSendOutAnim(u8 taskId);
+void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite);
+void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite);
+void SpriteCB_OpponentMonSendOut(struct Sprite *sprite);
+void sub_80756D4(struct Sprite *sprite);
+void sub_80756E0(struct Sprite *sprite);
+void sub_807574C(struct Sprite *sprite);
+void sub_80757E4(struct Sprite *sprite);
+void sub_8075838(struct Sprite *sprite);
+void sub_8075930(struct Sprite *sprite);
+void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite);
+void sub_8075970(struct Sprite *sprite);
+void HandleBallAnimEnd(struct Sprite *sprite);
+void sub_8075FB4(struct Sprite *sprite);
+void sub_80760F8(struct Sprite *sprite);
+u16 GetBankPokeballItemId(u8 bank);
+
+extern const struct SpriteTemplate gBallSpriteTemplates[];
+
+#define tFrames         data[0]
+#define tPan            data[1]
+#define tThrowId        data[2]
+#define tBank           data[3]
+#define tOpponentBank   data[4]
+
+u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow)
+{
+    u8 taskId;
+
+    gDoingBattleAnim = TRUE;
+    gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive = 1;
+
+    taskId = CreateTask(Task_DoPokeballSendOutAnim, 5);
+    gTasks[taskId].tPan = pan;
+    gTasks[taskId].tThrowId = kindOfThrow;
+    gTasks[taskId].tBank = gActiveBank;
+
+    return 0;
+}
+
+#define sData0          data[0]
+#define sData1          data[1]
+#define sData2          data[2]
+#define sData3          data[3]
+#define sData4          data[4]
+#define sData5          data[5]
+#define sBank           data[6]
+
+void Task_DoPokeballSendOutAnim(u8 taskId)
+{
+    u16 throwCaseId;
+    u8 bank;
+    u16 itemId, ballId;
+    u8 ballSpriteId;
+    bool8 notSendOut = FALSE;
+
+    if (gTasks[taskId].tFrames == 0)
+    {
+        gTasks[taskId].tFrames++;
+        return;
+    }
+
+    throwCaseId = gTasks[taskId].tThrowId;
+    bank = gTasks[taskId].tBank;
+
+    if (GetBankSide(bank) != SIDE_PLAYER)
+        itemId = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
+    else
+        itemId = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
+
+    ballId = ItemIdToBallId(itemId);
+    LoadBallGfx(ballId);
+    ballSpriteId = CreateSprite(&gBallSpriteTemplates[ballId], 32, 80, 29);
+    gSprites[ballSpriteId].data[0] = 0x80;
+    gSprites[ballSpriteId].data[1] = 0;
+    gSprites[ballSpriteId].data[7] = throwCaseId;
+
+    switch (throwCaseId)
+    {
+    case POKEBALL_PLAYER_SENDOUT:
+        gBankTarget = bank;
+        gSprites[ballSpriteId].pos1.x = 24;
+        gSprites[ballSpriteId].pos1.y = 68;
+        gSprites[ballSpriteId].callback = SpriteCB_PlayerMonSendOut_1;
+        break;
+    case POKEBALL_OPPONENT_SENDOUT:
+        gSprites[ballSpriteId].pos1.x = GetBankPosition(bank, BANK_X_POS);
+        gSprites[ballSpriteId].pos1.y = GetBankPosition(bank, BANK_Y_POS) + 24;
+        gBankTarget = bank;
+        gSprites[ballSpriteId].sData0 = 0;
+        gSprites[ballSpriteId].callback = SpriteCB_OpponentMonSendOut;
+        break;
+    default:
+        gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        notSendOut = TRUE;
+        break;
+    }
+
+    gSprites[ballSpriteId].sBank = gBankTarget;
+    if (!notSendOut)
+    {
+        DestroyTask(taskId);
+        return;
+    }
+
+    // this will perform an unused ball throw animation
+    gSprites[ballSpriteId].sData0 = 0x22;
+    gSprites[ballSpriteId].sData2 = GetBankPosition(gBankTarget, BANK_X_POS);
+    gSprites[ballSpriteId].sData4 = GetBankPosition(gBankTarget, BANK_Y_POS) - 16;
+    gSprites[ballSpriteId].sData5 = -40;
+    sub_80A68D4(&gSprites[ballSpriteId]);
+    gSprites[ballSpriteId].oam.affineParam = taskId;
+    gTasks[taskId].tOpponentBank = gBankTarget;
+    gTasks[taskId].func = TaskDummy;
+    PlaySE(SE_NAGERU);
+}
+
+void SpriteCB_TestBallThrow(struct Sprite *sprite)
+{
+    if (AnimateBallThrow(sprite))
+    {
+        u16 ballId;
+        u8 taskId = sprite->oam.affineParam;
+        u8 opponentBank = gTasks[taskId].tOpponentBank;
+        u8 noOfShakes = gTasks[taskId].tThrowId;
+
+        StartSpriteAnim(sprite, 1);
+        sprite->affineAnimPaused = 1;
+        sprite->pos1.x += sprite->pos2.x;
+        sprite->pos1.y += sprite->pos2.y;
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        sprite->sData5 = 0;
+        ballId = ItemIdToBallId(GetBankPokeballItemId(opponentBank));
+        LaunchBallStarsTask(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId);
+        sprite->sData0 = LaunchBallFadeMonTask(FALSE, opponentBank, 14, ballId);
+        sprite->sBank = opponentBank;
+        sprite->data[7] = noOfShakes;
+        DestroyTask(taskId);
+        sprite->callback = sub_80756D4;
+    }
+}
+
+#undef tFrames
+#undef tPan
+#undef tThrowId
+#undef tBank
+#undef tOpponentBank
+
+void sub_80756D4(struct Sprite *sprite)
+{
+    sprite->callback = sub_80756E0;
+}
+
+void sub_80756E0(struct Sprite *sprite)
+{
+    if (++sprite->sData5 == 10)
+    {
+        sprite->sData5 = 0;
+        sprite->callback = sub_807574C;
+        StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->sBank]], 2);
+        AnimateSprite(&gSprites[gBankSpriteIds[sprite->sBank]]);
+        gSprites[gBankSpriteIds[sprite->sBank]].data[1] = 0;
+    }
+}
+
+void sub_807574C(struct Sprite *sprite)
+{
+    sprite->data[5]++;
+    if (sprite->data[5] == 11)
+        PlaySE(SE_SUIKOMU);
+    if (gSprites[gBankSpriteIds[sprite->data[6]]].affineAnimEnded)
+    {
+        StartSpriteAnim(sprite, 2);
+        gSprites[gBankSpriteIds[sprite->data[6]]].invisible = TRUE;
+        sprite->data[5] = 0;
+        sprite->callback = sub_80757E4;
+    }
+    else
+    {
+        gSprites[gBankSpriteIds[sprite->data[6]]].data[1] += 0x60;
+        gSprites[gBankSpriteIds[sprite->data[6]]].pos2.y = -gSprites[gBankSpriteIds[sprite->data[6]]].data[1] >> 8;
+    }
+}
+
+void sub_80757E4(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+    {
+        sprite->data[5]++;
+        if (sprite->data[5] == 1)
+        {
+            sprite->data[3] = 0;
+            sprite->data[4] = 32;
+            sprite->data[5] = 0;
+            sprite->pos1.y += Cos(0, 32);
+            sprite->pos2.y = -Cos(0, sprite->data[4]);
+            sprite->callback = sub_8075838;
+        }
+    }
+}
+
+void sub_8075838(struct Sprite *sprite)
+{
+    bool8 r5 = FALSE;
+
+    switch (sprite->data[3] & 0xFF)
+    {
+    case 0:
+        sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]);
+        sprite->data[5] += 4 + (sprite->data[3] >> 8);
+        if (sprite->data[5] >= 64)
+        {
+            sprite->data[4] -= 10;
+            sprite->data[3] += 0x101;
+            if (sprite->data[3] >> 8 == 4)
+                r5 = TRUE;
+            switch (sprite->data[3] >> 8)
+            {
+            case 1:
+                PlaySE(SE_KON);
+                break;
+            case 2:
+                PlaySE(SE_KON2);
+                break;
+            case 3:
+                PlaySE(SE_KON3);
+                break;
+            default:
+                PlaySE(SE_KON4);
+                break;
+            }
+        }
+        break;
+    case 1:
+        sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]);
+        sprite->data[5] -= 4 + (sprite->data[3] >> 8);
+        if (sprite->data[5] <= 0)
+        {
+            sprite->data[5] = 0;
+            sprite->data[3] &= 0xFF00;
+        }
+        break;
+    }
+    if (r5)
+    {
+        sprite->data[3] = 0;
+        sprite->pos1.y += Cos(64, 32);
+        sprite->pos2.y = 0;
+        if (sprite->data[7] == 0)
+        {
+            sprite->callback = SpriteCB_ReleaseMonFromBall;
+        }
+        else
+        {
+            sprite->callback = sub_8075930;
+            sprite->data[4] = 1;
+            sprite->data[5] = 0;
+        }
+    }
+}
+
+void sub_8075930(struct Sprite *sprite)
+{
+    sprite->data[3]++;
+    if (sprite->data[3] == 31)
+    {
+        sprite->data[3] = 0;
+        sprite->affineAnimPaused = TRUE;
+        StartSpriteAffineAnim(sprite, 1);
+        sprite->callback = sub_8075970;
+        PlaySE(SE_BOWA);
+    }
+}
+
+void sub_8075970(struct Sprite *sprite)
+{
+    switch (sprite->data[3] & 0xFF)
+    {
+    case 0:
+    case 2:
+        sprite->pos2.x += sprite->data[4];
+        sprite->data[5] += sprite->data[4];
+        sprite->affineAnimPaused = FALSE;
+        if (sprite->data[5] > 3 || sprite->data[5] < -3)
+        {
+            sprite->data[3]++;
+            sprite->data[5] = 0;
+        }
+        break;
+    case 1:
+        sprite->data[5]++;
+        if (sprite->data[5] == 1)
+        {
+            sprite->data[5] = 0;
+            sprite->data[4] = -sprite->data[4];
+            sprite->data[3]++;
+            sprite->affineAnimPaused = FALSE;
+            if (sprite->data[4] < 0)
+                ChangeSpriteAffineAnim(sprite, 2);
+            else
+                ChangeSpriteAffineAnim(sprite, 1);
+        }
+        else
+        {
+            sprite->affineAnimPaused = TRUE;
+        }
+        break;
+    case 3:
+        sprite->data[3] += 0x100;
+        if (sprite->data[3] >> 8 == sprite->data[7])
+        {
+            sprite->callback = SpriteCB_ReleaseMonFromBall;
+        }
+        else
+        {
+            if (sprite->data[7] == 4 && sprite->data[3] >> 8 == 3)
+            {
+                sprite->callback = sub_8075FB4;
+                sprite->affineAnimPaused = TRUE;
+            }
+            else
+            {
+                sprite->data[3]++;
+                sprite->affineAnimPaused = TRUE;
+            }
+        }
+        break;
+    case 4:
+    default:
+        sprite->data[5]++;
+        if (sprite->data[5] == 31)
+        {
+            sprite->data[5] = 0;
+            sprite->data[3] &= 0xFF00;
+            StartSpriteAffineAnim(sprite, 3);
+            if (sprite->data[4] < 0)
+                StartSpriteAffineAnim(sprite, 2);
+            else
+                StartSpriteAffineAnim(sprite, 1);
+            PlaySE(SE_BOWA);
+        }
+        break;
+    }
+}
+
+#define tCryTaskSpecies         data[0]
+#define tCryTaskPan             data[1]
+#define tCryTaskWantedCry       data[2]
+#define tCryTaskBank            data[3]
+#define tCryTaskMonSpriteId     data[4]
+#define tCryTaskMonPtr1         data[5]
+#define tCryTaskMonPtr2         data[6]
+#define tCryTaskFrames          data[10]
+#define tCryTaskState           data[15]
+
+void Task_PlayCryWhenReleasedFromBall(u8 taskId)
+{
+    u8 wantedCry = gTasks[taskId].tCryTaskWantedCry;
+    s8 pan = gTasks[taskId].tCryTaskPan;
+    u16 species = gTasks[taskId].tCryTaskSpecies;
+    u8 bank = gTasks[taskId].tCryTaskBank;
+    u8 monSpriteId = gTasks[taskId].tCryTaskMonSpriteId;
+    struct Pokemon *mon = (void*)(u32)((gTasks[taskId].tCryTaskMonPtr1 << 0x10) | (u16)(gTasks[taskId].tCryTaskMonPtr2));
+
+    switch (gTasks[taskId].tCryTaskState)
+    {
+    case 0:
+    default:
+        if (gSprites[monSpriteId].affineAnimEnded)
+            gTasks[taskId].tCryTaskState = wantedCry + 1;
+        break;
+    case 1:
+        if (ShouldPlayNormalPokeCry(mon) == TRUE)
+            PlayCry3(species, pan, 0);
+        else
+            PlayCry3(species, pan, 11);
+        gBattleSpritesDataPtr->healthBoxesData[bank].field_1_x40 = 0;
+        DestroyTask(taskId);
+        break;
+    case 2:
+        StopCryAndClearCrySongs();
+        gTasks[taskId].tCryTaskFrames = 3;
+        gTasks[taskId].tCryTaskState = 20;
+        break;
+    case 20:
+        if (gTasks[taskId].tCryTaskFrames == 0)
+        {
+            if (ShouldPlayNormalPokeCry(mon) == TRUE)
+                PlayCry4(species, pan, 1);
+            else
+                PlayCry4(species, pan, 12);
+
+            gBattleSpritesDataPtr->healthBoxesData[bank].field_1_x40 = 0;
+            DestroyTask(taskId);
+        }
+        else
+        {
+            gTasks[taskId].tCryTaskFrames--;
+        }
+        break;
+    case 3:
+        gTasks[taskId].tCryTaskFrames = 6;
+        gTasks[taskId].tCryTaskState = 30;
+        break;
+    case 30:
+        if (gTasks[taskId].tCryTaskFrames != 0)
+        {
+            gTasks[taskId].tCryTaskFrames--;
+            break;
+        }
+        gTasks[taskId].tCryTaskState++;
+        // fall through
+    case 31:
+        if (!IsCryPlayingOrClearCrySongs())
+        {
+            StopCryAndClearCrySongs();
+            gTasks[taskId].tCryTaskFrames = 3;
+            gTasks[taskId].tCryTaskState++;
+        }
+        break;
+    case 32:
+        if (gTasks[taskId].tCryTaskFrames != 0)
+        {
+            gTasks[taskId].tCryTaskFrames--;
+            break;
+        }
+        if (ShouldPlayNormalPokeCry(mon) == TRUE)
+            PlayCry4(species, pan, 0);
+        else
+            PlayCry4(species, pan, 11);
+
+        gBattleSpritesDataPtr->healthBoxesData[bank].field_1_x40 = 0;
+        DestroyTask(taskId);
+        break;
+    }
+}
+
+void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
+{
+    u8 bank = sprite->sBank;
+    u32 ballId;
+
+    StartSpriteAnim(sprite, 1);
+    ballId = ItemIdToBallId(GetBankPokeballItemId(bank));
+    LaunchBallStarsTask(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId);
+    sprite->sData0 = LaunchBallFadeMonTask(1, sprite->sBank, 14, ballId);
+    sprite->callback = HandleBallAnimEnd;
+
+    if (gMain.inBattle)
+    {
+        struct Pokemon *mon;
+        u16 species;
+        s8 pan;
+        u16 wantedCryCase;
+        u8 taskId;
+
+        if (GetBankSide(bank) != SIDE_PLAYER)
+        {
+            mon = &gEnemyParty[gBattlePartyID[bank]];
+            pan = 25;
+        }
+        else
+        {
+            mon = &gPlayerParty[gBattlePartyID[bank]];
+            pan = -25;
+        }
+
+        species = GetMonData(mon, MON_DATA_SPECIES);
+        if ((bank == GetBankByIdentity(IDENTITY_PLAYER_MON1) || bank == GetBankByIdentity(IDENTITY_OPPONENT_MON1))
+         && IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1)
+        {
+            if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
+            {
+                if (IsBGMPlaying())
+                    m4aMPlayStop(&gMPlay_BGM);
+            }
+            else
+            {
+                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128);
+            }
+        }
+
+        if (!IsDoubleBattle() || !gBattleSpritesDataPtr->animationData->field_9_x1)
+            wantedCryCase = 0;
+        else if (bank == GetBankByIdentity(IDENTITY_PLAYER_MON1) || bank == GetBankByIdentity(IDENTITY_OPPONENT_MON1))
+            wantedCryCase = 1;
+        else
+            wantedCryCase = 2;
+
+        gBattleSpritesDataPtr->healthBoxesData[bank].field_1_x40 = 1;
+
+        taskId = CreateTask(Task_PlayCryWhenReleasedFromBall, 3);
+        gTasks[taskId].tCryTaskSpecies = species;
+        gTasks[taskId].tCryTaskPan = pan;
+        gTasks[taskId].tCryTaskWantedCry = wantedCryCase;
+        gTasks[taskId].tCryTaskBank = bank;
+        gTasks[taskId].tCryTaskMonSpriteId = gBankSpriteIds[sprite->sBank];
+        gTasks[taskId].tCryTaskMonPtr1 = (u32)(mon) >> 0x10;
+        gTasks[taskId].tCryTaskMonPtr2 = (u32)(mon);
+        gTasks[taskId].tCryTaskState = 0;
+    }
+
+    StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->sBank]], 1);
+
+    if (GetBankSide(sprite->sBank) == SIDE_OPPONENT)
+        gSprites[gBankSpriteIds[sprite->sBank]].callback = sub_8039B58;
+    else
+        gSprites[gBankSpriteIds[sprite->sBank]].callback = sub_8039E44;
+
+    AnimateSprite(&gSprites[gBankSpriteIds[sprite->sBank]]);
+    gSprites[gBankSpriteIds[sprite->sBank]].data[1] = 0x1000;
+}
+
+#undef tCryTaskSpecies
+#undef tCryTaskPan
+#undef tCryTaskWantedCry
+#undef tCryTaskBank
+#undef tCryTaskMonSpriteId
+#undef tCryTaskMonPtr1
+#undef tCryTaskMonPtr2
+#undef tCryTaskFrames
+#undef tCryTaskState
+
+void sub_8075FB4(struct Sprite *sprite)
+{
+    sprite->animPaused = TRUE;
+    sprite->callback = sub_80760F8;
+    sprite->data[3] = 0;
+    sprite->data[4] = 0;
+    sprite->data[5] = 0;
+}
+
+void HandleBallAnimEnd(struct Sprite *sprite)
+{
+    bool8 affineAnimEnded = FALSE;
+    u8 bank = sprite->sBank;
+
+    gSprites[gBankSpriteIds[bank]].invisible = FALSE;
+    if (sprite->animEnded)
+        sprite->invisible = TRUE;
+    if (gSprites[gBankSpriteIds[bank]].affineAnimEnded)
+    {
+        StartSpriteAffineAnim(&gSprites[gBankSpriteIds[bank]], 0);
+        affineAnimEnded = TRUE;
+    }
+    else
+    {
+        gSprites[gBankSpriteIds[bank]].data[1] -= 288;
+        gSprites[gBankSpriteIds[bank]].pos2.y = gSprites[gBankSpriteIds[bank]].data[1] >> 8;
+    }
+    if (sprite->animEnded && affineAnimEnded)
+    {
+        s32 i, doneBanks;
+
+        gSprites[gBankSpriteIds[bank]].pos2.y = 0;
+        gDoingBattleAnim = FALSE;
+        gBattleSpritesDataPtr->healthBoxesData[bank].ballAnimActive = 0;
+        FreeSpriteOamMatrix(sprite);
+        DestroySprite(sprite);
+
+        for (doneBanks = 0, i = 0; i < BATTLE_BANKS_COUNT; i++)
+        {
+            if (gBattleSpritesDataPtr->healthBoxesData[i].ballAnimActive == 0)
+                doneBanks++;
+        }
+        if (doneBanks == BATTLE_BANKS_COUNT)
+        {
+            for (i = 0; i < POKEBALL_COUNT; i++)
+                FreeBallGfx(i);
+        }
+    }
+}
+
+void sub_80760F8(struct Sprite *sprite)
+{
+    u8 bank = sprite->sBank;
+
+    sprite->data[4]++;
+    if (sprite->data[4] == 40)
+    {
+        return;
+    }
+    else if (sprite->data[4] == 95)
+    {
+        gDoingBattleAnim = FALSE;
+        m4aMPlayAllStop();
+        PlaySE(BGM_FANFA5);
+    }
+    else if (sprite->data[4] == 315)
+    {
+        FreeOamMatrix(gSprites[gBankSpriteIds[sprite->sBank]].oam.matrixNum);
+        DestroySprite(&gSprites[gBankSpriteIds[sprite->sBank]]);
+        DestroySpriteAndFreeResources(sprite);
+        if (gMain.inBattle)
+            gBattleSpritesDataPtr->healthBoxesData[bank].ballAnimActive = 0;
+    }
+}
+
+void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite)
+{
+    sprite->data[0] = 25;
+    sprite->data[2] = GetBankPosition(sprite->sBank, 2);
+    sprite->data[4] = GetBankPosition(sprite->sBank, 3) + 24;
+    sprite->data[5] = -30;
+    sprite->oam.affineParam = sprite->sBank;
+    sub_80A68D4(sprite);
+    sprite->callback = SpriteCB_PlayerMonSendOut_2;
+}
+
+#undef sData0
+#undef sData1
+#undef sData2
+#undef sData3
+#undef sData4
+#undef sData5
+#undef sBank
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 3177a8946..962ea0f6e 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -42,7 +42,7 @@ extern u8 GetBankSpriteDefault_Y(u8 bank);
 extern u8 sub_80A82E4(u8 bank);
 extern void sub_806A068(u16 species, u8 bankIdentity);
 extern void sub_806A12C(u16 backPicId, u8 bankIdentity);
-extern u8 sub_80A5C6C(u8 bank, u8 caseId);
+extern u8 GetBankPosition(u8 bank, u8 caseId);
 
 // this file's functions
 static void CB2_ReshowBattleScreenAfterMenu(void);
@@ -260,7 +260,7 @@ static void CreateBankSprite(u8 bank)
                 return;
 
             sub_806A068(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, sub_80A5C6C(bank, 2), posY, sub_80A82E4(bank));
+            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankPosition(bank, 2), posY, sub_80A82E4(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
             gSprites[gBankSpriteIds[bank]].data0 = bank;
@@ -296,7 +296,7 @@ static void CreateBankSprite(u8 bank)
                 return;
 
             sub_806A068(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, sub_80A5C6C(bank, 2), posY, sub_80A82E4(bank));
+            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankPosition(bank, 2), posY, sub_80A82E4(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
             gSprites[gBankSpriteIds[bank]].data0 = bank;
-- 
cgit v1.2.3


From c2fdde3a498b6b6bbf8a57784e3208be74bf59f7 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 2 Dec 2017 20:38:26 +0100
Subject: pokeball file is decompiled

---
 src/pokeball.c | 429 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 403 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/pokeball.c b/src/pokeball.c
index 93ef60c9f..a9172b7cf 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "pokemon.h"
 #include "sprite.h"
 #include "pokeball.h"
 #include "battle.h"
@@ -9,14 +10,20 @@
 #include "trig.h"
 #include "main.h"
 #include "m4a.h"
+#include "decompress.h"
+#include "species.h"
+#include "util.h"
 
 extern bool8 gDoingBattleAnim;
 extern u8 gActiveBank;
 extern u8 gBankTarget;
 extern u16 gBattlePartyID[];
 extern u8 gBankSpriteIds[];
+extern u8 gHealthBoxesIds[];
 extern struct MusicPlayerInfo gMPlay_BGM;
 
+extern const u32 gOpenPokeballGfx[];
+
 // this file's functions
 void Task_DoPokeballSendOutAnim(u8 taskId);
 void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite);
@@ -29,12 +36,23 @@ void sub_80757E4(struct Sprite *sprite);
 void sub_8075838(struct Sprite *sprite);
 void sub_8075930(struct Sprite *sprite);
 void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite);
+void SpriteCB_ReleaseMon2FromBall(struct Sprite *sprite);
 void sub_8075970(struct Sprite *sprite);
 void HandleBallAnimEnd(struct Sprite *sprite);
 void sub_8075FB4(struct Sprite *sprite);
 void sub_80760F8(struct Sprite *sprite);
+void sub_8076524(struct Sprite *sprite);
+void sub_80765E0(struct Sprite *sprite);
+void sub_80767D4(struct Sprite *sprite);
+void sub_807687C(struct Sprite *sprite);
+void sub_80768F0(struct Sprite *sprite);
+void sub_80769A8(struct Sprite *sprite);
+void sub_80769CC(struct Sprite *sprite);
+void SpriteCB_HitAnimHealthoxEffect(struct Sprite *sprite);
 u16 GetBankPokeballItemId(u8 bank);
 
+extern const struct CompressedSpriteSheet sBallSpriteSheets[];
+extern const struct CompressedSpritePalette sBallSpritePalettes[];
 extern const struct SpriteTemplate gBallSpriteTemplates[];
 
 #define tFrames         data[0]
@@ -58,12 +76,6 @@ u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow)
     return 0;
 }
 
-#define sData0          data[0]
-#define sData1          data[1]
-#define sData2          data[2]
-#define sData3          data[3]
-#define sData4          data[4]
-#define sData5          data[5]
 #define sBank           data[6]
 
 void Task_DoPokeballSendOutAnim(u8 taskId)
@@ -107,7 +119,7 @@ void Task_DoPokeballSendOutAnim(u8 taskId)
         gSprites[ballSpriteId].pos1.x = GetBankPosition(bank, BANK_X_POS);
         gSprites[ballSpriteId].pos1.y = GetBankPosition(bank, BANK_Y_POS) + 24;
         gBankTarget = bank;
-        gSprites[ballSpriteId].sData0 = 0;
+        gSprites[ballSpriteId].data[0] = 0;
         gSprites[ballSpriteId].callback = SpriteCB_OpponentMonSendOut;
         break;
     default:
@@ -124,10 +136,10 @@ void Task_DoPokeballSendOutAnim(u8 taskId)
     }
 
     // this will perform an unused ball throw animation
-    gSprites[ballSpriteId].sData0 = 0x22;
-    gSprites[ballSpriteId].sData2 = GetBankPosition(gBankTarget, BANK_X_POS);
-    gSprites[ballSpriteId].sData4 = GetBankPosition(gBankTarget, BANK_Y_POS) - 16;
-    gSprites[ballSpriteId].sData5 = -40;
+    gSprites[ballSpriteId].data[0] = 0x22;
+    gSprites[ballSpriteId].data[2] = GetBankPosition(gBankTarget, BANK_X_POS);
+    gSprites[ballSpriteId].data[4] = GetBankPosition(gBankTarget, BANK_Y_POS) - 16;
+    gSprites[ballSpriteId].data[5] = -40;
     sub_80A68D4(&gSprites[ballSpriteId]);
     gSprites[ballSpriteId].oam.affineParam = taskId;
     gTasks[taskId].tOpponentBank = gBankTarget;
@@ -150,10 +162,10 @@ void SpriteCB_TestBallThrow(struct Sprite *sprite)
         sprite->pos1.y += sprite->pos2.y;
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
-        sprite->sData5 = 0;
+        sprite->data[5] = 0;
         ballId = ItemIdToBallId(GetBankPokeballItemId(opponentBank));
         LaunchBallStarsTask(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId);
-        sprite->sData0 = LaunchBallFadeMonTask(FALSE, opponentBank, 14, ballId);
+        sprite->data[0] = LaunchBallFadeMonTask(FALSE, opponentBank, 14, ballId);
         sprite->sBank = opponentBank;
         sprite->data[7] = noOfShakes;
         DestroyTask(taskId);
@@ -174,9 +186,9 @@ void sub_80756D4(struct Sprite *sprite)
 
 void sub_80756E0(struct Sprite *sprite)
 {
-    if (++sprite->sData5 == 10)
+    if (++sprite->data[5] == 10)
     {
-        sprite->sData5 = 0;
+        sprite->data[5] = 0;
         sprite->callback = sub_807574C;
         StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->sBank]], 2);
         AnimateSprite(&gSprites[gBankSpriteIds[sprite->sBank]]);
@@ -189,17 +201,17 @@ void sub_807574C(struct Sprite *sprite)
     sprite->data[5]++;
     if (sprite->data[5] == 11)
         PlaySE(SE_SUIKOMU);
-    if (gSprites[gBankSpriteIds[sprite->data[6]]].affineAnimEnded)
+    if (gSprites[gBankSpriteIds[sprite->sBank]].affineAnimEnded)
     {
         StartSpriteAnim(sprite, 2);
-        gSprites[gBankSpriteIds[sprite->data[6]]].invisible = TRUE;
+        gSprites[gBankSpriteIds[sprite->sBank]].invisible = TRUE;
         sprite->data[5] = 0;
         sprite->callback = sub_80757E4;
     }
     else
     {
-        gSprites[gBankSpriteIds[sprite->data[6]]].data[1] += 0x60;
-        gSprites[gBankSpriteIds[sprite->data[6]]].pos2.y = -gSprites[gBankSpriteIds[sprite->data[6]]].data[1] >> 8;
+        gSprites[gBankSpriteIds[sprite->sBank]].data[1] += 0x60;
+        gSprites[gBankSpriteIds[sprite->sBank]].pos2.y = -gSprites[gBankSpriteIds[sprite->sBank]].data[1] >> 8;
     }
 }
 
@@ -464,7 +476,7 @@ void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
     StartSpriteAnim(sprite, 1);
     ballId = ItemIdToBallId(GetBankPokeballItemId(bank));
     LaunchBallStarsTask(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId);
-    sprite->sData0 = LaunchBallFadeMonTask(1, sprite->sBank, 14, ballId);
+    sprite->data[0] = LaunchBallFadeMonTask(1, sprite->sBank, 14, ballId);
     sprite->callback = HandleBallAnimEnd;
 
     if (gMain.inBattle)
@@ -628,10 +640,375 @@ void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite)
     sprite->callback = SpriteCB_PlayerMonSendOut_2;
 }
 
-#undef sData0
-#undef sData1
-#undef sData2
-#undef sData3
-#undef sData4
-#undef sData5
+#define HIBYTE(x) (((x) >> 8) & 0xFF)
+
+void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite)
+{
+    u32 r6;
+    u32 r7;
+
+    if (HIBYTE(sprite->data[7]) >= 35 && HIBYTE(sprite->data[7]) < 80)
+    {
+        s16 r4;
+
+        if ((sprite->oam.affineParam & 0xFF00) == 0)
+        {
+            r6 = sprite->data[1] & 1;
+            r7 = sprite->data[2] & 1;
+            sprite->data[1] = ((sprite->data[1] / 3) & ~1) | r6;
+            sprite->data[2] = ((sprite->data[2] / 3) & ~1) | r7;
+            StartSpriteAffineAnim(sprite, 4);
+        }
+        r4 = sprite->data[0];
+        sub_80A6F3C(sprite);
+        sprite->data[7] += sprite->sBank / 3;
+        sprite->pos2.y += Sin(HIBYTE(sprite->data[7]), sprite->data[5]);
+        sprite->oam.affineParam += 0x100;
+        if ((sprite->oam.affineParam >> 8) % 3 != 0)
+            sprite->data[0] = r4;
+        else
+            sprite->data[0] = r4 - 1;
+        if (HIBYTE(sprite->data[7]) >= 80)
+        {
+            r6 = sprite->data[1] & 1;
+            r7 = sprite->data[2] & 1;
+            sprite->data[1] = ((sprite->data[1] * 3) & ~1) | r6;
+            sprite->data[2] = ((sprite->data[2] * 3) & ~1) | r7;
+        }
+    }
+    else
+    {
+        if (AnimateBallThrow(sprite))
+        {
+            sprite->pos1.x += sprite->pos2.x;
+            sprite->pos1.y += sprite->pos2.y;
+            sprite->pos2.y = 0;
+            sprite->pos2.x = 0;
+            sprite->sBank = sprite->oam.affineParam & 0xFF;
+            sprite->data[0] = 0;
+
+            if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1
+             && sprite->sBank == GetBankByIdentity(IDENTITY_PLAYER_MON2))
+                sprite->callback = SpriteCB_ReleaseMon2FromBall;
+            else
+                sprite->callback = SpriteCB_ReleaseMonFromBall;
+
+            StartSpriteAffineAnim(sprite, 0);
+        }
+    }
+}
+
+void SpriteCB_ReleaseMon2FromBall(struct Sprite *sprite)
+{
+    if (sprite->data[0]++ > 24)
+    {
+        sprite->data[0] = 0;
+        sprite->callback = SpriteCB_ReleaseMonFromBall;
+    }
+}
+
+void SpriteCB_OpponentMonSendOut(struct Sprite *sprite)
+{
+    sprite->data[0]++;
+    if (sprite->data[0] > 15)
+    {
+        sprite->data[0] = 0;
+        if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1
+         && sprite->sBank == GetBankByIdentity(IDENTITY_OPPONENT_MON2))
+            sprite->callback = SpriteCB_ReleaseMon2FromBall;
+        else
+            sprite->callback = SpriteCB_ReleaseMonFromBall;
+    }
+}
+
 #undef sBank
+
+u8 LaunchBallStarsTaskForPokeball(u8 x, u8 y, u8 kindOfStars, u8 d)
+{
+    return LaunchBallStarsTask(x, y, kindOfStars, d, 0);
+}
+
+u8 LaunchBallFadeMonTaskForPokeball(bool8 unFadeLater, u8 bank, u32 arg2)
+{
+    return LaunchBallFadeMonTask(unFadeLater, bank, arg2, 0);
+}
+
+void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h, u16 species)
+{
+    u8 spriteId;
+
+    LoadCompressedObjectPicUsingHeap(&sBallSpriteSheets[0]);
+    LoadCompressedObjectPaletteUsingHeap(&sBallSpritePalettes[0]);
+    spriteId = CreateSprite(&gBallSpriteTemplates[0], x, y, subpriortiy);
+
+    gSprites[spriteId].data[0] = monSpriteId;
+    gSprites[spriteId].data[5] = gSprites[monSpriteId].pos1.x;
+    gSprites[spriteId].data[6] = gSprites[monSpriteId].pos1.y;
+
+    gSprites[monSpriteId].pos1.x = x;
+    gSprites[monSpriteId].pos1.y = y;
+    gSprites[monSpriteId].data[7] = species;
+
+    gSprites[spriteId].data[1] = g;
+    gSprites[spriteId].data[2] = bank;
+    gSprites[spriteId].data[3] = h;
+    gSprites[spriteId].data[4] = h >> 0x10;
+    gSprites[spriteId].oam.priority = oamPriority;
+    gSprites[spriteId].callback = sub_8076524;
+
+    gSprites[monSpriteId].invisible = TRUE;
+}
+
+void sub_8076524(struct Sprite *sprite)
+{
+    if (sprite->data[1] == 0)
+    {
+        u8 r5;
+        u8 r7 = sprite->data[0];
+        u8 bank = sprite->data[2];
+        u32 r4 = (u16)sprite->data[3] | ((u16)sprite->data[4] << 16);
+
+        if (sprite->subpriority != 0)
+            r5 = sprite->subpriority - 1;
+        else
+            r5 = 0;
+
+        StartSpriteAnim(sprite, 1);
+        LaunchBallStarsTaskForPokeball(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r5);
+        sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, bank, r4);
+        sprite->callback = sub_80765E0;
+        gSprites[r7].invisible = FALSE;
+        StartSpriteAffineAnim(&gSprites[r7], 1);
+        AnimateSprite(&gSprites[r7]);
+        gSprites[r7].data[1] = 0x1000;
+        sprite->data[7] = 0;
+    }
+    else
+    {
+        sprite->data[1]--;
+    }
+}
+
+void sub_80765E0(struct Sprite *sprite)
+{
+    bool8 r12 = FALSE;
+    bool8 r6 = FALSE;
+    u8 monSpriteId = sprite->data[0];
+    u16 var1;
+    u16 var2;
+
+    if (sprite->animEnded)
+        sprite->invisible = TRUE;
+    if (gSprites[monSpriteId].affineAnimEnded)
+    {
+        StartSpriteAffineAnim(&gSprites[monSpriteId], 0);
+        r12 = TRUE;
+    }
+    var1 = (sprite->data[5] - sprite->pos1.x) * sprite->data[7] / 128 + sprite->pos1.x;
+    var2 = (sprite->data[6] - sprite->pos1.y) * sprite->data[7] / 128 + sprite->pos1.y;
+    gSprites[monSpriteId].pos1.x = var1;
+    gSprites[monSpriteId].pos1.y = var2;
+    if (sprite->data[7] < 128)
+    {
+        s16 sine = -(gSineTable[(u8)sprite->data[7]] / 8);
+
+        sprite->data[7] += 4;
+        gSprites[monSpriteId].pos2.x = sine;
+        gSprites[monSpriteId].pos2.y = sine;
+    }
+    else
+    {
+        gSprites[monSpriteId].pos1.x = sprite->data[5];
+        gSprites[monSpriteId].pos1.y = sprite->data[6];
+        gSprites[monSpriteId].pos2.x = 0;
+        gSprites[monSpriteId].pos2.y = 0;
+        r6 = TRUE;
+    }
+    if (sprite->animEnded && r12 && r6)
+    {
+        if (gSprites[monSpriteId].data[7] == SPECIES_EGG)
+            DoMonFrontSpriteAnimation(&gSprites[monSpriteId], gSprites[monSpriteId].data[7], TRUE, 0);
+        else
+            DoMonFrontSpriteAnimation(&gSprites[monSpriteId], gSprites[monSpriteId].data[7], FALSE, 0);
+
+        DestroySpriteAndFreeResources(sprite);
+    }
+}
+
+u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h)
+{
+    u8 spriteId;
+
+    LoadCompressedObjectPicUsingHeap(&sBallSpriteSheets[0]);
+    LoadCompressedObjectPaletteUsingHeap(&sBallSpritePalettes[0]);
+    spriteId = CreateSprite(&gBallSpriteTemplates[0], x, y, subPriority);
+    gSprites[spriteId].data[0] = a;
+    gSprites[spriteId].data[1] = g;
+    gSprites[spriteId].data[2] = b;
+    gSprites[spriteId].data[3] = h;
+    gSprites[spriteId].data[4] = h >> 16;
+    gSprites[spriteId].oam.priority = oamPriority;
+    gSprites[spriteId].callback = sub_80767D4;
+    return spriteId;
+}
+
+void sub_80767D4(struct Sprite *sprite)
+{
+    if (sprite->data[1] == 0)
+    {
+        u8 r6;
+        u8 r7 = sprite->data[0];
+        u8 r8 = sprite->data[2];
+        u32 r5 = (u16)sprite->data[3] | ((u16)sprite->data[4] << 16);
+
+        if (sprite->subpriority != 0)
+            r6 = sprite->subpriority - 1;
+        else
+            r6 = 0;
+
+        StartSpriteAnim(sprite, 1);
+        LaunchBallStarsTaskForPokeball(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r6);
+        sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, r8, r5);
+        sprite->callback = sub_807687C;
+        StartSpriteAffineAnim(&gSprites[r7], 2);
+        AnimateSprite(&gSprites[r7]);
+        gSprites[r7].data[1] = 0;
+    }
+    else
+    {
+        sprite->data[1]--;
+    }
+}
+
+void sub_807687C(struct Sprite *sprite)
+{
+    u8 r1;
+
+    sprite->data[5]++;
+    if (sprite->data[5] == 11)
+        PlaySE(SE_SUIKOMU);
+    r1 = sprite->data[0];
+    if (gSprites[r1].affineAnimEnded)
+    {
+        StartSpriteAnim(sprite, 2);
+        gSprites[r1].invisible = TRUE;
+        sprite->data[5] = 0;
+        sprite->callback = sub_80768F0;
+    }
+    else
+    {
+        gSprites[r1].data[1] += 96;
+        gSprites[r1].pos2.y = -gSprites[r1].data[1] >> 8;
+    }
+}
+
+void sub_80768F0(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+        sprite->callback = SpriteCallbackDummy;
+}
+
+static void DestroySpriteAndFreeResources_(struct Sprite *sprite)
+{
+    DestroySpriteAndFreeResources(sprite);
+}
+
+void sub_8076918(u8 bank)
+{
+    struct Sprite *healthboxSprite = &gSprites[gHealthBoxesIds[bank]];
+
+    healthboxSprite->data[0] = 5;
+    healthboxSprite->data[1] = 0;
+    healthboxSprite->pos2.x = 0x73;
+    healthboxSprite->pos2.y = 0;
+    healthboxSprite->callback = sub_80769CC;
+    if (GetBankSide(bank) != SIDE_PLAYER)
+    {
+        healthboxSprite->data[0] = -healthboxSprite->data[0];
+        healthboxSprite->data[1] = -healthboxSprite->data[1];
+        healthboxSprite->pos2.x = -healthboxSprite->pos2.x;
+        healthboxSprite->pos2.y = -healthboxSprite->pos2.y;
+    }
+    gSprites[healthboxSprite->data[5]].callback(&gSprites[healthboxSprite->data[5]]);
+    if (GetBankIdentity(bank) == IDENTITY_PLAYER_MON2)
+        healthboxSprite->callback = sub_80769A8;
+}
+
+void sub_80769A8(struct Sprite *sprite)
+{
+    sprite->data[1]++;
+    if (sprite->data[1] == 20)
+    {
+        sprite->data[1] = 0;
+        sprite->callback = sub_80769CC;
+    }
+}
+
+void sub_80769CC(struct Sprite *sprite)
+{
+    sprite->pos2.x -= sprite->data[0];
+    sprite->pos2.y -= sprite->data[1];
+    if (sprite->pos2.x == 0 && sprite->pos2.y == 0)
+        sprite->callback = SpriteCallbackDummy;
+}
+
+void DoHitAnimHealthboxEffect(u8 bank)
+{
+    u8 spriteId;
+
+    spriteId = CreateInvisibleSpriteWithCallback(SpriteCB_HitAnimHealthoxEffect);
+    gSprites[spriteId].data[0] = 1;
+    gSprites[spriteId].data[1] = gHealthBoxesIds[bank];
+    gSprites[spriteId].callback = SpriteCB_HitAnimHealthoxEffect;
+}
+
+void SpriteCB_HitAnimHealthoxEffect(struct Sprite *sprite)
+{
+    u8 r1 = sprite->data[1];
+
+    gSprites[r1].pos2.y = sprite->data[0];
+    sprite->data[0] = -sprite->data[0];
+    sprite->data[2]++;
+    if (sprite->data[2] == 21)
+    {
+        gSprites[r1].pos2.x = 0;
+        gSprites[r1].pos2.y = 0;
+        DestroySprite(sprite);
+    }
+}
+
+void LoadBallGfx(u8 ballId)
+{
+    u16 var;
+
+    if (GetSpriteTileStartByTag(sBallSpriteSheets[ballId].tag) == 0xFFFF)
+    {
+        LoadCompressedObjectPicUsingHeap(&sBallSpriteSheets[ballId]);
+        LoadCompressedObjectPaletteUsingHeap(&sBallSpritePalettes[ballId]);
+    }
+    switch (ballId)
+    {
+    case BALL_DIVE:
+    case BALL_LUXURY:
+    case BALL_PREMIER:
+        break;
+    default:
+        var = GetSpriteTileStartByTag(sBallSpriteSheets[ballId].tag);
+        LZDecompressVram(gOpenPokeballGfx, (void *)(VRAM + 0x10100 + var * 32));
+        break;
+    }
+}
+
+void FreeBallGfx(u8 ballId)
+{
+    FreeSpriteTilesByTag(sBallSpriteSheets[ballId].tag);
+    FreeSpritePaletteByTag(sBallSpritePalettes[ballId].tag);
+}
+
+u16 GetBankPokeballItemId(u8 bank)
+{
+    if (GetBankSide(bank) == SIDE_PLAYER)
+        return GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
+    else
+        return GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
+}
-- 
cgit v1.2.3


From 2fe25da65a07edef2b1beaf895911b18a8c1dbc8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 2 Dec 2017 21:27:00 +0100
Subject: move pokeball data to rom

---
 src/pokeball.c | 412 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 340 insertions(+), 72 deletions(-)

(limited to 'src')

diff --git a/src/pokeball.c b/src/pokeball.c
index a9172b7cf..728145791 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -13,6 +13,7 @@
 #include "decompress.h"
 #include "species.h"
 #include "util.h"
+#include "graphics.h"
 
 extern bool8 gDoingBattleAnim;
 extern u8 gActiveBank;
@@ -22,38 +23,305 @@ extern u8 gBankSpriteIds[];
 extern u8 gHealthBoxesIds[];
 extern struct MusicPlayerInfo gMPlay_BGM;
 
-extern const u32 gOpenPokeballGfx[];
-
 // this file's functions
-void Task_DoPokeballSendOutAnim(u8 taskId);
-void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite);
-void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite);
-void SpriteCB_OpponentMonSendOut(struct Sprite *sprite);
-void sub_80756D4(struct Sprite *sprite);
-void sub_80756E0(struct Sprite *sprite);
-void sub_807574C(struct Sprite *sprite);
-void sub_80757E4(struct Sprite *sprite);
-void sub_8075838(struct Sprite *sprite);
-void sub_8075930(struct Sprite *sprite);
-void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite);
-void SpriteCB_ReleaseMon2FromBall(struct Sprite *sprite);
-void sub_8075970(struct Sprite *sprite);
-void HandleBallAnimEnd(struct Sprite *sprite);
-void sub_8075FB4(struct Sprite *sprite);
-void sub_80760F8(struct Sprite *sprite);
-void sub_8076524(struct Sprite *sprite);
-void sub_80765E0(struct Sprite *sprite);
-void sub_80767D4(struct Sprite *sprite);
-void sub_807687C(struct Sprite *sprite);
-void sub_80768F0(struct Sprite *sprite);
-void sub_80769A8(struct Sprite *sprite);
-void sub_80769CC(struct Sprite *sprite);
-void SpriteCB_HitAnimHealthoxEffect(struct Sprite *sprite);
-u16 GetBankPokeballItemId(u8 bank);
-
-extern const struct CompressedSpriteSheet sBallSpriteSheets[];
-extern const struct CompressedSpritePalette sBallSpritePalettes[];
-extern const struct SpriteTemplate gBallSpriteTemplates[];
+static void Task_DoPokeballSendOutAnim(u8 taskId);
+static void SpriteCB_TestBallThrow(struct Sprite *sprite);
+static void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite);
+static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite);
+static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite);
+static void sub_80756D4(struct Sprite *sprite);
+static void sub_80756E0(struct Sprite *sprite);
+static void sub_807574C(struct Sprite *sprite);
+static void sub_80757E4(struct Sprite *sprite);
+static void sub_8075838(struct Sprite *sprite);
+static void sub_8075930(struct Sprite *sprite);
+static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite);
+static void SpriteCB_ReleaseMon2FromBall(struct Sprite *sprite);
+static void sub_8075970(struct Sprite *sprite);
+static void HandleBallAnimEnd(struct Sprite *sprite);
+static void sub_8075FB4(struct Sprite *sprite);
+static void sub_80760F8(struct Sprite *sprite);
+static void sub_8076524(struct Sprite *sprite);
+static void sub_80765E0(struct Sprite *sprite);
+static void sub_80767D4(struct Sprite *sprite);
+static void sub_807687C(struct Sprite *sprite);
+static void sub_80768F0(struct Sprite *sprite);
+static void sub_80769A8(struct Sprite *sprite);
+static void sub_80769CC(struct Sprite *sprite);
+static void SpriteCB_HitAnimHealthoxEffect(struct Sprite *sprite);
+static u16 GetBankPokeballItemId(u8 bank);
+
+// rom const data
+
+#define GFX_TAG_POKEBALL    55000
+#define GFX_TAG_GREATBALL   55001
+#define GFX_TAG_SAFARIBALL  55002
+#define GFX_TAG_ULTRABALL   55003
+#define GFX_TAG_MASTERBALL  55004
+#define GFX_TAG_NETBALL     55005
+#define GFX_TAG_DIVEBALL    55006
+#define GFX_TAG_NESTBALL    55007
+#define GFX_TAG_REPEATBALL  55008
+#define GFX_TAG_TIMERBALL   55009
+#define GFX_TAG_LUXURYBALL  55010
+#define GFX_TAG_PREMIERBALL 55011
+
+const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] =
+{
+    {gInterfaceGfx_PokeBall,    384, GFX_TAG_POKEBALL},
+    {gInterfaceGfx_GreatBall,   384, GFX_TAG_GREATBALL},
+    {gInterfaceGfx_SafariBall,  384, GFX_TAG_SAFARIBALL},
+    {gInterfaceGfx_UltraBall,   384, GFX_TAG_ULTRABALL},
+    {gInterfaceGfx_MasterBall,  384, GFX_TAG_MASTERBALL},
+    {gInterfaceGfx_NetBall,     384, GFX_TAG_NETBALL},
+    {gInterfaceGfx_DiveBall,    384, GFX_TAG_DIVEBALL},
+    {gInterfaceGfx_NestBall,    384, GFX_TAG_NESTBALL},
+    {gInterfaceGfx_RepeatBall,  384, GFX_TAG_REPEATBALL},
+    {gInterfaceGfx_TimerBall,   384, GFX_TAG_TIMERBALL},
+    {gInterfaceGfx_LuxuryBall,  384, GFX_TAG_LUXURYBALL},
+    {gInterfaceGfx_PremierBall, 384, GFX_TAG_PREMIERBALL},
+};
+
+const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] =
+{
+    {gInterfacePal_PokeBall,    GFX_TAG_POKEBALL},
+    {gInterfacePal_GreatBall,   GFX_TAG_GREATBALL},
+    {gInterfacePal_SafariBall,  GFX_TAG_SAFARIBALL},
+    {gInterfacePal_UltraBall,   GFX_TAG_ULTRABALL},
+    {gInterfacePal_MasterBall,  GFX_TAG_MASTERBALL},
+    {gInterfacePal_NetBall,     GFX_TAG_NETBALL},
+    {gInterfacePal_DiveBall,    GFX_TAG_DIVEBALL},
+    {gInterfacePal_NestBall,    GFX_TAG_NESTBALL},
+    {gInterfacePal_RepeatBall,  GFX_TAG_REPEATBALL},
+    {gInterfacePal_TimerBall,   GFX_TAG_TIMERBALL},
+    {gInterfacePal_LuxuryBall,  GFX_TAG_LUXURYBALL},
+    {gInterfacePal_PremierBall, GFX_TAG_PREMIERBALL},
+};
+
+static const struct OamData sBallOamData =
+{
+    .y = 0,
+    .affineMode = 3,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sBallAnimSeq3[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sBallAnimSeq5[] =
+{
+    ANIMCMD_FRAME(4, 1),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sBallAnimSeq4[] =
+{
+    ANIMCMD_FRAME(8, 5),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sBallAnimSeq6[] =
+{
+    ANIMCMD_FRAME(12, 1),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sBallAnimSeq0[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sBallAnimSeq1[] =
+{
+    ANIMCMD_FRAME(4, 5),
+    ANIMCMD_FRAME(8, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sBallAnimSeq2[] =
+{
+    ANIMCMD_FRAME(4, 5),
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd *const sBallAnimSequences[] =
+{
+    sBallAnimSeq0,
+    sBallAnimSeq1,
+    sBallAnimSeq2,
+
+    // unused?
+    sBallAnimSeq3,
+    sBallAnimSeq4,
+    sBallAnimSeq5,
+    sBallAnimSeq6,
+};
+
+static const union AffineAnimCmd sBallAffineAnimSeq0[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, 0, 1),
+    AFFINEANIMCMD_JUMP(0),
+};
+
+static const union AffineAnimCmd sBallAffineAnimSeq1[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, -3, 1),
+    AFFINEANIMCMD_JUMP(0),
+};
+
+static const union AffineAnimCmd sBallAffineAnimSeq2[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, 3, 1),
+    AFFINEANIMCMD_JUMP(0),
+};
+
+static const union AffineAnimCmd sBallAffineAnimSeq3[] =
+{
+    AFFINEANIMCMD_FRAME(256, 256, 0, 0),
+    AFFINEANIMCMD_END,
+};
+
+static const union AffineAnimCmd sBallAffineAnimSeq4[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, 25, 1),
+    AFFINEANIMCMD_JUMP(0),
+};
+
+static const union AffineAnimCmd *const sBallAffineAnimSequences[] =
+{
+    sBallAffineAnimSeq0,
+    sBallAffineAnimSeq1,
+    sBallAffineAnimSeq2,
+    sBallAffineAnimSeq3,
+    sBallAffineAnimSeq4,
+};
+
+const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
+{
+    {
+        .tileTag = GFX_TAG_POKEBALL,
+        .paletteTag = GFX_TAG_POKEBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_GREATBALL,
+        .paletteTag = GFX_TAG_GREATBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_SAFARIBALL,
+        .paletteTag = GFX_TAG_SAFARIBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_ULTRABALL,
+        .paletteTag = GFX_TAG_ULTRABALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_MASTERBALL,
+        .paletteTag = GFX_TAG_MASTERBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_NETBALL,
+        .paletteTag = GFX_TAG_NETBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_DIVEBALL,
+        .paletteTag = GFX_TAG_DIVEBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_NESTBALL,
+        .paletteTag = GFX_TAG_NESTBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_REPEATBALL,
+        .paletteTag = GFX_TAG_REPEATBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_TIMERBALL,
+        .paletteTag = GFX_TAG_TIMERBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_LUXURYBALL,
+        .paletteTag = GFX_TAG_LUXURYBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+    {
+        .tileTag = GFX_TAG_PREMIERBALL,
+        .paletteTag = GFX_TAG_PREMIERBALL,
+        .oam = &sBallOamData,
+        .anims = sBallAnimSequences,
+        .images = NULL,
+        .affineAnims = sBallAffineAnimSequences,
+        .callback = SpriteCB_TestBallThrow,
+    },
+};
 
 #define tFrames         data[0]
 #define tPan            data[1]
@@ -78,7 +346,7 @@ u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow)
 
 #define sBank           data[6]
 
-void Task_DoPokeballSendOutAnim(u8 taskId)
+static void Task_DoPokeballSendOutAnim(u8 taskId)
 {
     u16 throwCaseId;
     u8 bank;
@@ -147,7 +415,7 @@ void Task_DoPokeballSendOutAnim(u8 taskId)
     PlaySE(SE_NAGERU);
 }
 
-void SpriteCB_TestBallThrow(struct Sprite *sprite)
+static void SpriteCB_TestBallThrow(struct Sprite *sprite)
 {
     if (AnimateBallThrow(sprite))
     {
@@ -179,12 +447,12 @@ void SpriteCB_TestBallThrow(struct Sprite *sprite)
 #undef tBank
 #undef tOpponentBank
 
-void sub_80756D4(struct Sprite *sprite)
+static void sub_80756D4(struct Sprite *sprite)
 {
     sprite->callback = sub_80756E0;
 }
 
-void sub_80756E0(struct Sprite *sprite)
+static void sub_80756E0(struct Sprite *sprite)
 {
     if (++sprite->data[5] == 10)
     {
@@ -196,7 +464,7 @@ void sub_80756E0(struct Sprite *sprite)
     }
 }
 
-void sub_807574C(struct Sprite *sprite)
+static void sub_807574C(struct Sprite *sprite)
 {
     sprite->data[5]++;
     if (sprite->data[5] == 11)
@@ -215,7 +483,7 @@ void sub_807574C(struct Sprite *sprite)
     }
 }
 
-void sub_80757E4(struct Sprite *sprite)
+static void sub_80757E4(struct Sprite *sprite)
 {
     if (sprite->animEnded)
     {
@@ -232,7 +500,7 @@ void sub_80757E4(struct Sprite *sprite)
     }
 }
 
-void sub_8075838(struct Sprite *sprite)
+static void sub_8075838(struct Sprite *sprite)
 {
     bool8 r5 = FALSE;
 
@@ -292,7 +560,7 @@ void sub_8075838(struct Sprite *sprite)
     }
 }
 
-void sub_8075930(struct Sprite *sprite)
+static void sub_8075930(struct Sprite *sprite)
 {
     sprite->data[3]++;
     if (sprite->data[3] == 31)
@@ -305,7 +573,7 @@ void sub_8075930(struct Sprite *sprite)
     }
 }
 
-void sub_8075970(struct Sprite *sprite)
+static void sub_8075970(struct Sprite *sprite)
 {
     switch (sprite->data[3] & 0xFF)
     {
@@ -386,7 +654,7 @@ void sub_8075970(struct Sprite *sprite)
 #define tCryTaskFrames          data[10]
 #define tCryTaskState           data[15]
 
-void Task_PlayCryWhenReleasedFromBall(u8 taskId)
+static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
 {
     u8 wantedCry = gTasks[taskId].tCryTaskWantedCry;
     s8 pan = gTasks[taskId].tCryTaskPan;
@@ -468,7 +736,7 @@ void Task_PlayCryWhenReleasedFromBall(u8 taskId)
     }
 }
 
-void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
+static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
 {
     u8 bank = sprite->sBank;
     u32 ballId;
@@ -554,7 +822,7 @@ void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
 #undef tCryTaskFrames
 #undef tCryTaskState
 
-void sub_8075FB4(struct Sprite *sprite)
+static void sub_8075FB4(struct Sprite *sprite)
 {
     sprite->animPaused = TRUE;
     sprite->callback = sub_80760F8;
@@ -563,7 +831,7 @@ void sub_8075FB4(struct Sprite *sprite)
     sprite->data[5] = 0;
 }
 
-void HandleBallAnimEnd(struct Sprite *sprite)
+static void HandleBallAnimEnd(struct Sprite *sprite)
 {
     bool8 affineAnimEnded = FALSE;
     u8 bank = sprite->sBank;
@@ -604,7 +872,7 @@ void HandleBallAnimEnd(struct Sprite *sprite)
     }
 }
 
-void sub_80760F8(struct Sprite *sprite)
+static void sub_80760F8(struct Sprite *sprite)
 {
     u8 bank = sprite->sBank;
 
@@ -629,7 +897,7 @@ void sub_80760F8(struct Sprite *sprite)
     }
 }
 
-void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite)
+static void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite)
 {
     sprite->data[0] = 25;
     sprite->data[2] = GetBankPosition(sprite->sBank, 2);
@@ -642,7 +910,7 @@ void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite)
 
 #define HIBYTE(x) (((x) >> 8) & 0xFF)
 
-void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite)
+static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite)
 {
     u32 r6;
     u32 r7;
@@ -698,7 +966,7 @@ void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite)
     }
 }
 
-void SpriteCB_ReleaseMon2FromBall(struct Sprite *sprite)
+static void SpriteCB_ReleaseMon2FromBall(struct Sprite *sprite)
 {
     if (sprite->data[0]++ > 24)
     {
@@ -707,7 +975,7 @@ void SpriteCB_ReleaseMon2FromBall(struct Sprite *sprite)
     }
 }
 
-void SpriteCB_OpponentMonSendOut(struct Sprite *sprite)
+static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite)
 {
     sprite->data[0]++;
     if (sprite->data[0] > 15)
@@ -723,22 +991,22 @@ void SpriteCB_OpponentMonSendOut(struct Sprite *sprite)
 
 #undef sBank
 
-u8 LaunchBallStarsTaskForPokeball(u8 x, u8 y, u8 kindOfStars, u8 d)
+static u8 LaunchBallStarsTaskForPokeball(u8 x, u8 y, u8 kindOfStars, u8 d)
 {
-    return LaunchBallStarsTask(x, y, kindOfStars, d, 0);
+    return LaunchBallStarsTask(x, y, kindOfStars, d, BALL_POKE);
 }
 
-u8 LaunchBallFadeMonTaskForPokeball(bool8 unFadeLater, u8 bank, u32 arg2)
+static u8 LaunchBallFadeMonTaskForPokeball(bool8 unFadeLater, u8 bank, u32 arg2)
 {
-    return LaunchBallFadeMonTask(unFadeLater, bank, arg2, 0);
+    return LaunchBallFadeMonTask(unFadeLater, bank, arg2, BALL_POKE);
 }
 
 void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h, u16 species)
 {
     u8 spriteId;
 
-    LoadCompressedObjectPicUsingHeap(&sBallSpriteSheets[0]);
-    LoadCompressedObjectPaletteUsingHeap(&sBallSpritePalettes[0]);
+    LoadCompressedObjectPicUsingHeap(&gBallSpriteSheets[0]);
+    LoadCompressedObjectPaletteUsingHeap(&gBallSpritePalettes[0]);
     spriteId = CreateSprite(&gBallSpriteTemplates[0], x, y, subpriortiy);
 
     gSprites[spriteId].data[0] = monSpriteId;
@@ -759,7 +1027,7 @@ void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oa
     gSprites[monSpriteId].invisible = TRUE;
 }
 
-void sub_8076524(struct Sprite *sprite)
+static void sub_8076524(struct Sprite *sprite)
 {
     if (sprite->data[1] == 0)
     {
@@ -789,7 +1057,7 @@ void sub_8076524(struct Sprite *sprite)
     }
 }
 
-void sub_80765E0(struct Sprite *sprite)
+static void sub_80765E0(struct Sprite *sprite)
 {
     bool8 r12 = FALSE;
     bool8 r6 = FALSE;
@@ -839,8 +1107,8 @@ u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32
 {
     u8 spriteId;
 
-    LoadCompressedObjectPicUsingHeap(&sBallSpriteSheets[0]);
-    LoadCompressedObjectPaletteUsingHeap(&sBallSpritePalettes[0]);
+    LoadCompressedObjectPicUsingHeap(&gBallSpriteSheets[0]);
+    LoadCompressedObjectPaletteUsingHeap(&gBallSpritePalettes[0]);
     spriteId = CreateSprite(&gBallSpriteTemplates[0], x, y, subPriority);
     gSprites[spriteId].data[0] = a;
     gSprites[spriteId].data[1] = g;
@@ -852,7 +1120,7 @@ u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32
     return spriteId;
 }
 
-void sub_80767D4(struct Sprite *sprite)
+static void sub_80767D4(struct Sprite *sprite)
 {
     if (sprite->data[1] == 0)
     {
@@ -880,7 +1148,7 @@ void sub_80767D4(struct Sprite *sprite)
     }
 }
 
-void sub_807687C(struct Sprite *sprite)
+static void sub_807687C(struct Sprite *sprite)
 {
     u8 r1;
 
@@ -902,7 +1170,7 @@ void sub_807687C(struct Sprite *sprite)
     }
 }
 
-void sub_80768F0(struct Sprite *sprite)
+static void sub_80768F0(struct Sprite *sprite)
 {
     if (sprite->animEnded)
         sprite->callback = SpriteCallbackDummy;
@@ -934,7 +1202,7 @@ void sub_8076918(u8 bank)
         healthboxSprite->callback = sub_80769A8;
 }
 
-void sub_80769A8(struct Sprite *sprite)
+static void sub_80769A8(struct Sprite *sprite)
 {
     sprite->data[1]++;
     if (sprite->data[1] == 20)
@@ -944,7 +1212,7 @@ void sub_80769A8(struct Sprite *sprite)
     }
 }
 
-void sub_80769CC(struct Sprite *sprite)
+static void sub_80769CC(struct Sprite *sprite)
 {
     sprite->pos2.x -= sprite->data[0];
     sprite->pos2.y -= sprite->data[1];
@@ -962,7 +1230,7 @@ void DoHitAnimHealthboxEffect(u8 bank)
     gSprites[spriteId].callback = SpriteCB_HitAnimHealthoxEffect;
 }
 
-void SpriteCB_HitAnimHealthoxEffect(struct Sprite *sprite)
+static void SpriteCB_HitAnimHealthoxEffect(struct Sprite *sprite)
 {
     u8 r1 = sprite->data[1];
 
@@ -981,10 +1249,10 @@ void LoadBallGfx(u8 ballId)
 {
     u16 var;
 
-    if (GetSpriteTileStartByTag(sBallSpriteSheets[ballId].tag) == 0xFFFF)
+    if (GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag) == 0xFFFF)
     {
-        LoadCompressedObjectPicUsingHeap(&sBallSpriteSheets[ballId]);
-        LoadCompressedObjectPaletteUsingHeap(&sBallSpritePalettes[ballId]);
+        LoadCompressedObjectPicUsingHeap(&gBallSpriteSheets[ballId]);
+        LoadCompressedObjectPaletteUsingHeap(&gBallSpritePalettes[ballId]);
     }
     switch (ballId)
     {
@@ -993,7 +1261,7 @@ void LoadBallGfx(u8 ballId)
     case BALL_PREMIER:
         break;
     default:
-        var = GetSpriteTileStartByTag(sBallSpriteSheets[ballId].tag);
+        var = GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag);
         LZDecompressVram(gOpenPokeballGfx, (void *)(VRAM + 0x10100 + var * 32));
         break;
     }
@@ -1001,11 +1269,11 @@ void LoadBallGfx(u8 ballId)
 
 void FreeBallGfx(u8 ballId)
 {
-    FreeSpriteTilesByTag(sBallSpriteSheets[ballId].tag);
-    FreeSpritePaletteByTag(sBallSpritePalettes[ballId].tag);
+    FreeSpriteTilesByTag(gBallSpriteSheets[ballId].tag);
+    FreeSpritePaletteByTag(gBallSpritePalettes[ballId].tag);
 }
 
-u16 GetBankPokeballItemId(u8 bank)
+static u16 GetBankPokeballItemId(u8 bank)
 {
     if (GetBankSide(bank) == SIDE_PLAYER)
         return GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
-- 
cgit v1.2.3


From ce6e97fa0b24e69582615048dbbac17a55afe8ac Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 2 Dec 2017 21:44:50 +0100
Subject: sprite data fields to array

---
 src/battle_2.c                            | 126 ++++----
 src/battle_controller_link_opponent.c     |  38 +--
 src/battle_controller_link_partner.c      |  42 +--
 src/battle_controller_opponent.c          |  40 +--
 src/battle_controller_player.c            |  46 +--
 src/battle_controller_player_partner.c    |  44 +--
 src/battle_controller_recorded_opponent.c |  36 +--
 src/battle_controller_recorded_player.c   |  44 +--
 src/battle_controller_safari.c            |   2 +-
 src/battle_controller_wally.c             |  32 +-
 src/battle_gfx_sfx_util.c                 |  10 +-
 src/battle_interface.c                    | 144 ++++-----
 src/battle_script_commands.c              |   4 +-
 src/berry_blender.c                       | 110 +++----
 src/decoration.c                          |  68 ++---
 src/egg_hatch.c                           |  78 ++---
 src/evolution_graphics.c                  |  80 ++---
 src/field_map_obj.c                       | 468 +++++++++++++++---------------
 src/hall_of_fame.c                        |  18 +-
 src/pokemon_summary_screen.c              |   4 +-
 src/region_map.c                          |  38 +--
 src/reshow_battle_screen.c                |  12 +-
 src/sprite.c                              |  17 +-
 src/starter_choose.c                      |  24 +-
 24 files changed, 759 insertions(+), 766 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index eead4d7a9..8905a0ec7 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -1620,7 +1620,7 @@ void CB2_QuitRecordedBattle(void)
 
 void sub_8038528(struct Sprite* sprite)
 {
-    sprite->data0 = 0;
+    sprite->data[0] = 0;
     sprite->callback = sub_8038538;
 }
 
@@ -1628,42 +1628,42 @@ static void sub_8038538(struct Sprite *sprite)
 {
     u16 *arr = (u16*)(gDecompressionBuffer);
 
-    switch (sprite->data0)
+    switch (sprite->data[0])
     {
     case 0:
-        sprite->data0++;
-        sprite->data1 = 0;
-        sprite->data2 = 0x281;
-        sprite->data3 = 0;
-        sprite->data4 = 1;
+        sprite->data[0]++;
+        sprite->data[1] = 0;
+        sprite->data[2] = 0x281;
+        sprite->data[3] = 0;
+        sprite->data[4] = 1;
         // fall through
     case 1:
-        sprite->data4--;
-        if (sprite->data4 == 0)
+        sprite->data[4]--;
+        if (sprite->data[4] == 0)
         {
             s32 i;
             s32 r2;
             s32 r0;
 
-            sprite->data4 = 2;
-            r2 = sprite->data1 + sprite->data3 * 32;
-            r0 = sprite->data2 - sprite->data3 * 32;
+            sprite->data[4] = 2;
+            r2 = sprite->data[1] + sprite->data[3] * 32;
+            r0 = sprite->data[2] - sprite->data[3] * 32;
             for (i = 0; i < 29; i += 2)
             {
                 arr[r2 + i] = 0x3D;
                 arr[r0 + i] = 0x3D;
             }
-            sprite->data3++;
-            if (sprite->data3 == 21)
+            sprite->data[3]++;
+            if (sprite->data[3] == 21)
             {
-                sprite->data0++;
-                sprite->data1 = 32;
+                sprite->data[0]++;
+                sprite->data[1] = 32;
             }
         }
         break;
     case 2:
-        sprite->data1--;
-        if (sprite->data1 == 20)
+        sprite->data[1]--;
+        if (sprite->data[1] == 20)
             SetMainCallback2(CB2_InitBattle);
         break;
     }
@@ -1824,12 +1824,12 @@ void nullsub_17(void)
 
 static void sub_8038B04(struct Sprite *sprite)
 {
-    if (sprite->data0 != 0)
-        sprite->pos1.x = sprite->data1 + ((sprite->data2 & 0xFF00) >> 8);
+    if (sprite->data[0] != 0)
+        sprite->pos1.x = sprite->data[1] + ((sprite->data[2] & 0xFF00) >> 8);
     else
-        sprite->pos1.x = sprite->data1 - ((sprite->data2 & 0xFF00) >> 8);
+        sprite->pos1.x = sprite->data[1] - ((sprite->data[2] & 0xFF00) >> 8);
 
-    sprite->data2 += 0x180;
+    sprite->data[2] += 0x180;
 
     if (sprite->affineAnimEnded)
     {
@@ -2382,8 +2382,8 @@ u32 sub_80397C4(u32 setId, u32 tableId)
     return gUnknown_0831ABA0[setId][tableId].width * 8;
 }
 
-#define tBank               data0
-#define tSpeciesId          data2
+#define tBank               data[0]
+#define tSpeciesId          data[2]
 
 void oac_poke_opponent(struct Sprite *sprite)
 {
@@ -2431,20 +2431,20 @@ void SpriteCallbackDummy_2(struct Sprite *sprite)
 
 static void sub_80398BC(struct Sprite *sprite) // unused?
 {
-    sprite->data3 = 6;
-    sprite->data4 = 1;
+    sprite->data[3] = 6;
+    sprite->data[4] = 1;
     sprite->callback = sub_80398D0;
 }
 
 static void sub_80398D0(struct Sprite *sprite)
 {
-    sprite->data4--;
-    if (sprite->data4 == 0)
+    sprite->data[4]--;
+    if (sprite->data[4] == 0)
     {
-        sprite->data4 = 8;
+        sprite->data[4] = 8;
         sprite->invisible ^= 1;
-        sprite->data3--;
-        if (sprite->data3 == 0)
+        sprite->data[3]--;
+        if (sprite->data[3] == 0)
         {
             sprite->invisible = FALSE;
             sprite->callback = SpriteCallbackDummy_2;
@@ -2495,8 +2495,8 @@ void sub_8039934(struct Sprite *sprite)
         yOffset = gMonFrontPicCoords[species].y_offset;
     }
 
-    sprite->data3 = 8 - yOffset / 8;
-    sprite->data4 = 1;
+    sprite->data[3] = 8 - yOffset / 8;
+    sprite->data[4] = 1;
     sprite->callback = sub_8039A48;
 }
 
@@ -2504,20 +2504,20 @@ static void sub_8039A48(struct Sprite *sprite)
 {
     s32 i;
 
-    sprite->data4--;
-    if (sprite->data4 == 0)
+    sprite->data[4]--;
+    if (sprite->data[4] == 0)
     {
-        sprite->data4 = 2;
+        sprite->data[4] = 2;
         sprite->pos2.y += 8;
-        sprite->data3--;
-        if (sprite->data3 < 0)
+        sprite->data[3]--;
+        if (sprite->data[3] < 0)
         {
             FreeSpriteOamMatrix(sprite);
             DestroySprite(sprite);
         }
         else
         {
-            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBankIdentity(sprite->tBank)] + (gBattleMonForms[sprite->tBank] << 11) + (sprite->data3 << 8);
+            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBankIdentity(sprite->tBank)] + (gBattleMonForms[sprite->tBank] << 11) + (sprite->data[3] << 8);
 
             for (i = 0; i < 0x100; i++)
                 *(dst++) = 0;
@@ -2529,25 +2529,25 @@ static void sub_8039A48(struct Sprite *sprite)
 
 void sub_8039AD8(struct Sprite *sprite)
 {
-    sprite->data3 = 8;
-    sprite->data4 = sprite->invisible;
+    sprite->data[3] = 8;
+    sprite->data[4] = sprite->invisible;
     sprite->callback = sub_8039AF4;
 }
 
 static void sub_8039AF4(struct Sprite *sprite)
 {
-    sprite->data3--;
-    if (sprite->data3 == 0)
+    sprite->data[3]--;
+    if (sprite->data[3] == 0)
     {
         sprite->invisible ^= 1;
-        sprite->data3 = 8;
+        sprite->data[3] = 8;
     }
 }
 
 void sub_8039B2C(struct Sprite *sprite)
 {
-    sprite->invisible = sprite->data4;
-    sprite->data4 = FALSE;
+    sprite->invisible = sprite->data[4];
+    sprite->data[4] = FALSE;
     sprite->callback = SpriteCallbackDummy_2;
 }
 
@@ -2577,7 +2577,7 @@ static void oac_poke_ally_(struct Sprite *sprite)
         if (sprite->pos2.x == 0)
         {
             sprite->callback = SpriteCallbackDummy_3;
-            sprite->data1 = 0;
+            sprite->data[1] = 0;
         }
     }
 }
@@ -2595,8 +2595,8 @@ void sub_8039C00(struct Sprite *sprite)
 {
     if (!(gUnknown_020243FC & 1))
     {
-        sprite->pos2.x += sprite->data1;
-        sprite->pos2.y += sprite->data2;
+        sprite->pos2.x += sprite->data[1];
+        sprite->pos2.y += sprite->data[2];
     }
 }
 
@@ -2622,19 +2622,19 @@ void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d)
         spriteId2 = gHealthBoxesIds[bank];
         gBattleSpritesDataPtr->healthBoxesData[bank].field_2 = bounceHealthBoxSpriteId;
         gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2 = 1;
-        gSprites[bounceHealthBoxSpriteId].data0 = 0x80;
+        gSprites[bounceHealthBoxSpriteId].data[0] = 0x80;
     }
     else
     {
         spriteId2 = gBankSpriteIds[bank];
         gBattleSpritesDataPtr->healthBoxesData[bank].field_3 = bounceHealthBoxSpriteId;
         gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4 = 1;
-        gSprites[bounceHealthBoxSpriteId].data0 = 0xC0;
+        gSprites[bounceHealthBoxSpriteId].data[0] = 0xC0;
     }
-    gSprites[bounceHealthBoxSpriteId].data1 = c;
-    gSprites[bounceHealthBoxSpriteId].data2 = d;
-    gSprites[bounceHealthBoxSpriteId].data3 = spriteId2;
-    gSprites[bounceHealthBoxSpriteId].data4 = b;
+    gSprites[bounceHealthBoxSpriteId].data[1] = c;
+    gSprites[bounceHealthBoxSpriteId].data[2] = d;
+    gSprites[bounceHealthBoxSpriteId].data[3] = spriteId2;
+    gSprites[bounceHealthBoxSpriteId].data[4] = b;
     gSprites[spriteId2].pos2.x = 0;
     gSprites[spriteId2].pos2.y = 0;
 }
@@ -2648,7 +2648,7 @@ void dp11b_obj_free(u8 bank, bool8 b)
         if (!gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2)
             return;
 
-        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_2].data3;
+        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_2].data[3];
         DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_2]);
         gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2 = 0;
     }
@@ -2657,7 +2657,7 @@ void dp11b_obj_free(u8 bank, bool8 b)
         if (!gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4)
             return;
 
-        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_3].data3;
+        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_3].data[3];
         DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_3]);
         gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4 = 0;
     }
@@ -2667,16 +2667,16 @@ void dp11b_obj_free(u8 bank, bool8 b)
 
 static void SpriteCB_HealthBoxBounce(struct Sprite *sprite)
 {
-    u8 spriteId = sprite->data3;
+    u8 spriteId = sprite->data[3];
     s32 var;
 
-    if (sprite->data4 == 1)
-        var = sprite->data0;
+    if (sprite->data[4] == 1)
+        var = sprite->data[0];
     else
-        var = sprite->data0;
+        var = sprite->data[0];
 
-    gSprites[spriteId].pos2.y = Sin(var, sprite->data2) + sprite->data2;
-    sprite->data0 = (sprite->data0 + sprite->data1) & 0xFF;
+    gSprites[spriteId].pos2.y = Sin(var, sprite->data[2]) + sprite->data[2];
+    sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF;
 }
 
 void sub_8039E44(struct Sprite *sprite)
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index e691af6a1..4795d2bd4 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -465,18 +465,18 @@ static void DoHitAnimBlinkSpriteEffect(void)
 {
     u8 spriteId = gBankSpriteIds[gActiveBank];
 
-    if (gSprites[spriteId].data1 == 32)
+    if (gSprites[spriteId].data[1] == 32)
     {
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         gSprites[spriteId].invisible = 0;
         gDoingBattleAnim = FALSE;
         LinkOpponentBufferExecCompleted();
     }
     else
     {
-        if ((gSprites[spriteId].data1 % 4) == 0)
+        if ((gSprites[spriteId].data[1] % 4) == 0)
             gSprites[spriteId].invisible ^= 1;
-        gSprites[spriteId].data1++;
+        gSprites[spriteId].data[1]++;
     }
 }
 
@@ -1168,7 +1168,7 @@ static void LinkOpponentHandleLoadMonSprite(void)
                                                sub_80A82E4(gActiveBank));
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
 
@@ -1201,11 +1201,11 @@ static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
-    gSprites[gUnknown_03005D7C[bank]].data2 = bank;
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data0 = bank;
-    gSprites[gBankSpriteIds[bank]].data2 = species;
+    gSprites[gBankSpriteIds[bank]].data[0] = bank;
+    gSprites[gBankSpriteIds[bank]].data[2] = species;
     gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
 
     StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
@@ -1213,7 +1213,7 @@ static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
+    gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
 }
 
 static void LinkOpponentHandleReturnMonToBall(void)
@@ -1334,7 +1334,7 @@ static void LinkOpponentHandleDrawTrainerPic(void)
                                                sub_80A82E4(gActiveBank));
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 2;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
     gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicId;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
@@ -1357,7 +1357,7 @@ static void LinkOpponentHandleTrainerSlide(void)
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 96;
     gSprites[gBankSpriteIds[gActiveBank]].pos1.x += 32;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
     gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicId;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
@@ -1369,9 +1369,9 @@ static void LinkOpponentHandleTrainerSlide(void)
 static void LinkOpponentHandleTrainerSlideBack(void)
 {
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     gBattleBankFunc[gActiveBank] = sub_8064470;
@@ -1670,7 +1670,7 @@ static void LinkOpponentHandleHitAnimation(void)
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
+        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBank);
         gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
     }
@@ -1731,9 +1731,9 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void)
 
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
 
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_80676FC);
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 02159970e..fde364a55 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -352,18 +352,18 @@ static void DoHitAnimBlinkSpriteEffect(void)
 {
     u8 spriteId = gBankSpriteIds[gActiveBank];
 
-    if (gSprites[spriteId].data1 == 32)
+    if (gSprites[spriteId].data[1] == 32)
     {
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         gSprites[spriteId].invisible = 0;
         gDoingBattleAnim = FALSE;
         LinkPartnerBufferExecCompleted();
     }
     else
     {
-        if ((gSprites[spriteId].data1 % 4) == 0)
+        if ((gSprites[spriteId].data[1] % 4) == 0)
             gSprites[spriteId].invisible ^= 1;
-        gSprites[spriteId].data1++;
+        gSprites[spriteId].data[1]++;
     }
 }
 
@@ -1053,7 +1053,7 @@ static void LinkPartnerHandleLoadMonSprite(void)
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
     gBattleBankFunc[gActiveBank] = sub_814B290;
@@ -1084,11 +1084,11 @@ static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
-    gSprites[gUnknown_03005D7C[bank]].data2 = bank;
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data0 = bank;
-    gSprites[gBankSpriteIds[bank]].data2 = species;
+    gSprites[gBankSpriteIds[bank]].data[0] = bank;
+    gSprites[gBankSpriteIds[bank]].data[2] = species;
     gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
 
     StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
@@ -1096,7 +1096,7 @@ static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
+    gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
 static void LinkPartnerHandleReturnMonToBall(void)
@@ -1174,7 +1174,7 @@ static void LinkPartnerHandleDrawTrainerPic(void)
 
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
 
     gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
@@ -1188,9 +1188,9 @@ static void LinkPartnerHandleTrainerSlide(void)
 static void LinkPartnerHandleTrainerSlideBack(void)
 {
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     gBattleBankFunc[gActiveBank] = sub_814AF54;
@@ -1211,8 +1211,8 @@ static void LinkPartnerHandleFaintAnimation(void)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
-            gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
-            gSprites[gBankSpriteIds[gActiveBank]].data2 = 5;
+            gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
+            gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
             gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039C00;
             gBattleBankFunc[gActiveBank] = sub_814B340;
         }
@@ -1492,7 +1492,7 @@ static void LinkPartnerHandleHitAnimation(void)
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
+        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBank);
         gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
     }
@@ -1554,11 +1554,11 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
 
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBank]].data5 = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
 
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_805CC00);
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 7338fdb00..dc23db8bc 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -453,18 +453,18 @@ static void DoHitAnimBlinkSpriteEffect(void)
 {
     u8 spriteId = gBankSpriteIds[gActiveBank];
 
-    if (gSprites[spriteId].data1 == 32)
+    if (gSprites[spriteId].data[1] == 32)
     {
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         gSprites[spriteId].invisible = 0;
         gDoingBattleAnim = FALSE;
         OpponentBufferExecCompleted();
     }
     else
     {
-        if ((gSprites[spriteId].data1 % 4) == 0)
+        if ((gSprites[spriteId].data[1] % 4) == 0)
             gSprites[spriteId].invisible ^= 1;
-        gSprites[spriteId].data1++;
+        gSprites[spriteId].data[1]++;
     }
 }
 
@@ -1156,8 +1156,8 @@ static void OpponentHandleLoadMonSprite(void)
                                                sub_80A82E4(gActiveBank));
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = species;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = species;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
 
@@ -1190,11 +1190,11 @@ static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
                                         GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
-    gSprites[gBankSpriteIds[bank]].data0 = bank;
-    gSprites[gBankSpriteIds[bank]].data2 = species;
+    gSprites[gBankSpriteIds[bank]].data[0] = bank;
+    gSprites[gBankSpriteIds[bank]].data[2] = species;
 
-    gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
-    gSprites[gUnknown_03005D7C[bank]].data2 = bank;
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
     gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
 
@@ -1203,7 +1203,7 @@ static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
+    gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
 }
 
 static void OpponentHandleReturnMonToBall(void)
@@ -1321,7 +1321,7 @@ static void OpponentHandleDrawTrainerPic(void)
                                                sub_80A82E4(gActiveBank));
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 2;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
     gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicId;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
@@ -1391,7 +1391,7 @@ static void OpponentHandleTrainerSlide(void)
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 96;
     gSprites[gBankSpriteIds[gActiveBank]].pos1.x += 32;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
     gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicId;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
@@ -1402,9 +1402,9 @@ static void OpponentHandleTrainerSlide(void)
 static void OpponentHandleTrainerSlideBack(void)
 {
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     gBattleBankFunc[gActiveBank] = sub_805F240;
@@ -1815,7 +1815,7 @@ static void OpponentHandleHitAnimation(void)
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
+        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBank);
         gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
     }
@@ -1876,9 +1876,9 @@ static void OpponentHandleIntroTrainerBallThrow(void)
 
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
 
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_806280C);
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 7c97c83bb..137b33274 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -1431,18 +1431,18 @@ static void DoHitAnimBlinkSpriteEffect(void)
 {
     u8 spriteId = gBankSpriteIds[gActiveBank];
 
-    if (gSprites[spriteId].data1 == 32)
+    if (gSprites[spriteId].data[1] == 32)
     {
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         gSprites[spriteId].invisible = 0;
         gDoingBattleAnim = FALSE;
         PlayerBufferExecCompleted();
     }
     else
     {
-        if ((gSprites[spriteId].data1 % 4) == 0)
+        if ((gSprites[spriteId].data[1] % 4) == 0)
             gSprites[spriteId].invisible ^= 1;
-        gSprites[spriteId].data1++;
+        gSprites[spriteId].data[1]++;
     }
 }
 
@@ -2241,11 +2241,11 @@ static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
-    gSprites[gUnknown_03005D7C[bank]].data2 = bank;
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data0 = bank;
-    gSprites[gBankSpriteIds[bank]].data2 = species;
+    gSprites[gBankSpriteIds[bank]].data[0] = bank;
+    gSprites[gBankSpriteIds[bank]].data[2] = species;
     gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
 
     StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
@@ -2253,7 +2253,7 @@ static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
+    gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
 static void PlayerHandleReturnMonToBall(void)
@@ -2358,7 +2358,7 @@ static void PlayerHandleDrawTrainerPic(void)
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
         gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
         gSprites[gBankSpriteIds[gActiveBank]].pos2.y = 48;
-        gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
         gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
         gSprites[gBankSpriteIds[gActiveBank]].oam.affineMode = 0;
         gSprites[gBankSpriteIds[gActiveBank]].hFlip = 1;
@@ -2372,7 +2372,7 @@ static void PlayerHandleDrawTrainerPic(void)
 
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
         gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
         gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
     }
 
@@ -2411,7 +2411,7 @@ static void PlayerHandleTrainerSlide(void)
 
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -96;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 2;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
 
     gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy2;
@@ -2420,9 +2420,9 @@ static void PlayerHandleTrainerSlide(void)
 static void PlayerHandleTrainerSlideBack(void)
 {
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
@@ -2444,8 +2444,8 @@ static void PlayerHandleFaintAnimation(void)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
-            gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
-            gSprites[gBankSpriteIds[gActiveBank]].data2 = 5;
+            gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
+            gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
             gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039C00;
             gBattleBankFunc[gActiveBank] = sub_80596A8;
         }
@@ -2902,7 +2902,7 @@ static void PlayerHandleHitAnimation(void)
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
+        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBank);
         gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
     }
@@ -2963,11 +2963,11 @@ static void PlayerHandleIntroTrainerBallThrow(void)
 
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBank]].data5 = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
 
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_805CC00);
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
@@ -2988,7 +2988,7 @@ static void PlayerHandleIntroTrainerBallThrow(void)
 
 void sub_805CC00(struct Sprite *sprite)
 {
-    u8 bank = sprite->data5;
+    u8 bank = sprite->data[5];
 
     FreeSpriteOamMatrix(sprite);
     FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum));
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index c05c3dcf8..3ce12fac7 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -539,18 +539,18 @@ static void DoHitAnimBlinkSpriteEffect(void)
 {
     u8 spriteId = gBankSpriteIds[gActiveBank];
 
-    if (gSprites[spriteId].data1 == 32)
+    if (gSprites[spriteId].data[1] == 32)
     {
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         gSprites[spriteId].invisible = 0;
         gDoingBattleAnim = FALSE;
         PlayerPartnerBufferExecCompleted();
     }
     else
     {
-        if ((gSprites[spriteId].data1 % 4) == 0)
+        if ((gSprites[spriteId].data[1] % 4) == 0)
             gSprites[spriteId].invisible ^= 1;
-        gSprites[spriteId].data1++;
+        gSprites[spriteId].data[1]++;
     }
 }
 
@@ -1240,7 +1240,7 @@ static void PlayerPartnerHandleLoadMonSprite(void)
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
     gBattleBankFunc[gActiveBank] = sub_81BB1D4;
@@ -1271,11 +1271,11 @@ static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
-    gSprites[gUnknown_03005D7C[bank]].data2 = bank;
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data0 = bank;
-    gSprites[gBankSpriteIds[bank]].data2 = species;
+    gSprites[gBankSpriteIds[bank]].data[0] = bank;
+    gSprites[gBankSpriteIds[bank]].data[2] = species;
     gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
 
     StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
@@ -1283,7 +1283,7 @@ static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
+    gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
 static void PlayerPartnerHandleReturnMonToBall(void)
@@ -1353,7 +1353,7 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
 
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
         gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
         gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
     }
     else // otherwise use front sprite
@@ -1365,7 +1365,7 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
         gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
         gSprites[gBankSpriteIds[gActiveBank]].pos2.y = 48;
-        gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
         gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
         gSprites[gBankSpriteIds[gActiveBank]].oam.affineMode = 0;
         gSprites[gBankSpriteIds[gActiveBank]].hFlip = 1;
@@ -1382,9 +1382,9 @@ static void PlayerPartnerHandleTrainerSlide(void)
 static void PlayerPartnerHandleTrainerSlideBack(void)
 {
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     gBattleBankFunc[gActiveBank] = sub_81BAE98;
@@ -1405,8 +1405,8 @@ static void PlayerPartnerHandleFaintAnimation(void)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
-            gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
-            gSprites[gBankSpriteIds[gActiveBank]].data2 = 5;
+            gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
+            gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
             gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039C00;
             gBattleBankFunc[gActiveBank] = sub_81BB78C;
         }
@@ -1745,7 +1745,7 @@ static void PlayerPartnerHandleHitAnimation(void)
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
+        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBank);
         gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
     }
@@ -1806,11 +1806,11 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
 
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBank]].data5 = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
 
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_805CC00);
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index d400d74b6..a57b2c576 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -449,18 +449,18 @@ static void DoHitAnimBlinkSpriteEffect(void)
 {
     u8 spriteId = gBankSpriteIds[gActiveBank];
 
-    if (gSprites[spriteId].data1 == 32)
+    if (gSprites[spriteId].data[1] == 32)
     {
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         gSprites[spriteId].invisible = 0;
         gDoingBattleAnim = FALSE;
         RecordedOpponentBufferExecCompleted();
     }
     else
     {
-        if ((gSprites[spriteId].data1 % 4) == 0)
+        if ((gSprites[spriteId].data[1] % 4) == 0)
             gSprites[spriteId].invisible ^= 1;
-        gSprites[spriteId].data1++;
+        gSprites[spriteId].data[1]++;
     }
 }
 
@@ -1155,7 +1155,7 @@ static void RecordedOpponentHandleLoadMonSprite(void)
 
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
 
@@ -1187,11 +1187,11 @@ static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
                                         GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
-    gSprites[gUnknown_03005D7C[bank]].data2 = bank;
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data0 = bank;
-    gSprites[gBankSpriteIds[bank]].data2 = species;
+    gSprites[gBankSpriteIds[bank]].data[0] = bank;
+    gSprites[gBankSpriteIds[bank]].data[2] = species;
     gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
 
     StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
@@ -1199,7 +1199,7 @@ static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
+    gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
 }
 
 static void RecordedOpponentHandleReturnMonToBall(void)
@@ -1285,7 +1285,7 @@ static void RecordedOpponentHandleDrawTrainerPic(void)
                                                sub_80A82E4(gActiveBank));
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 2;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
     gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicId;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
@@ -1301,9 +1301,9 @@ static void RecordedOpponentHandleTrainerSlide(void)
 static void RecordedOpponentHandleTrainerSlideBack(void)
 {
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     gBattleBankFunc[gActiveBank] = sub_81865C8;
@@ -1614,7 +1614,7 @@ static void RecordedOpponentHandleHitAnimation(void)
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
+        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBank);
         gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
     }
@@ -1675,9 +1675,9 @@ static void RecordedOpponentHandleIntroTrainerBallThrow(void)
 
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
 
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_818962C);
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 5c25ddf88..86558d25c 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -437,18 +437,18 @@ static void DoHitAnimBlinkSpriteEffect(void)
 {
     u8 spriteId = gBankSpriteIds[gActiveBank];
 
-    if (gSprites[spriteId].data1 == 32)
+    if (gSprites[spriteId].data[1] == 32)
     {
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         gSprites[spriteId].invisible = 0;
         gDoingBattleAnim = FALSE;
         RecordedPlayerBufferExecCompleted();
     }
     else
     {
-        if ((gSprites[spriteId].data1 % 4) == 0)
+        if ((gSprites[spriteId].data[1] % 4) == 0)
             gSprites[spriteId].invisible ^= 1;
-        gSprites[spriteId].data1++;
+        gSprites[spriteId].data[1]++;
     }
 }
 
@@ -1138,7 +1138,7 @@ static void RecordedPlayerHandleLoadMonSprite(void)
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
     gBattleBankFunc[gActiveBank] = sub_818A064;
@@ -1169,11 +1169,11 @@ static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
-    gSprites[gUnknown_03005D7C[bank]].data2 = bank;
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data0 = bank;
-    gSprites[gBankSpriteIds[bank]].data2 = species;
+    gSprites[gBankSpriteIds[bank]].data[0] = bank;
+    gSprites[gBankSpriteIds[bank]].data[2] = species;
     gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
 
     StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
@@ -1181,7 +1181,7 @@ static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
 
-    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
+    gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
 static void RecordedPlayerHandleReturnMonToBall(void)
@@ -1272,7 +1272,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
         gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
         gSprites[gBankSpriteIds[gActiveBank]].pos2.y = 48;
-        gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
         gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
         gSprites[gBankSpriteIds[gActiveBank]].oam.affineMode = 0;
         gSprites[gBankSpriteIds[gActiveBank]].hFlip = 1;
@@ -1285,7 +1285,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
 
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
         gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
         gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
     }
 
@@ -1300,9 +1300,9 @@ static void RecordedPlayerHandleTrainerSlide(void)
 static void RecordedPlayerHandleTrainerSlideBack(void)
 {
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
     gBattleBankFunc[gActiveBank] = sub_81899F0;
@@ -1323,8 +1323,8 @@ static void RecordedPlayerHandleFaintAnimation(void)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
             PlaySE12WithPanning(SE_POKE_DEAD, -64);
-            gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
-            gSprites[gBankSpriteIds[gActiveBank]].data2 = 5;
+            gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
+            gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
             gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039C00;
             gBattleBankFunc[gActiveBank] = sub_818A114;
         }
@@ -1633,7 +1633,7 @@ static void RecordedPlayerHandleHitAnimation(void)
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
+        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBank);
         gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
     }
@@ -1695,11 +1695,11 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void)
 
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBank]].data5 = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
 
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_805CC00);
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 635f5fef1..2ec14cab5 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -384,7 +384,7 @@ static void SafariHandleDrawTrainerPic(void)
       30);
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
     gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
 }
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 7aec76ffa..9df747888 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -396,18 +396,18 @@ static void DoHitAnimBlinkSpriteEffect(void)
 {
     u8 spriteId = gBankSpriteIds[gActiveBank];
 
-    if (gSprites[spriteId].data1 == 32)
+    if (gSprites[spriteId].data[1] == 32)
     {
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         gSprites[spriteId].invisible = 0;
         gDoingBattleAnim = FALSE;
         WallyBufferExecCompleted();
     }
     else
     {
-        if ((gSprites[spriteId].data1 % 4) == 0)
+        if ((gSprites[spriteId].data[1] % 4) == 0)
             gSprites[spriteId].invisible ^= 1;
-        gSprites[spriteId].data1++;
+        gSprites[spriteId].data[1]++;
     }
 }
 
@@ -1073,7 +1073,7 @@ static void WallyHandleDrawTrainerPic(void)
                                                30);
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = -2;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
     gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
 }
@@ -1088,7 +1088,7 @@ static void WallyHandleTrainerSlide(void)
                                                30);
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -96;
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 2;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
     gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy2;
 }
@@ -1408,7 +1408,7 @@ static void WallyHandleHitAnimation(void)
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
+        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBank);
         gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
     }
@@ -1462,11 +1462,11 @@ static void WallyHandleIntroTrainerBallThrow(void)
 
     oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data0 = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data2 = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data4 = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
     gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBank]].data5 = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
 
     StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_805CC00);
     StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
@@ -1499,17 +1499,17 @@ static void sub_816AA80(u8 bank)
                                         GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
-    gSprites[gUnknown_03005D7C[bank]].data2 = bank;
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data0 = bank;
-    gSprites[gBankSpriteIds[bank]].data2 = species;
+    gSprites[gBankSpriteIds[bank]].data[0] = bank;
+    gSprites[gBankSpriteIds[bank]].data[2] = species;
     gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
 
     StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-    gSprites[gUnknown_03005D7C[bank]].data0 = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
+    gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
 static void sub_816AC04(u8 taskId)
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 8ab9b541a..813d6d71b 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -332,7 +332,7 @@ static u16 BattlePalaceGetTargetRetValue(void)
 
 void sub_805D714(struct Sprite *sprite)
 {
-    u8 spriteId = sprite->data1;
+    u8 spriteId = sprite->data[1];
 
     if (!gSprites[spriteId].affineAnimEnded)
         return;
@@ -367,7 +367,7 @@ void sub_805D7AC(struct Sprite *sprite)
 {
     if (!(gUnknown_020243FC & 1))
     {
-        sprite->pos2.x += sprite->data0;
+        sprite->pos2.x += sprite->data[0];
         if (sprite->pos2.x == 0)
         {
             if (sprite->pos2.y != 0)
@@ -1134,7 +1134,7 @@ void sub_805EB9C(u8 affineMode)
     }
 }
 
-#define tBank data0
+#define tBank data[0]
 
 void LoadAndCreateEnemyShadowSprites(void)
 {
@@ -1144,13 +1144,13 @@ void LoadAndCreateEnemyShadowSprites(void)
 
     bank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
     gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankPosition(bank, 0), GetBankPosition(bank, 1) + 29, 0xC8);
-    gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data0 = bank;
+    gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
 
     if (IsDoubleBattle())
     {
         bank = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
         gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankPosition(bank, 0), GetBankPosition(bank, 1) + 29, 0xC8);
-        gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data0 = bank;
+        gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
     }
 }
 
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 240c64862..63813a424 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -927,7 +927,7 @@ u8 CreateBankHealthboxSprites(u8 bank)
             data6 = 2;
         }
         gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2;
-        gSprites[healthboxSpriteId_2].data5 = healthboxSpriteId_1;
+        gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1;
         gSprites[healthboxSpriteId_2].callback = sub_8072924;
     }
     else
@@ -939,7 +939,7 @@ u8 CreateBankHealthboxSprites(u8 bank)
 
             gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2;
 
-            gSprites[healthboxSpriteId_2].data5 = healthboxSpriteId_1;
+            gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1;
             gSprites[healthboxSpriteId_2].oam.tileNum += 32;
             gSprites[healthboxSpriteId_2].callback = sub_8072924;
 
@@ -952,7 +952,7 @@ u8 CreateBankHealthboxSprites(u8 bank)
 
             gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2;
 
-            gSprites[healthboxSpriteId_2].data5 = healthboxSpriteId_1;
+            gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1;
             gSprites[healthboxSpriteId_2].oam.tileNum += 32;
             gSprites[healthboxSpriteId_2].callback = sub_8072924;
 
@@ -968,14 +968,14 @@ u8 CreateBankHealthboxSprites(u8 bank)
 
     CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void*)(OBJ_VRAM0 + unkSpritePtr->oam.tileNum * 32), 64);
 
-    gSprites[healthboxSpriteId_1].data5 = unkSpriteId;
-    gSprites[healthboxSpriteId_1].data6 = bank;
+    gSprites[healthboxSpriteId_1].data[5] = unkSpriteId;
+    gSprites[healthboxSpriteId_1].data[6] = bank;
     gSprites[healthboxSpriteId_1].invisible = 1;
 
     gSprites[healthboxSpriteId_2].invisible = 1;
 
-    unkSpritePtr->data5 = healthboxSpriteId_1;
-    unkSpritePtr->data6 = data6;
+    unkSpritePtr->data[5] = healthboxSpriteId_1;
+    unkSpritePtr->data[6] = data6;
     unkSpritePtr->invisible = 1;
 
     return healthboxSpriteId_1;
@@ -994,7 +994,7 @@ u8 CreateSafariPlayerHealthboxSprites(void)
     gSprites[healthboxSpriteId_2].oam.tileNum += 64;
 
     gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2;
-    gSprites[healthboxSpriteId_2].data5 = healthboxSpriteId_1;
+    gSprites[healthboxSpriteId_2].data[5] = healthboxSpriteId_1;
 
     gSprites[healthboxSpriteId_2].callback = sub_8072924;
 
@@ -1008,9 +1008,9 @@ static const u8 *GetHealthboxElementGfxPtr(u8 elementId)
 
 static void sub_80728B4(struct Sprite *sprite)
 {
-    u8 var = sprite->data5;
+    u8 var = sprite->data[5];
 
-    switch (sprite->data6)
+    switch (sprite->data[6])
     {
     case 0:
         sprite->pos1.x = gSprites[var].pos1.x + 16;
@@ -1033,7 +1033,7 @@ static void sub_80728B4(struct Sprite *sprite)
 
 static void sub_8072924(struct Sprite *sprite)
 {
-    u8 otherSpriteId = sprite->data5;
+    u8 otherSpriteId = sprite->data[5];
 
     sprite->pos1.x = gSprites[otherSpriteId].pos1.x + 64;
     sprite->pos1.y = gSprites[otherSpriteId].pos1.y;
@@ -1054,14 +1054,14 @@ void SetBattleBarStruct(u8 bank, u8 healthboxSpriteId, s32 maxVal, s32 currVal,
 void SetHealthboxSpriteInvisible(u8 healthboxSpriteId)
 {
     gSprites[healthboxSpriteId].invisible = 1;
-    gSprites[gSprites[healthboxSpriteId].data5].invisible = 1;
+    gSprites[gSprites[healthboxSpriteId].data[5]].invisible = 1;
     gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = 1;
 }
 
 void SetHealthboxSpriteVisible(u8 healthboxSpriteId)
 {
     gSprites[healthboxSpriteId].invisible = 0;
-    gSprites[gSprites[healthboxSpriteId].data5].invisible = 0;
+    gSprites[gSprites[healthboxSpriteId].data[5]].invisible = 0;
     gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = 0;
 }
 
@@ -1074,7 +1074,7 @@ static void UpdateSpritePos(u8 spriteId, s16 x, s16 y)
 void DestoryHealthboxSprite(u8 healthboxSpriteId)
 {
     DestroySprite(&gSprites[gSprites[healthboxSpriteId].oam.affineParam]);
-    DestroySprite(&gSprites[gSprites[healthboxSpriteId].data5]);
+    DestroySprite(&gSprites[gSprites[healthboxSpriteId].data[5]]);
     DestroySprite(&gSprites[healthboxSpriteId]);
 }
 
@@ -1091,7 +1091,7 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority)
     {
         u8 healthboxSpriteId_1 = gHealthBoxesIds[i];
         u8 healthboxSpriteId_2 = gSprites[gHealthBoxesIds[i]].oam.affineParam;
-        u8 healthboxSpriteId_3 = gSprites[gHealthBoxesIds[i]].data5;
+        u8 healthboxSpriteId_3 = gSprites[gHealthBoxesIds[i]].data[5];
 
         gSprites[healthboxSpriteId_1].oam.priority = priority;
         gSprites[healthboxSpriteId_2].oam.priority = priority;
@@ -1156,7 +1156,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl)
     windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, xPos, 3, 2, &windowId);
     spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32;
 
-    if (GetBankSide(gSprites[healthboxSpriteId].data6) == SIDE_PLAYER)
+    if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER)
     {
         objVram = (void*)(OBJ_VRAM0);
         if (!IsDoubleBattle())
@@ -1180,7 +1180,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
     u8 text[32];
     void *objVram;
 
-    if (GetBankSide(gSprites[healthboxSpriteId].data6) == SIDE_PLAYER && !IsDoubleBattle())
+    if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER && !IsDoubleBattle())
     {
         spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32;
         if (maxOrCurrent != HP_CURRENT) // singles, max
@@ -1213,7 +1213,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
         u8 bank;
 
         memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4));
-        bank = gSprites[healthboxSpriteId].data6;
+        bank = gSprites[healthboxSpriteId].data[6];
         if (IsDoubleBattle() == TRUE || GetBankSide(bank) == SIDE_OPPONENT)
         {
             UpdateHpTextInHealthboxInDoubles(healthboxSpriteId, value, maxOrCurrent);
@@ -1223,7 +1223,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
             u32 var;
             u8 i;
 
-            if (GetBankSide(gSprites[healthboxSpriteId].data6) == SIDE_PLAYER)
+            if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER)
             {
                 if (maxOrCurrent == HP_CURRENT)
                     var = 29;
@@ -1258,11 +1258,11 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
     u8 text[32];
     void *objVram;
 
-    if (GetBankSide(gSprites[healthboxSpriteId].data6) == SIDE_PLAYER)
+    if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER)
     {
-        if (gBattleSpritesDataPtr->bankData[gSprites[healthboxSpriteId].data6].hpNumbersNoBars) // don't print text if only bars are visible
+        if (gBattleSpritesDataPtr->bankData[gSprites[healthboxSpriteId].data[6]].hpNumbersNoBars) // don't print text if only bars are visible
         {
-            spriteTileNum = gSprites[gSprites[healthboxSpriteId].data5].oam.tileNum * 32;
+            spriteTileNum = gSprites[gSprites[healthboxSpriteId].data[5]].oam.tileNum * 32;
             objVram = (void*)(OBJ_VRAM0) + spriteTileNum;
 
             if (maxOrCurrent != HP_CURRENT) // doubles, max hp
@@ -1292,7 +1292,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
         u8 bank;
 
         memcpy(text, sUnknown_0832C3D8, sizeof(sUnknown_0832C3D8));
-        bank = gSprites[healthboxSpriteId].data6;
+        bank = gSprites[healthboxSpriteId].data[6];
 
         if (gBattleSpritesDataPtr->bankData[bank].hpNumbersNoBars) // don't print text if only bars are visible
         {
@@ -1304,7 +1304,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
             if (maxOrCurrent == HP_CURRENT)
                 var = 0;
 
-            r7 = gSprites[healthboxSpriteId].data5;
+            r7 = gSprites[healthboxSpriteId].data[5];
             txtPtr = ConvertIntToDecimalStringN(text + 6, value, STR_CONV_MODE_RIGHT_ALIGN, 3);
             if (!maxOrCurrent)
                 StringCopy(txtPtr, gText_Slash);
@@ -1354,7 +1354,7 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon)
     u8 i, var, nature, healthboxSpriteId_2;
 
     memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4));
-    barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBankIdentity(gSprites[healthboxSpriteId].data6) * 384)];
+    barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBankIdentity(gSprites[healthboxSpriteId].data[6]) * 384)];
     var = 5;
     nature = GetNature(mon);
     StringCopy(text + 6, gNatureNamePointers[nature]);
@@ -1385,7 +1385,7 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon)
         barFontGfx += 0x20;
     }
 
-    healthboxSpriteId_2 = gSprites[healthboxSpriteId].data5;
+    healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5];
     ConvertIntToDecimalStringN(text + 6, gBattleStruct->field_7C, STR_CONV_MODE_RIGHT_ALIGN, 2);
     ConvertIntToDecimalStringN(text + 9, gBattleStruct->field_7B, STR_CONV_MODE_RIGHT_ALIGN, 2);
     text[5] = CHAR_SPACE;
@@ -1434,7 +1434,7 @@ void SwapHpBarsWithHpText(void)
 
                 if (noBars == TRUE) // bars to text
                 {
-                    spriteId = gSprites[gHealthBoxesIds[i]].data5;
+                    spriteId = gSprites[gHealthBoxesIds[i]].data[5];
 
                     CpuFill32(0, (void*)(OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32), 0x100);
                     UpdateHpTextInHealthboxInDoubles(gHealthBoxesIds[i], GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_HP), HP_CURRENT);
@@ -1457,7 +1457,7 @@ void SwapHpBarsWithHpText(void)
                     }
                     else
                     {
-                        spriteId = gSprites[gHealthBoxesIds[i]].data5;
+                        spriteId = gSprites[gHealthBoxesIds[i]].data[5];
 
                         CpuFill32(0, (void *)(OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32), 0x100);
                         UpdateHpTextInHealthboxInDoubles(gHealthBoxesIds[i], GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_HP), HP_CURRENT);
@@ -1472,7 +1472,7 @@ void SwapHpBarsWithHpText(void)
                         UpdateHealthboxAttribute(gHealthBoxesIds[i], &gEnemyParty[gBattlePartyID[i]], HEALTHBOX_NICK);
                 }
             }
-            gSprites[gHealthBoxesIds[i]].data7 ^= 1;
+            gSprites[gHealthBoxesIds[i]].data[7] ^= 1;
         }
     }
 }
@@ -1524,7 +1524,7 @@ u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 ar
     barSpriteId = CreateSprite(&sStatusSummaryBarSpriteTemplates[isOpponent], bar_X, bar_Y, 10);
     SetSubspriteTables(&gSprites[barSpriteId], sStatusSummaryBar_SubspriteTable);
     gSprites[barSpriteId].pos2.x = bar_pos2_X;
-    gSprites[barSpriteId].data0 = bar_data0;
+    gSprites[barSpriteId].data[0] = bar_data0;
 
     if (isOpponent)
     {
@@ -1549,22 +1549,22 @@ u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 ar
             gSprites[ballIconSpritesIds[i]].pos2.y = 0;
         }
 
-        gSprites[ballIconSpritesIds[i]].data0 = barSpriteId;
+        gSprites[ballIconSpritesIds[i]].data[0] = barSpriteId;
 
         if (!isOpponent)
         {
             gSprites[ballIconSpritesIds[i]].pos1.x += 10 * i + 24;
-            gSprites[ballIconSpritesIds[i]].data1 = i * 7 + 10;
+            gSprites[ballIconSpritesIds[i]].data[1] = i * 7 + 10;
             gSprites[ballIconSpritesIds[i]].pos2.x = 120;
         }
         else
         {
             gSprites[ballIconSpritesIds[i]].pos1.x -= 10 * (5 - i) + 24;
-            gSprites[ballIconSpritesIds[i]].data1 = (6 - i) * 7 + 10;
+            gSprites[ballIconSpritesIds[i]].data[1] = (6 - i) * 7 + 10;
             gSprites[ballIconSpritesIds[i]].pos2.x = -120;
         }
 
-        gSprites[ballIconSpritesIds[i]].data2 = isOpponent;
+        gSprites[ballIconSpritesIds[i]].data[2] = isOpponent;
     }
 
     if (GetBankSide(bank) == SIDE_PLAYER)
@@ -1576,7 +1576,7 @@ u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 ar
                 if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[i]].oam.tileNum += 1;
-                    gSprites[ballIconSpritesIds[i]].data7 = 1;
+                    gSprites[ballIconSpritesIds[i]].data[7] = 1;
                 }
                 else if (partyInfo[i].hp == 0) // fainted mon
                 {
@@ -1595,7 +1595,7 @@ u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 ar
                 if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[var]].oam.tileNum += 1;
-                    gSprites[ballIconSpritesIds[var]].data7 = 1;
+                    gSprites[ballIconSpritesIds[var]].data[7] = 1;
                     var--;
                     continue;
                 }
@@ -1624,7 +1624,7 @@ u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 ar
                 if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[var]].oam.tileNum += 1;
-                    gSprites[ballIconSpritesIds[var]].data7 = 1;
+                    gSprites[ballIconSpritesIds[var]].data[7] = 1;
                 }
                 else if (partyInfo[i].hp == 0) // fainted mon
                 {
@@ -1644,7 +1644,7 @@ u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 ar
                 if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[i]].oam.tileNum += 1;
-                    gSprites[ballIconSpritesIds[i]].data7 = 1;
+                    gSprites[ballIconSpritesIds[i]].data[7] = 1;
                     i++;
                     continue;
                 }
@@ -1714,21 +1714,21 @@ void sub_8073C30(u8 taskId)
         {
             if (GetBankSide(bank) != SIDE_PLAYER)
             {
-                gSprites[sp[5 - i]].data1 = 7 * i;
-                gSprites[sp[5 - i]].data3 = 0;
-                gSprites[sp[5 - i]].data4 = 0;
+                gSprites[sp[5 - i]].data[1] = 7 * i;
+                gSprites[sp[5 - i]].data[3] = 0;
+                gSprites[sp[5 - i]].data[4] = 0;
                 gSprites[sp[5 - i]].callback = sub_8074158;
             }
             else
             {
-                gSprites[sp[i]].data1 = 7 * i;
-                gSprites[sp[i]].data3 = 0;
-                gSprites[sp[i]].data4 = 0;
+                gSprites[sp[i]].data[1] = 7 * i;
+                gSprites[sp[i]].data[3] = 0;
+                gSprites[sp[i]].data[4] = 0;
                 gSprites[sp[i]].callback = sub_8074158;
             }
         }
-        gSprites[r10].data0 /= 2;
-        gSprites[r10].data1 = 0;
+        gSprites[r10].data[0] /= 2;
+        gSprites[r10].data[1] = 0;
         gSprites[r10].callback = sub_8074090;
         SetSubspriteTables(&gSprites[r10], sUnknown_0832C2CC);
         gTasks[taskId].func = sub_8073E08;
@@ -1831,17 +1831,17 @@ static void sub_8073F98(u8 taskId)
 static void SpriteCB_StatusSummaryBar(struct Sprite *sprite)
 {
     if (sprite->pos2.x != 0)
-        sprite->pos2.x += sprite->data0;
+        sprite->pos2.x += sprite->data[0];
 }
 
 static void sub_8074090(struct Sprite *sprite)
 {
-    sprite->data1 += 32;
-    if (sprite->data0 > 0)
-        sprite->pos2.x += sprite->data1 >> 4;
+    sprite->data[1] += 32;
+    if (sprite->data[0] > 0)
+        sprite->pos2.x += sprite->data[1] >> 4;
     else
-        sprite->pos2.x -= sprite->data1 >> 4;
-    sprite->data1 &= 0xF;
+        sprite->pos2.x -= sprite->data[1] >> 4;
+    sprite->data[1] &= 0xF;
 }
 
 static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite)
@@ -1850,16 +1850,16 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite)
     u16 var2;
     s8 pan;
 
-    if (sprite->data1 > 0)
+    if (sprite->data[1] > 0)
     {
-        sprite->data1--;
+        sprite->data[1]--;
         return;
     }
 
-    var1 = sprite->data2;
-    var2 = sprite->data3;
+    var1 = sprite->data[2];
+    var2 = sprite->data[3];
     var2 += 56;
-    sprite->data3 = var2 & 0xFFF0;
+    sprite->data[3] = var2 & 0xFFF0;
 
     if (var1 != 0)
     {
@@ -1880,7 +1880,7 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite)
         if (var1 != 0)
             pan = PAN_SIDE_PLAYER;
 
-        if (sprite->data7 != 0)
+        if (sprite->data[7] != 0)
             PlaySE2WithPanning(SE_TB_KARA, pan);
         else
             PlaySE1WithPanning(SE_TB_KON, pan);
@@ -1894,15 +1894,15 @@ static void sub_8074158(struct Sprite *sprite)
     u8 var1;
     u16 var2;
 
-    if (sprite->data1 > 0)
+    if (sprite->data[1] > 0)
     {
-        sprite->data1--;
+        sprite->data[1]--;
         return;
     }
-    var1 = sprite->data2;
-    var2 = sprite->data3;
+    var1 = sprite->data[2];
+    var2 = sprite->data[3];
     var2 += 56;
-    sprite->data3 = var2 & 0xFFF0;
+    sprite->data[3] = var2 & 0xFFF0;
     if (var1 != 0)
         sprite->pos2.x += var2 >> 4;
     else
@@ -1917,7 +1917,7 @@ static void sub_8074158(struct Sprite *sprite)
 
 static void SpriteCB_StatusSummaryBallsOnSwitchout(struct Sprite *sprite)
 {
-    u8 barSpriteId = sprite->data0;
+    u8 barSpriteId = sprite->data[0];
 
     sprite->pos2.x = gSprites[barSpriteId].pos2.x;
     sprite->pos2.y = gSprites[barSpriteId].pos2.y;
@@ -1964,7 +1964,7 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon)
 
     spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32;
 
-    if (GetBankSide(gSprites[healthboxSpriteId].data6) == SIDE_PLAYER)
+    if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER)
     {
         sub_8075198((void*)(0x6010040 + spriteTileNum), windowTileData, 6);
         ptr = (void*)(OBJ_VRAM0);
@@ -1991,13 +1991,13 @@ static void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus)
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
         return;
 
-    bank = gSprites[healthboxSpriteId].data6;
+    bank = gSprites[healthboxSpriteId].data[6];
     if (GetBankSide(bank) == SIDE_PLAYER)
         return;
     if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES)), FLAG_GET_CAUGHT))
         return;
 
-    healthboxSpriteId_2 = gSprites[healthboxSpriteId].data5;
+    healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5];
 
     if (noStatus)
         CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_70), (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 8) * 32), 32);
@@ -2014,8 +2014,8 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
     s16 tileNumAdder;
     u8 statusPalId;
 
-    bank = gSprites[healthboxSpriteId].data6;
-    healthboxSpriteId_2 = gSprites[healthboxSpriteId].data5;
+    bank = gSprites[healthboxSpriteId].data[6];
+    healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5];
     if (GetBankSide(bank) == SIDE_PLAYER)
     {
         status = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_STATUS);
@@ -2178,12 +2178,12 @@ static void UpdateLeftNoOfBallsTextOnHealthbox(u8 healthboxSpriteId)
 void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId)
 {
     s32 maxHp, currHp;
-    u8 bank = gSprites[healthboxSpriteId].data6;
+    u8 bank = gSprites[healthboxSpriteId].data[6];
 
     if (elementId == HEALTHBOX_ALL && !IsDoubleBattle())
         GetBankSide(bank); // pointless function call
 
-    if (GetBankSide(gSprites[healthboxSpriteId].data6) == SIDE_PLAYER)
+    if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER)
     {
         u8 isDoubles;
 
@@ -2308,7 +2308,7 @@ static void sub_8074B9C(u8 bank, u8 whichBar)
         }
         for (i = 0; i < 6; i++)
         {
-            u8 healthboxSpriteId_2 = gSprites[gBattleSpritesDataPtr->battleBars[bank].healthboxSpriteId].data5;
+            u8 healthboxSpriteId_2 = gSprites[gBattleSpritesDataPtr->battleBars[bank].healthboxSpriteId].data[5];
             if (i < 2)
                 CpuCopy32(GetHealthboxElementGfxPtr(barElementId) + array[i] * 32,
                           (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 2 + i) * 32), 32);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index d9b35c053..f91a52480 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -6782,8 +6782,8 @@ static bool8 sub_804F344(void)
     return (gBattle_BG2_X != 0x1A0);
 }
 
-#define sDestroy                    data0
-#define sSavedLvlUpBoxXPosition     data1
+#define sDestroy                    data[0]
+#define sSavedLvlUpBoxXPosition     data[1]
 
 static void PutMonIconOnLvlUpBox(void)
 {
diff --git a/src/berry_blender.c b/src/berry_blender.c
index aa333ebaf..a6144a35d 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1002,35 +1002,35 @@ static void sub_807FAC8(void)
 
 static void sub_807FD08(struct Sprite* sprite)
 {
-    sprite->data1 += sprite->data6;
-    sprite->data2 -= sprite->data4;
-    sprite->data2 += sprite->data7;
-    sprite->data0 += sprite->data7;
-    sprite->data4--;
+    sprite->data[1] += sprite->data[6];
+    sprite->data[2] -= sprite->data[4];
+    sprite->data[2] += sprite->data[7];
+    sprite->data[0] += sprite->data[7];
+    sprite->data[4]--;
 
-    if (sprite->data0 < sprite->data2)
+    if (sprite->data[0] < sprite->data[2])
     {
-        sprite->data3 = sprite->data4 = sprite->data3 - 1;
+        sprite->data[3] = sprite->data[4] = sprite->data[3] - 1;
 
-        if (++sprite->data5 > 3)
+        if (++sprite->data[5] > 3)
             DestroySprite(sprite);
         else
             PlaySE(SE_TB_KARA);
     }
-    sprite->pos1.x = sprite->data1;
-    sprite->pos1.y = sprite->data2;
+    sprite->pos1.x = sprite->data[1];
+    sprite->pos1.y = sprite->data[2];
 }
 
 static void sub_807FD64(struct Sprite* sprite, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6)
 {
-    sprite->data0 = a3;
-    sprite->data1 = a2;
-    sprite->data2 = a3;
-    sprite->data3 = a4;
-    sprite->data4 = 10;
-    sprite->data5 = 0;
-    sprite->data6 = a5;
-    sprite->data7 = a6;
+    sprite->data[0] = a3;
+    sprite->data[1] = a2;
+    sprite->data[2] = a3;
+    sprite->data[3] = a4;
+    sprite->data[4] = 10;
+    sprite->data[5] = 0;
+    sprite->data[6] = a5;
+    sprite->data[7] = a6;
     sprite->callback = sub_807FD08;
 }
 
@@ -2909,10 +2909,10 @@ static void BerryBlender_SetBackgroundsPos(void)
 
 static void sub_8082E3C(struct Sprite* sprite)
 {
-    sprite->data2 += sprite->data0;
-    sprite->data3 += sprite->data1;
-    sprite->pos2.x = sprite->data2 / 8;
-    sprite->pos2.y = sprite->data3 / 8;
+    sprite->data[2] += sprite->data[0];
+    sprite->data[3] += sprite->data[1];
+    sprite->pos2.x = sprite->data[2] / 8;
+    sprite->pos2.y = sprite->data[3] / 8;
 
     if (sprite->animEnded)
         DestroySprite(sprite);
@@ -2935,8 +2935,8 @@ static void sub_8082E84(void)
         y = gSineTable[(rand & 0xFF)] / 4;
 
         spriteId = CreateSprite(&sUnknown_08339BE0, x + 120, y + 80, 1);
-        gSprites[spriteId].data0 = 16 - (Random() % 32);
-        gSprites[spriteId].data1 = 16 - (Random() % 32);
+        gSprites[spriteId].data[0] = 16 - (Random() % 32);
+        gSprites[spriteId].data[1] = 16 - (Random() % 32);
 
         gSprites[spriteId].callback = sub_8082E3C;
     }
@@ -2944,8 +2944,8 @@ static void sub_8082E84(void)
 
 static void sub_8082F68(struct Sprite* sprite)
 {
-    sprite->data0++;
-    sprite->pos2.y = -(sprite->data0 / 3);
+    sprite->data[0]++;
+    sprite->pos2.y = -(sprite->data[0] / 3);
 
     if (sprite->animEnded)
         DestroySprite(sprite);
@@ -2953,8 +2953,8 @@ static void sub_8082F68(struct Sprite* sprite)
 
 static void sub_8082F9C(struct Sprite* sprite)
 {
-    sprite->data0++;
-    sprite->pos2.y = -(sprite->data0 * 2);
+    sprite->data[0]++;
+    sprite->pos2.y = -(sprite->data[0] * 2);
 
     if (sprite->pos2.y < -12)
         sprite->pos2.y = -12;
@@ -2970,68 +2970,68 @@ static void Blender_SetBankBerryData(u8 bank, u16 itemId)
 
 static void sub_8083010(struct Sprite* sprite)
 {
-    switch (sprite->data0)
+    switch (sprite->data[0])
     {
     case 0:
-        sprite->data1 += 8;
-        if (sprite->data1 > 88)
+        sprite->data[1] += 8;
+        if (sprite->data[1] > 88)
         {
-            sprite->data1 = 88;
-            sprite->data0++;
+            sprite->data[1] = 88;
+            sprite->data[0]++;
             PlaySE(SE_KON);
         }
         break;
     case 1:
-        sprite->data2 += 1;
-        if (sprite->data2 > 20)
+        sprite->data[2] += 1;
+        if (sprite->data[2] > 20)
         {
-            sprite->data0++;
-            sprite->data2 = 0;
+            sprite->data[0]++;
+            sprite->data[2] = 0;
         }
         break;
     case 2:
-        sprite->data1 += 4;
-        if (sprite->data1 > 176)
+        sprite->data[1] += 4;
+        if (sprite->data[1] > 176)
         {
-            if (++sprite->data3 == 3)
+            if (++sprite->data[3] == 3)
             {
                 DestroySprite(sprite);
                 CreateSprite(&sUnknown_08339C60, 120, -20, 2);
             }
             else
             {
-                sprite->data0 = 0;
-                sprite->data1 = -16;
-                StartSpriteAnim(sprite, sprite->data3);
+                sprite->data[0] = 0;
+                sprite->data[1] = -16;
+                StartSpriteAnim(sprite, sprite->data[3]);
             }
         }
         break;
     }
 
-    sprite->pos2.y = sprite->data1;
+    sprite->pos2.y = sprite->data[1];
 }
 
 static void sub_80830C0(struct Sprite* sprite)
 {
-    switch (sprite->data0)
+    switch (sprite->data[0])
     {
     case 0:
-        sprite->data1 += 8;
-        if (sprite->data1 > 92)
+        sprite->data[1] += 8;
+        if (sprite->data[1] > 92)
         {
-            sprite->data1 = 92;
-            sprite->data0++;
+            sprite->data[1] = 92;
+            sprite->data[0]++;
             PlaySE(SE_PIN);
         }
         break;
     case 1:
-        sprite->data2 += 1;
-        if (sprite->data2 > 20)
-            sprite->data0++;
+        sprite->data[2] += 1;
+        if (sprite->data[2] > 20)
+            sprite->data[0]++;
         break;
     case 2:
-        sprite->data1 += 4;
-        if (sprite->data1 > 176)
+        sprite->data[1] += 4;
+        if (sprite->data[1] > 176)
         {
             sBerryBlenderData->mainState++;
             DestroySprite(sprite);
@@ -3039,7 +3039,7 @@ static void sub_80830C0(struct Sprite* sprite)
         break;
     }
 
-    sprite->pos2.y = sprite->data1;
+    sprite->pos2.y = sprite->data[1];
 }
 
 static void sub_8083140(u16 a0, u16 a1)
diff --git a/src/decoration.c b/src/decoration.c
index 8093825f4..e4c84d0b9 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1302,7 +1302,7 @@ void sub_8128060(u8 taskId)
 
 void ConfigureCameraObjectForPlacingDecoration(struct PlaceDecorationGraphicsDataBuffer *data, u8 decor)
 {
-    sDecor_CameraSpriteObjectIdx1 = gSprites[gUnknown_03005DD0.unk4].data0;
+    sDecor_CameraSpriteObjectIdx1 = gSprites[gUnknown_03005DD0.unk4].data[0];
     gUnknown_03005DD0.unk4 = gpu_pal_decompress_alloc_tag_and_upload(data, decor);
     gSprites[gUnknown_03005DD0.unk4].oam.priority = 1;
     gSprites[gUnknown_03005DD0.unk4].callback = sub_81292D0;
@@ -1383,8 +1383,8 @@ void sub_812826C(u8 taskId)
 void sub_81283BC(u8 taskId)
 {
     gTasks[taskId].data[10] = 0;
-    gSprites[sDecor_CameraSpriteObjectIdx1].data7 = 1;
-    gSprites[sDecor_CameraSpriteObjectIdx2].data7 = 1;
+    gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 1;
+    gSprites[sDecor_CameraSpriteObjectIdx2].data[7] = 1;
     sub_8128DE0();
     sub_8128950(taskId);
 }
@@ -1392,8 +1392,8 @@ void sub_81283BC(u8 taskId)
 void sub_8128414(u8 taskId)
 {
     gTasks[taskId].data[10] = 0;
-    gSprites[sDecor_CameraSpriteObjectIdx1].data7 = 1;
-    gSprites[sDecor_CameraSpriteObjectIdx2].data7 = 1;
+    gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 1;
+    gSprites[sDecor_CameraSpriteObjectIdx2].data[7] = 1;
     sub_8128DE0();
     StringExpandPlaceholders(gStringVar4, gText_CancelDecorating);
     DisplayItemMessageOnField(taskId, gStringVar4, sub_8128B80);
@@ -1769,8 +1769,8 @@ bool8 sub_8128DB4(void)
 void sub_8128DE0(void)
 {
     sDecorationLastDirectionMoved = 0;
-    gSprites[sDecor_CameraSpriteObjectIdx1].data2 = 0;
-    gSprites[sDecor_CameraSpriteObjectIdx1].data3 = 0;
+    gSprites[sDecor_CameraSpriteObjectIdx1].data[2] = 0;
+    gSprites[sDecor_CameraSpriteObjectIdx1].data[3] = 0;
 }
 
 void sub_8128E18(u8 taskId)
@@ -1778,7 +1778,7 @@ void sub_8128E18(u8 taskId)
     s16 *data;
 
     data = gTasks[taskId].data;
-    if (!gSprites[sDecor_CameraSpriteObjectIdx1].data4)
+    if (!gSprites[sDecor_CameraSpriteObjectIdx1].data[4])
     {
         if (data[10] == 1)
         {
@@ -1792,29 +1792,29 @@ void sub_8128E18(u8 taskId)
         if ((gMain.heldKeys & 0x0F0) == DPAD_UP)
         {
             sDecorationLastDirectionMoved = DIR_SOUTH;
-            gSprites[sDecor_CameraSpriteObjectIdx1].data2 =  0;
-            gSprites[sDecor_CameraSpriteObjectIdx1].data3 = -2;
+            gSprites[sDecor_CameraSpriteObjectIdx1].data[2] =  0;
+            gSprites[sDecor_CameraSpriteObjectIdx1].data[3] = -2;
             data[1]--;
         }
         if ((gMain.heldKeys & 0x0F0) == DPAD_DOWN)
         {
             sDecorationLastDirectionMoved = DIR_NORTH;
-            gSprites[sDecor_CameraSpriteObjectIdx1].data2 =  0;
-            gSprites[sDecor_CameraSpriteObjectIdx1].data3 =  2;
+            gSprites[sDecor_CameraSpriteObjectIdx1].data[2] =  0;
+            gSprites[sDecor_CameraSpriteObjectIdx1].data[3] =  2;
             data[1]++;
         }
         if ((gMain.heldKeys & 0x0F0) == DPAD_LEFT)
         {
             sDecorationLastDirectionMoved = DIR_WEST;
-            gSprites[sDecor_CameraSpriteObjectIdx1].data2 = -2;
-            gSprites[sDecor_CameraSpriteObjectIdx1].data3 =  0;
+            gSprites[sDecor_CameraSpriteObjectIdx1].data[2] = -2;
+            gSprites[sDecor_CameraSpriteObjectIdx1].data[3] =  0;
             data[0]--;
         }
         if ((gMain.heldKeys & 0x0F0) == DPAD_RIGHT)
         {
             sDecorationLastDirectionMoved = DIR_EAST;
-            gSprites[sDecor_CameraSpriteObjectIdx1].data2 =  2;
-            gSprites[sDecor_CameraSpriteObjectIdx1].data3 =  0;
+            gSprites[sDecor_CameraSpriteObjectIdx1].data[2] =  2;
+            gSprites[sDecor_CameraSpriteObjectIdx1].data[3] =  0;
             data[0]++;
         }
         if (!sub_8128DB4() || !sub_8128D10(taskId))
@@ -1824,8 +1824,8 @@ void sub_8128E18(u8 taskId)
     }
     if (sDecorationLastDirectionMoved)
     {
-        gSprites[sDecor_CameraSpriteObjectIdx1].data4++;
-        gSprites[sDecor_CameraSpriteObjectIdx1].data4 &= 7;
+        gSprites[sDecor_CameraSpriteObjectIdx1].data[4]++;
+        gSprites[sDecor_CameraSpriteObjectIdx1].data[4] &= 7;
     }
     if (!data[10])
     {
@@ -1843,7 +1843,7 @@ void sub_8128E18(u8 taskId)
 void sub_8128FD8(u8 taskId)
 {
     sub_8197434(0, 1);
-    gSprites[sDecor_CameraSpriteObjectIdx1].data7 = 0;
+    gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0;
     gTasks[taskId].data[10] = 0;
     gTasks[taskId].func = sub_8128E18;
 }
@@ -1954,20 +1954,20 @@ void SetDecorSelectionBoxOamAttributes(u8 decorShape)
 
 void sub_81292D0(struct Sprite *sprite)
 {
-    sprite->data2 = 0;
-    sprite->data3 = 0;
-    sprite->data4 = 0;
-    sprite->data5 = 0;
-    sprite->data6 = 0;
-    sprite->data7 = 0;
+    sprite->data[2] = 0;
+    sprite->data[3] = 0;
+    sprite->data[4] = 0;
+    sprite->data[5] = 0;
+    sprite->data[6] = 0;
+    sprite->data[7] = 0;
     sprite->callback = sub_81292E8;
 }
 
 void sub_81292E8(struct Sprite *sprite)
 {
-    if (sprite->data7 == 0)
+    if (sprite->data[7] == 0)
     {
-        if (sprite->data6 < 15)
+        if (sprite->data[6] < 15)
         {
             sprite->invisible = FALSE;
         }
@@ -1975,8 +1975,8 @@ void sub_81292E8(struct Sprite *sprite)
         {
             sprite->invisible = TRUE;
         }
-        sprite->data6 ++;
-        sprite->data6 &= 0x1F;
+        sprite->data[6] ++;
+        sprite->data[6] &= 0x1F;
     }
     else
     {
@@ -2248,7 +2248,7 @@ bool8 sub_81299AC(u8 taskId)
 void SetUpPuttingAwayDecorationPlayerAvatar(void)
 {
     player_get_direction_lower_nybble();
-    sDecor_CameraSpriteObjectIdx1 = gSprites[gUnknown_03005DD0.unk4].data0;
+    sDecor_CameraSpriteObjectIdx1 = gSprites[gUnknown_03005DD0.unk4].data[0];
     sub_812A39C();
     gUnknown_03005DD0.unk4 = CreateSprite(&gUnknown_085A7404, 0x78, 0x50, 0);
     if (gSaveBlock2Ptr->playerGender == MALE)
@@ -2299,7 +2299,7 @@ void sub_8129ABC(u8 taskId)
 void sub_8129B34(u8 taskId)
 {
     sub_8197434(0, 1);
-    gSprites[sDecor_CameraSpriteObjectIdx1].data7 = 0;
+    gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0;
     gSprites[sDecor_CameraSpriteObjectIdx1].invisible = FALSE;
     gSprites[sDecor_CameraSpriteObjectIdx1].callback = sub_812A36C;
     gSprites[sDecor_CameraSpriteObjectIdx2].pos1.x = 0x88;
@@ -2719,9 +2719,9 @@ void sub_812A334(void)
 
 void sub_812A36C(struct Sprite *sprite)
 {
-    sprite->data0 ++;
-    sprite->data0 &= 0x1F;
-    if (sprite->data0 > 15)
+    sprite->data[0] ++;
+    sprite->data[0] &= 0x1F;
+    if (sprite->data[0] > 15)
     {
         sprite->invisible = TRUE;
     }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index d9d77d2e9..7fba0cd00 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -709,16 +709,16 @@ static void CB2_EggHatch_1(void)
 
 static void SpriteCB_Egg_0(struct Sprite* sprite)
 {
-    if (++sprite->data0 > 20)
+    if (++sprite->data[0] > 20)
     {
         sprite->callback = SpriteCB_Egg_1;
-        sprite->data0 = 0;
+        sprite->data[0] = 0;
     }
     else
     {
-        sprite->data1 = (sprite->data1 + 20) & 0xFF;
-        sprite->pos2.x = Sin(sprite->data1, 1);
-        if (sprite->data0 == 15)
+        sprite->data[1] = (sprite->data[1] + 20) & 0xFF;
+        sprite->pos2.x = Sin(sprite->data[1], 1);
+        if (sprite->data[0] == 15)
         {
             PlaySE(SE_BOWA);
             StartSpriteAnim(sprite, 1);
@@ -729,19 +729,19 @@ static void SpriteCB_Egg_0(struct Sprite* sprite)
 
 static void SpriteCB_Egg_1(struct Sprite* sprite)
 {
-    if (++sprite->data2 > 30)
+    if (++sprite->data[2] > 30)
     {
-        if (++sprite->data0 > 20)
+        if (++sprite->data[0] > 20)
         {
             sprite->callback = SpriteCB_Egg_2;
-            sprite->data0 = 0;
-            sprite->data2 = 0;
+            sprite->data[0] = 0;
+            sprite->data[2] = 0;
         }
         else
         {
-            sprite->data1 = (sprite->data1 + 20) & 0xFF;
-            sprite->pos2.x = Sin(sprite->data1, 2);
-            if (sprite->data0 == 15)
+            sprite->data[1] = (sprite->data[1] + 20) & 0xFF;
+            sprite->pos2.x = Sin(sprite->data[1], 2);
+            if (sprite->data[0] == 15)
             {
                 PlaySE(SE_BOWA);
                 StartSpriteAnim(sprite, 2);
@@ -752,30 +752,30 @@ static void SpriteCB_Egg_1(struct Sprite* sprite)
 
 static void SpriteCB_Egg_2(struct Sprite* sprite)
 {
-    if (++sprite->data2 > 30)
+    if (++sprite->data[2] > 30)
     {
-        if (++sprite->data0 > 38)
+        if (++sprite->data[0] > 38)
         {
             u16 species;
 
             sprite->callback = SpriteCB_Egg_3;
-            sprite->data0 = 0;
+            sprite->data[0] = 0;
             species = GetMonData(&gPlayerParty[sEggHatchData->eggPartyID], MON_DATA_SPECIES);
             gSprites[sEggHatchData->pokeSpriteID].pos2.x = 0;
             gSprites[sEggHatchData->pokeSpriteID].pos2.y = 0;
         }
         else
         {
-            sprite->data1 = (sprite->data1 + 20) & 0xFF;
-            sprite->pos2.x = Sin(sprite->data1, 2);
-            if (sprite->data0 == 15)
+            sprite->data[1] = (sprite->data[1] + 20) & 0xFF;
+            sprite->pos2.x = Sin(sprite->data[1], 2);
+            if (sprite->data[0] == 15)
             {
                 PlaySE(SE_BOWA);
                 StartSpriteAnim(sprite, 2);
                 CreateRandomEggShardSprite();
                 CreateRandomEggShardSprite();
             }
-            if (sprite->data0 == 30)
+            if (sprite->data[0] == 30)
                 PlaySE(SE_BOWA);
         }
     }
@@ -783,60 +783,60 @@ static void SpriteCB_Egg_2(struct Sprite* sprite)
 
 static void SpriteCB_Egg_3(struct Sprite* sprite)
 {
-    if (++sprite->data0 > 50)
+    if (++sprite->data[0] > 50)
     {
         sprite->callback = SpriteCB_Egg_4;
-        sprite->data0 = 0;
+        sprite->data[0] = 0;
     }
 }
 
 static void SpriteCB_Egg_4(struct Sprite* sprite)
 {
     s16 i;
-    if (sprite->data0 == 0)
+    if (sprite->data[0] == 0)
         BeginNormalPaletteFade(-1, -1, 0, 0x10, 0xFFFF);
-    if (sprite->data0 < 4u)
+    if (sprite->data[0] < 4u)
     {
         for (i = 0; i <= 3; i++)
             CreateRandomEggShardSprite();
     }
-    sprite->data0++;
+    sprite->data[0]++;
     if (!gPaletteFade.active)
     {
         PlaySE(SE_TAMAGO);
         sprite->invisible = 1;
         sprite->callback = SpriteCB_Egg_5;
-        sprite->data0 = 0;
+        sprite->data[0] = 0;
     }
 }
 
 static void SpriteCB_Egg_5(struct Sprite* sprite)
 {
-    if (sprite->data0 == 0)
+    if (sprite->data[0] == 0)
     {
         gSprites[sEggHatchData->pokeSpriteID].invisible = 0;
         StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1);
     }
-    if (sprite->data0 == 8)
+    if (sprite->data[0] == 8)
         BeginNormalPaletteFade(-1, -1, 0x10, 0, 0xFFFF);
-    if (sprite->data0 <= 9)
+    if (sprite->data[0] <= 9)
         gSprites[sEggHatchData->pokeSpriteID].pos1.y -= 1;
-    if (sprite->data0 > 40)
+    if (sprite->data[0] > 40)
         sprite->callback = SpriteCallbackDummy;
-    sprite->data0++;
+    sprite->data[0]++;
 }
 
 static void SpriteCB_EggShard(struct Sprite* sprite)
 {
-    sprite->data4 += sprite->data1;
-    sprite->data5 += sprite->data2;
+    sprite->data[4] += sprite->data[1];
+    sprite->data[5] += sprite->data[2];
 
-    sprite->pos2.x = sprite->data4 / 256;
-    sprite->pos2.y = sprite->data5 / 256;
+    sprite->pos2.x = sprite->data[4] / 256;
+    sprite->pos2.y = sprite->data[5] / 256;
 
-    sprite->data2 += sprite->data3;
+    sprite->data[2] += sprite->data[3];
 
-    if (sprite->pos1.y + sprite->pos2.y > sprite->pos1.y + 20 && sprite->data2 > 0)
+    if (sprite->pos1.y + sprite->pos2.y > sprite->pos1.y + 20 && sprite->data[2] > 0)
         DestroySprite(sprite);
 }
 
@@ -854,9 +854,9 @@ static void CreateRandomEggShardSprite(void)
 static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 spriteAnimIndex)
 {
     u8 spriteID = CreateSprite(&sSpriteTemplate_EggShard, x, y, 4);
-    gSprites[spriteID].data1 = data1;
-    gSprites[spriteID].data2 = data2;
-    gSprites[spriteID].data3 = data3;
+    gSprites[spriteID].data[1] = data1;
+    gSprites[spriteID].data[2] = data2;
+    gSprites[spriteID].data[3] = data3;
     StartSpriteAnim(&gSprites[spriteID], spriteAnimIndex);
 }
 
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index eca5d4bdc..09c351b17 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -112,18 +112,18 @@ static void SpriteCB_PreEvoSparkleSet1(struct Sprite* sprite)
     {
         u8 matrixNum;
 
-        sprite->pos1.y = 88 - (sprite->data7 * sprite->data7) / 80;
-        sprite->pos2.y = Sin((u8)(sprite->data6), sprite->data5) / 4;
-        sprite->pos2.x = Cos((u8)(sprite->data6), sprite->data5);
-        sprite->data6 += 4;
-        if (sprite->data7 & 1)
-            sprite->data5--;
-        sprite->data7++;
+        sprite->pos1.y = 88 - (sprite->data[7] * sprite->data[7]) / 80;
+        sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4;
+        sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]);
+        sprite->data[6] += 4;
+        if (sprite->data[7] & 1)
+            sprite->data[5]--;
+        sprite->data[7]++;
         if (sprite->pos2.y > 0)
             sprite->subpriority = 1;
         else
             sprite->subpriority = 20;
-        matrixNum = sprite->data5 / 4 + 20;
+        matrixNum = sprite->data[5] / 4 + 20;
         if (matrixNum > 31)
             matrixNum = 31;
         sprite->oam.matrixNum = matrixNum;
@@ -137,9 +137,9 @@ static void CreatePreEvoSparkleSet1(u8 arg0)
     u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 88, 0);
     if (spriteID != MAX_SPRITES)
     {
-        gSprites[spriteID].data5 = 48;
-        gSprites[spriteID].data6 = arg0;
-        gSprites[spriteID].data7 = 0;
+        gSprites[spriteID].data[5] = 48;
+        gSprites[spriteID].data[6] = arg0;
+        gSprites[spriteID].data[7] = 0;
         gSprites[spriteID].oam.affineMode = 1;
         gSprites[spriteID].oam.matrixNum = 31;
         gSprites[spriteID].callback = SpriteCB_PreEvoSparkleSet1;
@@ -150,11 +150,11 @@ static void SpriteCB_PreEvoSparkleSet2(struct Sprite* sprite)
 {
     if (sprite->pos1.y < 88)
     {
-        sprite->pos1.y = 8 + (sprite->data7 * sprite->data7) / 5;
-        sprite->pos2.y = Sin((u8)(sprite->data6), sprite->data5) / 4;
-        sprite->pos2.x = Cos((u8)(sprite->data6), sprite->data5);
-        sprite->data5 = 8 + Sin((u8)(sprite->data7 * 4), 40);
-        sprite->data7++;
+        sprite->pos1.y = 8 + (sprite->data[7] * sprite->data[7]) / 5;
+        sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4;
+        sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]);
+        sprite->data[5] = 8 + Sin((u8)(sprite->data[7] * 4), 40);
+        sprite->data[7]++;
     }
     else
         DestroySprite(sprite);
@@ -165,9 +165,9 @@ static void CreatePreEvoSparkleSet2(u8 arg0)
     u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 8, 0);
     if (spriteID != MAX_SPRITES)
     {
-        gSprites[spriteID].data5 = 8;
-        gSprites[spriteID].data6 = arg0;
-        gSprites[spriteID].data7 = 0;
+        gSprites[spriteID].data[5] = 8;
+        gSprites[spriteID].data[6] = arg0;
+        gSprites[spriteID].data[7] = 0;
         gSprites[spriteID].oam.affineMode = 1;
         gSprites[spriteID].oam.matrixNum = 25;
         gSprites[spriteID].subpriority = 1;
@@ -177,12 +177,12 @@ static void CreatePreEvoSparkleSet2(u8 arg0)
 
 static void SpriteCB_PostEvoSparkleSet1(struct Sprite* sprite)
 {
-    if (sprite->data5 > 8)
+    if (sprite->data[5] > 8)
     {
-        sprite->pos2.y = Sin((u8)(sprite->data6), sprite->data5);
-        sprite->pos2.x = Cos((u8)(sprite->data6), sprite->data5);
-        sprite->data5 -= sprite->data3;
-        sprite->data6 += 4;
+        sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]);
+        sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]);
+        sprite->data[5] -= sprite->data[3];
+        sprite->data[6] += 4;
     }
     else
         DestroySprite(sprite);
@@ -193,10 +193,10 @@ static void CreatePostEvoSparkleSet1(u8 arg0, u8 arg1)
     u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 56, 0);
     if (spriteID != MAX_SPRITES)
     {
-        gSprites[spriteID].data3 = arg1;
-        gSprites[spriteID].data5 = 120;
-        gSprites[spriteID].data6 = arg0;
-        gSprites[spriteID].data7 = 0;
+        gSprites[spriteID].data[3] = arg1;
+        gSprites[spriteID].data[5] = 120;
+        gSprites[spriteID].data[6] = arg0;
+        gSprites[spriteID].data[7] = 0;
         gSprites[spriteID].oam.affineMode = 1;
         gSprites[spriteID].oam.matrixNum = 31;
         gSprites[spriteID].subpriority = 1;
@@ -206,29 +206,29 @@ static void CreatePostEvoSparkleSet1(u8 arg0, u8 arg1)
 
 static void SpriteCB_PostEvoSparkleSet2(struct Sprite* sprite)
 {
-    if (!(sprite->data7 & 3))
+    if (!(sprite->data[7] & 3))
         sprite->pos1.y++;
-    if (sprite->data6 < 128)
+    if (sprite->data[6] < 128)
     {
         u8 matrixNum;
 
-        sprite->pos2.y = -Sin((u8)(sprite->data6), sprite->data5);
-        sprite->pos1.x = 120 + (sprite->data3 * sprite->data7) / 3;
-        sprite->data6++;
-        matrixNum = 31 - (sprite->data6 * 12 / 128);
-        if (sprite->data6 > 64)
+        sprite->pos2.y = -Sin((u8)(sprite->data[6]), sprite->data[5]);
+        sprite->pos1.x = 120 + (sprite->data[3] * sprite->data[7]) / 3;
+        sprite->data[6]++;
+        matrixNum = 31 - (sprite->data[6] * 12 / 128);
+        if (sprite->data[6] > 64)
             sprite->subpriority = 1;
         else
         {
             sprite->invisible = 0;
             sprite->subpriority = 20;
-            if (sprite->data6 > 112 && sprite->data6 & 1)
+            if (sprite->data[6] > 112 && sprite->data[6] & 1)
                 sprite->invisible = 1;
         }
         if (matrixNum < 20)
             matrixNum = 20;
         sprite->oam.matrixNum = matrixNum;
-        sprite->data7++;
+        sprite->data[7]++;
     }
     else
         DestroySprite(sprite);
@@ -239,9 +239,9 @@ static void CreatePostEvoSparkleSet2(u8 arg0)
     u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 56, 0);
     if (spriteID != MAX_SPRITES)
     {
-        gSprites[spriteID].data3 = 3 - (Random() % 7);
-        gSprites[spriteID].data5 = 48 + (Random() & 0x3F);
-        gSprites[spriteID].data7 = 0;
+        gSprites[spriteID].data[3] = 3 - (Random() % 7);
+        gSprites[spriteID].data[5] = 48 + (Random() & 0x3F);
+        gSprites[spriteID].data[7] = 0;
         gSprites[spriteID].oam.affineMode = 1;
         gSprites[spriteID].oam.matrixNum = 31;
         gSprites[spriteID].subpriority = 20;
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index dfdeb63a3..97df5682b 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -30,7 +30,7 @@
 bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\
 void FieldObjectCB_##name(struct Sprite *sprite)\
 {\
-    FieldObjectStep(&gMapObjects[sprite->data0], sprite, FieldObjectCB2_##name);\
+    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\
 }\
 bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\
 {\
@@ -42,11 +42,11 @@ extern bool8 (*const (table)[])(struct MapObject *, struct Sprite *);\
 bool8 FieldObjectCB2_##name(struct MapObject *, struct Sprite *);\
 void FieldObjectCB_##name(struct Sprite *sprite)\
 {\
-    FieldObjectStep(&gMapObjects[sprite->data0], sprite, FieldObjectCB2_##name);\
+    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, FieldObjectCB2_##name);\
 }\
 bool8 FieldObjectCB2_##name(struct MapObject *mapObject, struct Sprite *sprite)\
 {\
-    return (table)[sprite->data1](mapObject, sprite);\
+    return (table)[sprite->data[1]](mapObject, sprite);\
 }
 
 #define field_object_path(idx, table, sub, path, catch, coord)\
@@ -655,7 +655,7 @@ static u8 SpawnFieldObjectInternal(struct MapObjectTemplate *mapObjectTemplate,
     sprite->pos1.y += 16 + sprite->centerToCornerVecY;
     sprite->oam.paletteNum = paletteSlot;
     sprite->coordOffsetEnabled = TRUE;
-    sprite->data0 = mapObjectId;
+    sprite->data[0] = mapObjectId;
     mapObject->spriteId = spriteId;
     mapObject->mapobj_bit_12 = graphicsInfo->inanimate;
     if (!mapObject->mapobj_bit_12)
@@ -813,8 +813,8 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction)
             sprite->oam.paletteNum -= 16;
         }
         sprite->coordOffsetEnabled = TRUE;
-        sprite->data0 = a1;
-        sprite->data1 = z;
+        sprite->data[0] = a1;
+        sprite->data[1] = z;
         if (graphicsInfo->paletteSlot == 10)
         {
             npc_load_two_palettes__and_record(graphicsInfo->paletteTag1, graphicsInfo->paletteSlot);
@@ -1003,7 +1003,7 @@ static void sub_808E1B8(u8 mapObjectId, s16 x, s16 y)
         }
         sprite->oam.paletteNum = paletteSlot;
         sprite->coordOffsetEnabled = TRUE;
-        sprite->data0 = mapObjectId;
+        sprite->data[0] = mapObjectId;
         mapObject->spriteId = spriteId;
         if (!mapObject->mapobj_bit_12 && mapObject->animPattern != 0x0b)
         {
@@ -1463,7 +1463,7 @@ u8 AddCameraObject(u8 linkedSpriteId)
 
     spriteId = CreateSprite(&gUnknown_084975D4, 0, 0, 4);
     gSprites[spriteId].invisible = TRUE;
-    gSprites[spriteId].data0 = linkedSpriteId;
+    gSprites[spriteId].data[0] = linkedSpriteId;
     return spriteId;
 }
 
@@ -1472,15 +1472,15 @@ void ObjectCB_CameraObject(struct Sprite *sprite)
     void (*callbacks[ARRAY_COUNT(gUnknown_084975EC)])(struct Sprite *);
 
     memcpy(callbacks, gUnknown_084975EC, sizeof gUnknown_084975EC);
-    callbacks[sprite->data1](sprite);
+    callbacks[sprite->data[1]](sprite);
 }
 
 /*static*/ void CameraObject_0(struct Sprite *sprite)
 {
-    sprite->pos1.x = gSprites[sprite->data0].pos1.x;
-    sprite->pos1.y = gSprites[sprite->data0].pos1.y;
+    sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
+    sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
     sprite->invisible = TRUE;
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     CameraObject_1(sprite);
 }
 
@@ -1489,20 +1489,20 @@ void ObjectCB_CameraObject(struct Sprite *sprite)
     s16 x;
     s16 y;
 
-    y = gSprites[sprite->data0].pos1.y;
-    x = gSprites[sprite->data0].pos1.x;
-    sprite->data2 = x - sprite->pos1.x;
-    sprite->data3 = y - sprite->pos1.y;
+    y = gSprites[sprite->data[0]].pos1.y;
+    x = gSprites[sprite->data[0]].pos1.x;
+    sprite->data[2] = x - sprite->pos1.x;
+    sprite->data[3] = y - sprite->pos1.y;
     sprite->pos1.x = x;
     sprite->pos1.y = y;
 }
 
 /*static*/ void CameraObject_2(struct Sprite *sprite)
 {
-    sprite->pos1.x = gSprites[sprite->data0].pos1.x;
-    sprite->pos1.y = gSprites[sprite->data0].pos1.y;
-    sprite->data2 = 0;
-    sprite->data3 = 0;
+    sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
+    sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
+    sprite->data[2] = 0;
+    sprite->data[3] = 0;
 }
 
 static struct Sprite *FindCameraObject(void)
@@ -1526,7 +1526,7 @@ void CameraObjectReset1(void)
     cameraObject = FindCameraObject();
     if (cameraObject != NULL)
     {
-        cameraObject->data1 = 0;
+        cameraObject->data[1] = 0;
         cameraObject->callback(cameraObject);
     }
 }
@@ -1538,7 +1538,7 @@ void CameraObjectSetFollowedObjectId(u8 objectId)
     cameraObject = FindCameraObject();
     if (cameraObject != NULL)
     {
-        cameraObject->data0 = objectId;
+        cameraObject->data[0] = objectId;
         CameraObjectReset1();
     }
 }
@@ -1552,12 +1552,12 @@ u8 CameraObjectGetFollowedObjectId(void)
     {
         return MAX_SPRITES;
     }
-    return cameraObject->data0;
+    return cameraObject->data[0];
 }
 
 void CameraObjectReset2(void)
 {
-    FindCameraObject()->data1 = 2;
+    FindCameraObject()->data[1] = 2;
 }
 
 u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)
@@ -1818,14 +1818,14 @@ field_object_step(GoRandomDirections, gUnknown_0850D6F4)
 bool8 sub_808F44C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_808F460(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -1836,7 +1836,7 @@ bool8 sub_808F48C(struct MapObject *mapObject, struct Sprite *sprite)
         return FALSE;
     }
     SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
-    sprite->data1 = 3;
+    sprite->data[1] = 3;
     return TRUE;
 }
 
@@ -1844,7 +1844,7 @@ bool8 sub_808F4C8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -1858,10 +1858,10 @@ bool8 sub_808F4E8(struct MapObject *mapObject, struct Sprite *sprite)
     memcpy(directions, gUnknown_0850D710, sizeof directions);
     chosenDirection = directions[Random() & 0x03];
     FieldObjectSetDirection(mapObject, chosenDirection);
-    sprite->data1 = 5;
+    sprite->data[1] = 5;
     if (npc_block_way__next_tile(mapObject, chosenDirection))
     {
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return TRUE;
 }
@@ -1870,7 +1870,7 @@ bool8 sub_808F534(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18));
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 6;
+    sprite->data[1] = 6;
     return TRUE;
 }
 
@@ -1879,7 +1879,7 @@ bool8 sub_808F564(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return FALSE;
 }
@@ -2140,14 +2140,14 @@ field_object_step(LookRandomDirections, gUnknown_0850D740)
 bool8 sub_808F988(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_808F99C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2157,7 +2157,7 @@ bool8 sub_808F9C8(struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2166,7 +2166,7 @@ bool8 sub_808FA0C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2184,7 +2184,7 @@ bool8 sub_808FA3C(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x03];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2193,14 +2193,14 @@ field_object_step(RandomlyGoNorthOrSouth, gUnknown_0850D754)
 bool8 sub_808FAC8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_808FADC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2211,7 +2211,7 @@ bool8 sub_808FB08(struct MapObject *mapObject, struct Sprite *sprite)
         return FALSE;
     }
     SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
-    sprite->data1 = 3;
+    sprite->data[1] = 3;
     return TRUE;
 }
 
@@ -2219,7 +2219,7 @@ bool8 sub_808FB44(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2233,10 +2233,10 @@ bool8 sub_808FB64(struct MapObject *mapObject, struct Sprite *sprite)
     memcpy(directions, gUnknown_0850D770, sizeof directions);
     direction = directions[Random() & 0x01];
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 5;
+    sprite->data[1] = 5;
     if (npc_block_way__next_tile(mapObject, direction))
     {
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return TRUE;
 }
@@ -2245,7 +2245,7 @@ bool8 sub_808FBB0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18));
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 6;
+    sprite->data[1] = 6;
     return TRUE;
 }
 
@@ -2254,7 +2254,7 @@ bool8 sub_808FBE0(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return FALSE;
 }
@@ -2264,14 +2264,14 @@ field_object_step(RandomlyGoEastOrWest, gUnknown_0850D774)
 bool8 sub_808FC4C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_808FC60(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2282,7 +2282,7 @@ bool8 sub_808FC8C(struct MapObject *mapObject, struct Sprite *sprite)
         return FALSE;
     }
     SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
-    sprite->data1 = 3;
+    sprite->data[1] = 3;
     return TRUE;
 }
 
@@ -2290,7 +2290,7 @@ bool8 sub_808FCC8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2304,10 +2304,10 @@ bool8 sub_808FCE8(struct MapObject *mapObject, struct Sprite *sprite)
     memcpy(directions, gUnknown_0850D790, sizeof directions);
     direction = directions[Random() & 0x01];
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 5;
+    sprite->data[1] = 5;
     if (npc_block_way__next_tile(mapObject, direction))
     {
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return TRUE;
 }
@@ -2316,7 +2316,7 @@ bool8 sub_808FD34(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18));
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 6;
+    sprite->data[1] = 6;
     return TRUE;
 }
 
@@ -2325,7 +2325,7 @@ bool8 sub_808FD64(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return FALSE;
 }
@@ -2336,7 +2336,7 @@ bool8 sub_808FDD0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2344,7 +2344,7 @@ bool8 sub_808FDFC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
-        sprite->data1 = 2;
+        sprite->data[1] = 2;
         return TRUE;
     }
     return FALSE;
@@ -2362,17 +2362,17 @@ void FieldObjectCB_BerryTree(struct Sprite *sprite)
 {
     struct MapObject *mapObject;
 
-    mapObject = &gMapObjects[sprite->data0];
-    if (!(sprite->data7 & 0x0001))
+    mapObject = &gMapObjects[sprite->data[0]];
+    if (!(sprite->data[7] & 0x0001))
     {
         get_berry_tree_graphics(mapObject, sprite);
-        sprite->data7 |= 0x0001;
+        sprite->data[7] |= 0x0001;
     }
     FieldObjectStep(mapObject, sprite, FieldObjectCB2_BerryTree);
 }
 static bool8 FieldObjectCB2_BerryTree(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    return gUnknown_0850D7A0[sprite->data1](mapObject, sprite);
+    return gUnknown_0850D7A0[sprite->data[1]](mapObject, sprite);
 }
 
 bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite *sprite)
@@ -2385,7 +2385,7 @@ bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite
     berryStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId);
     if (berryStage == 0)
     {
-        if (!(sprite->data7 & 0x0004) && sprite->animNum == 4)
+        if (!(sprite->data[7] & 0x0004) && sprite->animNum == 4)
         {
             gFieldEffectArguments[0] = mapObject->coords2.x;
             gFieldEffectArguments[1] = mapObject->coords2.y;
@@ -2401,12 +2401,12 @@ bool8 do_berry_tree_growth_sparkle_1 (struct MapObject *mapObject, struct Sprite
     berryStage --;
     if (sprite->animNum != berryStage)
     {
-        sprite->data1 = 2;
+        sprite->data[1] = 2;
         return TRUE;
     }
     get_berry_tree_graphics(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, 0x39);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2414,7 +2414,7 @@ bool8 sub_808FF48 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
-        sprite->data1 = 0;
+        sprite->data[1] = 0;
         return TRUE;
     }
     return FALSE;
@@ -2423,9 +2423,9 @@ bool8 sub_808FF48 (struct MapObject *mapObject, struct Sprite *sprite)
 bool8 do_berry_tree_growth_sparkle_2 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 3;
-    sprite->data2 = 0;
-    sprite->data7 |= 0x0002;
+    sprite->data[1] = 3;
+    sprite->data[2] = 0;
+    sprite->data[7] |= 0x0002;
     gFieldEffectArguments[0] = mapObject->coords2.x;
     gFieldEffectArguments[1] = mapObject->coords2.y;
     gFieldEffectArguments[2] = sprite->subpriority - 1;
@@ -2436,14 +2436,14 @@ bool8 do_berry_tree_growth_sparkle_2 (struct MapObject *mapObject, struct Sprite
 
 bool8 sub_808FFB4 (struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sprite->data2 ++;
-    mapObject->mapobj_bit_13 = (sprite->data2 & 0x02) >> 1;
+    sprite->data[2] ++;
+    mapObject->mapobj_bit_13 = (sprite->data[2] & 0x02) >> 1;
     sprite->animPaused = TRUE;
-    if (sprite->data2 > 64)
+    if (sprite->data[2] > 64)
     {
         get_berry_tree_graphics(mapObject, sprite);
-        sprite->data1 = 4;
-        sprite->data2 = 0;
+        sprite->data[1] = 4;
+        sprite->data[2] = 0;
         return TRUE;
     }
     return FALSE;
@@ -2451,13 +2451,13 @@ bool8 sub_808FFB4 (struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 sub_8090004 (struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sprite->data2 ++;
-    mapObject->mapobj_bit_13 = (sprite->data2 & 0x02) >> 1;
+    sprite->data[2] ++;
+    mapObject->mapobj_bit_13 = (sprite->data[2] & 0x02) >> 1;
     sprite->animPaused = TRUE;
-    if (sprite->data2 > 64)
+    if (sprite->data[2] > 64)
     {
-        sprite->data1 = 0;
-        sprite->data7 &= ~0x0002;
+        sprite->data[1] = 0;
+        sprite->data[7] &= ~0x0002;
         return TRUE;
     }
     return FALSE;
@@ -2468,14 +2468,14 @@ field_object_step(RandomlyLookNorthOrSouth, gUnknown_0850D7B4)
 bool8 sub_8090094 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_80900A8 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2485,7 +2485,7 @@ bool8 sub_80900D4 (struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2494,7 +2494,7 @@ bool8 sub_8090118 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2512,7 +2512,7 @@ bool8 sub_8090148 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x01];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2521,14 +2521,14 @@ field_object_step(RandomlyLookEastOrWest, gUnknown_0850D7C8)
 bool8 sub_80901D4 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_80901E8 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2538,7 +2538,7 @@ bool8 sub_8090214 (struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6DC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2547,7 +2547,7 @@ bool8 sub_8090258 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2565,7 +2565,7 @@ bool8 sub_8090288 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x01];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2574,14 +2574,14 @@ field_object_step(RandomlyLookNorthOrWest, gUnknown_0850D7DC)
 bool8 sub_8090314 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_8090328 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2591,7 +2591,7 @@ bool8 sub_8090354 (struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2600,7 +2600,7 @@ bool8 sub_8090398 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2618,7 +2618,7 @@ bool8 sub_80903C8 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x01];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2627,14 +2627,14 @@ field_object_step(RandomlyLookNorthOrEast, gUnknown_0850D7F4)
 bool8 sub_8090454 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_8090468 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2644,7 +2644,7 @@ bool8 sub_8090494 (struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2653,7 +2653,7 @@ bool8 sub_80904D8 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2671,7 +2671,7 @@ bool8 sub_8090508 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x01];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2680,14 +2680,14 @@ field_object_step(RandomlyLookSouthOrWest, gUnknown_0850D80C)
 bool8 sub_8090594 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_80905A8 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2697,7 +2697,7 @@ bool8 sub_80905D4 (struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2706,7 +2706,7 @@ bool8 sub_8090618 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2724,7 +2724,7 @@ bool8 sub_8090648 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x01];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2733,14 +2733,14 @@ field_object_step(RandomlyLookSouthOrEast, gUnknown_0850D824)
 bool8 sub_80906D4 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_80906E8 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2750,7 +2750,7 @@ bool8 sub_8090714 (struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2759,7 +2759,7 @@ bool8 sub_8090758 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2777,7 +2777,7 @@ bool8 sub_8090788 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x01];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2786,14 +2786,14 @@ field_object_step(RandomlyLookNorthOrSouthOrWest, gUnknown_0850D83C)
 bool8 sub_8090814 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_8090828 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2803,7 +2803,7 @@ bool8 sub_8090854 (struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2812,7 +2812,7 @@ bool8 sub_8090898 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2830,7 +2830,7 @@ bool8 sub_80908C8 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x03];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2839,14 +2839,14 @@ field_object_step(RandomlyLookNorthOrSouthOrEast, gUnknown_0850D854)
 bool8 sub_8090954 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_8090968 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2856,7 +2856,7 @@ bool8 sub_8090994 (struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2865,7 +2865,7 @@ bool8 sub_80909D8 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2883,7 +2883,7 @@ bool8 sub_8090A08 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x03];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2892,14 +2892,14 @@ field_object_step(RandomlyLookNorthOrEastOrWest, gUnknown_0850D86C)
 bool8 sub_8090A94 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_8090AA8 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2909,7 +2909,7 @@ bool8 sub_8090AD4 (struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2918,7 +2918,7 @@ bool8 sub_8090B18 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2936,7 +2936,7 @@ bool8 sub_8090B48 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x03];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2945,14 +2945,14 @@ field_object_step(RandomlyLookSouthOrEastOrWest, gUnknown_0850D884)
 bool8 sub_8090BD4 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
 bool8 sub_8090BE8 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -2962,7 +2962,7 @@ bool8 sub_8090C14 (struct MapObject *mapObject, struct Sprite *sprite)
     {
         SetFieldObjectStepTimer(sprite, gUnknown_0850D6EC[Random() & 0x03]);
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -2971,7 +2971,7 @@ bool8 sub_8090C58 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return TRUE;
     }
     return FALSE;
@@ -2989,7 +2989,7 @@ bool8 sub_8090C88 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 0x03];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -2999,7 +2999,7 @@ bool8 sub_8090D14 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -3008,7 +3008,7 @@ bool8 sub_8090D40 (struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         SetFieldObjectStepTimer(sprite, 48);
-        sprite->data1 = 2;
+        sprite->data[1] = 2;
     }
     return FALSE;
 }
@@ -3017,7 +3017,7 @@ bool8 sub_8090D64 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -3034,7 +3034,7 @@ bool8 sub_8090D90 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[mapObject->mapobj_unk_18];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 0;
+    sprite->data[1] = 0;
     return TRUE;
 }
 
@@ -3044,7 +3044,7 @@ bool8 sub_8090E18 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -3053,7 +3053,7 @@ bool8 sub_8090E44 (struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         SetFieldObjectStepTimer(sprite, 48);
-        sprite->data1 = 2;
+        sprite->data[1] = 2;
     }
     return FALSE;
 }
@@ -3062,7 +3062,7 @@ bool8 sub_8090E68 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (RunFieldObjectStepTimer(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return FALSE;
 }
@@ -3079,7 +3079,7 @@ bool8 sub_8090E94 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[mapObject->mapobj_unk_18];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 0;
+    sprite->data[1] = 0;
     return TRUE;
 }
 
@@ -3088,7 +3088,7 @@ field_object_step(AlternatelyGoInOppositeDirections, gUnknown_0850D8CC)
 bool8 sub_8090F1C (struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -3102,7 +3102,7 @@ bool8 sub_8090F30 (struct MapObject *mapObject, struct Sprite *sprite)
         direction = GetOppositeDirection(direction);
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -3131,7 +3131,7 @@ bool8 sub_8090F68 (struct MapObject *mapObject, struct Sprite *sprite)
     }
     FieldObjectSetRegularAnim(mapObject, sprite, animId);
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 3;
+    sprite->data[1] = 3;
     return TRUE;
 }
 
@@ -3140,7 +3140,7 @@ bool8 sub_8091020 (struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return FALSE;
 }
@@ -3148,7 +3148,7 @@ bool8 sub_8091020 (struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_8091048(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -3177,7 +3177,7 @@ bool8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, stru
     }
     FieldObjectSetRegularAnim(mapObject, sprite, animId);
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -3186,7 +3186,7 @@ bool8 sub_8091110(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return FALSE;
 }
@@ -3225,7 +3225,7 @@ bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Spr
     {
         mapObject->mapobj_unk_21 = player_get_direction_lower_nybble();
     }
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -3243,7 +3243,7 @@ bool8 sub_8091F20(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         mapObject->mapobj_bit_1 = FALSE;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return FALSE;
 }
@@ -3257,7 +3257,7 @@ bool8 sub_8091F4C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, playerDirection)));
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -3278,7 +3278,7 @@ bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
             FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
             FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
             mapObject->mapobj_bit_1 = TRUE;
-            sprite->data1 = 2;
+            sprite->data[1] = 2;
             return TRUE;
         }
     }
@@ -3293,7 +3293,7 @@ bool8 sub_8091F94(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -3312,7 +3312,7 @@ bool8 sub_80920A4(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -3331,7 +3331,7 @@ bool8 sub_809215C(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -3350,7 +3350,7 @@ bool8 sub_8092214(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -3362,7 +3362,7 @@ bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 pl
     direction = state_to_direction(gUnknown_085055CD[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
     FieldObjectSetRegularAnim(mapObject, sprite, sub_80934BC(direction));
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -3381,7 +3381,7 @@ bool8 sub_8092314(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -3402,7 +3402,7 @@ bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -3423,15 +3423,15 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
 {
     struct MapObject *mapObject;
 
-    mapObject = &gMapObjects[sprite->data0];
-    if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data7))
+    mapObject = &gMapObjects[sprite->data[0]];
+    if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7]))
     {
         FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
-        sprite->data7 ++;
+        sprite->data[7] ++;
     }
-    FieldObjectStep(&gMapObjects[sprite->data0], sprite, sub_80925AC);
+    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC);
 }
 
 bool8 sub_80925AC(struct MapObject *mapObject, struct Sprite *sprite)
@@ -3444,15 +3444,15 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
 {
     struct MapObject *mapObject;
 
-    mapObject = &gMapObjects[sprite->data0];
-    if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data7))
+    mapObject = &gMapObjects[sprite->data[0]];
+    if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7]))
     {
         FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
-        sprite->data7 ++;
+        sprite->data[7] ++;
     }
-    FieldObjectStep(&gMapObjects[sprite->data0], sprite, sub_80925AC);
+    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_80925AC);
 }
 
 extern bool8 (*const gUnknown_0850DA9C[])(struct MapObject *, struct Sprite *);
@@ -3460,19 +3460,19 @@ bool8 sub_809268C(struct MapObject *, struct Sprite *);
 
 void FieldObjectCB_Hidden1(struct Sprite *sprite)
 {
-    if (!sprite->data7)
+    if (!sprite->data[7])
     {
-        gMapObjects[sprite->data0].mapobj_bit_26 = TRUE;
+        gMapObjects[sprite->data[0]].mapobj_bit_26 = TRUE;
         sprite->subspriteMode = 2;
         sprite->oam.priority = 3;
-        sprite->data7 ++;
+        sprite->data[7] ++;
     }
-    FieldObjectStep(&gMapObjects[sprite->data0], sprite, sub_809268C);
+    FieldObjectStep(&gMapObjects[sprite->data[0]], sprite, sub_809268C);
 }
 
 bool8 sub_809268C(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    return gUnknown_0850DA9C[sprite->data1](mapObject, sprite);
+    return gUnknown_0850DA9C[sprite->data[1]](mapObject, sprite);
 }
 
 bool8 sub_80926AC (struct MapObject *mapObject, struct Sprite *sprite)
@@ -3484,7 +3484,7 @@ bool8 sub_80926B8 (struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
-        sprite->data1 = 0;
+        sprite->data[1] = 0;
     }
     return FALSE;
 }
@@ -3495,7 +3495,7 @@ bool8 sub_8092718(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -3505,7 +3505,7 @@ bool8 sub_8092788(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay32AnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -3515,7 +3515,7 @@ bool8 sub_80927F8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -3525,7 +3525,7 @@ bool8 sub_8092868(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 
@@ -3536,14 +3536,14 @@ bool8 sub_80928D8(struct MapObject *mapObject, struct Sprite *sprite)
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
     mapObject->mapobj_bit_13 = TRUE;
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return TRUE;
 }
 bool8 sub_809290C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
-        sprite->data1 = 2;
+        sprite->data[1] = 2;
         return TRUE;
     }
     return FALSE;
@@ -3561,7 +3561,7 @@ void npc_reset(struct MapObject *mapObject, struct Sprite *sprite)
     mapObject->mapobj_bit_6 = FALSE;
     mapObject->mapobj_bit_7 = FALSE;
     mapObject->mapobj_unk_1C = 0xFF;
-    sprite->data1 = 0;
+    sprite->data[1] = 0;
 }
 
 #define dirn2anim(name, table)\
@@ -3680,7 +3680,7 @@ void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern)
     mapObject->mapobj_unk_21 = 0;
     mapObject->animId = 0;
     gSprites[mapObject->spriteId].callback = gUnknown_08505438[animPattern];
-    gSprites[mapObject->spriteId].data1 = 0;
+    gSprites[mapObject->spriteId].data[1] = 0;
 }
 
 dirn2anim(npc_running_behaviour_by_direction, gUnknown_0850DB53)
@@ -3811,7 +3811,7 @@ bool8 sub_8092E9C(u8 localId, u8 mapNum, u8 mapGroup)
 {
     u8 mapObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) && gSprites[gMapObjects[mapObjectId].spriteId].data7 & 0x02)
+    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) && gSprites[gMapObjects[mapObjectId].spriteId].data[7] & 0x02)
     {
         return TRUE;
     }
@@ -3824,7 +3824,7 @@ void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup)
 
     if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
     {
-        gSprites[gMapObjects[mapObjectId].spriteId].data7 |= 0x04;
+        gSprites[gMapObjects[mapObjectId].spriteId].data[7] |= 0x04;
     }
 }
 
@@ -3975,7 +3975,7 @@ bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId)
     mapObject->mapobj_unk_1C = specialAnimId;
     mapObject->mapobj_bit_6 = TRUE;
     mapObject->mapobj_bit_7 = FALSE;
-    gSprites[mapObject->spriteId].data2 = 0;
+    gSprites[mapObject->spriteId].data[2] = 0;
     return FALSE;
 }
 
@@ -3998,8 +3998,8 @@ void FieldObjectClearAnim(struct MapObject *mapObject)
     mapObject->mapobj_unk_1C = 0xFF;
     mapObject->mapobj_bit_6 = FALSE;
     mapObject->mapobj_bit_7 = FALSE;
-    gSprites[mapObject->spriteId].data1 = 0;
-    gSprites[mapObject->spriteId].data2 = 0;
+    gSprites[mapObject->spriteId].data[1] = 0;
+    gSprites[mapObject->spriteId].data[2] = 0;
 }
 
 u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject)
@@ -4137,7 +4137,7 @@ static u32 state_to_direction(u8 a0, u32 a1, u32 a2)
 
 static void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data2](mapObject, sprite))
+    if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite))
     {
         mapObject->mapobj_bit_7 = TRUE;
     }
@@ -4145,10 +4145,10 @@ static void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprit
 
 bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data2](mapObject, sprite))
+    if (gUnknown_0850DC50[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite))
     {
         mapObject->mapobj_unk_1C = 0xFF;
-        sprite->data2 = 0;
+        sprite->data[2] = 0;
         return TRUE;
     }
     return FALSE;
@@ -4157,7 +4157,7 @@ bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *spr
 void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId)
 {
     mapObject->mapobj_unk_1C = animId;
-    sprite->data2 = 0;
+    sprite->data[2] = 0;
 }
 
 // file boundary?
@@ -4168,7 +4168,7 @@ void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     npc_coords_shift_still(mapObject);
     obj_npc_animation_step(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18));
     sprite->animPaused = TRUE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
 }
 
 bool8 sub_8093950(struct MapObject *mapObject, struct Sprite *sprite)
@@ -4212,7 +4212,7 @@ void npc_apply_direction(struct MapObject *mapObject, struct Sprite *sprite, u8
         sprite->animPaused = TRUE;
     }
     mapObject->mapobj_bit_2 = TRUE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
 }
 
 void do_go_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 speed)
@@ -4255,7 +4255,7 @@ void sub_8093AF0(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     sub_80976DC(sprite, direction);
     sprite->animPaused = FALSE;
     mapObject->mapobj_bit_2 = TRUE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
 }
 
 void sub_8093B60(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
@@ -4287,7 +4287,7 @@ bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
 {\
     if (fn2(mapObject, sprite))\
     {\
-        sprite->data2 = 2;\
+        sprite->data[2] = 2;\
         return TRUE;\
     }\
     return FALSE;\
@@ -4323,7 +4323,7 @@ void sub_8093FC4(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     sub_8092F88(direction, &x, &y, displacements[speed], displacements[speed]);
     npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y);
     sub_809783C(sprite, direction, speed, a5);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     sprite->animPaused = 0;
     mapObject->mapobj_bit_2 = 1;
     mapObject->mapobj_bit_4 = 1;
@@ -4345,11 +4345,11 @@ u8 sub_80940C4(struct MapObject *mapObject, struct Sprite *sprite, u8 callback(s
 
     memcpy(displacements, gUnknown_0850DFC2, sizeof gUnknown_0850DFC2);
     result = callback(sprite);
-    if (result == 1 && displacements[sprite->data4] != 0)
+    if (result == 1 && displacements[sprite->data[4]] != 0)
     {
         x = 0;
         y = 0;
-        sub_8092F88(mapObject->placeholder18, &x, &y, displacements[sprite->data4], displacements[sprite->data4]);
+        sub_8092F88(mapObject->placeholder18, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]);
         npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y);
         mapObject->mapobj_bit_2 = TRUE;
         mapObject->mapobj_bit_4 = TRUE;
@@ -4418,7 +4418,7 @@ bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
     if (fn2(mapObject, sprite))\
     {\
         mapObject->mapobj_bit_22 = FALSE;\
-        sprite->data2 = 2;\
+        sprite->data[2] = 2;\
         return TRUE;\
     }\
     return FALSE;\
@@ -4431,15 +4431,15 @@ maybe_shadow_1_macro(sub_8094338, maybe_shadow_1, sub_80941B0, DIR_EAST,  2, 0)
 
 void sub_8094390(struct Sprite *sprite, u16 duration)
 {
-    sprite->data2 = 1;
-    sprite->data3 = duration;
+    sprite->data[2] = 1;
+    sprite->data[3] = duration;
 }
 
 bool8 sub_8094398(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (-- sprite->data3 == 0)
+    if (-- sprite->data[3] == 0)
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -4468,15 +4468,15 @@ void sub_8094554(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     FieldObjectSetDirection(mapObject, direction);
     npc_apply_anim_looping(mapObject, sprite, animNum);
     sprite->animPaused = FALSE;
-    sprite->data2 = 1;
-    sprite->data3 = duration;
+    sprite->data[2] = 1;
+    sprite->data[3] = duration;
 }
 
 bool8 sub_809459C(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (-- sprite->data3 == 0)
+    if (-- sprite->data[3] == 0)
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         sprite->animPaused = TRUE;
         return TRUE;
     }
@@ -4485,7 +4485,7 @@ bool8 sub_809459C(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 sub_80945C4(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (sprite->data3 & 1)
+    if (sprite->data[3] & 1)
     {
         sprite->animDelayCounter ++;
     }
@@ -4539,7 +4539,7 @@ void npc_set_direction_and_anim__an_proceed(struct MapObject *mapObject, struct
 {
     obj_anim_image_set_and_seek(sprite, animNum, 0);
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
 }
 
 bool8 sub_8094DAC(struct MapObject *mapObject, struct Sprite *sprite)
@@ -4552,7 +4552,7 @@ bool8 sub_8094DC4(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_80979BC(sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -4575,7 +4575,7 @@ bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
 {\
     if (sub_80941C8(mapObject, sprite))\
     {\
-        sprite->data2 = 2;\
+        sprite->data[2] = 2;\
         mapObject->mapobj_bit_5 = FALSE;\
         return TRUE;\
     }\
@@ -4595,7 +4595,7 @@ bool8 sub_8094F38(struct MapObject *mapObject, struct Sprite *sprite)
     {
         an_look_any(mapObject, sprite, sub_8092AF8(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[mapObjectId].coords2.x, gMapObjects[mapObjectId].coords2.y));
     }
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -4607,21 +4607,21 @@ bool8 sub_8094F94(struct MapObject *mapObject, struct Sprite *sprite)
     {
         an_look_any(mapObject, sprite, GetOppositeDirection(sub_8092AF8(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[mapObjectId].coords2.x, gMapObjects[mapObjectId].coords2.y)));
     }
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_8094FF8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_9 = TRUE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_8095008(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_9 = FALSE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -4653,42 +4653,42 @@ bool8 sub_8095450(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_8095460(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_25 = FALSE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_8095470(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_25 = TRUE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_8095480(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_12 = TRUE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_8095490(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_80954BC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_13 = TRUE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_13 = FALSE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -4696,7 +4696,7 @@ bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *s
 {
     FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -4704,7 +4704,7 @@ bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *s
 {
     FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -4712,7 +4712,7 @@ bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_HEART_ICON);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -4725,11 +4725,11 @@ bool8 sub_8095548(struct MapObject *mapObject, struct Sprite *sprite)
     }
     if (mapObject->animPattern != 0x39 && mapObject->animPattern != 0x3A)
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     sub_8155D78(mapObject);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return sub_809558C(mapObject, sprite);
 }
 
@@ -4737,7 +4737,7 @@ bool8 sub_809558C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8155DA0(mapObject))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -4746,7 +4746,7 @@ bool8 sub_809558C(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_80955AC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     obj_anim_image_set_and_seek(sprite, 1, 0);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return FALSE;
 }
 
@@ -4755,7 +4755,7 @@ bool8 sub_80955C8(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_80979BC(sprite))
     {
         SetFieldObjectStepTimer(sprite, 32);
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
     }
     return FALSE;
 }
@@ -4766,7 +4766,7 @@ bool8 sub_80955EC(struct MapObject *mapObject, struct Sprite *sprite)
     if (RunFieldObjectStepTimer(sprite))
     {
         mapObject->mapobj_bit_13 = TRUE;
-        sprite->data2 = 3;
+        sprite->data[2] = 3;
     }
     return FALSE;
 }
@@ -4774,7 +4774,7 @@ bool8 sub_80955EC(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_8095628(struct MapObject *mapObject, struct Sprite *sprite)
 {
     obj_anim_image_set_and_seek(sprite, 1, 0);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return FALSE;
 }
 
@@ -4783,7 +4783,7 @@ bool8 sub_8095644(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_80979BC(sprite))
     {
         SetFieldObjectStepTimer(sprite, 32);
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
     }
     return FALSE;
 }
@@ -4794,7 +4794,7 @@ bool8 sub_8095668(struct MapObject *mapObject, struct Sprite *sprite)
     if (RunFieldObjectStepTimer(sprite))
     {
         mapObject->mapobj_bit_13 = TRUE;
-        sprite->data2 = 3;
+        sprite->data[2] = 3;
     }
     return FALSE;
 }
@@ -4802,14 +4802,14 @@ bool8 sub_8095668(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_80956A4(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_26 = TRUE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_80956B4(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_26 = FALSE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -4856,7 +4856,7 @@ bool8 name##_2(struct MapObject *mapObject, struct Sprite *sprite)\
     if (fn2(mapObject, sprite))\
     {\
         sprite->affineAnimPaused = TRUE;\
-        sprite->data2 = 2;\
+        sprite->data[2] = 2;\
         return TRUE;\
     }\
     return FALSE;\
@@ -4873,7 +4873,7 @@ static void sub_80958C0(struct MapObject *mapObject, struct Sprite *sprite, u8 d
     npc_coords_shift_still(mapObject);
     obj_npc_animation_step(mapObject, sprite, sub_80929FC(direction));
     sprite->animPaused = TRUE;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
 }
 
 bool8 sub_8095900(struct MapObject *mapObject, struct Sprite *sprite)
@@ -4941,7 +4941,7 @@ bool8 sub_8095B0C(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_8095B44(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8095AF0(mapObject, sprite);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return sub_8095B64(mapObject, sprite);
 }
 
@@ -4949,7 +4949,7 @@ bool8 sub_8095B64(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8095B0C(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -5017,7 +5017,7 @@ an_walk_any_2_macro(sub_8096428, sub_8096330, npc_obj_ministep_stop_on_arrival,
 bool8 sub_8096468(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8097FA4(mapObject);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -5025,7 +5025,7 @@ bool8 sub_809647C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     sub_8098044(mapObject->mapobj_unk_1B);
     sprite->pos2.y = 0;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -5034,7 +5034,7 @@ bool8 sub_8096494(struct MapObject *mapObject, struct Sprite *sprite)
     if (sprite->pos2.y == 0)
     {
         sub_8098044(mapObject->mapobj_unk_1B);
-        sprite->data2 = 1;
+        sprite->data[2] = 1;
         return TRUE;
     }
     return FALSE;
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index bc7177bd7..af1f9813a 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -580,9 +580,9 @@ static void Task_Hof_SetMonDisplayTask(u8 taskId)
     gTasks[taskId].func = Task_Hof_DisplayMon;
 }
 
-#define tDestinationX  data1
-#define tDestinationY  data2
-#define tSpecies       data7
+#define tDestinationX  data[1]
+#define tDestinationY  data[2]
+#define tSpecies       data[7]
 
 static void Task_Hof_DisplayMon(u8 taskId)
 {
@@ -613,7 +613,7 @@ static void Task_Hof_DisplayMon(u8 taskId)
     spriteId = sub_818D3E4(currMon->species, currMon->tid, currMon->personality, 1, xPos, yPos, currMonId, 0xFFFF);
     gSprites[spriteId].tDestinationX = field4;
     gSprites[spriteId].tDestinationY = field6;
-    gSprites[spriteId].data0 = 0;
+    gSprites[spriteId].data[0] = 0;
     gSprites[spriteId].tSpecies = currMon->species;
     gSprites[spriteId].callback = SpriteCB_GetOnScreenAndAnimate;
     gTasks[taskId].tMonSpriteId(currMonId) = spriteId;
@@ -1404,13 +1404,13 @@ static void sub_81751A4(struct Sprite* sprite)
         u8 tableID;
 
         sprite->pos2.y++;
-        sprite->pos2.y += sprite->data1;
+        sprite->pos2.y += sprite->data[1];
 
-        tableID = sprite->data0;
+        tableID = sprite->data[0];
         rand = (Random() % 4) + 8;
         sprite->pos2.x = rand * gSineTable[tableID] / 256;
 
-        sprite->data0 += 4;
+        sprite->data[0] += 4;
     }
 }
 
@@ -1428,9 +1428,9 @@ static bool8 sub_81751FC(void)
     StartSpriteAnim(sprite, Random() % 17);
 
     if (Random() & 3)
-        sprite->data1 = 0;
+        sprite->data[1] = 0;
     else
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
 
     return FALSE;
 }
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index e9cd3e215..e806245a9 100755
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -937,7 +937,7 @@ void sub_81C0704(u8 taskId)
         gUnknown_0203CF1C->unk40D3 = sub_81C45F4(&gUnknown_0203CF1C->currentMon, &data[1]);
         if (gUnknown_0203CF1C->unk40D3 == 0xFF)
             return;
-        gSprites[gUnknown_0203CF1C->unk40D3].data2 = 1;
+        gSprites[gUnknown_0203CF1C->unk40D3].data[2] = 1;
         sub_81C0E24();
         data[1] = 0;
         break;
@@ -952,7 +952,7 @@ void sub_81C0704(u8 taskId)
         sub_81C2524();
         break;
     case 12:
-        gSprites[gUnknown_0203CF1C->unk40D3].data2 = 0;
+        gSprites[gUnknown_0203CF1C->unk40D3].data[2] = 0;
         break;
     default:
         if (sub_81221EC() == 0 && FuncIsActiveTask(sub_81C20F0) == 0)
diff --git a/src/region_map.c b/src/region_map.c
index 8c8f64df9..a91119420 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -1332,9 +1332,9 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
             gRegionMap->cursorSprite->pos1.x = 8 * gRegionMap->cursorPosX + 4;
             gRegionMap->cursorSprite->pos1.y = 8 * gRegionMap->cursorPosY + 4;
         }
-        gRegionMap->cursorSprite->data1 = 2;
-        gRegionMap->cursorSprite->data2 = (IndexOfSpritePaletteTag(paletteTag) << 4) + 0x101;
-        gRegionMap->cursorSprite->data3 = TRUE;
+        gRegionMap->cursorSprite->data[1] = 2;
+        gRegionMap->cursorSprite->data[2] = (IndexOfSpritePaletteTag(paletteTag) << 4) + 0x101;
+        gRegionMap->cursorSprite->data[3] = TRUE;
     }
 }
 
@@ -1350,12 +1350,12 @@ static void FreeRegionMapCursorSprite(void)
 
 void sub_8124268(void)
 {
-    gRegionMap->cursorSprite->data3 = TRUE;
+    gRegionMap->cursorSprite->data[3] = TRUE;
 }
 
 void sub_8124278(void)
 {
-    gRegionMap->cursorSprite->data3 = FALSE;
+    gRegionMap->cursorSprite->data[3] = FALSE;
 }
 
 void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
@@ -1429,17 +1429,17 @@ static void RegionMapPlayerIconSpriteCallback_Zoomed(struct Sprite *sprite)
 {
     sprite->pos2.x = -2 * gRegionMap->scrollX;
     sprite->pos2.y = -2 * gRegionMap->scrollY;
-    sprite->data0 = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
-    sprite->data1 = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
-    if (sprite->data0 < -8 || sprite->data0 > 0xa8 || sprite->data1 < -8 || sprite->data1 > 0xf8)
+    sprite->data[0] = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+    sprite->data[1] = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
+    if (sprite->data[0] < -8 || sprite->data[0] > 0xa8 || sprite->data[1] < -8 || sprite->data[1] > 0xf8)
     {
-        sprite->data2 = FALSE;
+        sprite->data[2] = FALSE;
     }
     else
     {
-        sprite->data2 = TRUE;
+        sprite->data[2] = TRUE;
     }
-    if (sprite->data2 == TRUE)
+    if (sprite->data[2] == TRUE)
     {
         RegionMapPlayerIconSpriteCallback(sprite);
     }
@@ -1458,9 +1458,9 @@ static void RegionMapPlayerIconSpriteCallback(struct Sprite *sprite)
 {
     if (gRegionMap->blinkPlayerIcon)
     {
-        if (++sprite->data7 > 16)
+        if (++sprite->data[7] > 16)
         {
-            sprite->data7 = 0;
+            sprite->data[7] = 0;
             sprite->invisible = sprite->invisible ? FALSE : TRUE;
         }
     }
@@ -1790,7 +1790,7 @@ static void sub_8124AD4(void)
                 shape += 3;
             }
             StartSpriteAnim(&gSprites[spriteId], shape);
-            gSprites[spriteId].data0 = i;
+            gSprites[spriteId].data[0] = i;
         }
         canFlyFlag++;
     }
@@ -1820,7 +1820,7 @@ static void sub_8124BE4(void)
                 gSprites[spriteId].oam.size = 1;
                 gSprites[spriteId].callback = sub_8124CBC;
                 StartSpriteAnim(&gSprites[spriteId], 6);
-                gSprites[spriteId].data0 = mapSecId;
+                gSprites[spriteId].data[0] = mapSecId;
             }
         }
     }
@@ -1828,17 +1828,17 @@ static void sub_8124BE4(void)
 
 static void sub_8124CBC(struct Sprite *sprite)
 {
-    if (gUnknown_0203A148->regionMap.mapSecId == sprite->data0)
+    if (gUnknown_0203A148->regionMap.mapSecId == sprite->data[0])
     {
-        if (++sprite->data1 > 16)
+        if (++sprite->data[1] > 16)
         {
-            sprite->data1 = 0;
+            sprite->data[1] = 0;
             sprite->invisible = sprite->invisible ? FALSE : TRUE;
         }
     }
     else
     {
-        sprite->data1 = 16;
+        sprite->data[1] = 16;
         sprite->invisible = FALSE;
     }
 }
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 962ea0f6e..4ad1971fd 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -263,8 +263,8 @@ static void CreateBankSprite(u8 bank)
             gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankPosition(bank, 2), posY, sub_80A82E4(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBankSpriteIds[bank]].data0 = bank;
-            gSprites[gBankSpriteIds[bank]].data2 = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+            gSprites[gBankSpriteIds[bank]].data[0] = bank;
+            gSprites[gBankSpriteIds[bank]].data[2] = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
 
             StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
             if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_CASTFORM)
@@ -278,7 +278,7 @@ static void CreateBankSprite(u8 bank)
                                                  sub_80A82E4(0));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBankSpriteIds[bank]].data0 = bank;
+            gSprites[gBankSpriteIds[bank]].data[0] = bank;
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
         {
@@ -288,7 +288,7 @@ static void CreateBankSprite(u8 bank)
                                                  sub_80A82E4(0));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBankSpriteIds[bank]].data0 = bank;
+            gSprites[gBankSpriteIds[bank]].data[0] = bank;
         }
         else
         {
@@ -299,8 +299,8 @@ static void CreateBankSprite(u8 bank)
             gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankPosition(bank, 2), posY, sub_80A82E4(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBankSpriteIds[bank]].data0 = bank;
-            gSprites[gBankSpriteIds[bank]].data2 = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+            gSprites[gBankSpriteIds[bank]].data[0] = bank;
+            gSprites[gBankSpriteIds[bank]].data[2] = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
 
             StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
             if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_CASTFORM)
diff --git a/src/sprite.c b/src/sprite.c
index daa019019..9db61d2e9 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -168,14 +168,7 @@ static const struct Sprite sDummySprite =
     .animPaused = 0,
     .affineAnimPaused = 0,
     .animLoopCounter = 0,
-    .data0 = 0,
-    .data1 = 0,
-    .data2 = 0,
-    .data3 = 0,
-    .data4 = 0,
-    .data5 = 0,
-    .data6 = 0,
-    .data7 = 0,
+    .data = {0, 0, 0, 0, 0, 0, 0},
     .inUse = 0,
     .coordOffsetEnabled = 0,
     .invisible = 0,
@@ -1075,7 +1068,7 @@ void BeginAffineAnim(struct Sprite *sprite)
         ApplyAffineAnimFrame(matrixNum, &frameCmd);
         sAffineAnimStates[matrixNum].delayCounter = frameCmd.duration;
         if (sprite->flags_f)
-            obj_update_pos2(sprite, sprite->data6, sprite->data7);
+            obj_update_pos2(sprite, sprite->data[6], sprite->data[7]);
     }
 }
 
@@ -1101,7 +1094,7 @@ void ContinueAffineAnim(struct Sprite *sprite)
             sAffineAnimCmdFuncs[funcIndex](matrixNum, sprite);
         }
         if (sprite->flags_f)
-            obj_update_pos2(sprite, sprite->data6, sprite->data7);
+            obj_update_pos2(sprite, sprite->data[6], sprite->data[7]);
     }
 }
 
@@ -1197,8 +1190,8 @@ u8 GetSpriteMatrixNum(struct Sprite *sprite)
 
 void sub_8007E18(struct Sprite* sprite, s16 a2, s16 a3)
 {
-    sprite->data6 = a2;
-    sprite->data7 = a3;
+    sprite->data[6] = a2;
+    sprite->data[7] = a3;
     sprite->flags_f = 1;
 }
 
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 8cf3cfefa..6be362caf 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -170,20 +170,20 @@ void CB2_ChooseStarter(void)
 
     // Create hand sprite
     spriteId = CreateSprite(&sSpriteTemplate_Hand, 120, 56, 2);
-    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data[0] = taskId;
 
     // Create three Pokeball sprites
     spriteId = CreateSprite(&sSpriteTemplate_PokeBall, sPokeballCoords[0][0], sPokeballCoords[0][1], 2);
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = 0;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = 0;
 
     spriteId = CreateSprite(&sSpriteTemplate_PokeBall, sPokeballCoords[1][0], sPokeballCoords[1][1], 2);
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = 1;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = 1;
 
     spriteId = CreateSprite(&sSpriteTemplate_PokeBall, sPokeballCoords[2][0], sPokeballCoords[2][1], 2);
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = 2;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = 2;
 
     sStarterChooseWindowId = 0xFF;
 }
@@ -363,15 +363,15 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
 
 static void sub_81346DC(struct Sprite *sprite)
 {
-    sprite->pos1.x = gUnknown_085B1E28[gTasks[sprite->data0].tStarterSelection][0];
-    sprite->pos1.y = gUnknown_085B1E28[gTasks[sprite->data0].tStarterSelection][1];
-    sprite->pos2.y = Sin(sprite->data1, 8);
-    sprite->data1 = (u8)(sprite->data1) + 4;
+    sprite->pos1.x = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][0];
+    sprite->pos1.y = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][1];
+    sprite->pos2.y = Sin(sprite->data[1], 8);
+    sprite->data[1] = (u8)(sprite->data[1]) + 4;
 }
 
 static void sub_813473C(struct Sprite *sprite)
 {
-    if (gTasks[sprite->data0].tStarterSelection == sprite->data1)
+    if (gTasks[sprite->data[0]].tStarterSelection == sprite->data[1])
         StartSpriteAnimIfDifferent(sprite, 1);
     else
         StartSpriteAnimIfDifferent(sprite, 0);
-- 
cgit v1.2.3


From e10aea9a5196f916ca6d56617b2d74a00f0a68d4 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 2 Dec 2017 23:31:58 +0100
Subject: give some more labels to battle struct fields

---
 src/battle_2.c               | 14 +++++++-------
 src/battle_script_commands.c | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 9bb41461d..328eacd85 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -160,7 +160,7 @@ extern const u8 gStatStageRatios[][2];
 extern const u8 * const gBattleScriptsForMoveEffects[];
 extern const u8 * const gBattlescriptsForBallThrow[];
 extern const u8 * const gBattlescriptsForRunningByItem[];
-extern const u8 * const gUnknown_082DBD3C[];
+extern const u8 * const gBattlescriptsForUsingItem[];
 extern const u8 * const gBattlescriptsForSafariActions[];
 
 // strings
@@ -4692,7 +4692,7 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
     gBattleMainFunc = RunTurnActionsFunctions;
     gBattleCommunication[3] = 0;
     gBattleCommunication[4] = 0;
-    gBattleScripting.field_16 = 0;
+    gBattleScripting.multihitMoveEffect = 0;
     gBattleResources->battleScriptsStack->size = 0;
 }
 
@@ -4701,7 +4701,7 @@ static void RunTurnActionsFunctions(void)
     if (gBattleOutcome != 0)
         gCurrentActionFuncId = 12;
 
-    *(&gBattleStruct->field_4B) = gCurrentTurnActionNumber;
+    *(&gBattleStruct->savedTurnActionNumber) = gCurrentTurnActionNumber;
     sTurnActionsFuncsTable[gCurrentActionFuncId]();
 
     if (gCurrentTurnActionNumber >= gNoOfAllBanks) // everyone did their actions, turn finished
@@ -4711,7 +4711,7 @@ static void RunTurnActionsFunctions(void)
     }
     else
     {
-        if (gBattleStruct->field_4B != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another bank
+        if (gBattleStruct->savedTurnActionNumber != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another bank
         {
             gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
             gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
@@ -5276,7 +5276,7 @@ static void HandleAction_UseItem(void)
     }
     else if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
     {
-        gBattlescriptCurrInstr = gUnknown_082DBD3C[0];
+        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[0];
     }
     else
     {
@@ -5332,7 +5332,7 @@ static void HandleAction_UseItem(void)
             break;
         }
 
-        gBattlescriptCurrInstr = gUnknown_082DBD3C[*(gBattleStruct->AI_itemType + gBankAttacker / 2)];
+        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[*(gBattleStruct->AI_itemType + gBankAttacker / 2)];
     }
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
@@ -5607,6 +5607,6 @@ static void HandleAction_ActionFinished(void)
     gBattleScripting.atk49_state = 0;
     gBattleCommunication[3] = 0;
     gBattleCommunication[4] = 0;
-    gBattleScripting.field_16 = 0;
+    gBattleScripting.multihitMoveEffect = 0;
     gBattleResources->battleScriptsStack->size = 0;
 }
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 54811a90d..60b08d2c2 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -3040,7 +3040,7 @@ static void atk15_seteffectwithchance(void)
     }
 
     gBattleCommunication[MOVE_EFFECT_BYTE] = 0;
-    gBattleScripting.field_16 = 0;
+    gBattleScripting.multihitMoveEffect = 0;
 }
 
 static void atk16_seteffectprimary(void)
@@ -3064,7 +3064,7 @@ static void atk18_clearstatusfromeffect(void)
 
     gBattleCommunication[MOVE_EFFECT_BYTE] = 0;
     gBattlescriptCurrInstr += 2;
-    gBattleScripting.field_16 = 0;
+    gBattleScripting.multihitMoveEffect = 0;
 }
 
 static void atk19_tryfaintmon(void)
@@ -3221,7 +3221,7 @@ static void atk1E_jumpifability(void)
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jumpPtr;
             RecordAbilityBattle(bank - 1, gLastUsedAbility);
-            gBattleScripting.field_15 = bank - 1;
+            gBattleScripting.bankWithAbility = bank - 1;
         }
         else
             gBattlescriptCurrInstr += 7;
@@ -3234,7 +3234,7 @@ static void atk1E_jumpifability(void)
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jumpPtr;
             RecordAbilityBattle(bank - 1, gLastUsedAbility);
-            gBattleScripting.field_15 = bank - 1;
+            gBattleScripting.bankWithAbility = bank - 1;
         }
         else
             gBattlescriptCurrInstr += 7;
@@ -3247,7 +3247,7 @@ static void atk1E_jumpifability(void)
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jumpPtr;
             RecordAbilityBattle(bank, gLastUsedAbility);
-            gBattleScripting.field_15 = bank;
+            gBattleScripting.bankWithAbility = bank;
         }
         else
             gBattlescriptCurrInstr += 7;
-- 
cgit v1.2.3


From 790df7159ec26194a71ed57216de27358999a061 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 3 Dec 2017 00:47:21 +0100
Subject: more battlescript labels

---
 src/battle_2.c       | 20 ++++++++++----------
 src/battle_message.c |  4 ++--
 src/battle_util.c    | 10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 328eacd85..ad1c8a179 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -2872,7 +2872,7 @@ void SwitchInClearSetData(void)
              && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
              && (gDisableStructs[i].bankWithSureHit == gActiveBank))
             {
-                gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
+                gStatuses3[i] &= ~(STATUS3_ALWAYS_HITS);
                 gStatuses3[i] |= 0x10;
             }
         }
@@ -4729,7 +4729,7 @@ static void HandleEndTurn_BattleWon(void)
         gBattleTextBuff1[0] = gBattleOutcome;
         gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
         gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
-        gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+        gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
             && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER))
@@ -4785,16 +4785,16 @@ static void HandleEndTurn_BattleLost(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
         {
-            if (gBattleOutcome & BATTLE_OUTCOME_BIT_x80)
+            if (gBattleOutcome & OUTCOME_LINK_BATTLE_RUN)
             {
-                gBattlescriptCurrInstr = BattleScript_82DB9C8;
-                gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+                gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle;
+                gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
                 gSaveBlock2Ptr->field_CA9_b = 1;
             }
             else
             {
                 gBattlescriptCurrInstr = BattleScript_82DAA0B;
-                gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+                gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
             }
         }
         else
@@ -4802,7 +4802,7 @@ static void HandleEndTurn_BattleLost(void)
             gBattleTextBuff1[0] = gBattleOutcome;
             gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
             gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
-            gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
+            gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
         }
     }
     else
@@ -4819,13 +4819,13 @@ static void HandleEndTurn_RanFromBattle(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
-        gBattlescriptCurrInstr = BattleScript_82DB9C1;
+        gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
         gBattleOutcome = BATTLE_FORFEITED;
         gSaveBlock2Ptr->field_CA9_b = 1;
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
     {
-        gBattlescriptCurrInstr = BattleScript_82DB9C1;
+        gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
         gBattleOutcome = BATTLE_FORFEITED;
     }
     else
@@ -5439,7 +5439,7 @@ static void HandleAction_Run(void)
             }
         }
 
-        gBattleOutcome |= BATTLE_OUTCOME_BIT_x80;
+        gBattleOutcome |= OUTCOME_LINK_BATTLE_RUN;
         gSaveBlock2Ptr->field_CA9_b = 1;
     }
     else
diff --git a/src/battle_message.c b/src/battle_message.c
index 77f7cc722..cf5a55140 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1632,9 +1632,9 @@ void BufferStringBattle(u16 stringID)
         stringPtr = gText_AttackerUsedX;
         break;
     case STRINGID_BATTLEEND: // battle end
-        if (gBattleTextBuff1[0] & BATTLE_OUTCOME_BIT_x80)
+        if (gBattleTextBuff1[0] & OUTCOME_LINK_BATTLE_RUN)
         {
-            gBattleTextBuff1[0] &= ~(BATTLE_OUTCOME_BIT_x80);
+            gBattleTextBuff1[0] &= ~(OUTCOME_LINK_BATTLE_RUN);
             if (GetBankSide(gActiveBank) == SIDE_OPPONENT && gBattleTextBuff1[0] != BATTLE_DREW)
                 gBattleTextBuff1[0] ^= (BATTLE_LOST | BATTLE_WON);
 
diff --git a/src/battle_util.c b/src/battle_util.c
index c08833858..b4268673c 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -364,7 +364,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DAE2A;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingDisabledMoveInPalace;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -379,7 +379,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         CancelMultiTurnMoves(gActiveBank);
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DB098;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingTormentedMoveInPalace;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -394,7 +394,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DB0AF;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingNotAllowedMoveTauntInPalace;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -409,7 +409,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_82DB185;
+            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingImprisionedMoveInPalace;
             gProtectStructs[gActiveBank].flag_x10 = 1;
         }
         else
@@ -1313,7 +1313,7 @@ void TryClearRageStatuses(void)
 u8 AtkCanceller_UnableToUseMove(void)
 {
     u8 effect = 0;
-    s32* bideDmg = &gBattleScripting.bideDmg;
+    s32 *bideDmg = &gBattleScripting.bideDmg;
     do
     {
         switch (gBattleStruct->atkCancellerTracker)
-- 
cgit v1.2.3


From 4faa442d5ab55d2961907661e21538028d7372d8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 3 Dec 2017 19:19:11 +0100
Subject: decompile and label mail

---
 src/battle_2.c  |   4 +-
 src/mail.c      | 302 ++++++++++++++++++++++++++++----------------------------
 src/mail_data.c | 203 +++++++++++++++++++++++++++++++++++++
 3 files changed, 357 insertions(+), 152 deletions(-)
 create mode 100644 src/mail_data.c

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index eead4d7a9..74a8be2f7 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -185,7 +185,7 @@ extern void sub_80356D0(void);
 extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower
 extern void sub_8166188(void); // battle tower, sets link battle mons level but why?
 extern void sub_8165B88(u8* dst, u16 trainerId); // battle tower, gets language
-extern void sub_81DB4DC(u8* dst, u8 arg2); //
+extern void PadNameString(u8* dst, u8 arg2); //
 extern void sub_81B9150(void);
 extern void sub_800AC34(void);
 extern void sub_80B3AF8(u8 taskId); // cable club
@@ -1140,7 +1140,7 @@ static void sub_80379F8(u8 arrayIdPlus)
         gUnknown_02022FF8[i].gender      = GetMonGender(&gPlayerParty[arrayIdPlus + i]);
         StripExtCtrlCodes(gUnknown_02022FF8[i].nickname);
         if (GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE)
-            sub_81DB4DC(gUnknown_02022FF8[i].nickname, 0);
+            PadNameString(gUnknown_02022FF8[i].nickname, 0);
     }
     memcpy(gUnknown_02023058, gUnknown_02022FF8, sizeof(gUnknown_02022FF8));
 }
diff --git a/src/mail.c b/src/mail.c
index dddc06feb..bee0e5e88 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "mail.h"
 #include "main.h"
 #include "overworld.h"
 #include "task.h"
@@ -17,8 +18,43 @@
 #include "species.h"
 #include "malloc.h"
 #include "easy_chat.h"
-#include "mail_data.h"
-#include "mail.h"
+
+extern const u16 gUnknown_08DBE818[];
+extern const u16 gUnknown_08DBE838[];
+extern const u16 gUnknown_08DBE858[];
+extern const u16 gUnknown_08DBE878[];
+extern const u16 gUnknown_08DBE898[];
+extern const u16 gUnknown_08DBE8B8[];
+extern const u16 gUnknown_08DBE8D8[];
+extern const u16 gUnknown_08DBE8F8[];
+extern const u16 gUnknown_08DBE918[];
+extern const u16 gUnknown_08DBE938[];
+extern const u16 gUnknown_08DBE958[];
+extern const u16 gUnknown_08DBE978[];
+extern const u8 gUnknown_08DBE998[];
+extern const u8 gUnknown_08DBFBA4[];
+extern const u8 gUnknown_08DBEB38[];
+extern const u8 gUnknown_08DBFC7C[];
+extern const u8 gUnknown_08DBEC74[];
+extern const u8 gUnknown_08DBFD5C[];
+extern const u8 gUnknown_08DBEE84[];
+extern const u8 gUnknown_08DBFE68[];
+extern const u8 gUnknown_08DBEF5C[];
+extern const u8 gUnknown_08DBFF44[];
+extern const u8 gUnknown_08DBF154[];
+extern const u8 gUnknown_08DC0034[];
+extern const u8 gUnknown_08DBF2D4[];
+extern const u8 gUnknown_08DC0114[];
+extern const u8 gUnknown_08DBF37C[];
+extern const u8 gUnknown_08DC01F4[];
+extern const u8 gUnknown_08DBF50C[];
+extern const u8 gUnknown_08DC0300[];
+extern const u8 gUnknown_08DBF64C[];
+extern const u8 gUnknown_08DC03F0[];
+extern const u8 gUnknown_08DBF7B4[];
+extern const u8 gUnknown_08DC04E8[];
+extern const u8 gUnknown_08DBF904[];
+extern const u8 gUnknown_08DC0600[];
 
 // Static type declarations
 
@@ -50,9 +86,7 @@ struct MailGraphics
     u16 color12;
 };
 
-// Static RAM declarations
-
-static EWRAM_DATA struct
+struct MailRead
 {
     /*0x0000*/ u8 strbuf[8][64];
     /*0x0200*/ u8 playerName[12];
@@ -71,22 +105,26 @@ static EWRAM_DATA struct
     /*0x0228*/ const struct MailLayout *layout;
     /*0x022c*/ u8 bg1TilemapBuffer[0x1000];
     /*0x122c*/ u8 bg2TilemapBuffer[0x1000];
-} *gUnknown_0203A134 = NULL;
+};
+
+// Static RAM declarations
+
+static EWRAM_DATA struct MailRead *sMailRead = NULL;
 
 // Static ROM declarations
 
-void sub_81219F0(void);
-void sub_8121A1C(void);
-void sub_8121B1C(void);
-void sub_8121C50(void);
-void sub_8121C64(void);
-void sub_8121C98(void);
-void sub_8121CC0(void);
-void sub_8121D00(void);
+static void CB2_InitMailRead(void);
+static void sub_8121A1C(void);
+static void sub_8121B1C(void);
+static void VBlankCB_MailRead(void);
+static void CB2_MailRead(void);
+static void CB2_WaitForPaletteExitOnKeyPress(void);
+static void CB2_ExitOnKeyPress(void);
+static void CB2_ExitMailReadFreeVars(void);
 
 // .rodata
 
-const struct BgTemplate gUnknown_0859F290[] = {
+static const struct BgTemplate sUnknown_0859F290[] = {
     {
         .bg = 0,
         .charBaseIndex = 2,
@@ -105,7 +143,7 @@ const struct BgTemplate gUnknown_0859F290[] = {
     }
 };
 
-const struct WindowTemplate gUnknown_0859F29C[] = {
+static const struct WindowTemplate sUnknown_0859F29C[] = {
     {
         .priority = 0,
         .tilemapLeft = 2,
@@ -118,55 +156,18 @@ const struct WindowTemplate gUnknown_0859F29C[] = {
     DUMMY_WIN_TEMPLATE
 };
 
-const u8 gUnknown_0859F2AC[] = {
+static const u8 sUnknown_0859F2AC[] = {
      0,
     10,
     11
 };
 
-const u16 gUnknown_0859F2B0[][2] = {
+static const u16 sUnknown_0859F2B0[][2] = {
     { 0x6ACD, 0x51A5 },
     { 0x45FC, 0x38D4 }
 };
 
-extern const u16 gUnknown_08DBE818[];
-extern const u16 gUnknown_08DBE838[];
-extern const u16 gUnknown_08DBE858[];
-extern const u16 gUnknown_08DBE878[];
-extern const u16 gUnknown_08DBE898[];
-extern const u16 gUnknown_08DBE8B8[];
-extern const u16 gUnknown_08DBE8D8[];
-extern const u16 gUnknown_08DBE8F8[];
-extern const u16 gUnknown_08DBE918[];
-extern const u16 gUnknown_08DBE938[];
-extern const u16 gUnknown_08DBE958[];
-extern const u16 gUnknown_08DBE978[];
-extern const u8 gUnknown_08DBE998[];
-extern const u8 gUnknown_08DBFBA4[];
-extern const u8 gUnknown_08DBEB38[];
-extern const u8 gUnknown_08DBFC7C[];
-extern const u8 gUnknown_08DBEC74[];
-extern const u8 gUnknown_08DBFD5C[];
-extern const u8 gUnknown_08DBEE84[];
-extern const u8 gUnknown_08DBFE68[];
-extern const u8 gUnknown_08DBEF5C[];
-extern const u8 gUnknown_08DBFF44[];
-extern const u8 gUnknown_08DBF154[];
-extern const u8 gUnknown_08DC0034[];
-extern const u8 gUnknown_08DBF2D4[];
-extern const u8 gUnknown_08DC0114[];
-extern const u8 gUnknown_08DBF37C[];
-extern const u8 gUnknown_08DC01F4[];
-extern const u8 gUnknown_08DBF50C[];
-extern const u8 gUnknown_08DC0300[];
-extern const u8 gUnknown_08DBF64C[];
-extern const u8 gUnknown_08DC03F0[];
-extern const u8 gUnknown_08DBF7B4[];
-extern const u8 gUnknown_08DC04E8[];
-extern const u8 gUnknown_08DBF904[];
-extern const u8 gUnknown_08DC0600[];
-
-const struct MailGraphics gUnknown_0859F2B8[] = {
+static const struct MailGraphics sUnknown_0859F2B8[] = {
     {
         gUnknown_08DBE818, gUnknown_08DBE998, gUnknown_08DBFBA4, 0x02c0, 0x0000, 0x294a, 0x6739
     }, {
@@ -194,13 +195,13 @@ const struct MailGraphics gUnknown_0859F2B8[] = {
     }
 };
 
-const struct UnkMailStruct Unknown_0859F3A8[] = {
+static const struct UnkMailStruct Unknown_0859F3A8[] = {
     { .numEasyChatWords = 3, .lineHeight = 16 },
     { .numEasyChatWords = 3, .lineHeight = 16 },
     { .numEasyChatWords = 3, .lineHeight = 16 }
 };
 
-const struct MailLayout gUnknown_0859F3B4[] = {
+static const struct MailLayout sUnknown_0859F3B4[] = {
     { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
     { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
     { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
@@ -215,7 +216,7 @@ const struct MailLayout gUnknown_0859F3B4[] = {
     { 0x03, 0x00, 0x00, 0x02, 0x00, Unknown_0859F3A8 }
 };
 
-const struct UnkMailStruct Unknown_0859F444[] = {
+static const struct UnkMailStruct Unknown_0859F444[] = {
     { .numEasyChatWords = 2, .lineHeight = 16 },
     { .numEasyChatWords = 2, .lineHeight = 16 },
     { .numEasyChatWords = 2, .lineHeight = 16 },
@@ -223,7 +224,7 @@ const struct UnkMailStruct Unknown_0859F444[] = {
     { .numEasyChatWords = 1, .lineHeight = 16 }
 };
 
-const struct MailLayout gUnknown_0859F458[] = {
+static const struct MailLayout sUnknown_0859F458[] = {
     { 0x05, 0x07, 0x58, 0x0b, 0x1e, Unknown_0859F444 },
     { 0x05, 0x0a, 0x60, 0x09, 0x1e, Unknown_0859F444 },
     { 0x05, 0x0c, 0x68, 0x05, 0x1e, Unknown_0859F444 },
@@ -240,23 +241,23 @@ const struct MailLayout gUnknown_0859F458[] = {
 
 // What the heck are these meant to be? Call them u16 for now.
 
-const u16 Unknown_0859F4E8[] = {
+static const u16 Unknown_0859F4E8[] = {
     0x00, 0x4000, 0x00, 0x00
 };
 
-const u16 Unknown_0859F4F0[] = {
+static const u16 Unknown_0859F4F0[] = {
     0x00, 0x00, -1, 0x00
 };
 
-const u16 Unknown_0859F4F8[] = {
+static const u16 Unknown_0859F4F8[] = {
     0x04, 0x00, -1, 0x00
 };
 
-const u16 Unknown_0859F500[] = {
+static const u16 Unknown_0859F500[] = {
     0x00, 0x40, -1, 0x00
 };
 
-const u16 *const gUnknown_0859F508[] = {
+static const u16 *const sUnknown_0859F508[] = {
     Unknown_0859F4F0,
     Unknown_0859F4F8,
     Unknown_0859F500
@@ -264,60 +265,62 @@ const u16 *const gUnknown_0859F508[] = {
 
 // .text
 
-void sub_8121478(struct MailStruct *mail, MainCallback callback, bool8 flag) {
+void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag)
+{
     u16 buffer[2];
     u16 species;
 
-    gUnknown_0203A134 = calloc(1, sizeof(*gUnknown_0203A134));
-    gUnknown_0203A134->language = LANGUAGE_ENGLISH;
-    gUnknown_0203A134->playerIsSender = TRUE;
-    gUnknown_0203A134->parserSingle = CopyEasyChatWord;
-    gUnknown_0203A134->parserMultiple = ConvertEasyChatWordsToString;
-    if (mail->itemId >= ITEM_ORANGE_MAIL && mail->itemId <= ITEM_RETRO_MAIL) {
-        gUnknown_0203A134->mailType = mail->itemId - ITEM_ORANGE_MAIL;
+    sMailRead = calloc(1, sizeof(*sMailRead));
+    sMailRead->language = LANGUAGE_ENGLISH;
+    sMailRead->playerIsSender = TRUE;
+    sMailRead->parserSingle = CopyEasyChatWord;
+    sMailRead->parserMultiple = ConvertEasyChatWordsToString;
+    if (IS_ITEM_MAIL(mail->itemId))
+    {
+        sMailRead->mailType = mail->itemId - ITEM_ORANGE_MAIL;
     }
     else
     {
-        gUnknown_0203A134->mailType = 0;
+        sMailRead->mailType = 0;
         flag = FALSE;
     }
-    switch (gUnknown_0203A134->playerIsSender)
+    switch (sMailRead->playerIsSender)
     {
         case FALSE:
         default:
-            gUnknown_0203A134->layout = &gUnknown_0859F3B4[gUnknown_0203A134->mailType];
+            sMailRead->layout = &sUnknown_0859F3B4[sMailRead->mailType];
             break;
         case TRUE:
-            gUnknown_0203A134->layout = &gUnknown_0859F458[gUnknown_0203A134->mailType];
+            sMailRead->layout = &sUnknown_0859F458[sMailRead->mailType];
             break;
     }
-    species = sub_80D45E8(mail->species, buffer);
+    species = MailSpeciesToSpecies(mail->species, buffer);
     if (species >= SPECIES_BULBASAUR && species < NUM_SPECIES)
     {
-        switch (gUnknown_0203A134->mailType)
+        switch (sMailRead->mailType)
         {
             default:
-                gUnknown_0203A134->animsActive = 0;
+                sMailRead->animsActive = 0;
                 break;
             case ITEM_BEAD_MAIL - ITEM_ORANGE_MAIL:
-                gUnknown_0203A134->animsActive = 1;
+                sMailRead->animsActive = 1;
                 break;
             case ITEM_DREAM_MAIL - ITEM_ORANGE_MAIL:
-                gUnknown_0203A134->animsActive = 2;
+                sMailRead->animsActive = 2;
                 break;
         }
     }
     else
     {
-        gUnknown_0203A134->animsActive = 0;
+        sMailRead->animsActive = 0;
     }
-    gUnknown_0203A134->mail = mail;
-    gUnknown_0203A134->callback = callback;
-    gUnknown_0203A134->flag = flag;
-    SetMainCallback2(sub_81219F0);
+    sMailRead->mail = mail;
+    sMailRead->callback = callback;
+    sMailRead->flag = flag;
+    SetMainCallback2(CB2_InitMailRead);
 }
 
-bool8 sub_81215EC(void)
+static bool8 MailReadBuildGraphics(void)
 {
     u16 icon;
 
@@ -351,21 +354,21 @@ bool8 sub_81215EC(void)
             SetGpuReg(REG_OFFSET_BG2HOFS, 0x0000);
             SetGpuReg(REG_OFFSET_BG3HOFS, 0x0000);
             SetGpuReg(REG_OFFSET_BG3VOFS, 0x0000);
-            SetGpuReg(REG_OFFSET_BLDCNT, 0x0000);
+            SetGpuReg(REG_OFFSET_BLDCNT,  0x0000);
             SetGpuReg(REG_OFFSET_BLDALPHA, 0x0000);
             break;
         case 6:
             ResetBgsAndClearDma3BusyFlags(0);
-            InitBgsFromTemplates(0, gUnknown_0859F290, 3);
-            SetBgTilemapBuffer(1, gUnknown_0203A134->bg1TilemapBuffer);
-            SetBgTilemapBuffer(2, gUnknown_0203A134->bg2TilemapBuffer);
+            InitBgsFromTemplates(0, sUnknown_0859F290, 3);
+            SetBgTilemapBuffer(1, sMailRead->bg1TilemapBuffer);
+            SetBgTilemapBuffer(2, sMailRead->bg2TilemapBuffer);
             break;
         case 7:
-            InitWindows(gUnknown_0859F29C);
+            InitWindows(sUnknown_0859F29C);
             DeactivateAllTextPrinters();
             break;
         case 8:
-            decompress_and_copy_tile_data_to_vram(1, gUnknown_0859F2B8[gUnknown_0203A134->mailType].tiles, 0, 0, 0);
+            decompress_and_copy_tile_data_to_vram(1, sUnknown_0859F2B8[sMailRead->mailType].tiles, 0, 0, 0);
             break;
         case 9:
             if (free_temp_tile_data_buffers_if_possible())
@@ -376,7 +379,7 @@ bool8 sub_81215EC(void)
         case 10:
             FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
             FillBgTilemapBufferRect_Palette0(2, 1, 0, 0, 30, 20);
-            CopyToBgTilemapBuffer(1, gUnknown_0859F2B8[gUnknown_0203A134->mailType].tileMap, 0, 0);
+            CopyToBgTilemapBuffer(1, sUnknown_0859F2B8[sMailRead->mailType].tileMap, 0, 0);
             break;
         case 11:
             CopyBgTilemapBufferToVram(0);
@@ -385,24 +388,24 @@ bool8 sub_81215EC(void)
             break;
         case 12:
             LoadPalette(GetOverworldTextboxPalettePtr(), 240, 32);
-            gPlttBufferUnfaded[250] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color10;
-            gPlttBufferFaded[250] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color10;
-            gPlttBufferUnfaded[251] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color12;
-            gPlttBufferFaded[251] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color12;
-            LoadPalette(gUnknown_0859F2B8[gUnknown_0203A134->mailType].palette, 0, 32);
-            gPlttBufferUnfaded[10] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0];
-            gPlttBufferFaded[10] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0];
-            gPlttBufferUnfaded[11] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1];
-            gPlttBufferFaded[11] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1];
+            gPlttBufferUnfaded[250] = sUnknown_0859F2B8[sMailRead->mailType].color10;
+            gPlttBufferFaded[250] = sUnknown_0859F2B8[sMailRead->mailType].color10;
+            gPlttBufferUnfaded[251] = sUnknown_0859F2B8[sMailRead->mailType].color12;
+            gPlttBufferFaded[251] = sUnknown_0859F2B8[sMailRead->mailType].color12;
+            LoadPalette(sUnknown_0859F2B8[sMailRead->mailType].palette, 0, 32);
+            gPlttBufferUnfaded[10] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0];
+            gPlttBufferFaded[10] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0];
+            gPlttBufferUnfaded[11] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1];
+            gPlttBufferFaded[11] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1];
             break;
         case 13:
-            if (gUnknown_0203A134->flag)
+            if (sMailRead->flag)
             {
                 sub_8121A1C();
             }
             break;
         case 14:
-            if (gUnknown_0203A134->flag)
+            if (sMailRead->flag)
             {
                 sub_8121B1C();
                 RunTextPrinters();
@@ -415,20 +418,20 @@ bool8 sub_81215EC(void)
             }
             break;
         case 16:
-            SetVBlankCallback(sub_8121C50);
+            SetVBlankCallback(VBlankCB_MailRead);
             gPaletteFade.bufferTransferDisabled = TRUE;
             break;
         case 17:
-            icon = sub_80D2E84(gUnknown_0203A134->mail->species);
-            switch (gUnknown_0203A134->animsActive)
+            icon = sub_80D2E84(sMailRead->mail->species);
+            switch (sMailRead->animsActive)
             {
                 case 1:
                     sub_80D2F68(icon);
-                    gUnknown_0203A134->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x60, 0x80, 0, 0);
+                    sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x60, 0x80, 0, 0);
                     break;
                 case 2:
                     sub_80D2F68(icon);
-                    gUnknown_0203A134->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x28, 0x80, 0, 0);
+                    sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x28, 0x80, 0, 0);
                     break;
             }
             break;
@@ -439,53 +442,53 @@ bool8 sub_81215EC(void)
             ShowBg(2);
             BeginNormalPaletteFade(-1, 0, 16, 0, 0);
             gPaletteFade.bufferTransferDisabled = FALSE;
-            gUnknown_0203A134->callback2 = sub_8121C98;
+            sMailRead->callback2 = CB2_WaitForPaletteExitOnKeyPress;
             return TRUE;
         default:
             return FALSE;
     }
-    gMain.state ++;
+    gMain.state++;
     return FALSE;
 }
 
-void sub_81219F0(void)
+static void CB2_InitMailRead(void)
 {
     do
     {
-        if (sub_81215EC() == TRUE)
+        if (MailReadBuildGraphics() == TRUE)
         {
-            SetMainCallback2(sub_8121C64);
+            SetMainCallback2(CB2_MailRead);
             break;
         }
     } while (sub_81221AC() != TRUE);
 }
 
-void sub_8121A1C(void)
+static void sub_8121A1C(void)
 {
     u16 i;
     u8 total;
     u8 *ptr;
 
     total = 0;
-    for (i = 0; i < gUnknown_0203A134->layout->numSubStructs; i ++)
+    for (i = 0; i < sMailRead->layout->numSubStructs; i ++)
     {
-        ConvertEasyChatWordsToString(gUnknown_0203A134->strbuf[i], &gUnknown_0203A134->mail->words[total], gUnknown_0203A134->layout->var8[i].numEasyChatWords, 1);
-        total += gUnknown_0203A134->layout->var8[i].numEasyChatWords;
+        ConvertEasyChatWordsToString(sMailRead->strbuf[i], &sMailRead->mail->words[total], sMailRead->layout->var8[i].numEasyChatWords, 1);
+        total += sMailRead->layout->var8[i].numEasyChatWords;
     }
-    ptr = StringCopy(gUnknown_0203A134->playerName, gUnknown_0203A134->mail->playerName);
-    if (!gUnknown_0203A134->playerIsSender)
+    ptr = StringCopy(sMailRead->playerName, sMailRead->mail->playerName);
+    if (!sMailRead->playerIsSender)
     {
         StringCopy(ptr, gText_FromSpace);
-        gUnknown_0203A134->signatureWidth = gUnknown_0203A134->layout->signatureWidth - (StringLength(gUnknown_0203A134->playerName) * 8 - 0x60);
+        sMailRead->signatureWidth = sMailRead->layout->signatureWidth - (StringLength(sMailRead->playerName) * 8 - 0x60);
     }
     else
     {
-        sub_81DB52C(gUnknown_0203A134->playerName);
-        gUnknown_0203A134->signatureWidth = gUnknown_0203A134->layout->signatureWidth;
+        sub_81DB52C(sMailRead->playerName);
+        sMailRead->signatureWidth = sMailRead->layout->signatureWidth;
     }
 }
 
-void sub_8121B1C(void)
+static void sub_8121B1C(void)
 {
     u16 i;
     u8 strbuf[0x20];
@@ -499,77 +502,76 @@ void sub_8121B1C(void)
     PutWindowTilemap(1);
     FillWindowPixelBuffer(0, 0);
     FillWindowPixelBuffer(1, 0);
-    for (i = 0; i < gUnknown_0203A134->layout->numSubStructs; i ++)
+    for (i = 0; i < sMailRead->layout->numSubStructs; i ++)
     {
-        if (gUnknown_0203A134->strbuf[i][0] == EOS || gUnknown_0203A134->strbuf[i][0] == CHAR_SPACE)
+        if (sMailRead->strbuf[i][0] == EOS || sMailRead->strbuf[i][0] == CHAR_SPACE)
         {
             continue;
         }
-        box_print(0, 1, gUnknown_0203A134->layout->var8[i].xOffset + gUnknown_0203A134->layout->wordsYPos, y + gUnknown_0203A134->layout->wordsXPos, gUnknown_0859F2AC, 0, gUnknown_0203A134->strbuf[i]);
-        y += gUnknown_0203A134->layout->var8[i].lineHeight;
+        box_print(0, 1, sMailRead->layout->var8[i].xOffset + sMailRead->layout->wordsYPos, y + sMailRead->layout->wordsXPos, sUnknown_0859F2AC, 0, sMailRead->strbuf[i]);
+        y += sMailRead->layout->var8[i].lineHeight;
     }
     bufptr = StringCopy(strbuf, gText_FromSpace);
-    StringCopy(bufptr, gUnknown_0203A134->playerName);
-    box_x = GetStringCenterAlignXOffset(1, strbuf, gUnknown_0203A134->signatureWidth) + 0x68;
-    box_y = gUnknown_0203A134->layout->signatureYPos + 0x58;
-    box_print(0, 1, box_x, box_y, gUnknown_0859F2AC, 0, strbuf);
+    StringCopy(bufptr, sMailRead->playerName);
+    box_x = GetStringCenterAlignXOffset(1, strbuf, sMailRead->signatureWidth) + 0x68;
+    box_y = sMailRead->layout->signatureYPos + 0x58;
+    box_print(0, 1, box_x, box_y, sUnknown_0859F2AC, 0, strbuf);
     CopyWindowToVram(0, 3);
     CopyWindowToVram(1, 3);
 }
 
-void sub_8121C50(void)
+static void VBlankCB_MailRead(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void sub_8121C64(void)
+static void CB2_MailRead(void)
 {
-    if (gUnknown_0203A134->animsActive != 0)
+    if (sMailRead->animsActive != 0)
     {
         AnimateSprites();
         BuildOamBuffer();
     }
-    gUnknown_0203A134->callback2();
+    sMailRead->callback2();
 }
 
-void sub_8121C98(void)
+static void CB2_WaitForPaletteExitOnKeyPress(void)
 {
     if (!UpdatePaletteFade())
     {
-        gUnknown_0203A134->callback2 = sub_8121CC0;
+        sMailRead->callback2 = CB2_ExitOnKeyPress;
     }
 }
 
-void sub_8121CC0(void)
+static void CB2_ExitOnKeyPress(void)
 {
     if (gMain.newKeys & (A_BUTTON | B_BUTTON))
     {
         BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-        gUnknown_0203A134->callback2 = sub_8121D00;
+        sMailRead->callback2 = CB2_ExitMailReadFreeVars;
     }
 }
 
-void sub_8121D00(void)
+static void CB2_ExitMailReadFreeVars(void)
 {
     if (!UpdatePaletteFade())
     {
-        SetMainCallback2(gUnknown_0203A134->callback);
-        switch (gUnknown_0203A134->animsActive)
+        SetMainCallback2(sMailRead->callback);
+        switch (sMailRead->animsActive)
         {
             case 1:
             case 2:
-                sub_80D2FF0(sub_80D2E84(gUnknown_0203A134->mail->species));
-                sub_80D2EF8(&gSprites[gUnknown_0203A134->monIconSprite]);
+                sub_80D2FF0(sub_80D2E84(sMailRead->mail->species));
+                sub_80D2EF8(&gSprites[sMailRead->monIconSprite]);
         }
-        memset(gUnknown_0203A134, 0, sizeof(*gUnknown_0203A134));
+        memset(sMailRead, 0, sizeof(*sMailRead));
         ResetPaletteFade();
         UnsetBgTilemapBuffer(0);
         UnsetBgTilemapBuffer(1);
         ResetBgsAndClearDma3BusyFlags(0);
         FreeAllWindowBuffers();
-        free(gUnknown_0203A134);
-        gUnknown_0203A134 = NULL;
+        FREE_AND_SET_NULL(sMailRead);
     }
 }
diff --git a/src/mail_data.c b/src/mail_data.c
new file mode 100644
index 000000000..55ae96e4a
--- /dev/null
+++ b/src/mail_data.c
@@ -0,0 +1,203 @@
+#include "global.h"
+#include "mail.h"
+#include "items.h"
+#include "pokemon.h"
+#include "pokemon_icon.h"
+#include "species.h"
+#include "text.h"
+#include "international_string_util.h"
+
+void ClearMailData(void)
+{
+    u8 i;
+
+    for (i = 0; i < MAIL_COUNT; i++)
+        ClearMailStruct(&gSaveBlock1Ptr->mail[i]);
+}
+
+void ClearMailStruct(struct MailStruct *mail)
+{
+    s32 i;
+
+    for (i = 0; i < MAIL_WORDS_COUNT; i++)
+        mail->words[i] = 0xFFFF;
+
+    for (i = 0; i < PLAYER_NAME_LENGTH; i++)
+        mail->playerName[i] = EOS;
+
+    for (i = 0; i < 4; i++)
+        mail->trainerId[i] = 0;
+
+    mail->species = SPECIES_BULBASAUR;
+    mail->itemId = ITEM_NONE;
+}
+
+bool8 MonHasMail(struct Pokemon *mon)
+{
+    u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM);
+    if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
+{
+    u8 heldItem[2];
+    u8 id, i;
+    u16 species;
+    u32 personality;
+
+    heldItem[0] = itemId;
+    heldItem[1] = itemId >> 8;
+
+    for (id = 0; id < PARTY_SIZE; id++)
+    {
+        if (gSaveBlock1Ptr->mail[id].itemId == 0)
+        {
+            for (i = 0; i < MAIL_WORDS_COUNT; i++)
+                gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF;
+
+            for (i = 0; i < PLAYER_NAME_LENGTH - 1; i++)
+                gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i];
+            gSaveBlock1Ptr->mail[id].playerName[i] = EOS;
+            PadNameString(gSaveBlock1Ptr->mail[id].playerName, CHAR_SPACE);
+
+            for (i = 0; i < 4; i++)
+                gSaveBlock1Ptr->mail[id].trainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
+
+            species = GetBoxMonData(&mon->box, MON_DATA_SPECIES);
+            personality = GetBoxMonData(&mon->box, MON_DATA_PERSONALITY);
+            gSaveBlock1Ptr->mail[id].species = SpeciesToMailSpecies(species, personality);
+            gSaveBlock1Ptr->mail[id].itemId = itemId;
+            SetMonData(mon, MON_DATA_MAIL, &id);
+            SetMonData(mon, MON_DATA_HELD_ITEM, heldItem);
+            return id;
+        }
+    }
+
+    return 0xFF;
+}
+
+u16 SpeciesToMailSpecies(u16 species, u32 personality)
+{
+    if (species == SPECIES_UNOWN)
+    {
+        u32 species = GetUnownLetterByPersonality(personality) + 30000;
+        return species;
+    }
+
+    return species;
+}
+
+u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *buffer)
+{
+    u16 result;
+
+    if (mailSpecies >= 30000 && mailSpecies < (30000 + UNOWN_FORM_COUNT))
+    {
+        result = SPECIES_UNOWN;
+        *buffer = mailSpecies - 30000;
+    }
+    else
+    {
+        result = mailSpecies;
+    }
+
+    return result;
+}
+
+u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail)
+{
+    u8 heldItem[2];
+    u16 itemId = mail->itemId;
+    u8 mailId = GiveMailToMon(mon, itemId);
+
+    if (mailId == 0xFF)
+        return 0xFF;
+
+    gSaveBlock1Ptr->mail[mailId] = *mail;
+
+    SetMonData(mon, MON_DATA_MAIL, &mailId);
+
+    heldItem[0] = itemId;
+    heldItem[1] = itemId >> 8;
+
+    SetMonData(mon, MON_DATA_HELD_ITEM, heldItem);
+
+    return mailId;
+}
+
+static bool32 DummyMailFunc(void)
+{
+    return FALSE;
+}
+
+void TakeMailFromMon(struct Pokemon *mon)
+{
+    u8 heldItem[2];
+    u8 mailId;
+
+    if (MonHasMail(mon))
+    {
+        mailId = GetMonData(mon, MON_DATA_MAIL);
+        gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE;
+        mailId = 0xFF;
+        heldItem[0] = ITEM_NONE;
+        heldItem[1] = ITEM_NONE << 8;
+        SetMonData(mon, MON_DATA_MAIL, &mailId);
+        SetMonData(mon, MON_DATA_HELD_ITEM, heldItem);
+    }
+}
+
+void ClearMailItemId(u8 mailId)
+{
+    gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE;
+}
+
+u8 TakeMailFromMon2(struct Pokemon *mon)
+{
+    u8 i;
+    u8 newHeldItem[2];
+    u8 newMailId;
+
+    newHeldItem[0] = ITEM_NONE;
+    newHeldItem[1] = ITEM_NONE << 8;
+    newMailId = 0xFF;
+
+    for (i = PARTY_SIZE; i < MAIL_COUNT; i++)
+    {
+        if (gSaveBlock1Ptr->mail[i].itemId == ITEM_NONE)
+        {
+            memcpy(&gSaveBlock1Ptr->mail[i], &gSaveBlock1Ptr->mail[GetMonData(mon, MON_DATA_MAIL)], sizeof(struct MailStruct));
+            gSaveBlock1Ptr->mail[GetMonData(mon, MON_DATA_MAIL)].itemId = ITEM_NONE;
+            SetMonData(mon, MON_DATA_MAIL, &newMailId);
+            SetMonData(mon, MON_DATA_HELD_ITEM, newHeldItem);
+            return i;
+        }
+    }
+
+    return 0xFF;
+}
+
+bool8 ItemIsMail(u16 itemId)
+{
+    switch (itemId)
+    {
+    case ITEM_ORANGE_MAIL:
+    case ITEM_HARBOR_MAIL:
+    case ITEM_GLITTER_MAIL:
+    case ITEM_MECH_MAIL:
+    case ITEM_WOOD_MAIL:
+    case ITEM_WAVE_MAIL:
+    case ITEM_BEAD_MAIL:
+    case ITEM_SHADOW_MAIL:
+    case ITEM_TROPIC_MAIL:
+    case ITEM_DREAM_MAIL:
+    case ITEM_FAB_MAIL:
+    case ITEM_RETRO_MAIL:
+        return TRUE;
+    default:
+        return FALSE;
+}
+}
-- 
cgit v1.2.3


From 077089f0e5bd90701fe7ba080e6b25bc67848aed Mon Sep 17 00:00:00 2001
From: EternalCode <dilshan.gunasekera@mail.utoronto.ca>
Date: Sun, 3 Dec 2017 20:46:56 -0500
Subject: fldeff_teleport file completed

---
 src/fldeff_teleport.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 src/fldeff_teleport.c

(limited to 'src')

diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
new file mode 100644
index 000000000..3ca72d787
--- /dev/null
+++ b/src/fldeff_teleport.c
@@ -0,0 +1,54 @@
+#include "global.h"
+#include "field_effect.h"
+#include "task.h"
+
+extern bool8 is_light_level_1_2_3_or_6(u8 mapType);
+extern void* hm_add_c3_launch_phase_2(void);
+extern void hm_teleport_run_dp02scr(void);
+extern void* gUnknown_0203CEEC;
+extern void* gUnknown_03005DB0;
+extern void sub_808469C(void);
+extern u8 GetCursorSelectionMonId(void);
+extern void sub_817C94C(void);
+extern u8 oei_task_add(void);
+extern void FieldEffectActiveListRemove(u8 id);
+extern void sub_80B7FC8(void);
+
+// 817C8BC
+bool8 SetUpFieldMove_Teleport()
+{
+    if (is_light_level_1_2_3_or_6(gMapHeader.mapType) == TRUE)
+    {
+        gUnknown_03005DB0 = hm_add_c3_launch_phase_2;
+        gUnknown_0203CEEC = hm_teleport_run_dp02scr;   
+        return TRUE;
+    } 
+    return FALSE;
+}
+
+// 817C8FC
+void hm_teleport_run_dp02scr()
+{
+    sub_808469C();
+    FieldEffectStart(0x3F);
+    gFieldEffectArguments[0] = (u32)GetCursorSelectionMonId();
+}
+
+extern void SetPlayerAvatarTransitionFlags(u8);
+// 817C91C
+u8 FldEff_UseTeleport()
+{
+    u8 taskID = oei_task_add();
+    gTasks[taskID].data[8] = (u32)sub_817C94C >> 16;
+    gTasks[taskID].data[9] = (u32)sub_817C94C;
+    SetPlayerAvatarTransitionFlags(1);
+    return 0;
+}
+
+void sub_817C94C()
+{
+    FieldEffectActiveListRemove(0x3F);
+    sub_80B7FC8();
+}
+
+
-- 
cgit v1.2.3


From d74c0d053ea4a3ba668f80c7140c8821e487707d Mon Sep 17 00:00:00 2001
From: EternalCode <dilshan.gunasekera@mail.utoronto.ca>
Date: Sun, 3 Dec 2017 20:48:08 -0500
Subject: missed moving an extern to top

---
 src/fldeff_teleport.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 3ca72d787..ea04f52da 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -13,6 +13,8 @@ extern void sub_817C94C(void);
 extern u8 oei_task_add(void);
 extern void FieldEffectActiveListRemove(u8 id);
 extern void sub_80B7FC8(void);
+extern void SetPlayerAvatarTransitionFlags(u8);
+
 
 // 817C8BC
 bool8 SetUpFieldMove_Teleport()
@@ -34,7 +36,6 @@ void hm_teleport_run_dp02scr()
     gFieldEffectArguments[0] = (u32)GetCursorSelectionMonId();
 }
 
-extern void SetPlayerAvatarTransitionFlags(u8);
 // 817C91C
 u8 FldEff_UseTeleport()
 {
-- 
cgit v1.2.3


From ad07843f2dc3df3db53490018eb978ef270062d9 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 4 Dec 2017 23:09:44 +0100
Subject: start working on use pokeblock

---
 src/use_pokeblock.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/use_pokeblock.c

(limited to 'src')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
new file mode 100644
index 000000000..7057b0528
--- /dev/null
+++ b/src/use_pokeblock.c
@@ -0,0 +1,35 @@
+#include "global.h"
+#include "main.h"
+#include "pokeblock.h"
+#include "malloc.h"
+
+struct UsePokeblockSubStruct
+{
+    void *field_0;
+    void (*callback)(void);
+    struct Pokeblock *pokeblock;
+};
+
+struct UsePokeblockStruct1
+{
+    u8 field_0[0x7FD0];
+    struct UsePokeblockSubStruct info;
+};
+
+extern struct UsePokeblockStruct1 *gUnknown_0203BCAC;
+extern struct UsePokeblockSubStruct *gUnknown_0203BC90;
+
+// this file's functions
+void sub_816636C(void *arg0);
+void sub_8166380(void);
+void sub_816631C(void);
+
+void sub_8166204(struct Pokeblock *pokeblock, void (*callback)(void))
+{
+    gUnknown_0203BCAC = AllocZeroed(0x806C);
+    gUnknown_0203BC90 = &gUnknown_0203BCAC->info;
+    gUnknown_0203BC90->pokeblock = pokeblock;
+    gUnknown_0203BC90->callback = callback;
+    sub_816636C(sub_8166380);
+    SetMainCallback2(sub_816631C);
+}
-- 
cgit v1.2.3


From 266dd492a772c6189eaf45a134592c3d319bf857 Mon Sep 17 00:00:00 2001
From: EternalCode <dilshan.gunasekera@mail.utoronto.ca>
Date: Mon, 4 Dec 2017 17:12:05 -0500
Subject: void parameter in function header

---
 src/fldeff_teleport.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index ea04f52da..1730f8355 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -17,7 +17,7 @@ extern void SetPlayerAvatarTransitionFlags(u8);
 
 
 // 817C8BC
-bool8 SetUpFieldMove_Teleport()
+bool8 SetUpFieldMove_Teleport(void)
 {
     if (is_light_level_1_2_3_or_6(gMapHeader.mapType) == TRUE)
     {
@@ -29,7 +29,7 @@ bool8 SetUpFieldMove_Teleport()
 }
 
 // 817C8FC
-void hm_teleport_run_dp02scr()
+void hm_teleport_run_dp02scr(void)
 {
     sub_808469C();
     FieldEffectStart(0x3F);
@@ -37,7 +37,7 @@ void hm_teleport_run_dp02scr()
 }
 
 // 817C91C
-u8 FldEff_UseTeleport()
+u8 FldEff_UseTeleport(void)
 {
     u8 taskID = oei_task_add();
     gTasks[taskID].data[8] = (u32)sub_817C94C >> 16;
@@ -46,7 +46,7 @@ u8 FldEff_UseTeleport()
     return 0;
 }
 
-void sub_817C94C()
+void sub_817C94C(void)
 {
     FieldEffectActiveListRemove(0x3F);
     sub_80B7FC8();
-- 
cgit v1.2.3


From caa13f877797edbb7a1e13bf00b537bafbd4315a Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 5 Dec 2017 11:55:48 -0600
Subject: convert some constants to C headers

---
 src/battle_2.c                   |   8 +--
 src/battle_ai_script_commands.c  |   4 +-
 src/battle_ai_switch_items.c     |   4 +-
 src/battle_controller_opponent.c |   2 +-
 src/battle_controller_player.c   |   2 +-
 src/battle_controller_wally.c    |   2 +-
 src/battle_controllers.c         |   2 +-
 src/battle_message.c             |   2 +-
 src/battle_script_commands.c     |   8 +--
 src/battle_util.c                |   8 +--
 src/battle_util2.c               |   2 +-
 src/berry.c                      |   2 +-
 src/berry_blender.c              |   4 +-
 src/braille_puzzles.c            |   2 +-
 src/calculate_base_damage.c      |   8 +--
 src/daycare.c                    |   2 +-
 src/decoration.c                 |   3 +-
 src/decoration_inventory.c       |   1 +
 src/egg_hatch.c                  |   4 +-
 src/hall_of_fame.c               |   3 +-
 src/heal_location.c              |   4 +-
 src/item.c                       |   2 +-
 src/lilycove_lady.c              |   2 +-
 src/lottery_corner.c             |   2 +-
 src/mail.c                       |   1 +
 src/pokemon_1.c                  |   2 +-
 src/pokemon_3.c                  |   6 +--
 src/pokemon_summary_screen.c     |   2 +-
 src/region_map.c                 | 112 +++++++++++++++++++--------------------
 src/safari_zone.c                |   2 +-
 src/save.c                       |   2 +-
 src/save_location.c              |  83 ++++++++++++++---------------
 src/secret_base.c                |  55 +++++++++----------
 src/tv.c                         |  26 ++++-----
 src/wild_encounter.c             |  21 ++++----
 35 files changed, 201 insertions(+), 194 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index eead4d7a9..48430b0f6 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -15,8 +15,8 @@
 #include "berry.h"
 #include "text.h"
 #include "item.h"
-#include "items.h"
-#include "hold_effects.h"
+#include "constants/items.h"
+#include "constants/hold_effects.h"
 #include "link.h"
 #include "bg.h"
 #include "dma3.h"
@@ -33,10 +33,10 @@
 #include "util.h"
 #include "trig.h"
 #include "battle_ai_script_commands.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
 #include "battle_controllers.h"
 #include "pokedex.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "moves.h"
 #include "trainer_classes.h"
 #include "evolution_scene.h"
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 97226f5c9..0debca274 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -3,10 +3,10 @@
 #include "pokemon.h"
 #include "battle.h"
 #include "species.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "rng.h"
 #include "item.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
 #include "moves.h"
 #include "util.h"
 
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index f5b6c7fe4..af038ba9b 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -1,13 +1,13 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_controllers.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "moves.h"
 #include "pokemon.h"
 #include "species.h"
 #include "rng.h"
 #include "util.h"
-#include "items.h"
+#include "constants/items.h"
 #include "pokemon_item_effects.h"
 
 extern u8 gActiveBank;
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index d69de8c29..97024d12c 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -11,7 +11,7 @@
 #include "util.h"
 #include "main.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "songs.h"
 #include "sound.h"
 #include "moves.h"
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 7ea2abccf..61ca8c45d 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -10,7 +10,7 @@
 #include "util.h"
 #include "main.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "songs.h"
 #include "sound.h"
 #include "moves.h"
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 442e32cca..fef841bca 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -10,7 +10,7 @@
 #include "util.h"
 #include "main.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "songs.h"
 #include "sound.h"
 #include "moves.h"
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 2d373e876..a6e6a1b6d 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -9,7 +9,7 @@
 #include "species.h"
 #include "recorded_battle.h"
 #include "util.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "battle_message.h"
 
 extern u32 gBattleTypeFlags;
diff --git a/src/battle_message.c b/src/battle_message.c
index 77f7cc722..f3df05949 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -5,7 +5,7 @@
 #include "moves.h"
 #include "text.h"
 #include "string_util.h"
-#include "items.h"
+#include "constants/items.h"
 #include "event_data.h"
 #include "link.h"
 #include "item.h"
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index d9b35c053..cf701ba18 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -1,14 +1,14 @@
 #include "global.h"
 #include "battle.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
 #include "battle_message.h"
 #include "battle_ai_script_commands.h"
 #include "battle_scripts.h"
 #include "moves.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "item.h"
-#include "items.h"
-#include "hold_effects.h"
+#include "constants/items.h"
+#include "constants/hold_effects.h"
 #include "util.h"
 #include "pokemon.h"
 #include "calculate_base_damage.h"
diff --git a/src/battle_util.c b/src/battle_util.c
index 5c305a4e4..ed1355eca 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1,14 +1,14 @@
 #include "global.h"
 #include "battle.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "moves.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
 #include "pokemon.h"
 #include "species.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "util.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
 #include "battle_scripts.h"
 #include "rng.h"
 #include "text.h"
diff --git a/src/battle_util2.c b/src/battle_util2.c
index e119c85d7..24904d709 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -4,7 +4,7 @@
 #include "malloc.h"
 #include "pokemon.h"
 #include "event_data.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "rng.h"
 
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
diff --git a/src/berry.c b/src/berry.c
index 0c1553463..8522ca9c7 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -2,7 +2,7 @@
 #include "berry.h"
 #include "main.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "text.h"
 #include "rng.h"
 #include "event_data.h"
diff --git a/src/berry_blender.c b/src/berry_blender.c
index aa333ebaf..22e558479 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1,4 +1,6 @@
 #include "global.h"
+#include "constants/game_stat.h"
+#include "overworld.h"
 #include "berry_blender.h"
 #include "bg.h"
 #include "window.h"
@@ -20,7 +22,7 @@
 #include "item_menu_icons.h"
 #include "berry.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "string_util.h"
 #include "international_string_util.h"
 #include "rng.h"
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 85b2bc509..c3b66f87a 100755
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -6,7 +6,7 @@
 #include "species.h"
 #include "task.h"
 #include "field_effect.h"
-#include "flags.h"
+#include "constants/flags.h"
 
 extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); // fieldmap
 extern void DrawWholeMapView(); // field_camera
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c
index 89770b17a..868bf734a 100644
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@@ -1,14 +1,14 @@
 #include "global.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "battle.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
 #include "event_data.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "pokemon.h"
 #include "species.h"
 #include "moves.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
 
 extern u32 gBattleTypeFlags;
 extern struct BattlePokemon gBattleMons[4];
diff --git a/src/daycare.c b/src/daycare.c
index 8dd45863a..331ec192f 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -3,7 +3,7 @@
 #include "daycare.h"
 #include "string_util.h"
 #include "species.h"
-#include "items.h"
+#include "constants/items.h"
 #include "mail.h"
 #include "pokemon_storage_system.h"
 #include "event_data.h"
diff --git a/src/decoration.c b/src/decoration.c
index 8093825f4..124d6f988 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "constants/decorations.h"
 #include "decompress.h"
 #include "malloc.h"
 #include "text.h"
@@ -32,7 +33,7 @@
 #include "tilesets.h"
 #include "item_icon.h"
 #include "trader.h"
-#include "map_object_constants.h"
+#include "constants/map_objects.h"
 #include "decoration_inventory.h"
 #include "decoration.h"
 #include "graphics.h"
diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c
index 03ab6c00c..308320206 100644
--- a/src/decoration_inventory.c
+++ b/src/decoration_inventory.c
@@ -1,6 +1,7 @@
 
 // Includes
 #include "global.h"
+#include "constants/decorations.h"
 #include "decoration.h"
 #include "decoration_inventory.h"
 
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index d9d77d2e9..1bff57f84 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -2,7 +2,7 @@
 #include "pokemon.h"
 #include "egg_hatch.h"
 #include "pokedex.h"
-#include "items.h"
+#include "constants/items.h"
 #include "script.h"
 #include "decompress.h"
 #include "task.h"
@@ -23,7 +23,7 @@
 #include "bg.h"
 #include "m4a.h"
 #include "window.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "daycare.h"
 #include "battle.h" // to get rid of later
 
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index bc7177bd7..421f24a0e 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -15,7 +15,7 @@
 #include "window.h"
 #include "bg.h"
 #include "species.h"
-#include "game_stat.h"
+#include "constants/game_stat.h"
 #include "blend_palette.h"
 #include "string_util.h"
 #include "m4a.h"
@@ -24,6 +24,7 @@
 #include "trig.h"
 #include "rng.h"
 #include "event_data.h"
+#include "overworld.h"
 
 struct HallofFameMon
 {
diff --git a/src/heal_location.c b/src/heal_location.c
index efc534170..aa90fe1ae 100644
--- a/src/heal_location.c
+++ b/src/heal_location.c
@@ -1,10 +1,10 @@
 
 // Includes
 #include "global.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "heal_location.h"
 
-#define HEAL_LOCATION(map, x, y) {MAP_GROUP_##map, MAP_ID_##map, x, y}
+#define HEAL_LOCATION(map, x, y) {MAP_GROUP(map), MAP_NUM(map), x, y}
 
 // Static type declarations
 
diff --git a/src/item.c b/src/item.c
index 5cf9edf6c..931027e25 100644
--- a/src/item.c
+++ b/src/item.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "string_util.h"
 #include "text.h"
 #include "event_data.h"
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 62171e475..bcb9f86f7 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -11,7 +11,7 @@
 #include "rng.h"
 #include "string_util.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "item_menu.h"
 #include "text.h"
 #include "easy_chat.h"
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index 211b78f19..e8fd234c5 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -2,7 +2,7 @@
 #include "lottery_corner.h"
 #include "event_data.h"
 #include "pokemon.h"
-#include "items.h"
+#include "constants/items.h"
 #include "rng.h"
 #include "species.h"
 #include "string_util.h"
diff --git a/src/mail.c b/src/mail.c
index dddc06feb..f56e05c44 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "constants/items.h"
 #include "main.h"
 #include "overworld.h"
 #include "task.h"
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index f56ade967..1d8246eae 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -2,7 +2,7 @@
 #include "pokemon.h"
 #include "rng.h"
 #include "main.h"
-#include "items.h"
+#include "constants/items.h"
 #include "string_util.h"
 #include "text.h"
 
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 1fafee810..6c7707424 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "pokemon.h"
 #include "main.h"
-#include "items.h"
+#include "constants/items.h"
 #include "string_util.h"
 #include "battle_message.h"
 #include "rtc.h"
@@ -9,7 +9,7 @@
 #include "battle.h"
 #include "species.h"
 #include "link.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
 #include "rng.h"
 #include "trainer_classes.h"
 #include "trainer_ids.h"
@@ -19,7 +19,7 @@
 #include "task.h"
 #include "sprite.h"
 #include "text.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "pokemon_animation.h"
 #include "pokedex.h"
 
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index e9cd3e215..7829ac87c 100755
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -3,7 +3,7 @@
 #include "bg.h"
 #include "decompress.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "link.h"
 #include "m4a.h"
 #include "main.h"
diff --git a/src/region_map.c b/src/region_map.c
index 8c8f64df9..96d780b04 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -7,9 +7,9 @@
 #include "palette.h"
 #include "party_menu.h"
 #include "trig.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "overworld.h"
-#include "flags.h"
+#include "constants/flags.h"
 #include "event_data.h"
 #include "rom6.h"
 #include "secret_base.h"
@@ -242,56 +242,56 @@ static const u16 Unknown_085A1D48[] = INCBIN_U16("graphics/pokenav/fly_target_ic
 static const u8 gUnknown_085A1D68[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
 
 static const u8 gUnknown_085A1E3C[][3] = {
-    {MAP_GROUP_LITTLEROOT_TOWN, MAP_ID_LITTLEROOT_TOWN, 1},
-    {MAP_GROUP_OLDALE_TOWN, MAP_ID_OLDALE_TOWN, 14},
-    {MAP_GROUP_DEWFORD_TOWN, MAP_ID_DEWFORD_TOWN, 15},
-    {MAP_GROUP_LAVARIDGE_TOWN, MAP_ID_LAVARIDGE_TOWN, 16},
-    {MAP_GROUP_FALLARBOR_TOWN, MAP_ID_FALLARBOR_TOWN, 17},
-    {MAP_GROUP_VERDANTURF_TOWN, MAP_ID_VERDANTURF_TOWN, 18},
-    {MAP_GROUP_PACIFIDLOG_TOWN, MAP_ID_PACIFIDLOG_TOWN, 19},
-    {MAP_GROUP_PETALBURG_CITY, MAP_ID_PETALBURG_CITY, 3},
-    {MAP_GROUP_SLATEPORT_CITY, MAP_ID_SLATEPORT_CITY, 4},
-    {MAP_GROUP_MAUVILLE_CITY, MAP_ID_MAUVILLE_CITY, 5},
-    {MAP_GROUP_RUSTBORO_CITY, MAP_ID_RUSTBORO_CITY, 6},
-    {MAP_GROUP_FORTREE_CITY, MAP_ID_FORTREE_CITY, 7},
-    {MAP_GROUP_LILYCOVE_CITY, MAP_ID_LILYCOVE_CITY, 8},
-    {MAP_GROUP_MOSSDEEP_CITY, MAP_ID_MOSSDEEP_CITY, 9},
-    {MAP_GROUP_SOOTOPOLIS_CITY, MAP_ID_SOOTOPOLIS_CITY, 10},
-    {MAP_GROUP_EVER_GRANDE_CITY, MAP_ID_EVER_GRANDE_CITY, 11},
-    {MAP_GROUP_ROUTE101, MAP_ID_ROUTE101, 0},
-    {MAP_GROUP_ROUTE102, MAP_ID_ROUTE102, 0},
-    {MAP_GROUP_ROUTE103, MAP_ID_ROUTE103, 0},
-    {MAP_GROUP_ROUTE104, MAP_ID_ROUTE104, 0},
-    {MAP_GROUP_ROUTE105, MAP_ID_ROUTE105, 0},
-    {MAP_GROUP_ROUTE106, MAP_ID_ROUTE106, 0},
-    {MAP_GROUP_ROUTE107, MAP_ID_ROUTE107, 0},
-    {MAP_GROUP_ROUTE108, MAP_ID_ROUTE108, 0},
-    {MAP_GROUP_ROUTE109, MAP_ID_ROUTE109, 0},
-    {MAP_GROUP_ROUTE110, MAP_ID_ROUTE110, 0},
-    {MAP_GROUP_ROUTE111, MAP_ID_ROUTE111, 0},
-    {MAP_GROUP_ROUTE112, MAP_ID_ROUTE112, 0},
-    {MAP_GROUP_ROUTE113, MAP_ID_ROUTE113, 0},
-    {MAP_GROUP_ROUTE114, MAP_ID_ROUTE114, 0},
-    {MAP_GROUP_ROUTE115, MAP_ID_ROUTE115, 0},
-    {MAP_GROUP_ROUTE116, MAP_ID_ROUTE116, 0},
-    {MAP_GROUP_ROUTE117, MAP_ID_ROUTE117, 0},
-    {MAP_GROUP_ROUTE118, MAP_ID_ROUTE118, 0},
-    {MAP_GROUP_ROUTE119, MAP_ID_ROUTE119, 0},
-    {MAP_GROUP_ROUTE120, MAP_ID_ROUTE120, 0},
-    {MAP_GROUP_ROUTE121, MAP_ID_ROUTE121, 0},
-    {MAP_GROUP_ROUTE122, MAP_ID_ROUTE122, 0},
-    {MAP_GROUP_ROUTE123, MAP_ID_ROUTE123, 0},
-    {MAP_GROUP_ROUTE124, MAP_ID_ROUTE124, 0},
-    {MAP_GROUP_ROUTE125, MAP_ID_ROUTE125, 0},
-    {MAP_GROUP_ROUTE126, MAP_ID_ROUTE126, 0},
-    {MAP_GROUP_ROUTE127, MAP_ID_ROUTE127, 0},
-    {MAP_GROUP_ROUTE128, MAP_ID_ROUTE128, 0},
-    {MAP_GROUP_ROUTE129, MAP_ID_ROUTE129, 0},
-    {MAP_GROUP_ROUTE130, MAP_ID_ROUTE130, 0},
-    {MAP_GROUP_ROUTE131, MAP_ID_ROUTE131, 0},
-    {MAP_GROUP_ROUTE132, MAP_ID_ROUTE132, 0},
-    {MAP_GROUP_ROUTE133, MAP_ID_ROUTE133, 0},
-    {MAP_GROUP_ROUTE134, MAP_ID_ROUTE134, 0}
+    {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 1},
+    {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), 14},
+    {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), 15},
+    {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), 16},
+    {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), 17},
+    {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), 18},
+    {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), 19},
+    {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), 3},
+    {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), 4},
+    {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), 5},
+    {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), 6},
+    {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), 7},
+    {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), 8},
+    {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), 9},
+    {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), 10},
+    {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 11},
+    {MAP_GROUP(ROUTE101), MAP_NUM(ROUTE101), 0},
+    {MAP_GROUP(ROUTE102), MAP_NUM(ROUTE102), 0},
+    {MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), 0},
+    {MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), 0},
+    {MAP_GROUP(ROUTE105), MAP_NUM(ROUTE105), 0},
+    {MAP_GROUP(ROUTE106), MAP_NUM(ROUTE106), 0},
+    {MAP_GROUP(ROUTE107), MAP_NUM(ROUTE107), 0},
+    {MAP_GROUP(ROUTE108), MAP_NUM(ROUTE108), 0},
+    {MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), 0},
+    {MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), 0},
+    {MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), 0},
+    {MAP_GROUP(ROUTE112), MAP_NUM(ROUTE112), 0},
+    {MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), 0},
+    {MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), 0},
+    {MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), 0},
+    {MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), 0},
+    {MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), 0},
+    {MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), 0},
+    {MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), 0},
+    {MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), 0},
+    {MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), 0},
+    {MAP_GROUP(ROUTE122), MAP_NUM(ROUTE122), 0},
+    {MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), 0},
+    {MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), 0},
+    {MAP_GROUP(ROUTE125), MAP_NUM(ROUTE125), 0},
+    {MAP_GROUP(ROUTE126), MAP_NUM(ROUTE126), 0},
+    {MAP_GROUP(ROUTE127), MAP_NUM(ROUTE127), 0},
+    {MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), 0},
+    {MAP_GROUP(ROUTE129), MAP_NUM(ROUTE129), 0},
+    {MAP_GROUP(ROUTE130), MAP_NUM(ROUTE130), 0},
+    {MAP_GROUP(ROUTE131), MAP_NUM(ROUTE131), 0},
+    {MAP_GROUP(ROUTE132), MAP_NUM(ROUTE132), 0},
+    {MAP_GROUP(ROUTE133), MAP_NUM(ROUTE133), 0},
+    {MAP_GROUP(ROUTE134), MAP_NUM(ROUTE134), 0}
 };
 
 static const u8 *const gUnknown_085A1ED4[] = {
@@ -871,10 +871,10 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void)
     u16 xOnMap;
     struct WarpData *storedWarp;
 
-    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_SS_TIDAL_CORRIDOR
-        && (gSaveBlock1Ptr->location.mapNum == MAP_ID_SS_TIDAL_CORRIDOR
-            || gSaveBlock1Ptr->location.mapNum == MAP_ID_SS_TIDAL_LOWER_DECK
-            || gSaveBlock1Ptr->location.mapNum == MAP_ID_SS_TIDAL_ROOMS))
+    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SS_TIDAL_CORRIDOR)
+        && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(SS_TIDAL_CORRIDOR)
+            || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SS_TIDAL_LOWER_DECK)
+            || gSaveBlock1Ptr->location.mapNum == MAP_NUM(SS_TIDAL_ROOMS)))
     {
         RegionMap_InitializeStateBasedOnSSTidalLocation();
         return;
diff --git a/src/safari_zone.c b/src/safari_zone.c
index d3d40af28..19a26dad9 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "safari_zone.h"
 #include "event_data.h"
-#include "game_stat.h"
+#include "constants/game_stat.h"
 #include "main.h"
 #include "battle.h"
 #include "string_util.h"
diff --git a/src/save.c b/src/save.c
index 528c67145..023ca6870 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "gba/flash_internal.h"
 #include "save.h"
-#include "game_stat.h"
+#include "constants/game_stat.h"
 #include "task.h"
 
 extern struct SaveSectionLocation gRamSaveSectionLocations[0xE];
diff --git a/src/save_location.c b/src/save_location.c
index 61a5fd30d..262aaf40c 100755
--- a/src/save_location.c
+++ b/src/save_location.c
@@ -1,9 +1,6 @@
 #include "global.h"
 #include "save_location.h"
-#include "map_constants.h"
-
-// used to make the list defines a little less ugly.
-#define MAP(name) ((MAP_GROUP_##name << 8) + (MAP_ID_##name))
+#include "constants/maps.h"
 
 // specialSaveWarp flags
 #define POKECENTER_SAVEWARP (1 << 1)
@@ -29,44 +26,44 @@ static bool32 IsCurMapInLocationList(const u16 *list)
 // TODO: Not require a packed u16 array for these lists
 static const u16 sSaveLocationPokeCenterList[] =
 {
-    MAP(OLDALE_TOWN_POKEMON_CENTER_1F),
-    MAP(OLDALE_TOWN_POKEMON_CENTER_2F),
-    MAP(DEWFORD_TOWN_POKEMON_CENTER_1F),
-    MAP(DEWFORD_TOWN_POKEMON_CENTER_2F),
-    MAP(LAVARIDGE_TOWN_POKEMON_CENTER_1F),
-    MAP(LAVARIDGE_TOWN_POKEMON_CENTER_2F),
-    MAP(FALLARBOR_TOWN_POKEMON_CENTER_1F),
-    MAP(FALLARBOR_TOWN_POKEMON_CENTER_2F),
-    MAP(VERDANTURF_TOWN_POKEMON_CENTER_1F),
-    MAP(VERDANTURF_TOWN_POKEMON_CENTER_2F),
-    MAP(PACIFIDLOG_TOWN_POKEMON_CENTER_1F),
-    MAP(PACIFIDLOG_TOWN_POKEMON_CENTER_2F),
-    MAP(PETALBURG_CITY_POKEMON_CENTER_1F),
-    MAP(PETALBURG_CITY_POKEMON_CENTER_2F),
-    MAP(SLATEPORT_CITY_POKEMON_CENTER_1F),
-    MAP(SLATEPORT_CITY_POKEMON_CENTER_2F),
-    MAP(MAUVILLE_CITY_POKEMON_CENTER_1F),
-    MAP(MAUVILLE_CITY_POKEMON_CENTER_2F),
-    MAP(RUSTBORO_CITY_POKEMON_CENTER_1F),
-    MAP(RUSTBORO_CITY_POKEMON_CENTER_2F),
-    MAP(FORTREE_CITY_POKEMON_CENTER_1F),
-    MAP(FORTREE_CITY_POKEMON_CENTER_2F),
-    MAP(LILYCOVE_CITY_POKEMON_CENTER_1F),
-    MAP(LILYCOVE_CITY_POKEMON_CENTER_2F),
-    MAP(MOSSDEEP_CITY_POKEMON_CENTER_1F),
-    MAP(MOSSDEEP_CITY_POKEMON_CENTER_2F),
-    MAP(SOOTOPOLIS_CITY_POKEMON_CENTER_1F),
-    MAP(SOOTOPOLIS_CITY_POKEMON_CENTER_2F),
-    MAP(EVER_GRANDE_CITY_POKEMON_CENTER_1F),
-    MAP(EVER_GRANDE_CITY_POKEMON_CENTER_2F),
-    MAP(EVER_GRANDE_CITY_POKEMON_LEAGUE_1F),
-    MAP(EVER_GRANDE_CITY_POKEMON_LEAGUE_2F),
-    MAP(BATTLE_FRONTIER_POKEMON_CENTER_1F),
-    MAP(BATTLE_FRONTIER_POKEMON_CENTER_2F),
-    MAP(SINGLE_BATTLE_COLOSSEUM),
-    MAP(TRADE_CENTER),
-    MAP(RECORD_CORNER),
-    MAP(DOUBLE_BATTLE_COLOSSEUM),
+    MAP_OLDALE_TOWN_POKEMON_CENTER_1F,
+    MAP_OLDALE_TOWN_POKEMON_CENTER_2F,
+    MAP_DEWFORD_TOWN_POKEMON_CENTER_1F,
+    MAP_DEWFORD_TOWN_POKEMON_CENTER_2F,
+    MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F,
+    MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F,
+    MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F,
+    MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F,
+    MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F,
+    MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F,
+    MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F,
+    MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F,
+    MAP_PETALBURG_CITY_POKEMON_CENTER_1F,
+    MAP_PETALBURG_CITY_POKEMON_CENTER_2F,
+    MAP_SLATEPORT_CITY_POKEMON_CENTER_1F,
+    MAP_SLATEPORT_CITY_POKEMON_CENTER_2F,
+    MAP_MAUVILLE_CITY_POKEMON_CENTER_1F,
+    MAP_MAUVILLE_CITY_POKEMON_CENTER_2F,
+    MAP_RUSTBORO_CITY_POKEMON_CENTER_1F,
+    MAP_RUSTBORO_CITY_POKEMON_CENTER_2F,
+    MAP_FORTREE_CITY_POKEMON_CENTER_1F,
+    MAP_FORTREE_CITY_POKEMON_CENTER_2F,
+    MAP_LILYCOVE_CITY_POKEMON_CENTER_1F,
+    MAP_LILYCOVE_CITY_POKEMON_CENTER_2F,
+    MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F,
+    MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F,
+    MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F,
+    MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F,
+    MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F,
+    MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F,
+    MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F,
+    MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F,
+    MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F,
+    MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F,
+    MAP_SINGLE_BATTLE_COLOSSEUM,
+    MAP_TRADE_CENTER,
+    MAP_RECORD_CORNER,
+    MAP_DOUBLE_BATTLE_COLOSSEUM,
     0xFFFF,
 };
 
@@ -77,7 +74,7 @@ static bool32 IsCurMapPokeCenter(void)
 
 static const u16 sSaveLocationReloadLocList[] = // there's only 1 location, and it's presumed its for the save reload feature for battle tower
 {
-    MAP(BATTLE_TOWER_LOBBY),
+    MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY,
     0xFFFF,
 };
 
diff --git a/src/secret_base.c b/src/secret_base.c
index de2b7221a..7a1f0158e 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1,6 +1,7 @@
 
 // Includes
 #include "global.h"
+#include "constants/decorations.h"
 #include "malloc.h"
 #include "task.h"
 #include "palette.h"
@@ -10,7 +11,7 @@
 #include "menu_helpers.h"
 #include "new_menu_helpers.h"
 #include "menu_indicators.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "songs.h"
 #include "sound.h"
 #include "overworld.h"
@@ -89,30 +90,30 @@ const struct {
 };
 
 const u8 gUnknown_0858CFE8[] = {
-    MAP_ID_SECRET_BASE_RED_CAVE1,    0x00, 0x01, 0x03,
-    MAP_ID_SECRET_BASE_RED_CAVE2,    0x00, 0x05, 0x09,
-    MAP_ID_SECRET_BASE_RED_CAVE3,    0x00, 0x01, 0x03,
-    MAP_ID_SECRET_BASE_RED_CAVE4,    0x00, 0x07, 0x0d,
-    MAP_ID_SECRET_BASE_BROWN_CAVE1,  0x00, 0x02, 0x03,
-    MAP_ID_SECRET_BASE_BROWN_CAVE2,  0x00, 0x09, 0x02,
-    MAP_ID_SECRET_BASE_BROWN_CAVE3,  0x00, 0x0d, 0x04,
-    MAP_ID_SECRET_BASE_BROWN_CAVE4,  0x00, 0x01, 0x02,
-    MAP_ID_SECRET_BASE_BLUE_CAVE1,   0x00, 0x01, 0x03,
-    MAP_ID_SECRET_BASE_BLUE_CAVE2,   0x00, 0x01, 0x02,
-    MAP_ID_SECRET_BASE_BLUE_CAVE3,   0x00, 0x03, 0x0f,
-    MAP_ID_SECRET_BASE_BLUE_CAVE4,   0x00, 0x03, 0x0e,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE1, 0x00, 0x09, 0x03,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE2, 0x00, 0x08, 0x07,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE3, 0x00, 0x03, 0x06,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE4, 0x00, 0x05, 0x09,
-    MAP_ID_SECRET_BASE_TREE1,        0x00, 0x02, 0x03,
-    MAP_ID_SECRET_BASE_TREE2,        0x00, 0x05, 0x06,
-    MAP_ID_SECRET_BASE_TREE3,        0x00, 0x0f, 0x03,
-    MAP_ID_SECRET_BASE_TREE4,        0x00, 0x04, 0x0a,
-    MAP_ID_SECRET_BASE_SHRUB1,       0x00, 0x03, 0x03,
-    MAP_ID_SECRET_BASE_SHRUB2,       0x00, 0x01, 0x02,
-    MAP_ID_SECRET_BASE_SHRUB3,       0x00, 0x07, 0x08,
-    MAP_ID_SECRET_BASE_SHRUB4,       0x00, 0x09, 0x06
+    MAP_NUM(SECRET_BASE_RED_CAVE1),    0x00, 0x01, 0x03,
+    MAP_NUM(SECRET_BASE_RED_CAVE2),    0x00, 0x05, 0x09,
+    MAP_NUM(SECRET_BASE_RED_CAVE3),    0x00, 0x01, 0x03,
+    MAP_NUM(SECRET_BASE_RED_CAVE4),    0x00, 0x07, 0x0d,
+    MAP_NUM(SECRET_BASE_BROWN_CAVE1),  0x00, 0x02, 0x03,
+    MAP_NUM(SECRET_BASE_BROWN_CAVE2),  0x00, 0x09, 0x02,
+    MAP_NUM(SECRET_BASE_BROWN_CAVE3),  0x00, 0x0d, 0x04,
+    MAP_NUM(SECRET_BASE_BROWN_CAVE4),  0x00, 0x01, 0x02,
+    MAP_NUM(SECRET_BASE_BLUE_CAVE1),   0x00, 0x01, 0x03,
+    MAP_NUM(SECRET_BASE_BLUE_CAVE2),   0x00, 0x01, 0x02,
+    MAP_NUM(SECRET_BASE_BLUE_CAVE3),   0x00, 0x03, 0x0f,
+    MAP_NUM(SECRET_BASE_BLUE_CAVE4),   0x00, 0x03, 0x0e,
+    MAP_NUM(SECRET_BASE_YELLOW_CAVE1), 0x00, 0x09, 0x03,
+    MAP_NUM(SECRET_BASE_YELLOW_CAVE2), 0x00, 0x08, 0x07,
+    MAP_NUM(SECRET_BASE_YELLOW_CAVE3), 0x00, 0x03, 0x06,
+    MAP_NUM(SECRET_BASE_YELLOW_CAVE4), 0x00, 0x05, 0x09,
+    MAP_NUM(SECRET_BASE_TREE1),        0x00, 0x02, 0x03,
+    MAP_NUM(SECRET_BASE_TREE2),        0x00, 0x05, 0x06,
+    MAP_NUM(SECRET_BASE_TREE3),        0x00, 0x0f, 0x03,
+    MAP_NUM(SECRET_BASE_TREE4),        0x00, 0x04, 0x0a,
+    MAP_NUM(SECRET_BASE_SHRUB1),       0x00, 0x03, 0x03,
+    MAP_NUM(SECRET_BASE_SHRUB2),       0x00, 0x01, 0x02,
+    MAP_NUM(SECRET_BASE_SHRUB3),       0x00, 0x07, 0x08,
+    MAP_NUM(SECRET_BASE_SHRUB4),       0x00, 0x09, 0x06
 };
 
 const struct MenuAction gUnknown_0858D048[] = {
@@ -360,7 +361,7 @@ void sub_80E8F9C(void)
     s8 idx;
 
     idx = sCurSecretBaseId / 10 * 4;
-    warp1_set_2(MAP_GROUP_SECRET_BASE_RED_CAVE1, gUnknown_0858CFE8[idx], gUnknown_0858CFE8[idx + 1]);
+    warp1_set_2(MAP_GROUP(SECRET_BASE_RED_CAVE1), gUnknown_0858CFE8[idx], gUnknown_0858CFE8[idx + 1]);
 }
 
 void sub_80E8FD0(u8 taskId)
@@ -455,7 +456,7 @@ void sub_80E91F8(void)
 
 bool8 CurrentMapIsSecretBase(void)
 {
-    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_SECRET_BASE_RED_CAVE1 && (u8)gSaveBlock1Ptr->location.mapNum <= MAP_ID_SECRET_BASE_SHRUB4)
+    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SECRET_BASE_RED_CAVE1) && (u8)gSaveBlock1Ptr->location.mapNum <= MAP_NUM(SECRET_BASE_SHRUB4))
     {
         return TRUE;
     }
diff --git a/src/tv.c b/src/tv.c
index 1d978b093..842ae41c6 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -3,7 +3,7 @@
 #include "global.h"
 #include "rtc.h"
 #include "overworld.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "rng.h"
 #include "event_data.h"
 #include "fieldmap.h"
@@ -19,7 +19,7 @@
 #include "battle.h"
 #include "battle_tower.h"
 #include "contest.h"
-#include "items.h"
+#include "constants/items.h"
 #include "item.h"
 #include "link.h"
 #include "main.h"
@@ -832,7 +832,7 @@ void UpdateTVScreensOnMap(int width, int height)
         case 2:
             break;
         default:
-            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F && gSaveBlock1Ptr->location.mapNum == MAP_ID_LILYCOVE_CITY_COVE_LILY_MOTEL_1F)
+            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(LILYCOVE_CITY_COVE_LILY_MOTEL_1F) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(LILYCOVE_CITY_COVE_LILY_MOTEL_1F))
             {
                 SetTVMetatilesOnMap(width, height, 0x3);
             }
@@ -1575,7 +1575,9 @@ void SaveRecordedItemPurchasesForTVShow(void)
     TVShow *show;
     u8 i;
 
-    if (!(gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_TRAINER_HILL_LOBBY && gSaveBlock1Ptr->location.mapNum == MAP_ID_TRAINER_HILL_LOBBY) && !(gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_BATTLE_FRONTIER_MART && gSaveBlock1Ptr->location.mapNum == MAP_ID_BATTLE_FRONTIER_MART) && !rbernoulli(1, 3))
+    if (!(gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_HILL_ENTRANCE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_HILL_ENTRANCE))
+     && !(gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_MART) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_MART))
+     && !rbernoulli(1, 3))
     {
         sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
         if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_SMART_SHOPPER, FALSE) != TRUE)
@@ -2959,13 +2961,13 @@ bool8 IsPriceDiscounted(u8 newsKind)
     switch (newsKind)
     {
         case POKENEWS_SLATEPORT:
-            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_SLATEPORT_CITY && gSaveBlock1Ptr->location.mapNum == MAP_ID_SLATEPORT_CITY && gSpecialVar_LastTalked == 25)
+            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SLATEPORT_CITY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SLATEPORT_CITY) && gSpecialVar_LastTalked == 25)
             {
                 return TRUE;
             }
             return FALSE;
         case POKENEWS_LILYCOVE:
-            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP && gSaveBlock1Ptr->location.mapNum == MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP)
+            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP))
             {
                 return TRUE;
             }
@@ -3694,20 +3696,20 @@ u32 GetPlayerIDAsU32(void)
 
 u8 CheckForBigMovieOrEmergencyNewsOnTV(void)
 {
-    if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)
+    if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F))
     {
         return 0;
     }
     if (gSaveBlock2Ptr->playerGender == MALE)
     {
-        if (gSaveBlock1Ptr->location.mapNum != MAP_ID_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)
+        if (gSaveBlock1Ptr->location.mapNum != MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F))
         {
             return 0;
         }
     }
     else
     {
-        if (gSaveBlock1Ptr->location.mapNum != MAP_ID_LITTLEROOT_TOWN_MAYS_HOUSE_1F)
+        if (gSaveBlock1Ptr->location.mapNum != MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_1F))
         {
             return 0;
         }
@@ -3725,11 +3727,11 @@ u8 CheckForBigMovieOrEmergencyNewsOnTV(void)
 
 void GetMomOrDadStringForTVMessage(void)
 {
-    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)
+    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F))
     {
         if (gSaveBlock2Ptr->playerGender == MALE)
         {
-            if (gSaveBlock1Ptr->location.mapNum == MAP_ID_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)
+            if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F))
             {
                 StringCopy(gStringVar1, gText_Mom);
                 VarSet(VAR_0x4003, 1);
@@ -3737,7 +3739,7 @@ void GetMomOrDadStringForTVMessage(void)
         }
         else
         {
-            if (gSaveBlock1Ptr->location.mapNum == MAP_ID_LITTLEROOT_TOWN_MAYS_HOUSE_1F)
+            if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_1F))
             {
                 StringCopy(gStringVar1, gText_Mom);
                 VarSet(VAR_0x4003, 1);
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index ce1e02e5e..953624b15 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -5,19 +5,20 @@
 #include "metatile_behavior.h"
 #include "fieldmap.h"
 #include "rng.h"
-#include "map_constants.h"
+#include "constants/maps.h"
 #include "field_player_avatar.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "event_data.h"
 #include "safari_zone.h"
+#include "overworld.h"
 #include "pokeblock.h"
 #include "battle_setup.h"
 #include "roamer.h"
-#include "game_stat.h"
+#include "constants/game_stat.h"
 #include "tv.h"
 #include "link.h"
 #include "script.h"
-#include "items.h"
+#include "constants/items.h"
 
 extern const u8 EventScript_RepelWoreOff[];
 
@@ -84,8 +85,8 @@ static bool8 CheckFeebas(void)
     u8 route119Section = 0;
     u16 waterTileNum;
 
-    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_ROUTE119
-     && gSaveBlock1Ptr->location.mapNum == MAP_ID_ROUTE119)
+    if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE119)
+     && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE119))
     {
         GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
         x -= 7;
@@ -283,8 +284,8 @@ static u16 GetCurrentMapWildMonHeaderId(void)
         if (gWildMonHeaders[i].mapGroup == gSaveBlock1Ptr->location.mapGroup &&
             gWildMonHeaders[i].mapNum == gSaveBlock1Ptr->location.mapNum)
         {
-            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_ALTERING_CAVE &&
-                gSaveBlock1Ptr->location.mapNum == MAP_ID_ALTERING_CAVE)
+            if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ALTERING_CAVE) &&
+                gSaveBlock1Ptr->location.mapNum == MAP_NUM(ALTERING_CAVE))
             {
                 u16 alteringCaveId = VarGet(VAR_ALTERING_CAVE_WILD_SET);
                 if (alteringCaveId > 8)
@@ -513,8 +514,8 @@ static bool8 DoGlobalWildEncounterDiceRoll(void)
 
 static bool8 AreLegendariesInSootopolisPreventingEncounters(void)
 {
-    if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP_SOOTOPOLIS_CITY
-        || gSaveBlock1Ptr->location.mapNum != MAP_ID_SOOTOPOLIS_CITY)
+    if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(SOOTOPOLIS_CITY)
+     || gSaveBlock1Ptr->location.mapNum != MAP_NUM(SOOTOPOLIS_CITY))
     {
         return FALSE;
     }
-- 
cgit v1.2.3


From 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 5 Dec 2017 12:27:33 -0600
Subject: rename rng.c to random.c and rom4.c to overworld.c

---
 src/battle_2.c                   |  2 +-
 src/battle_ai_script_commands.c  |  2 +-
 src/battle_ai_switch_items.c     |  2 +-
 src/battle_controller_opponent.c |  2 +-
 src/battle_controller_player.c   |  2 +-
 src/battle_controller_wally.c    |  2 +-
 src/battle_gfx_sfx_util.c        |  2 +-
 src/battle_script_commands.c     |  2 +-
 src/battle_util.c                |  2 +-
 src/battle_util2.c               |  2 +-
 src/berry.c                      |  2 +-
 src/berry_blender.c              |  2 +-
 src/daycare.c                    |  2 +-
 src/egg_hatch.c                  |  2 +-
 src/evolution_graphics.c         |  2 +-
 src/field_map_obj.c              |  2 +-
 src/hall_of_fame.c               |  2 +-
 src/lilycove_lady.c              |  2 +-
 src/load_save.c                  |  2 +-
 src/lottery_corner.c             |  2 +-
 src/main.c                       |  2 +-
 src/new_game.c                   |  2 +-
 src/overworld.c                  | 19 +++++++++++++++++++
 src/pokemon_1.c                  |  2 +-
 src/pokemon_2.c                  |  2 +-
 src/pokemon_3.c                  |  2 +-
 src/random.c                     | 32 ++++++++++++++++++++++++++++++++
 src/recorded_battle.c            |  2 +-
 src/rng.c                        | 32 --------------------------------
 src/roamer.c                     |  2 +-
 src/rom4.c                       | 19 -------------------
 src/scrcmd.c                     |  2 +-
 src/tv.c                         |  2 +-
 src/wild_encounter.c             |  2 +-
 34 files changed, 81 insertions(+), 81 deletions(-)
 create mode 100644 src/overworld.c
 create mode 100644 src/random.c
 delete mode 100644 src/rng.c
 delete mode 100644 src/rom4.c

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index e71d45017..006a5e467 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -25,7 +25,7 @@
 #include "event_data.h"
 #include "m4a.h"
 #include "window.h"
-#include "rng.h"
+#include "random.h"
 #include "songs.h"
 #include "sound.h"
 #include "battle_message.h"
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index c2e89f68d..ced8ba45f 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -4,7 +4,7 @@
 #include "battle.h"
 #include "species.h"
 #include "abilities.h"
-#include "rng.h"
+#include "random.h"
 #include "item.h"
 #include "battle_move_effects.h"
 #include "moves.h"
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index f5b6c7fe4..661fe0637 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -5,7 +5,7 @@
 #include "moves.h"
 #include "pokemon.h"
 #include "species.h"
-#include "rng.h"
+#include "random.h"
 #include "util.h"
 #include "items.h"
 #include "pokemon_item_effects.h"
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index dc23db8bc..41458c023 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -23,7 +23,7 @@
 #include "string_util.h"
 #include "bg.h"
 #include "reshow_battle_screen.h"
-#include "rng.h"
+#include "random.h"
 #include "pokeball.h"
 #include "data2.h"
 
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 137b33274..9689d3719 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -22,7 +22,7 @@
 #include "string_util.h"
 #include "bg.h"
 #include "reshow_battle_screen.h"
-#include "rng.h"
+#include "random.h"
 #include "pokeball.h"
 #include "data2.h"
 
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 9df747888..3b7e3e4af 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -22,7 +22,7 @@
 #include "string_util.h"
 #include "bg.h"
 #include "reshow_battle_screen.h"
-#include "rng.h"
+#include "random.h"
 #include "pokeball.h"
 #include "data2.h"
 #include "party_menu.h"
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 813d6d71b..e9b31ae55 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -6,7 +6,7 @@
 #include "battle_interface.h"
 #include "main.h"
 #include "malloc.h"
-#include "rng.h"
+#include "random.h"
 #include "util.h"
 #include "pokemon.h"
 #include "moves.h"
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index ae4703512..a9578395d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -12,7 +12,7 @@
 #include "util.h"
 #include "pokemon.h"
 #include "calculate_base_damage.h"
-#include "rng.h"
+#include "random.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
 #include "species.h"
diff --git a/src/battle_util.c b/src/battle_util.c
index b4268673c..e67d22d64 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -10,7 +10,7 @@
 #include "util.h"
 #include "battle_move_effects.h"
 #include "battle_scripts.h"
-#include "rng.h"
+#include "random.h"
 #include "text.h"
 #include "string_util.h"
 #include "battle_message.h"
diff --git a/src/battle_util2.c b/src/battle_util2.c
index 4854bb5bb..351bdff1d 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -5,7 +5,7 @@
 #include "pokemon.h"
 #include "event_data.h"
 #include "abilities.h"
-#include "rng.h"
+#include "random.h"
 #include "battle_scripts.h"
 
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
diff --git a/src/berry.c b/src/berry.c
index 0c1553463..5d833fb06 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -4,7 +4,7 @@
 #include "item.h"
 #include "items.h"
 #include "text.h"
-#include "rng.h"
+#include "random.h"
 #include "event_data.h"
 #include "fieldmap.h"
 
diff --git a/src/berry_blender.c b/src/berry_blender.c
index a6144a35d..7c90391fa 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -23,7 +23,7 @@
 #include "items.h"
 #include "string_util.h"
 #include "international_string_util.h"
-#include "rng.h"
+#include "random.h"
 #include "menu.h"
 #include "pokeblock.h"
 #include "trig.h"
diff --git a/src/daycare.c b/src/daycare.c
index 8dd45863a..1c0548058 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -7,7 +7,7 @@
 #include "mail.h"
 #include "pokemon_storage_system.h"
 #include "event_data.h"
-#include "rng.h"
+#include "random.h"
 #include "main.h"
 #include "moves.h"
 #include "egg_hatch.h"
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 7fba0cd00..3be64b37d 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -16,7 +16,7 @@
 #include "string_util.h"
 #include "menu.h"
 #include "trig.h"
-#include "rng.h"
+#include "random.h"
 #include "malloc.h"
 #include "dma3.h"
 #include "gpu_regs.h"
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index 09c351b17..30aacec94 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -2,7 +2,7 @@
 #include "evolution_graphics.h"
 #include "sprite.h"
 #include "trig.h"
-#include "rng.h"
+#include "random.h"
 #include "decompress.h"
 #include "task.h"
 #include "sound.h"
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 97df5682b..6a99890a4 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -4,7 +4,7 @@
 #include "malloc.h"
 #include "sprite.h"
 #include "overworld.h"
-#include "rng.h"
+#include "random.h"
 #include "event_scripts.h"
 #include "berry.h"
 #include "palette.h"
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index af1f9813a..9b421872c 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -22,7 +22,7 @@
 #include "international_string_util.h"
 #include "unknown_task.h"
 #include "trig.h"
-#include "rng.h"
+#include "random.h"
 #include "event_data.h"
 
 struct HallofFameMon
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 62171e475..e18733e37 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -8,7 +8,7 @@
 #include "rom6.h"
 #include "event_data.h"
 #include "script.h"
-#include "rng.h"
+#include "random.h"
 #include "string_util.h"
 #include "item.h"
 #include "items.h"
diff --git a/src/load_save.c b/src/load_save.c
index 1d78bda50..2b40f2e92 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -3,7 +3,7 @@
 #include "load_save.h"
 #include "main.h"
 #include "pokemon.h"
-#include "rng.h"
+#include "random.h"
 
 extern void* gUnknown_0203CF5C;
 
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index 211b78f19..c935dc852 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -3,7 +3,7 @@
 #include "event_data.h"
 #include "pokemon.h"
 #include "items.h"
-#include "rng.h"
+#include "random.h"
 #include "species.h"
 #include "string_util.h"
 #include "text.h"
diff --git a/src/main.c b/src/main.c
index 665a4dd84..07ce07f1c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "m4a.h"
 #include "rtc.h"
-#include "rng.h"
+#include "random.h"
 #include "dma3.h"
 #include "gba/flash_internal.h"
 #include "battle.h"
diff --git a/src/new_game.c b/src/new_game.c
index 75e80dc8e..12873fec9 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "new_game.h"
-#include "rng.h"
+#include "random.h"
 #include "pokemon.h"
 #include "roamer.h"
 #include "pokemon_size_record.h"
diff --git a/src/overworld.c b/src/overworld.c
new file mode 100644
index 000000000..c538595f2
--- /dev/null
+++ b/src/overworld.c
@@ -0,0 +1,19 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+IWRAM_DATA void *gUnknown_03000E0C;
+IWRAM_DATA u8 gUnknown_03000E10[4];
+IWRAM_DATA u8 (*gUnknown_03000E14)(u32);
+IWRAM_DATA u8 gUnknown_03000E18;
+IWRAM_DATA u8 gUnknown_03000E19;
+IWRAM_DATA void *rom4_c_unused_03000e1c;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index f56ade967..1c7c3b846 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "pokemon.h"
-#include "rng.h"
+#include "random.h"
 #include "main.h"
 #include "items.h"
 #include "string_util.h"
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 7014be492..e9bf14a41 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -2,7 +2,7 @@
 #include "pokemon.h"
 #include "battle.h"
 #include "event_data.h"
-#include "rng.h"
+#include "random.h"
 #include "sprite.h"
 #include "species.h"
 #include "text.h"
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 1fafee810..b89b00e8e 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -10,7 +10,7 @@
 #include "species.h"
 #include "link.h"
 #include "hold_effects.h"
-#include "rng.h"
+#include "random.h"
 #include "trainer_classes.h"
 #include "trainer_ids.h"
 #include "songs.h"
diff --git a/src/random.c b/src/random.c
new file mode 100644
index 000000000..f2f0ede58
--- /dev/null
+++ b/src/random.c
@@ -0,0 +1,32 @@
+#include "global.h"
+#include "random.h"
+
+// The number 1103515245 comes from the example implementation of rand and srand
+// in the ISO C standard.
+
+EWRAM_DATA static u8 sUnknown = 0;
+EWRAM_DATA static u32 sRandCount = 0;
+
+u16 Random(void)
+{
+    gRngValue = 1103515245 * gRngValue + 24691;
+    sRandCount++;
+    return gRngValue >> 16;
+}
+
+void SeedRng(u16 seed)
+{
+    gRngValue = seed;
+    sUnknown = 0;
+}
+
+void SeedRng2(u16 seed)
+{
+    gRng2Value = seed;
+}
+
+u16 Random2(void)
+{
+    gRng2Value = 1103515245 * gRng2Value + 24691;
+    return gRng2Value >> 16;
+}
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index e843ff7cb..4f3fe4ab9 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -3,7 +3,7 @@
 #include "recorded_battle.h"
 #include "main.h"
 #include "pokemon.h"
-#include "rng.h"
+#include "random.h"
 #include "event_data.h"
 #include "link.h"
 #include "string_util.h"
diff --git a/src/rng.c b/src/rng.c
deleted file mode 100644
index ddd149018..000000000
--- a/src/rng.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "global.h"
-#include "rng.h"
-
-// The number 1103515245 comes from the example implementation of rand and srand
-// in the ISO C standard.
-
-EWRAM_DATA static u8 sUnknown = 0;
-EWRAM_DATA static u32 sRandCount = 0;
-
-u16 Random(void)
-{
-    gRngValue = 1103515245 * gRngValue + 24691;
-    sRandCount++;
-    return gRngValue >> 16;
-}
-
-void SeedRng(u16 seed)
-{
-    gRngValue = seed;
-    sUnknown = 0;
-}
-
-void SeedRng2(u16 seed)
-{
-    gRng2Value = seed;
-}
-
-u16 Random2(void)
-{
-    gRng2Value = 1103515245 * gRng2Value + 24691;
-    return gRng2Value >> 16;
-}
diff --git a/src/roamer.c b/src/roamer.c
index cbe1b6312..bce85dffd 100644
--- a/src/roamer.c
+++ b/src/roamer.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "roamer.h"
 #include "pokemon.h"
-#include "rng.h"
+#include "random.h"
 #include "species.h"
 #include "event_data.h"
 
diff --git a/src/rom4.c b/src/rom4.c
deleted file mode 100644
index c538595f2..000000000
--- a/src/rom4.c
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// Includes
-#include "global.h"
-
-// Static type declarations
-
-// Static RAM declarations
-IWRAM_DATA void *gUnknown_03000E0C;
-IWRAM_DATA u8 gUnknown_03000E10[4];
-IWRAM_DATA u8 (*gUnknown_03000E14)(u32);
-IWRAM_DATA u8 gUnknown_03000E18;
-IWRAM_DATA u8 gUnknown_03000E19;
-IWRAM_DATA void *rom4_c_unused_03000e1c;
-
-// Static ROM declarations
-
-// .rodata
-
-// .text
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 183b9bab5..504d001ea 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -34,7 +34,7 @@
 #include "party_menu.h"
 #include "pokemon_3.h"
 #include "pokemon_storage_system.h"
-#include "rng.h"
+#include "random.h"
 #include "overworld.h"
 #include "rtc.h"
 #include "script.h"
diff --git a/src/tv.c b/src/tv.c
index 1d978b093..79e417f16 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -4,7 +4,7 @@
 #include "rtc.h"
 #include "overworld.h"
 #include "map_constants.h"
-#include "rng.h"
+#include "random.h"
 #include "event_data.h"
 #include "fieldmap.h"
 #include "field_camera.h"
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index ce1e02e5e..5d4e5a20f 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -4,7 +4,7 @@
 #include "species.h"
 #include "metatile_behavior.h"
 #include "fieldmap.h"
-#include "rng.h"
+#include "random.h"
 #include "map_constants.h"
 #include "field_player_avatar.h"
 #include "abilities.h"
-- 
cgit v1.2.3


From 6561b62986a003e83811abfc85bf07ebc6f3a1ae Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 9 Dec 2017 21:23:40 +0100
Subject: start pokeblock feed

---
 src/pokeblock_feed.c         | 472 +++++++++++++++++++++++++++++++++++++++++++
 src/pokemon_summary_screen.c |   8 +-
 src/use_pokeblock.c          | 198 +++++++++++++++++-
 3 files changed, 668 insertions(+), 10 deletions(-)
 create mode 100644 src/pokeblock_feed.c

(limited to 'src')

diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
new file mode 100644
index 000000000..1f2125016
--- /dev/null
+++ b/src/pokeblock_feed.c
@@ -0,0 +1,472 @@
+#include "global.h"
+#include "pokeblock.h"
+#include "sprite.h"
+#include "task.h"
+#include "palette.h"
+#include "menu.h"
+#include "malloc.h"
+#include "pokemon.h"
+#include "blend_palette.h"
+#include "main.h"
+#include "menu_helpers.h"
+#include "bg.h"
+#include "gpu_regs.h"
+#include "data2.h"
+#include "decompress.h"
+#include "event_data.h"
+#include "strings.h"
+#include "string_util.h"
+#include "new_menu_helpers.h"
+#include "party_menu.h"
+#include "m4a.h"
+#include "sound.h"
+#include "battle.h" // to get rid of once gMonSpritesGfxPtr is put elsewhere
+
+struct PokeblockFeedStruct
+{
+    u8 field_0[0x48];
+    u8 tilemapBuffer[0x1008];
+    u8 field_1050;
+    u8 field_1051;
+    u8 field_1052;
+    bool8 noMonFlip;
+    u16 species;
+    u16 field_1056;
+    u16 field_1058;
+    u8 nature;
+    u8 monSpriteId_;
+    u8 field_105C;
+    u8 monSpriteId;
+    u8 pokeblockCaseSpriteId;
+    u8 pokeblockSpriteId;
+    u8 field_1060[0x1E];
+    s16 loadGfxState;
+    u8 somefield[2];
+};
+
+extern u8 gPokeblockMonId;
+extern u16 gSpecialVar_ItemId;
+extern s16 gPokeblockGain;
+extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct SpriteTemplate gUnknown_0202499C;
+
+extern struct PokeblockFeedStruct *sPokeblockFeed;
+extern struct CompressedSpritePalette sPokeblockSpritePal;
+
+extern bool8 sub_81221EC(void);
+extern void sub_806A068(u16, u8);
+
+// this file's functions
+static void HandleInitBackgrounds(void);
+static void HandleInitWindows(void);
+static bool8 LoadMonAndSceneGfx(struct Pokemon *mon);
+u8 CreatePokeblockCaseSpriteForFeeding(void);
+static u8 CreateMonSprite(struct Pokemon *mon);
+void LaunchPokeblockFeedTask(void);
+static void SetPokeblockSpritePal(u8 pokeblockCaseId);
+void sub_817A5CC(void);
+void sub_8148108(u8 spriteId, bool8 a1);
+u8 CreatePokeblockSprite(void);
+void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 arg1);
+static void PrepareMonToMoveToPokeblock(u8 spriteId);
+void Task_HandleMonAtePokeblock(u8 taskId);
+void Task_PaletteFadeToReturn(u8 taskId);
+void sub_817A634(void);
+static void sub_817A468(struct Sprite *sprite);
+
+static void CB2_PokeblockFeed(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    do_scheduled_bg_tilemap_copies_to_vram();
+    UpdatePaletteFade();
+}
+
+static void VBlankCB_PokeblockFeed(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+bool8 TransitionToPokeblockFeedScene(void)
+{
+    switch (gMain.state)
+    {
+    case 0:
+        sPokeblockFeed = AllocZeroed(sizeof(*sPokeblockFeed));
+        SetVBlankHBlankCallbacksToNull();
+        clear_scheduled_bg_copies_to_vram();
+        gMain.state++;
+        break;
+    case 1:
+        ResetPaletteFade();
+        gPaletteFade.bufferTransferDisabled = 1;
+        gMain.state++;
+        break;
+    case 2:
+        ResetSpriteData();
+        gMain.state++;
+        break;
+    case 3:
+        FreeAllSpritePalettes();
+        gMain.state++;
+        break;
+    case 4:
+        AllocateMonSpritesGfx();
+        gMain.state++;
+        break;
+    case 5:
+        HandleInitBackgrounds();
+        gMain.state++;
+        break;
+    case 6:
+        HandleInitWindows();
+        gMain.state++;
+        break;
+    case 7:
+        if (LoadMonAndSceneGfx(&gPlayerParty[gPokeblockMonId]))
+        {
+            gMain.state++;
+        }
+        break;
+    case 8:
+        sPokeblockFeed->pokeblockCaseSpriteId = CreatePokeblockCaseSpriteForFeeding();
+        gMain.state++;
+        break;
+    case 9:
+        sPokeblockFeed->monSpriteId = CreateMonSprite(&gPlayerParty[gPokeblockMonId]);
+        gMain.state++;
+        break;
+    case 10:
+        SetWindowBorderStyle(0, 1, 1, 14);
+        gMain.state++;
+        break;
+    case 11:
+        LaunchPokeblockFeedTask();
+        gMain.state++;
+        break;
+    case 12:
+        BlendPalettes(-1, 0x10, 0);
+        gMain.state++;
+        break;
+    case 13:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        gPaletteFade.bufferTransferDisabled = 0;
+        gMain.state++;
+        break;
+    default:
+        SetVBlankCallback(VBlankCB_PokeblockFeed);
+        SetMainCallback2(CB2_PokeblockFeed);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void CB2_PreparePokeblockFeedScene(void)
+{
+    while (1)
+    {
+        if (sub_81221EC() == TRUE)
+            break;
+        if (TransitionToPokeblockFeedScene() == TRUE)
+            break;
+        if (sub_81221AC() == TRUE)
+            break;
+    }
+}
+
+extern const struct BgTemplate gUnknown_085F0550[2];
+extern const u8 gBattleTerrainPalette_Frontier[];
+extern const u8 gBattleTerrainTiles_Building[];
+extern const u8 gUnknown_08D9BA44[];
+extern const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet;
+extern const struct CompressedSpriteSheet gPokeblock_SpriteSheet;
+extern const struct CompressedSpritePalette gPokeblockCase_SpritePal;
+extern const struct CompressedSpriteSheet gMonFrontPicTable[];
+extern const struct WindowTemplate gUnknown_085F0558[];
+extern const u16 gUnknown_0860F074[];
+extern const u8 *sPokeblocksPals[];
+extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F05B0[];
+extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F0664[];
+extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F0668[];
+extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F066C[];
+extern const struct SpriteTemplate sThrownPokeblockSpriteTemplate;
+
+static void HandleInitBackgrounds(void)
+{
+    ResetVramOamAndBgCntRegs();
+
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_085F0550, ARRAY_COUNT(gUnknown_085F0550));
+    SetBgTilemapBuffer(1, sPokeblockFeed->tilemapBuffer);
+    ResetAllBgsCoordinates();
+    schedule_bg_copy_tilemap_to_vram(1);
+
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+
+    ShowBg(0);
+    ShowBg(1);
+
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+}
+
+static bool8 LoadMonAndSceneGfx(struct Pokemon *mon)
+{
+    u16 species;
+    u32 personality, trainerId;
+    const struct CompressedSpritePalette *palette;
+
+    switch (sPokeblockFeed->loadGfxState)
+    {
+    case 0:
+        species = GetMonData(mon, MON_DATA_SPECIES2);
+        personality = GetMonData(mon, MON_DATA_PERSONALITY);
+        HandleLoadSpecialPokePic_2(&gMonFrontPicTable[species], gMonSpritesGfxPtr->sprites[1], species, personality);
+        sPokeblockFeed->loadGfxState++;
+        break;
+    case 1:
+        species = GetMonData(mon, MON_DATA_SPECIES2);
+        personality = GetMonData(mon, MON_DATA_PERSONALITY);
+        trainerId = GetMonData(mon, MON_DATA_OT_ID);
+        palette = GetMonSpritePalStructFromOtIdPersonality(species, trainerId, personality);
+
+        LoadCompressedObjectPalette(palette);
+        sub_806A068(palette->tag, 1);
+        sPokeblockFeed->loadGfxState++;
+        break;
+    case 2:
+        LoadCompressedObjectPic(&gPokeblockCase_SpriteSheet);
+        sPokeblockFeed->loadGfxState++;
+        break;
+    case 3:
+        LoadCompressedObjectPalette(&gPokeblockCase_SpritePal);
+        sPokeblockFeed->loadGfxState++;
+        break;
+    case 4:
+        LoadCompressedObjectPic(&gPokeblock_SpriteSheet);
+        sPokeblockFeed->loadGfxState++;
+        break;
+    case 5:
+        SetPokeblockSpritePal(gSpecialVar_ItemId);
+        LoadCompressedObjectPalette(&sPokeblockSpritePal);
+        sPokeblockFeed->loadGfxState++;
+        break;
+    case 6:
+        reset_temp_tile_data_buffers();
+        decompress_and_copy_tile_data_to_vram(1, gBattleTerrainTiles_Building, 0, 0, 0);
+        sPokeblockFeed->loadGfxState++;
+        break;
+    case 7:
+        if (free_temp_tile_data_buffers_if_possible() != TRUE)
+        {
+            LZDecompressWram(gUnknown_08D9BA44, sPokeblockFeed->tilemapBuffer);
+            sPokeblockFeed->loadGfxState++;
+        }
+        break;
+    case 8:
+        LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+        sPokeblockFeed->loadGfxState = 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+extern void sub_809882C(u8, u16, u8);
+
+static void HandleInitWindows(void)
+{
+    InitWindows(gUnknown_085F0558);
+    DeactivateAllTextPrinters();
+    sub_809882C(0, 1, 0xE0);
+    LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
+    FillWindowPixelBuffer(0, 0);
+    PutWindowTilemap(0);
+    schedule_bg_copy_tilemap_to_vram(0);
+}
+
+static void SetPokeblockSpritePal(u8 pokeblockCaseId)
+{
+    u8 colorId = GetPokeblockData(&gSaveBlock1Ptr->pokeblocks[pokeblockCaseId], PBLOCK_COLOR);
+    sPokeblockSpritePal.data = sPokeblocksPals[colorId - 1];
+    sPokeblockSpritePal.tag = TAG_POKEBLOCK_GFX;
+}
+
+#define tFrames     data[0]
+#define tData1      data[1]
+
+void Task_HandlePokeblockFeed(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        switch (gTasks[taskId].tFrames)
+        {
+        case 0:
+            sPokeblockFeed->field_1050 = 0;
+            sPokeblockFeed->field_1058 = 0;
+            sub_817A5CC();
+            break;
+        case 255:
+            DoPokeblockCaseThrowEffect(sPokeblockFeed->pokeblockCaseSpriteId, gTasks[taskId].tData1);
+            break;
+        case 269:
+            sPokeblockFeed->pokeblockSpriteId = CreatePokeblockSprite();
+            break;
+        case 281:
+            PrepareMonToMoveToPokeblock(sPokeblockFeed->monSpriteId);
+            break;
+        case 297:
+            gTasks[taskId].func = Task_HandleMonAtePokeblock;
+            return;
+        }
+
+        if (sPokeblockFeed->field_1058 < sPokeblockFeed->field_1056)
+            sub_817A634();
+        else if (sPokeblockFeed->field_1058 == sPokeblockFeed->field_1056)
+            gTasks[taskId].tFrames = 254;
+
+        sPokeblockFeed->field_1058++;
+        gTasks[taskId].tFrames++;
+    }
+}
+
+void LaunchPokeblockFeedTask(void)
+{
+    u8 taskId = CreateTask(Task_HandlePokeblockFeed, 0);
+    gTasks[taskId].tFrames = 0;
+    gTasks[taskId].tData1 = 1;
+}
+
+void Task_WaitForAtePokeblockText(u8 taskId)
+{
+    if (RunTextPrintersRetIsActive(0) != TRUE)
+        gTasks[taskId].func = Task_PaletteFadeToReturn;
+}
+
+void Task_HandleMonAtePokeblock(u8 taskId)
+{
+    struct Pokemon *mon = &gPlayerParty[gPokeblockMonId];
+    struct Pokeblock *pokeblock = &gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId];
+
+    gPokeblockGain = PokeblockGetGain(GetNature(mon), pokeblock);
+    GetMonNickname(mon, gStringVar1);
+    PokeblockCopyName(pokeblock, gStringVar2);
+
+    if (gPokeblockGain == 0)
+        StringExpandPlaceholders(gStringVar4, gText_Var1AteTheVar2);
+    else if (gPokeblockGain > 0)
+        StringExpandPlaceholders(gStringVar4, gText_Var1HappilyAteVar2);
+    else
+        StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2);
+
+    gTextFlags.flag_0 = 1;
+    AddTextPrinterParametrized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3);
+    gTasks[taskId].func = Task_WaitForAtePokeblockText;
+}
+
+void Task_ReturnAfterPaletteFade(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        m4aMPlayVolumeControl(&gMPlay_BGM, -1, 256);
+        SetMainCallback2(gMain.savedCallback);
+        DestroyTask(taskId);
+        FreeAllWindowBuffers();
+        Free(sPokeblockFeed);
+        FreeMonSpritesGfx();
+    }
+}
+
+void Task_PaletteFadeToReturn(u8 taskId)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskId].func = Task_ReturnAfterPaletteFade;
+}
+
+static u8 CreateMonSprite(struct Pokemon* mon)
+{
+    u16 species = GetMonData(mon, MON_DATA_SPECIES2);
+    u8 spriteId = CreateSprite(&gUnknown_0202499C, 48, 80, 2);
+
+    sPokeblockFeed->species = species;
+    sPokeblockFeed->monSpriteId_ = spriteId;
+    sPokeblockFeed->nature = GetNature(mon);
+    gSprites[spriteId].data2 = species;
+    gSprites[spriteId].callback = SpriteCallbackDummy;
+
+    sPokeblockFeed->noMonFlip = TRUE;
+    if (!IsPokeSpriteNotFlipped(species))
+    {
+        gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_85F05B0;
+        gSprites[spriteId].oam.affineMode = 3;
+        CalcCenterToCornerVec(&gSprites[spriteId], gSprites[spriteId].oam.shape, gSprites[spriteId].oam.size, gSprites[spriteId].oam.affineMode);
+        sPokeblockFeed->noMonFlip = FALSE;
+    }
+
+    return spriteId;
+}
+
+static void PrepareMonToMoveToPokeblock(u8 spriteId)
+{
+    gSprites[spriteId].pos1.x = 48;
+    gSprites[spriteId].pos1.y = 80;
+    gSprites[spriteId].data0 = -8;
+    gSprites[spriteId].data1 = 1;
+    gSprites[spriteId].callback = sub_817A468;
+}
+
+static void sub_817A468(struct Sprite* sprite)
+{
+    sprite->pos1.x += 4;
+    sprite->pos1.y += sprite->data0;
+    sprite->data0 += sprite->data1;
+
+    if (sprite->data0 == 0)
+        PlayCry1(sprite->data2, 0);
+    if (sprite->data0 == 9)
+        sprite->callback = SpriteCallbackDummy;
+}
+
+u8 CreatePokeblockCaseSpriteForFeeding(void)
+{
+    u8 spriteId = CreatePokeblockCaseSprite(188, 100, 2);
+    gSprites[spriteId].oam.affineMode = 1;
+    gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_85F0664;
+    gSprites[spriteId].callback = SpriteCallbackDummy;
+    InitSpriteAffineAnim(&gSprites[spriteId]);
+    return spriteId;
+}
+
+void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 a1)
+{
+    FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
+    gSprites[spriteId].oam.affineMode = 3;
+
+    if (!a1)
+        gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_85F0668;
+    else
+        gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_85F066C;
+
+    InitSpriteAffineAnim(&gSprites[spriteId]);
+}
+
+u8 CreatePokeblockSprite(void)
+{
+    u8 spriteId = CreateSprite(&sThrownPokeblockSpriteTemplate, 174, 84, 1);
+    gSprites[spriteId].data0 = -12;
+    gSprites[spriteId].data1 = 1;
+    return spriteId;
+}
+
+static void SpriteCB_ThrownPokeblock(struct Sprite* sprite)
+{
+    sprite->pos1.x -= 4;
+    sprite->pos1.y += sprite->data0;
+    sprite->data0 += sprite->data1;
+    if (sprite->data0 == 10)
+        DestroySprite(sprite);
+}
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index e9cd3e215..f45e1f07e 100755
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -73,7 +73,7 @@ extern void do_scheduled_bg_tilemap_copies_to_vram(void);
 extern u8 sub_81221EC();
 extern u8 sub_81221AC();
 extern void SetVBlankHBlankCallbacksToNull();
-extern void sub_8121DA0();
+extern void ResetVramOamAndBgCntRegs();
 extern void clear_scheduled_bg_copies_to_vram();
 extern void remove_some_task();
 extern void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable);
@@ -193,7 +193,7 @@ void sub_81C4A88();
 void sub_81C4280();
 void sub_81C0510(u8 taskId);
 void sub_81C171C(u8 taskId);
-void sub_8121E10();
+void ResetAllBgsCoordinates();
 u8 sub_81B205C(struct Pokemon* a);
 void sub_81C1DA4(u16 a, s16 b);
 void sub_81C1EFC(u16 a, s16 b, u16 c);
@@ -450,7 +450,7 @@ bool8 sub_81BFB10(void)
     {
     case 0:
         SetVBlankHBlankCallbacksToNull();
-        sub_8121DA0();
+        ResetVramOamAndBgCntRegs();
         clear_scheduled_bg_copies_to_vram();
         gMain.state++;
         break;
@@ -578,7 +578,7 @@ void sub_81BFE24()
     SetBgTilemapBuffer(1, &gUnknown_0203CF1C->unkTilemap2);
     SetBgTilemapBuffer(2, &gUnknown_0203CF1C->unkTilemap1);
     SetBgTilemapBuffer(3, &gUnknown_0203CF1C->unkTilemap0);
-    sub_8121E10();
+    ResetAllBgsCoordinates();
     schedule_bg_copy_tilemap_to_vram(1);
     schedule_bg_copy_tilemap_to_vram(2);
     schedule_bg_copy_tilemap_to_vram(3);
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 7057b0528..64d1cb4a5 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -2,29 +2,69 @@
 #include "main.h"
 #include "pokeblock.h"
 #include "malloc.h"
+#include "palette.h"
+#include "pokenav.h"
+#include "unknown_task.h"
+#include "text.h"
+#include "bg.h"
+#include "window.h"
+#include "text_window.h"
 
 struct UsePokeblockSubStruct
 {
-    void *field_0;
+    void (*field_0)(void);
     void (*callback)(void);
     struct Pokeblock *pokeblock;
+    struct Pokemon *pokemon;
+    u8 stringBuffer[0x40];
+    u8 field_50;
+    u8 field_51;
+    u8 field_52;
+    u8 field_53;
+    u8 field_54;
+    u8 field_55;
+    u8 field_56;
+    u8 field_57[5];
+    u8 field_5c[5];
+    u8 field_61[5];
+    s16 field_66[5];
 };
 
-struct UsePokeblockStruct1
+struct UsePokeblockStruct
 {
-    u8 field_0[0x7FD0];
+    u8 field_0[0x7C58];
+    u8 field_7C58[0x378];
     struct UsePokeblockSubStruct info;
 };
 
-extern struct UsePokeblockStruct1 *gUnknown_0203BCAC;
+extern struct UsePokeblockStruct *gUnknown_0203BCAC;
 extern struct UsePokeblockSubStruct *gUnknown_0203BC90;
+extern struct Pokeblock *gUnknown_0203BC98;
+extern void (*gUnknown_0203BC94)(void);
+extern u8 gPokeblockMonId;
+
+extern u16 gKeyRepeatStartDelay;
 
 // this file's functions
-void sub_816636C(void *arg0);
+void sub_816636C(void (*func)(void));
 void sub_8166380(void);
 void sub_816631C(void);
+void sub_81662C0(void);
+void sub_8166564(void);
+void sub_8166304(void);
+void sub_81668F8(void);
+void sub_8167420(void);
+void sub_8167760(void);
+u8 sub_81672E4(u8 arg0);
+bool8 sub_8168328(void);
+bool8 sub_8167930(void);
+void sub_8167608(u8 arg0);
+void sub_8167BA0(u16 arg0, u8 copyToVramMode);
+
+extern const struct BgTemplate gUnknown_085DFCCC[4];
+extern const struct WindowTemplate gUnknown_085DFCDC[];
 
-void sub_8166204(struct Pokeblock *pokeblock, void (*callback)(void))
+void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void))
 {
     gUnknown_0203BCAC = AllocZeroed(0x806C);
     gUnknown_0203BC90 = &gUnknown_0203BCAC->info;
@@ -33,3 +73,149 @@ void sub_8166204(struct Pokeblock *pokeblock, void (*callback)(void))
     sub_816636C(sub_8166380);
     SetMainCallback2(sub_816631C);
 }
+
+void CB2_ReturnAndChooseMonToGivePokeblock(void)
+{
+    gUnknown_0203BCAC = AllocZeroed(0x806C);
+    gUnknown_0203BC90 = &gUnknown_0203BCAC->info;
+    gUnknown_0203BC90->pokeblock = gUnknown_0203BC98;
+    gUnknown_0203BC90->callback = gUnknown_0203BC94;
+    gPokeblockMonId = sub_81672E4(gPokeblockMonId);
+    gUnknown_0203BC90->field_56 = gPokeblockMonId < 4 ? 0 : 1;
+    sub_816636C(sub_8166380);
+    SetMainCallback2(sub_81662C0);
+}
+
+void sub_81662C0(void)
+{
+    gUnknown_0203BC90->field_0();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+    if (gUnknown_0203BC90->field_0 == sub_8166564)
+    {
+        gUnknown_0203BC90->field_50 = 0;
+        SetMainCallback2(sub_8166304);
+    }
+}
+
+void sub_8166304(void)
+{
+    sub_81668F8();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+void sub_816631C(void)
+{
+    gUnknown_0203BC90->field_0();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+void sub_8166340(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_81D2108(gUnknown_0203BCAC->field_7C58);
+    sub_80BA0A8();
+}
+
+void sub_816636C(void (*func)(void))
+{
+    gUnknown_0203BC90->field_0 = func;
+    gUnknown_0203BC90->field_50 = 0;
+}
+
+void sub_8166380(void)
+{
+    switch (gUnknown_0203BC90->field_50)
+    {
+        case 0:
+            gUnknown_0203BCAC->field_0[0x7B10] = 0xFF;
+            sub_81D1ED4(gUnknown_0203BCAC->field_7C58);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 1:
+            ResetSpriteData();
+            FreeAllSpritePalettes();
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 2:
+            SetVBlankCallback(NULL);
+            CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 3:
+            ResetBgsAndClearDma3BusyFlags(0);
+            InitBgsFromTemplates(0, gUnknown_085DFCCC, ARRAY_COUNT(gUnknown_085DFCCC));
+            InitWindows(gUnknown_085DFCDC);
+            DeactivateAllTextPrinters();
+            sub_809882C(0, 0x97, 0xE0);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 4:
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 5:
+            if (!sub_8168328())
+            {
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 6:
+            gKeyRepeatStartDelay = 20;
+            sub_8167420();
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 7:
+            if (!sub_8167930())
+            {
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 8:
+            sub_8167608(0);
+            sub_8167760();
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 9:
+            if (!sub_81D312C(&gUnknown_0203BCAC->field_0[0x7B0E]))
+            {
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 10:
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 11:
+            sub_81D2754(gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_0[0x7C6C]);
+            sub_81D20AC(gUnknown_0203BCAC->field_7C58);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 12:
+            if (!sub_81D20BC(gUnknown_0203BCAC->field_7C58))
+            {
+                sub_81D1F84(gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_7C58[0x14], &gUnknown_0203BCAC->field_7C58[0x14]);
+                gUnknown_0203BC90->field_50++;
+            }
+            break;
+        case 13:
+            sub_81D2230(gUnknown_0203BCAC->field_7C58);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 14:
+            PutWindowTilemap(0);
+            PutWindowTilemap(1);
+            sub_8167BA0(0, 1);
+            gUnknown_0203BC90->field_50++;
+            break;
+        case 15:
+            sub_816636C(sub_8166564);
+            break;
+    }
+}
-- 
cgit v1.2.3


From fb30acbc30518469e98a72f4e6df0fb9dd835344 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 10 Dec 2017 15:04:03 +0100
Subject: pokeblock feed is decompiled

---
 src/pokeblock_feed.c | 618 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 557 insertions(+), 61 deletions(-)

(limited to 'src')

diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 1f2125016..1659e4d77 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -20,14 +20,18 @@
 #include "party_menu.h"
 #include "m4a.h"
 #include "sound.h"
+#include "trig.h"
 #include "battle.h" // to get rid of once gMonSpritesGfxPtr is put elsewhere
 
 struct PokeblockFeedStruct
 {
-    u8 field_0[0x48];
-    u8 tilemapBuffer[0x1008];
+    struct Sprite *monSpritePtr;
+    struct Sprite savedMonSprite;
+    u8 tilemapBuffer[0x808];
+    s16 field_850[0x200];
+    s16 field_C50[0x200];
     u8 field_1050;
-    u8 field_1051;
+    u8 animId;
     u8 field_1052;
     bool8 noMonFlip;
     u16 species;
@@ -39,7 +43,7 @@ struct PokeblockFeedStruct
     u8 monSpriteId;
     u8 pokeblockCaseSpriteId;
     u8 pokeblockSpriteId;
-    u8 field_1060[0x1E];
+    s16 field_1060[15];
     s16 loadGfxState;
     u8 somefield[2];
 };
@@ -50,30 +54,352 @@ extern s16 gPokeblockGain;
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern struct SpriteTemplate gUnknown_0202499C;
 
-extern struct PokeblockFeedStruct *sPokeblockFeed;
-extern struct CompressedSpritePalette sPokeblockSpritePal;
+extern const u8 gBattleTerrainPalette_Frontier[];
+extern const u8 gBattleTerrainTiles_Building[];
+extern const u8 gUnknown_08D9BA44[];
+extern const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet;
+extern const struct CompressedSpriteSheet gPokeblock_SpriteSheet;
+extern const struct CompressedSpritePalette gPokeblockCase_SpritePal;
+extern const struct CompressedSpriteSheet gMonFrontPicTable[];
+extern const u16 gUnknown_0860F074[];
+extern const u8 *sPokeblocksPals[];
+extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F05B0[];
+extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F0664[];
+extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F0668[];
+extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F066C[];
+extern const struct SpriteTemplate sThrownPokeblockSpriteTemplate;
 
 extern bool8 sub_81221EC(void);
 extern void sub_806A068(u16, u8);
+extern void sub_809882C(u8, u16, u8);
 
 // this file's functions
 static void HandleInitBackgrounds(void);
 static void HandleInitWindows(void);
-static bool8 LoadMonAndSceneGfx(struct Pokemon *mon);
-u8 CreatePokeblockCaseSpriteForFeeding(void);
-static u8 CreateMonSprite(struct Pokemon *mon);
-void LaunchPokeblockFeedTask(void);
+static void LaunchPokeblockFeedTask(void);
 static void SetPokeblockSpritePal(u8 pokeblockCaseId);
-void sub_817A5CC(void);
-void sub_8148108(u8 spriteId, bool8 a1);
-u8 CreatePokeblockSprite(void);
-void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 arg1);
+static void sub_817A5CC(void);
+static void sub_8148108(u8 spriteId, bool8 a1);
+static void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 arg1);
 static void PrepareMonToMoveToPokeblock(u8 spriteId);
-void Task_HandleMonAtePokeblock(u8 taskId);
-void Task_PaletteFadeToReturn(u8 taskId);
-void sub_817A634(void);
+static void Task_HandleMonAtePokeblock(u8 taskId);
+static void Task_PaletteFadeToReturn(u8 taskId);
+static void sub_817A634(void);
 static void sub_817A468(struct Sprite *sprite);
+static void sub_817AB68(void);
+static void sub_817AA54(void);
+static bool8 sub_817A91C(void);
+static bool8 FreeMonSpriteOamMatrix(void);
+static bool8 sub_817A9E4(void);
+static bool8 LoadMonAndSceneGfx(struct Pokemon *mon);
+static u8 CreatePokeblockSprite(void);
+static u8 CreatePokeblockCaseSpriteForFeeding(void);
+static u8 CreateMonSprite(struct Pokemon *mon);
+
+// ram variables
+EWRAM_DATA static struct PokeblockFeedStruct *sPokeblockFeed = NULL;
+EWRAM_DATA static struct CompressedSpritePalette sPokeblockSpritePal = {0};
 
+// const rom data
+static const u8 sNatureToMonPokeblockAnim[][2] =
+{
+    {  0, 0 }, // HARDY
+    {  3, 0 }, // LONELY
+    {  4, 1 }, // BRAVE
+    {  5, 0 }, // ADAMANT
+    { 10, 0 }, // NAUGHTY
+    { 13, 0 }, // BOLD
+    { 15, 0 }, // DOCILE
+    { 16, 2 }, // RELAXED
+    { 18, 0 }, // IMPISH
+    { 19, 0 }, // LAX
+    { 20, 0 }, // TIMID
+    { 25, 0 }, // HASTY
+    { 27, 3 }, // SERIOUS
+    { 28, 0 }, // JOLLY
+    { 29, 0 }, // NAIVE
+    { 33, 4 }, // MODEST
+    { 36, 0 }, // MILD
+    { 37, 0 }, // QUIET
+    { 39, 0 }, // BASHFUL
+    { 42, 0 }, // RASH
+    { 45, 0 }, // CALM
+    { 46, 5 }, // GENTLE
+    { 47, 6 }, // SASSY
+    { 48, 0 }, // CAREFUL
+    { 53, 0 }, // QUIRKY
+};
+
+static const s16 sMonPokeblockAnims[][10] =
+{
+    // HARDY
+    {   0,   4,   0,   8,  24,   0,   0,   0,  12,   0},
+    {   0,   4,   0,  16,  24,   0,   0,   0,  12,   0},
+    {   0,   4,   0,  32,  32,   0,   0,   0,  16,   1},
+
+    // LONELY
+    {   0,   3,   6,   0,  48,   0,   0,   0,  24,   1},
+
+    // BRAVE
+    {  64,  16, -24,   0,  32,   0,   0,   0,   0,   1},
+
+    // ADAMANT
+    {   0,   4,   8,   0,  16,   0,  -8,   0,   0,   0},
+    {   0,   0,   0,   0,  16,   0,   0,   0,   0,   0},
+    {   0,   4,   8,   0,  16,   0,  -8,   0,   0,   0},
+    {   0,   0,   0,   0,  16,   0,   0,   0,   0,   0},
+    {   0,   4, -16,   0,   4,   0,  16,   0,   0,   1},
+
+    // NAUGHTY
+    {   0,   3,   6,   0,  12,   0,   0,   0,   6,   0},
+    {   0,   3,  -6,   0,  12,   0,   0,   0,   6,   0},
+    {   0,  16,  16,   0,  45,   1,   0,   0,   0,   1},
+
+    // BOLD
+    {   0,  16,   0,  24,  32,   0,   0,   0,  16,   0},
+    {   0,  16,   0,  23,  32,   0,   0,   0,  16,   1},
+
+    // DOCILE
+    {   0,   0,   0,   0,  80,   0,   0,   0,   0,   1},
+
+    // RELAXED
+    {   0,   2,   8,   0,  32,   0,   0,   0,   0,   0},
+    {   0,   2,  -8,   0,  32,   0,   0,   0,   0,   1},
+
+    // IMPISH
+    {   0,  32,   2,   1,  48,   1,   0,   0,  24,   1},
+
+    // LAX
+    {   0,   2,  16,  16, 128,   0,   0,   0,   0,   1},
+
+    // TIMID
+    {   0,   2,  -8,   0,  48,   0, -24,   0,   0,   0},
+    {   0,   0,   0,   0,   8,   0,   0,   0,   0,   0},
+    {  64,  32,   2,   0,  36,   0,   0,   0,   0,   0},
+    {   0,   0,   0,   0,   8,   0,   0,   0,   0,   0},
+    {   0,   2,   8,   0,  48,   0,  24,   0,   0,   1},
+
+    // HASTY
+    {  64,  24,  16,   0,  32,   0,   0,   0,   0,   0},
+    {   0,  28,   2,   1,  32,   1,   0,   0,  16,   1},
+
+    // SERIOUS
+    {   0,   0,   0,   0,  32,   0,   0,   0,   0,   1},
+
+    // JOLLY
+    {  64,  16, -16,   2,  48,   0,   0,   0,  32,   1},
+
+    // NAIVE
+    {   0,  12,  -8,   4,  24,   0,   8,   0,  12,   0},
+    {   0,  12,   8,   8,  24,   0, -16,   0,  12,   0},
+    {   0,  12,  -8,  16,  24,   0,  16,   0,  12,   0},
+    {   0,  12,   8,  28,  24,   0,  -8,   0,  12,   1},
+
+    // MODEST
+    {   0,   0,   0,   0,   8,   0,   0,   0,   0,   0},
+    {  64,  16,  -4,   0,  32,   0,   0,   0,   0,   0},
+    {   0,   0,   0,   0,   8,   0,   0,   0,   0,   1},
+
+    // MILD
+    { 128,   4,   0,   8,  64,   0,   0,   0,   0,   1},
+
+    // QUIET
+    {   0,   2,  16,   0,  48,   0,   0,   0,   0,   0},
+    { 128,   2,  16,   0,  48,   0,   0,   0,   0,   1},
+
+    // BASHFUL
+    {   0,   2,  -4,   0,  48,   0, -48,   0,   0,   0},
+    {   0,   0,   0,   0,  80,   0,   0,   0,   0,   0},
+    {   0,   2,   8,   0,  24,   0,  48,   0,   0,   1},
+
+    // RASH
+    {  64,   4,  64,  58,  52,   0, -88,   0,   0,   0},
+    {   0,   0,   0,   0,  80,   0,   0,   0,   0,   0},
+    {   0,  24,  80,   0,  32,   0,  88,   0,   0,   1},
+
+    // CALM
+    {   0,   2,  16,   4,  64,   0,   0,   0,   0,   1},
+
+    // GENTLE
+    {   0,   0,   0,   0,  32,   0,   0,   0,   0,   1},
+
+    // SASSY
+    {   0,   0,   0,   0,  42,   0,   0,   0,   0,   1},
+
+    // CAREFUL
+    {   0,   4,   0,   8,  24,   0,   0,   0,  12,   0},
+    {   0,   0,   0,   0,  12,   0,   0,   0,   0,   0},
+    {   0,   4,   0,  12,  24,   0,   0,   0,  12,   0},
+    {   0,   0,   0,   0,  12,   0,   0,   0,   0,   0},
+    {   0,   4,   0,   4,  24,   0,   0,   0,  12,   1},
+
+    // QUIRKY
+    {   0,   4,  16,  12,  64,   0,   0,   0,   0,   0},
+    {   0,  -4,  16,  12,  64,   0,   0,   0,   0,   1},
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411E90[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411EA0[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, 12, 1),
+    AFFINEANIMCMD_FRAME(0, 0, 0, 30),
+    AFFINEANIMCMD_FRAME(0, 0, -12, 1),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411EC0[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(0, 0, 12, 1),
+    AFFINEANIMCMD_FRAME(0, 0, 0, 28),
+    AFFINEANIMCMD_FRAME(0, 0, -4, 3),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411EE8[] =
+{
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 16),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 32),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 16),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411F08[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 16),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 32),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 16),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411F30[] =
+{
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 8),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 16),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 8),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411F50[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 8),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 16),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 8),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411F78[] =
+{
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 8),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 32),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 8),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411F98[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 8),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 32),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 8),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411FC0[] =
+{
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 4),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 24),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 4),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8411FE0[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 4),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 24),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 4),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8412008[] =
+{
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 24),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 16),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -12, 2),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8412028[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 24),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 16),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -12, 2),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_85F04FC[] =
+{
+    sSpriteAffineAnim_8411E90,
+    sSpriteAffineAnim_8411EA0,
+    sSpriteAffineAnim_8411EE8,
+    sSpriteAffineAnim_8411F30,
+    sSpriteAffineAnim_8411F78,
+    sSpriteAffineAnim_8411FC0,
+    sSpriteAffineAnim_8412008,
+    sSpriteAffineAnim_8411E90,
+    sSpriteAffineAnim_8411E90,
+    sSpriteAffineAnim_8411E90,
+    sSpriteAffineAnim_8411E90,
+    sSpriteAffineAnim_8411EC0,
+    sSpriteAffineAnim_8411F08,
+    sSpriteAffineAnim_8411F50,
+    sSpriteAffineAnim_8411F98,
+    sSpriteAffineAnim_8411FE0,
+    sSpriteAffineAnim_8412028,
+    sSpriteAffineAnim_8411E90,
+    sSpriteAffineAnim_8411E90,
+    sSpriteAffineAnim_8411E90,
+    sSpriteAffineAnim_8411E90,
+};
+
+static const struct BgTemplate sBackgroundTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    }
+};
+
+static const struct WindowTemplate sWindowTemplates[] =
+{
+    {0, 1, 0xF, 0x1C, 4, 0xF, 0xA},
+    DUMMY_WIN_TEMPLATE
+};
+
+// code
 static void CB2_PokeblockFeed(void)
 {
     RunTasks();
@@ -90,7 +416,7 @@ static void VBlankCB_PokeblockFeed(void)
     TransferPlttBuffer();
 }
 
-bool8 TransitionToPokeblockFeedScene(void)
+static bool8 TransitionToPokeblockFeedScene(void)
 {
     switch (gMain.state)
     {
@@ -177,29 +503,12 @@ void CB2_PreparePokeblockFeedScene(void)
     }
 }
 
-extern const struct BgTemplate gUnknown_085F0550[2];
-extern const u8 gBattleTerrainPalette_Frontier[];
-extern const u8 gBattleTerrainTiles_Building[];
-extern const u8 gUnknown_08D9BA44[];
-extern const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet;
-extern const struct CompressedSpriteSheet gPokeblock_SpriteSheet;
-extern const struct CompressedSpritePalette gPokeblockCase_SpritePal;
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const struct WindowTemplate gUnknown_085F0558[];
-extern const u16 gUnknown_0860F074[];
-extern const u8 *sPokeblocksPals[];
-extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F05B0[];
-extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F0664[];
-extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F0668[];
-extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F066C[];
-extern const struct SpriteTemplate sThrownPokeblockSpriteTemplate;
-
 static void HandleInitBackgrounds(void)
 {
     ResetVramOamAndBgCntRegs();
 
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_085F0550, ARRAY_COUNT(gUnknown_085F0550));
+    InitBgsFromTemplates(0, sBackgroundTemplates, ARRAY_COUNT(sBackgroundTemplates));
     SetBgTilemapBuffer(1, sPokeblockFeed->tilemapBuffer);
     ResetAllBgsCoordinates();
     schedule_bg_copy_tilemap_to_vram(1);
@@ -274,11 +583,9 @@ static bool8 LoadMonAndSceneGfx(struct Pokemon *mon)
     return FALSE;
 }
 
-extern void sub_809882C(u8, u16, u8);
-
 static void HandleInitWindows(void)
 {
-    InitWindows(gUnknown_085F0558);
+    InitWindows(sWindowTemplates);
     DeactivateAllTextPrinters();
     sub_809882C(0, 1, 0xE0);
     LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
@@ -297,7 +604,7 @@ static void SetPokeblockSpritePal(u8 pokeblockCaseId)
 #define tFrames     data[0]
 #define tData1      data[1]
 
-void Task_HandlePokeblockFeed(u8 taskId)
+static void Task_HandlePokeblockFeed(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -332,20 +639,20 @@ void Task_HandlePokeblockFeed(u8 taskId)
     }
 }
 
-void LaunchPokeblockFeedTask(void)
+static void LaunchPokeblockFeedTask(void)
 {
     u8 taskId = CreateTask(Task_HandlePokeblockFeed, 0);
     gTasks[taskId].tFrames = 0;
     gTasks[taskId].tData1 = 1;
 }
 
-void Task_WaitForAtePokeblockText(u8 taskId)
+static void Task_WaitForAtePokeblockText(u8 taskId)
 {
     if (RunTextPrintersRetIsActive(0) != TRUE)
         gTasks[taskId].func = Task_PaletteFadeToReturn;
 }
 
-void Task_HandleMonAtePokeblock(u8 taskId)
+static void Task_HandleMonAtePokeblock(u8 taskId)
 {
     struct Pokemon *mon = &gPlayerParty[gPokeblockMonId];
     struct Pokeblock *pokeblock = &gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId];
@@ -366,7 +673,7 @@ void Task_HandleMonAtePokeblock(u8 taskId)
     gTasks[taskId].func = Task_WaitForAtePokeblockText;
 }
 
-void Task_ReturnAfterPaletteFade(u8 taskId)
+static void Task_ReturnAfterPaletteFade(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -381,12 +688,15 @@ void Task_ReturnAfterPaletteFade(u8 taskId)
     }
 }
 
-void Task_PaletteFadeToReturn(u8 taskId)
+static void Task_PaletteFadeToReturn(u8 taskId)
 {
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
     gTasks[taskId].func = Task_ReturnAfterPaletteFade;
 }
 
+#undef tFrames
+#undef tData1
+
 static u8 CreateMonSprite(struct Pokemon* mon)
 {
     u16 species = GetMonData(mon, MON_DATA_SPECIES2);
@@ -395,7 +705,7 @@ static u8 CreateMonSprite(struct Pokemon* mon)
     sPokeblockFeed->species = species;
     sPokeblockFeed->monSpriteId_ = spriteId;
     sPokeblockFeed->nature = GetNature(mon);
-    gSprites[spriteId].data2 = species;
+    gSprites[spriteId].data[2] = species;
     gSprites[spriteId].callback = SpriteCallbackDummy;
 
     sPokeblockFeed->noMonFlip = TRUE;
@@ -414,24 +724,24 @@ static void PrepareMonToMoveToPokeblock(u8 spriteId)
 {
     gSprites[spriteId].pos1.x = 48;
     gSprites[spriteId].pos1.y = 80;
-    gSprites[spriteId].data0 = -8;
-    gSprites[spriteId].data1 = 1;
+    gSprites[spriteId].data[0] = -8;
+    gSprites[spriteId].data[1] = 1;
     gSprites[spriteId].callback = sub_817A468;
 }
 
 static void sub_817A468(struct Sprite* sprite)
 {
     sprite->pos1.x += 4;
-    sprite->pos1.y += sprite->data0;
-    sprite->data0 += sprite->data1;
+    sprite->pos1.y += sprite->data[0];
+    sprite->data[0] += sprite->data[1];
 
-    if (sprite->data0 == 0)
-        PlayCry1(sprite->data2, 0);
-    if (sprite->data0 == 9)
+    if (sprite->data[0] == 0)
+        PlayCry1(sprite->data[2], 0);
+    if (sprite->data[0] == 9)
         sprite->callback = SpriteCallbackDummy;
 }
 
-u8 CreatePokeblockCaseSpriteForFeeding(void)
+static u8 CreatePokeblockCaseSpriteForFeeding(void)
 {
     u8 spriteId = CreatePokeblockCaseSprite(188, 100, 2);
     gSprites[spriteId].oam.affineMode = 1;
@@ -441,7 +751,7 @@ u8 CreatePokeblockCaseSpriteForFeeding(void)
     return spriteId;
 }
 
-void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 a1)
+static void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 a1)
 {
     FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
     gSprites[spriteId].oam.affineMode = 3;
@@ -454,19 +764,205 @@ void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 a1)
     InitSpriteAffineAnim(&gSprites[spriteId]);
 }
 
-u8 CreatePokeblockSprite(void)
+static u8 CreatePokeblockSprite(void)
 {
     u8 spriteId = CreateSprite(&sThrownPokeblockSpriteTemplate, 174, 84, 1);
-    gSprites[spriteId].data0 = -12;
-    gSprites[spriteId].data1 = 1;
+    gSprites[spriteId].data[0] = -12;
+    gSprites[spriteId].data[1] = 1;
     return spriteId;
 }
 
 static void SpriteCB_ThrownPokeblock(struct Sprite* sprite)
 {
     sprite->pos1.x -= 4;
-    sprite->pos1.y += sprite->data0;
-    sprite->data0 += sprite->data1;
-    if (sprite->data0 == 10)
+    sprite->pos1.y += sprite->data[0];
+    sprite->data[0] += sprite->data[1];
+    if (sprite->data[0] == 10)
         DestroySprite(sprite);
 }
+
+static void sub_817A5CC(void)
+{
+    u8 animId, i;
+    struct PokeblockFeedStruct *pokeblockFeed;
+
+    pokeblockFeed = sPokeblockFeed;
+    pokeblockFeed->field_1056 = 1;
+    animId = sNatureToMonPokeblockAnim[pokeblockFeed->nature][0];
+    for (i = 0; i < 8; i++, animId++)
+    {
+        pokeblockFeed->field_1056 += sMonPokeblockAnims[animId][4];
+        if (sMonPokeblockAnims[animId][9] == 1)
+            break;
+    }
+}
+
+static void sub_817A634(void)
+{
+    struct PokeblockFeedStruct *pokeblockFeed = sPokeblockFeed;
+
+    switch (pokeblockFeed->field_1050)
+    {
+    case 0:
+        pokeblockFeed->animId = sNatureToMonPokeblockAnim[pokeblockFeed->nature][0];
+        pokeblockFeed->monSpritePtr = &gSprites[pokeblockFeed->monSpriteId_];
+        pokeblockFeed->savedMonSprite = *pokeblockFeed->monSpritePtr;
+        pokeblockFeed->field_1050 = 10;
+        break;
+    case 1 ... 9:
+        break;
+    case 10:
+        sub_817A91C();
+        if (sNatureToMonPokeblockAnim[pokeblockFeed->nature][1] != 0)
+        {
+            pokeblockFeed->monSpritePtr->oam.affineMode = 3;
+            pokeblockFeed->monSpritePtr->oam.matrixNum = 0;
+            pokeblockFeed->monSpritePtr->affineAnims = sSpriteAffineAnimTable_85F04FC;
+            InitSpriteAffineAnim(pokeblockFeed->monSpritePtr);
+        }
+        pokeblockFeed->field_1050 = 50;
+    case 50:
+        if (sNatureToMonPokeblockAnim[pokeblockFeed->nature][1] != 0)
+        {
+            if (!pokeblockFeed->noMonFlip) // double negation, so mon's sprite is flipped
+                StartSpriteAffineAnim(pokeblockFeed->monSpritePtr, sNatureToMonPokeblockAnim[pokeblockFeed->nature][1] + 10);
+            else
+                StartSpriteAffineAnim(pokeblockFeed->monSpritePtr, sNatureToMonPokeblockAnim[pokeblockFeed->nature][1]);
+        }
+        pokeblockFeed->field_1050 = 60;
+        break;
+    case 60:
+        if (sub_817A9E4() == TRUE)
+        {
+            if (pokeblockFeed->field_1060[9] == 0)
+            {
+                pokeblockFeed->animId++;
+                sub_817A91C();
+                pokeblockFeed->field_1050 = 60;
+            }
+            else
+            {
+                FreeOamMatrix(pokeblockFeed->monSpritePtr->oam.matrixNum);
+                pokeblockFeed->field_1050 = 70;
+            }
+        }
+        break;
+    case 70:
+        FreeMonSpriteOamMatrix();
+        pokeblockFeed->animId = 0;
+        pokeblockFeed->field_1050 = 0;
+        break;
+    case 71 ... 90:
+        break;
+    }
+}
+
+static bool8 sub_817A91C(void)
+{
+    struct PokeblockFeedStruct *pokeblockFeed = sPokeblockFeed;
+    u8 i;
+
+    for (i = 0; i < 10; i++)
+        pokeblockFeed->field_1060[i] = sMonPokeblockAnims[pokeblockFeed->animId][i];
+
+    if (pokeblockFeed->field_1060[4] == 0)
+    {
+        return TRUE;
+    }
+    else
+    {
+        pokeblockFeed->field_1060[10] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2]);
+        pokeblockFeed->field_1060[11] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3]);
+        pokeblockFeed->field_1060[12] = pokeblockFeed->field_1060[4];
+        pokeblockFeed->field_1060[13] = pokeblockFeed->monSpritePtr->pos2.x;
+        pokeblockFeed->field_1060[14] = pokeblockFeed->monSpritePtr->pos2.y;
+        sub_817AB68();
+        pokeblockFeed->field_1060[4] = pokeblockFeed->field_1060[12];
+        sub_817AA54();
+        pokeblockFeed->field_1060[4] = pokeblockFeed->field_1060[12];
+        return FALSE;
+    }
+}
+
+static bool8 sub_817A9E4(void)
+{
+    u16 var = sPokeblockFeed->field_1060[12] - sPokeblockFeed->field_1060[4];
+
+    sPokeblockFeed->monSpritePtr->pos2.x = sPokeblockFeed->field_850[var];
+    sPokeblockFeed->monSpritePtr->pos2.y = sPokeblockFeed->field_C50[var];
+
+    if (--sPokeblockFeed->field_1060[4] == 0)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static bool8 FreeMonSpriteOamMatrix(void)
+{
+    FreeSpriteOamMatrix(sPokeblockFeed->monSpritePtr);
+    return FALSE;
+}
+
+static void sub_817AA54(void)
+{
+    struct PokeblockFeedStruct *pokeblockFeed = sPokeblockFeed;
+    u16 i;
+    u16 r8 = pokeblockFeed->field_1060[8];
+    u16 r7 = pokeblockFeed->field_1060[12] - r8;
+    s16 var3 = pokeblockFeed->field_1060[13] + pokeblockFeed->field_1060[6];
+    s16 r9 = pokeblockFeed->field_1060[14] + pokeblockFeed->field_1060[7];
+
+    for (i = 0; i < r7 - 1; i++)
+    {
+        s16 r1 = pokeblockFeed->field_850[r8 + i] - (var3);
+        s16 r4 = pokeblockFeed->field_C50[r8 + i] - r9;
+
+        pokeblockFeed->field_850[r8 + i] -= r1 * (i + 1) / r7;
+        pokeblockFeed->field_C50[r8 + i] -= r4 * (i + 1) / r7;
+    }
+
+    pokeblockFeed->field_850[(r8 + r7) - 1] = var3;
+    pokeblockFeed->field_C50[(r8 + r7) - 1] = r9;
+}
+
+static void sub_817AB68(void)
+{
+    struct PokeblockFeedStruct *pokeblockFeed = sPokeblockFeed;
+    bool8 var_24 = FALSE;
+    s16 r8 = pokeblockFeed->field_1060[13] - pokeblockFeed->field_1060[10];
+    s16 r7 = pokeblockFeed->field_1060[14] - pokeblockFeed->field_1060[11];
+
+    while (1)
+    {
+        u16 r5;
+        u16 r4;
+        u16 var;
+
+        var = abs(pokeblockFeed->field_1060[5]);
+        r5 = var + pokeblockFeed->field_1060[3];
+        pokeblockFeed->field_1060[3] = r5;
+
+        if (pokeblockFeed->field_1060[2] < 0)
+            var_24 = TRUE;
+
+        r4 = pokeblockFeed->field_1060[12] - pokeblockFeed->field_1060[4];
+
+        if (pokeblockFeed->field_1060[4] == 0)
+            break;
+
+        if (!var_24)
+        {
+            pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] + r5 / 256) + r8;
+            pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] + r5 / 256) + r7;
+        }
+        else
+        {
+            pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] - r5 / 256) + r8;
+            pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] - r5 / 256) + r7;
+        }
+
+        pokeblockFeed->field_1060[0] += pokeblockFeed->field_1060[1];
+        pokeblockFeed->field_1060[0] &= 0xFF;
+        pokeblockFeed->field_1060[4]--;
+    }
+}
-- 
cgit v1.2.3


From 37ae6a7758d0f16394f31c367f5c1eb86d34327f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 10 Dec 2017 16:38:27 +0100
Subject: move more pokeblock data to C and label

---
 src/pokeblock_feed.c | 192 ++++++++++++++++++++++++++++++++++++++++++++-------
 src/use_pokeblock.c  |  17 +++--
 2 files changed, 178 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 1659e4d77..58a8667fd 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -21,6 +21,7 @@
 #include "m4a.h"
 #include "sound.h"
 #include "trig.h"
+#include "graphics.h"
 #include "battle.h" // to get rid of once gMonSpritesGfxPtr is put elsewhere
 
 struct PokeblockFeedStruct
@@ -45,12 +46,10 @@ struct PokeblockFeedStruct
     u8 pokeblockSpriteId;
     s16 field_1060[15];
     s16 loadGfxState;
-    u8 somefield[2];
+    u8 unused;
 };
 
-extern u8 gPokeblockMonId;
 extern u16 gSpecialVar_ItemId;
-extern s16 gPokeblockGain;
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern struct SpriteTemplate gUnknown_0202499C;
 
@@ -58,16 +57,9 @@ extern const u8 gBattleTerrainPalette_Frontier[];
 extern const u8 gBattleTerrainTiles_Building[];
 extern const u8 gUnknown_08D9BA44[];
 extern const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet;
-extern const struct CompressedSpriteSheet gPokeblock_SpriteSheet;
 extern const struct CompressedSpritePalette gPokeblockCase_SpritePal;
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const u16 gUnknown_0860F074[];
-extern const u8 *sPokeblocksPals[];
-extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F05B0[];
-extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F0664[];
-extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F0668[];
-extern const union AffineAnimCmd * const sSpriteAffineAnimTable_85F066C[];
-extern const struct SpriteTemplate sThrownPokeblockSpriteTemplate;
 
 extern bool8 sub_81221EC(void);
 extern void sub_806A068(u16, u8);
@@ -95,6 +87,7 @@ static bool8 LoadMonAndSceneGfx(struct Pokemon *mon);
 static u8 CreatePokeblockSprite(void);
 static u8 CreatePokeblockCaseSpriteForFeeding(void);
 static u8 CreateMonSprite(struct Pokemon *mon);
+static void SpriteCB_ThrownPokeblock(struct Sprite* sprite);
 
 // ram variables
 EWRAM_DATA static struct PokeblockFeedStruct *sPokeblockFeed = NULL;
@@ -399,6 +392,136 @@ static const struct WindowTemplate sWindowTemplates[] =
     DUMMY_WIN_TEMPLATE
 };
 
+static const u8* const sPokeblocksPals[] =
+{
+    gPokeblockRed_Pal,
+    gPokeblockBlue_Pal,
+    gPokeblockPink_Pal,
+    gPokeblockGreen_Pal,
+    gPokeblockYellow_Pal,
+    gPokeblockPurple_Pal,
+    gPokeblockIndigo_Pal,
+    gPokeblockBrown_Pal,
+    gPokeblockLiteBlue_Pal,
+    gPokeblockOlive_Pal,
+    gPokeblockGray_Pal,
+    gPokeblockBlack_Pal,
+    gPokeblockWhite_Pal,
+    gPokeblockGold_Pal
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_84120DC[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_MonNoFlip[] =
+{
+    sSpriteAffineAnim_84120DC
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_84120F0[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 16, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 16, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 16, 1),
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8412148[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -16, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -16, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -16, 1),
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_85F0664[] =
+{
+    sSpriteAffineAnim_84120DC
+};
+
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_85F0668[] =
+{
+    sSpriteAffineAnim_84120F0
+};
+
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_85F066C[] =
+{
+    sSpriteAffineAnim_8412148
+};
+
+static const struct OamData sThrownPokeblockOamData =
+{
+    .y = 0,
+    .affineMode = 3,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sThrownPokeblockSpriteAnim[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sThrownPokeblockAnimTable[] =
+{
+    sThrownPokeblockSpriteAnim,
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_84121C0[] =
+{
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(-8, -8, 0, 1),
+    AFFINEANIMCMD_JUMP(1)
+};
+
+static const union AffineAnimCmd *const sThrownPokeblockAffineAnimTable[] =
+{
+    sSpriteAffineAnim_84121C0
+};
+
+static const struct CompressedSpriteSheet sPokeblock_SpriteSheet =
+{
+    gPokeblock_Gfx, 0x20, TAG_POKEBLOCK_GFX
+};
+
+static const struct SpriteTemplate sThrownPokeblockSpriteTemplate =
+{
+    .tileTag = TAG_POKEBLOCK_GFX,
+    .paletteTag = TAG_POKEBLOCK_GFX,
+    .oam = &sThrownPokeblockOamData,
+    .anims = sThrownPokeblockAnimTable,
+    .images = NULL,
+    .affineAnims = sThrownPokeblockAffineAnimTable,
+    .callback = SpriteCB_ThrownPokeblock
+};
+
 // code
 static void CB2_PokeblockFeed(void)
 {
@@ -554,7 +677,7 @@ static bool8 LoadMonAndSceneGfx(struct Pokemon *mon)
         sPokeblockFeed->loadGfxState++;
         break;
     case 4:
-        LoadCompressedObjectPic(&gPokeblock_SpriteSheet);
+        LoadCompressedObjectPic(&sPokeblock_SpriteSheet);
         sPokeblockFeed->loadGfxState++;
         break;
     case 5:
@@ -601,6 +724,8 @@ static void SetPokeblockSpritePal(u8 pokeblockCaseId)
     sPokeblockSpritePal.tag = TAG_POKEBLOCK_GFX;
 }
 
+// defines for task data fields
+
 #define tFrames     data[0]
 #define tData1      data[1]
 
@@ -697,6 +822,12 @@ static void Task_PaletteFadeToReturn(u8 taskId)
 #undef tFrames
 #undef tData1
 
+// defines for mon sprite data fields
+
+#define tDelta          data[0]
+#define tDeltaMod       data[1]
+#define tSpecies        data[2]
+
 static u8 CreateMonSprite(struct Pokemon* mon)
 {
     u16 species = GetMonData(mon, MON_DATA_SPECIES2);
@@ -705,13 +836,13 @@ static u8 CreateMonSprite(struct Pokemon* mon)
     sPokeblockFeed->species = species;
     sPokeblockFeed->monSpriteId_ = spriteId;
     sPokeblockFeed->nature = GetNature(mon);
-    gSprites[spriteId].data[2] = species;
+    gSprites[spriteId].tSpecies = species;
     gSprites[spriteId].callback = SpriteCallbackDummy;
 
     sPokeblockFeed->noMonFlip = TRUE;
     if (!IsPokeSpriteNotFlipped(species))
     {
-        gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_85F05B0;
+        gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_MonNoFlip;
         gSprites[spriteId].oam.affineMode = 3;
         CalcCenterToCornerVec(&gSprites[spriteId], gSprites[spriteId].oam.shape, gSprites[spriteId].oam.size, gSprites[spriteId].oam.affineMode);
         sPokeblockFeed->noMonFlip = FALSE;
@@ -724,23 +855,27 @@ static void PrepareMonToMoveToPokeblock(u8 spriteId)
 {
     gSprites[spriteId].pos1.x = 48;
     gSprites[spriteId].pos1.y = 80;
-    gSprites[spriteId].data[0] = -8;
-    gSprites[spriteId].data[1] = 1;
+    gSprites[spriteId].tDelta = -8;
+    gSprites[spriteId].tDeltaMod = 1;
     gSprites[spriteId].callback = sub_817A468;
 }
 
 static void sub_817A468(struct Sprite* sprite)
 {
     sprite->pos1.x += 4;
-    sprite->pos1.y += sprite->data[0];
-    sprite->data[0] += sprite->data[1];
+    sprite->pos1.y += sprite->tDelta;
+    sprite->tDelta += sprite->tDeltaMod;
 
-    if (sprite->data[0] == 0)
-        PlayCry1(sprite->data[2], 0);
-    if (sprite->data[0] == 9)
+    if (sprite->tDelta == 0)
+        PlayCry1(sprite->tSpecies, 0);
+    if (sprite->tDelta == 9)
         sprite->callback = SpriteCallbackDummy;
 }
 
+#undef tDelta
+#undef tDeltaMod
+#undef tSpecies
+
 static u8 CreatePokeblockCaseSpriteForFeeding(void)
 {
     u8 spriteId = CreatePokeblockCaseSprite(188, 100, 2);
@@ -764,23 +899,30 @@ static void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 a1)
     InitSpriteAffineAnim(&gSprites[spriteId]);
 }
 
+// defines for the pokeblock sprite data fields
+#define tDelta          data[0]
+#define tDeltaMod       data[1]
+
 static u8 CreatePokeblockSprite(void)
 {
     u8 spriteId = CreateSprite(&sThrownPokeblockSpriteTemplate, 174, 84, 1);
-    gSprites[spriteId].data[0] = -12;
-    gSprites[spriteId].data[1] = 1;
+    gSprites[spriteId].tDelta = -12;
+    gSprites[spriteId].tDeltaMod = 1;
     return spriteId;
 }
 
 static void SpriteCB_ThrownPokeblock(struct Sprite* sprite)
 {
     sprite->pos1.x -= 4;
-    sprite->pos1.y += sprite->data[0];
-    sprite->data[0] += sprite->data[1];
-    if (sprite->data[0] == 10)
+    sprite->pos1.y += sprite->tDelta;
+    sprite->tDelta += sprite->tDeltaMod;
+    if (sprite->tDelta == 10)
         DestroySprite(sprite);
 }
 
+#undef tDelta
+#undef tDeltaMod
+
 static void sub_817A5CC(void)
 {
     u8 animId, i;
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 64d1cb4a5..1a210b101 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -37,12 +37,6 @@ struct UsePokeblockStruct
     struct UsePokeblockSubStruct info;
 };
 
-extern struct UsePokeblockStruct *gUnknown_0203BCAC;
-extern struct UsePokeblockSubStruct *gUnknown_0203BC90;
-extern struct Pokeblock *gUnknown_0203BC98;
-extern void (*gUnknown_0203BC94)(void);
-extern u8 gPokeblockMonId;
-
 extern u16 gKeyRepeatStartDelay;
 
 // this file's functions
@@ -64,6 +58,17 @@ void sub_8167BA0(u16 arg0, u8 copyToVramMode);
 extern const struct BgTemplate gUnknown_085DFCCC[4];
 extern const struct WindowTemplate gUnknown_085DFCDC[];
 
+// ram variables
+EWRAM_DATA struct UsePokeblockSubStruct *gUnknown_0203BC90 = NULL;
+EWRAM_DATA void (*gUnknown_0203BC94)(void) = NULL;
+EWRAM_DATA struct Pokeblock *gUnknown_0203BC98 = NULL;
+EWRAM_DATA u8 gPokeblockMonId = 0;
+EWRAM_DATA s16 gPokeblockGain = 0;
+EWRAM_DATA void *gUnknown_0203BCA0 = NULL;
+EWRAM_DATA void *gUnknown_0203BCA4 = NULL;
+EWRAM_DATA void *gUnknown_0203BCA8 = NULL;
+EWRAM_DATA struct UsePokeblockStruct *gUnknown_0203BCAC = NULL;
+
 void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void))
 {
     gUnknown_0203BCAC = AllocZeroed(0x806C);
-- 
cgit v1.2.3


From b4d10ab7aba76bf9ab16f07cc9409083388c603d Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 10 Dec 2017 19:02:51 +0100
Subject: split pokeblock files

---
 src/pokeblock.c     | 4 ++++
 src/use_pokeblock.c | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 src/pokeblock.c

(limited to 'src')

diff --git a/src/pokeblock.c b/src/pokeblock.c
new file mode 100644
index 000000000..023b7c3e7
--- /dev/null
+++ b/src/pokeblock.c
@@ -0,0 +1,4 @@
+#include "global.h"
+#include "pokeblock.h"
+
+
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 1a210b101..12f475c93 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -69,6 +69,10 @@ EWRAM_DATA void *gUnknown_0203BCA4 = NULL;
 EWRAM_DATA void *gUnknown_0203BCA8 = NULL;
 EWRAM_DATA struct UsePokeblockStruct *gUnknown_0203BCAC = NULL;
 
+// const rom data
+// todo: make it static once the file is decompiled
+
+// code
 void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void))
 {
     gUnknown_0203BCAC = AllocZeroed(0x806C);
-- 
cgit v1.2.3


From 8ac17e09486006c7d2d066173c8fa907aceb72de Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 11 Dec 2017 16:52:28 +0100
Subject: move data from asm to pokeblock.c

---
 src/berry_blender.c  |   2 -
 src/lilycove_lady.c  |   2 +-
 src/pokeblock.c      | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/pokeblock_feed.c |  10 ++-
 src/pokemon_3.c      |  12 ++--
 src/safari_zone.c    |   2 +-
 6 files changed, 212 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/berry_blender.c b/src/berry_blender.c
index 7c90391fa..aed7814d8 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -132,8 +132,6 @@ extern u8 gInGameOpponentsNo;
 extern u8 gUnknown_020322D5;
 extern u8 gResultsWindowId;
 
-extern const u8 * const gPokeblockNames[];
-
 // graphics
 extern const u8 gBerryBlenderArrowTiles[];
 extern const u8 gBerryBlenderStartTiles[];
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index e18733e37..a85cf8945 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -1079,7 +1079,7 @@ void sub_818E914(void)
 
 void sub_818E92C(void)
 {
-    sub_81357FC(3, c2_exit_to_overworld_2_switch);
+    OpenPokeblockCase(3, c2_exit_to_overworld_2_switch);
 }
 
 void sub_818E940(void)
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 023b7c3e7..4c8a9504f 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -1,4 +1,204 @@
 #include "global.h"
 #include "pokeblock.h"
+#include "bg.h"
+#include "strings.h"
+#include "text.h"
+#include "menu.h"
+#include "task.h"
+#include "menu_helpers.h"
+#include "pokemon.h"
+#include "graphics.h"
 
+enum
+{
+    PKBL_USE_ON_FIELD,
+    PKBL_TOSS,
+    PKBL_CANCEL,
+    PKBL_USE_IN_BATTLE,
+    PKBL_USE_ON_FEEDER,
+    PKBL_GIVE_TO_LADY
+};
 
+// this file's functions
+void PokeblockAction_UseOnField(u8 taskId);
+void PokeblockAction_Toss(u8 taskId);
+void PokeblockAction_Cancel(u8 taskId);
+void PokeblockAction_UseInBattle(u8 taskId);
+void PokeblockAction_UseOnPokeblockFeeder(u8 taskId);
+void PokeblockAction_GiveToContestLady(u8 taskId);
+void TossPokeblockChoice_Yes(u8 taskId);
+void TossPokeblockChoice_No(u8 taskId);
+
+// const rom data
+const s8 gPokeblockFlavorCompatibilityTable[] =
+{
+    // Cool, Beauty, Cute, Smart, Tough
+          0,      0,    0,     0,     0, // Hardy
+          1,      0,    0,     0,    -1, // Lonely
+          1,      0,   -1,     0,     0, // Brave
+          1,     -1,    0,     0,     0, // Adamant
+          1,      0,    0,    -1,     0, // Naughty
+         -1,      0,    0,     0,     1, // Bold
+          0,      0,    0,     0,     0, // Docile
+          0,      0,   -1,     0,     1, // Relaxed
+          0,     -1,    0,     0,     1, // Impish
+          0,      0,    0,    -1,     1, // Lax
+         -1,      0,    1,     0,     0, // Timid
+          0,      0,    1,     0,    -1, // Hasty
+          0,      0,    0,     0,     0, // Serious
+          0,     -1,    1,     0,     0, // Jolly
+          0,      0,    1,    -1,     0, // Naive
+         -1,      1,    0,     0,     0, // Modest
+          0,      1,    0,     0,    -1, // Mild
+          0,      1,   -1,     0,     0, // Quiet
+          0,      0,    0,     0,     0, // Bashful
+          0,      1,    0,    -1,     0, // Rash
+         -1,      0,    0,     1,     0, // Calm
+          0,      0,    0,     1,    -1, // Gentle
+          0,      0,   -1,     1,     0, // Sassy
+          0,     -1,    0,     1,     0, // Careful
+          0,      0,    0,     0,     0  // Quirky
+};
+
+const struct BgTemplate gUnknown_085B2620[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 29,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    }
+};
+
+const u8 *const gPokeblockNames[] =
+{
+    NULL,
+    gText_RedPokeblock,
+    gText_BluePokeblock,
+    gText_PinkPokeblock,
+    gText_GreenPokeblock,
+    gText_YellowPokeblock,
+    gText_PurplePokeblock,
+    gText_IndigoPokeblock,
+    gText_BrownPokeblock,
+    gText_LiteBluePokeblock,
+    gText_OlivePokeblock,
+    gText_GrayPokeblock,
+    gText_BlackPokeblock,
+    gText_WhitePokeblock,
+    gText_GoldPokeblock
+};
+
+const struct MenuAction sPokeblockMenuActions[] =
+{
+    {gMenuText_Use, PokeblockAction_UseOnField},
+    {gMenuText_Toss, PokeblockAction_Toss},
+    {gText_Cancel2, PokeblockAction_Cancel},
+    {gMenuText_Use, PokeblockAction_UseInBattle},
+    {gMenuText_Use, PokeblockAction_UseOnPokeblockFeeder},
+    {gMenuText_Give2, PokeblockAction_GiveToContestLady},
+};
+
+const u8 sActionsOnField[] = {PKBL_USE_ON_FIELD, PKBL_TOSS, PKBL_CANCEL};
+const u8 sActionsInBattle[] = {PKBL_USE_IN_BATTLE, PKBL_CANCEL};
+const u8 sActionsOnPokeblockFeeder[] = {PKBL_USE_ON_FEEDER, PKBL_CANCEL};
+const u8 sActionsWhenGivingToLady[] = {PKBL_GIVE_TO_LADY, PKBL_CANCEL};
+
+const struct YesNoFuncTable sTossYesNoFuncTable = {TossPokeblockChoice_Yes, TossPokeblockChoice_No};
+
+static const u8 sContestStatsMonData[] = {MON_DATA_COOL, MON_DATA_BEAUTY, MON_DATA_CUTE, MON_DATA_SMART, MON_DATA_TOUGH};
+
+static const struct OamData sOamData_PokeblockCase =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sSpriteAnim_PokeblockCase[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_PokeblockCase[] =
+{
+    sSpriteAnim_PokeblockCase
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_85B26C8[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, -2,  2),
+    AFFINEANIMCMD_FRAME(0, 0,  2,  4),
+    AFFINEANIMCMD_FRAME(0, 0, -2,  4),
+    AFFINEANIMCMD_FRAME(0, 0,  2,  2),
+    AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd *const sSpriteAffineAnimTable_85B26F0[] =
+{
+    gSpriteAffineAnim_85B26C8
+};
+
+const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet =
+{
+    gMenuPokeblockDevice_Gfx, 0x800, GFX_TAG_POKEBLOCK_CASE
+};
+
+const struct CompressedSpritePalette gPokeblockCase_SpritePal =
+{
+    gMenuPokeblockDevice_Pal, GFX_TAG_POKEBLOCK_CASE
+};
+
+const struct SpriteTemplate sSpriteTemplate_PokeblockCase =
+{
+    GFX_TAG_POKEBLOCK_CASE,
+    GFX_TAG_POKEBLOCK_CASE,
+    &sOamData_PokeblockCase,
+    sSpriteAnimTable_PokeblockCase,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
+
+const struct TextColor sTextColorInPokeblockMenu = {0, 2, 3};
+
+const struct Pokeblock sFavoritePokeblocksTable[] =
+{
+    { PBLOCK_CLR_RED,    20,  0,  0,  0,  0, 20},
+    { PBLOCK_CLR_BLUE,    0, 20,  0,  0,  0, 20},
+    { PBLOCK_CLR_PINK,    0,  0, 20,  0,  0, 20},
+    { PBLOCK_CLR_GREEN,   0,  0,  0, 20,  0, 20},
+    { PBLOCK_CLR_YELLOW,  0,  0,  0,  0, 20, 20}
+};
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 58a8667fd..ec5f3074f 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -56,8 +56,6 @@ extern struct SpriteTemplate gUnknown_0202499C;
 extern const u8 gBattleTerrainPalette_Frontier[];
 extern const u8 gBattleTerrainTiles_Building[];
 extern const u8 gUnknown_08D9BA44[];
-extern const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet;
-extern const struct CompressedSpritePalette gPokeblockCase_SpritePal;
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const u16 gUnknown_0860F074[];
 
@@ -508,13 +506,13 @@ static const union AffineAnimCmd *const sThrownPokeblockAffineAnimTable[] =
 
 static const struct CompressedSpriteSheet sPokeblock_SpriteSheet =
 {
-    gPokeblock_Gfx, 0x20, TAG_POKEBLOCK_GFX
+    gPokeblock_Gfx, 0x20, GFX_TAG_POKEBLOCK
 };
 
 static const struct SpriteTemplate sThrownPokeblockSpriteTemplate =
 {
-    .tileTag = TAG_POKEBLOCK_GFX,
-    .paletteTag = TAG_POKEBLOCK_GFX,
+    .tileTag = GFX_TAG_POKEBLOCK,
+    .paletteTag = GFX_TAG_POKEBLOCK,
     .oam = &sThrownPokeblockOamData,
     .anims = sThrownPokeblockAnimTable,
     .images = NULL,
@@ -721,7 +719,7 @@ static void SetPokeblockSpritePal(u8 pokeblockCaseId)
 {
     u8 colorId = GetPokeblockData(&gSaveBlock1Ptr->pokeblocks[pokeblockCaseId], PBLOCK_COLOR);
     sPokeblockSpritePal.data = sPokeblocksPals[colorId - 1];
-    sPokeblockSpritePal.tag = TAG_POKEBLOCK_GFX;
+    sPokeblockSpritePal.tag = GFX_TAG_POKEBLOCK;
 }
 
 // defines for task data fields
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index b89b00e8e..634923777 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -22,6 +22,7 @@
 #include "abilities.h"
 #include "pokemon_animation.h"
 #include "pokedex.h"
+#include "pokeblock.h"
 
 extern struct BattlePokemon gBattleMons[4];
 extern struct BattleEnigmaBerry gEnigmaBerries[4];
@@ -59,7 +60,6 @@ extern const u8 gText_PkmnsXPreventsSwitching[];
 extern const struct CompressedSpritePalette gMonPaletteTable[];
 extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
 extern const u16 gHMMoves[];
-extern const s8 gPokeblockFlavorCompatibilityTable[];
 extern const u8 gMonAnimationDelayTable[];
 extern const u8 gMonFrontAnimIdsTable[];
 
@@ -1297,21 +1297,21 @@ bool8 IsPokeSpriteNotFlipped(u16 species)
     return gBaseStats[species].noFlip;
 }
 
-s8 GetMonFlavorRelation(struct Pokemon *mon, u8 a2)
+s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavour)
 {
     u8 nature = GetNature(mon);
-    return gPokeblockFlavorCompatibilityTable[nature * 5 + a2];
+    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavour];
 }
 
-s8 GetFlavorRelationByPersonality(u32 personality, u8 a2)
+s8 GetFlavorRelationByPersonality(u32 personality, u8 flavour)
 {
     u8 nature = GetNatureFromPersonality(personality);
-    return gPokeblockFlavorCompatibilityTable[nature * 5 + a2];
+    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavour];
 }
 
 bool8 IsTradedMon(struct Pokemon *mon)
 {
-    u8 otName[8];
+    u8 otName[OT_NAME_LENGTH + 1];
     u32 otId;
     GetMonData(mon, MON_DATA_OT_NAME, otName);
     otId = GetMonData(mon, MON_DATA_OT_ID, 0);
diff --git a/src/safari_zone.c b/src/safari_zone.c
index d3d40af28..53027b57e 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -5,6 +5,7 @@
 #include "main.h"
 #include "battle.h"
 #include "string_util.h"
+#include "pokeblock.h"
 
 struct PokeblockFeeder
 {
@@ -24,7 +25,6 @@ extern u8 EventScript_2A4B8A[];
 extern u8 EventScript_2A4B6F[];
 extern u8 EventScript_2A4B4C[];
 extern u8 EventScript_2A4B9B[];
-extern const u8* const gPokeblockNames[];
 
 extern void sub_80EE44C(u8, u8);
 extern void IncrementGameStat(u8 index);
-- 
cgit v1.2.3


From c681b482c2ab0a4281cb6ad5927ce8ca565a3692 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Mon, 11 Dec 2017 12:27:51 -0600
Subject: convert more constants

---
 src/battle_2.c                            | 6 +++---
 src/battle_ai_script_commands.c           | 4 ++--
 src/battle_ai_switch_items.c              | 4 ++--
 src/battle_controller_link_opponent.c     | 2 +-
 src/battle_controller_link_partner.c      | 2 +-
 src/battle_controller_opponent.c          | 4 ++--
 src/battle_controller_player.c            | 4 ++--
 src/battle_controller_player_partner.c    | 2 +-
 src/battle_controller_recorded_opponent.c | 2 +-
 src/battle_controller_recorded_player.c   | 2 +-
 src/battle_controller_safari.c            | 2 +-
 src/battle_controller_wally.c             | 4 ++--
 src/battle_controllers.c                  | 2 +-
 src/battle_dome_cards.c                   | 2 +-
 src/battle_gfx_sfx_util.c                 | 6 +++---
 src/battle_interface.c                    | 4 ++--
 src/battle_message.c                      | 2 +-
 src/battle_script_commands.c              | 6 +++---
 src/battle_util.c                         | 4 ++--
 src/berry_blender.c                       | 6 +++---
 src/braille_puzzles.c                     | 4 ++--
 src/calculate_base_damage.c               | 4 ++--
 src/clear_save_data_screen.c              | 2 +-
 src/daycare.c                             | 4 ++--
 src/decompress.c                          | 2 +-
 src/decoration.c                          | 2 +-
 src/egg_hatch.c                           | 2 +-
 src/event_data.c                          | 2 +-
 src/evolution_graphics.c                  | 2 +-
 src/evolution_scene.c                     | 5 +++--
 src/field_poison.c                        | 2 +-
 src/field_special_scene.c                 | 4 ++--
 src/hall_of_fame.c                        | 5 +++--
 src/lottery_corner.c                      | 2 +-
 src/mail.c                                | 2 +-
 src/pokeball.c                            | 4 ++--
 src/pokemon_2.c                           | 2 +-
 src/pokemon_3.c                           | 4 ++--
 src/pokemon_size_record.c                 | 2 +-
 src/pokemon_storage_system.c              | 2 +-
 src/pokemon_summary_screen.c              | 6 +++---
 src/region_map.c                          | 2 +-
 src/reshow_battle_screen.c                | 2 +-
 src/roamer.c                              | 2 +-
 src/secret_base.c                         | 2 +-
 src/sound.c                               | 2 +-
 src/starter_choose.c                      | 2 +-
 src/tv.c                                  | 7 +++++--
 src/wild_encounter.c                      | 2 +-
 49 files changed, 80 insertions(+), 75 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index a021e83b0..52530f6b3 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -11,7 +11,7 @@
 #include "palette.h"
 #include "task.h"
 #include "event_data.h"
-#include "species.h"
+#include "constants/species.h"
 #include "berry.h"
 #include "text.h"
 #include "item.h"
@@ -26,7 +26,7 @@
 #include "m4a.h"
 #include "window.h"
 #include "random.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "battle_message.h"
 #include "sprite.h"
@@ -37,7 +37,7 @@
 #include "battle_controllers.h"
 #include "pokedex.h"
 #include "constants/abilities.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "trainer_classes.h"
 #include "evolution_scene.h"
 #include "roamer.h"
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index c3fab44f3..44be0a4d9 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -2,12 +2,12 @@
 #include "battle_ai_script_commands.h"
 #include "pokemon.h"
 #include "battle.h"
-#include "species.h"
+#include "constants/species.h"
 #include "constants/abilities.h"
 #include "random.h"
 #include "item.h"
 #include "constants/battle_move_effects.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "util.h"
 
 #define AIScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24)
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 4177b82d2..b3fccb17f 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -2,9 +2,9 @@
 #include "battle.h"
 #include "battle_controllers.h"
 #include "constants/abilities.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "random.h"
 #include "util.h"
 #include "constants/items.h"
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 4795d2bd4..dd8582618 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -10,7 +10,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index fde364a55..9da468761 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -10,7 +10,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 5c2730490..0862e72a7 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -12,9 +12,9 @@
 #include "main.h"
 #include "item.h"
 #include "constants/items.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "window.h"
 #include "m4a.h"
 #include "palette.h"
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 0c9ff211f..e497dbfe2 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -11,9 +11,9 @@
 #include "main.h"
 #include "item.h"
 #include "constants/items.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "window.h"
 #include "m4a.h"
 #include "palette.h"
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 3ce12fac7..eb57297da 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -9,7 +9,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index a57b2c576..8e2f31879 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -11,7 +11,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 86558d25c..f558fde87 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -10,7 +10,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 2ec14cab5..db4670523 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -8,7 +8,7 @@
 #include "link.h"
 #include "util.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "window.h"
 #include "m4a.h"
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 947836e34..446027944 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -11,9 +11,9 @@
 #include "main.h"
 #include "item.h"
 #include "constants/items.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "window.h"
 #include "m4a.h"
 #include "palette.h"
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index a6e6a1b6d..c6d47e71e 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -6,7 +6,7 @@
 #include "battle_ai_script_commands.h"
 #include "battle_anim.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "recorded_battle.h"
 #include "util.h"
 #include "constants/abilities.h"
diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index 9385417b4..d549856f2 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -4,7 +4,7 @@
 #include "sprite.h"
 #include "window.h"
 #include "malloc.h"
-#include "species.h"
+#include "constants/species.h"
 #include "palette.h"
 #include "decompress.h"
 #include "battle_dome_cards.h"
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index e9b31ae55..22be086f0 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -9,18 +9,18 @@
 #include "random.h"
 #include "util.h"
 #include "pokemon.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "task.h"
 #include "sprite.h"
 #include "sound.h"
 #include "m4a.h"
-#include "species.h"
+#include "constants/species.h"
 #include "decompress.h"
 #include "data2.h"
 #include "palette.h"
 #include "blend_palette.h"
 #include "contest.h"
-#include "songs.h"
+#include "constants/songs.h"
 
 extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gActiveBank;
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 63813a424..95f1a1111 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -8,13 +8,13 @@
 #include "string_util.h"
 #include "text.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "decompress.h"
 #include "task.h"
 #include "util.h"
 #include "gpu_regs.h"
 #include "battle_message.h"
-#include "species.h"
+#include "constants/species.h"
 #include "pokedex.h"
 #include "palette.h"
 #include "international_string_util.h"
diff --git a/src/battle_message.c b/src/battle_message.c
index ecfcc1228..ec1cfd626 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -2,7 +2,7 @@
 #include "battle.h"
 #include "battle_message.h"
 #include "battle_string_ids.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "text.h"
 #include "string_util.h"
 #include "constants/items.h"
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index a7240783c..88d583c1f 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -4,7 +4,7 @@
 #include "battle_message.h"
 #include "battle_ai_script_commands.h"
 #include "battle_scripts.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "constants/abilities.h"
 #include "item.h"
 #include "constants/items.h"
@@ -15,8 +15,8 @@
 #include "random.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
-#include "species.h"
-#include "songs.h"
+#include "constants/species.h"
+#include "constants/songs.h"
 #include "text.h"
 #include "sound.h"
 #include "pokedex.h"
diff --git a/src/battle_util.c b/src/battle_util.c
index 293915de7..1a624641d 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1,10 +1,10 @@
 #include "global.h"
 #include "battle.h"
 #include "constants/abilities.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "constants/hold_effects.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "item.h"
 #include "constants/items.h"
 #include "util.h"
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 2d3c38810..b1d36e2d9 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -7,7 +7,7 @@
 #include "task.h"
 #include "sprite.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "m4a.h"
 #include "bg.h"
 #include "palette.h"
@@ -1068,7 +1068,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum)
         sBerryBlenderData->playersNo = 2;
         StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName);
 
-        if (!FlagGet(FLAG_340))
+        if (!FlagGet(FLAG_0x340))
             StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]);
         else
             StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]);
@@ -1592,7 +1592,7 @@ static void sub_80808D4(void)
 
         if (gSpecialVar_0x8004 == 1)
         {
-            if (!FlagGet(FLAG_340))
+            if (!FlagGet(FLAG_0x340))
                 sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10);
             else
                 sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10);
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index c3b66f87a..d6924de9f 100755
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "event_data.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "script.h"
-#include "species.h"
+#include "constants/species.h"
 #include "task.h"
 #include "field_effect.h"
 #include "constants/flags.h"
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c
index 868bf734a..d30599607 100644
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@@ -6,8 +6,8 @@
 #include "item.h"
 #include "constants/items.h"
 #include "pokemon.h"
-#include "species.h"
-#include "moves.h"
+#include "constants/species.h"
+#include "constants/moves.h"
 #include "constants/battle_move_effects.h"
 
 extern u32 gBattleTypeFlags;
diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c
index d5e173ee8..d00944ac1 100755
--- a/src/clear_save_data_screen.c
+++ b/src/clear_save_data_screen.c
@@ -9,7 +9,7 @@
 #include "gpu_regs.h"
 #include "bg.h"
 #include "text_window.h"
-#include "songs.h"
+#include "constants/songs.h"
 
 extern u8 gText_ClearAllSaveData[];
 extern u8 gText_ClearingData[];
diff --git a/src/daycare.c b/src/daycare.c
index df03e3b91..ce9952531 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -2,14 +2,14 @@
 #include "pokemon.h"
 #include "daycare.h"
 #include "string_util.h"
-#include "species.h"
+#include "constants/species.h"
 #include "constants/items.h"
 #include "mail.h"
 #include "pokemon_storage_system.h"
 #include "event_data.h"
 #include "random.h"
 #include "main.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "egg_hatch.h"
 #include "text.h"
 #include "menu.h"
diff --git a/src/decompress.c b/src/decompress.c
index e2ae6ce83..8e8827194 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "decompress.h"
-#include "species.h"
+#include "constants/species.h"
 #include "text.h"
 #include "malloc.h"
 #include "pokemon.h"
diff --git a/src/decoration.c b/src/decoration.c
index ce678e046..987e628c5 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -9,7 +9,7 @@
 #include "task.h"
 #include "main.h"
 #include "palette.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "overworld.h"
 #include "fieldmap.h"
 #include "metatile_behavior.h"
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 60deddf29..032607806 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -10,7 +10,7 @@
 #include "main.h"
 #include "event_data.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "text.h"
 #include "text_window.h"
 #include "string_util.h"
diff --git a/src/event_data.c b/src/event_data.c
index e3742a147..9f1432f17 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -44,7 +44,7 @@ void ClearTempFieldEventData(void)
     FlagClear(FLAG_SYS_ENC_DOWN_ITEM);
     FlagClear(FLAG_SYS_USE_STRENGTH);
     FlagClear(FLAG_SYS_CTRL_OBJ_DELETE);
-    FlagClear(FLAG_SYS_UNKNOWN_880);
+    FlagClear(FLAG_0x880);
 }
 
 // probably had different flag splits at one point.
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index 30aacec94..8d02eef91 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -6,7 +6,7 @@
 #include "decompress.h"
 #include "task.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "palette.h"
 
 // this file's functions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 452035b54..c17921b74 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -16,9 +16,9 @@
 #include "m4a.h"
 #include "menu.h"
 #include "pokedex.h"
-#include "species.h"
+#include "constants/species.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "overworld.h"
 #include "battle_message.h"
 #include "battle_string_ids.h"
@@ -52,6 +52,7 @@ extern u8 gBattleTerrain;
 extern struct SpriteTemplate gUnknown_0202499C;
 extern bool8 gAffineAnimsDisabled;
 extern u16 gMoveToLearn;
+extern const u8 gSpeciesNames[][11];
 
 extern u8 gBattleCommunication[];
 #define sEvoCursorPos           gBattleCommunication[1] // when learning a new move
diff --git a/src/field_poison.c b/src/field_poison.c
index d953ab29c..b83788210 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "string_util.h"
 #include "party_menu.h"
-#include "species.h"
+#include "constants/species.h"
 #include "task.h"
 #include "field_message_box.h"
 #include "strings.h"
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index f92f342eb..d46ddeaa6 100755
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -2,11 +2,11 @@
 #include "task.h"
 #include "sprite.h"
 #include "field_map_obj.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "palette.h"
 #include "script.h"
-#include "vars.h"
+#include "constants/vars.h"
 #include "event_data.h"
 #include "main.h"
 
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index c5394834b..52babe346 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -9,12 +9,12 @@
 #include "gpu_regs.h"
 #include "main.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "decompress.h"
 #include "save.h"
 #include "window.h"
 #include "bg.h"
-#include "species.h"
+#include "constants/species.h"
 #include "constants/game_stat.h"
 #include "blend_palette.h"
 #include "string_util.h"
@@ -58,6 +58,7 @@ extern struct MusicPlayerInfo gMPlay_BGM;
 extern MainCallback gGameContinueCallback;
 extern u32 gDamagedSaveSectors;
 extern u8 gReservedSpritePaletteCount;
+extern const u8 gSpeciesNames[][11];
 
 #define HALL_OF_FAME_MAX_TEAMS 50
 
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index a6019e691..2ded9c943 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -4,7 +4,7 @@
 #include "pokemon.h"
 #include "constants/items.h"
 #include "random.h"
-#include "species.h"
+#include "constants/species.h"
 #include "string_util.h"
 #include "text.h"
 
diff --git a/src/mail.c b/src/mail.c
index f56e05c44..877035fb6 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -15,7 +15,7 @@
 #include "gpu_regs.h"
 #include "bg.h"
 #include "pokemon_icon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "malloc.h"
 #include "easy_chat.h"
 #include "mail_data.h"
diff --git a/src/pokeball.c b/src/pokeball.c
index 728145791..127ba8e9d 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -6,12 +6,12 @@
 #include "battle_anim.h"
 #include "task.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "trig.h"
 #include "main.h"
 #include "m4a.h"
 #include "decompress.h"
-#include "species.h"
+#include "constants/species.h"
 #include "util.h"
 #include "graphics.h"
 
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index e9bf14a41..a4d00112b 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -4,7 +4,7 @@
 #include "event_data.h"
 #include "random.h"
 #include "sprite.h"
-#include "species.h"
+#include "constants/species.h"
 #include "text.h"
 #include "string_util.h"
 
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index b0ee4a7d9..a419dd46e 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -7,13 +7,13 @@
 #include "rtc.h"
 #include "item.h"
 #include "battle.h"
-#include "species.h"
+#include "constants/species.h"
 #include "link.h"
 #include "constants/hold_effects.h"
 #include "random.h"
 #include "trainer_classes.h"
 #include "trainer_ids.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "m4a.h"
 #include "task.h"
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index ec0103bc7..fe3b3e8dd 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "pokemon_size_record.h"
 #include "event_data.h"
-#include "species.h"
+#include "constants/species.h"
 #include "string_util.h"
 #include "text.h"
 #include "pokemon.h"
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index f82a52d38..bdf4427c7 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "pokemon_storage_system.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "event_data.h"
 #include "string_util.h"
 #include "text.h"
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 3e99fe375..b00979945 100755
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -8,12 +8,12 @@
 #include "m4a.h"
 #include "main.h"
 #include "malloc.h"
-#include "moves.h"
+#include "constants/moves.h"
 #include "palette.h"
 #include "pokemon.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "species.h"
+#include "constants/species.h"
 #include "sprite.h"
 #include "unk_text_util.h"
 #include "string_util.h"
diff --git a/src/region_map.c b/src/region_map.c
index a3066b77e..b7fc625ca 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -17,7 +17,7 @@
 #include "international_string_util.h"
 #include "strings.h"
 #include "text_window.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "m4a.h"
 #include "field_effect.h"
 #include "region_map.h"
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 4ad1971fd..a034ca089 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -10,7 +10,7 @@
 #include "battle_controllers.h"
 #include "link.h"
 #include "sprite.h"
-#include "species.h"
+#include "constants/species.h"
 #include "battle_interface.h"
 
 extern u16 gBattle_BG0_X;
diff --git a/src/roamer.c b/src/roamer.c
index bce85dffd..fbd25bfad 100644
--- a/src/roamer.c
+++ b/src/roamer.c
@@ -2,7 +2,7 @@
 #include "roamer.h"
 #include "pokemon.h"
 #include "random.h"
-#include "species.h"
+#include "constants/species.h"
 #include "event_data.h"
 
 enum
diff --git a/src/secret_base.c b/src/secret_base.c
index 7a1f0158e..6d66e6576 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -12,7 +12,7 @@
 #include "new_menu_helpers.h"
 #include "menu_indicators.h"
 #include "constants/maps.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "overworld.h"
 #include "fieldmap.h"
diff --git a/src/sound.c b/src/sound.c
index a95511ece..086fede67 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -5,7 +5,7 @@
 #include "m4a.h"
 #include "main.h"
 #include "pokemon.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "task.h"
 
 struct Fanfare
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 6be362caf..82f8f75f6 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -12,7 +12,7 @@
 #include "decompress.h"
 #include "menu.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "event_data.h"
 #include "pokedex.h"
 #include "data2.h"
diff --git a/src/tv.c b/src/tv.c
index 282396c6f..1605be29c 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -14,8 +14,8 @@
 #include "pokemon_storage_system.h"
 #include "field_message_box.h"
 #include "easy_chat.h"
-#include "species.h"
-#include "moves.h"
+#include "constants/species.h"
+#include "constants/moves.h"
 #include "battle.h"
 #include "battle_tower.h"
 #include "contest.h"
@@ -38,6 +38,9 @@
 #include "secret_base.h"
 #include "tv.h"
 
+extern const u8 gSpeciesNames[][11];
+extern const u8 gMoveNames[][13];
+
 // Static type declarations
 
 #define rbernoulli(num, den) TV_BernoulliTrial(0xFFFF * (num) / (den))
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 5c85ef971..705c4416c 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "wild_encounter.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "metatile_behavior.h"
 #include "fieldmap.h"
 #include "random.h"
-- 
cgit v1.2.3


From 435167674968749684710d7ad5c4f628c6b4ae86 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 16 Dec 2017 00:08:23 +0100
Subject: decompile more of pokeblock.s

---
 src/battle_controller_safari.c |   7 +-
 src/daycare.c                  |   9 +-
 src/decoration.c               |  24 +-
 src/new_game.c                 |   3 +-
 src/pokeblock.c                | 817 ++++++++++++++++++++++++++++++++++++++++-
 src/secret_base.c              |  24 +-
 6 files changed, 849 insertions(+), 35 deletions(-)

(limited to 'src')

diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 2ec14cab5..5cfeb6da6 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -19,6 +19,7 @@
 #include "reshow_battle_screen.h"
 #include "pokeball.h"
 #include "data2.h"
+#include "pokeblock.h"
 
 extern u32 gBattleExecBuffer;
 extern u8 gActiveBank;
@@ -291,13 +292,13 @@ static void CompleteOnSpecialAnimDone(void)
         SafariBufferExecCompleted();
 }
 
-static void OpenPokeblockCase(void)
+static void SafariOpenPokeblockCase(void)
 {
     if (!gPaletteFade.active)
     {
         gBattleBankFunc[gActiveBank] = CompleteWhenChosePokeblock;
         FreeAllWindowBuffers();
-        sub_81358F4();
+        OpenPokeblockCaseInBattle();
     }
 }
 
@@ -497,7 +498,7 @@ static void SafariHandleChooseItem(void)
     s32 i;
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-    gBattleBankFunc[gActiveBank] = OpenPokeblockCase;
+    gBattleBankFunc[gActiveBank] = SafariOpenPokeblockCase;
     gBankInMenu = gActiveBank;
 }
 
diff --git a/src/daycare.c b/src/daycare.c
index 1c0548058..5866f274d 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -40,7 +40,7 @@ extern const u8 gDaycareText_PlayOther[];
 
 extern u8 GetCursorSelectionMonId(void);
 extern u16 ItemIdToBattleMoveId(u16);
-extern s32 ListMenuHandleInput(u8);
+extern s32 ListMenuHandleInputGetItemId(u8);
 extern void sub_81AE6C8(u8, u16*, u16*);
 extern void sub_819746C(u8, bool8);
 extern void sub_81973FC(u8, bool8);
@@ -75,7 +75,7 @@ static const struct ListMenuItem sLevelMenuItems[] =
 static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
 {
     .items = sLevelMenuItems,
-    .unk_04 = sub_81AF078,
+    .moveCursorFunc = sub_81AF078,
     .unk_08 = DaycarePrintMonInfo,
     .totalItems = 3,
     .maxShowed = 3,
@@ -90,7 +90,8 @@ static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
     .unk_16_0 = TRUE,
     .spaceBetweenItems = 0,
     .unk_16_7 = FALSE,
-    .unk_17_0 = 1
+    .unk_17_0 = 1,
+    .cursorKind = 0
 };
 
 static const u8 *const sCompatibilityMessages[] =
@@ -1256,7 +1257,7 @@ static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y)
 
 static void Task_HandleDaycareLevelMenuInput(u8 taskId)
 {
-    u32 var = ListMenuHandleInput(gTasks[taskId].tMenuListTaskId);
+    u32 var = ListMenuHandleInputGetItemId(gTasks[taskId].tMenuListTaskId);
 
     if (gMain.newKeys & A_BUTTON)
     {
diff --git a/src/decoration.c b/src/decoration.c
index e4c84d0b9..974b60c7a 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -791,17 +791,17 @@ void sub_8127330(u8 taskId)
     for (i = 0; i < sDecorPCBuffer->unk_520 - 1; i ++)
     {
         sub_8127454(sDecorPCBuffer->names[i], gCurDecorInventoryItems[i]);
-        sDecorPCBuffer->items[i].unk_00 = sDecorPCBuffer->names[i];
-        sDecorPCBuffer->items[i].unk_04 = i;
+        sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i];
+        sDecorPCBuffer->items[i].id = i;
     }
     StringCopy(sDecorPCBuffer->names[i], gText_Cancel);
-    sDecorPCBuffer->items[i].unk_00 = sDecorPCBuffer->names[i];
-    sDecorPCBuffer->items[i].unk_04 = -2;
-    gUnknown_03006310 = gUnknown_085A6BD0;
-    gUnknown_03006310.unk_10 = sDecorMenuWindowIndices[1];
-    gUnknown_03006310.totalItems = sDecorPCBuffer->unk_520;
-    gUnknown_03006310.items = sDecorPCBuffer->items;
-    gUnknown_03006310.maxShowed = sDecorPCBuffer->unk_521;
+    sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i];
+    sDecorPCBuffer->items[i].id = -2;
+    gMultiuseListMenuTemplate = gUnknown_085A6BD0;
+    gMultiuseListMenuTemplate.unk_10 = sDecorMenuWindowIndices[1];
+    gMultiuseListMenuTemplate.totalItems = sDecorPCBuffer->unk_520;
+    gMultiuseListMenuTemplate.items = sDecorPCBuffer->items;
+    gMultiuseListMenuTemplate.maxShowed = sDecorPCBuffer->unk_521;
 }
 
 void sub_8127454(u8 *dest, u16 decorId)
@@ -870,7 +870,7 @@ void sub_812759C(u8 taskId)
     sub_81272C8();
     sub_81272F8();
     sub_8127330(taskId);
-    data[13] = ListMenuInit(&gUnknown_03006310, sSecretBasePCSelectDecorPageNo, sSecretBasePCSelectDecorLineNo);
+    data[13] = ListMenuInit(&gMultiuseListMenuTemplate, sSecretBasePCSelectDecorPageNo, sSecretBasePCSelectDecorLineNo);
     sub_8127500();
 }
 
@@ -888,8 +888,8 @@ void sub_812764C(u8 taskId)
     data = gTasks[taskId].data;
     if (!gPaletteFade.active)
     {
-        input = ListMenuHandleInput(data[13]);
-        get_coro_args_x18_x1A(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
+        input = ListMenuHandleInputGetItemId(data[13]);
+        sub_81AE860(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
         switch (input)
         {
             case -1:
diff --git a/src/new_game.c b/src/new_game.c
index 12873fec9..89771e92b 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -33,7 +33,6 @@ extern void Overworld_SetWarpDestination(s8 mapBank, s8 mapNo, s8 warpNo, s8 xPo
 extern void warp_in(void);
 extern void sub_80BB358(void);
 extern void ResetBagScrollPositions(void);
-extern void sub_813624C(void); // clears something pokeblock related
 extern void ResetPokedex(void);
 extern void sub_8084400(void);
 extern void ClearMailData(void);
@@ -148,7 +147,7 @@ void sub_808447C(void)
     ZeroPlayerPartyMons();
     ZeroEnemyPartyMons();
     ResetBagScrollPositions();
-    sub_813624C();
+    ResetPokeblockScrollPositions();
 }
 
 void NewGameInitData(void)
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 4c8a9504f..6ea487bb2 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -8,6 +8,59 @@
 #include "menu_helpers.h"
 #include "pokemon.h"
 #include "graphics.h"
+#include "malloc.h"
+#include "main.h"
+#include "battle.h"
+#include "battle_controllers.h"
+#include "palette.h"
+#include "unknown_task.h"
+#include "list_menu.h"
+#include "gpu_regs.h"
+#include "decompress.h"
+#include "international_string_util.h"
+#include "item.h"
+#include "items.h"
+#include "string_util.h"
+#include "songs.h"
+#include "sound.h"
+#include "berry.h"
+#include "menu_indicators.h"
+#include "event_data.h"
+
+#define FIELD_E75_COUNT 7
+
+struct PokeblockMenuStruct
+{
+    u8 tilemap[0x800];
+    void (*debugCallback)(void);
+    const u8 *pokeblockOptions;
+    u8 optionsNo;
+    u8 caseId;
+    u8 itemsNo;
+    u8 maxShowed;
+    struct ListMenuItem items[POKEBLOCKS_COUNT + 1];
+    u8 menuItemsStrings[POKEBLOCKS_COUNT + 1][0x20]; // + 1 because of STOW CASE item
+    u8 pokeblockCaseSpriteId;
+    u8 field_E75[FIELD_E75_COUNT];
+    u8 unkTaskId;
+    bool8 isSwapping;
+    s16 gfxState;
+    u8 field_E80;
+    u8 field_E81;
+    u8 field_E82;
+    u8 field_E83;
+    u8 field_E84;
+    u8 field_E85;
+    u8 field_E86;
+    u8 field_E87;
+};
+
+struct PokeblockSavedData
+{
+    void (*callback)(void);
+    u16 lastItemPos;
+    u16 lastItemPage;
+};
 
 enum
 {
@@ -19,7 +72,33 @@ enum
     PKBL_GIVE_TO_LADY
 };
 
+extern u16 gSpecialVar_ItemId;
+extern void (*gFieldCallback)(void);
+
+extern const u16 gUnknown_0860F074[];
+
+extern void c2_exit_to_overworld_2_switch(void);
+extern bool8 sub_81221EC(void);
+extern void sub_809882C(u8, u16, u8);
+extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8);
+extern void sub_80AF168(void);
+
 // this file's functions
+void CB2_InitPokeblockMenu(void);
+bool8 InitPokeblockMenu(void);
+static bool8 LoadPokeblockMenuGfx(void);
+static void HandleInitBackgrounds(void);
+static void HandleInitWindows(void);
+void SetMenuItemsCountAndMaxShowed(void);
+void sub_81362E0(void);
+void sub_8136344(void);
+void HandlePokeblockListMenuItems(void);
+void sub_81363BC(void);
+static void MovePokeblockMenuCursor(u32 pkblId, bool8 arg1, struct ListMenu *arg2);
+static void PutPokeblockInfoText(void);
+void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1);
+static void PutPokeblockListMenuString(u8 *dst, u16 pkblId);
+void Task_HandlePokeblockMenuInput(u8 taskId);
 void PokeblockAction_UseOnField(u8 taskId);
 void PokeblockAction_Toss(u8 taskId);
 void PokeblockAction_Cancel(u8 taskId);
@@ -28,6 +107,16 @@ void PokeblockAction_UseOnPokeblockFeeder(u8 taskId);
 void PokeblockAction_GiveToContestLady(u8 taskId);
 void TossPokeblockChoice_Yes(u8 taskId);
 void TossPokeblockChoice_No(u8 taskId);
+void Task_FreeDataAndExitPokeblockCase(u8 taskId);
+void PutPokeblockOptionsWindow(u8 taskId);
+static void Task_HandlePokeblocksSwapInput(u8 taskId);
+static void sub_8136470(struct Sprite *sprite);
+static void sub_8135FCC(s32 pkblId);
+void HandlePokeblocksSwap(u8 taskId, bool8 noSwap);
+
+// ram variables
+EWRAM_DATA struct PokeblockSavedData sSavedPokeblockData = {0};
+EWRAM_DATA struct PokeblockMenuStruct *sPokeblockMenu = NULL;
 
 // const rom data
 const s8 gPokeblockFlavorCompatibilityTable[] =
@@ -60,7 +149,7 @@ const s8 gPokeblockFlavorCompatibilityTable[] =
           0,      0,    0,     0,     0  // Quirky
 };
 
-const struct BgTemplate gUnknown_085B2620[] =
+static const struct BgTemplate sBgTemplatesForPokeblockMenu[] =
 {
     {
         .bg = 0,
@@ -181,7 +270,7 @@ const struct CompressedSpritePalette gPokeblockCase_SpritePal =
     gMenuPokeblockDevice_Pal, GFX_TAG_POKEBLOCK_CASE
 };
 
-const struct SpriteTemplate sSpriteTemplate_PokeblockCase =
+static const struct SpriteTemplate sSpriteTemplate_PokeblockCase =
 {
     GFX_TAG_POKEBLOCK_CASE,
     GFX_TAG_POKEBLOCK_CASE,
@@ -202,3 +291,727 @@ const struct Pokeblock sFavoritePokeblocksTable[] =
     { PBLOCK_CLR_GREEN,   0,  0,  0, 20,  0, 20},
     { PBLOCK_CLR_YELLOW,  0,  0,  0,  0, 20, 20}
 };
+
+static const struct WindowTemplate sWindowTemplatesForPokeblockMenu[] =
+{
+    {0, 2, 1, 9, 2, 0xF, 0x1E},
+    {0, 0xF, 1, 0xE, 0x12, 0xF, 0x30},
+    {0, 2, 0xD, 5, 2, 0xF, 0x12C},
+    {0, 2, 0xF, 5, 2, 0xF, 0x136},
+    {0, 2, 0x11, 5, 2, 0xF, 0x140},
+    {0, 8, 0xD, 5, 2, 0xF, 0x14A},
+    {0, 8, 0xF, 5, 2, 0xF, 0x154},
+    {0, 0xB, 0x11, 2, 2, 0xF, 0x15E},
+    {1, 7, 5, 6, 6, 0xF, 0x162},
+    {1, 7, 7, 6, 4, 0xF, 0x186},
+    {1, 2, 0xF, 0x1B, 4, 0xF, 0x19E},
+    DUMMY_WIN_TEMPLATE
+};
+
+const struct WindowTemplate gUnknown_085B27A8[] = {1, 0x15, 9, 5, 4, 0xF, 0x20A};
+
+static const struct ListMenuTemplate sPokeblockListMenuTemplate =
+{
+    .items = NULL,
+    .moveCursorFunc = MovePokeblockMenuCursor,
+    .unk_08 = NULL,
+    .totalItems = 0,
+    .maxShowed = 0,
+    .unk_10 = 1,
+    .unk_11 = 0,
+    .unk_12 = 1,
+    .cursor_Y = 0,
+    .upText_Y = 1,
+    .cursorColor = 2,
+    .fillColor = 0,
+    .cursorShadowColor = 3,
+    .unk_16_0 = FALSE,
+    .spaceBetweenItems = 32,
+    .unk_16_7 = FALSE,
+    .unk_17_0 = 1,
+    .cursorKind = 1
+};
+
+// code
+void OpenPokeblockCase(u8 caseId, void (*callback)(void))
+{
+    sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu));
+    sPokeblockMenu->caseId = caseId;
+    sPokeblockMenu->debugCallback = NULL;
+    sPokeblockMenu->unkTaskId = 0xFF;
+    sPokeblockMenu->isSwapping = FALSE;
+    sSavedPokeblockData.callback = callback;
+
+    switch (sPokeblockMenu->caseId)
+    {
+    case PBLOCK_CASE_BATTLE:
+        sPokeblockMenu->pokeblockOptions = sActionsInBattle;
+        sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsInBattle);
+        break;
+    case PBLOCK_CASE_FEEDER:
+        sPokeblockMenu->pokeblockOptions = sActionsOnPokeblockFeeder;
+        sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsOnPokeblockFeeder);
+        break;
+    case PBLOCK_CASE_GIVE:
+        sPokeblockMenu->pokeblockOptions = sActionsWhenGivingToLady;
+        sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsWhenGivingToLady);
+        break;
+    default:
+        sPokeblockMenu->pokeblockOptions = sActionsOnField;
+        sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsOnField);
+        break;
+    }
+
+    SetMainCallback2(CB2_InitPokeblockMenu);
+}
+
+void OpenPokeblockCaseInBattle(void)
+{
+    OpenPokeblockCase(PBLOCK_CASE_BATTLE, SetCB2ToReshowScreenAfterMenu2);
+}
+
+void OpenPokeblockCaseOnFeeder(void)
+{
+    OpenPokeblockCase(PBLOCK_CASE_FEEDER, c2_exit_to_overworld_2_switch);
+}
+
+static void CB2_PokeblockMenu(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    do_scheduled_bg_tilemap_copies_to_vram();
+    UpdatePaletteFade();
+}
+
+static void VBlankCB_PokeblockMenu(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void CB2_InitPokeblockMenu(void)
+{
+    while (1)
+    {
+        if (sub_81221EC() == TRUE)
+            break;
+        if (InitPokeblockMenu() == TRUE)
+            break;
+        if (sub_81221AC() == TRUE)
+            break;
+    }
+}
+
+bool8 InitPokeblockMenu(void)
+{
+    u8 taskId;
+
+    switch (gMain.state)
+    {
+    case 0:
+        SetVBlankHBlankCallbacksToNull();
+        clear_scheduled_bg_copies_to_vram();
+        gMain.state++;
+        break;
+    case 1:
+        remove_some_task();
+        gMain.state++;
+        break;
+    case 2:
+        FreeAllSpritePalettes();
+        gMain.state++;
+        break;
+    case 3:
+        ResetPaletteFade();
+        gPaletteFade.bufferTransferDisabled = 1;
+        gMain.state++;
+        break;
+    case 4:
+        ResetSpriteData();
+        gMain.state++;
+        break;
+    case 5:
+        if (sPokeblockMenu->caseId != PBLOCK_CASE_BATTLE)
+            ResetTasks();
+        gMain.state++;
+        break;
+    case 6:
+        HandleInitBackgrounds();
+        sPokeblockMenu->gfxState = 0;
+        gMain.state++;
+        break;
+    case 7:
+        if (!LoadPokeblockMenuGfx())
+            return FALSE;
+        gMain.state++;
+        break;
+    case 8:
+        SetMenuItemsCountAndMaxShowed();
+        sub_81362E0();
+        sub_8136344();
+        gMain.state++;
+        break;
+    case 9:
+        sPokeblockMenu->pokeblockCaseSpriteId = CreatePokeblockCaseSprite(56, 64, 0);
+        gMain.state++;
+        break;
+    case 10:
+        sub_8122344(&sPokeblockMenu->field_E75, FIELD_E75_COUNT);
+        gMain.state++;
+        break;
+    case 11:
+        HandlePokeblockMenuCursor(sSavedPokeblockData.lastItemPos, 0x1005);
+        gMain.state++;
+        break;
+    case 12:
+        HandleInitWindows();
+        gMain.state++;
+        break;
+    case 13:
+        HandlePokeblockListMenuItems();
+        gMain.state++;
+        break;
+    case 14:
+        sub_81363BC();
+        gMain.state++;
+        break;
+    case 15:
+        taskId = CreateTask(Task_HandlePokeblockMenuInput, 0);
+        gTasks[taskId].data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sSavedPokeblockData.lastItemPage, sSavedPokeblockData.lastItemPos);
+        gMain.state++;
+        break;
+    case 16:
+        PutPokeblockInfoText();
+        gMain.state++;
+        break;
+    case 17:
+        BlendPalettes(-1, 0x10, 0);
+        gMain.state++;
+        break;
+    case 18:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        gPaletteFade.bufferTransferDisabled = 0;
+        gMain.state++;
+        break;
+    default:
+        SetVBlankCallback(VBlankCB_PokeblockMenu);
+        SetMainCallback2(CB2_PokeblockMenu);
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static void HandleInitBackgrounds(void)
+{
+    ResetVramOamAndBgCntRegs();
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, sBgTemplatesForPokeblockMenu, ARRAY_COUNT(sBgTemplatesForPokeblockMenu));
+    SetBgTilemapBuffer(2, sPokeblockMenu->tilemap);
+    ResetAllBgsCoordinates();
+    schedule_bg_copy_tilemap_to_vram(2);
+
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+
+    ShowBg(0);
+    ShowBg(1);
+    ShowBg(2);
+
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+}
+
+static bool8 LoadPokeblockMenuGfx(void)
+{
+    switch (sPokeblockMenu->gfxState)
+    {
+    case 0:
+        reset_temp_tile_data_buffers();
+        decompress_and_copy_tile_data_to_vram(2, gMenuPokeblock_Gfx, 0, 0, 0);
+        sPokeblockMenu->gfxState++;
+        break;
+    case 1:
+        if (free_temp_tile_data_buffers_if_possible() != TRUE)
+        {
+            LZDecompressWram(gMenuPokeblock_Tilemap, sPokeblockMenu->tilemap);
+            sPokeblockMenu->gfxState++;
+        }
+        break;
+    case 2:
+        LoadCompressedPalette(gMenuPokeblock_Pal, 0, 0xC0);
+        sPokeblockMenu->gfxState++;
+        break;
+    case 3:
+        LoadCompressedObjectPic(&gPokeblockCase_SpriteSheet);
+        sPokeblockMenu->gfxState++;
+        break;
+    case 4:
+        LoadCompressedObjectPalette(&gPokeblockCase_SpritePal);
+        sPokeblockMenu->gfxState++;
+        break;
+    case 5:
+        LoadListMenuArrowsGfx();
+        sPokeblockMenu->gfxState = 0;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static void HandleInitWindows(void)
+{
+    u8 i;
+
+    InitWindows(sWindowTemplatesForPokeblockMenu);
+    DeactivateAllTextPrinters();
+    sub_809882C(0, 1, 0xE0);
+    copy_textbox_border_tile_patterns_to_vram(0, 0xA, 0xD0);
+    LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
+
+    for (i = 0; i < ARRAY_COUNT(sWindowTemplatesForPokeblockMenu) - 1; i++)
+    {
+        FillWindowPixelBuffer(i, 0);
+    }
+
+    schedule_bg_copy_tilemap_to_vram(0);
+    schedule_bg_copy_tilemap_to_vram(1);
+}
+
+void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x)
+{
+    AddTextPrinterParametrized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string);
+}
+
+static void PutPokeblockInfoText(void)
+{
+    u8 i;
+
+    const u8 *itemName = ItemId_GetItem(ITEM_POKEBLOCK_CASE)->name;
+    PrintOnPokeblockWindow(0, itemName, GetStringCenterAlignXOffset(1, itemName, 0x48));
+
+    PrintOnPokeblockWindow(2, gText_Spicy, 0);
+    PrintOnPokeblockWindow(3, gText_Dry, 0);
+    PrintOnPokeblockWindow(4, gText_Sweet, 0);
+    PrintOnPokeblockWindow(5, gText_Bitter, 0);
+    PrintOnPokeblockWindow(6, gText_Sour, 0);
+
+    for (i = 0; i < 8; i++)
+    {
+        PutWindowTilemap(i);
+    }
+}
+
+void HandlePokeblockListMenuItems(void)
+{
+    u16 i;
+
+    for (i = 0; i < sPokeblockMenu->itemsNo - 1; i++)
+    {
+        PutPokeblockListMenuString(sPokeblockMenu->menuItemsStrings[i], i);
+        sPokeblockMenu->items[i].name = sPokeblockMenu->menuItemsStrings[i];
+        sPokeblockMenu->items[i].id = i;
+    }
+
+    StringCopy(sPokeblockMenu->menuItemsStrings[i], gText_StowCase);
+    sPokeblockMenu->items[i].name = sPokeblockMenu->menuItemsStrings[i];
+    sPokeblockMenu->items[i].id = LIST_B_PRESSED;
+
+    gMultiuseListMenuTemplate = sPokeblockListMenuTemplate;
+    gMultiuseListMenuTemplate.unk_17_0 = 7;
+    gMultiuseListMenuTemplate.totalItems = sPokeblockMenu->itemsNo;
+    gMultiuseListMenuTemplate.items = sPokeblockMenu->items;
+    gMultiuseListMenuTemplate.maxShowed = sPokeblockMenu->maxShowed;
+}
+
+static void PutPokeblockListMenuString(u8 *dst, u16 pkblId)
+{
+    struct Pokeblock *pkblock = &gSaveBlock1Ptr->pokeblocks[pkblId];
+    u8 *txtPtr = StringCopy(dst, gPokeblockNames[pkblock->color]);
+
+    *(txtPtr++) = EXT_CTRL_CODE_BEGIN;
+    *(txtPtr++) = 0x12;
+    *(txtPtr++) = 0x57;
+
+    ConvertIntToDecimalStringN(gStringVar1, GetHighestPokeblocksFlavorLevel(pkblock), STR_CONV_MODE_LEFT_ALIGN, 3);
+    StringExpandPlaceholders(txtPtr, gText_LvVar1);
+}
+
+static void MovePokeblockMenuCursor(u32 pkblId, bool8 arg1, struct ListMenu *arg2)
+{
+    if (arg1 != TRUE)
+    {
+        PlaySE(SE_SELECT);
+        gSprites[sPokeblockMenu->pokeblockCaseSpriteId].callback = sub_8136470;
+    }
+
+    if (!sPokeblockMenu->isSwapping)
+        sub_8135FCC(pkblId);
+}
+
+static void sub_8135FCC(s32 pkblId)
+{
+    u8 i;
+    struct Pokeblock *pokeblock;
+    u16 rectTilemapSrc[2];
+
+    FillWindowPixelBuffer(7, 0);
+
+    if (pkblId != LIST_B_PRESSED)
+    {
+        pokeblock = &gSaveBlock1Ptr->pokeblocks[pkblId];
+        rectTilemapSrc[0] = 0x17;
+        rectTilemapSrc[1] = 0x18;
+        for (i = 0; i < FLAVOR_COUNT; i++)
+        {
+            if (GetPokeblockData(pokeblock, PBLOCK_SPICY + i) > 0)
+            {
+                rectTilemapSrc[0] = (i << 0xC) + 0x17;
+                rectTilemapSrc[1] = (i << 0xC) + 0x18;
+            }
+            else
+            {
+                rectTilemapSrc[0] = 0xF;
+                rectTilemapSrc[1] = 0xF;
+            }
+            CopyToBgTilemapBufferRect(2, rectTilemapSrc, (i / 3 * 6) + 1, (i % 3 * 2) + 13, 1, 2);
+        }
+        ConvertIntToDecimalStringN(gStringVar1, GetPokeblocksFeel(pokeblock), STR_CONV_MODE_RIGHT_ALIGN, 2);
+        PrintOnPokeblockWindow(7, gStringVar1, 4);
+    }
+    else
+    {
+        rectTilemapSrc[0] = 0xF;
+        rectTilemapSrc[1] = 0xF;
+
+        for (i = 0; i < FLAVOR_COUNT; i++)
+        {
+            CopyToBgTilemapBufferRect(2, rectTilemapSrc, (i / 3 * 6) + 1, (i % 3 * 2) + 13, 1, 2);
+        }
+        CopyWindowToVram(7, 2);
+    }
+
+    schedule_bg_copy_tilemap_to_vram(0);
+    schedule_bg_copy_tilemap_to_vram(2);
+}
+
+void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1)
+{
+    FillBgTilemapBufferRect_Palette0(2, arg1, 0xF, (cursorPos * 2) + 1, 0xE, 2);
+    schedule_bg_copy_tilemap_to_vram(2);
+}
+
+void CompactPokeblockSlots(void)
+{
+    u16 i, j;
+
+    for (i = 0; i < POKEBLOCKS_COUNT - 1; i++)
+    {
+        for (j = i + 1; j < POKEBLOCKS_COUNT; j++)
+        {
+            if (gSaveBlock1Ptr->pokeblocks[i].color == 0)
+            {
+                struct Pokeblock temp = gSaveBlock1Ptr->pokeblocks[i];
+                gSaveBlock1Ptr->pokeblocks[i] = gSaveBlock1Ptr->pokeblocks[j];
+                gSaveBlock1Ptr->pokeblocks[j] = temp;
+            }
+        }
+    }
+}
+
+void SwapSortPokeblocksInternalData(u32 id1, u32 id2)
+{
+    s16 i, count;
+    struct Pokeblock *pokeblocks = gSaveBlock1Ptr->pokeblocks;
+    struct Pokeblock *copyPokeblock1;
+
+    if (id1 == id2)
+        return;
+
+    copyPokeblock1 = Alloc(sizeof(struct Pokeblock));
+    *copyPokeblock1 = pokeblocks[id1];
+
+    if (id2 > id1)
+    {
+        id2--;
+        for (count = id2, i = id1; i < count; i++)
+            pokeblocks[i] = pokeblocks[i + 1];
+    }
+    else
+    {
+        for (count = id2, i = id1; i > count; i--)
+            pokeblocks[i] = pokeblocks[i - 1];
+    }
+
+    pokeblocks[id2] = *copyPokeblock1;
+    Free(copyPokeblock1);
+}
+
+void ResetPokeblockScrollPositions(void)
+{
+    sSavedPokeblockData.lastItemPos = 0;
+    sSavedPokeblockData.lastItemPage = 0;
+}
+
+void SetMenuItemsCountAndMaxShowed(void)
+{
+    u16 i;
+
+    CompactPokeblockSlots();
+
+    for (sPokeblockMenu->itemsNo = 0, i = 0; i < POKEBLOCKS_COUNT; i++)
+    {
+        if (gSaveBlock1Ptr->pokeblocks[i].color != 0)
+            sPokeblockMenu->itemsNo++;
+    }
+
+    sPokeblockMenu->itemsNo++; // STOW CASE menu item
+
+    if (sPokeblockMenu->itemsNo > 9)
+        sPokeblockMenu->maxShowed = 9;
+    else
+        sPokeblockMenu->maxShowed = sPokeblockMenu->itemsNo;
+}
+
+void sub_81362E0(void)
+{
+    if (sSavedPokeblockData.lastItemPage != 0)
+    {
+        if (sSavedPokeblockData.lastItemPage + sPokeblockMenu->maxShowed > sPokeblockMenu->itemsNo)
+            sSavedPokeblockData.lastItemPage = sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed;
+    }
+
+    if (sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos >= sPokeblockMenu->itemsNo)
+    {
+        if (sPokeblockMenu->itemsNo == 0)
+            sSavedPokeblockData.lastItemPos = 0;
+        else
+            sSavedPokeblockData.lastItemPos = sPokeblockMenu->itemsNo - 1;
+    }
+}
+
+void sub_8136344(void)
+{
+    if (sSavedPokeblockData.lastItemPos > 4)
+    {
+        u8 i;
+
+        for (i = 0;
+             i < sSavedPokeblockData.lastItemPos - 4 && sSavedPokeblockData.lastItemPage + sPokeblockMenu->maxShowed != sPokeblockMenu->itemsNo;
+             sSavedPokeblockData.lastItemPos--, sSavedPokeblockData.lastItemPage++, i++);
+    }
+}
+
+void sub_81363BC(void)
+{
+    if (sPokeblockMenu->unkTaskId == 0xFF)
+    {
+        sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParametrized(2, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed,
+                                                                            0x456, 0x456, &sSavedPokeblockData.lastItemPage);
+    }
+}
+
+void sub_8136418(void)
+{
+    if (sPokeblockMenu->unkTaskId != 0xFF)
+    {
+        RemoveScrollIndicatorArrowPair(sPokeblockMenu->unkTaskId);
+        sPokeblockMenu->unkTaskId = 0xFF;
+    }
+}
+
+u8 CreatePokeblockCaseSprite(s16 x, s16 y, u8 subpriority)
+{
+    return CreateSprite(&sSpriteTemplate_PokeblockCase, x, y, subpriority);
+}
+
+static void sub_8136470(struct Sprite *sprite)
+{
+    if (sprite->data[0] > 1)
+        sprite->data[0] = 0;
+
+    switch (sprite->data[0])
+    {
+    case 0:
+        sprite->oam.affineMode = 1;
+        sprite->affineAnims = sSpriteAffineAnimTable_85B26F0;
+        InitSpriteAffineAnim(sprite);
+        sprite->data[0] = 1;
+        sprite->data[1] = 0;
+        break;
+    case 1:
+        if (++sprite->data[1] > 11)
+        {
+            sprite->oam.affineMode = 0;
+            sprite->data[0] = 0;
+            sprite->data[1] = 0;
+            FreeOamMatrix(sprite->oam.matrixNum);
+            sprite->callback = SpriteCallbackDummy;
+        }
+        break;
+    }
+}
+
+void FadePaletteAndSetTaskToClosePokeblockCase(u8 taskId)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskId].func = Task_FreeDataAndExitPokeblockCase;
+}
+
+void Task_FreeDataAndExitPokeblockCase(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (!gPaletteFade.active)
+    {
+        if (sPokeblockMenu->caseId == PBLOCK_CASE_FEEDER || sPokeblockMenu->caseId == PBLOCK_CASE_GIVE)
+            gFieldCallback = sub_80AF168;
+
+        sub_81AE6C8(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+        sub_8136418();
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+
+        if (sPokeblockMenu->debugCallback != NULL)
+            SetMainCallback2(sPokeblockMenu->debugCallback);
+        else
+            SetMainCallback2(sSavedPokeblockData.callback);
+
+        FreeAllWindowBuffers();
+        Free(sPokeblockMenu);
+        DestroyTask(taskId);
+    }
+}
+
+void Task_HandlePokeblockMenuInput(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (!gPaletteFade.active && sub_81221EC() != TRUE)
+    {
+        if (gMain.newKeys & SELECT_BUTTON)
+        {
+            sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+            if (sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos != sPokeblockMenu->itemsNo - 1)
+            {
+                PlaySE(SE_SELECT);
+                HandlePokeblockMenuCursor(sSavedPokeblockData.lastItemPos, 0x2005);
+                data[2] = sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos;
+                sPokeblockMenu->isSwapping = TRUE;
+                gTasks[taskId].func = Task_HandlePokeblocksSwapInput;
+            }
+        }
+        else
+        {
+            u16 oldPosition = sSavedPokeblockData.lastItemPos;
+            s32 itemId = ListMenuHandleInputGetItemId(data[0]);
+
+            sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+            if (oldPosition != sSavedPokeblockData.lastItemPos)
+            {
+                HandlePokeblockMenuCursor(oldPosition, 5);
+                HandlePokeblockMenuCursor(sSavedPokeblockData.lastItemPos, 0x1005);
+            }
+
+            switch (itemId)
+            {
+            case LIST_NOTHING_CHOSEN:
+                break;
+            case LIST_B_PRESSED:
+                PlaySE(SE_SELECT);
+                gSpecialVar_Result = 0xFFFF;
+                gSpecialVar_ItemId = 0;
+                FadePaletteAndSetTaskToClosePokeblockCase(taskId);
+                break;
+            default:
+                PlaySE(SE_SELECT);
+                gSpecialVar_ItemId = itemId;
+                PutPokeblockOptionsWindow(taskId);
+                break;
+            }
+        }
+    }
+}
+
+static void Task_HandlePokeblocksSwapInput(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (sub_81221EC() == TRUE)
+        return;
+
+    if (gMain.newKeys & SELECT_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+        HandlePokeblocksSwap(taskId, FALSE);
+    }
+    else
+    {
+        u16 i = sSavedPokeblockData.lastItemPage;
+        u16 var = sSavedPokeblockData.lastItemPos;
+        s32 itemId = ListMenuHandleInputGetItemId(data[0]);
+
+        sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+        if (i != sSavedPokeblockData.lastItemPage || var != sSavedPokeblockData.lastItemPos)
+        {
+            for (i = 0; i < 9; i++)
+            {
+                var = i + sSavedPokeblockData.lastItemPage;
+                if (var == data[2])
+                    HandlePokeblockMenuCursor(i, 0x2005);
+                else
+                    HandlePokeblockMenuCursor(i, 5);
+            }
+        }
+
+        sub_81223FC(sPokeblockMenu->field_E75, FIELD_E75_COUNT, 0);
+        sub_8122448(sPokeblockMenu->field_E75, FIELD_E75_COUNT, 0x80, (sSavedPokeblockData.lastItemPos * 16) + 8);
+
+        switch (itemId)
+        {
+        case LIST_NOTHING_CHOSEN:
+            break;
+        case LIST_B_PRESSED: // same id as STOW CASE field
+            PlaySE(SE_SELECT);
+            if (gMain.newKeys & A_BUTTON)
+                HandlePokeblocksSwap(taskId, FALSE);
+            else
+                HandlePokeblocksSwap(taskId, TRUE);
+            break;
+        default:
+            PlaySE(SE_SELECT);
+            HandlePokeblocksSwap(taskId, FALSE);
+            break;
+        }
+    }
+}
+
+void HandlePokeblocksSwap(u8 taskId, bool8 noSwap)
+{
+    u8 i;
+    s16 *data = gTasks[taskId].data;
+    u16 swappedFromId = sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos;
+
+    sPokeblockMenu->isSwapping = FALSE;
+    sub_81AE6C8(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos);
+
+    if (!noSwap && data[2] != swappedFromId && data[2] != swappedFromId - 1)
+    {
+        SwapSortPokeblocksInternalData(data[2], swappedFromId);
+        HandlePokeblockListMenuItems();
+    }
+
+    if (data[2] < swappedFromId)
+        sSavedPokeblockData.lastItemPos--;
+
+    data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sSavedPokeblockData.lastItemPage, sSavedPokeblockData.lastItemPos);
+    schedule_bg_copy_tilemap_to_vram(0);
+    sub_81223FC(sPokeblockMenu->field_E75, FIELD_E75_COUNT, 1);
+
+    for (i = 0; i < 9; i++)
+        HandlePokeblockMenuCursor(i, 5);
+
+    HandlePokeblockMenuCursor(sSavedPokeblockData.lastItemPos, 0x1005);
+    gTasks[taskId].func = Task_HandlePokeblockMenuInput;
+}
diff --git a/src/secret_base.c b/src/secret_base.c
index de2b7221a..2ae093bc2 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1081,13 +1081,13 @@ void game_continue(u8 taskId)
         if (sub_80E9878(i))
         {
             sub_80E9780(gUnknown_0203A020->names[count], i);
-            gUnknown_0203A020->items[count].unk_00 = gUnknown_0203A020->names[count];
-            gUnknown_0203A020->items[count].unk_04 = i;
+            gUnknown_0203A020->items[count].name = gUnknown_0203A020->names[count];
+            gUnknown_0203A020->items[count].id = i;
             count ++;
         }
     }
-    gUnknown_0203A020->items[count].unk_00 = gText_Cancel;
-    gUnknown_0203A020->items[count].unk_04 = -2;
+    gUnknown_0203A020->items[count].name = gText_Cancel;
+    gUnknown_0203A020->items[count].id = -2;
     data[0] = count + 1;
     if (data[0] < 8)
     {
@@ -1097,11 +1097,11 @@ void game_continue(u8 taskId)
     {
         data[3] = 8;
     }
-    gUnknown_03006310 = gUnknown_0858D07C;
-    gUnknown_03006310.unk_10 = data[6];
-    gUnknown_03006310.totalItems = data[0];
-    gUnknown_03006310.items = gUnknown_0203A020->items;
-    gUnknown_03006310.maxShowed = data[3];
+    gMultiuseListMenuTemplate = gUnknown_0858D07C;
+    gMultiuseListMenuTemplate.unk_10 = data[6];
+    gMultiuseListMenuTemplate.totalItems = data[0];
+    gMultiuseListMenuTemplate.items = gUnknown_0203A020->items;
+    gMultiuseListMenuTemplate.maxShowed = data[3];
 }
 
 void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu)
@@ -1118,7 +1118,7 @@ void sub_80E9E00(u8 taskId)
 
     data = gTasks[taskId].data;
     SetStandardWindowBorderStyle(data[6], 0);
-    data[5] = ListMenuInit(&gUnknown_03006310, data[2], data[1]);
+    data[5] = ListMenuInit(&gMultiuseListMenuTemplate, data[2], data[1]);
     sub_80E9E44(taskId);
     schedule_bg_copy_tilemap_to_vram(0);
 }
@@ -1137,8 +1137,8 @@ void sub_80E9E90(u8 taskId)
     s32 input;
 
     data = gTasks[taskId].data;
-    input = ListMenuHandleInput(data[5]);
-    get_coro_args_x18_x1A(data[5], &data[2], &data[1]);
+    input = ListMenuHandleInputGetItemId(data[5]);
+    sub_81AE860(data[5], &data[2], &data[1]);
     switch (input)
     {
         case -1:
-- 
cgit v1.2.3


From bb82032208a328a9332839f55df92c9b73d2c5a0 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 16 Dec 2017 01:15:19 +0100
Subject: battle setup review changes

---
 src/battle_setup.c    | 4 ++--
 src/recorded_battle.c | 2 +-
 src/trainer_see.c     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 774aba9b2..dbb20b148 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -528,8 +528,8 @@ void BattleSetup_StartLegendaryBattle(void)
         CreateBattleStartTask(B_TRANSITION_GROUDON, BGM_BATTLE34);
         break;
     case SPECIES_KYOGRE:
-        gBattleTypeFlags |= BATTLE_TYPE_KYORGE;
-        CreateBattleStartTask(B_TRANSITION_KYORGE, BGM_BATTLE34);
+        gBattleTypeFlags |= BATTLE_TYPE_KYOGRE;
+        CreateBattleStartTask(B_TRANSITION_KYOGRE, BGM_BATTLE34);
         break;
     case SPECIES_RAYQUAZA:
         gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA;
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 4f3fe4ab9..c88229c61 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -19,7 +19,7 @@
                               | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER   \
                               | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI           \
                               | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE           \
-                              | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYORGE | BATTLE_TYPE_RAYQUAZA))
+                              | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA))
 
 extern u32 gBattleTypeFlags;
 extern u16 gTrainerBattleOpponent_A;
diff --git a/src/trainer_see.c b/src/trainer_see.c
index c469e11ed..b30f27347 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -28,7 +28,7 @@ bool8 CheckForTrainersWantingBattle(void)
 
         retVal = CheckIfTrainerWantsBattle(i);
         if (retVal == 2)
-            break; // two trainers has been found
+            break; // two trainers have been found
 
         if (retVal == 0) // no trainers
             continue;
-- 
cgit v1.2.3


From 930fea6fad24692773b930ec7448c59d599844b8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 16 Dec 2017 01:18:31 +0100
Subject: mail review changes

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

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 74a8be2f7..b5afd263d 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -1140,7 +1140,7 @@ static void sub_80379F8(u8 arrayIdPlus)
         gUnknown_02022FF8[i].gender      = GetMonGender(&gPlayerParty[arrayIdPlus + i]);
         StripExtCtrlCodes(gUnknown_02022FF8[i].nickname);
         if (GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE)
-            PadNameString(gUnknown_02022FF8[i].nickname, 0);
+            PadNameString(gUnknown_02022FF8[i].nickname, CHAR_SPACE);
     }
     memcpy(gUnknown_02023058, gUnknown_02022FF8, sizeof(gUnknown_02022FF8));
 }
-- 
cgit v1.2.3


From 5b409d49edfa1102fdbf7a9d860aec387d7a523a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 16 Dec 2017 15:10:29 +0100
Subject: pokeblock.s is decompiled

---
 src/battle_interface.c |   1 -
 src/lilycove_lady.c    |   2 +-
 src/pokeblock.c        | 447 ++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 388 insertions(+), 62 deletions(-)

(limited to 'src')

diff --git a/src/battle_interface.c b/src/battle_interface.c
index 95f1a1111..6a6bf00a2 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -177,7 +177,6 @@ extern const u16 gBattleInterface_BallDisplayPal[];
 extern const u8 gHealthboxElementsGfxTable[][32];
 
 // functions
-extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str); // menu.h
 extern void LoadBattleBarGfx(u8 arg0);
 
 // this file's functions
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index dab2b7768..b1782c588 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -943,7 +943,7 @@ static void sub_818E6B0(u8 sheen)
     }
 }
 
-bool8 sub_818E704(struct Pokeblock *pokeblock)
+bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock)
 {
     u8 sheen;
     bool8 response;
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 6ea487bb2..ba292ee75 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -6,6 +6,7 @@
 #include "menu.h"
 #include "task.h"
 #include "menu_helpers.h"
+#include "new_menu_helpers.h"
 #include "pokemon.h"
 #include "graphics.h"
 #include "malloc.h"
@@ -19,21 +20,25 @@
 #include "decompress.h"
 #include "international_string_util.h"
 #include "item.h"
-#include "items.h"
+#include "constants/items.h"
 #include "string_util.h"
 #include "songs.h"
 #include "sound.h"
 #include "berry.h"
 #include "menu_indicators.h"
 #include "event_data.h"
+#include "battle_message.h"
+#include "safari_zone.h"
+#include "lilycove_lady.h"
 
+#define POKEBLOCK_MAX_FEEL 99
 #define FIELD_E75_COUNT 7
 
 struct PokeblockMenuStruct
 {
     u8 tilemap[0x800];
-    void (*debugCallback)(void);
-    const u8 *pokeblockOptions;
+    void (*callbackOnUse)(void);
+    const u8 *pokeblockOptionsIds;
     u8 optionsNo;
     u8 caseId;
     u8 itemsNo;
@@ -84,39 +89,44 @@ extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8);
 extern void sub_80AF168(void);
 
 // this file's functions
-void CB2_InitPokeblockMenu(void);
-bool8 InitPokeblockMenu(void);
+static void CB2_InitPokeblockMenu(void);
+static bool8 InitPokeblockMenu(void);
 static bool8 LoadPokeblockMenuGfx(void);
 static void HandleInitBackgrounds(void);
 static void HandleInitWindows(void);
-void SetMenuItemsCountAndMaxShowed(void);
-void sub_81362E0(void);
-void sub_8136344(void);
-void HandlePokeblockListMenuItems(void);
-void sub_81363BC(void);
+static void SetMenuItemsCountAndMaxShowed(void);
+static void sub_81362E0(void);
+static void sub_8136344(void);
+static void HandlePokeblockListMenuItems(void);
+static void sub_81363BC(void);
 static void MovePokeblockMenuCursor(u32 pkblId, bool8 arg1, struct ListMenu *arg2);
 static void PutPokeblockInfoText(void);
-void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1);
+static void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1);
 static void PutPokeblockListMenuString(u8 *dst, u16 pkblId);
-void Task_HandlePokeblockMenuInput(u8 taskId);
-void PokeblockAction_UseOnField(u8 taskId);
-void PokeblockAction_Toss(u8 taskId);
-void PokeblockAction_Cancel(u8 taskId);
-void PokeblockAction_UseInBattle(u8 taskId);
-void PokeblockAction_UseOnPokeblockFeeder(u8 taskId);
-void PokeblockAction_GiveToContestLady(u8 taskId);
-void TossPokeblockChoice_Yes(u8 taskId);
-void TossPokeblockChoice_No(u8 taskId);
-void Task_FreeDataAndExitPokeblockCase(u8 taskId);
-void PutPokeblockOptionsWindow(u8 taskId);
+static void Task_HandlePokeblockMenuInput(u8 taskId);
+static void PokeblockAction_UseOnField(u8 taskId);
+static void PokeblockAction_Toss(u8 taskId);
+static void PokeblockAction_Cancel(u8 taskId);
+static void PokeblockAction_UseInBattle(u8 taskId);
+static void PokeblockAction_UseOnPokeblockFeeder(u8 taskId);
+static void PokeblockAction_GiveToContestLady(u8 taskId);
+static void TossPokeblockChoice_Yes(u8 taskId);
+static void TossPokeblockChoice_No(u8 taskId);
+static void Task_FreeDataAndExitPokeblockCase(u8 taskId);
+static void Task_HandlePokeblockOptionsInput(u8 taskId);
+static void PutPokeblockOptionsWindow(u8 taskId);
 static void Task_HandlePokeblocksSwapInput(u8 taskId);
 static void sub_8136470(struct Sprite *sprite);
 static void sub_8135FCC(s32 pkblId);
-void HandlePokeblocksSwap(u8 taskId, bool8 noSwap);
+static void HandlePokeblocksSwap(u8 taskId, bool8 noSwap);
+static void UsePokeblockOnField(void);
+static void ReturnToPokeblockCaseOnField(void);
+static void CreateTossPokeblockYesNoMenu(u8 taskId);
+static void HandleErasePokeblock(u8 taskId);
 
 // ram variables
-EWRAM_DATA struct PokeblockSavedData sSavedPokeblockData = {0};
-EWRAM_DATA struct PokeblockMenuStruct *sPokeblockMenu = NULL;
+EWRAM_DATA static struct PokeblockSavedData sSavedPokeblockData = {0};
+EWRAM_DATA static struct PokeblockMenuStruct *sPokeblockMenu = NULL;
 
 // const rom data
 const s8 gPokeblockFlavorCompatibilityTable[] =
@@ -199,7 +209,7 @@ const u8 *const gPokeblockNames[] =
     gText_GoldPokeblock
 };
 
-const struct MenuAction sPokeblockMenuActions[] =
+static const struct MenuAction sPokeblockMenuActions[] =
 {
     {gMenuText_Use, PokeblockAction_UseOnField},
     {gMenuText_Toss, PokeblockAction_Toss},
@@ -209,12 +219,12 @@ const struct MenuAction sPokeblockMenuActions[] =
     {gMenuText_Give2, PokeblockAction_GiveToContestLady},
 };
 
-const u8 sActionsOnField[] = {PKBL_USE_ON_FIELD, PKBL_TOSS, PKBL_CANCEL};
-const u8 sActionsInBattle[] = {PKBL_USE_IN_BATTLE, PKBL_CANCEL};
-const u8 sActionsOnPokeblockFeeder[] = {PKBL_USE_ON_FEEDER, PKBL_CANCEL};
-const u8 sActionsWhenGivingToLady[] = {PKBL_GIVE_TO_LADY, PKBL_CANCEL};
+static const u8 sActionsOnField[] = {PKBL_USE_ON_FIELD, PKBL_TOSS, PKBL_CANCEL};
+static const u8 sActionsInBattle[] = {PKBL_USE_IN_BATTLE, PKBL_CANCEL};
+static const u8 sActionsOnPokeblockFeeder[] = {PKBL_USE_ON_FEEDER, PKBL_CANCEL};
+static const u8 sActionsWhenGivingToLady[] = {PKBL_GIVE_TO_LADY, PKBL_CANCEL};
 
-const struct YesNoFuncTable sTossYesNoFuncTable = {TossPokeblockChoice_Yes, TossPokeblockChoice_No};
+static const struct YesNoFuncTable sTossYesNoFuncTable = {TossPokeblockChoice_Yes, TossPokeblockChoice_No};
 
 static const u8 sContestStatsMonData[] = {MON_DATA_COOL, MON_DATA_BEAUTY, MON_DATA_CUTE, MON_DATA_SMART, MON_DATA_TOUGH};
 
@@ -246,7 +256,7 @@ static const union AnimCmd *const sSpriteAnimTable_PokeblockCase[] =
     sSpriteAnim_PokeblockCase
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_85B26C8[] =
+static const union AffineAnimCmd sSpriteAffineAnim_85B26C8[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, -2,  2),
     AFFINEANIMCMD_FRAME(0, 0,  2,  4),
@@ -255,9 +265,9 @@ static const union AffineAnimCmd gSpriteAffineAnim_85B26C8[] =
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd *const sSpriteAffineAnimTable_85B26F0[] =
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_85B26F0[] =
 {
-    gSpriteAffineAnim_85B26C8
+    sSpriteAffineAnim_85B26C8
 };
 
 const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet =
@@ -281,9 +291,9 @@ static const struct SpriteTemplate sSpriteTemplate_PokeblockCase =
     SpriteCallbackDummy
 };
 
-const struct TextColor sTextColorInPokeblockMenu = {0, 2, 3};
+static const struct TextColor sTextColorInPokeblockMenu = {0, 2, 3};
 
-const struct Pokeblock sFavoritePokeblocksTable[] =
+static const struct Pokeblock sFavoritePokeblocksTable[] =
 {
     { PBLOCK_CLR_RED,    20,  0,  0,  0,  0, 20},
     { PBLOCK_CLR_BLUE,    0, 20,  0,  0,  0, 20},
@@ -308,7 +318,7 @@ static const struct WindowTemplate sWindowTemplatesForPokeblockMenu[] =
     DUMMY_WIN_TEMPLATE
 };
 
-const struct WindowTemplate gUnknown_085B27A8[] = {1, 0x15, 9, 5, 4, 0xF, 0x20A};
+static const struct WindowTemplate sTossPkblockWindowTemplate = {1, 0x15, 9, 5, 4, 0xF, 0x20A};
 
 static const struct ListMenuTemplate sPokeblockListMenuTemplate =
 {
@@ -337,7 +347,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void))
 {
     sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu));
     sPokeblockMenu->caseId = caseId;
-    sPokeblockMenu->debugCallback = NULL;
+    sPokeblockMenu->callbackOnUse = NULL;
     sPokeblockMenu->unkTaskId = 0xFF;
     sPokeblockMenu->isSwapping = FALSE;
     sSavedPokeblockData.callback = callback;
@@ -345,19 +355,19 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void))
     switch (sPokeblockMenu->caseId)
     {
     case PBLOCK_CASE_BATTLE:
-        sPokeblockMenu->pokeblockOptions = sActionsInBattle;
+        sPokeblockMenu->pokeblockOptionsIds = sActionsInBattle;
         sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsInBattle);
         break;
     case PBLOCK_CASE_FEEDER:
-        sPokeblockMenu->pokeblockOptions = sActionsOnPokeblockFeeder;
+        sPokeblockMenu->pokeblockOptionsIds = sActionsOnPokeblockFeeder;
         sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsOnPokeblockFeeder);
         break;
     case PBLOCK_CASE_GIVE:
-        sPokeblockMenu->pokeblockOptions = sActionsWhenGivingToLady;
+        sPokeblockMenu->pokeblockOptionsIds = sActionsWhenGivingToLady;
         sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsWhenGivingToLady);
         break;
     default:
-        sPokeblockMenu->pokeblockOptions = sActionsOnField;
+        sPokeblockMenu->pokeblockOptionsIds = sActionsOnField;
         sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsOnField);
         break;
     }
@@ -391,7 +401,7 @@ static void VBlankCB_PokeblockMenu(void)
     TransferPlttBuffer();
 }
 
-void CB2_InitPokeblockMenu(void)
+static void CB2_InitPokeblockMenu(void)
 {
     while (1)
     {
@@ -404,7 +414,7 @@ void CB2_InitPokeblockMenu(void)
     }
 }
 
-bool8 InitPokeblockMenu(void)
+static bool8 InitPokeblockMenu(void)
 {
     u8 taskId;
 
@@ -578,7 +588,7 @@ static void HandleInitWindows(void)
     schedule_bg_copy_tilemap_to_vram(1);
 }
 
-void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x)
+static void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x)
 {
     AddTextPrinterParametrized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string);
 }
@@ -602,7 +612,7 @@ static void PutPokeblockInfoText(void)
     }
 }
 
-void HandlePokeblockListMenuItems(void)
+static void HandlePokeblockListMenuItems(void)
 {
     u16 i;
 
@@ -695,13 +705,13 @@ static void sub_8135FCC(s32 pkblId)
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1)
+static void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1)
 {
     FillBgTilemapBufferRect_Palette0(2, arg1, 0xF, (cursorPos * 2) + 1, 0xE, 2);
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-void CompactPokeblockSlots(void)
+static void CompactPokeblockSlots(void)
 {
     u16 i, j;
 
@@ -719,7 +729,7 @@ void CompactPokeblockSlots(void)
     }
 }
 
-void SwapSortPokeblocksInternalData(u32 id1, u32 id2)
+static void SwapSortPokeblocksInternalData(u32 id1, u32 id2)
 {
     s16 i, count;
     struct Pokeblock *pokeblocks = gSaveBlock1Ptr->pokeblocks;
@@ -753,7 +763,7 @@ void ResetPokeblockScrollPositions(void)
     sSavedPokeblockData.lastItemPage = 0;
 }
 
-void SetMenuItemsCountAndMaxShowed(void)
+static void SetMenuItemsCountAndMaxShowed(void)
 {
     u16 i;
 
@@ -773,7 +783,7 @@ void SetMenuItemsCountAndMaxShowed(void)
         sPokeblockMenu->maxShowed = sPokeblockMenu->itemsNo;
 }
 
-void sub_81362E0(void)
+static void sub_81362E0(void)
 {
     if (sSavedPokeblockData.lastItemPage != 0)
     {
@@ -790,7 +800,7 @@ void sub_81362E0(void)
     }
 }
 
-void sub_8136344(void)
+static void sub_8136344(void)
 {
     if (sSavedPokeblockData.lastItemPos > 4)
     {
@@ -802,7 +812,7 @@ void sub_8136344(void)
     }
 }
 
-void sub_81363BC(void)
+static void sub_81363BC(void)
 {
     if (sPokeblockMenu->unkTaskId == 0xFF)
     {
@@ -811,7 +821,7 @@ void sub_81363BC(void)
     }
 }
 
-void sub_8136418(void)
+static void sub_8136418(void)
 {
     if (sPokeblockMenu->unkTaskId != 0xFF)
     {
@@ -852,13 +862,13 @@ static void sub_8136470(struct Sprite *sprite)
     }
 }
 
-void FadePaletteAndSetTaskToClosePokeblockCase(u8 taskId)
+static void FadePaletteAndSetTaskToClosePokeblockCase(u8 taskId)
 {
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
     gTasks[taskId].func = Task_FreeDataAndExitPokeblockCase;
 }
 
-void Task_FreeDataAndExitPokeblockCase(u8 taskId)
+static void Task_FreeDataAndExitPokeblockCase(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -872,8 +882,8 @@ void Task_FreeDataAndExitPokeblockCase(u8 taskId)
         ResetSpriteData();
         FreeAllSpritePalettes();
 
-        if (sPokeblockMenu->debugCallback != NULL)
-            SetMainCallback2(sPokeblockMenu->debugCallback);
+        if (sPokeblockMenu->callbackOnUse != NULL)
+            SetMainCallback2(sPokeblockMenu->callbackOnUse);
         else
             SetMainCallback2(sSavedPokeblockData.callback);
 
@@ -883,7 +893,7 @@ void Task_FreeDataAndExitPokeblockCase(u8 taskId)
     }
 }
 
-void Task_HandlePokeblockMenuInput(u8 taskId)
+static void Task_HandlePokeblockMenuInput(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -987,7 +997,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId)
     }
 }
 
-void HandlePokeblocksSwap(u8 taskId, bool8 noSwap)
+static void HandlePokeblocksSwap(u8 taskId, bool8 noSwap)
 {
     u8 i;
     s16 *data = gTasks[taskId].data;
@@ -1015,3 +1025,320 @@ void HandlePokeblocksSwap(u8 taskId, bool8 noSwap)
     HandlePokeblockMenuCursor(sSavedPokeblockData.lastItemPos, 0x1005);
     gTasks[taskId].func = Task_HandlePokeblockMenuInput;
 }
+
+static void PutPokeblockOptionsWindow(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (sPokeblockMenu->optionsNo == 3)
+        data[1] = 8;
+    else
+        data[1] = 9;
+
+    sub_8136418();
+    SetWindowBorderStyle(data[1], 0, 1, 0xE);
+    sub_81995E4(data[1], sPokeblockMenu->optionsNo, sPokeblockMenuActions, sPokeblockMenu->pokeblockOptionsIds);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[1], sPokeblockMenu->optionsNo, 0);
+    PutWindowTilemap(data[1]);
+    schedule_bg_copy_tilemap_to_vram(1);
+
+    gTasks[taskId].func = Task_HandlePokeblockOptionsInput;
+}
+
+static void Task_HandlePokeblockOptionsInput(u8 taskId)
+{
+    s8 itemId;
+
+    if (sub_81221EC() == TRUE)
+        return;
+
+    itemId = ProcessMenuInputNoWrapAround();
+    if (itemId == MENU_NOTHING_CHOSEN)
+    {
+        return;
+    }
+    else if (itemId == MENU_B_PRESSED)
+    {
+        PlaySE(SE_SELECT);
+        PokeblockAction_Cancel(taskId);
+    }
+    else
+    {
+        PlaySE(SE_SELECT);
+        sPokeblockMenuActions[sPokeblockMenu->pokeblockOptionsIds[itemId]].func.void_u8(taskId);
+    }
+}
+
+static void PokeblockAction_UseOnField(u8 taskId)
+{
+    sPokeblockMenu->callbackOnUse = UsePokeblockOnField;
+    FadePaletteAndSetTaskToClosePokeblockCase(taskId);
+}
+
+static void UsePokeblockOnField(void)
+{
+    ChooseMonToGivePokeblock(&gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId], ReturnToPokeblockCaseOnField);
+}
+
+static void ReturnToPokeblockCaseOnField(void)
+{
+    OpenPokeblockCase(PBLOCK_CASE_FIELD, sSavedPokeblockData.callback);
+}
+
+static void PokeblockAction_Toss(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    sub_8198070(data[1], FALSE);
+    StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color]);
+    StringExpandPlaceholders(gStringVar4, gText_ThrowAwayVar1);
+    DisplayMessageAndContinueTask(taskId, 10, 10, 13, 1, GetPlayerTextSpeed(), gStringVar4, CreateTossPokeblockYesNoMenu);
+}
+
+static void CreateTossPokeblockYesNoMenu(u8 taskId)
+{
+    CreateYesNoMenuWithCallbacks(taskId, &sTossPkblockWindowTemplate, 1, 0, 2, 1, 0xE, &sTossYesNoFuncTable);
+}
+
+static void TossPokeblockChoice_Yes(u8 taskId)
+{
+    StringExpandPlaceholders(gStringVar4, gText_Var1ThrownAway);
+    DisplayMessageAndContinueTask(taskId, 10, 10, 13, 1, GetPlayerTextSpeed(), gStringVar4, HandleErasePokeblock);
+}
+
+static void HandleErasePokeblock(u8 taskId)
+{
+    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    {
+        s16 *data;
+        u16 *lastPage, *lastPos;
+
+        TryClearPokeblock(gSpecialVar_ItemId);
+        PlaySE(SE_SELECT);
+
+        lastPage = &sSavedPokeblockData.lastItemPage;
+        lastPos = &sSavedPokeblockData.lastItemPos;
+        data = gTasks[taskId].data;
+
+        sub_81AE6C8(data[0], lastPage, lastPos);
+        HandlePokeblockMenuCursor(*lastPos, 5);
+        SetMenuItemsCountAndMaxShowed();
+        sub_81362E0();
+        HandlePokeblockListMenuItems();
+        data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *lastPage, *lastPos);
+        HandlePokeblockMenuCursor(*lastPos, 0x1005);
+        schedule_bg_copy_tilemap_to_vram(0);
+        schedule_bg_copy_tilemap_to_vram(1);
+        TossPokeblockChoice_No(taskId);
+    }
+}
+
+static void TossPokeblockChoice_No(u8 taskId)
+{
+    sub_8197DF8(10, FALSE);
+    schedule_bg_copy_tilemap_to_vram(1);
+    sub_81363BC();
+    gTasks[taskId].func = Task_HandlePokeblockMenuInput;
+}
+
+static void PokeblockAction_UseInBattle(u8 taskId)
+{
+    u8 nature = GetNature(&gEnemyParty[0]);
+    s16 gain = PokeblockGetGain(nature, &gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId]);
+    StringCopy(gBattleTextBuff1, gPokeblockNames[gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color]);
+    TryClearPokeblock(gSpecialVar_ItemId);
+
+    gSpecialVar_ItemId = gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color << 8;
+    if (gain == 0)
+        gSpecialVar_ItemId += 1;
+    else if (gain > 0)
+        gSpecialVar_ItemId += 2;
+    else
+        gSpecialVar_ItemId += 3;
+
+    FadePaletteAndSetTaskToClosePokeblockCase(taskId);
+}
+
+static void PokeblockAction_UseOnPokeblockFeeder(u8 taskId)
+{
+    SafariZoneActivatePokeblockFeeder(gSpecialVar_ItemId);
+    StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color]);
+    gSpecialVar_Result = gSpecialVar_ItemId;
+    TryClearPokeblock(gSpecialVar_ItemId);
+    gSpecialVar_ItemId = 0;
+    FadePaletteAndSetTaskToClosePokeblockCase(taskId);
+}
+
+static void PokeblockAction_GiveToContestLady(u8 taskId)
+{
+    gSpecialVar_0x8004 = GivePokeblockToContestLady(&gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId]);
+    gSpecialVar_Result = gSpecialVar_ItemId;
+    TryClearPokeblock(gSpecialVar_ItemId);
+    gSpecialVar_ItemId = 0;
+    FadePaletteAndSetTaskToClosePokeblockCase(taskId);
+}
+
+static void PokeblockAction_Cancel(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    sub_8198070(data[1], FALSE);
+    schedule_bg_copy_tilemap_to_vram(1);
+    sub_81363BC();
+    gTasks[taskId].func = Task_HandlePokeblockMenuInput;
+}
+
+static void ClearPokeblock(u8 pkblId)
+{
+    gSaveBlock1Ptr->pokeblocks[pkblId].color = 0;
+    gSaveBlock1Ptr->pokeblocks[pkblId].spicy = 0;
+    gSaveBlock1Ptr->pokeblocks[pkblId].dry = 0;
+    gSaveBlock1Ptr->pokeblocks[pkblId].sweet = 0;
+    gSaveBlock1Ptr->pokeblocks[pkblId].bitter = 0;
+    gSaveBlock1Ptr->pokeblocks[pkblId].sour = 0;
+    gSaveBlock1Ptr->pokeblocks[pkblId].feel = 0;
+}
+
+void ClearPokeblocks(void)
+{
+    u8 i;
+
+    for (i = 0; i < POKEBLOCKS_COUNT; i++)
+        ClearPokeblock(i);
+}
+
+u8 GetHighestPokeblocksFlavorLevel(const struct Pokeblock *pokeblock)
+{
+    u8 i;
+    u8 maxFlavor = GetPokeblockData(pokeblock, PBLOCK_SPICY);
+
+    for (i = PBLOCK_SPICY; i < FLAVOR_COUNT; i++)
+    {
+        u8 currFlavor = GetPokeblockData(pokeblock, PBLOCK_SPICY + i);
+        if (maxFlavor < currFlavor)
+            maxFlavor = currFlavor;
+    }
+
+    return maxFlavor;
+}
+
+u8 GetPokeblocksFeel(const struct Pokeblock *pokeblock)
+{
+    u8 feel = GetPokeblockData(pokeblock, PBLOCK_FEEL);
+    if (feel > POKEBLOCK_MAX_FEEL)
+        feel = POKEBLOCK_MAX_FEEL;
+
+    return feel;
+}
+
+s8 GetFirstFreePokeblockSlot(void)
+{
+    u8 i;
+
+    for (i = 0; i < POKEBLOCKS_COUNT; i++)
+    {
+        if (gSaveBlock1Ptr->pokeblocks[i].color == 0)
+            return i;
+    }
+
+    return -1;
+}
+
+bool32 AddPokeblock(const struct Pokeblock *pokeblock)
+{
+    s8 slot = GetFirstFreePokeblockSlot();
+
+    if (slot == -1)
+    {
+        return FALSE;
+    }
+    else
+    {
+        gSaveBlock1Ptr->pokeblocks[slot] = *pokeblock;
+        return TRUE;
+    }
+}
+
+bool32 TryClearPokeblock(u8 pkblId)
+{
+    if (gSaveBlock1Ptr->pokeblocks[pkblId].color == 0)
+    {
+        return FALSE;
+    }
+    else
+    {
+        ClearPokeblock(pkblId);
+        return TRUE;
+    }
+}
+
+s16 GetPokeblockData(const struct Pokeblock *pokeblock, u8 field)
+{
+    if (field == PBLOCK_COLOR)
+        return pokeblock->color;
+    if (field == PBLOCK_SPICY)
+        return pokeblock->spicy;
+    if (field == PBLOCK_DRY)
+        return pokeblock->dry;
+    if (field == PBLOCK_SWEET)
+        return pokeblock->sweet;
+    if (field == PBLOCK_BITTER)
+        return pokeblock->bitter;
+    if (field == PBLOCK_SOUR)
+        return pokeblock->sour;
+    if (field == PBLOCK_FEEL)
+        return pokeblock->feel;
+
+    return 0;
+}
+
+s16 PokeblockGetGain(u8 nature, const struct Pokeblock *pokeblock)
+{
+    u8 flavor;
+    s16 curGain, totalGain = 0;
+
+    for (flavor = 0; flavor < FLAVOR_COUNT; flavor++)
+    {
+        curGain = GetPokeblockData(pokeblock, flavor + PBLOCK_SPICY);
+        if (curGain > 0)
+            totalGain += curGain * gPokeblockFlavorCompatibilityTable[5 * nature + flavor];
+    }
+
+    return totalGain;
+}
+
+void PokeblockCopyName(const struct Pokeblock *pokeblock, u8 *dest)
+{
+    u8 color = GetPokeblockData(pokeblock, PBLOCK_COLOR);
+    StringCopy(dest, gPokeblockNames[color]);
+}
+
+bool8 CopyMonFavoritePokeblockName(u8 nature, u8 *dest)
+{
+    u8 i;
+
+    for (i = 0; i < FLAVOR_COUNT; i++)
+    {
+        if (PokeblockGetGain(nature, &sFavoritePokeblocksTable[i]) > 0)
+        {
+            StringCopy(dest, gPokeblockNames[i + 1]);
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+u8 GetPokeblocksFlavor(const struct Pokeblock *pokeblock)
+{
+    s16 bestFlavor = 0;
+    s16 i;
+
+    for (i = 0; i < FLAVOR_COUNT; i++)
+    {
+        if (GetPokeblockData(pokeblock, bestFlavor + 1) < GetPokeblockData(pokeblock, i + 1))
+            bestFlavor = i;
+    }
+
+    return bestFlavor;
+}
-- 
cgit v1.2.3


From c3abe2863feb8ebb21921c40d3c685a27a4135c4 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 16 Dec 2017 15:12:55 +0100
Subject: rename

---
 src/pokeblock.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/pokeblock.c b/src/pokeblock.c
index ba292ee75..945b3680d 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -50,14 +50,7 @@ struct PokeblockMenuStruct
     u8 unkTaskId;
     bool8 isSwapping;
     s16 gfxState;
-    u8 field_E80;
-    u8 field_E81;
-    u8 field_E82;
-    u8 field_E83;
-    u8 field_E84;
-    u8 field_E85;
-    u8 field_E86;
-    u8 field_E87;
+    u8 unused[8];
 };
 
 struct PokeblockSavedData
-- 
cgit v1.2.3


From 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 16 Dec 2017 10:23:05 -0500
Subject: Import function labels from Ruby

---
 src/berry_blender.c          |   2 +-
 src/clear_save_data_screen.c |   2 +-
 src/clock.c                  |  53 ++++----
 src/egg_hatch.c              |   4 +-
 src/evolution_scene.c        |   2 +-
 src/starter_choose.c         |   2 +-
 src/tv.c                     |   2 +-
 src/wallclock.c              | 279 +++++++++++++++++++++++--------------------
 8 files changed, 180 insertions(+), 166 deletions(-)

(limited to 'src')

diff --git a/src/berry_blender.c b/src/berry_blender.c
index b1d36e2d9..b1e8712a6 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -2444,7 +2444,7 @@ static void CB2_HandleBlenderEndGame(void)
         sBerryBlenderData->gameEndState++;
         break;
     case 10:
-        switch (sub_8198C58())
+        switch (ProcessMenuInputNoWrap_())
         {
         case 1:
         case -1:
diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c
index d00944ac1..6d6a1545b 100755
--- a/src/clear_save_data_screen.c
+++ b/src/clear_save_data_screen.c
@@ -88,7 +88,7 @@ static void Task_DoClearSaveDataScreenYesNo(u8 taskId)
 
 static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId)
 {
-    switch(sub_8198C58())
+    switch(ProcessMenuInputNoWrap_())
     {
         case 0:
             FillWindowPixelBuffer(0, 17);
diff --git a/src/clock.c b/src/clock.c
index 2ba42f70d..7cea30166 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -15,14 +15,14 @@
 
 // static declarations
 
-static void sub_809E7E8(struct Time *localTime);
-static void sub_809E858(struct Time *localTime);
+static void UpdatePerDay(struct Time *localTime);
+static void UpdatePerMinute(struct Time *localTime);
 
 // rodata
 
 // text
 
-static void sub_809E778(void)
+static void InitTimeBasedEvents(void)
 {
     FlagSet(FLAG_SYS_CLOCK_SET);
     RtcCalcLocalTime();
@@ -35,38 +35,35 @@ void DoTimeBasedEvents(void)
     if (FlagGet(FLAG_SYS_CLOCK_SET) && !sub_813B9C0())
     {
         RtcCalcLocalTime();
-        sub_809E7E8(&gLocalTime);
-        sub_809E858(&gLocalTime);
+        UpdatePerDay(&gLocalTime);
+        UpdatePerMinute(&gLocalTime);
     }
 }
 
-static void sub_809E7E8(struct Time *localTime)
+static void UpdatePerDay(struct Time *localTime)
 {
     u16 *days = GetVarPointer(VAR_DAYS);
     u16 daysSince;
 
-    if (*days != localTime->days)
+    if (*days != localTime->days && *days <= localTime->days)
     {
-        if (*days <= localTime->days)
-        {
-            daysSince = localTime->days - *days;
-            ClearUpperFlags();
-            sub_8122580(daysSince);
-            sub_80ED888(daysSince);
-            sub_80AEFBC(daysSince);
-            UpdatePartyPokerusTime(daysSince);
-            sub_8137904(daysSince);
-            sub_8137A20(daysSince);
-            sub_8139EF4(daysSince);
-            sub_813A7F4(daysSince);
-            sub_813945C(daysSince);
-            SetRandomLotteryNumber(daysSince);
-            *days = localTime->days;
-        }
+        daysSince = localTime->days - *days;
+        ClearUpperFlags();
+        UpdateDewfordTrendPerDay(daysSince);
+        UpdateTVShowsPerDay(daysSince);
+        UpdateWeatherPerDay(daysSince);
+        UpdatePartyPokerusTime(daysSince);
+        UpdateMirageRnd(daysSince);
+        UpdateBirchState(daysSince);
+        UpdateFrontierManiac(daysSince);
+        UpdateFrontierGambler(daysSince);
+        SetShoalItemFlag(daysSince);
+        SetRandomLotteryNumber(daysSince);
+        *days = localTime->days;
     }
 }
 
-static void sub_809E858(struct Time *localTime)
+static void UpdatePerMinute(struct Time *localTime)
 {
     struct Time difference;
     int minutes;
@@ -83,14 +80,14 @@ static void sub_809E858(struct Time *localTime)
     }
 }
 
-void sub_809E8B4(void)
+static void ReturnFromStartWallClock(void)
 {
-    sub_809E778();
+    InitTimeBasedEvents();
     SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
 }
 
-void Special_StartWallClock(void)
+void StartWallClock(void)
 {
     SetMainCallback2(Cb2_StartWallClock);
-    gMain.savedCallback = sub_809E8B4;
+    gMain.savedCallback = ReturnFromStartWallClock;
 }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 032607806..a31eb0520 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -58,7 +58,7 @@ extern const u8 gText_HatchedFromEgg[];
 extern const u8 gText_NickHatchPrompt[];
 
 extern u8 sav1_map_get_name(void);
-extern s8 sub_8198C58(void);
+extern s8 ProcessMenuInputNoWrap_(void);
 extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8);
 extern void sub_806A068(u16, u8);
 extern void fade_screen(u8, u8);
@@ -669,7 +669,7 @@ static void CB2_EggHatch_1(void)
         }
         break;
     case 10:
-        switch (sub_8198C58())
+        switch (ProcessMenuInputNoWrap_())
         {
         case 0:
             GetMonNick(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar3);
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index c17921b74..2b88fec3a 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -1168,7 +1168,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             }
             break;
         case 4:
-            switch (sub_8198C58())
+            switch (ProcessMenuInputNoWrap_())
             {
             case 0:
                 sEvoCursorPos = 0;
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 82f8f75f6..2d78af8fb 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -265,7 +265,7 @@ static void Task_StarterChoose5(u8 taskId)
 {
     u8 spriteId;
 
-    switch (sub_8198C58())
+    switch (ProcessMenuInputNoWrap_())
     {
     case 0:  // YES
         // Return the starter choice and exit.
diff --git a/src/tv.c b/src/tv.c
index 1605be29c..205adbf4d 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1793,7 +1793,7 @@ void EndMassOutbreak(void)
     gSaveBlock1Ptr->outbreakDaysLeft = 0;
 }
 
-void sub_80ED888(u16 days)
+void UpdateTVShowsPerDay(u16 days)
 {
 
     sub_80ED8B4(days);
diff --git a/src/wallclock.c b/src/wallclock.c
index ccec36739..892ef3f05 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -22,38 +22,38 @@
 
 // static types
 
-#define WALL_CLOCK_TASK_MINUTE_HAND_ANGLE  0
-#define WALL_CLOCK_TASK_HOUR_HAND_ANGLE    1
-#define WALL_CLOCK_TASK_HOUR               2
-#define WALL_CLOCK_TASK_MINUTE             3
-#define WALL_CLOCK_TASK_SET_COMMAND        4
-#define WALL_CLOCK_TASK_12HRCLOCK_AM_PM    5
-#define WALL_CLOCK_TASK_SET_SPEED          6
+#define tMinuteHandAngle data[0]
+#define tHourHandAngle   data[1]
+#define tHours           data[2]
+#define tMinutes         data[3]
+#define tMvmtDir         data[4]
+#define tPeriod          data[5]
+#define tMvmtSpeed       data[6]
 
 #define TAG_GFX_WALL_CLOCK_HAND 0x1000
 #define TAG_PAL_WALL_CLOCK_HAND 0x1000
 
 // static declarations
 
-static void sub_8134C9C(void);
-static void sub_8134CB8(u8 taskId);
-static void sub_8134CE8(u8 taskId);
-static void sub_8134DC4(u8 taskId);
-static void c3_80BF560(u8 taskId);
-static void sub_8134EA4(u8 taskId);
-static void c2_080111BC(u8 taskId);
-static void sub_8134F10(u8 taskId);
-static void sub_8134F40(u8 taskId);
-static void sub_8134F78(u8 taskId);
-static void sub_8134FB0(u8 taskId);
-static u16 GetClockHandAngle(u16 a0, u8 command, u8 a2);
-static bool32 MoveClockHand(u8 taskId, u8 command);
-static void _12HourClockFixAMPM(u8 taskId, u8 command);
-static void sub_8135130(u8 taskId);
-static void sub_81351AC(struct Sprite *sprite);
-static void sub_8135244(struct Sprite *sprite);
-static void sub_81352DC(struct Sprite *sprite);
-static void sub_8135380(struct Sprite *sprite);
+static void WallClockMainCallback(void);
+static void Task_SetClock1(u8 taskId);
+static void Task_SetClock2(u8 taskId);
+static void Task_SetClock3(u8 taskId);
+static void Task_SetClock4(u8 taskId);
+static void Task_SetClock5(u8 taskId);
+static void Task_SetClock6(u8 taskId);
+static void Task_ViewClock1(u8 taskId);
+static void Task_ViewClock2(u8 taskId);
+static void Task_ViewClock3(u8 taskId);
+static void Task_ViewClock4(u8 taskId);
+static u16 CalcNewMinHandAngle(u16 a0, u8 command, u8 a2);
+static bool32 AdvanceClock(u8 taskId, u8 command);
+static void UpdateClockPeriod(u8 taskId, u8 command);
+static void InitClockWithRtc(u8 taskId);
+static void SpriteCB_MinuteHand(struct Sprite *sprite);
+static void SpriteCB_HourHand(struct Sprite *sprite);
+static void SpriteCB_AMIndicator(struct Sprite *sprite);
+static void SpriteCB_PMIndicator(struct Sprite *sprite);
 
 // rodata
 
@@ -122,7 +122,7 @@ static const struct SpriteTemplate gUnknown_085B2250 = {
     gUnknown_085B2248,
     NULL,
     gDummySpriteAffineAnimTable,
-    sub_81351AC
+    SpriteCB_MinuteHand
 };
 static const struct SpriteTemplate gUnknown_085B2268 = {
     TAG_GFX_WALL_CLOCK_HAND,
@@ -131,7 +131,7 @@ static const struct SpriteTemplate gUnknown_085B2268 = {
     gUnknown_085B224C,
     NULL,
     gDummySpriteAffineAnimTable,
-    sub_8135244
+    SpriteCB_HourHand
 };
 static const struct OamData Unknown_085B2280 = {
     .y = 0xa0,
@@ -159,7 +159,7 @@ static const struct SpriteTemplate gUnknown_085B22A0 = {
     gUnknown_085B2298,
     NULL,
     gDummySpriteAffineAnimTable,
-    sub_81352DC
+    SpriteCB_AMIndicator
 };
 static const struct SpriteTemplate gUnknown_085B22B8 = {
     TAG_GFX_WALL_CLOCK_HAND,
@@ -168,7 +168,7 @@ static const struct SpriteTemplate gUnknown_085B22B8 = {
     gUnknown_085B229C,
     NULL,
     gDummySpriteAffineAnimTable,
-    sub_8135380
+    SpriteCB_PMIndicator
 };
 static const s8 sClockHandCoords[][2] = {
     { 0x00, -0x18},
@@ -535,14 +535,14 @@ static const s8 sClockHandCoords[][2] = {
 
 // text
 
-static void sub_81347B4(void)
+static void WallClockVblankCallback(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void LoadWallClockGraphics(void)
+static void LoadWallClockGraphics(void)
 {
     SetVBlankCallback(NULL);
     SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
@@ -587,12 +587,12 @@ void LoadWallClockGraphics(void)
     LoadSpritePalettes(gUnknown_085B2218);
 }
 
-void sub_813498C(void)
+static void WallClockInit(void)
 {
     BeginNormalPaletteFade(-1, 0, 16, 0, 0);
     EnableInterrupts(INTR_FLAG_VBLANK);
-    SetVBlankCallback(sub_81347B4);
-    SetMainCallback2(sub_8134C9C);
+    SetVBlankCallback(WallClockVblankCallback);
+    SetMainCallback2(WallClockMainCallback);
     SetGpuReg(REG_OFFSET_BLDCNT, 0x0000);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0x0000);
     SetGpuReg(REG_OFFSET_BLDY, 0x0000);
@@ -609,29 +609,36 @@ void Cb2_StartWallClock(void)
 
     LoadWallClockGraphics();
     LZ77UnCompVram(gUnknown_08DCC648, (u16 *)BG_SCREEN_ADDR(7));
-    taskId = CreateTask(sub_8134CB8, 0);
-    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] = 10;
-    gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] = 0;
-    gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND] = 0;
-    gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = 0;
-    gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED] = 0;
-    gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] = 0;
-    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR_HAND_ANGLE] = 0x12c;
+
+    taskId = CreateTask(Task_SetClock1, 0);
+    gTasks[taskId].tHours = 10;
+    gTasks[taskId].tMinutes = 0;
+    gTasks[taskId].tMvmtDir = 0;
+    gTasks[taskId].tPeriod = 0;
+    gTasks[taskId].tMvmtSpeed = 0;
+    gTasks[taskId].tMinuteHandAngle = 0;
+    gTasks[taskId].tHourHandAngle = 300;
+
     spriteId = CreateSprite(&gUnknown_085B2250, 0x78, 0x50, 1);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 0;
+
     spriteId = CreateSprite(&gUnknown_085B2268, 0x78, 0x50, 0);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 1;
+
     spriteId = CreateSprite(&gUnknown_085B22A0, 0x78, 0x50, 2);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].data[1] = 45;
+
     spriteId = CreateSprite(&gUnknown_085B22B8, 0x78, 0x50, 2);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].data[1] = 90;
-    sub_813498C();
+
+    WallClockInit();
+
     PrintTextOnWindow(1, 1, gText_Confirm3, 0, 1, 0, NULL);
     PutWindowTilemap(1);
     schedule_bg_copy_tilemap_to_vram(2);
@@ -641,44 +648,51 @@ void Cb2_ViewWallClock(void)
 {
     u8 taskId;
     u8 spriteId;
-    u8 r10;
-    u8 spc;
+    u8 angle1;
+    u8 angle2;
 
     LoadWallClockGraphics();
     LZ77UnCompVram(gUnknown_08DCC908, (u16 *)BG_SCREEN_ADDR(7));
-    taskId = CreateTask(sub_8134F10, 0);
-    sub_8135130(taskId);
-    if (gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] == 0)
+
+    taskId = CreateTask(Task_ViewClock1, 0);
+    InitClockWithRtc(taskId);
+    if (gTasks[taskId].tPeriod == 0)
     {
-        r10 = 45;
-        spc = 90;
+        angle1 = 45;
+        angle2 = 90;
     }
     else
     {
-        r10 = 90;
-        spc = 135;
+        angle1 = 90;
+        angle2 = 135;
     }
+    
     spriteId = CreateSprite(&gUnknown_085B2250, 0x78, 0x50, 1);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 0;
+    
     spriteId = CreateSprite(&gUnknown_085B2268, 0x78, 0x50, 0);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 1;
+    
     spriteId = CreateSprite(&gUnknown_085B22A0, 0x78, 0x50, 2);
     gSprites[spriteId].data[0] = taskId;
-    gSprites[spriteId].data[1] = r10;
+    gSprites[spriteId].data[1] = angle1;
+    
     spriteId = CreateSprite(&gUnknown_085B22B8, 0x78, 0x50, 2);
     gSprites[spriteId].data[0] = taskId;
-    gSprites[spriteId].data[1] = spc;
-    sub_813498C();
+    gSprites[spriteId].data[1] = angle2;
+    
+    WallClockInit();
+    
     PrintTextOnWindow(1, 1, gText_Cancel4, 0, 1, 0, NULL);
     PutWindowTilemap(1);
     schedule_bg_copy_tilemap_to_vram(2);
 }
 
-static void sub_8134C9C(void)
+static void WallClockMainCallback(void)
 {
     RunTasks();
     AnimateSprites();
@@ -687,92 +701,92 @@ static void sub_8134C9C(void)
     UpdatePaletteFade();
 }
 
-static void sub_8134CB8(u8 taskId)
+static void Task_SetClock1(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        gTasks[taskId].func = sub_8134CE8;
+        gTasks[taskId].func = Task_SetClock2;
     }
 }
 
-static void sub_8134CE8(u8 taskId)
+static void Task_SetClock2(u8 taskId)
 {
-    if (gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] % 6)
+    if (gTasks[taskId].tMinuteHandAngle % 6)
     {
-        gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] = GetClockHandAngle(gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE], gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND], gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED]);
+        gTasks[taskId].tMinuteHandAngle = CalcNewMinHandAngle(gTasks[taskId].tMinuteHandAngle, gTasks[taskId].tMvmtDir, gTasks[taskId].tMvmtSpeed);
     }
     else
     {
-        gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] = gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] * 6;
-        gTasks[taskId].data[WALL_CLOCK_TASK_HOUR_HAND_ANGLE] = (gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] % 12) * 30 + (gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] / 10) * 5;
+        gTasks[taskId].tMinuteHandAngle = gTasks[taskId].tMinutes * 6;
+        gTasks[taskId].tHourHandAngle = (gTasks[taskId].tHours % 12) * 30 + (gTasks[taskId].tMinutes / 10) * 5;
         if (gMain.newKeys & A_BUTTON)
         {
-            gTasks[taskId].func = sub_8134DC4;
+            gTasks[taskId].func = Task_SetClock3;
         }
         else
         {
-            gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND] = 0;
+            gTasks[taskId].tMvmtDir = 0;
             if (gMain.heldKeys & DPAD_LEFT)
             {
-                gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND] = 1;
+                gTasks[taskId].tMvmtDir = 1;
             }
             if (gMain.heldKeys & DPAD_RIGHT)
             {
-                gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND] = 2;
+                gTasks[taskId].tMvmtDir = 2;
             }
-            if (gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND] != 0)
+            if (gTasks[taskId].tMvmtDir != 0)
             {
-                if (gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED] <= 0xFE)
+                if (gTasks[taskId].tMvmtSpeed < 0xFF)
                 {
-                    gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED]++;
+                    gTasks[taskId].tMvmtSpeed++;
                 }
-                gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] = GetClockHandAngle(gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE], gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND], gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED]);
-                MoveClockHand(taskId, gTasks[taskId].data[WALL_CLOCK_TASK_SET_COMMAND]);
+                gTasks[taskId].tMinuteHandAngle = CalcNewMinHandAngle(gTasks[taskId].tMinuteHandAngle, gTasks[taskId].tMvmtDir, gTasks[taskId].tMvmtSpeed);
+                AdvanceClock(taskId, gTasks[taskId].tMvmtDir);
             }
             else
             {
-                gTasks[taskId].data[WALL_CLOCK_TASK_SET_SPEED] = 0;
+                gTasks[taskId].tMvmtSpeed = 0;
             }
         }
     }
 }
 
-static void sub_8134DC4(u8 taskId)
+static void Task_SetClock3(u8 taskId)
 {
     SetWindowBorderStyle(0, FALSE, 0x250, 0x0d);
     PrintTextOnWindow(0, 1, gText_IsThisTheCorrectTime, 0, 1, 0, NULL);
     PutWindowTilemap(0);
     schedule_bg_copy_tilemap_to_vram(0);
     CreateYesNoMenu(&gUnknown_085B21F4, 0x250, 0x0d, 1);
-    gTasks[taskId].func = c3_80BF560;
+    gTasks[taskId].func = Task_SetClock4;
 }
 
-static void c3_80BF560(u8 taskId)
+static void Task_SetClock4(u8 taskId)
 {
-    switch (sub_8198C58())
+    switch (ProcessMenuInputNoWrap_())
     {
         case 0:
             PlaySE(SE_SELECT);
-            gTasks[taskId].func = sub_8134EA4;
+            gTasks[taskId].func = Task_SetClock5;
             break;
         case 1:
         case -1:
             PlaySE(SE_SELECT);
             sub_8198070(0, FALSE);
             ClearWindowTilemap(0);
-            gTasks[taskId].func = sub_8134CE8;
+            gTasks[taskId].func = Task_SetClock2;
             break;
     }
 }
 
-static void sub_8134EA4(u8 taskId)
+static void Task_SetClock5(u8 taskId)
 {
-    RtcInitLocalTimeOffset(gTasks[taskId].data[WALL_CLOCK_TASK_HOUR], gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE]);
+    RtcInitLocalTimeOffset(gTasks[taskId].tHours, gTasks[taskId].tMinutes);
     BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-    gTasks[taskId].func = c2_080111BC;
+    gTasks[taskId].func = Task_SetClock6;
 }
 
-static void c2_080111BC(u8 taskId)
+static void Task_SetClock6(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -781,30 +795,30 @@ static void c2_080111BC(u8 taskId)
     }
 }
 
-static void sub_8134F10(u8 taskId)
+static void Task_ViewClock1(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        gTasks[taskId].func = sub_8134F40;
+        gTasks[taskId].func = Task_ViewClock2;
     }
 }
 
-static void sub_8134F40(u8 taskId)
+static void Task_ViewClock2(u8 taskId)
 {
-    sub_8135130(taskId);
+    InitClockWithRtc(taskId);
     if (gMain.newKeys & (A_BUTTON | B_BUTTON))
     {
-        gTasks[taskId].func = sub_8134F78;
+        gTasks[taskId].func = Task_ViewClock3;
     }
 }
 
-static void sub_8134F78(u8 taskId)
+static void Task_ViewClock3(u8 taskId)
 {
     BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-    gTasks[taskId].func = sub_8134FB0;
+    gTasks[taskId].func = Task_ViewClock4;
 }
 
-static void sub_8134FB0(u8 taskId)
+static void Task_ViewClock4(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -812,7 +826,7 @@ static void sub_8134FB0(u8 taskId)
     }
 }
 
-static u8 GetClockHandAngleChange(u16 a0)
+static u8 CalcMinHandDelta(u16 a0)
 {
     if (a0 > 60)
     {
@@ -829,9 +843,9 @@ static u8 GetClockHandAngleChange(u16 a0)
     return 1;
 }
 
-static u16 GetClockHandAngle(u16 a0, u8 command, u8 a2)
+static u16 CalcNewMinHandAngle(u16 a0, u8 command, u8 a2)
 {
-    u8 r1 = GetClockHandAngleChange(a2);
+    u8 r1 = CalcMinHandDelta(a2);
     switch (command)
     {
         case 1:
@@ -846,65 +860,65 @@ static u16 GetClockHandAngle(u16 a0, u8 command, u8 a2)
     return a0;
 }
 
-static bool32 MoveClockHand(u8 taskId, u8 command)
+static bool32 AdvanceClock(u8 taskId, u8 command)
 {
     switch (command)
     {
         case 1:
-            if (gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] > 0)
+            if (gTasks[taskId].tMinutes > 0)
             {
-                gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE]--;
+                gTasks[taskId].tMinutes--;
             }
             else
             {
-                gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] = 59;
-                if (gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] > 0)
+                gTasks[taskId].tMinutes = 59;
+                if (gTasks[taskId].tHours > 0)
                 {
-                    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR]--;
+                    gTasks[taskId].tHours--;
                 }
                 else
                 {
-                    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] = 23;
+                    gTasks[taskId].tHours = 23;
                 }
-                _12HourClockFixAMPM(taskId, command);
+                UpdateClockPeriod(taskId, command);
             }
             break;
         case 2:
-            if (gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] < 59)
+            if (gTasks[taskId].tMinutes < 59)
             {
-                gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE]++;
+                gTasks[taskId].tMinutes++;
             }
             else
             {
-                gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] = 0;
-                if (gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] < 23)
+                gTasks[taskId].tMinutes = 0;
+                if (gTasks[taskId].tHours < 23)
                 {
-                    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR]++;
+                    gTasks[taskId].tHours++;
                 }
                 else
                 {
-                    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] = 0;
+                    gTasks[taskId].tHours = 0;
                 }
-                _12HourClockFixAMPM(taskId, command);
+                UpdateClockPeriod(taskId, command);
             }
             break;
     }
     return FALSE;
 }
 
-static void _12HourClockFixAMPM(u8 taskId, u8 command)
+static void UpdateClockPeriod(u8 taskId, u8 command)
 {
-    u8 hours = gTasks[taskId].data[WALL_CLOCK_TASK_HOUR];
+    u8 hours = gTasks[taskId].tHours;
     switch (command)
     {
         case 1:
             switch (hours)
             {
                 case 11:
-                    gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = FALSE;
+                    gTasks[taskId].tPeriod = FALSE;
                     break;
                 case 23:
-                    gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = TRUE;
+                    gTasks[taskId].tPeriod = TRUE;
                     break;
             }
             break;
@@ -912,43 +926,45 @@ static void _12HourClockFixAMPM(u8 taskId, u8 command)
             switch (hours)
             {
                 case 0:
-                    gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = FALSE;
+                    gTasks[taskId].tPeriod = FALSE;
                     break;
                 case 12:
-                    gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = TRUE;
+                    gTasks[taskId].tPeriod = TRUE;
                     break;
             }
             break;
     }
 }
 
-static void sub_8135130(u8 taskId)
+static void InitClockWithRtc(u8 taskId)
 {
     RtcCalcLocalTime();
-    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] = gLocalTime.hours;
-    gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] = gLocalTime.minutes;
-    gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE] = gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] * 6;
-    gTasks[taskId].data[WALL_CLOCK_TASK_HOUR_HAND_ANGLE] = (gTasks[taskId].data[WALL_CLOCK_TASK_HOUR] % 12) * 30 + (gTasks[taskId].data[WALL_CLOCK_TASK_MINUTE] / 10) * 5;
+    gTasks[taskId].tHours = gLocalTime.hours;
+    gTasks[taskId].tMinutes = gLocalTime.minutes;
+    gTasks[taskId].tMinuteHandAngle = gTasks[taskId].tMinutes * 6;
+    gTasks[taskId].tHourHandAngle = (gTasks[taskId].tHours % 12) * 30 + (gTasks[taskId].tMinutes / 10) * 5;
     if (gLocalTime.hours < 12)
     {
-        gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = FALSE;
+        gTasks[taskId].tPeriod = FALSE;
     }
     else
     {
-        gTasks[taskId].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM] = TRUE;
+        gTasks[taskId].tPeriod = TRUE;
     }
 }
 
-static void sub_81351AC(struct Sprite *sprite)
+static void SpriteCB_MinuteHand(struct Sprite *sprite)
 {
-    u16 angle = gTasks[sprite->data[0]].data[WALL_CLOCK_TASK_MINUTE_HAND_ANGLE];
+    u16 angle = gTasks[sprite->data[0]].tMinuteHandAngle;
     s16 sin = Sin2(angle) / 16;
     s16 cos = Cos2(angle) / 16;
     u16 xhat;
     u16 yhat;
+
     SetOamMatrix(0, cos, sin, -sin, cos);
     xhat = sClockHandCoords[angle][0];
     yhat = sClockHandCoords[angle][1];
+
     if (xhat > 0x80)
     {
         xhat |= 0xff00;
@@ -961,13 +977,14 @@ static void sub_81351AC(struct Sprite *sprite)
     sprite->pos2.y = yhat;
 }
 
-static void sub_8135244(struct Sprite *sprite)
+static void SpriteCB_HourHand(struct Sprite *sprite)
 {
-    u16 angle = gTasks[sprite->data[0]].data[WALL_CLOCK_TASK_HOUR_HAND_ANGLE];
+    u16 angle = gTasks[sprite->data[0]].tHourHandAngle;
     s16 sin = Sin2(angle) / 16;
     s16 cos = Cos2(angle) / 16;
     u16 xhat;
     u16 yhat;
+
     SetOamMatrix(1, cos, sin, -sin, cos);
     xhat = sClockHandCoords[angle][0];
     yhat = sClockHandCoords[angle][1];
@@ -983,9 +1000,9 @@ static void sub_8135244(struct Sprite *sprite)
     sprite->pos2.y = yhat;
 }
 
-static void sub_81352DC(struct Sprite *sprite)
+static void SpriteCB_AMIndicator(struct Sprite *sprite)
 {
-    if (gTasks[sprite->data[0]].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM])
+    if (gTasks[sprite->data[0]].tPeriod)
     {
         if (sprite->data[1] >= 60 && sprite->data[1] < 90)
         {
@@ -1011,9 +1028,9 @@ static void sub_81352DC(struct Sprite *sprite)
     sprite->pos2.y = Sin2(sprite->data[1]) * 30 / 0x1000;
 }
 
-static void sub_8135380(struct Sprite *sprite)
+static void SpriteCB_PMIndicator(struct Sprite *sprite)
 {
-    if (gTasks[sprite->data[0]].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM])
+    if (gTasks[sprite->data[0]].tPeriod)
     {
         if (sprite->data[1] >= 105 && sprite->data[1] < 135)
         {
-- 
cgit v1.2.3


From eb8055eb07f4ed6e3dd1d04d61e66ad9fb0d08b8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 17 Dec 2017 20:10:57 +0100
Subject: battle 1 is decompiled

---
 src/battle_1.c             |  17 -
 src/battle_2.c             |  12 +-
 src/battle_bg.c            | 754 +++++++++++++++++++++++++++++++++++++++++++++
 src/egg_hatch.c            |  12 +-
 src/reshow_battle_screen.c |   4 +-
 src/rom_8034C54.c          |   5 +
 6 files changed, 773 insertions(+), 31 deletions(-)
 delete mode 100644 src/battle_1.c
 create mode 100644 src/battle_bg.c
 create mode 100644 src/rom_8034C54.c

(limited to 'src')

diff --git a/src/battle_1.c b/src/battle_1.c
deleted file mode 100644
index 5e4ef5583..000000000
--- a/src/battle_1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-// Includes
-#include "global.h"
-
-// Static type declarations
-
-// Static RAM declarations
-
-IWRAM_DATA u32 gUnknown_03000DD4;
-IWRAM_DATA u32 gUnknown_03000DD8;
-IWRAM_DATA u32 gUnknown_03000DDC;
-
-// Static ROM declarations
-
-// .rodata
-
-// .text
diff --git a/src/battle_2.c b/src/battle_2.c
index 52530f6b3..c83bab168 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -152,7 +152,7 @@ extern u8 gUnknown_020241E9;
 extern u16 gChosenMove;
 
 extern const struct BattleMove gBattleMoves[];
-extern const u16 gUnknown_08C004E0[]; // battle textbox palette
+extern const u16 gBattleTextboxPalette[]; // battle textbox palette
 extern const struct BgTemplate gUnknown_0831AA08[];
 extern const struct WindowTemplate * const gUnknown_0831ABA0[];
 extern const u8 gUnknown_0831ACE0[];
@@ -754,7 +754,7 @@ static void CB2_HandleStartBattle(void)
             ResetBlockReceivedFlags();
             sub_8036EB8(2, playerMultiplayerId);
             SetAllPlayersBerryData();
-            taskId = CreateTask(task00_0800F6FC, 0);
+            taskId = CreateTask(sub_8035D74, 0);
             gTasks[taskId].data[1] = 0x10E;
             gTasks[taskId].data[2] = 0x5A;
             gTasks[taskId].data[5] = 0;
@@ -956,7 +956,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
             ResetBlockReceivedFlags();
             sub_8036EB8(2, playerMultiplayerId);
             SetAllPlayersBerryData();
-            taskId = CreateTask(task00_0800F6FC, 0);
+            taskId = CreateTask(sub_8035D74, 0);
             gTasks[taskId].data[1] = 0x10E;
             gTasks[taskId].data[2] = 0x5A;
             gTasks[taskId].data[5] = 0;
@@ -1342,7 +1342,7 @@ static void CB2_HandleStartMultiBattle(void)
             sub_8036EB8(4, playerMultiplayerId);
             SetAllPlayersBerryData();
             sub_8068AA4();
-            var = CreateTask(task00_0800F6FC, 0);
+            var = CreateTask(sub_8035D74, 0);
             gTasks[var].data[1] = 0x10E;
             gTasks[var].data[2] = 0x5A;
             gTasks[var].data[5] = 0;
@@ -1978,7 +1978,7 @@ void sub_8038D64(void)
         gBattle_BG3_Y = 0;
 
         sub_80356D0();
-        LoadCompressedPalette(gUnknown_08C004E0, 0, 64);
+        LoadCompressedPalette(gBattleTextboxPalette, 0, 64);
         ApplyPlayerChosenFrameToBattleMenu();
         ResetSpriteData();
         ResetTasks();
@@ -1988,7 +1988,7 @@ void sub_8038D64(void)
         gReservedSpritePaletteCount = 4;
         SetVBlankCallback(VBlankCB_Battle);
 
-        taskId = CreateTask(task00_0800F6FC, 0);
+        taskId = CreateTask(sub_8035D74, 0);
         gTasks[taskId].data[1] = 0x10E;
         gTasks[taskId].data[2] = 0x5A;
         gTasks[taskId].data[5] = 1;
diff --git a/src/battle_bg.c b/src/battle_bg.c
new file mode 100644
index 000000000..b4ce80a87
--- /dev/null
+++ b/src/battle_bg.c
@@ -0,0 +1,754 @@
+#include "global.h"
+#include "battle.h"
+#include "sprite.h"
+#include "trainer_classes.h"
+#include "graphics.h"
+#include "decompress.h"
+#include "bg.h"
+#include "palette.h"
+#include "main.h"
+#include "gpu_regs.h"
+#include "link.h"
+#include "battle_message.h"
+#include "task.h"
+#include "trig.h"
+#include "sound.h"
+#include "songs.h"
+#include "strings.h"
+#include "window.h"
+#include "text_window.h"
+#include "new_menu_helpers.h"
+
+struct BattleBackground
+{
+    const void *tileset;
+    const void *tilemap;
+    const void *entryTileset;
+    const void *entryTilemap;
+    const void *palette;
+};
+
+extern const struct SpriteTemplate gUnknown_0831A9D0;
+extern const struct SpriteTemplate gUnknown_0831A9E8;
+extern const struct CompressedSpriteSheet gUnknown_0831AA00;
+extern const struct BgTemplate gUnknown_0831AA08[4];
+extern const struct WindowTemplate *gUnknown_0831ABA0[];
+extern const struct BattleBackground gBattleTerrainTable[];
+
+extern u8 gBattleTerrain;
+extern u16 gTrainerBattleOpponent_A;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG2_X;
+extern u16 gBattle_BG2_Y;
+extern u16 gPartnerTrainerId;
+
+extern u8 GetCurrentMapBattleScene(void);
+
+void sub_8035658(void)
+{
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_0831AA08, ARRAY_COUNT(gUnknown_0831AA08));
+
+    if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
+    {
+        gBattleScripting.field_24 = 1;
+        SetBgTilemapBuffer(1, gUnknown_02023060);
+        SetBgTilemapBuffer(2, gUnknown_02023060);
+    }
+    else
+    {
+        gBattleScripting.field_24 = 0;
+    }
+
+    InitWindows(gUnknown_0831ABA0[gBattleScripting.field_24]);
+    DeactivateAllTextPrinters();
+}
+
+void sub_80356D0(void)
+{
+    DisableInterrupts(INTR_FLAG_HBLANK);
+    EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL);
+    sub_8035658();
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+    SetGpuReg(REG_OFFSET_BLDY, 0);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJWIN_ON | DISPCNT_WIN0_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+}
+
+void ApplyPlayerChosenFrameToBattleMenu(void)
+{
+    sub_809882C(2, 0x12, 0x10);
+    sub_809882C(2, 0x22, 0x10);
+    LoadCompressedPalette(gUnknown_08D85600, 0x50, 0x20);
+
+    if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
+    {
+        sub_81978B0(0x70);
+        copy_textbox_border_tile_patterns_to_vram(0, 0x30, 0x70);
+        gPlttBufferUnfaded[0x76] = 0;
+        CpuCopy16(&gPlttBufferUnfaded[0x76], &gPlttBufferFaded[0x76], 2);
+    }
+}
+
+void DrawMainBattleBackground(void)
+{
+    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000))
+    {
+        LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+        LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+        LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
+    {
+        LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(VRAM + 0x8000));
+        LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000));
+        LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_KYORGE)
+    {
+        LZDecompressVram(gBattleTerrainTiles_Water, (void*)(VRAM + 0x8000));
+        LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000));
+        LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA)
+    {
+        LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void*)(VRAM + 0x8000));
+        LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(VRAM + 0xD000));
+        LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60);
+    }
+    else
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+        {
+            u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+            if (trainerClass == CLASS_LEADER)
+            {
+                LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+                LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+                LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60);
+                return;
+            }
+            else if (trainerClass == CLASS_CHAMPION)
+            {
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60);
+                return;
+            }
+        }
+
+        switch (GetCurrentMapBattleScene())
+        {
+        default:
+        case MAP_BATTLE_SCENE_NORMAL:
+            LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_GYM:
+            LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_MAGMA:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_AQUA:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_SIDNEY:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_PHOEBE:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_GLACIA:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_DRAKE:
+            LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60);
+            break;
+        case MAP_BATTLE_SCENE_FRONTIER:
+            LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+            LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+            LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+            break;
+        }
+    }
+}
+
+void LoadBattleTextboxAndBackground(void)
+{
+    LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM));
+    CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
+    CopyBgTilemapBufferToVram(0);
+    LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40);
+    ApplyPlayerChosenFrameToBattleMenu();
+
+    DrawMainBattleBackground();
+}
+
+static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY)
+{
+    s32 i;
+    u16 var = 0;
+    u16 src[6];
+
+    if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+    {
+        if (gTasks[taskId].data[5] != 0)
+        {
+            switch (bank)
+            {
+            case 0:
+                var = 0x3F & gTasks[taskId].data[3];
+                break;
+            case 1:
+                var = (0xFC0 & gTasks[taskId].data[4]) >> 6;
+                break;
+            case 2:
+                var = (0xFC0 & gTasks[taskId].data[3]) >> 6;
+                break;
+            case 3:
+                var = 0x3F & gTasks[taskId].data[4];
+                break;
+            }
+        }
+        else
+        {
+            switch (bank)
+            {
+            case 0:
+                var = 0x3F & gTasks[taskId].data[3];
+                break;
+            case 1:
+                var = 0x3F & gTasks[taskId].data[4];
+                break;
+            case 2:
+                var = (0xFC0 & gTasks[taskId].data[3]) >> 6;
+                break;
+            case 3:
+                var = (0xFC0 & gTasks[taskId].data[4]) >> 6;
+                break;
+            }
+        }
+
+        for (i = 0; i < 3; i++)
+        {
+            src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001;
+        }
+
+        CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 3, 1, 0x11);
+        CopyBgTilemapBufferToVram(bgId);
+    }
+    else
+    {
+        if (bank == gBattleScripting.multiplayerId)
+            var = gTasks[taskId].data[3];
+        else
+            var = gTasks[taskId].data[4];
+
+        for (i = 0; i < 6; i++)
+        {
+            src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001;
+        }
+
+        CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 6, 1, 0x11);
+        CopyBgTilemapBufferToVram(bgId);
+    }
+}
+
+static void sub_8035C4C(void)
+{
+    if (gBattleOutcome == BATTLE_DREW)
+    {
+        BattleHandleAddTextPrinter(gText_Draw, 0x15);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+    {
+        if (gBattleOutcome == BATTLE_WON)
+        {
+            switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18)
+            {
+            case 0:
+                BattleHandleAddTextPrinter(gText_Win, 0x16);
+                BattleHandleAddTextPrinter(gText_Loss, 0x17);
+                break;
+            case 1:
+                BattleHandleAddTextPrinter(gText_Win, 0x17);
+                BattleHandleAddTextPrinter(gText_Loss, 0x16);
+                break;
+            case 2:
+                BattleHandleAddTextPrinter(gText_Win, 0x16);
+                BattleHandleAddTextPrinter(gText_Loss, 0x17);
+                break;
+            case 3:
+                BattleHandleAddTextPrinter(gText_Win, 0x17);
+                BattleHandleAddTextPrinter(gText_Loss, 0x16);
+                break;
+            }
+        }
+        else
+        {
+            switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18)
+            {
+            case 0:
+                BattleHandleAddTextPrinter(gText_Win, 0x17);
+                BattleHandleAddTextPrinter(gText_Loss, 0x16);
+                break;
+            case 1:
+                BattleHandleAddTextPrinter(gText_Win, 0x16);
+                BattleHandleAddTextPrinter(gText_Loss, 0x17);
+                break;
+            case 2:
+                BattleHandleAddTextPrinter(gText_Win, 0x17);
+                BattleHandleAddTextPrinter(gText_Loss, 0x16);
+                break;
+            case 3:
+                BattleHandleAddTextPrinter(gText_Win, 0x16);
+                BattleHandleAddTextPrinter(gText_Loss, 0x17);
+                break;
+            }
+        }
+    }
+    else if (gBattleOutcome == BATTLE_WON)
+    {
+        if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0)
+        {
+            BattleHandleAddTextPrinter(gText_Win, 0x17);
+            BattleHandleAddTextPrinter(gText_Loss, 0x16);
+        }
+        else
+        {
+            BattleHandleAddTextPrinter(gText_Win, 0x16);
+            BattleHandleAddTextPrinter(gText_Loss, 0x17);
+        }
+    }
+    else
+    {
+        if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0)
+        {
+            BattleHandleAddTextPrinter(gText_Win, 0x16);
+            BattleHandleAddTextPrinter(gText_Loss, 0x17);
+        }
+        else
+        {
+            BattleHandleAddTextPrinter(gText_Win, 0x17);
+            BattleHandleAddTextPrinter(gText_Loss, 0x16);
+        }
+    }
+}
+
+void sub_8035D74(u8 taskId)
+{
+    struct LinkPlayer *linkPlayer;
+    u8 *name;
+    s32 i, palId;
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+        {
+            for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+            {
+                name = gLinkPlayers[i].name;
+                linkPlayer = &gLinkPlayers[i];
+
+                switch (linkPlayer->lp_field_18)
+                {
+                case 0:
+                    BattleHandleAddTextPrinter(name, 0x11);
+                    sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 4);
+                    break;
+                case 1:
+                    BattleHandleAddTextPrinter(name, 0x12);
+                    sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 4);
+                    break;
+                case 2:
+                    BattleHandleAddTextPrinter(name, 0x13);
+                    sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 8);
+                    break;
+                case 3:
+                    BattleHandleAddTextPrinter(name, 0x14);
+                    sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 8);
+                    break;
+                }
+            }
+        }
+        else
+        {
+            u8 playerId = gBattleScripting.multiplayerId;
+            u8 opponentId = playerId ^ BIT_SIDE;
+            u8 opponentId_copy = opponentId;
+
+            if (gLinkPlayers[playerId].lp_field_18 != 0)
+                opponentId = playerId, playerId = opponentId_copy;
+
+            name = gLinkPlayers[playerId].name;
+            BattleHandleAddTextPrinter(name, 0xF);
+
+            name = gLinkPlayers[opponentId].name;
+            BattleHandleAddTextPrinter(name, 0x10);
+
+            sub_8035AE4(taskId, playerId, 1, 2, 7);
+            sub_8035AE4(taskId, opponentId, 2, 2, 7);
+        }
+        gTasks[taskId].data[0]++;
+        break;
+    case 1:
+        palId = AllocSpritePalette(0x2710);
+        gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF;
+        gBattleStruct->field_7D = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0);
+        gBattleStruct->field_7E = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0);
+        gSprites[gBattleStruct->field_7D].invisible = 1;
+        gSprites[gBattleStruct->field_7E].invisible = 1;
+        gTasks[taskId].data[0]++;
+        break;
+    case 2:
+        if (gTasks[taskId].data[5] != 0)
+        {
+            gBattle_BG1_X = -(20) - (Sin2(gTasks[taskId].data[1]) / 32);
+            gBattle_BG2_X = -(140) - (Sin2(gTasks[taskId].data[2]) / 32);
+            gBattle_BG1_Y = -36;
+            gBattle_BG2_Y = -36;
+        }
+        else
+        {
+            gBattle_BG1_X = -(20) - (Sin2(gTasks[taskId].data[1]) / 32);
+            gBattle_BG1_Y = (Cos2(gTasks[taskId].data[1]) / 32) - 164;
+            gBattle_BG2_X = -(140) - (Sin2(gTasks[taskId].data[2]) / 32);
+            gBattle_BG2_Y = (Cos2(gTasks[taskId].data[2]) / 32) - 164;
+        }
+
+        if (gTasks[taskId].data[2] != 0)
+        {
+            gTasks[taskId].data[2] -= 2;
+            gTasks[taskId].data[1] += 2;
+        }
+        else
+        {
+            if (gTasks[taskId].data[5] != 0)
+                sub_8035C4C();
+
+            PlaySE(SE_W231);
+            DestroyTask(taskId);
+            gSprites[gBattleStruct->field_7D].invisible = 0;
+            gSprites[gBattleStruct->field_7E].invisible = 0;
+            gSprites[gBattleStruct->field_7E].oam.tileNum += 0x40;
+            gSprites[gBattleStruct->field_7D].data[0] = 0;
+            gSprites[gBattleStruct->field_7E].data[0] = 1;
+            gSprites[gBattleStruct->field_7D].data[1] = gSprites[gBattleStruct->field_7D].pos1.x;
+            gSprites[gBattleStruct->field_7E].data[1] = gSprites[gBattleStruct->field_7E].pos1.x;
+            gSprites[gBattleStruct->field_7D].data[2] = 0;
+            gSprites[gBattleStruct->field_7E].data[2] = 0;
+        }
+        break;
+    }
+}
+
+void LoadBattleEntryBackground(void)
+{
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+    {
+        LZDecompressVram(gUnknown_08D778F0, (void*)(VRAM + 0x4000));
+        LZDecompressVram(gUnknown_08D77B0C, (void*)(VRAM + 0x10000));
+        LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20);
+        SetBgAttribute(1, BG_CTRL_ATTR_MAPBASEINDEX, 1);
+        SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04);
+        CopyToBgTilemapBuffer(1, gUnknown_08D779D8, 0, 0);
+        CopyToBgTilemapBuffer(2, gUnknown_08D779D8, 0, 0);
+        CopyBgTilemapBufferToVram(1);
+        CopyBgTilemapBufferToVram(2);
+        SetGpuReg(REG_OFFSET_WININ, 0x36);
+        SetGpuReg(REG_OFFSET_WINOUT, 0x36);
+        gBattle_BG1_Y = 0xFF5C;
+        gBattle_BG2_Y = 0xFF5C;
+        LoadCompressedObjectPicUsingHeap(&gUnknown_0831AA00);
+    }
+    else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
+    {
+        if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == STEVEN_PARTNER_ID)
+        {
+            LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
+            LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
+        }
+        else
+        {
+            SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 2);
+            SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 2);
+            CopyToBgTilemapBuffer(1, gUnknown_08D857A8, 0, 0);
+            CopyToBgTilemapBuffer(2, gUnknown_08D85A1C, 0, 0);
+            CopyBgTilemapBufferToVram(1);
+            CopyBgTilemapBufferToVram(2);
+        }
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
+    {
+        LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void*)(VRAM + 0x4000));
+        LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void*)(VRAM + 0xE000));
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_KYORGE)
+    {
+        LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void*)(VRAM + 0x4000));
+        LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void*)(VRAM + 0xE000));
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA)
+    {
+        LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(VRAM + 0x4000));
+        LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(VRAM + 0xE000));
+    }
+    else
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+        {
+            u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+            if (trainerClass == CLASS_LEADER)
+            {
+                LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
+                LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
+                return;
+            }
+            else if (trainerClass == CLASS_CHAMPION)
+            {
+                LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
+                LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
+                return;
+            }
+        }
+
+        if (GetCurrentMapBattleScene() == MAP_BATTLE_SCENE_NORMAL)
+        {
+            LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTileset, (void*)(VRAM + 0x4000));
+            LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTilemap, (void*)(VRAM + 0xE000));
+        }
+        else
+        {
+            LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
+            LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
+        }
+    }
+}
+
+bool8 LoadChosenBattleElement(u8 caseId)
+{
+    bool8 ret = FALSE;
+
+    switch (caseId)
+    {
+    case 0:
+        LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM));
+        break;
+    case 1:
+        CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
+        CopyBgTilemapBufferToVram(0);
+        break;
+    case 2:
+        LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40);
+        break;
+    case 3:
+        if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
+        {
+            LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+        }
+        else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
+        {
+            LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(VRAM + 0x8000));
+        }
+        else
+        {
+            if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+            {
+                u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+                if (trainerClass == CLASS_LEADER)
+                {
+                    LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+                    break;
+                }
+                else if (trainerClass == CLASS_CHAMPION)
+                {
+                    LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                    break;
+                }
+            }
+
+            switch (GetCurrentMapBattleScene())
+            {
+            default:
+            case MAP_BATTLE_SCENE_NORMAL:
+                LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_GYM:
+                LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_MAGMA:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_AQUA:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_SIDNEY:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_PHOEBE:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_GLACIA:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_DRAKE:
+                LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
+                break;
+            case MAP_BATTLE_SCENE_FRONTIER:
+                LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
+                break;
+            }
+        }
+        break;
+    case 4:
+        if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
+        {
+            LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+        }
+        else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
+        {
+            if (gGameVersion == VERSION_RUBY)
+                LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000));
+            else
+                LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000));
+        }
+        else
+        {
+            if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+            {
+                u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+                if (trainerClass == CLASS_LEADER)
+                {
+                    LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+                    break;
+                }
+                else if (trainerClass == CLASS_CHAMPION)
+                {
+                    LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                    break;
+                }
+            }
+
+            switch (GetCurrentMapBattleScene())
+            {
+            default:
+            case MAP_BATTLE_SCENE_NORMAL:
+                LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_GYM:
+                LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_MAGMA:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_AQUA:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_SIDNEY:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_PHOEBE:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_GLACIA:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_DRAKE:
+                LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
+                break;
+            case MAP_BATTLE_SCENE_FRONTIER:
+                LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
+                break;
+            }
+        }
+        break;
+    case 5:
+        if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
+        {
+            LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+        }
+        else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
+        {
+            if (gGameVersion == VERSION_RUBY)
+                LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60);
+            else
+                LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60);
+        }
+        else
+        {
+            if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+            {
+                u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+                if (trainerClass == CLASS_LEADER)
+                {
+                    LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60);
+                    break;
+                }
+                else if (trainerClass == CLASS_CHAMPION)
+                {
+                    LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60);
+                    break;
+                }
+            }
+
+            switch (GetCurrentMapBattleScene())
+            {
+            default:
+            case MAP_BATTLE_SCENE_NORMAL:
+                LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_GYM:
+                LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_MAGMA:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_AQUA:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_SIDNEY:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_PHOEBE:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_GLACIA:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_DRAKE:
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60);
+                break;
+            case MAP_BATTLE_SCENE_FRONTIER:
+                LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+                break;
+            }
+        }
+        break;
+    case 6:
+        ApplyPlayerChosenFrameToBattleMenu();
+        break;
+    default:
+        ret = TRUE;
+        break;
+    }
+
+    return ret;
+}
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 032607806..ed1acd5d7 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -48,9 +48,9 @@ extern struct SpriteTemplate gUnknown_0202499C;
 extern void (*gFieldCallback)(void);
 
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const u8 gUnknown_08C00000[];
-extern const u8 gUnknown_08C00524[];
-extern const u8 gUnknown_08C004E0[];
+extern const u8 gBattleTextboxTiles[];
+extern const u8 gBattleTextboxTilemap[];
+extern const u8 gBattleTextboxPalette[];
 extern const u16 gUnknown_08DD7300[]; // palette, gameboy advance
 extern const u32 gUnknown_08DD7360[]; // tileset gameboy advance
 extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle
@@ -522,9 +522,9 @@ static void CB2_EggHatch_0(void)
         gMain.state++;
         break;
     case 2:
-        copy_decompressed_tile_data_to_vram_autofree(0, gUnknown_08C00000, 0, 0, 0);
-        CopyToBgTilemapBuffer(0, gUnknown_08C00524, 0, 0);
-        LoadCompressedPalette(gUnknown_08C004E0, 0, 0x20);
+        copy_decompressed_tile_data_to_vram_autofree(0, gBattleTextboxTiles, 0, 0, 0);
+        CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
+        LoadCompressedPalette(gBattleTextboxPalette, 0, 0x20);
         gMain.state++;
         break;
     case 3:
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index a034ca089..3df2ff151 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -35,7 +35,7 @@ extern struct SpriteTemplate gUnknown_0202499C;
 extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
 
 extern void dp12_8087EA4(void);
-extern void trs_config(void);
+extern void sub_8035658(void);
 extern bool8 IsDoubleBattle(void);
 extern u8 GetSubstituteSpriteDefault_Y(u8 bank);
 extern u8 GetBankSpriteDefault_Y(u8 bank);
@@ -73,7 +73,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
     {
     case 0:
         dp12_8087EA4();
-        trs_config();
+        sub_8035658();
         SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0);
         SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0);
         ShowBg(0);
diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c
new file mode 100644
index 000000000..4d4492524
--- /dev/null
+++ b/src/rom_8034C54.c
@@ -0,0 +1,5 @@
+#include "global.h"
+
+IWRAM_DATA u32 gUnknown_03000DD4;
+IWRAM_DATA u32 gUnknown_03000DD8;
+IWRAM_DATA u32 gUnknown_03000DDC;
-- 
cgit v1.2.3


From 54dccc851283d4b5013c6bb9997b695bee79007d Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 17 Dec 2017 20:38:01 +0100
Subject: give batter script command names

---
 src/scrcmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 8f67d1990..1b10501fc 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1979,13 +1979,13 @@ bool8 ScrCmd_dotrainerbattle(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_gotobattleendscript(struct ScriptContext *ctx)
+bool8 ScrCmd_gotopostbattlescript(struct ScriptContext *ctx)
 {
     ctx->scriptPtr = BattleSetup_GetScriptAddrAfterBattle();
     return FALSE;
 }
 
-bool8 ScrCmd_gototrainerscript(struct ScriptContext *ctx)
+bool8 ScrCmd_gotobeatenscript(struct ScriptContext *ctx)
 {
     ctx->scriptPtr = BattleSetup_GetTrainerPostBattleScript();
     return FALSE;
-- 
cgit v1.2.3


From 720bd555bce8141e5e321e082cf80e7f4401d455 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 17 Dec 2017 21:19:08 +0100
Subject: add constants trainers file

---
 src/battle_2.c               | 34 +++++++++---------
 src/battle_script_commands.c |  7 ++--
 src/battle_setup.c           | 34 +++++++++---------
 src/pokemon_3.c              | 85 +++++++++++++++++++++++---------------------
 4 files changed, 81 insertions(+), 79 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 67e49bb34..80945ba8b 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -17,6 +17,7 @@
 #include "item.h"
 #include "constants/items.h"
 #include "constants/hold_effects.h"
+#include "constants/trainers.h"
 #include "link.h"
 #include "bg.h"
 #include "dma3.h"
@@ -38,7 +39,6 @@
 #include "pokedex.h"
 #include "constants/abilities.h"
 #include "constants/moves.h"
-#include "trainer_classes.h"
 #include "evolution_scene.h"
 #include "roamer.h"
 #include "tv.h"
@@ -1718,7 +1718,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
             {
                 const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerNum].party.NoItemDefaultMoves;
 
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
 
                 personalityValue += nameHash << 8;
@@ -1726,11 +1726,11 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
                 CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0);
                 break;
             }
-            case PARTY_FLAG_CUSTOM_MOVES:
+            case F_TRAINER_PARTY_CUSTOM_MOVESET:
             {
                 const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerNum].party.NoItemCustomMoves;
 
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
 
                 personalityValue += nameHash << 8;
@@ -1744,11 +1744,11 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
                 }
                 break;
             }
-            case PARTY_FLAG_HAS_ITEM:
+            case F_TRAINER_PARTY_HELD_ITEM:
             {
                 const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerNum].party.ItemDefaultMoves;
 
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
 
                 personalityValue += nameHash << 8;
@@ -1758,11 +1758,11 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
                 SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
                 break;
             }
-            case PARTY_FLAG_CUSTOM_MOVES | PARTY_FLAG_HAS_ITEM:
+            case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
             {
                 const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerNum].party.ItemCustomMoves;
 
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
 
                 personalityValue += nameHash << 8;
@@ -4749,19 +4749,19 @@ static void HandleEndTurn_BattleWon(void)
 
         switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
         {
-        case CLASS_ELITE_FOUR:
-        case CLASS_CHAMPION:
+        case TRAINER_CLASS_ELITE_FOUR:
+        case TRAINER_CLASS_CHAMPION:
             PlayBGM(BGM_KACHI5);
             break;
-        case CLASS_TEAM_AQUA:
-        case CLASS_TEAM_MAGMA:
-        case CLASS_AQUA_ADMIN:
-        case CLASS_AQUA_LEADER:
-        case CLASS_MAGMA_ADMIN:
-        case CLASS_MAGMA_LEADER:
+        case TRAINER_CLASS_TEAM_AQUA:
+        case TRAINER_CLASS_TEAM_MAGMA:
+        case TRAINER_CLASS_AQUA_ADMIN:
+        case TRAINER_CLASS_AQUA_LEADER:
+        case TRAINER_CLASS_MAGMA_ADMIN:
+        case TRAINER_CLASS_MAGMA_LEADER:
             PlayBGM(BGM_KACHI4);
             break;
-        case CLASS_LEADER:
+        case TRAINER_CLASS_LEADER:
             PlayBGM(BGM_KACHI3);
             break;
         default:
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index ecdbb4d90..656f9f43a 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -17,6 +17,7 @@
 #include "battle_interface.h"
 #include "constants/species.h"
 #include "constants/songs.h"
+#include "constants/trainers.h"
 #include "text.h"
 #include "sound.h"
 #include "pokedex.h"
@@ -6236,19 +6237,19 @@ static u32 GetTrainerMoneyToGive(u16 trainerId)
                 lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
             }
             break;
-        case PARTY_FLAG_CUSTOM_MOVES:
+        case F_TRAINER_PARTY_CUSTOM_MOVESET:
             {
                 const struct TrainerMonNoItemCustomMoves *party = gTrainers[trainerId].party.NoItemCustomMoves;
                 lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
             }
             break;
-        case PARTY_FLAG_HAS_ITEM:
+        case F_TRAINER_PARTY_HELD_ITEM:
             {
                 const struct TrainerMonItemDefaultMoves *party = gTrainers[trainerId].party.ItemDefaultMoves;
                 lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
             }
             break;
-        case PARTY_FLAG_CUSTOM_MOVES | PARTY_FLAG_HAS_ITEM:
+        case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
             {
                 const struct TrainerMonItemCustomMoves *party = gTrainers[trainerId].party.ItemCustomMoves;
                 lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
diff --git a/src/battle_setup.c b/src/battle_setup.c
index dbb20b148..3d4f5afcc 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "constants/trainers.h"
 #include "battle.h"
 #include "battle_setup.h"
 #include "battle_transition.h"
@@ -15,8 +16,6 @@
 #include "constants/maps.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "trainer_classes.h"
-#include "trainer_ids.h"
 #include "random.h"
 #include "starter_choose.h"
 #include "script_pokemon_80F8.h"
@@ -27,7 +26,6 @@
 #include "event_scripts.h"
 #include "trainer_see.h"
 #include "field_message_box.h"
-#include "trainer.h"
 #include "sound.h"
 #include "strings.h"
 #include "secret_base.h"
@@ -759,7 +757,7 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
                 sum += party[i].lvl;
         }
         break;
-    case PARTY_FLAG_CUSTOM_MOVES:
+    case F_TRAINER_PARTY_CUSTOM_MOVESET:
         {
             const struct TrainerMonNoItemCustomMoves *party;
             party = gTrainers[opponentId].party.NoItemCustomMoves;
@@ -767,7 +765,7 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
                 sum += party[i].lvl;
         }
         break;
-    case PARTY_FLAG_HAS_ITEM:
+    case F_TRAINER_PARTY_HELD_ITEM:
         {
             const struct TrainerMonItemDefaultMoves *party;
             party = gTrainers[opponentId].party.ItemDefaultMoves;
@@ -775,7 +773,7 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
                 sum += party[i].lvl;
         }
         break;
-    case PARTY_FLAG_CUSTOM_MOVES | PARTY_FLAG_HAS_ITEM:
+    case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
         {
             const struct TrainerMonItemCustomMoves *party;
             party = gTrainers[opponentId].party.ItemCustomMoves;
@@ -820,30 +818,30 @@ static u8 GetTrainerBattleTransition(void)
     if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT)
         return B_TRANSITION_CHAMPION;
 
-    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR)
+    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR)
     {
-        if (gTrainerBattleOpponent_A == TRAINER_ID_SIDNEY)
+        if (gTrainerBattleOpponent_A == TRAINER_SIDNEY)
             return B_TRANSITION_SYDNEY;
-        if (gTrainerBattleOpponent_A == TRAINER_ID_PHOEBE)
+        if (gTrainerBattleOpponent_A == TRAINER_PHOEBE)
             return B_TRANSITION_PHOEBE;
-        if (gTrainerBattleOpponent_A == TRAINER_ID_GLACIA)
+        if (gTrainerBattleOpponent_A == TRAINER_GLACIA)
             return B_TRANSITION_GLACIA;
-        if (gTrainerBattleOpponent_A == TRAINER_ID_DRAKE)
+        if (gTrainerBattleOpponent_A == TRAINER_DRAKE)
             return B_TRANSITION_DRAKE;
         return B_TRANSITION_CHAMPION;
     }
 
-    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION)
+    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION)
         return B_TRANSITION_CHAMPION;
 
-    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_TEAM_MAGMA
-        || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_MAGMA_LEADER
-        || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_MAGMA_ADMIN)
+    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_TEAM_MAGMA
+        || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_MAGMA_LEADER
+        || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_MAGMA_ADMIN)
         return B_TRANSITION_MAGMA;
 
-    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_TEAM_AQUA
-        || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_AQUA_LEADER
-        || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_AQUA_ADMIN)
+    if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_TEAM_AQUA
+        || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_AQUA_LEADER
+        || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_AQUA_ADMIN)
         return B_TRANSITION_AQUA;
 
     if (gTrainers[gTrainerBattleOpponent_A].doubleBattle == TRUE)
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 6a1698152..d58b024a8 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -11,8 +11,7 @@
 #include "link.h"
 #include "constants/hold_effects.h"
 #include "random.h"
-#include "trainer_classes.h"
-#include "trainer_ids.h"
+#include "constants/trainers.h"
 #include "constants/songs.h"
 #include "sound.h"
 #include "m4a.h"
@@ -692,9 +691,9 @@ void AdjustFriendship(struct Pokemon *mon, u8 event)
         if ((event != 5 || !(Random() & 1))
          && (event != 3
           || ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
-           && (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR
-            || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_LEADER
-            || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION))))
+           && (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR
+            || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_LEADER
+            || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION))))
         {
             s8 mod = gUnknown_08329ECE[event][friendshipLevel];
             if (mod > 0 && holdEffect == HOLD_EFFECT_HAPPINESS_UP)
@@ -1146,55 +1145,57 @@ void ClearBattleMonForms(void)
 u16 GetBattleBGM(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
-        return 0x1E0;
+        return BGM_BATTLE34;
     if (gBattleTypeFlags & BATTLE_TYPE_REGI)
-        return 0x1DF;
+        return BGM_BATTLE36;
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-        return 0x1DC;
+        return BGM_BATTLE20;
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
         u8 trainerClass;
+
         if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
             trainerClass = GetFrontierOpponentClass(gTrainerBattleOpponent_A);
         else if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
-            trainerClass = CLASS_EXPERT;
+            trainerClass = TRAINER_CLASS_EXPERT;
         else
             trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
+
         switch (trainerClass)
         {
-        case CLASS_AQUA_LEADER:
-        case CLASS_MAGMA_LEADER:
-            return 0x1E3;
-        case CLASS_TEAM_AQUA:
-        case CLASS_TEAM_MAGMA:
-        case CLASS_AQUA_ADMIN:
-        case CLASS_MAGMA_ADMIN:
-            return 0x1DB;
-        case CLASS_LEADER:
-            return 0x1DD;
-        case CLASS_CHAMPION:
-            return 0x1DE;
-        case CLASS_PKMN_TRAINER_RIVAL:
+        case TRAINER_CLASS_AQUA_LEADER:
+        case TRAINER_CLASS_MAGMA_LEADER:
+            return BGM_BATTLE30;
+        case TRAINER_CLASS_TEAM_AQUA:
+        case TRAINER_CLASS_TEAM_MAGMA:
+        case TRAINER_CLASS_AQUA_ADMIN:
+        case TRAINER_CLASS_MAGMA_ADMIN:
+            return BGM_BATTLE31;
+        case TRAINER_CLASS_LEADER:
+            return BGM_BATTLE32;
+        case TRAINER_CLASS_CHAMPION:
+            return BGM_BATTLE33;
+        case TRAINER_CLASS_PKMN_TRAINER_3:
             if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
-                return 0x1E1;
+                return BGM_BATTLE35;
             if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, gText_BattleWallyName))
-                return 0x1DC;
-            return 0x1E1;
-        case CLASS_ELITE_FOUR:
-            return 0x1E2;
-        case CLASS_SALON_MAIDEN:
-        case CLASS_DOME_ACE:
-        case CLASS_PALACE_MAVEN:
-        case CLASS_ARENA_TYCOON:
-        case CLASS_FACTORY_HEAD:
-        case CLASS_PIKE_QUEEN:
-        case CLASS_PYRAMID_KING:
-            return 0x1D7;
+                return BGM_BATTLE20;
+            return BGM_BATTLE35;
+        case TRAINER_CLASS_ELITE_FOUR:
+            return BGM_BATTLE38;
+        case TRAINER_CLASS_SALON_MAIDEN:
+        case TRAINER_CLASS_DOME_ACE:
+        case TRAINER_CLASS_PALACE_MAVEN:
+        case TRAINER_CLASS_ARENA_TYCOON:
+        case TRAINER_CLASS_FACTORY_HEAD:
+        case TRAINER_CLASS_PIKE_QUEEN:
+        case TRAINER_CLASS_PYRAMID_KING:
+            return BGM_BATTLE_FRONTIER_BRAIN;
         default:
-            return 0x1DC;
+            return BGM_BATTLE20;
         }
     }
-    return 0x1DA;
+    return BGM_BATTLE27;
 }
 
 void PlayBattleBGM(void)
@@ -1462,12 +1463,14 @@ bool8 IsShinyOtIdPersonality(u32 otId, u32 personality)
     return retVal;
 }
 
-const u8* GetTrainerPartnerName(void)
+const u8 *GetTrainerPartnerName(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
     {
         if (gPartnerTrainerId == STEVEN_PARTNER_ID)
-            return gTrainers[TRAINER_ID_STEVEN].trainerName;
+        {
+            return gTrainers[TRAINER_STEVEN].trainerName;
+        }
         else
         {
             GetFrontierTrainerName(gStringVar1, gPartnerTrainerId);
@@ -1682,14 +1685,14 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality)
     }
 }
 
-const u8* GetTrainerClassNameFromId(u16 trainerId)
+const u8 *GetTrainerClassNameFromId(u16 trainerId)
 {
     if (trainerId > NO_OF_TRAINERS)
         trainerId = 0;
     return gTrainerClassNames[gTrainers[trainerId].trainerClass];
 }
 
-const u8* GetTrainerNameFromId(u16 trainerId)
+const u8 *GetTrainerNameFromId(u16 trainerId)
 {
     if (trainerId > NO_OF_TRAINERS)
         trainerId = 0;
-- 
cgit v1.2.3


From 314b96af46db86b74203f67f7bdf2d68ff4d4e68 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 17 Dec 2017 23:45:27 +0100
Subject: static names given s prefix

---
 src/battle_controller_player.c         |  2 +-
 src/battle_controller_player_partner.c |  2 +-
 src/battle_message.c                   |  6 ++--
 src/berry_fix_program.c                | 44 +++++++++++++-------------
 src/hall_of_fame.c                     | 30 +++++++++---------
 src/lilycove_lady.c                    | 30 +++++++++---------
 src/palette.c                          | 56 +++++++++++++++++-----------------
 src/region_map.c                       | 20 ++++++------
 src/save_failed_screen.c               |  8 ++---
 src/sprite.c                           | 10 +++---
 src/unk_text_util_2.c                  | 14 ++++-----
 src/wallclock.c                        | 20 ++++++------
 12 files changed, 121 insertions(+), 121 deletions(-)

(limited to 'src')

diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index e497dbfe2..08c666d11 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -234,7 +234,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
 static const u8 sTargetIdentities[] = {IDENTITY_PLAYER_MON1, IDENTITY_PLAYER_MON2, IDENTITY_OPPONENT_MON2, IDENTITY_OPPONENT_MON1};
 
 // unknown unused data
-static const u8 gUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58};
+static const u8 sUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58};
 
 void nullsub_21(void)
 {
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index eb57297da..dc4a213cc 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -198,7 +198,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
 };
 
 // unknown unused data
-static const u8 gUnknown_08617254[] =
+static const u8 sUnknown_08617254[] =
 {
     0x83, 0x4d, 0xf3, 0x5f, 0x6f, 0x4f, 0xeb, 0x3e,
     0x67, 0x2e, 0x10, 0x46, 0x8c, 0x3d, 0x28, 0x35,
diff --git a/src/battle_message.c b/src/battle_message.c
index ec1cfd626..bd8b0fca5 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1367,7 +1367,7 @@ static const u16 sUnknownMoveTable[] =
 
 static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS, EOS, 0, 0};
 
-static const u8 gUnknown_085CD42C[] =
+static const u8 sUnknown_085CD42C[] =
 {
     0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1,
     0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0,
@@ -1392,7 +1392,7 @@ static const u8 gUnknown_085CD42C[] =
     0x6, 0x0, 0x0, 0x0, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x6, 0x0, 0x0
 };
 
-static const u8 gUnknown_085CD54C[] =
+static const u8 sUnknown_085CD54C[] =
 {
     0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1,
     0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0,
@@ -1419,7 +1419,7 @@ static const u8 gUnknown_085CD54C[] =
 
 static const u8 * const gUnknown_085CD660[] =
 {
-    gUnknown_085CD42C, gUnknown_085CD54C
+    sUnknown_085CD42C, sUnknown_085CD54C
 };
 
 static const u8 sRecordedBattleTextSpeeds[] = {8, 4, 1, 0};
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index bba39c3eb..195490543 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -35,9 +35,9 @@ static void berry_fix_bg_hide(void);
 
 // .rodata
 
-static const u8 gUnknown_08617E78[] = _("Berry Program Update");
-static const u8 gUnknown_08617E8D[] = _("Ruby/Sapphire");
-static const u8 gUnknown_08617E9B[] = _("Emerald");
+static const u8 sUnknown_08617E78[] = _("Berry Program Update");
+static const u8 sUnknown_08617E8D[] = _("Ruby/Sapphire");
+static const u8 sUnknown_08617E9B[] = _("Emerald");
 
 static const u8 Unknown_08617EA3[] = _("The Berry Program on your POKéMON\nRuby/Sapphire Game Pak will be updated.\n{COLOR RED}{SHADOW LIGHT_RED}Press the A Button.");
 static const u8 Unknown_08617F07[] = _("Please ensure the connection of your\nGame Boy Advance system matches this.\n{COLOR RED}{SHADOW LIGHT_RED}YES: Press the A Button.\nNO: Turn off the power and try again.");
@@ -62,15 +62,15 @@ static const struct WindowTemplate gUnknown_08618110[] = {
     {-1}
 };
 
-static const u16 gUnknown_08618138[] = {
+static const u16 sUnknown_08618138[] = {
     0x7fff, 0x7fff, 0x318c, 0x675a,
     0x043c, 0x3aff, 0x0664, 0x4bd2,
     0x6546, 0x7b14, 0x7fff, 0x318c,
     0x675a, 0x0000, 0x0000, 0x0000
 };
 
-static const u8 gUnknown_08618158[] = {10, 11, 12};
-static const u8 gUnknown_0861815B[] = { 0, 10, 13};
+static const u8 sUnknown_08618158[] = {10, 11, 12};
+static const u8 sUnknown_0861815B[] = { 0, 10, 13};
 
 static const u8 *const gUnknown_08618160[] = {
     Unknown_08617F07,
@@ -243,21 +243,21 @@ static void berry_fix_gpu_set(void)
     InitWindows(gUnknown_08618110);
     DeactivateAllTextPrinters();
 
-    DmaCopy32(3, gUnknown_08618138, BG_PLTT + 0x1E0, 0x20);
+    DmaCopy32(3, sUnknown_08618138, BG_PLTT + 0x1E0, 0x20);
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
     FillWindowPixelBuffer(2, 0);
     FillWindowPixelBuffer(3, 0);
     FillWindowPixelBuffer(0, 0xAA);
 
 // This block is a meme among memes
-    width = (0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2;
-    box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E9B);
-    width = (s32)(0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2 + 0x78;
-    box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E8D);
-    width = (0x70 - GetStringWidth(0, gUnknown_08617E8D, 0)) / 2;
-    box_print(3, 0, width, 0, gUnknown_0861815B, -1, gUnknown_08617E8D);
-    width = (0xd0 - GetStringWidth(1, gUnknown_08617E78, 0)) / 2;
-    box_print(0, 1, width, 2, gUnknown_08618158, -1, gUnknown_08617E78);
+    width = (0x78 - GetStringWidth(0, sUnknown_08617E9B, 0)) / 2;
+    box_print(2, 0, width, 3, sUnknown_0861815B, -1, sUnknown_08617E9B);
+    width = (s32)(0x78 - GetStringWidth(0, sUnknown_08617E9B, 0)) / 2 + 0x78;
+    box_print(2, 0, width, 3, sUnknown_0861815B, -1, sUnknown_08617E8D);
+    width = (0x70 - GetStringWidth(0, sUnknown_08617E8D, 0)) / 2;
+    box_print(3, 0, width, 0, sUnknown_0861815B, -1, sUnknown_08617E8D);
+    width = (0xd0 - GetStringWidth(1, sUnknown_08617E78, 0)) / 2;
+    box_print(0, 1, width, 2, sUnknown_08618158, -1, sUnknown_08617E78);
 
     CopyWindowToVram(2, 2);
     CopyWindowToVram(3, 2);
@@ -346,7 +346,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tldr r0, =gUnknown_08618110\n"
         "\tbl InitWindows\n"
         "\tbl DeactivateAllTextPrinters\n"
-        "\tldr r0, =gUnknown_08618138\n"
+        "\tldr r0, =sUnknown_08618138\n"
         "\tstr r0, [r4]\n"
         "\tldr r0, =0x050001e0\n"
         "\tstr r0, [r4, 0x4]\n"
@@ -365,7 +365,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tmovs r0, 0\n"
         "\tmovs r1, 0xAA\n"
         "\tbl FillWindowPixelBuffer\n"
-        "\tldr r5, =gUnknown_08617E9B\n"
+        "\tldr r5, =sUnknown_08617E9B\n"
         "\tmovs r0, 0\n"
         "\tadds r1, r5, 0\n"
         "\tmovs r2, 0\n"
@@ -378,7 +378,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tasrs r0, 1\n"
         "\tlsls r2, r0, 24\n"
         "\tlsrs r2, 24\n"
-        "\tldr r6, =gUnknown_0861815B\n"
+        "\tldr r6, =sUnknown_0861815B\n"
         "\tstr r6, [sp]\n"
         "\tmovs r0, 0x1\n"
         "\tnegs r0, r0\n"
@@ -389,7 +389,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tmovs r1, 0\n"
         "\tmovs r3, 0x3\n"
         "\tbl box_print\n"
-        "\tldr r5, =gUnknown_08617E8D\n"
+        "\tldr r5, =sUnknown_08617E8D\n"
         "\tmovs r0, 0\n"
         "\tadds r1, r5, 0\n"
         "\tmovs r2, 0\n"
@@ -431,7 +431,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tmovs r1, 0\n"
         "\tmovs r3, 0\n"
         "\tbl box_print\n"
-        "\tldr r4, =gUnknown_08617E78\n"
+        "\tldr r4, =sUnknown_08617E78\n"
         "\tmovs r0, 0x1\n"
         "\tadds r1, r4, 0\n"
         "\tmovs r2, 0\n"
@@ -444,7 +444,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
         "\tasrs r0, 1\n"
         "\tlsls r2, r0, 24\n"
         "\tlsrs r2, 24\n"
-        "\tldr r0, =gUnknown_08618158\n"
+        "\tldr r0, =sUnknown_08618158\n"
         "\tstr r0, [sp]\n"
         "\tmov r0, r8\n"
         "\tstr r0, [sp, 0x4]\n"
@@ -496,7 +496,7 @@ static void berry_fix_text_print(int scene)
 {
     FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32);
     FillWindowPixelBuffer(1, 0xAA);
-    box_print(1, 1, 0, 0, gUnknown_08618158, -1, gUnknown_08618160[scene]);
+    box_print(1, 1, 0, 0, sUnknown_08618158, -1, gUnknown_08618160[scene]);
     PutWindowTilemap(1);
     CopyWindowToVram(1, 2);
     switch (scene)
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 52babe346..239c5d690 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -187,9 +187,9 @@ static const struct BgTemplate sHof_BgTemplates[] =
 
 static const struct WindowTemplate sHof_WindowTemplate = {0, 2, 2, 0xE, 6, 0xE, 1};
 
-static const u8 gUnknown_085E5388[] = {0, 1, 2, 0};
+static const u8 sUnknown_085E5388[] = {0, 1, 2, 0};
 
-static const u8 gUnknown_085E538C[] = {0, 2, 3, 0, 4, 5, 0, 0};
+static const u8 sUnknown_085E538C[] = {0, 2, 3, 0, 4, 5, 0, 0};
 
 static const struct CompressedSpriteSheet sHallOfFame_ConfettiSpriteSheet =
 {
@@ -1137,7 +1137,7 @@ static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2)
 {
     FillWindowPixelBuffer(0, 0);
     PutWindowTilemap(0);
-    box_print(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, gUnknown_085E5388, 0, gText_WelcomeToHOF);
+    box_print(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, sUnknown_085E5388, 0, gText_WelcomeToHOF);
     CopyWindowToVram(0, 3);
 }
 
@@ -1173,7 +1173,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
             *(stringPtr)++ = CHAR_QUESTION_MARK;
         }
         stringPtr[0] = EOS;
-        box_print(0, 1, 0x10, 1, gUnknown_085E5388, -1, text);
+        box_print(0, 1, 0x10, 1, sUnknown_085E5388, -1, text);
     }
 
     // nick, species names, gender and level
@@ -1182,13 +1182,13 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
     if (currMon->species == SPECIES_EGG)
     {
         width = GetStringCenterAlignXOffset(1, text, 0xD0);
-        box_print(0, 1, width, 1, gUnknown_085E5388, -1, text);
+        box_print(0, 1, width, 1, sUnknown_085E5388, -1, text);
         CopyWindowToVram(0, 3);
     }
     else
     {
         width = GetStringRightAlignXOffset(1, text, 0x80);
-        box_print(0, 1, width, 1, gUnknown_085E5388, -1, text);
+        box_print(0, 1, width, 1, sUnknown_085E5388, -1, text);
 
         text[0] = CHAR_SLASH;
         stringPtr = StringCopy(text + 1, gSpeciesNames[currMon->species]);
@@ -1209,15 +1209,15 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
         }
 
         stringPtr[0] = EOS;
-        box_print(0, 1, 0x80, 1, gUnknown_085E5388, -1, text);
+        box_print(0, 1, 0x80, 1, sUnknown_085E5388, -1, text);
 
         stringPtr = StringCopy(text, gText_Level);
         ConvertIntToDecimalStringN(stringPtr, currMon->lvl, STR_CONV_MODE_LEFT_ALIGN, 3);
-        box_print(0, 1, 0x24, 0x11, gUnknown_085E5388, -1, text);
+        box_print(0, 1, 0x24, 0x11, sUnknown_085E5388, -1, text);
 
         stringPtr = StringCopy(text, gText_IDNumber);
         ConvertIntToDecimalStringN(stringPtr, (u16)(currMon->tid), STR_CONV_MODE_LEADING_ZEROS, 5);
-        box_print(0, 1, 0x68, 0x11, gUnknown_085E5388, -1, text);
+        box_print(0, 1, 0x68, 0x11, sUnknown_085E5388, -1, text);
 
         CopyWindowToVram(0, 3);
     }
@@ -1232,13 +1232,13 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
     FillWindowPixelBuffer(1, 0x11);
     PutWindowTilemap(1);
     SetWindowBorderStyle(1, FALSE, 0x21D, 0xD);
-    box_print(1, 1, 0, 1, gUnknown_085E538C, -1, gText_Name);
+    box_print(1, 1, 0, 1, sUnknown_085E538C, -1, gText_Name);
 
     width = GetStringRightAlignXOffset(1, gSaveBlock2Ptr->playerName, 0x70);
-    box_print(1, 1, width, 1, gUnknown_085E538C, -1, gSaveBlock2Ptr->playerName);
+    box_print(1, 1, width, 1, sUnknown_085E538C, -1, gSaveBlock2Ptr->playerName);
 
     trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) | (gSaveBlock2Ptr->playerTrainerId[1] << 8);
-    box_print(1, 1, 0, 0x11, gUnknown_085E538C, 0, gText_IDNumber);
+    box_print(1, 1, 0, 0x11, sUnknown_085E538C, 0, gText_IDNumber);
     text[0] = (trainerId % 100000) / 10000 + CHAR_0;
     text[1] = (trainerId % 10000) / 1000 + CHAR_0;
     text[2] = (trainerId % 1000) / 100 + CHAR_0;
@@ -1246,9 +1246,9 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
     text[4] = (trainerId % 10) / 1 + CHAR_0;
     text[5] = EOS;
     width = GetStringRightAlignXOffset(1, text, 0x70);
-    box_print(1, 1, width, 0x11, gUnknown_085E538C, -1, text);
+    box_print(1, 1, width, 0x11, sUnknown_085E538C, -1, text);
 
-    box_print(1, 1, 0, 0x21, gUnknown_085E538C, -1, gText_MainMenuTime);
+    box_print(1, 1, 0, 0x21, sUnknown_085E538C, -1, gText_MainMenuTime);
     text[0] = (gSaveBlock2Ptr->playTimeHours / 100) + CHAR_0;
     text[1] = (gSaveBlock2Ptr->playTimeHours % 100) / 10 + CHAR_0;
     text[2] = (gSaveBlock2Ptr->playTimeHours % 10) + CHAR_0;
@@ -1264,7 +1264,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
     text[6] = EOS;
 
     width = GetStringRightAlignXOffset(1, text, 0x70);
-    box_print(1, 1, width, 0x21, gUnknown_085E538C, -1, text);
+    box_print(1, 1, width, 0x21, sUnknown_085E538C, -1, text);
 
     CopyWindowToVram(1, 3);
 }
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 95270974a..18fbdd64c 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -29,10 +29,10 @@ static u8 sub_818E258(const u8 *);
 
 extern const u8 gText_Lady2[];
 
-static const u16 gUnknown_0860B074[] = {
+static const u16 sUnknown_0860B074[] = {
         0x62, 0xcb, 0xdc, 0xcc, 0xd1
 };
-static const u16 gUnknown_0860B07E[] = {
+static const u16 sUnknown_0860B07E[] = {
         0x1a, 0x14, 0x0a
 };
 
@@ -119,11 +119,11 @@ static const u16 *const gUnknown_0860B1A4[] = {
         Unknown_0860B192
 };
 
-static const u16 gUnknown_0860B1E4[] = {
+static const u16 sUnknown_0860B1E4[] = {
         0x0210, 0x0400, 0x0212, 0x1a26, 0x0208, 0x045d, 0x040a, 0x0411, 0x0464, 0x020e, 0x1a25, 0x181b, 0x1a24, 0x0420, 0x0410, 0x0400
 };
 
-static const u16 gUnknown_0860B204[] = {
+static const u16 sUnknown_0860B204[] = {
         0x007b, 0x007f, 0x0081, 0x0023, 0x0023, 0x0023, 0x00a5, 0x00a7, 0x00a6, 0x000b, 0x012f, 0x006b, 0x006d, 0x0044, 0x0044, 0x000c
 };
 
@@ -176,7 +176,7 @@ static const u16 *const gUnknown_0860B2EC[] = {
         Unknown_0860B2D6
 };
 
-static const u16 gUnknown_0860B304[] = {
+static const u16 sUnknown_0860B304[] = {
         0x0b, 0x6e, 0x40, 0x6f, 0x44, 0x47
 };
 
@@ -218,7 +218,7 @@ static const u8 *const gUnknown_0860B338[] = {
         gUnknown_085EADE7
 };
 
-static const u16 gUnknown_0860B34C[] = {
+static const u16 sUnknown_0860B34C[] = {
         0x0120, 0x013b, 0x011e, 0x013d, 0x0019
 };
 
@@ -237,11 +237,11 @@ void sub_818D9C0(void)
 {
     LilycoveLady *lilycoveLady;
 
-    VarSet(VAR_0x4010, gUnknown_0860B07E[GetLilycoveLadyId()]);
+    VarSet(VAR_0x4010, sUnknown_0860B07E[GetLilycoveLadyId()]);
     if (GetLilycoveLadyId() == LILYCOVE_LADY_CONTEST)
     {
         lilycoveLady = &gSaveBlock1Ptr->lilycoveLady;
-        VarSet(VAR_0x4011, gUnknown_0860B074[lilycoveLady->contest.category]);
+        VarSet(VAR_0x4011, sUnknown_0860B074[lilycoveLady->contest.category]);
         gSpecialVar_Result = TRUE;
     }
     else
@@ -481,7 +481,7 @@ u16 sub_818DEA0(void)
     u16 itemId;
 
     gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
-    itemId = gUnknown_0860B304[gUnknown_0203CD64->unk_00c];
+    itemId = sUnknown_0860B304[gUnknown_0203CD64->unk_00c];
     sub_818DE88(itemId);
     gUnknown_0203CD64->phase = 2;
     return itemId;
@@ -508,8 +508,8 @@ static void sub_818DF00(void)
     {
         gUnknown_0203CD68->unk_002[i] = gUnknown_0860B1A4[v0][i];
     }
-    gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0];
-    gUnknown_0203CD68->itemId = gUnknown_0860B204[v0];
+    gUnknown_0203CD68->unk_014 = sUnknown_0860B1E4[v0];
+    gUnknown_0203CD68->itemId = sUnknown_0860B204[v0];
     gUnknown_0203CD68->unk_02b = v0;
     gUnknown_0203CD68->playerName[0] = EOS;
 }
@@ -581,13 +581,13 @@ u8 sub_818E06C(void)
             {
                 i = 0;
             }
-        } while (sub_811F8D8(gUnknown_0860B1E4[i]) == 0);
+        } while (sub_811F8D8(sUnknown_0860B1E4[i]) == 0);
         for (j = 0; j < 9; j ++)
         {
             quiz->unk_002[j] = gUnknown_0860B1A4[i][j];
         }
-        quiz->unk_014 = gUnknown_0860B1E4[i];
-        quiz->itemId = gUnknown_0860B204[i];
+        quiz->unk_014 = sUnknown_0860B1E4[i];
+        quiz->itemId = sUnknown_0860B204[i];
         quiz->unk_02b = i;
         quiz->playerName[0] = EOS;
     }
@@ -1091,7 +1091,7 @@ void sub_818E940(void)
 void sub_818E960(void)
 {
     gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
-    gSpecialVar_0x8005 = gUnknown_0860B34C[gUnknown_0203CD6C->category];
+    gSpecialVar_0x8005 = sUnknown_0860B34C[gUnknown_0203CD6C->category];
 }
 
 u8 sub_818E990(void)
diff --git a/src/palette.c b/src/palette.c
index d4bb593da..6d8abbde6 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -65,7 +65,7 @@ static const struct PaletteStructTemplate gDummyPaletteStructTemplate = {
     .uid = 0xFFFF,
     .pst_field_B_5 = 1
 };
-static const u8 gUnknown_0852489C[] = {
+static const u8 sUnknown_0852489C[] = {
      0,  0,  0,  0,  0,
      5,  5,  5,  5,  5,
     11, 11, 11, 11, 11,
@@ -849,13 +849,13 @@ void TintPalette_GrayScale(u16 *palette, u16 count)
         r = *palette & 0x1F;
         g = (*palette >> 5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
-        
+
         r *= 0x4C;
         r += g * 0x97;
         r += b * 0x1D;
-        
+
         gray = r >> 8;
-        
+
         *palette++ = gray << 10 | gray << 5 | gray;
     }
     return;
@@ -874,18 +874,18 @@ void TintPalette_GrayScale2(u16 *palette, u16 count)
         r = *palette & 0x1F;
         g = (*palette >> 5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
-        
+
         r *= 0x4C;
         r += g * 0x97;
         r += b * 0x1D;
-        
+
         gray = r >> 8;
-        
+
         if ((u32)gray > 0x1F)
             gray = 0x1F;
-        
-        gray = gUnknown_0852489C[gray];
-        
+
+        gray = sUnknown_0852489C[gray];
+
         *palette++ = gray << 10 | gray << 5 | gray;
     }
     return;
@@ -902,31 +902,31 @@ void TintPalette_SepiaTone(u16 *palette, u16 count)
     s8 r2;
     s8 g2;
     s8 b2;
-    
+
     int i;
     for (i = 0; i < count; i++)
     {
         r = *palette & 0x1F;
         g = (*palette >> 5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
-        
+
         r *= 0x4C;
         r += g * 0x97;
         r += b * 0x1D;
-        
+
         gray = (s32)(r >> 8);
-        
+
         sepia = (gray * 0x133);
-        
+
         r2 = (u16)sepia >> 8;
-        
+
         g2 = gray;
-        
+
         b2 = (gray * 15);
-        
+
         if (r2 > 0x1F)
             r2 = 0x1F;
-        
+
         *palette++ = b2 << 10 | g2 << 5 | r2;
     }
     return;
@@ -1011,28 +1011,28 @@ void sub_80A2BAC(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5)
         r = *palette & 0x1F;
         g = (*palette >> 5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
-        
+
         r *= 0x4C;
         r += g * 0x97;
         r += b * 0x1D;
-        
+
         gray = r >> 8;
-        
+
         r2 = (u16)(gray * a3) >> 8;
-        
+
         g2 = (u16)(gray * a4) >> 8;
-        
+
         b2 = (u16)(gray * a5) >> 8;
-        
+
         if (r2 > 0x1F)
             r2 = 0x1F;
-        
+
         if (g2 > 0x1F)
             g2 = 0x1F;
-        
+
         if (b2 > 0x1F)
             b2 = 0x1F;
-        
+
         *palette++ = b2 << 10 | g2 << 5 | r2;
     }
     return;
diff --git a/src/region_map.c b/src/region_map.c
index b7fc625ca..f28f07d52 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -239,9 +239,9 @@ static const u8 sRegionMapFrameTilemapLZ[] = INCBIN_U8("graphics/pokenav/map_fra
 
 static const u16 Unknown_085A1D48[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal");
 
-static const u8 gUnknown_085A1D68[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
+static const u8 sUnknown_085A1D68[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
 
-static const u8 gUnknown_085A1E3C[][3] = {
+static const u8 sUnknown_085A1E3C[][3] = {
     {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 1},
     {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), 14},
     {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), 15},
@@ -326,7 +326,7 @@ static const struct SpritePalette gUnknown_085A1F10 = {
     Unknown_085A1D48, 2
 };
 
-static const u16 gUnknown_085A1F18[][2] = {
+static const u16 sUnknown_085A1F18[][2] = {
     {FLAG_UNLOCK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER},
     {-1, MAPSEC_NONE}
 };
@@ -1738,7 +1738,7 @@ static void sub_8124A70(void)
 {
     struct SpriteSheet sheet;
 
-    LZ77UnCompWram(gUnknown_085A1D68, gUnknown_0203A148->unk_88c);
+    LZ77UnCompWram(sUnknown_085A1D68, gUnknown_0203A148->unk_88c);
     sheet.data = gUnknown_0203A148->unk_88c;
     sheet.size = 0x1c0;
     sheet.tag = 2;
@@ -1806,11 +1806,11 @@ static void sub_8124BE4(void)
     u16 mapSecId;
     u8 spriteId;
 
-    for (i = 0; gUnknown_085A1F18[i][1] != MAPSEC_NONE; i++)
+    for (i = 0; sUnknown_085A1F18[i][1] != MAPSEC_NONE; i++)
     {
-        if (FlagGet(gUnknown_085A1F18[i][0]))
+        if (FlagGet(sUnknown_085A1F18[i][0]))
         {
-            mapSecId = gUnknown_085A1F18[i][1];
+            mapSecId = sUnknown_085A1F18[i][1];
             sub_8124630(mapSecId, &x, &y, &width, &height);
             x = (x + MAPCURSOR_X_MIN) * 8;
             y = (y + MAPCURSOR_Y_MIN) * 8;
@@ -1919,13 +1919,13 @@ static void sub_8124E0C(void)
                             sub_8084CCC(FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B);
                             break;
                         default:
-                            if (gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0)
+                            if (sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0)
                             {
-                                sub_8084CCC(gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2]);
+                                sub_8084CCC(sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2]);
                             }
                             else
                             {
-                                warp1_set_2(gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][0], gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][1], -1);
+                                warp1_set_2(sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][0], sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][1], -1);
                             }
                             break;
                     }
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index ef01f0293..218ef68d7 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -154,8 +154,8 @@ static const u8 sClockFrames[8][3] =
     { 5, 1, 0 },
 };
 
-static const u8 gSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal");
-static const u8 gSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz");
+static const u8 sSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal");
+static const u8 sSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz");
 
 static void CB2_SaveFailedScreen(void);
 static void CB2_WipeSave(void);
@@ -221,7 +221,7 @@ static void CB2_SaveFailedScreen(void)
             LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM);
             LZ77UnCompVram(gBirchBagTilemap, (void *)(VRAM + 0x7000));
             LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x7800));
-            LZ77UnCompVram(gSaveFailedClockGfx, (void *)(VRAM + 0x10020));
+            LZ77UnCompVram(sSaveFailedClockGfx, (void *)(VRAM + 0x10020));
             ResetBgsAndClearDma3BusyFlags(0);
             InitBgsFromTemplates(0, gUnknown_085EFD88, 3);
             SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]);
@@ -238,7 +238,7 @@ static void CB2_SaveFailedScreen(void)
             ResetTasks();
             ResetPaletteFade();
             LoadPalette(gBirchBagGrassPal, 0, 0x40);
-            LoadPalette(gSaveFailedClockPal, 0x100, 0x20);
+            LoadPalette(sSaveFailedClockPal, 0x100, 0x20);
             LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20);
             LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
             SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE);
diff --git a/src/sprite.c b/src/sprite.c
index 9db61d2e9..6d76b9854 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -240,7 +240,7 @@ static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] =
     AffineAnimCmd_frame,
 };
 
-static const s32 gUnknown_082EC6F4[24] =
+static const s32 sUnknown_082EC6F4[24] =
 {
     8,      8,      0x10,   0x10,   0x20,   0x20,
     0x40,   0x40,   0x10,   8,      0x20,   8,
@@ -1214,14 +1214,14 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
     u8 matrixNum = sprite->oam.matrixNum;
     if (a1 != 0x800)
     {
-        var0 = gUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32];
+        var0 = sUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32];
         var1 = var0 << 8;
         var2 = (var0 << 16) / gOamMatrices[matrixNum].a;
         sprite->pos2.x = sub_8007E28(var1, var2, a1);
     }
     if (a2 != 0x800)
     {
-        var0 = gUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)];
+        var0 = sUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)];
         var1 = var0 << 8;
         var2 = (var0 << 16) / gOamMatrices[matrixNum].d;
         sprite->pos2.y = sub_8007E28(var1, var2, a2);
@@ -1247,7 +1247,7 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
 	mov r9, r0\n\
 	cmp r6, r9\n\
 	beq _08007EA2\n\
-	ldr r2, =gUnknown_082EC6F4\n\
+	ldr r2, =sUnknown_082EC6F4\n\
 	lsrs r1, 6\n\
 	lsls r1, 3\n\
 	ldrb r0, [r5, 0x1]\n\
@@ -1272,7 +1272,7 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
 _08007EA2:\n\
 	cmp r8, r9\n\
 	beq _08007EDA\n\
-	ldr r2, =gUnknown_082EC6F4\n\
+	ldr r2, =sUnknown_082EC6F4\n\
 	ldrb r1, [r5, 0x3]\n\
 	lsrs r1, 6\n\
 	lsls r1, 3\n\
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
index d88af611f..8eaab32b6 100644
--- a/src/unk_text_util_2.c
+++ b/src/unk_text_util_2.c
@@ -4,8 +4,8 @@
 #include "text.h"
 #include "sound.h"
 
-static const u8 gUnknown_08616124[] = {1, 2, 4};
-static const u16 gFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
+static const u8 sUnknown_08616124[] = {1, 2, 4};
+static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
 
 static void DecompressGlyphFont6(u16);
 
@@ -13,7 +13,7 @@ u16 Font6Func(struct TextPrinter *textPrinter)
 {
     u16 char_;
     struct TextPrinterSubStruct *sub;
-    
+
     sub = &textPrinter->sub_union.sub;
     switch (textPrinter->state)
     {
@@ -163,15 +163,15 @@ u16 Font6Func(struct TextPrinter *textPrinter)
         case 4:
             if (textPrinter->scrollDistance)
             {
-                if (textPrinter->scrollDistance < gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed])
+                if (textPrinter->scrollDistance < sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed])
                 {
                     ScrollWindow(textPrinter->subPrinter.windowId, 0, textPrinter->scrollDistance, textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
                     textPrinter->scrollDistance = 0;
                 }
                 else
                 {
-                    ScrollWindow(textPrinter->subPrinter.windowId, 0, gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
-                    textPrinter->scrollDistance -= gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed];
+                    ScrollWindow(textPrinter->subPrinter.windowId, 0, sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
+                    textPrinter->scrollDistance -= sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed];
                 }
                 CopyWindowToVram(textPrinter->subPrinter.windowId, 2);
             }
@@ -204,7 +204,7 @@ static void DecompressGlyphFont6(u16 glyph)
 {
     const u16 *glyphs;
 
-    glyphs = gFont6BrailleGlyphs + 0x100 * (glyph / 8) + 0x10 * (glyph % 8);
+    glyphs = sFont6BrailleGlyphs + 0x100 * (glyph / 8) + 0x10 * (glyph % 8);
     DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90);
     DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90 + 0x20));
     DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90 + 0x40));
diff --git a/src/wallclock.c b/src/wallclock.c
index 892ef3f05..cd85de230 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -57,8 +57,8 @@ static void SpriteCB_PMIndicator(struct Sprite *sprite);
 
 // rodata
 
-static const u8 gUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz");
-static const u16 gUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal");
+static const u8 sUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz");
+static const u16 sUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal");
 static const struct WindowTemplate gUnknown_085B21DC[] = {
     { 0x00, 0x03, 0x11, 0x18, 0x02, 0x0e, 0x200 },
     { 0x02, 0x18, 0x10, 0x06, 0x02, 0x0c, 0x230 },
@@ -88,7 +88,7 @@ static const struct BgTemplate gUnknown_085B21FC[] = {
     }
 };
 static const struct CompressedSpriteSheet gUnknown_085B2208 = {
-    gUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND
+    sUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND
 };
 static const u32 filler_85B2210[2] = {};
 static const struct SpritePalette gUnknown_085B2218[] = {
@@ -571,7 +571,7 @@ static void LoadWallClockGraphics(void)
         LoadPalette(gUnknown_08DCC03C, 0x00, 0x20);
     }
     LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 0x20);
-    LoadPalette(gUnknown_085B21D4, 0xc0, 0x08);
+    LoadPalette(sUnknown_085B21D4, 0xc0, 0x08);
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, gUnknown_085B21FC, 3);
     InitWindows(gUnknown_085B21DC);
@@ -666,27 +666,27 @@ void Cb2_ViewWallClock(void)
         angle1 = 90;
         angle2 = 135;
     }
-    
+
     spriteId = CreateSprite(&gUnknown_085B2250, 0x78, 0x50, 1);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 0;
-    
+
     spriteId = CreateSprite(&gUnknown_085B2268, 0x78, 0x50, 0);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 1;
-    
+
     spriteId = CreateSprite(&gUnknown_085B22A0, 0x78, 0x50, 2);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].data[1] = angle1;
-    
+
     spriteId = CreateSprite(&gUnknown_085B22B8, 0x78, 0x50, 2);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].data[1] = angle2;
-    
+
     WallClockInit();
-    
+
     PrintTextOnWindow(1, 1, gText_Cancel4, 0, 1, 0, NULL);
     PutWindowTilemap(1);
     schedule_bg_copy_tilemap_to_vram(2);
-- 
cgit v1.2.3


From a612ef12a0a647fe0614f8003ce39448d46b02ef Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 18 Dec 2017 19:35:50 +0100
Subject: start working on trainer see

---
 src/egg_hatch.c   |   2 +-
 src/trainer_see.c | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 225 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index a31eb0520..9e9a192de 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -91,7 +91,7 @@ static void CreateRandomEggShardSprite(void);
 static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 spriteAnimIndex);
 
 // IWRAM bss
-static IWRAM_DATA struct EggHatchData* sEggHatchData;
+static IWRAM_DATA struct EggHatchData *sEggHatchData;
 
 // rom data
 static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/palettes/egg_palette.gbapal");
diff --git a/src/trainer_see.c b/src/trainer_see.c
index b30f27347..b396d26e7 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -1,15 +1,158 @@
 #include "global.h"
 #include "trainer_see.h"
 #include "battle_setup.h"
+#include "pokemon.h"
+#include "sprite.h"
+#include "field_map_obj.h"
+#include "pokenav.h"
+#include "task.h"
 
 extern u8 gApproachingTrainerId;
 extern u8 gNoOfApproachingTrainers;
 extern u8 gUnknown_030060AC;
 extern u16 gUnknown_03006080;
 
+extern bool8 InBattlePyramid(void);
+extern bool32 InTrainerHill(void);
+extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjectId);
+extern bool8 GetTrainerHillTrainerFlag(u8 mapObjectId);
+
 // this file's functions
-u8 CheckIfTrainerWantsBattle(u8 mapObjectId);
+static u8 CheckTrainer(u8 mapObjectId);
+u8 GetTrainerApproachDistance(struct MapObject *trainerObj);
+void TrainerApproachPlayer(struct MapObject *trainerObj, u8 radius);
+
+u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+
+bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+
+bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+
+void objc_exclamation_mark_probably(struct Sprite *sprite);
+
+// const rom data
+const u8 gEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion_exclamation.4bpp");
+const u8 gEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp");
+const u8 gEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp");
+
+u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *trainerObj, s16 range, s16 x, s16 y) =
+{
+    GetTrainerApproachDistanceSouth,
+    GetTrainerApproachDistanceNorth,
+    GetTrainerApproachDistanceWest,
+    GetTrainerApproachDistanceEast,
+};
+
+bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+{
+    sub_80B4178,
+	sub_80B417C,
+	sub_80B41C0,
+	sub_80B4200,
+	sub_80B425C,
+	sub_80B4318,
+	sub_80B435C,
+	sub_80B4390,
+	sub_80B43AC,
+	sub_80B43E0,
+	sub_80B4438,
+	sub_80B44AC
+};
+
+bool8 (*const gTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+{
+    sub_80B43AC,
+    sub_80B43E0,
+    sub_80B4438,
+    sub_80B44AC,
+};
+
+const struct OamData gOamData_855077C =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+const struct SpriteFrameImage gSpriteImageTable_8550784[] =
+{
+    {gEmotion_ExclamationMarkGfx, 0x80},
+    {gEmotion_QuestionMarkGfx, 0x80}
+};
 
+const struct SpriteFrameImage gSpriteImageTable_8550794[] =
+{
+    {gEmotion_HeartGfx, 0x80}
+};
+
+const union AnimCmd gSpriteAnim_855079C[] =
+{
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_85507A4[] =
+{
+    ANIMCMD_FRAME(1, 60),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_85507AC[] =
+{
+    gSpriteAnim_855079C,
+    gSpriteAnim_85507A4
+};
+
+const struct SpriteTemplate gSpriteTemplate_85507B4 =
+{
+    .tileTag = 0xffff,
+    .paletteTag = 0xffff,
+    .oam = &gOamData_855077C,
+    .anims = gSpriteAnimTable_85507AC,
+    .images = gSpriteImageTable_8550784,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = objc_exclamation_mark_probably
+};
+
+const struct SpriteTemplate gSpriteTemplate_85507CC =
+{
+    .tileTag = 0xffff,
+    .paletteTag = 0x1004,
+    .oam = &gOamData_855077C,
+    .anims = gSpriteAnimTable_85507AC,
+    .images = gSpriteImageTable_8550794,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = objc_exclamation_mark_probably
+};
+
+// code
 bool8 CheckForTrainersWantingBattle(void)
 {
     u8 i;
@@ -26,7 +169,7 @@ bool8 CheckForTrainersWantingBattle(void)
         if (gMapObjects[i].trainerType != 1 && gMapObjects[i].trainerType != 3)
             continue;
 
-        retVal = CheckIfTrainerWantsBattle(i);
+        retVal = CheckTrainer(i);
         if (retVal == 2)
             break; // two trainers have been found
 
@@ -66,3 +209,82 @@ bool8 CheckForTrainersWantingBattle(void)
         return FALSE;
     }
 }
+
+static u8 CheckTrainer(u8 mapObjectId)
+{
+    const u8 *scriptPtr;
+    u8 ret = 1;
+    u8 approachDistance;
+
+    if (InTrainerHill() == TRUE)
+        scriptPtr = sub_81D62AC();
+    else
+        scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(mapObjectId);
+
+    if (InBattlePyramid())
+    {
+        if (GetBattlePyramidTrainerFlag(mapObjectId))
+            return 0;
+    }
+    else if (InTrainerHill() == TRUE)
+    {
+        if (GetTrainerHillTrainerFlag(mapObjectId))
+            return 0;
+    }
+    else
+    {
+        if (GetTrainerFlagFromScriptPointer(scriptPtr))
+            return 0;
+    }
+
+    approachDistance = GetTrainerApproachDistance(&gMapObjects[mapObjectId]);
+
+    if (approachDistance != 0)
+    {
+        if (scriptPtr[1] == TRAINER_BATTLE_DOUBLE
+            || scriptPtr[1] == TRAINER_BATTLE_REMATCH_DOUBLE
+            || scriptPtr[1] == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE)
+        {
+            if (GetMonsStateToDoubles_2() != 0)
+                return 0;
+
+            ret = 2;
+        }
+
+        gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId = mapObjectId;
+        gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr;
+        gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance;
+        TrainerApproachPlayer(&gMapObjects[mapObjectId], approachDistance - 1);
+        gNoOfApproachingTrainers++;
+
+        return ret;
+    }
+
+    return 0;
+}
+
+/*
+u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
+{
+    s16 x, y;
+    u8 i;
+    u8 approachDistance;
+
+    PlayerGetDestCoords(&x, &y);
+    if (trainerObj->trainerType == 1)  // can only see in one direction
+    {
+        approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
+        return CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, approachDistance, trainerObj->mapobj_unk_18);
+    }
+    else  // can see in all directions
+    {
+        for (i = 0; i < 4; i++)
+        {
+            approachDistance = sDirectionalApproachDistanceFuncs[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
+            if (CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, approachDistance, i + 1)) // directions are 1-4 instead of 0-3. south north west east
+                return approachDistance;
+        }
+    }
+    return 0;
+}
+*/
-- 
cgit v1.2.3


From 574435698942634f7e1bdf800a62391e6c03b064 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 18 Dec 2017 23:26:44 +0100
Subject: decompile trainer see

---
 src/field_map_obj.c |  18 +-
 src/scrcmd.c        |   2 +-
 src/trainer_see.c   | 486 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 489 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 6a99890a4..fc23a6e37 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -1174,11 +1174,11 @@ void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGr
     }
 }
 
-void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, u8 *localId, u8 *mapNum, u8 *mapGroup)
+void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup)
 {
-    *localId = mapObject->localId;
-    *mapNum = mapObject->mapNum;
-    *mapGroup = mapObject->mapGroup;
+    *(u8*)(localId) = mapObject->localId;
+    *(u8*)(mapNum) = mapObject->mapNum;
+    *(u8*)(mapGroup) = mapObject->mapGroup;
 }
 
 void sub_808E75C(s16 x, s16 y)
@@ -3426,7 +3426,7 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
     mapObject = &gMapObjects[sprite->data[0]];
     if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7]))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
         sprite->data[7] ++;
@@ -3447,7 +3447,7 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
     mapObject = &gMapObjects[sprite->data[0]];
     if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7]))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
         sprite->data[7] ++;
@@ -4694,7 +4694,7 @@ bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
     sprite->data[2] = 1;
     return TRUE;
@@ -4702,7 +4702,7 @@ bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *s
 
 bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2);
     sprite->data[2] = 1;
     return TRUE;
@@ -4710,7 +4710,7 @@ bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *s
 
 bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_HEART_ICON);
     sprite->data[2] = 1;
     return TRUE;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 1b10501fc..412f8acd1 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -2332,7 +2332,7 @@ bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx)
 
 bool8 ScrCmd_cmdD8(struct ScriptContext *ctx)
 {
-    gSelectedMapObject = sub_80B47BC();
+    gSelectedMapObject = GetCurrentApproachingTrainerMapObjectId();
     return FALSE;
 }
 
diff --git a/src/trainer_see.c b/src/trainer_see.c
index b396d26e7..26d00192e 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -3,24 +3,37 @@
 #include "battle_setup.h"
 #include "pokemon.h"
 #include "sprite.h"
+#include "field_effect.h"
 #include "field_map_obj.h"
+#include "field_player_avatar.h"
+#include "map_obj_8097404.h"
 #include "pokenav.h"
 #include "task.h"
+#include "util.h"
+#include "script.h"
+#include "event_data.h"
+#include "script_movement.h"
 
 extern u8 gApproachingTrainerId;
 extern u8 gNoOfApproachingTrainers;
 extern u8 gUnknown_030060AC;
 extern u16 gUnknown_03006080;
+extern u8 gUnknown_03006084[];
 
 extern bool8 InBattlePyramid(void);
 extern bool32 InTrainerHill(void);
 extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjectId);
 extern bool8 GetTrainerHillTrainerFlag(u8 mapObjectId);
+extern void sub_809BE48(u16 npcId);
 
 // this file's functions
-static u8 CheckTrainer(u8 mapObjectId);
+u8 CheckTrainer(u8 mapObjectId);
 u8 GetTrainerApproachDistance(struct MapObject *trainerObj);
-void TrainerApproachPlayer(struct MapObject *trainerObj, u8 radius);
+void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range);
+u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction);
+void Task_RunTrainerSeeFuncList(u8 taskId);
+void Task_DestroyTrainerApproachTask(u8 taskId);
+void sub_80B46D8(struct Sprite *sprite, u16 a2, u8 a3);
 
 u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
 u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
@@ -210,7 +223,7 @@ bool8 CheckForTrainersWantingBattle(void)
     }
 }
 
-static u8 CheckTrainer(u8 mapObjectId)
+u8 CheckTrainer(u8 mapObjectId)
 {
     const u8 *scriptPtr;
     u8 ret = 1;
@@ -263,7 +276,6 @@ static u8 CheckTrainer(u8 mapObjectId)
     return 0;
 }
 
-/*
 u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
 {
     s16 x, y;
@@ -274,17 +286,477 @@ u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
     if (trainerObj->trainerType == 1)  // can only see in one direction
     {
         approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-        return CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, approachDistance, trainerObj->mapobj_unk_18);
+        return CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, trainerObj->mapobj_unk_18);
     }
     else  // can see in all directions
     {
         for (i = 0; i < 4; i++)
         {
             approachDistance = sDirectionalApproachDistanceFuncs[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y);
-            if (CheckPathBetweenTrainerAndPlayer((struct MapObject2 *)trainerObj, approachDistance, i + 1)) // directions are 1-4 instead of 0-3. south north west east
+            if (CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, i + 1)) // directions are 1-4 instead of 0-3. south north west east
                 return approachDistance;
         }
     }
+
+    return 0;
+}
+
+// Returns how far south the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.x == x
+     && y > trainerObj->coords2.y
+     && y <= trainerObj->coords2.y + range)
+        return (y - trainerObj->coords2.y);
+    else
+        return 0;
+}
+
+// Returns how far north the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.x == x
+     && y < trainerObj->coords2.y
+     && y >= trainerObj->coords2.y - range)
+        return (trainerObj->coords2.y - y);
+    else
+        return 0;
+}
+
+// Returns how far west the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.y == y
+     && x < trainerObj->coords2.x
+     && x >= trainerObj->coords2.x - range)
+        return (trainerObj->coords2.x - x);
+    else
+        return 0;
+}
+
+// Returns how far east the player is from trainer. 0 if out of trainer's sight.
+u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+{
+    if (trainerObj->coords2.y == y
+     && x > trainerObj->coords2.x
+     && x <= trainerObj->coords2.x + range)
+        return (x - trainerObj->coords2.x);
+    else
+        return 0;
+}
+
+#define COLLISION_MASK (~1)
+
+u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction)
+{
+    s16 x, y;
+    u8 unk19_temp;
+    u8 unk19b_temp;
+    u8 i;
+    u8 collision;
+
+    if (approachDistance == 0)
+        return 0;
+
+    x = trainerObj->coords2.x;
+    y = trainerObj->coords2.y;
+
+    MoveCoords(direction, &x, &y);
+    for (i = 0; i < approachDistance - 1; i++, MoveCoords(direction, &x, &y))
+    {
+        collision = sub_8092C8C(trainerObj, x, y, direction);
+        if (collision != 0 && (collision & COLLISION_MASK))
+            return 0;
+    }
+
+    // preserve mapobj_unk_19 before clearing.
+    unk19_temp = trainerObj->range.as_nybbles.x;
+    unk19b_temp = trainerObj->range.as_nybbles.y;
+    trainerObj->range.as_nybbles.x = 0;
+    trainerObj->range.as_nybbles.y = 0;
+
+    collision = npc_block_way(trainerObj, x, y, direction);
+
+    trainerObj->range.as_nybbles.x = unk19_temp;
+    trainerObj->range.as_nybbles.y = unk19b_temp;
+    if (collision == 4)
+        return approachDistance;
+
     return 0;
 }
-*/
+
+#define tFuncId             data[0]
+#define tTrainerRange       data[3]
+#define tTrainerMapObjectId data[7]
+
+void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range)
+{
+    struct Task *task;
+
+    gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50);
+    task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId];
+    task->tTrainerRange = range;
+    task->tTrainerMapObjectId = gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId;
+}
+
+void sub_80B40C8(TaskFunc followupFunc)
+{
+    u8 taskId;
+    TaskFunc taskFunc;
+
+    if (gApproachingTrainerId == 0)
+        taskId = gApproachingTrainers[0].taskId;
+    else
+        taskId = gApproachingTrainers[1].taskId;
+
+    taskFunc = Task_RunTrainerSeeFuncList;
+    SetTaskFuncWithFollowupFunc(taskId, taskFunc, followupFunc);
+    gTasks[taskId].tFuncId = 1;
+    taskFunc(taskId);
+}
+
+void Task_RunTrainerSeeFuncList(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    struct MapObject *trainerObj = &gMapObjects[task->tTrainerMapObjectId];
+
+    if (!trainerObj->active)
+    {
+        SwitchTaskToFollowupFunc(taskId);
+    }
+    else
+    {
+        while (gTrainerSeeFuncList[task->tFuncId](taskId, task, trainerObj));
+    }
+}
+
+bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    return FALSE;
+}
+
+bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    u8 direction;
+
+    FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
+    direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
+    FieldObjectSetSpecialAnim(trainerObj, direction);
+    task->tFuncId++;
+    return TRUE;
+}
+
+bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (FieldEffectActiveListContains(0))
+    {
+        return FALSE;
+    }
+    else
+    {
+        task->data[0]++;
+        if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58)
+            task->data[0] = 6;
+        if (trainerObj->animPattern == 63)
+            task->data[0] = 8;
+        return TRUE;
+    }
+}
+
+bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    {
+        if (task->data[3])
+        {
+            FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18));
+            task->data[3]--;
+        }
+        else
+        {
+            FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+            task->data[0]++;
+        }
+    }
+    return FALSE;
+}
+
+bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    struct MapObject *playerObj;
+
+    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+        return FALSE;
+
+    npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
+    sub_808F23C(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18));
+    sub_808F208(trainerObj);
+
+    playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+        return FALSE;
+
+    sub_808BCE8();
+    FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18)));
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+        SwitchTaskToFollowupFunc(taskId);
+    return FALSE;
+}
+
+bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    {
+        FieldObjectSetSpecialAnim(trainerObj, 0x59);
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+        task->data[0] = 3;
+
+    return FALSE;
+}
+
+bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
+     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    {
+        FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj))
+    {
+        gFieldEffectArguments[0] = trainerObj->coords2.x;
+        gFieldEffectArguments[1] = trainerObj->coords2.y;
+        gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1;
+        gFieldEffectArguments[3] = 2;
+        task->data[4] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    struct Sprite *sprite;
+
+    if (gSprites[task->data[4]].animCmdIndex == 2)
+    {
+        trainerObj->mapobj_bit_26 = 0;
+        trainerObj->mapobj_bit_2 = 1;
+
+        sprite = &gSprites[trainerObj->spriteId];
+        sprite->oam.priority = 2;
+        FieldObjectClearAnimIfSpecialAnimFinished(trainerObj);
+        FieldObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->mapobj_unk_18));
+        task->data[0]++;
+    }
+
+    return FALSE;
+}
+
+bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+{
+    if (!FieldEffectActiveListContains(49))
+        task->data[0] = 3;
+
+    return FALSE;
+}
+
+void sub_80B44C8(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    struct MapObject *mapObj;
+
+    // another mapObj loaded into by loadword?
+    LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&mapObj);
+    if (!task->data[7])
+    {
+        FieldObjectClearAnim(mapObj);
+        task->data[7]++;
+    }
+    gTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj);
+    if (task->data[0] == 3 && !FieldEffectActiveListContains(49))
+    {
+        npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18));
+        sub_808F23C(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18));
+        DestroyTask(taskId);
+    }
+    else
+    {
+        mapObj->mapobj_bit_7 = 0;
+    }
+}
+
+void sub_80B4578(struct MapObject *var)
+{
+    StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var);
+}
+
+void EndTrainerApproach(void)
+{
+    sub_80B40C8(Task_DestroyTrainerApproachTask);
+}
+
+void Task_DestroyTrainerApproachTask(u8 taskId)
+{
+    DestroyTask(taskId);
+    EnableBothScriptContexts();
+}
+
+void sub_80B45D0(void)
+{
+    if (gNoOfApproachingTrainers == 2)
+    {
+        if (gApproachingTrainerId == 0)
+        {
+            gApproachingTrainerId++;
+            gSpecialVar_Result = 1;
+            UnfreezeMapObjects();
+            sub_80974D0(gApproachingTrainers[1].mapObjectId);
+        }
+        else
+        {
+            gApproachingTrainerId = 0;
+            gSpecialVar_Result = 0;
+        }
+    }
+    else
+    {
+        gSpecialVar_Result = 0;
+    }
+}
+
+u8 FldEff_ExclamationMarkIcon1(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_85507B4, 0, 0, 0x53);
+
+    if (spriteId != MAX_SPRITES)
+        sub_80B46D8(&gSprites[spriteId], 0, 0);
+
+    return 0;
+}
+
+u8 FldEff_ExclamationMarkIcon2(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_85507B4, 0, 0, 0x52);
+
+    if (spriteId != MAX_SPRITES)
+        sub_80B46D8(&gSprites[spriteId], 33, 1);
+
+    return 0;
+}
+
+u8 FldEff_HeartIcon(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_85507CC, 0, 0, 0x52);
+
+    if (spriteId != MAX_SPRITES)
+    {
+        struct Sprite *sprite = &gSprites[spriteId];
+
+        sub_80B46D8(sprite, 46, 0);
+        sprite->oam.paletteNum = 2;
+    }
+
+    return 0;
+}
+
+void sub_80B46D8(struct Sprite *sprite, u16 a2, u8 a3)
+{
+    sprite->oam.priority = 1;
+    sprite->coordOffsetEnabled = 1;
+
+    sprite->data[0] = gFieldEffectArguments[0];
+    sprite->data[1] = gFieldEffectArguments[1];
+    sprite->data[2] = gFieldEffectArguments[2];
+    sprite->data[3] = -5;
+    sprite->data[7] = a2;
+
+    StartSpriteAnim(sprite, a3);
+}
+
+void objc_exclamation_mark_probably(struct Sprite *sprite)
+{
+    u8 mapObjId;
+
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjId)
+     || sprite->animEnded)
+    {
+        FieldEffectStop(sprite, sprite->data[7]);
+    }
+    else
+    {
+        struct Sprite *mapObjSprite = &gSprites[gMapObjects[mapObjId].spriteId];
+        sprite->data[4] += sprite->data[3];
+        sprite->pos1.x = mapObjSprite->pos1.x;
+        sprite->pos1.y = mapObjSprite->pos1.y - 16;
+        sprite->pos2.x = mapObjSprite->pos2.x;
+        sprite->pos2.y = mapObjSprite->pos2.y + sprite->data[4];
+        if (sprite->data[4])
+            sprite->data[3]++;
+        else
+            sprite->data[3] = 0;
+    }
+}
+
+u8 GetCurrentApproachingTrainerMapObjectId(void)
+{
+    if (gApproachingTrainerId == 0)
+        return gApproachingTrainers[0].mapObjectId;
+    else
+        return gApproachingTrainers[1].mapObjectId;
+}
+
+u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId)
+{
+    if (arrayId >= ARRAY_COUNT(gApproachingTrainers))
+        return 0;
+    else if (arrayId == 0)
+        return gApproachingTrainers[0].mapObjectId;
+    else
+        return gApproachingTrainers[1].mapObjectId;
+}
+
+void sub_80B4808(void)
+{
+    struct MapObject *trainerObj;
+
+    if (gUnknown_030060AC == 1)
+    {
+        trainerObj = &gMapObjects[gApproachingTrainers[gUnknown_03006080].mapObjectId];
+        gUnknown_03006084[0] = GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18));
+        gUnknown_03006084[1] = 0xFE;
+        ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
+    }
+    else
+    {
+        trainerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+        gUnknown_03006084[0] = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
+        gUnknown_03006084[1] = 0xFE;
+        ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084);
+    }
+
+    sub_809BE48(0xFF);
+}
-- 
cgit v1.2.3


From b7a23353471ade3bffa5108e45b79eb1a6f19a65 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 19 Dec 2017 17:18:44 +0100
Subject: clean up trainer see file

---
 src/trainer_see.c | 263 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 139 insertions(+), 124 deletions(-)

(limited to 'src')

diff --git a/src/trainer_see.c b/src/trainer_see.c
index 26d00192e..b8dbda0c1 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -27,45 +27,40 @@ extern bool8 GetTrainerHillTrainerFlag(u8 mapObjectId);
 extern void sub_809BE48(u16 npcId);
 
 // this file's functions
-u8 CheckTrainer(u8 mapObjectId);
-u8 GetTrainerApproachDistance(struct MapObject *trainerObj);
-void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range);
-u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction);
-void Task_RunTrainerSeeFuncList(u8 taskId);
-void Task_DestroyTrainerApproachTask(u8 taskId);
-void sub_80B46D8(struct Sprite *sprite, u16 a2, u8 a3);
-
-u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-
-bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-
-bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-
-void objc_exclamation_mark_probably(struct Sprite *sprite);
+static u8 CheckTrainer(u8 mapObjectId);
+static u8 GetTrainerApproachDistance(struct MapObject *trainerObj);
+static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction);
+static void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range);
+static void Task_RunTrainerSeeFuncList(u8 taskId);
+static void Task_DestroyTrainerApproachTask(u8 taskId);
+static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum);
+
+static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+
+static bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+
+static void SpriteCB_TrainerIcons(struct Sprite *sprite);
 
 // const rom data
-const u8 gEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion_exclamation.4bpp");
-const u8 gEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp");
-const u8 gEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp");
+static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion_exclamation.4bpp");
+static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp");
+static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp");
 
-u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *trainerObj, s16 range, s16 x, s16 y) =
+static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *trainerObj, s16 range, s16 x, s16 y) =
 {
     GetTrainerApproachDistanceSouth,
     GetTrainerApproachDistanceNorth,
@@ -73,7 +68,7 @@ u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *trainerObj, s1
     GetTrainerApproachDistanceEast,
 };
 
-bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
 {
     sub_80B4178,
 	sub_80B417C,
@@ -89,7 +84,7 @@ bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObj
 	sub_80B44AC
 };
 
-bool8 (*const gTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
 {
     sub_80B43AC,
     sub_80B43E0,
@@ -97,7 +92,7 @@ bool8 (*const gTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct MapOb
     sub_80B44AC,
 };
 
-const struct OamData gOamData_855077C =
+static const struct OamData sOamData_Icons =
 {
     .y = 0,
     .affineMode = 0,
@@ -114,55 +109,55 @@ const struct OamData gOamData_855077C =
     .affineParam = 0,
 };
 
-const struct SpriteFrameImage gSpriteImageTable_8550784[] =
+static const struct SpriteFrameImage sSpriteImageTable_ExclamationQuestionMark[] =
 {
-    {gEmotion_ExclamationMarkGfx, 0x80},
-    {gEmotion_QuestionMarkGfx, 0x80}
+    {sEmotion_ExclamationMarkGfx, 0x80},
+    {sEmotion_QuestionMarkGfx, 0x80}
 };
 
-const struct SpriteFrameImage gSpriteImageTable_8550794[] =
+static const struct SpriteFrameImage sSpriteImageTable_HeartIcon[] =
 {
-    {gEmotion_HeartGfx, 0x80}
+    {sEmotion_HeartGfx, 0x80}
 };
 
-const union AnimCmd gSpriteAnim_855079C[] =
+static const union AnimCmd sSpriteAnim_Icons1[] =
 {
     ANIMCMD_FRAME(0, 60),
     ANIMCMD_END
 };
 
-const union AnimCmd gSpriteAnim_85507A4[] =
+static const union AnimCmd sSpriteAnim_Icons2[] =
 {
     ANIMCMD_FRAME(1, 60),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gSpriteAnimTable_85507AC[] =
+static const union AnimCmd *const sSpriteAnimTable_Icons[] =
 {
-    gSpriteAnim_855079C,
-    gSpriteAnim_85507A4
+    sSpriteAnim_Icons1,
+    sSpriteAnim_Icons2
 };
 
-const struct SpriteTemplate gSpriteTemplate_85507B4 =
+static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark =
 {
     .tileTag = 0xffff,
     .paletteTag = 0xffff,
-    .oam = &gOamData_855077C,
-    .anims = gSpriteAnimTable_85507AC,
-    .images = gSpriteImageTable_8550784,
+    .oam = &sOamData_Icons,
+    .anims = sSpriteAnimTable_Icons,
+    .images = sSpriteImageTable_ExclamationQuestionMark,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = objc_exclamation_mark_probably
+    .callback = SpriteCB_TrainerIcons
 };
 
-const struct SpriteTemplate gSpriteTemplate_85507CC =
+static const struct SpriteTemplate sSpriteTemplate_HeartIcon =
 {
     .tileTag = 0xffff,
     .paletteTag = 0x1004,
-    .oam = &gOamData_855077C,
-    .anims = gSpriteAnimTable_85507AC,
-    .images = gSpriteImageTable_8550794,
+    .oam = &sOamData_Icons,
+    .anims = sSpriteAnimTable_Icons,
+    .images = sSpriteImageTable_HeartIcon,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = objc_exclamation_mark_probably
+    .callback = SpriteCB_TrainerIcons
 };
 
 // code
@@ -223,7 +218,7 @@ bool8 CheckForTrainersWantingBattle(void)
     }
 }
 
-u8 CheckTrainer(u8 mapObjectId)
+static u8 CheckTrainer(u8 mapObjectId)
 {
     const u8 *scriptPtr;
     u8 ret = 1;
@@ -276,7 +271,7 @@ u8 CheckTrainer(u8 mapObjectId)
     return 0;
 }
 
-u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
+static u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
 {
     s16 x, y;
     u8 i;
@@ -302,7 +297,7 @@ u8 GetTrainerApproachDistance(struct MapObject *trainerObj)
 }
 
 // Returns how far south the player is from trainer. 0 if out of trainer's sight.
-u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->coords2.x == x
      && y > trainerObj->coords2.y
@@ -313,7 +308,7 @@ u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16
 }
 
 // Returns how far north the player is from trainer. 0 if out of trainer's sight.
-u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->coords2.x == x
      && y < trainerObj->coords2.y
@@ -324,7 +319,7 @@ u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16
 }
 
 // Returns how far west the player is from trainer. 0 if out of trainer's sight.
-u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->coords2.y == y
      && x < trainerObj->coords2.x
@@ -335,7 +330,7 @@ u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x
 }
 
 // Returns how far east the player is from trainer. 0 if out of trainer's sight.
-u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->coords2.y == y
      && x > trainerObj->coords2.x
@@ -347,7 +342,7 @@ u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x
 
 #define COLLISION_MASK (~1)
 
-u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction)
+static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction)
 {
     s16 x, y;
     u8 unk19_temp;
@@ -387,9 +382,10 @@ u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDis
 
 #define tFuncId             data[0]
 #define tTrainerRange       data[3]
+#define tOutOfAshSpriteId   data[4]
 #define tTrainerMapObjectId data[7]
 
-void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range)
+static void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range)
 {
     struct Task *task;
 
@@ -399,7 +395,7 @@ void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range)
     task->tTrainerMapObjectId = gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId;
 }
 
-void sub_80B40C8(TaskFunc followupFunc)
+static void sub_80B40C8(TaskFunc followupFunc)
 {
     u8 taskId;
     TaskFunc taskFunc;
@@ -415,7 +411,7 @@ void sub_80B40C8(TaskFunc followupFunc)
     taskFunc(taskId);
 }
 
-void Task_RunTrainerSeeFuncList(u8 taskId)
+static void Task_RunTrainerSeeFuncList(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     struct MapObject *trainerObj = &gMapObjects[task->tTrainerMapObjectId];
@@ -426,16 +422,16 @@ void Task_RunTrainerSeeFuncList(u8 taskId)
     }
     else
     {
-        while (gTrainerSeeFuncList[task->tFuncId](taskId, task, trainerObj));
+        while (sTrainerSeeFuncList[task->tFuncId](taskId, task, trainerObj));
     }
 }
 
-bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     return FALSE;
 }
 
-bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     u8 direction;
 
@@ -447,42 +443,42 @@ bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
     return TRUE;
 }
 
-bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
-    if (FieldEffectActiveListContains(0))
+    if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1))
     {
         return FALSE;
     }
     else
     {
-        task->data[0]++;
+        task->tFuncId++;
         if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58)
-            task->data[0] = 6;
+            task->tFuncId = 6;
         if (trainerObj->animPattern == 63)
-            task->data[0] = 8;
+            task->tFuncId = 8;
         return TRUE;
     }
 }
 
-bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
-        if (task->data[3])
+        if (task->tTrainerRange)
         {
             FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18));
-            task->data[3]--;
+            task->tTrainerRange--;
         }
         else
         {
             FieldObjectSetSpecialAnim(trainerObj, 0x3E);
-            task->data[0]++;
+            task->tFuncId++;
         }
     }
     return FALSE;
 }
 
-bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     struct MapObject *playerObj;
 
@@ -499,11 +495,11 @@ bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 
     sub_808BCE8();
     FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18)));
-    task->data[0]++;
+    task->tFuncId++;
     return FALSE;
 }
 
-bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
 
@@ -513,37 +509,37 @@ bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj)
     return FALSE;
 }
 
-bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
      || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
         FieldObjectSetSpecialAnim(trainerObj, 0x59);
-        task->data[0]++;
+        task->tFuncId++;
     }
     return FALSE;
 }
 
-bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
-        task->data[0] = 3;
+        task->tFuncId = 3;
 
     return FALSE;
 }
 
-bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
      || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
     {
         FieldObjectSetSpecialAnim(trainerObj, 0x3E);
-        task->data[0]++;
+        task->tFuncId++;
     }
     return FALSE;
 }
 
-bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj))
     {
@@ -551,17 +547,17 @@ bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj)
         gFieldEffectArguments[1] = trainerObj->coords2.y;
         gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1;
         gFieldEffectArguments[3] = 2;
-        task->data[4] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
-        task->data[0]++;
+        task->tOutOfAshSpriteId = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
+        task->tFuncId++;
     }
     return FALSE;
 }
 
-bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
     struct Sprite *sprite;
 
-    if (gSprites[task->data[4]].animCmdIndex == 2)
+    if (gSprites[task->tOutOfAshSpriteId].animCmdIndex == 2)
     {
         trainerObj->mapobj_bit_26 = 0;
         trainerObj->mapobj_bit_2 = 1;
@@ -570,21 +566,26 @@ bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj)
         sprite->oam.priority = 2;
         FieldObjectClearAnimIfSpecialAnimFinished(trainerObj);
         FieldObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->mapobj_unk_18));
-        task->data[0]++;
+        task->tFuncId++;
     }
 
     return FALSE;
 }
 
-bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
 {
-    if (!FieldEffectActiveListContains(49))
-        task->data[0] = 3;
+    if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
+        task->tFuncId = 3;
 
     return FALSE;
 }
 
-void sub_80B44C8(u8 taskId)
+#undef tFuncId
+#undef tTrainerRange
+#undef tOutOfAshSpriteId
+#undef tTrainerMapObjectId
+
+static void sub_80B44C8(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     struct MapObject *mapObj;
@@ -596,8 +597,8 @@ void sub_80B44C8(u8 taskId)
         FieldObjectClearAnim(mapObj);
         task->data[7]++;
     }
-    gTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj);
-    if (task->data[0] == 3 && !FieldEffectActiveListContains(49))
+    sTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj);
+    if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
     {
         npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18));
         sub_808F23C(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18));
@@ -619,7 +620,7 @@ void EndTrainerApproach(void)
     sub_80B40C8(Task_DestroyTrainerApproachTask);
 }
 
-void Task_DestroyTrainerApproachTask(u8 taskId)
+static void Task_DestroyTrainerApproachTask(u8 taskId)
 {
     DestroyTask(taskId);
     EnableBothScriptContexts();
@@ -648,79 +649,93 @@ void sub_80B45D0(void)
     }
 }
 
+#define sLocalId    data[0]
+#define sMapNum     data[1]
+#define sMapGroup   data[2]
+#define sData3      data[3]
+#define sData4      data[4]
+#define sFldEffId   data[7]
+
 u8 FldEff_ExclamationMarkIcon1(void)
 {
-    u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_85507B4, 0, 0, 0x53);
+    u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x53);
 
     if (spriteId != MAX_SPRITES)
-        sub_80B46D8(&gSprites[spriteId], 0, 0);
+        SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_1, 0);
 
     return 0;
 }
 
 u8 FldEff_ExclamationMarkIcon2(void)
 {
-    u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_85507B4, 0, 0, 0x52);
+    u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x52);
 
     if (spriteId != MAX_SPRITES)
-        sub_80B46D8(&gSprites[spriteId], 33, 1);
+        SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_2, 1);
 
     return 0;
 }
 
 u8 FldEff_HeartIcon(void)
 {
-    u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_85507CC, 0, 0, 0x52);
+    u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_HeartIcon, 0, 0, 0x52);
 
     if (spriteId != MAX_SPRITES)
     {
         struct Sprite *sprite = &gSprites[spriteId];
 
-        sub_80B46D8(sprite, 46, 0);
+        SetIconSpriteData(sprite, FLDEFF_HEART_ICON, 0);
         sprite->oam.paletteNum = 2;
     }
 
     return 0;
 }
 
-void sub_80B46D8(struct Sprite *sprite, u16 a2, u8 a3)
+static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum)
 {
     sprite->oam.priority = 1;
     sprite->coordOffsetEnabled = 1;
 
-    sprite->data[0] = gFieldEffectArguments[0];
-    sprite->data[1] = gFieldEffectArguments[1];
-    sprite->data[2] = gFieldEffectArguments[2];
-    sprite->data[3] = -5;
-    sprite->data[7] = a2;
+    sprite->sLocalId = gFieldEffectArguments[0];
+    sprite->sMapNum = gFieldEffectArguments[1];
+    sprite->sMapGroup = gFieldEffectArguments[2];
+    sprite->sData3 = -5;
+    sprite->sFldEffId = fldEffId;
 
-    StartSpriteAnim(sprite, a3);
+    StartSpriteAnim(sprite, spriteAnimNum);
 }
 
-void objc_exclamation_mark_probably(struct Sprite *sprite)
+static void SpriteCB_TrainerIcons(struct Sprite *sprite)
 {
     u8 mapObjId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjId)
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &mapObjId)
      || sprite->animEnded)
     {
-        FieldEffectStop(sprite, sprite->data[7]);
+        FieldEffectStop(sprite, sprite->sFldEffId);
     }
     else
     {
         struct Sprite *mapObjSprite = &gSprites[gMapObjects[mapObjId].spriteId];
-        sprite->data[4] += sprite->data[3];
+        sprite->sData4 += sprite->sData3;
         sprite->pos1.x = mapObjSprite->pos1.x;
         sprite->pos1.y = mapObjSprite->pos1.y - 16;
         sprite->pos2.x = mapObjSprite->pos2.x;
-        sprite->pos2.y = mapObjSprite->pos2.y + sprite->data[4];
-        if (sprite->data[4])
-            sprite->data[3]++;
+        sprite->pos2.y = mapObjSprite->pos2.y + sprite->sData4;
+        if (sprite->sData4)
+            sprite->sData3++;
         else
-            sprite->data[3] = 0;
+            sprite->sData3 = 0;
     }
 }
 
+#undef sLocalId
+#undef sMapNum
+#undef sMapGroup
+#undef sData3
+#undef sData4
+#undef sFldEffId
+
 u8 GetCurrentApproachingTrainerMapObjectId(void)
 {
     if (gApproachingTrainerId == 0)
-- 
cgit v1.2.3


From 4abc2eea8aee0efc714df8519533c55fbabae5f1 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 19 Dec 2017 17:33:07 +0100
Subject: ram vars to C files

---
 src/battle_setup.c |  5 +----
 src/trainer_see.c  | 16 ++++++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 3d4f5afcc..be23a28c9 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -88,9 +88,6 @@ extern u32 GetGameStat(u8 statId);
 extern u32 gBattleTypeFlags;
 extern u8 gBattleOutcome;
 extern void (*gFieldCallback)(void);
-extern u8 gApproachingTrainerId;
-extern u8 gNoOfApproachingTrainers;
-extern u16 gUnknown_03006080;
 
 // this file's functions
 static void DoBattlePikeWildBattle(void);
@@ -113,7 +110,7 @@ static void HandleRematchVarsOnBattleEnd(void);
 static const u8 *GetIntroSpeechOfApproachingTrainer(void);
 static const u8 *GetTrainerCantBattleSpeech(void);
 
-// ewram data
+// ewram vars
 EWRAM_DATA static u16 sTrainerBattleMode = 0;
 EWRAM_DATA u16 gTrainerBattleOpponent_A = 0;
 EWRAM_DATA u16 gTrainerBattleOpponent_B = 0;
diff --git a/src/trainer_see.c b/src/trainer_see.c
index b8dbda0c1..53bc5cbbb 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -14,12 +14,6 @@
 #include "event_data.h"
 #include "script_movement.h"
 
-extern u8 gApproachingTrainerId;
-extern u8 gNoOfApproachingTrainers;
-extern u8 gUnknown_030060AC;
-extern u16 gUnknown_03006080;
-extern u8 gUnknown_03006084[];
-
 extern bool8 InBattlePyramid(void);
 extern bool32 InTrainerHill(void);
 extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjectId);
@@ -55,6 +49,16 @@ static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainer
 
 static void SpriteCB_TrainerIcons(struct Sprite *sprite);
 
+// IWRAM common
+u16 gUnknown_03006080;
+u8 gUnknown_03006084[4];
+struct ApproachingTrainer gApproachingTrainers[2];
+u8 gNoOfApproachingTrainers;
+u8 gUnknown_030060AC;
+
+// EWRAM
+EWRAM_DATA u8 gApproachingTrainerId = 0;
+
 // const rom data
 static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion_exclamation.4bpp");
 static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp");
-- 
cgit v1.2.3


From 4949411f3e5c7eece80cf3e89188627b82a4c3be Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 19 Dec 2017 17:41:05 +0100
Subject: make battle bg compile

---
 src/battle_bg.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/battle_bg.c b/src/battle_bg.c
index b4ce80a87..24a88c4f5 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "sprite.h"
-#include "trainer_classes.h"
+#include "constants\trainers.h"
 #include "graphics.h"
 #include "decompress.h"
 #include "bg.h"
@@ -105,7 +105,7 @@ void DrawMainBattleBackground(void)
         LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000));
         LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60);
     }
-    else if (gBattleTypeFlags & BATTLE_TYPE_KYORGE)
+    else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE)
     {
         LZDecompressVram(gBattleTerrainTiles_Water, (void*)(VRAM + 0x8000));
         LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000));
@@ -122,14 +122,14 @@ void DrawMainBattleBackground(void)
         if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
         {
             u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
-            if (trainerClass == CLASS_LEADER)
+            if (trainerClass == TRAINER_CLASS_LEADER)
             {
                 LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
                 LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
                 LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60);
                 return;
             }
-            else if (trainerClass == CLASS_CHAMPION)
+            else if (trainerClass == TRAINER_CLASS_CHAMPION)
             {
                 LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
                 LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
@@ -501,7 +501,7 @@ void LoadBattleEntryBackground(void)
         LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void*)(VRAM + 0x4000));
         LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void*)(VRAM + 0xE000));
     }
-    else if (gBattleTypeFlags & BATTLE_TYPE_KYORGE)
+    else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE)
     {
         LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void*)(VRAM + 0x4000));
         LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void*)(VRAM + 0xE000));
@@ -516,13 +516,13 @@ void LoadBattleEntryBackground(void)
         if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
         {
             u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
-            if (trainerClass == CLASS_LEADER)
+            if (trainerClass == TRAINER_CLASS_LEADER)
             {
                 LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
                 LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
                 return;
             }
-            else if (trainerClass == CLASS_CHAMPION)
+            else if (trainerClass == TRAINER_CLASS_CHAMPION)
             {
                 LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
                 LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
@@ -573,12 +573,12 @@ bool8 LoadChosenBattleElement(u8 caseId)
             if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             {
                 u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
-                if (trainerClass == CLASS_LEADER)
+                if (trainerClass == TRAINER_CLASS_LEADER)
                 {
                     LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
                     break;
                 }
-                else if (trainerClass == CLASS_CHAMPION)
+                else if (trainerClass == TRAINER_CLASS_CHAMPION)
                 {
                     LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
                     break;
@@ -635,12 +635,12 @@ bool8 LoadChosenBattleElement(u8 caseId)
             if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             {
                 u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
-                if (trainerClass == CLASS_LEADER)
+                if (trainerClass == TRAINER_CLASS_LEADER)
                 {
                     LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
                     break;
                 }
-                else if (trainerClass == CLASS_CHAMPION)
+                else if (trainerClass == TRAINER_CLASS_CHAMPION)
                 {
                     LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
                     break;
@@ -697,12 +697,12 @@ bool8 LoadChosenBattleElement(u8 caseId)
             if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
             {
                 u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
-                if (trainerClass == CLASS_LEADER)
+                if (trainerClass == TRAINER_CLASS_LEADER)
                 {
                     LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60);
                     break;
                 }
-                else if (trainerClass == CLASS_CHAMPION)
+                else if (trainerClass == TRAINER_CLASS_CHAMPION)
                 {
                     LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60);
                     break;
-- 
cgit v1.2.3


From df479661ffd0c270e4a8c35f37285d5d3988f592 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 20 Dec 2017 17:20:41 +0100
Subject: pokeblock review changes

---
 src/pokeblock.c      |  2 +-
 src/pokeblock_feed.c | 10 +++++-----
 src/pokemon_3.c      |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/pokeblock.c b/src/pokeblock.c
index 945b3680d..8716e827f 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -800,7 +800,7 @@ static void sub_8136344(void)
         u8 i;
 
         for (i = 0;
-             i < sSavedPokeblockData.lastItemPos - 4 && sSavedPokeblockData.lastItemPage + sPokeblockMenu->maxShowed != sPokeblockMenu->itemsNo;
+             (i < sSavedPokeblockData.lastItemPos - 4) && (sSavedPokeblockData.lastItemPage + sPokeblockMenu->maxShowed != sPokeblockMenu->itemsNo);
              sSavedPokeblockData.lastItemPos--, sSavedPokeblockData.lastItemPage++, i++);
     }
 }
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index ec5f3074f..1bf40bbe5 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -802,7 +802,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskId)
     {
         ResetSpriteData();
         FreeAllSpritePalettes();
-        m4aMPlayVolumeControl(&gMPlay_BGM, -1, 256);
+        m4aMPlayVolumeControl(&gMPlay_BGM, -1, 0x100);
         SetMainCallback2(gMain.savedCallback);
         DestroyTask(taskId);
         FreeAllWindowBuffers();
@@ -1092,13 +1092,13 @@ static void sub_817AB68(void)
 
         if (!var_24)
         {
-            pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] + r5 / 256) + r8;
-            pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] + r5 / 256) + r7;
+            pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] + r5 / 0x100) + r8;
+            pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] + r5 / 0x100) + r7;
         }
         else
         {
-            pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] - r5 / 256) + r8;
-            pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] - r5 / 256) + r7;
+            pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] - r5 / 0x100) + r8;
+            pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] - r5 / 0x100) + r7;
         }
 
         pokeblockFeed->field_1060[0] += pokeblockFeed->field_1060[1];
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index e3b340698..1a44a4410 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1298,16 +1298,16 @@ bool8 IsPokeSpriteNotFlipped(u16 species)
     return gBaseStats[species].noFlip;
 }
 
-s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavour)
+s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavor)
 {
     u8 nature = GetNature(mon);
-    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavour];
+    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor];
 }
 
-s8 GetFlavorRelationByPersonality(u32 personality, u8 flavour)
+s8 GetFlavorRelationByPersonality(u32 personality, u8 flavor)
 {
     u8 nature = GetNatureFromPersonality(personality);
-    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavour];
+    return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor];
 }
 
 bool8 IsTradedMon(struct Pokemon *mon)
-- 
cgit v1.2.3


From 6b5157b2a3b2d81f83a910b211834cde5cd3a238 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 21 Dec 2017 17:46:03 +0100
Subject: decompile bike.s

---
 src/bike.c            | 1078 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/evolution_scene.c |    6 +-
 2 files changed, 1081 insertions(+), 3 deletions(-)
 create mode 100644 src/bike.c

(limited to 'src')

diff --git a/src/bike.c b/src/bike.c
new file mode 100644
index 000000000..b97a6dba6
--- /dev/null
+++ b/src/bike.c
@@ -0,0 +1,1078 @@
+#include "global.h"
+#include "bike.h"
+#include "field_map_obj.h"
+#include "field_player_avatar.h"
+#include "fieldmap.h"
+#include "constants/flags.h"
+#include "global.fieldmap.h"
+#include "metatile_behavior.h"
+#include "overworld.h"
+#include "constants/songs.h"
+#include "sound.h"
+
+extern bool8 gBikeCyclingChallenge;
+extern u8 gBikeCollisions;
+extern bool8 gUnknown_02037348;
+
+extern u8 sub_8093514(u8 direction);
+extern u8 sub_808B980(u8 direction);
+extern u8 sub_808B9BC(u8 direction);
+extern u8 sub_808B9A4(u8 direction);
+extern u8 sub_808C1B4(u8 direction);
+extern u8 npc_use_some_d2s(u8 direction);
+extern void Overworld_ClearSavedMusic(void);
+extern void Overworld_PlaySpecialMapMusic(void);
+
+// this file's functions
+static void MovePlayerOnMachBike(u8, u16, u16);
+static u8 GetMachBikeTransition(u8 *);
+static void MachBikeTransition_FaceDirection(u8);
+static void MachBikeTransition_TurnDirection(u8);
+static void MachBikeTransition_TrySpeedUp(u8);
+static void MachBikeTransition_TrySlowDown(u8);
+static void MovePlayerOnAcroBike(u8, u16, u16);
+static u8 CheckMovementInputAcroBike(u8 *, u16, u16);
+static u8 AcroBikeHandleInputNormal(u8 *, u16, u16);
+static u8 AcroBikeHandleInputTurning(u8 *, u16, u16);
+static u8 AcroBikeHandleInputWheelieStanding(u8 *, u16, u16);
+static u8 AcroBikeHandleInputBunnyHop(u8 *, u16, u16);
+static u8 AcroBikeHandleInputWheelieMoving(u8 *, u16, u16);
+static u8 AcroBikeHandleInputSidewaysJump(u8 *, u16, u16);
+static u8 AcroBikeHandleInputTurnJump(u8 *, u16, u16);
+static void AcroBikeTransition_FaceDirection(u8);
+static void AcroBikeTransition_TurnDirection(u8);
+static void AcroBikeTransition_Moving(u8);
+static void AcroBikeTransition_NormalToWheelie(u8);
+static void AcroBikeTransition_WheelieToNormal(u8);
+static void AcroBikeTransition_WheelieIdle(u8);
+static void AcroBikeTransition_WheelieHoppingStanding(u8);
+static void AcroBikeTransition_WheelieHoppingMoving(u8);
+static void AcroBikeTransition_SideJump(u8);
+static void AcroBikeTransition_TurnJump(u8);
+static void AcroBikeTransition_WheelieMoving(u8);
+static void AcroBikeTransition_WheelieRisingMoving(u8);
+static void AcroBikeTransition_WheelieLoweringMoving(u8);
+static void AcroBike_TryHistoryUpdate(u16, u16);
+static u8 AcroBike_GetJumpDirection(void);
+static void Bike_UpdateDirTimerHistory(u8);
+static void Bike_UpdateABStartSelectHistory(u8);
+static u8 Bike_DPadToDirection(u16);
+static u8 get_some_collision(u8);
+static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct MapObject *, s16, s16, u8, u8);
+static bool8 IsRunningDisallowedByMetatile(u8);
+static void Bike_TryAdvanceCyclingRoadCollisions();
+static u8 CanBikeFaceDirOnMetatile(u8, u8);
+static bool8 WillPlayerCollideWithCollision(u8, u8);
+static void Bike_SetBikeStill(void);
+
+// const rom data
+
+/*
+    A bike transition is a type of callback for the bike that actually
+    modifies the bicycle's direction or momentum or otherwise movement.
+    Alternatively, a bike may also have input handlers which process the
+    bike transition to call: the acro bike has input handlers while the mach
+    bike does not. This is because the Acro needs to know the button inputs
+    for its complex tricks and actions.
+*/
+
+static void (*const sMachBikeTransitions[])(u8) =
+{
+    MachBikeTransition_FaceDirection, // Face vs Turn: Face has no anim while Turn does. Turn checks for collision because if you turn right as opposed to face right, if there is a wall there, turn will make a bonk sound effect while face will not.
+    MachBikeTransition_TurnDirection,
+    MachBikeTransition_TrySpeedUp,
+    MachBikeTransition_TrySlowDown,
+};
+
+// bikeFrameCounter is input which is represented by sMachBikeSpeeds in order: 0 is normal speed (1 speed), 1 is fast speed (2 speed), 2 is fastest speed (4 speed)
+static void (*const sMachBikeSpeedCallbacks[])(u8) =
+{
+    PlayerGoSpeed1, // normal speed (1 speed)
+    PlayerGoSpeed2, // fast speed (2 speed)
+    PlayerGoSpeed4, // fastest speed (4 speed)
+};
+
+static void (*const sAcroBikeTransitions[])(u8) =
+{
+    AcroBikeTransition_FaceDirection,
+    AcroBikeTransition_TurnDirection,
+    AcroBikeTransition_Moving,
+    AcroBikeTransition_NormalToWheelie,
+    AcroBikeTransition_WheelieToNormal,
+    AcroBikeTransition_WheelieIdle,
+    AcroBikeTransition_WheelieHoppingStanding,
+    AcroBikeTransition_WheelieHoppingMoving,
+    AcroBikeTransition_SideJump,
+    AcroBikeTransition_TurnJump,
+    AcroBikeTransition_WheelieMoving,
+    AcroBikeTransition_WheelieRisingMoving,
+    AcroBikeTransition_WheelieLoweringMoving,
+};
+
+static u8 (*const sAcroBikeInputHandlers[])(u8 *, u16, u16) =
+{
+    AcroBikeHandleInputNormal,
+    AcroBikeHandleInputTurning,
+    AcroBikeHandleInputWheelieStanding,
+    AcroBikeHandleInputBunnyHop,
+    AcroBikeHandleInputWheelieMoving,
+    AcroBikeHandleInputSidewaysJump,
+    AcroBikeHandleInputTurnJump,
+};
+
+// used with bikeFrameCounter from mach bike
+static const u16 sMachBikeSpeeds[] = {SPEED_NORMAL, SPEED_FAST, SPEED_FASTEST};
+
+// this is a list of timers to compare against later, terminated with 0. the only timer being compared against is 4 frames in this list.
+static const u8 sAcroBikeJumpTimerList[] = {4, 0};
+
+// this is a list of history inputs to do in order to do the check to retrieve a jump direction for acro bike. it seems to be an extensible list, so its possible that Game Freak may have intended for the Acro Bike to have more complex tricks at some point. The final list only has the acro jump.
+static const struct BikeHistoryInputInfo sAcroBikeTricksList[] =
+{
+    // the 0xF is a mask performed with each byte of the array in order to perform the check on only the last entry of the history list, otherwise the check wouldn't work as there can be 0xF0 as opposed to 0x0F.
+    {DIR_SOUTH, B_BUTTON, 0xF, 0xF, sAcroBikeJumpTimerList, sAcroBikeJumpTimerList, DIR_SOUTH},
+    {DIR_NORTH, B_BUTTON, 0xF, 0xF, sAcroBikeJumpTimerList, sAcroBikeJumpTimerList, DIR_NORTH},
+    {DIR_WEST, B_BUTTON, 0xF, 0xF, sAcroBikeJumpTimerList, sAcroBikeJumpTimerList, DIR_WEST},
+    {DIR_EAST, B_BUTTON, 0xF, 0xF, sAcroBikeJumpTimerList, sAcroBikeJumpTimerList, DIR_EAST},
+};
+
+// code
+void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys)
+{
+    if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_MACH_BIKE)
+        MovePlayerOnMachBike(direction, newKeys, heldKeys);
+    else
+        MovePlayerOnAcroBike(direction, newKeys, heldKeys);
+}
+
+static void MovePlayerOnMachBike(u8 direction, u16 newKeys, u16 heldKeys)
+{
+    sMachBikeTransitions[GetMachBikeTransition(&direction)](direction);
+}
+
+// dirTraveling is a variable that is 0 when the player is standing still.
+static u8 GetMachBikeTransition(u8 *dirTraveling)
+{
+    // if the dir updated before this function, get the relevent new direction to check later.
+    u8 direction = player_get_direction_upper_nybble();
+
+    // is the player standing still?
+    if (*dirTraveling == 0)
+    {
+        *dirTraveling = direction; // update the direction, since below we either faced a direction or we started moving.
+        if (gPlayerAvatar.bikeSpeed == SPEED_STANDING)
+        {
+            gPlayerAvatar.runningState = NOT_MOVING;
+            return MACH_TRANS_FACE_DIRECTION;
+        }
+        gPlayerAvatar.runningState = MOVING;
+        return MACH_TRANS_START_MOVING;
+    }
+
+    // we need to check if the last traveled direction changed from the new direction as well as ensuring that we dont update the state while the player is moving: see the else check.
+    if (*dirTraveling != direction && gPlayerAvatar.runningState != MOVING)
+    {
+        if (gPlayerAvatar.bikeSpeed != SPEED_STANDING)
+        {
+            *dirTraveling = direction; // implement the new direction
+            gPlayerAvatar.runningState = MOVING;
+            return MACH_TRANS_START_MOVING;
+        }
+        // if you didnt start moving but your dir was different, do a turn direction instead.
+        gPlayerAvatar.runningState = TURN_DIRECTION;
+        return MACH_TRANS_TURN_DIRECTION;
+    }
+    else // the player is either going in the current direction and hasnt changed or their state is currently moving.
+    {
+        gPlayerAvatar.runningState = MOVING;
+        return MACH_TRANS_KEEP_MOVING;
+    }
+}
+
+// the difference between face direction and turn direction is that one changes direction while the other does the animation of turning as well as changing direction.
+static void MachBikeTransition_FaceDirection(u8 direction)
+{
+    PlayerFaceDirection(direction);
+    Bike_SetBikeStill();
+}
+
+static void MachBikeTransition_TurnDirection(u8 direction)
+{
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E))
+    {
+        PlayerTurnInPlace(direction);
+        Bike_SetBikeStill();
+    }
+    else
+    {
+        MachBikeTransition_FaceDirection(playerMapObj->mapobj_unk_18);
+    }
+}
+
+static void MachBikeTransition_TrySpeedUp(u8 direction)
+{
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    u8 collision;
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == FALSE)
+    {
+        // we cannot go forward, so either slow down or, if we are stopped, idle face direction.
+        if (gPlayerAvatar.bikeSpeed)
+            MachBikeTransition_TrySlowDown(playerMapObj->placeholder18);
+        else
+            MachBikeTransition_FaceDirection(playerMapObj->placeholder18);
+    }
+    else
+    {
+        collision = get_some_collision(direction);
+        if (collision > 0 && collision < 12)
+        {
+            // we hit a solid object, but check to see if its a ledge and then jump.
+            if (collision == COLLISION_LEDGE_JUMP)
+            {
+                PlayerJumpLedge(direction);
+            }
+            else
+            {
+                // we hit a solid object that is not a ledge, so perform the collision.
+                Bike_SetBikeStill();
+                if (collision == 4 && IsPlayerCollidingWithFarawayIslandMew(direction))
+                    PlayerOnBikeCollideWithFarawayIslandMew(direction);
+                else if (collision < 5 || collision > 8)
+                    PlayerOnBikeCollide(direction);
+            }
+        }
+        else
+        {
+            // we did not hit anything that can slow us down, so perform the advancement callback depending on the bikeFrameCounter and try to increase the mach bike's speed.
+            sMachBikeSpeedCallbacks[gPlayerAvatar.bikeFrameCounter](direction);
+            gPlayerAvatar.bikeSpeed = gPlayerAvatar.bikeFrameCounter + (gPlayerAvatar.bikeFrameCounter >> 1); // same as dividing by 2, but compiler is insistent on >> 1
+            if (gPlayerAvatar.bikeFrameCounter < 2) // do not go faster than the last element in the mach bike array
+                gPlayerAvatar.bikeFrameCounter++;
+        }
+    }
+}
+
+static void MachBikeTransition_TrySlowDown(u8 direction)
+{
+    u8 collision;
+
+    if (gPlayerAvatar.bikeSpeed != SPEED_STANDING)
+        gPlayerAvatar.bikeFrameCounter = --gPlayerAvatar.bikeSpeed;
+
+    collision = get_some_collision(direction);
+
+    if (collision > 0 && collision < 12)
+    {
+        if (collision == COLLISION_LEDGE_JUMP)
+        {
+            PlayerJumpLedge(direction);
+        }
+        else
+        {
+            Bike_SetBikeStill();
+            if (collision == 4 && IsPlayerCollidingWithFarawayIslandMew(direction))
+                PlayerOnBikeCollideWithFarawayIslandMew(direction);
+            else if (collision < 5 || collision > 8)
+                PlayerOnBikeCollide(direction);
+        }
+    }
+    else
+    {
+        sMachBikeSpeedCallbacks[gPlayerAvatar.bikeFrameCounter](direction);
+    }
+}
+
+// the acro bike requires the input handler to be executed before the transition can.
+static void MovePlayerOnAcroBike(u8 newDirection, u16 newKeys, u16 heldKeys)
+{
+    sAcroBikeTransitions[CheckMovementInputAcroBike(&newDirection, newKeys, heldKeys)](newDirection);
+}
+
+static u8 CheckMovementInputAcroBike(u8 *newDirection, u16 newKeys, u16 heldKeys)
+{
+    return sAcroBikeInputHandlers[gPlayerAvatar.acroBikeState](newDirection, newKeys, heldKeys);
+}
+
+static u8 AcroBikeHandleInputNormal(u8 *newDirection, u16 newKeys, u16 heldKeys)
+{
+    u8 direction = player_get_direction_upper_nybble();
+
+    gPlayerAvatar.bikeFrameCounter = 0;
+    if (*newDirection == DIR_NONE)
+    {
+        if (newKeys & B_BUTTON)
+        {
+            //We're standing still with the B button held.
+            //Do a wheelie.
+            *newDirection = direction;
+            gPlayerAvatar.runningState = NOT_MOVING;
+            gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING;
+            return ACRO_TRANS_NORMAL_TO_WHEELIE;
+        }
+        else
+        {
+            *newDirection = direction;
+            gPlayerAvatar.runningState = NOT_MOVING;
+            return ACRO_TRANS_FACE_DIRECTION;
+        }
+    }
+    if (*newDirection == direction && (heldKeys & B_BUTTON) && gPlayerAvatar.bikeSpeed == SPEED_STANDING)
+    {
+        gPlayerAvatar.bikeSpeed++;
+        gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_MOVING;
+        return ACRO_TRANS_WHEELIE_RISING_MOVING;
+    }
+    if (*newDirection != direction && gPlayerAvatar.runningState != MOVING)
+    {
+        gPlayerAvatar.acroBikeState = ACRO_STATE_TURNING;
+        gPlayerAvatar.newDirBackup = *newDirection;
+        gPlayerAvatar.runningState = NOT_MOVING;
+        return CheckMovementInputAcroBike(newDirection, newKeys, heldKeys);
+    }
+    gPlayerAvatar.runningState = MOVING;
+    return ACRO_TRANS_MOVING;
+}
+
+static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys)
+{
+    u8 direction;
+
+    *newDirection = gPlayerAvatar.newDirBackup;
+    gPlayerAvatar.bikeFrameCounter++;
+
+    // Wait 6 frames before actually changing direction
+    if (gPlayerAvatar.bikeFrameCounter > 6) // ... because it takes 6 frames to advance 1 tile.
+    {
+        gPlayerAvatar.runningState = TURN_DIRECTION;
+        gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
+        Bike_SetBikeStill();
+        return ACRO_TRANS_TURN_DIRECTION;
+    }
+    direction = player_get_direction_upper_nybble();
+    if (*newDirection == AcroBike_GetJumpDirection())
+    {
+        Bike_SetBikeStill(); // Bike_SetBikeStill sets speed to standing, but the next line immediately overrides it. could have just reset acroBikeState to 0 here instead of wasting a jump.
+        gPlayerAvatar.bikeSpeed = SPEED_NORMAL;
+        if (*newDirection == GetOppositeDirection(direction))
+        {
+            // do a turn jump.
+            // no need to update runningState, didnt move.
+            gPlayerAvatar.acroBikeState = ACRO_STATE_TURN_JUMP;
+            return ACRO_TRANS_TURN_JUMP;
+        }
+        else
+        {
+            // do a sideways jump.
+            gPlayerAvatar.runningState = MOVING; // we need to move, set state to moving.
+            gPlayerAvatar.acroBikeState = ACRO_STATE_SIDE_JUMP;
+            return ACRO_TRANS_SIDE_JUMP;
+        }
+    }
+    *newDirection = direction;
+    return ACRO_TRANS_FACE_DIRECTION;
+}
+
+static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys)
+{
+    u8 direction;
+    struct MapObject *playerMapObj;
+
+    direction = player_get_direction_upper_nybble();
+    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    gPlayerAvatar.runningState = NOT_MOVING;
+
+    if (heldKeys & B_BUTTON)
+        gPlayerAvatar.bikeFrameCounter++;
+    else
+    {
+        // B button was released.
+        gPlayerAvatar.bikeFrameCounter = 0;
+        if (!MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E))
+        {
+            // Go back to normal on flat ground
+            *newDirection = direction;
+            gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
+            Bike_SetBikeStill();
+            return ACRO_TRANS_WHEELIE_TO_NORMAL;
+        }
+    }
+    if (gPlayerAvatar.bikeFrameCounter >= 40)
+    {
+        *newDirection = direction;
+        gPlayerAvatar.acroBikeState = ACRO_STATE_BUNNY_HOP;
+        Bike_SetBikeStill();
+        return ACRO_TRANS_WHEELIE_HOPPING_STANDING;
+    }
+    if (*newDirection == direction)
+    {
+        gPlayerAvatar.runningState = MOVING;
+        gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_MOVING;
+        Bike_SetBikeStill();
+        return ACRO_TRANS_WHEELIE_MOVING;
+    }
+    if (*newDirection == 0)
+    {
+        *newDirection = direction;
+        return ACRO_TRANS_WHEELIE_IDLE;
+    }
+    gPlayerAvatar.runningState = TURN_DIRECTION;
+    return ACRO_TRANS_WHEELIE_IDLE;
+}
+
+static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys)
+{
+    u8 direction;
+    struct MapObject *playerMapObj;
+
+    direction = player_get_direction_upper_nybble();
+    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (!(heldKeys & B_BUTTON))
+    {
+        // B button was released
+        Bike_SetBikeStill();
+        if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E))
+        {
+            // even though B was released, dont undo the wheelie on the bumpy slope.
+            gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING;
+            return CheckMovementInputAcroBike(newDirection, newKeys, heldKeys);
+        }
+        else
+        {
+            // .. otherwise, go back to normal on flat ground
+            *newDirection = direction;
+            gPlayerAvatar.runningState = NOT_MOVING;
+            gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
+            return ACRO_TRANS_WHEELIE_TO_NORMAL;
+        }
+    }
+
+    // B Button is still held
+
+    if (*newDirection == DIR_NONE)
+    {
+        // we did not move, so keep hopping in place without moving.
+        *newDirection = direction;
+        gPlayerAvatar.runningState = NOT_MOVING;
+        return ACRO_TRANS_WHEELIE_HOPPING_STANDING;
+    }
+    if (*newDirection != direction && gPlayerAvatar.runningState != MOVING)
+    {
+        // we changed direction, so turn but do not move hop.
+        gPlayerAvatar.runningState = TURN_DIRECTION;
+        return ACRO_TRANS_WHEELIE_HOPPING_STANDING;
+    }
+    // otherwise, we started moving while hopping
+    gPlayerAvatar.runningState = MOVING;
+    return ACRO_TRANS_WHEELIE_HOPPING_MOVING;
+}
+
+static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 heldKeys)
+{
+    u8 direction;
+    struct MapObject *playerMapObj;
+
+    direction = player_get_direction_lower_nybble();
+    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (!(heldKeys & B_BUTTON))
+    {
+        // we were moving on a wheelie, but we let go while moving. reset bike still status
+        Bike_SetBikeStill();
+        if (!MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E))
+        {
+            // we let go of B and arent on a bumpy slope, set state to normal because now we need to handle this
+            gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
+            if (*newDirection == DIR_NONE)
+            {
+                // we stopped moving but are turning, still try to lower the wheelie in place.
+                *newDirection = direction;
+                gPlayerAvatar.runningState = NOT_MOVING;
+                return ACRO_TRANS_WHEELIE_TO_NORMAL;
+            }
+            if (*newDirection != direction && gPlayerAvatar.runningState != MOVING)
+            {
+                // we did not turn while lowering wheelie, so do so without turning.
+                gPlayerAvatar.runningState = NOT_MOVING;
+                return ACRO_TRANS_WHEELIE_TO_NORMAL;
+            }
+            // if we are moving while lowering wheelie, put the acro into a lowering state while moving.
+            gPlayerAvatar.runningState = MOVING;
+            return ACRO_TRANS_WHEELIE_LOWERING_MOVING;
+        }
+        // please do not undo the wheelie on a bumpy slope
+        gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING;
+        return CheckMovementInputAcroBike(newDirection, newKeys, heldKeys);
+    }
+    // we are still holding B.
+    if (*newDirection == DIR_NONE)
+    {
+        // idle the wheelie in place because we're holding B without moving.
+        *newDirection = direction;
+        gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING;
+        gPlayerAvatar.runningState = NOT_MOVING;
+        Bike_SetBikeStill();
+        return ACRO_TRANS_WHEELIE_IDLE;
+    }
+    if (direction != *newDirection && gPlayerAvatar.runningState != MOVING)
+    {
+        gPlayerAvatar.runningState = NOT_MOVING;
+        return ACRO_TRANS_WHEELIE_IDLE;
+    }
+    gPlayerAvatar.runningState = MOVING;
+    return ACRO_TRANS_WHEELIE_MOVING;
+}
+
+static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys)
+{
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    playerMapObj->mapobj_bit_9 = 0;
+    FieldObjectSetDirection(playerMapObj, playerMapObj->mapobj_unk_18);
+    gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
+    return CheckMovementInputAcroBike(ptr, newKeys, heldKeys);
+}
+
+static u8 AcroBikeHandleInputTurnJump(u8 *ptr, u16 newKeys, u16 heldKeys)
+{
+    gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
+    return CheckMovementInputAcroBike(ptr, newKeys, heldKeys);
+}
+
+static void AcroBikeTransition_FaceDirection(u8 direction)
+{
+    PlayerFaceDirection(direction);
+}
+
+static void AcroBikeTransition_TurnDirection(u8 direction)
+{
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+        direction = playerMapObj->placeholder18;
+    PlayerFaceDirection(direction);
+}
+
+static void AcroBikeTransition_Moving(u8 direction)
+{
+    u8 collision;
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+    {
+        AcroBikeTransition_FaceDirection(playerMapObj->placeholder18);
+        return;
+    }
+    collision = get_some_collision(direction);
+    if (collision > 0 && collision < 12)
+    {
+        if (collision == COLLISION_LEDGE_JUMP)
+            PlayerJumpLedge(direction);
+        else if (collision == 4 && IsPlayerCollidingWithFarawayIslandMew(direction))
+            PlayerOnBikeCollideWithFarawayIslandMew(direction);
+        else if (collision < 5 || collision > 8)
+            PlayerOnBikeCollide(direction);
+    }
+    else
+    {
+        PlayerGoSpeed3(direction);
+    }
+}
+
+static void AcroBikeTransition_NormalToWheelie(u8 direction)
+{
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+        direction = playerMapObj->placeholder18;
+    PlayerStartWheelie(direction);
+}
+
+static void AcroBikeTransition_WheelieToNormal(u8 direction)
+{
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+        direction = playerMapObj->placeholder18;
+    PlayerEndWheelie(direction);
+}
+
+static void AcroBikeTransition_WheelieIdle(u8 direction)
+{
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+        direction = playerMapObj->placeholder18;
+    PlayerIdleWheelie(direction);
+}
+
+static void AcroBikeTransition_WheelieHoppingStanding(u8 direction)
+{
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+        direction = playerMapObj->placeholder18;
+    PlayerStandingHoppingWheelie(direction);
+}
+
+static void AcroBikeTransition_WheelieHoppingMoving(u8 direction)
+{
+    u8 collision;
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+    {
+        AcroBikeTransition_WheelieHoppingStanding(playerMapObj->placeholder18);
+        return;
+    }
+    collision = get_some_collision(direction);
+    // TODO: Try to get rid of this goto
+    if (collision == 0 || collision == 9)
+    {
+        goto derp;
+    }
+    else if (collision == 6)
+    {
+        PlayerLedgeHoppingWheelie(direction);
+    }
+    else if (collision < 5 || collision > 8)
+    {
+        if (collision <= 11)
+        {
+            AcroBikeTransition_WheelieHoppingStanding(direction);
+        }
+        else
+        {
+        derp:
+            PlayerMovingHoppingWheelie(direction);
+        }
+    }
+}
+
+static void AcroBikeTransition_SideJump(u8 direction)
+{
+    u8 collision;
+    struct MapObject *playerMapObj;
+
+    collision = get_some_collision(direction);
+    if (collision != 0)
+    {
+        if (collision == 7)
+            return;
+        if (collision < 10)
+        {
+            AcroBikeTransition_TurnDirection(direction);
+            return;
+        }
+        if (WillPlayerCollideWithCollision(collision, direction) == FALSE)
+        {
+            AcroBikeTransition_TurnDirection(direction);
+            return;
+        }
+    }
+    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    PlaySE(SE_JITE_PYOKO);
+    playerMapObj->mapobj_bit_9 = 1;
+    PlayerSetAnimId(sub_8093514(direction), 2);
+}
+
+static void AcroBikeTransition_TurnJump(u8 direction)
+{
+    PlayerAcroTurnJump(direction);
+}
+
+static void AcroBikeTransition_WheelieMoving(u8 direction)
+{
+    u8 collision;
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+    {
+        PlayerIdleWheelie(playerMapObj->placeholder18);
+        return;
+    }
+    collision = get_some_collision(direction);
+    if (collision > 0 && collision < 12)
+    {
+        if (collision == 6)
+        {
+            PlayerLedgeHoppingWheelie(direction);
+        }
+        else if (collision == 9)
+        {
+            PlayerIdleWheelie(direction);
+        }
+        else if (collision <= 4)
+        {
+            if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E))
+                PlayerIdleWheelie(direction);
+            else
+                sub_808B980(direction);  //hit wall?
+        }
+        return;
+    }
+    sub_808B9BC(direction);
+    gPlayerAvatar.runningState = MOVING;
+}
+
+static void AcroBikeTransition_WheelieRisingMoving(u8 direction)
+{
+    u8 collision;
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+    {
+        PlayerStartWheelie(playerMapObj->placeholder18);
+        return;
+    }
+    collision = get_some_collision(direction);
+    if (collision > 0 && collision < 12)
+    {
+        if (collision == 6)
+        {
+            PlayerLedgeHoppingWheelie(direction);
+        }
+        else if (collision == 9)
+        {
+            PlayerIdleWheelie(direction);
+        }
+        else if (collision <= 4)
+        {
+            if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E))
+                PlayerIdleWheelie(direction);
+            else
+                sub_808B980(direction);  //hit wall?
+        }
+        return;
+    }
+    sub_808B9A4(direction);
+    gPlayerAvatar.runningState = MOVING;
+}
+
+static void AcroBikeTransition_WheelieLoweringMoving(u8 direction)
+{
+    u8 collision;
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0)
+    {
+        PlayerEndWheelie(playerMapObj->placeholder18);
+        return;
+    }
+    collision = get_some_collision(direction);
+    if (collision > 0 && collision < 12)
+    {
+        if (collision == 6)
+            PlayerJumpLedge(direction);
+        else if (collision < 5 || collision > 8)
+            PlayerEndWheelie(direction);
+        return;
+    }
+    npc_use_some_d2s(direction);
+}
+
+void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys)
+{
+    if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ACRO_BIKE)
+        AcroBike_TryHistoryUpdate(newKeys, heldKeys);
+}
+
+static void AcroBike_TryHistoryUpdate(u16 newKeys, u16 heldKeys) // newKeys is unused
+{
+    u8 direction = Bike_DPadToDirection(heldKeys);
+
+    if (direction == (gPlayerAvatar.directionHistory & 0xF))
+    {
+        // increment the timer for direction history since last input.
+        if (gPlayerAvatar.dirTimerHistory[0] < 0xFF)
+            gPlayerAvatar.dirTimerHistory[0]++;
+    }
+    else
+    {
+        Bike_UpdateDirTimerHistory(direction);
+        gPlayerAvatar.bikeSpeed = SPEED_STANDING;
+    }
+
+    direction = heldKeys & (A_BUTTON | B_BUTTON | SELECT_BUTTON | START_BUTTON); // directions is reused for some reason.
+    if (direction == (gPlayerAvatar.abStartSelectHistory & 0xF))
+    {
+        if (gPlayerAvatar.abStartSelectTimerHistory[0] < 0xFF)
+            gPlayerAvatar.abStartSelectTimerHistory[0]++;
+    }
+    else
+    {
+        Bike_UpdateABStartSelectHistory(direction);
+        gPlayerAvatar.bikeSpeed = SPEED_STANDING;
+    }
+}
+
+static bool8 HasPlayerInputTakenLongerThanList(const u8 *dirTimerList, const u8 *abStartSelectTimerList)
+{
+    u8 i;
+
+    for (i = 0; dirTimerList[i] != 0; i++)
+    {
+        if (gPlayerAvatar.dirTimerHistory[i] > dirTimerList[i])
+            return FALSE;
+    }
+    for (i = 0; abStartSelectTimerList[i] != 0; i++)
+    {
+        if (gPlayerAvatar.abStartSelectTimerHistory[i] > abStartSelectTimerList[i])
+            return FALSE;
+    }
+    return TRUE;
+}
+
+static u8 AcroBike_GetJumpDirection(void)
+{
+    u32 i;
+
+    for (i = 0; i < ARRAY_COUNT(sAcroBikeTricksList); i++)
+    {
+        const struct BikeHistoryInputInfo *historyInputInfo = &sAcroBikeTricksList[i];
+        u32 dirHistory = gPlayerAvatar.directionHistory;
+        u32 abStartSelectHistory = gPlayerAvatar.abStartSelectHistory;
+
+        dirHistory &= historyInputInfo->dirHistoryMask;
+        abStartSelectHistory &= historyInputInfo->abStartSelectHistoryMask;
+        if (dirHistory == historyInputInfo->dirHistoryMatch && abStartSelectHistory == historyInputInfo->abStartSelectHistoryMatch && HasPlayerInputTakenLongerThanList(historyInputInfo->dirTimerHistoryList, historyInputInfo->abStartSelectHistoryList))
+            return historyInputInfo->direction;
+    }
+    return 0;
+}
+
+static void Bike_UpdateDirTimerHistory(u8 dir)
+{
+    u8 i;
+
+    gPlayerAvatar.directionHistory = (gPlayerAvatar.directionHistory << 4) | (dir & 0xF);
+
+    for (i = 7; i != 0; i--)
+        gPlayerAvatar.dirTimerHistory[i] = gPlayerAvatar.dirTimerHistory[i - 1];
+    gPlayerAvatar.dirTimerHistory[0] = 1;
+}
+
+static void Bike_UpdateABStartSelectHistory(u8 input)
+{
+    u8 i;
+
+    gPlayerAvatar.abStartSelectHistory = (gPlayerAvatar.abStartSelectHistory << 4) | (input & 0xF);
+
+    for (i = 7; i != 0; i--)
+        gPlayerAvatar.abStartSelectTimerHistory[i] = gPlayerAvatar.abStartSelectTimerHistory[i - 1];
+    gPlayerAvatar.abStartSelectTimerHistory[0] = 1;
+}
+
+static u8 Bike_DPadToDirection(u16 heldKeys)
+{
+    if (heldKeys & DPAD_UP)
+        return DIR_NORTH;
+    if (heldKeys & DPAD_DOWN)
+        return DIR_SOUTH;
+    if (heldKeys & DPAD_LEFT)
+        return DIR_WEST;
+    if (heldKeys & DPAD_RIGHT)
+        return DIR_EAST;
+    return DIR_NONE;
+}
+
+static u8 get_some_collision(u8 direction)
+{
+    s16 x;
+    s16 y;
+    u8 metatitleBehavior;
+    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+
+    x = playerMapObj->coords2.x;
+    y = playerMapObj->coords2.y;
+    MoveCoords(direction, &x, &y);
+    metatitleBehavior = MapGridGetMetatileBehaviorAt(x, y);
+    return Bike_CheckCollisionTryAdvanceCollisionCount(playerMapObj, x, y, direction, metatitleBehavior);
+}
+
+static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct MapObject *mapObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior)
+{
+    u8 collision = CheckForFieldObjectCollision(mapObject, x, y, direction, metatitleBehavior);
+
+    if (collision > 4)
+        return collision;
+
+    if (collision == 0 && IsRunningDisallowedByMetatile(metatitleBehavior))
+        collision = 2;
+
+    if (collision)
+        Bike_TryAdvanceCyclingRoadCollisions();
+
+    return collision;
+}
+
+bool8 RS_IsRunningDisallowed(u8 tile)
+{
+    if (IsRunningDisallowedByMetatile(tile) != FALSE || gMapHeader.mapType == MAP_TYPE_INDOOR)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static bool8 IsRunningDisallowedByMetatile(u8 tile)
+{
+    if (MetatileBehavior_IsRunningDisallowed(tile))
+        return TRUE;
+    if (MetatileBehavior_IsFortreeBridge(tile) && (PlayerGetZCoord() & 1) == 0)
+        return TRUE;
+    return FALSE;
+}
+
+static void Bike_TryAdvanceCyclingRoadCollisions(void)
+{
+    if (gBikeCyclingChallenge != FALSE && gBikeCollisions < 100)
+        gBikeCollisions++;
+}
+
+static bool8 CanBikeFaceDirOnMetatile(u8 direction, u8 tile)
+{
+    if (direction == DIR_EAST || direction == DIR_WEST)
+    {
+        // Bike cannot face east or west on a vertical rail
+        if (MetatileBehavior_IsIsolatedVerticalRail(tile)
+         || MetatileBehavior_IsVerticalRail(tile))
+            return FALSE;
+    }
+    else
+    {
+        // Bike cannot face north or south on a horizontal rail
+        if (MetatileBehavior_IsIsolatedHorizontalRail(tile)
+         || MetatileBehavior_IsHorizontalRail(tile))
+            return FALSE;
+    }
+    return TRUE;
+}
+
+static bool8 WillPlayerCollideWithCollision(u8 newTileCollision, u8 direction)
+{
+    if (direction == DIR_NORTH || direction == DIR_SOUTH)
+    {
+        if (newTileCollision == 10 || newTileCollision == 12)
+            return FALSE;
+    }
+    else if (newTileCollision == 11 || newTileCollision == 13)
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+bool8 IsBikingDisallowedByPlayer(void)
+{
+    s16 x, y;
+    u8 tileBehavior;
+
+    if (!(gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_SURFING | PLAYER_AVATAR_FLAG_4)))
+    {
+        PlayerGetDestCoords(&x, &y);
+        tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+        if (!IsRunningDisallowedByMetatile(tileBehavior))
+            return FALSE;
+    }
+    return TRUE;
+}
+
+bool8 player_should_look_direction_be_enforced_upon_movement(void)
+{
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E) != FALSE)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+void GetOnOffBike(u8 transitionFlags)
+{
+    gUnknown_02037348 = FALSE;
+
+    if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
+    {
+        SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
+        Overworld_ClearSavedMusic();
+        Overworld_PlaySpecialMapMusic();
+    }
+    else
+    {
+        SetPlayerAvatarTransitionFlags(transitionFlags);
+        Overworld_SetSavedMusic(BGM_CYCLING);
+        Overworld_ChangeMusicTo(BGM_CYCLING);
+    }
+}
+
+void BikeClearState(int newDirHistory, int newAbStartHistory)
+{
+    u8 i;
+
+    gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
+    gPlayerAvatar.newDirBackup = DIR_NONE;
+    gPlayerAvatar.bikeFrameCounter = 0;
+    gPlayerAvatar.bikeSpeed = SPEED_STANDING;
+    gPlayerAvatar.directionHistory = newDirHistory;
+    gPlayerAvatar.abStartSelectHistory = newAbStartHistory;
+
+    for (i = 0; i < 8; i++)
+        gPlayerAvatar.dirTimerHistory[i] = 0;
+
+    for (i = 0; i < 8; i++)
+        gPlayerAvatar.abStartSelectTimerHistory[i] = 0;
+}
+
+void Bike_UpdateBikeCounterSpeed(u8 counter)
+{
+    gPlayerAvatar.bikeFrameCounter = counter;
+    gPlayerAvatar.bikeSpeed = gPlayerAvatar.bikeFrameCounter + (gPlayerAvatar.bikeFrameCounter >> 1); // lazy way of multiplying by 1.5.
+}
+
+static void Bike_SetBikeStill(void)
+{
+    gPlayerAvatar.bikeFrameCounter = 0;
+    gPlayerAvatar.bikeSpeed = SPEED_STANDING;
+}
+
+s16 GetPlayerSpeed(void)
+{
+    // because the player pressed a direction, it won't ever return a speed of 0 since this function returns the player's current speed.
+    s16 machSpeeds[3];
+
+    memcpy(machSpeeds, sMachBikeSpeeds, sizeof(machSpeeds));
+
+    if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_MACH_BIKE)
+        return machSpeeds[gPlayerAvatar.bikeFrameCounter];
+    else if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ACRO_BIKE)
+        return SPEED_FASTER;
+    else if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_SURFING | PLAYER_AVATAR_FLAG_DASH))
+        return SPEED_FAST;
+    else
+        return SPEED_NORMAL;
+}
+
+void Bike_HandleBumpySlopeJump(void)
+{
+    s16 x, y;
+    u8 tileBehavior;
+
+    if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ACRO_BIKE)
+    {
+        PlayerGetDestCoords(&x, &y);
+        tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+        if (MetatileBehavior_IsBumpySlope(tileBehavior))
+        {
+            gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING;
+            sub_808C1B4(player_get_direction_upper_nybble());
+        }
+    }
+}
+
+bool32 IsRunningDisallowed(u8 metatile)
+{
+    if (!(gMapHeader.flags & 4) || IsRunningDisallowedByMetatile(metatile) == TRUE)
+        return TRUE;
+    else
+        return FALSE;
+}
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 2b88fec3a..ea5c77399 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -86,7 +86,7 @@ extern void sub_806A068(u16, u8);
 extern void sub_807F19C(void);
 extern void sub_807B140(void);
 extern void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
-extern void sub_8085784(void);
+extern void Overworld_PlaySpecialMapMusic(void);
 extern void sub_81BFA38(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move);
 extern u8 sub_81C1B94(void);
 extern void sub_807F1A8(u8 arg0, const u8 *arg1, u8 arg2);
@@ -698,7 +698,7 @@ static void Task_EvolutionScene(u8 taskID)
                 if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE))
                 {
                     StopMapMusic();
-                    sub_8085784();
+                    Overworld_PlaySpecialMapMusic();
                 }
 
                 gTasks[taskID].tBits |= TASK_BIT_LEARN_MOVE;
@@ -727,7 +727,7 @@ static void Task_EvolutionScene(u8 taskID)
             if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE))
             {
                 StopMapMusic();
-                sub_8085784();
+                Overworld_PlaySpecialMapMusic();
             }
             if (!gTasks[taskID].tEvoWasStopped)
                 CreateShedinja(gTasks[taskID].tPreEvoSpecies, mon);
-- 
cgit v1.2.3


From a705a863d1f59411a6f18fdd95e81de76f66fd66 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Thu, 21 Dec 2017 12:26:00 -0600
Subject: Fix incorrect slash in battle_bg.c

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

(limited to 'src')

diff --git a/src/battle_bg.c b/src/battle_bg.c
index 24a88c4f5..82355273b 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "sprite.h"
-#include "constants\trainers.h"
+#include "constants/trainers.h"
 #include "graphics.h"
 #include "decompress.h"
 #include "bg.h"
-- 
cgit v1.2.3


From 173761a5a11edf32eb22453e83689587e0aee683 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Thu, 21 Dec 2017 13:47:52 -0600
Subject: Port generic event script macros from pokeruby

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

(limited to 'src')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 412f8acd1..0557cd95e 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -2089,7 +2089,7 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_choosecontestpkmn(struct ScriptContext *ctx)
+bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
 {
     sub_81B9404();
     ScriptContext1_Stop();
-- 
cgit v1.2.3


From 19c25a8f2b3145b6a053cf3af9a76b306dbf3a88 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 21 Dec 2017 22:56:20 +0100
Subject: start dumping pokedex

---
 src/pokedex.c | 295 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 295 insertions(+)
 create mode 100644 src/pokedex.c

(limited to 'src')

diff --git a/src/pokedex.c b/src/pokedex.c
new file mode 100644
index 000000000..97716ef8a
--- /dev/null
+++ b/src/pokedex.c
@@ -0,0 +1,295 @@
+#include "global.h"
+#include "gba/m4a_internal.h"
+#include "pokedex.h"
+
+#include "data/pokedex_orders.h"
+
+static const struct OamData gOamData_83A0404 =
+{
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+static const struct OamData gOamData_83A040C =
+{
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+static const struct OamData gOamData_83A0414 =
+{
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 2,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+static const struct OamData gOamData_83A041C =
+{
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 2,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 2,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+static const struct OamData gOamData_83A0424 =
+{
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+static const struct OamData gOamData_83A042C =
+{
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 2,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+
+static const union AnimCmd sSpriteAnim_855D014[] =
+{
+    ANIMCMD_FRAME(3, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D01C[] =
+{
+    ANIMCMD_FRAME(1, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D024[] =
+{
+    ANIMCMD_FRAME(16, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D02C[] =
+{
+    ANIMCMD_FRAME(48, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D034[] =
+{
+    ANIMCMD_FRAME(40, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D03C[] =
+{
+    ANIMCMD_FRAME(32, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D044[] =
+{
+    ANIMCMD_FRAME(56, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D04C[] =
+{
+    ANIMCMD_FRAME(64, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D054[] =
+{
+    ANIMCMD_FRAME(96, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D05C[] =
+{
+    ANIMCMD_FRAME(160, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D064[] =
+{
+    ANIMCMD_FRAME(168, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D06C[] =
+{
+    ANIMCMD_FRAME(128, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D074[] =
+{
+    ANIMCMD_FRAME(130, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D07C[] =
+{
+    ANIMCMD_FRAME(132, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D084[] =
+{
+    ANIMCMD_FRAME(134, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D08C[] =
+{
+    ANIMCMD_FRAME(136, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D094[] =
+{
+    ANIMCMD_FRAME(138, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D09C[] =
+{
+    ANIMCMD_FRAME(140, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0A4[] =
+{
+    ANIMCMD_FRAME(142, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0AC[] =
+{
+    ANIMCMD_FRAME(144, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0B4[] =
+{
+    ANIMCMD_FRAME(146, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0BC[] =
+{
+    ANIMCMD_FRAME(176, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0C4[] =
+{
+    ANIMCMD_FRAME(178, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0CC[] =
+{
+    ANIMCMD_FRAME(180, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0D4[] =
+{
+    ANIMCMD_FRAME(182, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0DC[] =
+{
+    ANIMCMD_FRAME(184, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0E4[] =
+{
+    ANIMCMD_FRAME(186, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0EC[] =
+{
+    ANIMCMD_FRAME(188, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0F4[] =
+{
+    ANIMCMD_FRAME(190, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D0FC[] =
+{
+    ANIMCMD_FRAME(192, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D104[] =
+{
+    ANIMCMD_FRAME(194, 30),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_855D10C[] =
+{
+    ANIMCMD_FRAME(4, 30),
+    ANIMCMD_END
+};
-- 
cgit v1.2.3


From 0e8d6645f84057a9eaf9e60ac9312bc259f15be1 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Fri, 22 Dec 2017 01:03:16 -0600
Subject: Attempts to fix nonmatchings in palette.c

---
 src/palette.c | 91 ++++++++++++++++++++++++++++-------------------------------
 1 file changed, 43 insertions(+), 48 deletions(-)

(limited to 'src')

diff --git a/src/palette.c b/src/palette.c
index d4bb593da..8528a3fdc 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -65,7 +65,8 @@ static const struct PaletteStructTemplate gDummyPaletteStructTemplate = {
     .uid = 0xFFFF,
     .pst_field_B_5 = 1
 };
-static const u8 gUnknown_0852489C[] = {
+
+static const u8 sRoundedDownGrayscaleMap[] = {
      0,  0,  0,  0,  0,
      5,  5,  5,  5,  5,
     11, 11, 11, 11, 11,
@@ -620,7 +621,7 @@ static u8 UpdateFastPaletteFade(void)
             gPlttBufferFaded[i] = r | (g << 5) | (b << 10);
         }
         break;
-    case FAST_FADE_OUT_TO_WHTIE:
+    case FAST_FADE_OUT_TO_WHITE:
         for (i = paletteOffsetStart; i < paletteOffsetEnd; i++)
         {
             struct PlttData *data = (struct PlttData *)&gPlttBufferFaded[i];
@@ -701,7 +702,7 @@ static u8 UpdateFastPaletteFade(void)
         case FAST_FADE_IN_FROM_BLACK:
             CpuCopy32(gPlttBufferUnfaded, gPlttBufferFaded, PLTT_SIZE);
             break;
-        case FAST_FADE_OUT_TO_WHTIE:
+        case FAST_FADE_OUT_TO_WHITE:
             CpuFill32(0xFFFFFFFF, gPlttBufferFaded, PLTT_SIZE);
             break;
         case FAST_FADE_OUT_TO_BLACK:
@@ -838,10 +839,10 @@ void BlendPalettesUnfaded(u32 selectedPalettes, u8 coeff, u16 color)
 
 void TintPalette_GrayScale(u16 *palette, u16 count)
 {
-    s32 r;
-    s32 g;
-    s32 b;
-    s32 gray;
+    int r;
+    int g;
+    int b;
+    u32 gray;
 
     int i;
     for (i = 0; i < count; i++)
@@ -850,23 +851,22 @@ void TintPalette_GrayScale(u16 *palette, u16 count)
         g = (*palette >> 5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
         
-        r *= 0x4C;
-        r += g * 0x97;
-        r += b * 0x1D;
+        r = r * Q_8_8(0.2969);
+        r += g * Q_8_8(0.5899);
+        r += b * Q_8_8(0.1133);
         
         gray = r >> 8;
         
         *palette++ = gray << 10 | gray << 5 | gray;
     }
-    return;
 }
 
 void TintPalette_GrayScale2(u16 *palette, u16 count)
 {
-    s32 r;
-    s32 g;
-    s32 b;
-    s32 gray;
+    int r;
+    int g;
+    int b;
+    u32 gray;
 
     int i;
     for (i = 0; i < count; i++)
@@ -874,62 +874,57 @@ void TintPalette_GrayScale2(u16 *palette, u16 count)
         r = *palette & 0x1F;
         g = (*palette >> 5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
-        
-        r *= 0x4C;
-        r += g * 0x97;
-        r += b * 0x1D;
+       
+        r = r * Q_8_8(0.2969);
+        r += g * Q_8_8(0.5899);
+        r += b * Q_8_8(0.1133);
         
         gray = r >> 8;
         
-        if ((u32)gray > 0x1F)
+        if (gray > 0x1F)
             gray = 0x1F;
         
-        gray = gUnknown_0852489C[gray];
+        gray = sRoundedDownGrayscaleMap[gray];
         
         *palette++ = gray << 10 | gray << 5 | gray;
     }
-    return;
 }
 
 #ifdef NONMATCHING
 void TintPalette_SepiaTone(u16 *palette, u16 count)
 {
-    s32 r;
-    s32 g;
-    s32 b;
+    int red;
+    int green;
+    int blue;
     u32 gray;
-    u32 sepia;
-    s8 r2;
-    s8 g2;
-    s8 b2;
+    u8 r2;
+    u8 g2;
+    u8 b2;
     
     int i;
     for (i = 0; i < count; i++)
     {
-        r = *palette & 0x1F;
-        g = (*palette >> 5) & 0x1F;
-        b = (*palette >> 10) & 0x1F;
-        
-        r *= 0x4C;
-        r += g * 0x97;
-        r += b * 0x1D;
+        red = *palette & 0x1F;
+        green = (*palette >> 5) & 0x1F;
+        blue = (*palette >> 10) & 0x1F;
         
-        gray = (s32)(r >> 8);
+        gray = red * Q_8_8(0.2969);
+        gray += green * Q_8_8(0.5899);
+        gray += blue * Q_8_8(0.1133);
         
-        sepia = (gray * 0x133);
+        gray = gray / 256;
         
-        r2 = (u16)sepia >> 8;
+        r2 = (gray * 0x133) / 256;
         
         g2 = gray;
         
-        b2 = (gray * 15);
+        b2 = (gray * 0xF);
         
         if (r2 > 0x1F)
             r2 = 0x1F;
         
         *palette++ = b2 << 10 | g2 << 5 | r2;
     }
-    return;
 }
 #else
 __attribute__((naked))
@@ -995,7 +990,7 @@ _080A2BA2:\n\
 #endif // NONMATCHING
 
 #ifdef NONMATCHING
-void sub_80A2BAC(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5)
+void TintPalette_CustomTone(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5)
 {
     s32 r;
     s32 g;
@@ -1039,7 +1034,7 @@ void sub_80A2BAC(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5)
 }
 #else
 __attribute__((naked))
-void sub_80A2BAC(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5)
+void TintPalette_CustomTone(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5)
 {
     asm("push {r4-r7,lr}\n\
     mov r7, r9\n\
@@ -1153,7 +1148,7 @@ void sub_80A2C44(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7)
     gTasks[taskId].func(taskId);
 }
 
-u32 sub_80A2CF8(u8 var)
+bool32 sub_80A2CF8(u8 var)
 {
     int i;
 
@@ -1181,7 +1176,7 @@ void sub_80A2D54(u8 taskId)
 {
     u32 wordVar;
     s16 *data;
-    u16 temp;
+    s16 temp;
 
     data = gTasks[taskId].data;
     wordVar = GetWordTaskArg(taskId, 5);
@@ -1191,7 +1186,7 @@ void sub_80A2D54(u8 taskId)
         data[4] = 0;
         BlendPalettes(wordVar, data[0], data[7]);
         temp = data[1];
-        if (data[0] == (s16)temp)
+        if (data[0] == temp)
         {
             DestroyTask(taskId);
         }
@@ -1200,12 +1195,12 @@ void sub_80A2D54(u8 taskId)
             data[0] += data[2];
             if (data[2] >= 0)
             {
-                if (data[0] < (s16)temp)
+                if (data[0] < temp)
                 {
                     return;
                 }
             }
-            else if (data[0] > (s16)temp)
+            else if (data[0] > temp)
             {
                 return;
             }
-- 
cgit v1.2.3


From 96511dc214b9f343864b125816751040edccd010 Mon Sep 17 00:00:00 2001
From: sceptillion <33798691+sceptillion@users.noreply.github.com>
Date: Thu, 21 Dec 2017 23:46:19 -0800
Subject: use internal song names

---
 src/battle_2.c               | 12 +++++------
 src/battle_bg.c              |  2 +-
 src/battle_message.c         |  4 ++--
 src/battle_script_commands.c |  2 +-
 src/battle_setup.c           | 48 ++++++++++++++++++++++----------------------
 src/berry_blender.c          | 10 ++++-----
 src/evolution_scene.c        | 20 +++++++++---------
 src/field_special_scene.c    |  2 +-
 src/hall_of_fame.c           |  2 +-
 src/pokeball.c               |  2 +-
 src/pokemon_3.c              | 28 +++++++++++++-------------
 src/sound.c                  |  2 +-
 src/wallclock.c              |  2 +-
 13 files changed, 68 insertions(+), 68 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index f8b4113f0..6752c4d4f 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -4738,9 +4738,9 @@ static void HandleEndTurn_BattleWon(void)
         gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon;
 
         if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE)
-            PlayBGM(BGM_KACHI3);
+            PlayBGM(MUS_KACHI3);
         else
-            PlayBGM(BGM_KACHI1);
+            PlayBGM(MUS_KACHI1);
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
     {
@@ -4751,7 +4751,7 @@ static void HandleEndTurn_BattleWon(void)
         {
         case TRAINER_CLASS_ELITE_FOUR:
         case TRAINER_CLASS_CHAMPION:
-            PlayBGM(BGM_KACHI5);
+            PlayBGM(MUS_KACHI5);
             break;
         case TRAINER_CLASS_TEAM_AQUA:
         case TRAINER_CLASS_TEAM_MAGMA:
@@ -4759,13 +4759,13 @@ static void HandleEndTurn_BattleWon(void)
         case TRAINER_CLASS_AQUA_LEADER:
         case TRAINER_CLASS_MAGMA_ADMIN:
         case TRAINER_CLASS_MAGMA_LEADER:
-            PlayBGM(BGM_KACHI4);
+            PlayBGM(MUS_KACHI4);
             break;
         case TRAINER_CLASS_LEADER:
-            PlayBGM(BGM_KACHI3);
+            PlayBGM(MUS_KACHI3);
             break;
         default:
-            PlayBGM(BGM_KACHI1);
+            PlayBGM(MUS_KACHI1);
             break;
         }
     }
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 82355273b..5d5bbf0e9 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -13,7 +13,7 @@
 #include "task.h"
 #include "trig.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "strings.h"
 #include "window.h"
 #include "text_window.h"
diff --git a/src/battle_message.c b/src/battle_message.c
index 8a985102d..e37a4c30c 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -484,8 +484,8 @@ const u8 gText_PkmnBrokeFree[] = _("Oh, no!\nThe POKéMON broke free!");
 const u8 gText_ItAppearedCaught[] = _("Aww!\nIt appeared to be caught!");
 const u8 gText_AarghAlmostHadIt[] = _("Aargh!\nAlmost had it!");
 const u8 gText_ShootSoClose[] = _("Shoot!\nIt was so close, too!");
-const u8 gText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}\p");
-const u8 gText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}{PAUSE 127}");
+const u8 gText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}\p");
+const u8 gText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}");
 const u8 gText_GiveNicknameCaptured[] = _("Give a nickname to the\ncaptured {B_OPPONENT_MON1_NAME}?");
 const u8 gText_PkmnSentToPC[] = _("{B_OPPONENT_MON1_NAME} was sent to\n{B_PC_CREATOR_NAME} PC.");
 const u8 gText_Someones[] = _("someone’s");
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 656f9f43a..43b802d0b 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -7121,7 +7121,7 @@ static void atk76_various(void)
             gBattleOutcome = BATTLE_OPPONENT_TELEPORTED;
         break;
     case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC:
-        EmitPlayFanfareOrBGM(0, BGM_KACHI1, TRUE);
+        EmitPlayFanfareOrBGM(0, MUS_KACHI1, TRUE);
         MarkBufferBankForExecution(gActiveBank);
         break;
     }
diff --git a/src/battle_setup.c b/src/battle_setup.c
index be23a28c9..6d7a97844 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -11,7 +11,7 @@
 #include "constants/game_stat.h"
 #include "event_data.h"
 #include "constants/species.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "metatile_behavior.h"
 #include "constants/maps.h"
 #include "field_player_avatar.h"
@@ -520,25 +520,25 @@ void BattleSetup_StartLegendaryBattle(void)
     default:
     case SPECIES_GROUDON:
         gBattleTypeFlags |= BATTLE_TYPE_GROUDON;
-        CreateBattleStartTask(B_TRANSITION_GROUDON, BGM_BATTLE34);
+        CreateBattleStartTask(B_TRANSITION_GROUDON, MUS_BATTLE34);
         break;
     case SPECIES_KYOGRE:
         gBattleTypeFlags |= BATTLE_TYPE_KYOGRE;
-        CreateBattleStartTask(B_TRANSITION_KYOGRE, BGM_BATTLE34);
+        CreateBattleStartTask(B_TRANSITION_KYOGRE, MUS_BATTLE34);
         break;
     case SPECIES_RAYQUAZA:
         gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA;
-        CreateBattleStartTask(B_TRANSITION_RAYQUAZA, BGM_BATTLE_LEGENDARY);
+        CreateBattleStartTask(B_TRANSITION_RAYQUAZA, MUS_VS_REKKU);
         break;
     case SPECIES_DEOXYS:
-        CreateBattleStartTask(B_TRANSITION_BLUR, BGM_FRLG_BATTLE_DEOXYS);
+        CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEO);
         break;
     case SPECIES_LUGIA:
     case SPECIES_HO_OH:
-        CreateBattleStartTask(B_TRANSITION_BLUR, BGM_FRLG_BATTLE_LEGENDARY);
+        CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEN);
         break;
     case SPECIES_MEW:
-        CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, BGM_BATTLE_MEW);
+        CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_VS_MEW);
         break;
     }
 
@@ -555,9 +555,9 @@ void StartGroudonKyogreBattle(void)
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
 
     if (gGameVersion == VERSION_RUBY)
-        CreateBattleStartTask(B_TRANSITION_SHARDS, BGM_BATTLE34); // GROUDON
+        CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_BATTLE34); // GROUDON
     else
-        CreateBattleStartTask(B_TRANSITION_RIPPLE, BGM_BATTLE34); // KYOGRE
+        CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_BATTLE34); // KYOGRE
 
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
@@ -590,7 +590,7 @@ void StartRegiBattle(void)
         transitionId = B_TRANSITION_GRID_SQUARES;
         break;
     }
-    CreateBattleStartTask(transitionId, BGM_BATTLE36);
+    CreateBattleStartTask(transitionId, MUS_BATTLE36);
 
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
@@ -1446,46 +1446,46 @@ void SetUpTrainerEncounterMusic(void)
         switch (GetTrainerEncounterMusicId(trainerId))
         {
         case TRAINER_ENCOUNTER_MUSIC_MALE:
-            music = BGM_BOYEYE;
+            music = MUS_BOYEYE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_FEMALE:
-            music = BGM_GIRLEYE;
+            music = MUS_GIRLEYE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_GIRL:
-            music = BGM_SYOUJOEYE;
+            music = MUS_SYOUJOEYE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_INTENSE:
-            music = BGM_HAGESHII;
+            music = MUS_HAGESHII;
             break;
         case TRAINER_ENCOUNTER_MUSIC_COOL:
-            music = BGM_KAKKOII;
+            music = MUS_KAKKOII;
             break;
         case TRAINER_ENCOUNTER_MUSIC_AQUA:
-            music = BGM_AQA_0;
+            music = MUS_AQA_0;
             break;
         case TRAINER_ENCOUNTER_MUSIC_MAGMA:
-            music = BGM_MGM0;
+            music = MUS_MGM0;
             break;
         case TRAINER_ENCOUNTER_MUSIC_SWIMMER:
-            music = BGM_SWIMEYE;
+            music = MUS_SWIMEYE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_TWINS:
-            music = BGM_HUTAGO;
+            music = MUS_HUTAGO;
             break;
         case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR:
-            music = BGM_SITENNOU;
+            music = MUS_SITENNOU;
             break;
         case TRAINER_ENCOUNTER_MUSIC_HIKER:
-            music = BGM_YAMA_EYE;
+            music = MUS_YAMA_EYE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER:
-            music = BGM_INTER_V;
+            music = MUS_INTER_V;
             break;
         case TRAINER_ENCOUNTER_MUSIC_RICH:
-            music = BGM_TEST;
+            music = MUS_TEST;
             break;
         default:
-            music = BGM_AYASII;
+            music = MUS_AYASII;
         }
         PlayNewMapMusic(music);
     }
diff --git a/src/berry_blender.c b/src/berry_blender.c
index b1e8712a6..57b158870 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1305,11 +1305,11 @@ static void sub_8080018(void)
         sBerryBlenderData->field_4C = 128;
         sBerryBlenderData->gameFrameTime = 0;
         SetMainCallback2(sub_8081898);
-        if (GetCurrentMapMusic() != BGM_CYCLING)
+        if (GetCurrentMapMusic() != MUS_CYCLING)
         {
             sBerryBlenderData->field_154 = GetCurrentMapMusic();
         }
-        PlayBGM(BGM_CYCLING);
+        PlayBGM(MUS_CYCLING);
         break;
     }
 
@@ -1604,10 +1604,10 @@ static void sub_80808D4(void)
                 sBerryBlenderData->field_120[i] = CreateTask(sUnknown_083399EC[i], 10 + i);
         }
 
-        if (GetCurrentMapMusic() != BGM_CYCLING)
+        if (GetCurrentMapMusic() != MUS_CYCLING)
             sBerryBlenderData->field_154 = GetCurrentMapMusic();
 
-        PlayBGM(BGM_CYCLING);
+        PlayBGM(MUS_CYCLING);
         PlaySE(SE_MOTER);
         Blender_ControlHitPitch();
         break;
@@ -3522,7 +3522,7 @@ static void sub_8083F3C(u8 taskId)
 {
     if (gTasks[taskId].data[0] == 0)
     {
-        PlayFanfare(BGM_FANFA1);
+        PlayFanfare(MUS_FANFA1);
         gTasks[taskId].data[0]++;
     }
     if (IsFanfareTaskInactive())
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 2b88fec3a..bfb558444 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -594,14 +594,14 @@ static void Task_EvolutionScene(u8 taskID)
     case 3:
         if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteID)) // wait for animation, play tu du SE
         {
-            PlaySE(BGM_ME_SHINKA);
+            PlaySE(MUS_ME_SHINKA);
             gTasks[taskID].tState++;
         }
         break;
     case 4: // play evolution music and fade screen black
         if (!IsSEPlaying())
         {
-            PlayNewMapMusic(BGM_SHINKA);
+            PlayNewMapMusic(MUS_SHINKA);
             gTasks[taskID].tState++;
             BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0);
         }
@@ -677,7 +677,7 @@ static void Task_EvolutionScene(u8 taskID)
         {
             StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved);
             BattleHandleAddTextPrinter(gStringVar4, 0);
-            PlayBGM(BGM_FANFA5);
+            PlayBGM(MUS_FANFA5);
             gTasks[taskID].tState++;
             SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
             CalculateMonStats(mon);
@@ -772,7 +772,7 @@ static void Task_EvolutionScene(u8 taskID)
         if (!IsTextPrinterActive(0) && !IsSEPlaying())
         {
             BufferMoveToLearnIntoBattleTextBuff2();
-            PlayFanfare(BGM_FANFA1);
+            PlayFanfare(MUS_FANFA1);
             BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
             BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
@@ -962,15 +962,15 @@ static void Task_TradeEvolutionScene(u8 taskID)
     case 2:
         if (IsCryFinished())
         {
-            m4aSongNumStop(BGM_SHINKA);
-            PlaySE(BGM_ME_SHINKA);
+            m4aSongNumStop(MUS_SHINKA);
+            PlaySE(MUS_ME_SHINKA);
             gTasks[taskID].tState++;
         }
         break;
     case 3:
         if (!IsSEPlaying())
         {
-            PlayBGM(BGM_SHINKA);
+            PlayBGM(MUS_SHINKA);
             gTasks[taskID].tState++;
             BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0);
         }
@@ -1040,7 +1040,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         {
             StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved);
             sub_807F1A8(0, gStringVar4, 1);
-            PlayFanfare(BGM_FANFA5);
+            PlayFanfare(MUS_FANFA5);
             gTasks[taskID].tState++;
             SetMonData(mon, MON_DATA_SPECIES, (&gTasks[taskID].tPostEvoSpecies));
             CalculateMonStats(mon);
@@ -1073,7 +1073,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             }
             else
             {
-                PlayBGM(BGM_SHINKA);
+                PlayBGM(MUS_SHINKA);
                 sub_807F1A8(0, gText_CommunicationStandby5, 1);
                 gTasks[taskID].tState++;
             }
@@ -1117,7 +1117,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         if (!IsTextPrinterActive(0) && !IsSEPlaying())
         {
             BufferMoveToLearnIntoBattleTextBuff2();
-            PlayFanfare(BGM_FANFA1);
+            PlayFanfare(MUS_FANFA1);
             BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
             sub_807F1A8(0, gDisplayedStringBattle, 1);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index d46ddeaa6..a704beaab 100755
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -211,7 +211,7 @@ void Task_HandleTruckSequence(u8 taskId)
         data[1]++;
         if (data[1] == 90)
         {
-            PlaySE(SE_TRACK_HAIK);
+            PlaySE(SE_TRACK_HAIKI);
             data[1] = 0;
             data[0] = 5;
         }
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 239c5d690..2496b9564 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -424,7 +424,7 @@ static bool8 InitHallOfFameScreen(void)
         if (!gPaletteFade.active)
         {
             SetMainCallback2(CB2_HallOfFame);
-            PlayBGM(BGM_DENDOU);
+            PlayBGM(MUS_DENDOU);
             return FALSE;
         }
         break;
diff --git a/src/pokeball.c b/src/pokeball.c
index 127ba8e9d..13969a5d1 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -885,7 +885,7 @@ static void sub_80760F8(struct Sprite *sprite)
     {
         gDoingBattleAnim = FALSE;
         m4aMPlayAllStop();
-        PlaySE(BGM_FANFA5);
+        PlaySE(MUS_FANFA5);
     }
     else if (sprite->data[4] == 315)
     {
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index d58b024a8..164069fa6 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1145,11 +1145,11 @@ void ClearBattleMonForms(void)
 u16 GetBattleBGM(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
-        return BGM_BATTLE34;
+        return MUS_BATTLE34;
     if (gBattleTypeFlags & BATTLE_TYPE_REGI)
-        return BGM_BATTLE36;
+        return MUS_BATTLE36;
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-        return BGM_BATTLE20;
+        return MUS_BATTLE20;
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
         u8 trainerClass;
@@ -1165,24 +1165,24 @@ u16 GetBattleBGM(void)
         {
         case TRAINER_CLASS_AQUA_LEADER:
         case TRAINER_CLASS_MAGMA_LEADER:
-            return BGM_BATTLE30;
+            return MUS_BATTLE30;
         case TRAINER_CLASS_TEAM_AQUA:
         case TRAINER_CLASS_TEAM_MAGMA:
         case TRAINER_CLASS_AQUA_ADMIN:
         case TRAINER_CLASS_MAGMA_ADMIN:
-            return BGM_BATTLE31;
+            return MUS_BATTLE31;
         case TRAINER_CLASS_LEADER:
-            return BGM_BATTLE32;
+            return MUS_BATTLE32;
         case TRAINER_CLASS_CHAMPION:
-            return BGM_BATTLE33;
+            return MUS_BATTLE33;
         case TRAINER_CLASS_PKMN_TRAINER_3:
             if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
-                return BGM_BATTLE35;
+                return MUS_BATTLE35;
             if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, gText_BattleWallyName))
-                return BGM_BATTLE20;
-            return BGM_BATTLE35;
+                return MUS_BATTLE20;
+            return MUS_BATTLE35;
         case TRAINER_CLASS_ELITE_FOUR:
-            return BGM_BATTLE38;
+            return MUS_BATTLE38;
         case TRAINER_CLASS_SALON_MAIDEN:
         case TRAINER_CLASS_DOME_ACE:
         case TRAINER_CLASS_PALACE_MAVEN:
@@ -1190,12 +1190,12 @@ u16 GetBattleBGM(void)
         case TRAINER_CLASS_FACTORY_HEAD:
         case TRAINER_CLASS_PIKE_QUEEN:
         case TRAINER_CLASS_PYRAMID_KING:
-            return BGM_BATTLE_FRONTIER_BRAIN;
+            return MUS_VS_FRONT;
         default:
-            return BGM_BATTLE20;
+            return MUS_BATTLE20;
         }
     }
-    return BGM_BATTLE27;
+    return MUS_BATTLE27;
 }
 
 void PlayBattleBGM(void)
diff --git a/src/sound.c b/src/sound.c
index 086fede67..0cb11d5a5 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -189,7 +189,7 @@ bool8 WaitFanfare(bool8 stop)
         if (!stop)
             m4aMPlayContinue(&gMPlay_BGM);
         else
-            m4aSongNumStart(SE_STOP);
+            m4aSongNumStart(MUS_DUMMY);
 
         return TRUE;
     }
diff --git a/src/wallclock.c b/src/wallclock.c
index cd85de230..897576719 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -16,7 +16,7 @@
 #include "task.h"
 #include "strings.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "trig.h"
 #include "decompress.h"
 
-- 
cgit v1.2.3


From 841ee0f2b25b39b923a9f800279df413edb8c66d Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Fri, 22 Dec 2017 03:06:57 -0600
Subject: Fix pokeblock songs include

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

(limited to 'src')

diff --git a/src/pokeblock.c b/src/pokeblock.c
index 8716e827f..737f2c6f3 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -22,7 +22,7 @@
 #include "item.h"
 #include "constants/items.h"
 #include "string_util.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "berry.h"
 #include "menu_indicators.h"
-- 
cgit v1.2.3


From 08ebf59e4441c8006f9f96ba189d53cd51a864c8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 22 Dec 2017 18:43:41 +0100
Subject: get rid of pointers in pokedex

---
 src/pokedex.c | 275 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 261 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/pokedex.c b/src/pokedex.c
index 97716ef8a..964f41716 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1,10 +1,24 @@
 #include "global.h"
 #include "gba/m4a_internal.h"
 #include "pokedex.h"
-
+#include "sprite.h"
+#include "graphics.h"
+#include "decompress.h"
+#include "bg.h"
+#include "window.h"
+
+// this file's functions
+void sub_80BE604(struct Sprite *sprite);
+void sub_80BE658(struct Sprite *sprite);
+void sub_80BE758(struct Sprite *sprite);
+void sub_80BE780(struct Sprite *sprite);
+void sub_80BE44C(struct Sprite *sprite);
+void sub_80BE834(struct Sprite *sprite);
+
+// const rom data
 #include "data/pokedex_orders.h"
 
-static const struct OamData gOamData_83A0404 =
+static const struct OamData sOamData_855CFE4 =
 {
     .y = 160,
     .affineMode = 0,
@@ -18,9 +32,10 @@ static const struct OamData gOamData_83A0404 =
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
-    .affineParam = 0,
+    .affineParam = 0
 };
-static const struct OamData gOamData_83A040C =
+
+static const struct OamData sOamData_855CFEC =
 {
     .y = 160,
     .affineMode = 0,
@@ -34,9 +49,10 @@ static const struct OamData gOamData_83A040C =
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0,
+    .affineParam = 0
 };
-static const struct OamData gOamData_83A0414 =
+
+static const struct OamData sOamData_855CFF4 =
 {
     .y = 160,
     .affineMode = 0,
@@ -50,9 +66,10 @@ static const struct OamData gOamData_83A0414 =
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0,
+    .affineParam = 0
 };
-static const struct OamData gOamData_83A041C =
+
+static const struct OamData sOamData_855CFFC =
 {
     .y = 160,
     .affineMode = 0,
@@ -66,9 +83,10 @@ static const struct OamData gOamData_83A041C =
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
-    .affineParam = 0,
+    .affineParam = 0
 };
-static const struct OamData gOamData_83A0424 =
+
+static const struct OamData sOamData_855D004 =
 {
     .y = 160,
     .affineMode = 0,
@@ -82,9 +100,10 @@ static const struct OamData gOamData_83A0424 =
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0,
+    .affineParam = 0
 };
-static const struct OamData gOamData_83A042C =
+
+static const struct OamData sOamData_855D00C =
 {
     .y = 160,
     .affineMode = 0,
@@ -98,10 +117,9 @@ static const struct OamData gOamData_83A042C =
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
-    .affineParam = 0,
+    .affineParam = 0
 };
 
-
 static const union AnimCmd sSpriteAnim_855D014[] =
 {
     ANIMCMD_FRAME(3, 30),
@@ -293,3 +311,232 @@ static const union AnimCmd sSpriteAnim_855D10C[] =
     ANIMCMD_FRAME(4, 30),
     ANIMCMD_END
 };
+
+static const union AnimCmd *const sSpriteAnimTable_855D114[] =
+{
+    sSpriteAnim_855D014
+};
+
+static const union AnimCmd *const sSpriteAnimTable_855D118[] =
+{
+    sSpriteAnim_855D01C
+};
+
+static const union AnimCmd *const sSpriteAnimTable_855D11C[] =
+{
+    sSpriteAnim_855D024
+};
+
+static const union AnimCmd *const sSpriteAnimTable_855D120[] =
+{
+    sSpriteAnim_855D02C,
+    sSpriteAnim_855D034,
+    sSpriteAnim_855D03C,
+    sSpriteAnim_855D044
+};
+
+static const union AnimCmd *const sSpriteAnimTable_855D130[] =
+{
+    sSpriteAnim_855D04C,
+    sSpriteAnim_855D054
+};
+
+static const union AnimCmd *const sSpriteAnimTable_855D138[] =
+{
+    sSpriteAnim_855D05C,
+    sSpriteAnim_855D064
+};
+
+static const union AnimCmd *const sSpriteAnimTable_855D140[] =
+{
+    sSpriteAnim_855D06C,
+    sSpriteAnim_855D074,
+    sSpriteAnim_855D07C,
+    sSpriteAnim_855D084,
+    sSpriteAnim_855D08C,
+    sSpriteAnim_855D094,
+    sSpriteAnim_855D09C,
+    sSpriteAnim_855D0A4,
+    sSpriteAnim_855D0AC,
+    sSpriteAnim_855D0B4
+};
+
+static const union AnimCmd *const sSpriteAnimTable_855D168[] =
+{
+    sSpriteAnim_855D0BC,
+    sSpriteAnim_855D0C4,
+    sSpriteAnim_855D0CC,
+    sSpriteAnim_855D0D4,
+    sSpriteAnim_855D0DC,
+    sSpriteAnim_855D0E4,
+    sSpriteAnim_855D0EC,
+    sSpriteAnim_855D0F4,
+    sSpriteAnim_855D0FC,
+    sSpriteAnim_855D104
+};
+
+static const union AnimCmd *const sSpriteAnimTable_855D190[] =
+{
+    sSpriteAnim_855D10C
+};
+
+const struct SpriteTemplate gUnknown_0855D194 =
+{
+    .tileTag = 4096,
+    .paletteTag = 4096,
+    .oam = &sOamData_855CFE4,
+    .anims = sSpriteAnimTable_855D114,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80BE604,
+};
+
+const struct SpriteTemplate gUnknown_0855D1AC =
+{
+    .tileTag = 4096,
+    .paletteTag = 4096,
+    .oam = &sOamData_855CFEC,
+    .anims = sSpriteAnimTable_855D118,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80BE658,
+};
+
+const struct SpriteTemplate gUnknown_0855D1C4 =
+{
+    .tileTag = 4096,
+    .paletteTag = 4096,
+    .oam = &sOamData_855CFF4,
+    .anims = sSpriteAnimTable_855D120,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80BE758,
+};
+
+const struct SpriteTemplate gUnknown_0855D1DC =
+{
+    .tileTag = 4096,
+    .paletteTag = 4096,
+    .oam = &sOamData_855CFFC,
+    .anims = sSpriteAnimTable_855D11C,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80BE780,
+};
+
+const struct SpriteTemplate gUnknown_0855D1F4 =
+{
+    .tileTag = 4096,
+    .paletteTag = 4096,
+    .oam = &sOamData_855D004,
+    .anims = sSpriteAnimTable_855D130,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80BE44C,
+};
+
+const struct SpriteTemplate gUnknown_0855D20C =
+{
+    .tileTag = 4096,
+    .paletteTag = 4096,
+    .oam = &sOamData_855CFF4,
+    .anims = sSpriteAnimTable_855D138,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80BE44C,
+};
+
+const struct SpriteTemplate gUnknown_0855D224 =
+{
+    .tileTag = 4096,
+    .paletteTag = 4096,
+    .oam = &sOamData_855D00C,
+    .anims = sSpriteAnimTable_855D140,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80BE44C,
+};
+
+const struct SpriteTemplate gUnknown_0855D23C =
+{
+    .tileTag = 4096,
+    .paletteTag = 4096,
+    .oam = &sOamData_855D00C,
+    .anims = sSpriteAnimTable_855D168,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80BE44C,
+};
+
+const struct SpriteTemplate gUnknown_0855D254 =
+{
+    .tileTag = 4096,
+    .paletteTag = 4096,
+    .oam = &sOamData_855D00C,
+    .anims = sSpriteAnimTable_855D190,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80BE834,
+};
+
+const struct CompressedSpriteSheet gSpriteSheets_0855D26C[] =
+{
+    {gUnknown_08DC234C, 0x2000, 4096},
+    {0}
+};
+
+const struct CompressedSpritePalette gSpritePalettes_0855D26C[] =
+{
+    {gUnknown_08DC16F4, 4096},
+    {0}
+};
+
+const u8 gUnknown_0855D28C[] = {0x4, 0x8, 0x10, 0x20, 0x20};
+const u8 gUnknown_0855D291[] = {0x8, 0x4, 0x2, 0x1, 0x1};
+
+const struct BgTemplate gBgTemplates_0855D298[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 12,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 13,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 14,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 15,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    }
+};
+
+const struct WindowTemplate sWindowTemplates_0855D2A8[] =
+{
+    {2, 0, 0, 0x20, 0x20, 0, 1},
+    DUMMY_WIN_TEMPLATE
+};
+
-- 
cgit v1.2.3


From 9c45ca0c5fb9693751baace38b67f9232ed568b9 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 22 Dec 2017 19:16:15 +0100
Subject: dump pokemon icon

---
 src/pokemon_icon.c | 1014 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1014 insertions(+)
 create mode 100644 src/pokemon_icon.c

(limited to 'src')

diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
new file mode 100644
index 000000000..4d1cc51c5
--- /dev/null
+++ b/src/pokemon_icon.c
@@ -0,0 +1,1014 @@
+#include "global.h"
+#include "sprite.h"
+#include "graphics.h"
+
+#define POKE_ICON_BASE_PAL_TAG 56000
+
+const u8 * const gMonIconTable[] =
+{
+    gMonIcon_Bulbasaur,
+    gMonIcon_Bulbasaur,
+    gMonIcon_Ivysaur,
+    gMonIcon_Venusaur,
+    gMonIcon_Charmander,
+    gMonIcon_Charmeleon,
+    gMonIcon_Charizard,
+    gMonIcon_Squirtle,
+    gMonIcon_Wartortle,
+    gMonIcon_Blastoise,
+    gMonIcon_Caterpie,
+    gMonIcon_Metapod,
+    gMonIcon_Butterfree,
+    gMonIcon_Weedle,
+    gMonIcon_Kakuna,
+    gMonIcon_Beedrill,
+    gMonIcon_Pidgey,
+    gMonIcon_Pidgeotto,
+    gMonIcon_Pidgeot,
+    gMonIcon_Rattata,
+    gMonIcon_Raticate,
+    gMonIcon_Spearow,
+    gMonIcon_Fearow,
+    gMonIcon_Ekans,
+    gMonIcon_Arbok,
+    gMonIcon_Pikachu,
+    gMonIcon_Raichu,
+    gMonIcon_Sandshrew,
+    gMonIcon_Sandslash,
+    gMonIcon_NidoranF,
+    gMonIcon_Nidorina,
+    gMonIcon_Nidoqueen,
+    gMonIcon_NidoranM,
+    gMonIcon_Nidorino,
+    gMonIcon_Nidoking,
+    gMonIcon_Clefairy,
+    gMonIcon_Clefable,
+    gMonIcon_Vulpix,
+    gMonIcon_Ninetales,
+    gMonIcon_Jigglypuff,
+    gMonIcon_Wigglytuff,
+    gMonIcon_Zubat,
+    gMonIcon_Golbat,
+    gMonIcon_Oddish,
+    gMonIcon_Gloom,
+    gMonIcon_Vileplume,
+    gMonIcon_Paras,
+    gMonIcon_Parasect,
+    gMonIcon_Venonat,
+    gMonIcon_Venomoth,
+    gMonIcon_Diglett,
+    gMonIcon_Dugtrio,
+    gMonIcon_Meowth,
+    gMonIcon_Persian,
+    gMonIcon_Psyduck,
+    gMonIcon_Golduck,
+    gMonIcon_Mankey,
+    gMonIcon_Primeape,
+    gMonIcon_Growlithe,
+    gMonIcon_Arcanine,
+    gMonIcon_Poliwag,
+    gMonIcon_Poliwhirl,
+    gMonIcon_Poliwrath,
+    gMonIcon_Abra,
+    gMonIcon_Kadabra,
+    gMonIcon_Alakazam,
+    gMonIcon_Machop,
+    gMonIcon_Machoke,
+    gMonIcon_Machamp,
+    gMonIcon_Bellsprout,
+    gMonIcon_Weepinbell,
+    gMonIcon_Victreebel,
+    gMonIcon_Tentacool,
+    gMonIcon_Tentacruel,
+    gMonIcon_Geodude,
+    gMonIcon_Graveler,
+    gMonIcon_Golem,
+    gMonIcon_Ponyta,
+    gMonIcon_Rapidash,
+    gMonIcon_Slowpoke,
+    gMonIcon_Slowbro,
+    gMonIcon_Magnemite,
+    gMonIcon_Magneton,
+    gMonIcon_Farfetchd,
+    gMonIcon_Doduo,
+    gMonIcon_Dodrio,
+    gMonIcon_Seel,
+    gMonIcon_Dewgong,
+    gMonIcon_Grimer,
+    gMonIcon_Muk,
+    gMonIcon_Shellder,
+    gMonIcon_Cloyster,
+    gMonIcon_Gastly,
+    gMonIcon_Haunter,
+    gMonIcon_Gengar,
+    gMonIcon_Onix,
+    gMonIcon_Drowzee,
+    gMonIcon_Hypno,
+    gMonIcon_Krabby,
+    gMonIcon_Kingler,
+    gMonIcon_Voltorb,
+    gMonIcon_Electrode,
+    gMonIcon_Exeggcute,
+    gMonIcon_Exeggutor,
+    gMonIcon_Cubone,
+    gMonIcon_Marowak,
+    gMonIcon_Hitmonlee,
+    gMonIcon_Hitmonchan,
+    gMonIcon_Lickitung,
+    gMonIcon_Koffing,
+    gMonIcon_Weezing,
+    gMonIcon_Rhyhorn,
+    gMonIcon_Rhydon,
+    gMonIcon_Chansey,
+    gMonIcon_Tangela,
+    gMonIcon_Kangaskhan,
+    gMonIcon_Horsea,
+    gMonIcon_Seadra,
+    gMonIcon_Goldeen,
+    gMonIcon_Seaking,
+    gMonIcon_Staryu,
+    gMonIcon_Starmie,
+    gMonIcon_Mrmime,
+    gMonIcon_Scyther,
+    gMonIcon_Jynx,
+    gMonIcon_Electabuzz,
+    gMonIcon_Magmar,
+    gMonIcon_Pinsir,
+    gMonIcon_Tauros,
+    gMonIcon_Magikarp,
+    gMonIcon_Gyarados,
+    gMonIcon_Lapras,
+    gMonIcon_Ditto,
+    gMonIcon_Eevee,
+    gMonIcon_Vaporeon,
+    gMonIcon_Jolteon,
+    gMonIcon_Flareon,
+    gMonIcon_Porygon,
+    gMonIcon_Omanyte,
+    gMonIcon_Omastar,
+    gMonIcon_Kabuto,
+    gMonIcon_Kabutops,
+    gMonIcon_Aerodactyl,
+    gMonIcon_Snorlax,
+    gMonIcon_Articuno,
+    gMonIcon_Zapdos,
+    gMonIcon_Moltres,
+    gMonIcon_Dratini,
+    gMonIcon_Dragonair,
+    gMonIcon_Dragonite,
+    gMonIcon_Mewtwo,
+    gMonIcon_Mew,
+    gMonIcon_Chikorita,
+    gMonIcon_Bayleef,
+    gMonIcon_Meganium,
+    gMonIcon_Cyndaquil,
+    gMonIcon_Quilava,
+    gMonIcon_Typhlosion,
+    gMonIcon_Totodile,
+    gMonIcon_Croconaw,
+    gMonIcon_Feraligatr,
+    gMonIcon_Sentret,
+    gMonIcon_Furret,
+    gMonIcon_Hoothoot,
+    gMonIcon_Noctowl,
+    gMonIcon_Ledyba,
+    gMonIcon_Ledian,
+    gMonIcon_Spinarak,
+    gMonIcon_Ariados,
+    gMonIcon_Crobat,
+    gMonIcon_Chinchou,
+    gMonIcon_Lanturn,
+    gMonIcon_Pichu,
+    gMonIcon_Cleffa,
+    gMonIcon_Igglybuff,
+    gMonIcon_Togepi,
+    gMonIcon_Togetic,
+    gMonIcon_Natu,
+    gMonIcon_Xatu,
+    gMonIcon_Mareep,
+    gMonIcon_Flaaffy,
+    gMonIcon_Ampharos,
+    gMonIcon_Bellossom,
+    gMonIcon_Marill,
+    gMonIcon_Azumarill,
+    gMonIcon_Sudowoodo,
+    gMonIcon_Politoed,
+    gMonIcon_Hoppip,
+    gMonIcon_Skiploom,
+    gMonIcon_Jumpluff,
+    gMonIcon_Aipom,
+    gMonIcon_Sunkern,
+    gMonIcon_Sunflora,
+    gMonIcon_Yanma,
+    gMonIcon_Wooper,
+    gMonIcon_Quagsire,
+    gMonIcon_Espeon,
+    gMonIcon_Umbreon,
+    gMonIcon_Murkrow,
+    gMonIcon_Slowking,
+    gMonIcon_Misdreavus,
+    gMonIcon_UnownA,
+    gMonIcon_Wobbuffet,
+    gMonIcon_Girafarig,
+    gMonIcon_Pineco,
+    gMonIcon_Forretress,
+    gMonIcon_Dunsparce,
+    gMonIcon_Gligar,
+    gMonIcon_Steelix,
+    gMonIcon_Snubbull,
+    gMonIcon_Granbull,
+    gMonIcon_Qwilfish,
+    gMonIcon_Scizor,
+    gMonIcon_Shuckle,
+    gMonIcon_Heracross,
+    gMonIcon_Sneasel,
+    gMonIcon_Teddiursa,
+    gMonIcon_Ursaring,
+    gMonIcon_Slugma,
+    gMonIcon_Magcargo,
+    gMonIcon_Swinub,
+    gMonIcon_Piloswine,
+    gMonIcon_Corsola,
+    gMonIcon_Remoraid,
+    gMonIcon_Octillery,
+    gMonIcon_Delibird,
+    gMonIcon_Mantine,
+    gMonIcon_Skarmory,
+    gMonIcon_Houndour,
+    gMonIcon_Houndoom,
+    gMonIcon_Kingdra,
+    gMonIcon_Phanpy,
+    gMonIcon_Donphan,
+    gMonIcon_Porygon2,
+    gMonIcon_Stantler,
+    gMonIcon_Smeargle,
+    gMonIcon_Tyrogue,
+    gMonIcon_Hitmontop,
+    gMonIcon_Smoochum,
+    gMonIcon_Elekid,
+    gMonIcon_Magby,
+    gMonIcon_Miltank,
+    gMonIcon_Blissey,
+    gMonIcon_Raikou,
+    gMonIcon_Entei,
+    gMonIcon_Suicune,
+    gMonIcon_Larvitar,
+    gMonIcon_Pupitar,
+    gMonIcon_Tyranitar,
+    gMonIcon_Lugia,
+    gMonIcon_HoOh,
+    gMonIcon_Celebi,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_QuestionMark,
+    gMonIcon_Treecko,
+    gMonIcon_Grovyle,
+    gMonIcon_Sceptile,
+    gMonIcon_Torchic,
+    gMonIcon_Combusken,
+    gMonIcon_Blaziken,
+    gMonIcon_Mudkip,
+    gMonIcon_Marshtomp,
+    gMonIcon_Swampert,
+    gMonIcon_Poochyena,
+    gMonIcon_Mightyena,
+    gMonIcon_Zigzagoon,
+    gMonIcon_Linoone,
+    gMonIcon_Wurmple,
+    gMonIcon_Silcoon,
+    gMonIcon_Beautifly,
+    gMonIcon_Cascoon,
+    gMonIcon_Dustox,
+    gMonIcon_Lotad,
+    gMonIcon_Lombre,
+    gMonIcon_Ludicolo,
+    gMonIcon_Seedot,
+    gMonIcon_Nuzleaf,
+    gMonIcon_Shiftry,
+    gMonIcon_Nincada,
+    gMonIcon_Ninjask,
+    gMonIcon_Shedinja,
+    gMonIcon_Taillow,
+    gMonIcon_Swellow,
+    gMonIcon_Shroomish,
+    gMonIcon_Breloom,
+    gMonIcon_Spinda,
+    gMonIcon_Wingull,
+    gMonIcon_Pelipper,
+    gMonIcon_Surskit,
+    gMonIcon_Masquerain,
+    gMonIcon_Wailmer,
+    gMonIcon_Wailord,
+    gMonIcon_Skitty,
+    gMonIcon_Delcatty,
+    gMonIcon_Kecleon,
+    gMonIcon_Baltoy,
+    gMonIcon_Claydol,
+    gMonIcon_Nosepass,
+    gMonIcon_Torkoal,
+    gMonIcon_Sableye,
+    gMonIcon_Barboach,
+    gMonIcon_Whiscash,
+    gMonIcon_Luvdisc,
+    gMonIcon_Corphish,
+    gMonIcon_Crawdaunt,
+    gMonIcon_Feebas,
+    gMonIcon_Milotic,
+    gMonIcon_Carvanha,
+    gMonIcon_Sharpedo,
+    gMonIcon_Trapinch,
+    gMonIcon_Vibrava,
+    gMonIcon_Flygon,
+    gMonIcon_Makuhita,
+    gMonIcon_Hariyama,
+    gMonIcon_Electrike,
+    gMonIcon_Manectric,
+    gMonIcon_Numel,
+    gMonIcon_Camerupt,
+    gMonIcon_Spheal,
+    gMonIcon_Sealeo,
+    gMonIcon_Walrein,
+    gMonIcon_Cacnea,
+    gMonIcon_Cacturne,
+    gMonIcon_Snorunt,
+    gMonIcon_Glalie,
+    gMonIcon_Lunatone,
+    gMonIcon_Solrock,
+    gMonIcon_Azurill,
+    gMonIcon_Spoink,
+    gMonIcon_Grumpig,
+    gMonIcon_Plusle,
+    gMonIcon_Minun,
+    gMonIcon_Mawile,
+    gMonIcon_Meditite,
+    gMonIcon_Medicham,
+    gMonIcon_Swablu,
+    gMonIcon_Altaria,
+    gMonIcon_Wynaut,
+    gMonIcon_Duskull,
+    gMonIcon_Dusclops,
+    gMonIcon_Roselia,
+    gMonIcon_Slakoth,
+    gMonIcon_Vigoroth,
+    gMonIcon_Slaking,
+    gMonIcon_Gulpin,
+    gMonIcon_Swalot,
+    gMonIcon_Tropius,
+    gMonIcon_Whismur,
+    gMonIcon_Loudred,
+    gMonIcon_Exploud,
+    gMonIcon_Clamperl,
+    gMonIcon_Huntail,
+    gMonIcon_Gorebyss,
+    gMonIcon_Absol,
+    gMonIcon_Shuppet,
+    gMonIcon_Banette,
+    gMonIcon_Seviper,
+    gMonIcon_Zangoose,
+    gMonIcon_Relicanth,
+    gMonIcon_Aron,
+    gMonIcon_Lairon,
+    gMonIcon_Aggron,
+    gMonIcon_Castform,
+    gMonIcon_Volbeat,
+    gMonIcon_Illumise,
+    gMonIcon_Lileep,
+    gMonIcon_Cradily,
+    gMonIcon_Anorith,
+    gMonIcon_Armaldo,
+    gMonIcon_Ralts,
+    gMonIcon_Kirlia,
+    gMonIcon_Gardevoir,
+    gMonIcon_Bagon,
+    gMonIcon_Shelgon,
+    gMonIcon_Salamence,
+    gMonIcon_Beldum,
+    gMonIcon_Metang,
+    gMonIcon_Metagross,
+    gMonIcon_Regirock,
+    gMonIcon_Regice,
+    gMonIcon_Registeel,
+    gMonIcon_Kyogre,
+    gMonIcon_Groudon,
+    gMonIcon_Rayquaza,
+    gMonIcon_Latias,
+    gMonIcon_Latios,
+    gMonIcon_Jirachi,
+    gMonIcon_Deoxys,
+    gMonIcon_Chimecho,
+    gMonIcon_Egg,
+    gMonIcon_UnownB,
+    gMonIcon_UnownC,
+    gMonIcon_UnownD,
+    gMonIcon_UnownE,
+    gMonIcon_UnownF,
+    gMonIcon_UnownG,
+    gMonIcon_UnownH,
+    gMonIcon_UnownI,
+    gMonIcon_UnownJ,
+    gMonIcon_UnownK,
+    gMonIcon_UnownL,
+    gMonIcon_UnownM,
+    gMonIcon_UnownN,
+    gMonIcon_UnownO,
+    gMonIcon_UnownP,
+    gMonIcon_UnownQ,
+    gMonIcon_UnownR,
+    gMonIcon_UnownS,
+    gMonIcon_UnownT,
+    gMonIcon_UnownU,
+    gMonIcon_UnownV,
+    gMonIcon_UnownW,
+    gMonIcon_UnownX,
+    gMonIcon_UnownY,
+    gMonIcon_UnownZ,
+    gMonIcon_UnownExclamationMark,
+    gMonIcon_UnownQuestionMark,
+};
+
+const u8 gMonIconPaletteIndices[] =
+{
+    0, // ??????????
+    1, // Bulbasaur
+    1, // Ivysaur
+    1, // Venusaur
+    0, // Charmander
+    0, // Charmeleon
+    0, // Charizard
+    0, // Squirtle
+    2, // Wartortle
+    2, // Blastoise
+    1, // Caterpie
+    1, // Metapod
+    0, // Butterfree
+    1, // Weedle
+    2, // Kakuna
+    2, // Beedrill
+    0, // Pidgey
+    0, // Pidgeotto
+    0, // Pidgeot
+    2, // Rattata
+    1, // Raticate
+    0, // Spearow
+    0, // Fearow
+    2, // Ekans
+    2, // Arbok
+    2, // Pikachu
+    0, // Raichu
+    2, // Sandshrew
+    2, // Sandslash
+    2, // Nidoran♀
+    2, // Nidorina
+    2, // Nidoqueen
+    2, // Nidoran♂
+    2, // Nidorino
+    2, // Nidoking
+    0, // Clefairy
+    0, // Clefable
+    2, // Vulpix
+    1, // Ninetales
+    0, // Jigglypuff
+    0, // Wigglytuff
+    2, // Zubat
+    2, // Golbat
+    1, // Oddish
+    0, // Gloom
+    0, // Vileplume
+    0, // Paras
+    0, // Parasect
+    0, // Venonat
+    2, // Venomoth
+    2, // Diglett
+    2, // Dugtrio
+    1, // Meowth
+    1, // Persian
+    1, // Psyduck
+    2, // Golduck
+    1, // Mankey
+    2, // Primeape
+    0, // Growlithe
+    0, // Arcanine
+    0, // Poliwag
+    0, // Poliwhirl
+    0, // Poliwrath
+    2, // Abra
+    2, // Kadabra
+    2, // Alakazam
+    0, // Machop
+    2, // Machoke
+    0, // Machamp
+    1, // Bellsprout
+    1, // Weepinbell
+    1, // Victreebel
+    2, // Tentacool
+    2, // Tentacruel
+    1, // Geodude
+    1, // Graveler
+    1, // Golem
+    0, // Ponyta
+    0, // Rapidash
+    0, // Slowpoke
+    0, // Slowbro
+    0, // Magnemite
+    0, // Magneton
+    1, // Farfetch'd
+    2, // Doduo
+    2, // Dodrio
+    2, // Seel
+    2, // Dewgong
+    2, // Grimer
+    2, // Muk
+    2, // Shellder
+    2, // Cloyster
+    2, // Gastly
+    2, // Haunter
+    2, // Gengar
+    2, // Onix
+    2, // Drowzee
+    1, // Hypno
+    2, // Krabby
+    2, // Kingler
+    0, // Voltorb
+    0, // Electrode
+    0, // Exeggcute
+    1, // Exeggutor
+    1, // Cubone
+    1, // Marowak
+    2, // Hitmonlee
+    2, // Hitmonchan
+    1, // Lickitung
+    2, // Koffing
+    2, // Weezing
+    1, // Rhyhorn
+    1, // Rhydon
+    0, // Chansey
+    0, // Tangela
+    1, // Kangaskhan
+    0, // Horsea
+    0, // Seadra
+    0, // Goldeen
+    0, // Seaking
+    2, // Staryu
+    2, // Starmie
+    0, // Mr. mime
+    1, // Scyther
+    2, // Jynx
+    1, // Electabuzz
+    0, // Magmar
+    2, // Pinsir
+    2, // Tauros
+    0, // Magikarp
+    0, // Gyarados
+    2, // Lapras
+    2, // Ditto
+    2, // Eevee
+    0, // Vaporeon
+    0, // Jolteon
+    0, // Flareon
+    0, // Porygon
+    0, // Omanyte
+    0, // Omastar
+    2, // Kabuto
+    2, // Kabutops
+    0, // Aerodactyl
+    1, // Snorlax
+    0, // Articuno
+    0, // Zapdos
+    0, // Moltres
+    0, // Dratini
+    0, // Dragonair
+    2, // Dragonite
+    2, // Mewtwo
+    0, // Mew
+    1, // Chikorita
+    1, // Bayleef
+    1, // Meganium
+    1, // Cyndaquil
+    1, // Quilava
+    1, // Typhlosion
+    2, // Totodile
+    2, // Croconaw
+    2, // Feraligatr
+    2, // Sentret
+    2, // Furret
+    2, // Hoothoot
+    2, // Noctowl
+    0, // Ledyba
+    0, // Ledian
+    1, // Spinarak
+    0, // Ariados
+    2, // Crobat
+    2, // Chinchou
+    0, // Lanturn
+    0, // Pichu
+    0, // Cleffa
+    1, // Igglybuff
+    2, // Togepi
+    2, // Togetic
+    0, // Natu
+    0, // Xatu
+    2, // Mareep
+    0, // Flaaffy
+    0, // Ampharos
+    1, // Bellossom
+    2, // Marill
+    2, // Azumarill
+    1, // Sudowoodo
+    1, // Politoed
+    1, // Hoppip
+    1, // Skiploom
+    2, // Jumpluff
+    2, // Aipom
+    1, // Sunkern
+    1, // Sunflora
+    1, // Yanma
+    0, // Wooper
+    0, // Quagsire
+    2, // Espeon
+    2, // Umbreon
+    2, // Murkrow
+    0, // Slowking
+    0, // Misdreavus
+    0, // Unown A
+    0, // Wobbuffet
+    1, // Girafarig
+    0, // Pineco
+    2, // Forretress
+    2, // Dunsparce
+    2, // Gligar
+    0, // Steelix
+    0, // Snubbull
+    2, // Granbull
+    0, // Qwilfish
+    0, // Scizor
+    1, // Shuckle
+    2, // Heracross
+    0, // Sneasel
+    0, // Teddiursa
+    2, // Ursaring
+    0, // Slugma
+    0, // Magcargo
+    2, // Swinub
+    2, // Piloswine
+    0, // Corsola
+    0, // Remoraid
+    0, // Octillery
+    0, // Delibird
+    2, // Mantine
+    0, // Skarmory
+    0, // Houndour
+    0, // Houndoom
+    0, // Kingdra
+    0, // Phanpy
+    0, // Donphan
+    0, // Porygon2
+    2, // Stantler
+    1, // Smeargle
+    2, // Tyrogue
+    2, // Hitmontop
+    1, // Smoochum
+    1, // Elekid
+    1, // Magby
+    1, // Miltank
+    1, // Blissey
+    0, // Raikou
+    2, // Entei
+    0, // Suicune
+    1, // Larvitar
+    0, // Pupitar
+    1, // Tyranitar
+    0, // Lugia
+    1, // Ho-Oh
+    1, // Celebi
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    0, // ?
+    1, // Treecko
+    0, // Grovyle
+    1, // Sceptile
+    0, // Torchic
+    0, // Combusken
+    0, // Blaziken
+    0, // Mudkip
+    0, // Marshtomp
+    0, // Swampert
+    2, // Poochyena
+    2, // Mightyena
+    2, // Zigzagoon
+    2, // Linoone
+    0, // Wurmple
+    2, // Silcoon
+    0, // Beautifly
+    2, // Cascoon
+    1, // Dustox
+    1, // Lotad
+    1, // Lombre
+    1, // Ludicolo
+    1, // Seedot
+    1, // Nuzleaf
+    0, // Shiftry
+    1, // Nincada
+    1, // Ninjask
+    1, // Shedinja
+    2, // Taillow
+    2, // Swellow
+    1, // Shroomish
+    1, // Breloom
+    1, // Spinda
+    0, // Wingull
+    0, // Pelipper
+    2, // Surskit
+    0, // Masquerain
+    2, // Wailmer
+    0, // Wailord
+    0, // Skitty
+    2, // Delcatty
+    1, // Kecleon
+    1, // Baltoy
+    0, // Claydol
+    0, // Nosepass
+    1, // Torkoal
+    2, // Sableye
+    0, // Barboach
+    0, // Whiscash
+    0, // Luvdisc
+    0, // Corphish
+    0, // Crawdaunt
+    2, // Feebas
+    0, // Milotic
+    0, // Carvanha
+    0, // Sharpedo
+    1, // Trapinch
+    1, // Vibrava
+    1, // Flygon
+    2, // Makuhita
+    1, // Hariyama
+    1, // Electrike
+    0, // Manectric
+    1, // Numel
+    0, // Camerupt
+    2, // Spheal
+    2, // Sealeo
+    0, // Walrein
+    1, // Cacnea
+    1, // Cacturne
+    2, // Snorunt
+    0, // Glalie
+    1, // Lunatone
+    0, // Solrock
+    2, // Azurill
+    0, // Spoink
+    2, // Grumpig
+    0, // Plusle
+    0, // Minun
+    2, // Mawile
+    0, // Meditite
+    0, // Medicham
+    0, // Swablu
+    0, // Altaria
+    0, // Wynaut
+    0, // Duskull
+    0, // Dusclops
+    0, // Roselia
+    2, // Slakoth
+    2, // Vigoroth
+    1, // Slaking
+    1, // Gulpin
+    2, // Swalot
+    1, // Tropius
+    0, // Whismur
+    2, // Loudred
+    2, // Exploud
+    0, // Clamperl
+    0, // Huntail
+    0, // Gorebyss
+    0, // Absol
+    0, // Shuppet
+    0, // Banette
+    2, // Seviper
+    0, // Zangoose
+    1, // Relicanth
+    2, // Aron
+    2, // Lairon
+    2, // Aggron
+    0, // Castform
+    0, // Volbeat
+    2, // Illumise
+    2, // Lileep
+    0, // Cradily
+    0, // Anorith
+    0, // Armaldo
+    1, // Ralts
+    1, // Kirlia
+    1, // Gardevoir
+    2, // Bagon
+    2, // Shelgon
+    0, // Salamence
+    0, // Beldum
+    0, // Metang
+    0, // Metagross
+    2, // Regirock
+    2, // Regice
+    2, // Registeel
+    2, // Kyogre
+    0, // Groudon
+    1, // Rayquaza
+    0, // Latias
+    2, // Latios
+    0, // Jirachi
+    0, // Deoxys
+    0, // Chimecho
+    1, // Egg
+    0, // Unown B
+    0, // Unown C
+    0, // Unown D
+    0, // Unown E
+    0, // Unown F
+    0, // Unown G
+    0, // Unown H
+    0, // Unown I
+    0, // Unown J
+    0, // Unown K
+    0, // Unown L
+    0, // Unown M
+    0, // Unown N
+    0, // Unown O
+    0, // Unown P
+    0, // Unown Q
+    0, // Unown R
+    0, // Unown S
+    0, // Unown T
+    0, // Unown U
+    0, // Unown V
+    0, // Unown W
+    0, // Unown X
+    0, // Unown Y
+    0, // Unown Z
+    0, // Unown Exclamation Mark
+    0, // Unown Question Mark
+};
+
+const struct SpritePalette gMonIconPaletteTable[] =
+{
+    { gMonIconPalettes[0], POKE_ICON_BASE_PAL_TAG + 0 },
+    { gMonIconPalettes[1], POKE_ICON_BASE_PAL_TAG + 1 },
+    { gMonIconPalettes[2], POKE_ICON_BASE_PAL_TAG + 2 },
+
+// There are only 3 actual palettes. The following are unused
+// and don't point to valid data.
+    { gMonIconPalettes[3], POKE_ICON_BASE_PAL_TAG + 3 },
+    { gMonIconPalettes[4], POKE_ICON_BASE_PAL_TAG + 4 },
+    { gMonIconPalettes[5], POKE_ICON_BASE_PAL_TAG + 5 },
+};
+
+const struct OamData sMonIconOamData =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 2,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+// fastest to slowest
+
+static const union AnimCmd sAnim_0[] =
+{
+    ANIMCMD_FRAME(0, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sAnim_1[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sAnim_2[] =
+{
+    ANIMCMD_FRAME(0, 14),
+    ANIMCMD_FRAME(1, 14),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sAnim_3[] =
+{
+    ANIMCMD_FRAME(0, 22),
+    ANIMCMD_FRAME(1, 22),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sAnim_4[] =
+{
+    ANIMCMD_FRAME(0, 29),
+    ANIMCMD_FRAME(0, 29), // frame 0 is repeated
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const sMonIconAnims[] =
+{
+    sAnim_0,
+    sAnim_1,
+    sAnim_2,
+    sAnim_3,
+    sAnim_4,
+};
+
+static const union AffineAnimCmd sAffineAnim_0[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, 0, 10),
+    AFFINEANIMCMD_END,
+};
+
+static const union AffineAnimCmd sAffineAnim_1[] =
+{
+    AFFINEANIMCMD_FRAME(-2, -2, 0, 122),
+    AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd *const sMonIconAffineAnims[] =
+{
+    sAffineAnim_0,
+    sAffineAnim_1,
+};
+
+const u16 sSpriteImageSizes[3][4] =
+{
+    // square
+    {
+         0x20, // 1×1
+         0x80, // 2×2
+        0x200, // 4×4
+        0x800, // 8×8
+    },
+
+    // horizontal rectangle
+    {
+         0x40, // 2×1
+         0x80, // 4×1
+        0x100, // 4×2
+        0x400, // 8×4
+    },
+
+    // vertical rectangle
+    {
+         0x40, // 1×2
+         0x80, // 1×4
+        0x100, // 2×4
+        0x400, // 4×8
+    },
+};
-- 
cgit v1.2.3


From 3ca5af4d5ddb91987f598a0d44e57911ef5445ea Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 22 Dec 2017 20:10:51 +0100
Subject: do some pointer storage system hunting

---
 src/pokemon_storage_system.c | 67 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

(limited to 'src')

diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index bdf4427c7..bb196dd27 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -5,9 +5,76 @@
 #include "event_data.h"
 #include "string_util.h"
 #include "text.h"
+#include "strings.h"
+#include "window.h"
 
 IWRAM_DATA u8 gUnknown_03000F78[0x188];
 
+struct OptionAndDescription
+{
+    const u8 *optionTxt;
+    const u8 *descriptionTxt;
+};
+
+// const rom data
+const struct OptionAndDescription gUnknown_085716C0[] =
+{
+    {gText_WithdrawPokemon, gText_WithdrawMonDescription},
+    {gText_DepositPokemon, gText_DepositMonDescription},
+    {gText_MovePokemon, gText_MoveMonDescription},
+    {gText_MoveItems, gText_MoveItemsDescription},
+    {gText_SeeYa, gText_SeeYaDescription}
+};
+
+const struct WindowTemplate gUnknown_085716E8 = {0, 1, 1, 0x11, 0xA, 0xF, 1};
+
+static const union AnimCmd sSpriteAnim_85716F0[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_85716F8[] =
+{
+    ANIMCMD_FRAME(4, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8571700[] =
+{
+    ANIMCMD_FRAME(6, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_8571708[] =
+{
+    ANIMCMD_FRAME(10, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const sSpriteAnimTable_8571710[] =
+{
+    sSpriteAnim_85716F0,
+    sSpriteAnim_85716F8,
+    sSpriteAnim_8571700,
+    sSpriteAnim_8571708
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_8571720[] =
+{
+    AFFINEANIMCMD_FRAME(0xE0, 0xE0, 0, 0),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_8571730[] =
+{
+    sSpriteAffineAnim_8571720
+};
+
+const struct TextColor gUnknown_08571734[] = {4, 0xF, 0xE};
+const u8 gUnknown_08571737[] = _("/30");
+
+// code
 u8 CountMonsInBox(u8 boxId)
 {
     u16 i, count;
-- 
cgit v1.2.3


From e7111984a98e4a0944a8eb878a7b88b13470158d Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 23 Dec 2017 00:22:07 +0100
Subject: start rayquaza dumping

---
 src/rayquaza_scene.c | 802 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 802 insertions(+)
 create mode 100644 src/rayquaza_scene.c

(limited to 'src')

diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
new file mode 100644
index 000000000..67693eeca
--- /dev/null
+++ b/src/rayquaza_scene.c
@@ -0,0 +1,802 @@
+#include "global.h"
+#include "sprite.h"
+#include "task.h"
+#include "graphics.h"
+#include "bg.h"
+
+struct UnkRayquazaStruct
+{
+    u32 field_0;
+    u32 field_4;
+    u32 field_8;
+};
+
+// this file's functions
+void sub_81D7134(u8 taskId);
+void sub_81D7F4C(u8 taskId);
+void sub_81D84EC(u8 taskId);
+void sub_81D8980(u8 taskId);
+void sub_81D8DB4(u8 taskId);
+void sub_81D6800(u8 taskId);
+
+void sub_81D8260(struct Sprite *sprite);
+
+// const rom data
+const TaskFunc gUnknown_0862A6A0[] =
+{
+    sub_81D7134,
+    sub_81D7134,
+    sub_81D7F4C,
+    sub_81D84EC,
+    sub_81D8980,
+    sub_81D8DB4,
+    sub_81D6800
+};
+
+static const struct OamData sOamData_862A6BC =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_862A6C4 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 2,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_862A6CC =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_862A6D4 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 2,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_862A6DC =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_862A6E4 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 2,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 2,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_862A6EC =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct OamData sOamData_862A6F4 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const union AnimCmd sSpriteAnim_862A6FC[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_FRAME(64, 30),
+    ANIMCMD_FRAME(128, 30),
+    ANIMCMD_FRAME(64, 30),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sSpriteAnim_862A710[] =
+{
+    ANIMCMD_FRAME(192, 30),
+    ANIMCMD_FRAME(256, 30),
+    ANIMCMD_FRAME(320, 30),
+    ANIMCMD_FRAME(256, 30),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862A724[] =
+{
+    sSpriteAnim_862A6FC,
+    sSpriteAnim_862A710
+};
+
+const struct SpriteTemplate gUnknown_0862A72C =
+{
+    .tileTag = 30505,
+    .paletteTag = 30505,
+    .oam = &sOamData_862A6BC,
+    .anims = sSpriteAnimTable_862A724,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const union AnimCmd sSpriteAnim_862A744[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862A74C[] =
+{
+    sSpriteAnim_862A744
+};
+
+const struct SpriteTemplate gUnknown_0862A750 =
+{
+    .tileTag = 30506,
+    .paletteTag = 30505,
+    .oam = &sOamData_862A6C4,
+    .anims = sSpriteAnimTable_862A74C,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const union AnimCmd sSpriteAnim_862A768[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862A770[] =
+{
+    sSpriteAnim_862A768
+};
+
+const struct SpriteTemplate gUnknown_0862A774 =
+{
+    .tileTag = 30507,
+    .paletteTag = 30505,
+    .oam = &sOamData_862A6CC,
+    .anims = sSpriteAnimTable_862A770,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const union AnimCmd sSpriteAnim_862A78C[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A794[] =
+{
+    ANIMCMD_FRAME(8, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A79C[] =
+{
+    ANIMCMD_FRAME(16, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A7A4[] =
+{
+    ANIMCMD_FRAME(24, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A7AC[] =
+{
+    ANIMCMD_FRAME(32, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A7B4[] =
+{
+    ANIMCMD_FRAME(40, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A7BC[] =
+{
+    ANIMCMD_FRAME(48, 36),
+    ANIMCMD_FRAME(64, 36),
+    ANIMCMD_FRAME(80, 36),
+    ANIMCMD_FRAME(64, 36),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sSpriteAnim_862A7D0[] =
+{
+    ANIMCMD_FRAME(56, 36),
+    ANIMCMD_FRAME(72, 36),
+    ANIMCMD_FRAME(88, 36),
+    ANIMCMD_FRAME(72, 36),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sSpriteAnim_862A7E4[] =
+{
+    ANIMCMD_FRAME(96, 36),
+    ANIMCMD_FRAME(104, 36),
+    ANIMCMD_FRAME(112, 36),
+    ANIMCMD_FRAME(104, 36),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862A7F8[] =
+{
+    sSpriteAnim_862A78C,
+    sSpriteAnim_862A794,
+    sSpriteAnim_862A79C,
+    sSpriteAnim_862A7A4,
+    sSpriteAnim_862A7AC,
+    sSpriteAnim_862A7B4,
+    sSpriteAnim_862A7BC,
+    sSpriteAnim_862A7D0,
+    sSpriteAnim_862A7E4
+};
+
+const struct SpriteTemplate gUnknown_0862A81C =
+{
+    .tileTag = 30508,
+    .paletteTag = 30508,
+    .oam = &sOamData_862A6D4,
+    .anims = sSpriteAnimTable_862A7F8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const union AnimCmd sSpriteAnim_862A834[] =
+{
+    ANIMCMD_FRAME(0, 36),
+    ANIMCMD_FRAME(2, 36),
+    ANIMCMD_FRAME(4, 36),
+    ANIMCMD_FRAME(2, 36),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862A848[] =
+{
+    sSpriteAnim_862A834
+};
+
+const struct SpriteTemplate gUnknown_0862A84C =
+{
+    .tileTag = 30509,
+    .paletteTag = 30508,
+    .oam = &sOamData_862A6DC,
+    .anims = sSpriteAnimTable_862A848,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct SpriteTemplate gUnknown_0862A864 =
+{
+    .tileTag = 30510,
+    .paletteTag = 30508,
+    .oam = &sOamData_862A6C4,
+    .anims = sSpriteAnimTable_862A74C,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct UnkRayquazaStruct gUnknown_0862A87C = {0x4000014, 0xA2600001, 1};
+
+const struct BgTemplate gUnknown_0862A888[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 29,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+};
+
+static const union AnimCmd sSpriteAnim_862A894[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(64, 20),
+    ANIMCMD_FRAME(128, 20),
+    ANIMCMD_FRAME(64, 20),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sSpriteAnim_862A8A8[] =
+{
+    ANIMCMD_FRAME(192, 20),
+    ANIMCMD_FRAME(256, 20),
+    ANIMCMD_FRAME(320, 20),
+    ANIMCMD_FRAME(256, 20),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862A8BC[] =
+{
+    sSpriteAnim_862A894,
+    sSpriteAnim_862A8A8
+};
+
+const struct CompressedSpriteSheet gUnknown_0862A8C4 =
+{
+    gUnknown_08DA1E78, 0x3000, 30505
+};
+
+const struct CompressedSpritePalette gUnknown_0862A8CC =
+{
+    gUnknown_08DA3370, 30505
+};
+
+const struct SpriteTemplate gUnknown_0862A8D4 =
+{
+    .tileTag = 30505,
+    .paletteTag = 30505,
+    .oam = &sOamData_862A6BC,
+    .anims = sSpriteAnimTable_862A8BC,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const union AnimCmd sSpriteAnim_862A8EC[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862A8F4[] =
+{
+    sSpriteAnim_862A8EC
+};
+
+const struct CompressedSpriteSheet gUnknown_0862A8F8 =
+{
+    gUnknown_08DA2A5C, 0x200, 30506
+};
+
+const struct SpriteTemplate gUnknown_0862A900 =
+{
+    .tileTag = 30506,
+    .paletteTag = 30505,
+    .oam = &sOamData_862A6C4,
+    .anims = sSpriteAnimTable_862A8F4,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const union AnimCmd sSpriteAnim_862A918[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862A920[] =
+{
+    sSpriteAnim_862A918
+};
+
+const struct CompressedSpriteSheet gUnknown_0862A924 =
+{
+    gUnknown_08DA2B28, 0x400, 30507
+};
+
+const struct SpriteTemplate gUnknown_0862A92C =
+{
+    .tileTag = 30507,
+    .paletteTag = 30505,
+    .oam = &sOamData_862A6CC,
+    .anims = sSpriteAnimTable_862A920,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const union AnimCmd sSpriteAnim_862A944[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A94C[] =
+{
+    ANIMCMD_FRAME(8, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A954[] =
+{
+    ANIMCMD_FRAME(16, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A95C[] =
+{
+    ANIMCMD_FRAME(24, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A964[] =
+{
+    ANIMCMD_FRAME(32, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A96C[] =
+{
+    ANIMCMD_FRAME(40, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862A974[] =
+{
+    ANIMCMD_FRAME(48, 24),
+    ANIMCMD_FRAME(64, 24),
+    ANIMCMD_FRAME(80, 24),
+    ANIMCMD_FRAME(64, 24),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sSpriteAnim_862A988[] =
+{
+    ANIMCMD_FRAME(56, 24),
+    ANIMCMD_FRAME(72, 24),
+    ANIMCMD_FRAME(88, 24),
+    ANIMCMD_FRAME(72, 24),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sSpriteAnim_862A99C[] =
+{
+    ANIMCMD_FRAME(96, 24),
+    ANIMCMD_FRAME(104, 24),
+    ANIMCMD_FRAME(112, 24),
+    ANIMCMD_FRAME(104, 24),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862A9B0[] =
+{
+    sSpriteAnim_862A944,
+    sSpriteAnim_862A94C,
+    sSpriteAnim_862A954,
+    sSpriteAnim_862A95C,
+    sSpriteAnim_862A964,
+    sSpriteAnim_862A96C,
+    sSpriteAnim_862A974,
+    sSpriteAnim_862A988,
+    sSpriteAnim_862A99C
+};
+
+const struct CompressedSpriteSheet gUnknown_0862A9D4 =
+{
+    gUnknown_08DA2D1C, 0xF00, 30508
+};
+
+const struct CompressedSpritePalette gUnknown_0862A9DC =
+{
+    gUnknown_08DA3398, 30508
+};
+
+const struct SpriteTemplate gUnknown_0862A9E4 =
+{
+    .tileTag = 30508,
+    .paletteTag = 30508,
+    .oam = &sOamData_862A6D4,
+    .anims = sSpriteAnimTable_862A9B0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const union AnimCmd sSpriteAnim_862A9FC[] =
+{
+    ANIMCMD_FRAME(0, 24),
+    ANIMCMD_FRAME(2, 24),
+    ANIMCMD_FRAME(4, 24),
+    ANIMCMD_FRAME(2, 24),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862AA10[] =
+{
+    sSpriteAnim_862A9FC
+};
+
+const struct CompressedSpriteSheet gUnknown_0862AA14 =
+{
+    gUnknown_08DA3250, 0xC0, 30509
+};
+
+const struct SpriteTemplate gUnknown_0862AA1C =
+{
+    .tileTag = 30509,
+    .paletteTag = 30508,
+    .oam = &sOamData_862A6DC,
+    .anims = sSpriteAnimTable_862AA10,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct CompressedSpriteSheet gUnknown_0862AA34 =
+{
+    gUnknown_08DA32A4, 0x200, 30510
+};
+
+const struct SpriteTemplate gUnknown_0862AA3C =
+{
+    .tileTag = 30510,
+    .paletteTag = 30508,
+    .oam = &sOamData_862A6C4,
+    .anims = sSpriteAnimTable_862A8F4,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct BgTemplate gUnknown_0862AA54[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 29,
+        .screenSize = 1,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    }
+};
+
+static const union AnimCmd sSpriteAnim_862AA60[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862AA68[] =
+{
+    sSpriteAnim_862AA60
+};
+
+static const union AffineAnimCmd sSpriteAffineAnim_862AA6C[] =
+{
+    AFFINEANIMCMD_FRAME(-64, -64, 0, 1),
+    AFFINEANIMCMD_FRAME(32, 32, 0, 14),
+    AFFINEANIMCMD_FRAME(256, 256, 0, 0),
+    AFFINEANIMCMD_JUMP(0)
+};
+
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_862AA8C[] =
+{
+    sSpriteAffineAnim_862AA6C
+};
+
+const struct CompressedSpriteSheet gUnknown_0862AA90 =
+{
+    gUnknown_08DA3BC0, 0x100, 30555
+};
+
+const struct CompressedSpritePalette gUnknown_0862AA98 =
+{
+    gUnknown_08DA3C7C, 30555
+};
+
+const struct SpriteTemplate gUnknown_0862AAA0 =
+{
+    .tileTag = 30555,
+    .paletteTag = 30555,
+    .oam = &sOamData_862A6D4,
+    .anims = sSpriteAnimTable_862AA68,
+    .images = NULL,
+    .affineAnims = sSpriteAffineAnimTable_862AA8C,
+    .callback = sub_81D8260,
+};
+
+const s8 gUnknown_0862AAB8[][2] =
+{
+    {-1,    5},
+    {-3,    -4},
+    {5,     -3},
+    {-7,    2},
+    {-9,    -1},
+    {1,     -5},
+    {3,     4},
+    {-5,    3},
+    {7,     -2},
+    {9,     1}
+};
+
+const struct BgTemplate gUnknown_0862AACC[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 29,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 28,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    }
+};
+
+static const union AnimCmd sSpriteAnim_862AADC[] =
+{
+    ANIMCMD_FRAME(0, 32),
+    ANIMCMD_FRAME(64, 32),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862AAE8[] =
+{
+    sSpriteAnim_862AADC
+};
+
+static const union AnimCmd sSpriteAnim_862AAEC[] =
+{
+    ANIMCMD_FRAME(0, 32),
+    ANIMCMD_FRAME(8, 32),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862AAF8[] =
+{
+    sSpriteAnim_862AAEC
+};
+
-- 
cgit v1.2.3


From 3499ff51b50ec90ac87ff61430a89a578c01092d Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 23 Dec 2017 01:45:04 -0500
Subject: second wave of graphics.s dumps (battle_anim part 1)

---
 src/battle_gfx_sfx_util.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 22be086f0..70b4d7d31 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -63,7 +63,7 @@ extern const u8 gUnknown_08C1F46C[];
 extern const u8 gUnknown_08C1F5E8[];
 extern const u8 gUnknown_08C1F76C[];
 extern const u8 gUnknown_08C1F8E8[];
-extern const u8 gUnknown_08C0237C[];
+extern const u8 gBlankGfxCompressed[];
 extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
 
@@ -110,10 +110,10 @@ static const struct CompressedSpriteSheet gUnknown_0832C100 =
 
 static const struct CompressedSpriteSheet gUnknown_0832C108[BATTLE_BANKS_COUNT] =
 {
-    {gUnknown_08C0237C, 0x0100, 0xd704},
-    {gUnknown_08C0237C, 0x0120, 0xd705},
-    {gUnknown_08C0237C, 0x0100, 0xd706},
-    {gUnknown_08C0237C, 0x0120, 0xd707}
+    {gBlankGfxCompressed, 0x0100, 0xd704},
+    {gBlankGfxCompressed, 0x0120, 0xd705},
+    {gBlankGfxCompressed, 0x0100, 0xd706},
+    {gBlankGfxCompressed, 0x0120, 0xd707}
 };
 
 static const struct SpritePalette gUnknown_0832C128[2] =
-- 
cgit v1.2.3


From 4f6ca126b544fd64bc0aaa30275bf6b840b2452f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 23 Dec 2017 13:23:23 +0100
Subject: dump all rayquaza scene data to C

---
 src/rayquaza_scene.c | 362 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 362 insertions(+)

(limited to 'src')

diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 67693eeca..577294f0c 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -20,6 +20,7 @@ void sub_81D8DB4(u8 taskId);
 void sub_81D6800(u8 taskId);
 
 void sub_81D8260(struct Sprite *sprite);
+void sub_81D961C(struct Sprite *sprite);
 
 // const rom data
 const TaskFunc gUnknown_0862A6A0[] =
@@ -800,3 +801,364 @@ static const union AnimCmd *const sSpriteAnimTable_862AAF8[] =
     sSpriteAnim_862AAEC
 };
 
+const struct CompressedSpriteSheet gUnknown_0862AAFC =
+{
+    gUnknown_08DA6440, 0x1000, 30556
+};
+
+const struct CompressedSpriteSheet gUnknown_0862AB04 =
+{
+    gUnknown_08DA68AC, 0x200, 30557
+};
+
+const struct CompressedSpritePalette gUnknown_0862AB0C =
+{
+    gUnknown_08DA4DA8, 30556
+};
+
+const struct SpriteTemplate gUnknown_0862AB14 =
+{
+    .tileTag = 30556,
+    .paletteTag = 30556,
+    .oam = &sOamData_862A6BC,
+    .anims = sSpriteAnimTable_862AAE8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct SpriteTemplate gUnknown_0862AB2C =
+{
+    .tileTag = 30557,
+    .paletteTag = 30556,
+    .oam = &sOamData_862A6E4,
+    .anims = sSpriteAnimTable_862AAF8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct BgTemplate gUnknown_0862AB44[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 29,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 28,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    }
+};
+
+static const union AnimCmd sSpriteAnim_862AB54[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862AB5C[] =
+{
+    ANIMCMD_FRAME(0, 48),
+    ANIMCMD_FRAME(64, 32),
+    ANIMCMD_FRAME(0, 48),
+    ANIMCMD_FRAME(128, 32),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862AB70[] =
+{
+    sSpriteAnim_862AB54,
+    sSpriteAnim_862AB5C
+};
+
+static const union AnimCmd sSpriteAnim_862AB78[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862AB80[] =
+{
+    sSpriteAnim_862AB78,
+};
+
+static const union AnimCmd sSpriteAnim_862AB84[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862AB8C[] =
+{
+    ANIMCMD_FRAME(16, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862AB94[] =
+{
+    ANIMCMD_FRAME(32, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862AB9C[] =
+{
+    sSpriteAnim_862AB84,
+    sSpriteAnim_862AB8C,
+    sSpriteAnim_862AB94
+};
+
+static const union AnimCmd sSpriteAnim_862ABA8[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862ABB0[] =
+{
+    ANIMCMD_FRAME(64, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862ABB8[] =
+{
+    ANIMCMD_FRAME(128, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862ABC0[] =
+{
+    ANIMCMD_FRAME(192, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862ABC8[] =
+{
+    sSpriteAnim_862ABA8,
+    sSpriteAnim_862ABB0,
+    sSpriteAnim_862ABB8,
+    sSpriteAnim_862ABC0
+};
+
+static const union AnimCmd sSpriteAnim_862ABD8[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862ABE0[] =
+{
+    ANIMCMD_FRAME(16, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862ABE8[] =
+{
+    ANIMCMD_FRAME(32, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862ABF0[] =
+{
+    ANIMCMD_FRAME(48, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862ABF8[] =
+{
+    sSpriteAnim_862ABD8,
+    sSpriteAnim_862ABE0,
+    sSpriteAnim_862ABE8,
+    sSpriteAnim_862ABF0
+};
+
+static const union AnimCmd sSpriteAnim_862AC08[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(8, 8),
+    ANIMCMD_FRAME(12, 8),
+    ANIMCMD_FRAME(16, 8),
+    ANIMCMD_FRAME(20, 8),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862AC24[] =
+{
+    sSpriteAnim_862AC08
+};
+
+const struct CompressedSpriteSheet gUnknown_0862AC28 =
+{
+    gUnknown_08DA8ED8, 0x1800, 30565
+};
+
+const struct CompressedSpriteSheet gUnknown_0862AC30 =
+{
+    gUnknown_08DA9670, 0x80, 30566
+};
+
+const struct CompressedSpriteSheet gUnknown_0862AC38 =
+{
+    gUnknown_08DA96B4, 0x600, 30568
+};
+
+const struct CompressedSpriteSheet gUnknown_0862AC40 =
+{
+    gUnknown_08DA98FC, 0x2000, 30569
+};
+
+const struct CompressedSpriteSheet gUnknown_0862AC48 =
+{
+    gUnknown_08DAA5A4, 0x800, 30570
+};
+
+const struct CompressedSpriteSheet gUnknown_0862AC50 =
+{
+    gUnknown_08DAA794, 0x300, 30571
+};
+
+const struct CompressedSpritePalette gUnknown_0862AC58 =
+{
+    gUnknown_08DAA82C, 30565
+};
+
+const struct CompressedSpritePalette gUnknown_0862AC60 =
+{
+    gUnknown_08DAA854, 30568
+};
+
+const struct CompressedSpritePalette gUnknown_0862AC68 =
+{
+    gUnknown_08DAA87C, 30569
+};
+
+const struct CompressedSpritePalette gUnknown_0862AC70 =
+{
+    gUnknown_08DAA8A4, 30571
+};
+
+const struct SpriteTemplate gUnknown_0862AC78 =
+{
+    .tileTag = 30565,
+    .paletteTag = 30565,
+    .oam = &sOamData_862A6BC,
+    .anims = sSpriteAnimTable_862AB70,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct SpriteTemplate gUnknown_0862AC90 =
+{
+    .tileTag = 30566,
+    .paletteTag = 30565,
+    .oam = &sOamData_862A6EC,
+    .anims = sSpriteAnimTable_862AB80,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct SpriteTemplate gUnknown_0862ACA8 =
+{
+    .tileTag = 30568,
+    .paletteTag = 30568,
+    .oam = &sOamData_862A6C4,
+    .anims = sSpriteAnimTable_862AB9C,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct SpriteTemplate gUnknown_0862ACC0 =
+{
+    .tileTag = 30569,
+    .paletteTag = 30569,
+    .oam = &sOamData_862A6BC,
+    .anims = sSpriteAnimTable_862ABC8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_81D961C,
+};
+
+const struct SpriteTemplate gUnknown_0862ACD8 =
+{
+    .tileTag = 30570,
+    .paletteTag = 30569,
+    .oam = &sOamData_862A6C4,
+    .anims = sSpriteAnimTable_862ABF8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct SpriteTemplate gUnknown_0862ACF0 =
+{
+    .tileTag = 30571,
+    .paletteTag = 30571,
+    .oam = &sOamData_862A6F4,
+    .anims = sSpriteAnimTable_862AC24,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+const struct BgTemplate gUnknown_0862AD08[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 29,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    }
+};
+
-- 
cgit v1.2.3


From e647cb2308af4f15ac769e8692e41c72bd715256 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 23 Dec 2017 19:23:55 +0100
Subject: dump start menu and a bit of textwindow and trainercard

---
 src/start_menu.c | 102 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 82 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/start_menu.c b/src/start_menu.c
index f45fd8626..a820cd992 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -6,6 +6,8 @@
 #include "window.h"
 #include "string_util.h"
 #include "text.h"
+#include "strings.h"
+#include "bg.h"
 
 // Menu actions
 enum
@@ -25,15 +27,6 @@ enum
     MENU_ACTION_PYRAMID_BAG
 };
 
-static void BuildStartMenuActions_LinkMode(void);
-static void BuildStartMenuActions_UnionRoom(void);
-static void BuildStartMenuActions_SafariZone(void);
-static void BuildStartMenuActions_BattlePike(void);
-static void BuildStartMenuActions_BattlePyramid(void);
-static void BuildStartMenuActions_MultiBattleRoom(void);
-static void BuildStartMenuActions_Normal(void);
-u8 StartMenu_PlayerName(void);
-
 extern bool32 is_c1_link_related_active(void);
 extern bool32 InUnionRoom(void);
 extern bool8 InBattlePike(void);
@@ -42,12 +35,91 @@ extern bool8 InMultiBattleRoom(void);
 extern void sub_81973FC(u8 windowId, u8 a1);
 extern void sub_8198070(u8 windowId, u8 a1);
 
+// this file's functions
+static void BuildStartMenuActions_LinkMode(void);
+static void BuildStartMenuActions_UnionRoom(void);
+static void BuildStartMenuActions_SafariZone(void);
+static void BuildStartMenuActions_BattlePike(void);
+static void BuildStartMenuActions_BattlePyramid(void);
+static void BuildStartMenuActions_MultiBattleRoom(void);
+static void BuildStartMenuActions_Normal(void);
+bool8 StartMenu_Pokedex(void);
+bool8 StartMenu_Pokemon(void);
+bool8 StartMenu_Bag(void);
+bool8 StartMenu_PokeNav(void);
+bool8 StartMenu_PlayerName(void);
+bool8 StartMenu_Save(void);
+bool8 StartMenu_Option(void);
+bool8 StartMenu_Exit(void);
+bool8 StartMenu_SafariZoneRetire(void);
+bool8 StartMenu_LinkModePlayerName(void);
+bool8 StartMenu_BattlePyramidRetire(void);
+bool8 StartMenu_BattlePyramidBag(void);
+
+// EWRAM vars
 EWRAM_DATA u8 sSafariBallsWindowId = 0;
 EWRAM_DATA u8 sBattlePyramidFloorWindowId = 0;
 EWRAM_DATA u8 sStartMenuCursorPos = 0;
 EWRAM_DATA u8 sNumStartMenuActions = 0;
 EWRAM_DATA u8 sCurrentStartMenuActions[9] = {0};
 
+// const rom data
+static const struct WindowTemplate gSafariBallsWindowTemplate = {0, 1, 1, 9, 4, 0xF, 8};
+
+static const u8* const sPyramindFloorNames[] =
+{
+    gText_Floor1,
+    gText_Floor2,
+    gText_Floor3,
+    gText_Floor4,
+    gText_Floor5,
+    gText_Floor6,
+    gText_Floor7,
+    gText_Peak
+};
+
+static const struct WindowTemplate gPyramidFloorWindowTemplate_2 = {0, 1, 1, 0xA, 4, 0xF, 8};
+static const struct WindowTemplate gPyramidFloorWindowTemplate_1 = {0, 1, 1, 0xC, 4, 0xF, 8};
+
+const struct MenuAction sStartMenuItems[] =
+{
+    {gText_MenuPokedex, {.u8_void = StartMenu_Pokedex}},
+    {gText_MenuPokemon, {.u8_void = StartMenu_Pokemon}},
+    {gText_MenuBag, {.u8_void = StartMenu_Bag}},
+    {gText_MenuPokenav, {.u8_void = StartMenu_PokeNav}},
+    {gText_MenuPlayer, {.u8_void = StartMenu_PlayerName}},
+    {gText_MenuSave, {.u8_void = StartMenu_Save}},
+    {gText_MenuOption, {.u8_void = StartMenu_Option}},
+    {gText_MenuExit, {.u8_void = StartMenu_Exit}},
+    {gText_MenuRetire, {.u8_void = StartMenu_SafariZoneRetire}},
+    {gText_MenuPlayer, {.u8_void = StartMenu_LinkModePlayerName}},
+    {gText_MenuRest, {.u8_void = StartMenu_Save}},
+    {gText_MenuRetire, {.u8_void = StartMenu_BattlePyramidRetire}},
+    {gText_MenuBag, {.u8_void = StartMenu_BattlePyramidBag}}
+};
+
+const struct BgTemplate gUnknown_085105A8[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    }
+};
+
+const struct WindowTemplate gUnknown_085105AC[] =
+{
+    {0, 2, 0xF, 0x1A, 4, 0xF, 0x194},
+    DUMMY_WIN_TEMPLATE
+};
+
+const struct WindowTemplate gUnknown_085105BC = {0, 1, 1, 0xE, 0xA, 0xF, 8};
+
+// code
 void BuildStartMenuActions(void)
 {
     sNumStartMenuActions = 0;
@@ -148,11 +220,6 @@ static void BuildStartMenuActions_MultiBattleRoom(void)
     AddStartMenuAction(MENU_ACTION_EXIT);
 }
 
-extern const struct WindowTemplate gSafariBallsWindowTemplate;
-extern const struct WindowTemplate gPyramidFloorWindowTemplate_1;
-extern const struct WindowTemplate gPyramidFloorWindowTemplate_2;
-extern const u8 gText_SafariBallStock[];
-
 void DisplaySafariBallsWindow(void)
 {
     sSafariBallsWindowId = AddWindow(&gSafariBallsWindowTemplate);
@@ -164,9 +231,6 @@ void DisplaySafariBallsWindow(void)
     CopyWindowToVram(sSafariBallsWindowId, 2);
 }
 
-extern const u8* const gUnknown_08510510[];
-extern const u8 gText_BattlePyramidFloor[];
-
 void DisplayPyramidFloorWindow(void)
 {
     // TODO: fix location
@@ -176,7 +240,7 @@ void DisplayPyramidFloorWindow(void)
         sBattlePyramidFloorWindowId = AddWindow(&gPyramidFloorWindowTemplate_2);
     PutWindowTilemap(sBattlePyramidFloorWindowId);
     sub_81973FC(sBattlePyramidFloorWindowId, 0);
-    StringCopy(gStringVar1, gUnknown_08510510[gSaveBlock2Ptr->field_CAA[4]]);
+    StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->field_CAA[4]]);
     StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor);
     PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
     CopyWindowToVram(sBattlePyramidFloorWindowId, 2);
@@ -197,8 +261,6 @@ void RemoveExtraStartMenuWindows(void)
     }
 }
 
-extern const struct MenuAction sStartMenuItems[];
-
 /*
 // Prints n menu items starting at *index
 static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n)
-- 
cgit v1.2.3


From 9ee677d5674f49a116e48d32f74cd5a84dfa26ed Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 24 Dec 2017 19:08:55 +0100
Subject: commit

---
 src/battle_ai_script_commands.c | 206 ++++++++++++++++++++--------------------
 1 file changed, 103 insertions(+), 103 deletions(-)

(limited to 'src')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 44be0a4d9..7a30de75b 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -723,14 +723,14 @@ static void BattleAICmd_score(void)
 
 static void BattleAICmd_if_hp_less_than(void)
 {
-    u16 index;
+    u16 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) < gAIScriptPtr[2])
+    if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) < gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
     else
         gAIScriptPtr += 7;
@@ -738,14 +738,14 @@ static void BattleAICmd_if_hp_less_than(void)
 
 static void BattleAICmd_if_hp_more_than(void)
 {
-    u16 index;
+    u16 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) > gAIScriptPtr[2])
+    if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) > gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
     else
         gAIScriptPtr += 7;
@@ -753,14 +753,14 @@ static void BattleAICmd_if_hp_more_than(void)
 
 static void BattleAICmd_if_hp_equal(void)
 {
-    u16 index;
+    u16 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) == gAIScriptPtr[2])
+    if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) == gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
     else
         gAIScriptPtr += 7;
@@ -768,14 +768,14 @@ static void BattleAICmd_if_hp_equal(void)
 
 static void BattleAICmd_if_hp_not_equal(void)
 {
-    u16 index;
+    u16 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) != gAIScriptPtr[2])
+    if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) != gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
     else
         gAIScriptPtr += 7;
@@ -783,17 +783,17 @@ static void BattleAICmd_if_hp_not_equal(void)
 
 static void BattleAICmd_if_status(void)
 {
-    u16 index;
-    u32 arg;
+    u16 bank;
+    u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    arg = AIScriptRead32(gAIScriptPtr + 2);
+    status = AIScriptRead32(gAIScriptPtr + 2);
 
-    if ((gBattleMons[index].status1 & arg) != 0)
+    if ((gBattleMons[bank].status1 & status) != 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -801,17 +801,17 @@ static void BattleAICmd_if_status(void)
 
 static void BattleAICmd_if_not_status(void)
 {
-    u16 index;
-    u32 arg;
+    u16 bank;
+    u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    arg = AIScriptRead32(gAIScriptPtr + 2);
+    status = AIScriptRead32(gAIScriptPtr + 2);
 
-    if ((gBattleMons[index].status1 & arg) == 0)
+    if ((gBattleMons[bank].status1 & status) == 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -819,17 +819,17 @@ static void BattleAICmd_if_not_status(void)
 
 static void BattleAICmd_if_status2(void)
 {
-    u16 index;
-    u32 arg;
+    u16 bank;
+    u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    arg = AIScriptRead32(gAIScriptPtr + 2);
+    status = AIScriptRead32(gAIScriptPtr + 2);
 
-    if ((gBattleMons[index].status2 & arg) != 0)
+    if ((gBattleMons[bank].status2 & status) != 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -837,17 +837,17 @@ static void BattleAICmd_if_status2(void)
 
 static void BattleAICmd_if_not_status2(void)
 {
-    u16 index;
-    u32 arg;
+    u16 bank;
+    u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    arg = AIScriptRead32(gAIScriptPtr + 2);
+    status = AIScriptRead32(gAIScriptPtr + 2);
 
-    if ((gBattleMons[index].status2 & arg) == 0)
+    if ((gBattleMons[bank].status2 & status) == 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -855,17 +855,17 @@ static void BattleAICmd_if_not_status2(void)
 
 static void BattleAICmd_if_status3(void)
 {
-    u16 index;
-    u32 arg;
+    u16 bank;
+    u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    arg = AIScriptRead32(gAIScriptPtr + 2);
+    status = AIScriptRead32(gAIScriptPtr + 2);
 
-    if ((gStatuses3[index] & arg) != 0)
+    if ((gStatuses3[bank] & status) != 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -873,17 +873,17 @@ static void BattleAICmd_if_status3(void)
 
 static void BattleAICmd_if_not_status3(void)
 {
-    u16 index;
-    u32 arg;
+    u16 bank;
+    u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    arg = AIScriptRead32(gAIScriptPtr + 2);
+    status = AIScriptRead32(gAIScriptPtr + 2);
 
-    if ((gStatuses3[index] & arg) == 0)
+    if ((gStatuses3[bank] & status) == 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -891,18 +891,18 @@ static void BattleAICmd_if_not_status3(void)
 
 static void BattleAICmd_if_side_affecting(void)
 {
-    u16 index;
-    u32 arg1, arg2;
+    u16 bank;
+    u32 side, status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    arg1 = GetBankIdentity(index) & 1;
-    arg2 = AIScriptRead32(gAIScriptPtr + 2);
+    side = GET_BANK_SIDE(bank);
+    status = AIScriptRead32(gAIScriptPtr + 2);
 
-    if ((gSideAffecting[arg1] & arg2) != 0)
+    if ((gSideAffecting[side] & status) != 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -910,18 +910,18 @@ static void BattleAICmd_if_side_affecting(void)
 
 static void BattleAICmd_if_not_side_affecting(void)
 {
-    u16 index;
-    u32 arg1, arg2;
+    u16 bank;
+    u32 side, status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    arg1 = GetBankIdentity(index) & 1;
-    arg2 = AIScriptRead32(gAIScriptPtr + 2);
+    side = GET_BANK_SIDE(bank);
+    status = AIScriptRead32(gAIScriptPtr + 2);
 
-    if ((gSideAffecting[arg1] & arg2) == 0)
+    if ((gSideAffecting[side] & status) == 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -1146,9 +1146,9 @@ static void BattleAICmd_get_type(void)
     gAIScriptPtr += 2;
 }
 
-static u8 BattleAI_GetWantedBank(u8 index)
+static u8 BattleAI_GetWantedBank(u8 bank)
 {
-    switch (index)
+    switch (bank)
     {
         case AI_USER:
             return sBank_AI;
@@ -1300,7 +1300,7 @@ static void BattleAICmd_nullsub_2B(void)
 
 static void BattleAICmd_count_alive_pokemon(void)
 {
-    u8 index;
+    u8 bank;
     u8 bankOnField1, bankOnField2;
     struct Pokemon *party;
     int i;
@@ -1308,11 +1308,11 @@ static void BattleAICmd_count_alive_pokemon(void)
     AI_THINKING_STRUCT->funcResult = 0;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    if (GetBankSide(index) == SIDE_PLAYER)
+    if (GetBankSide(bank) == SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -1320,14 +1320,14 @@ static void BattleAICmd_count_alive_pokemon(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         u32 status;
-        bankOnField1 = gBattlePartyID[index];
-        status = GetBankIdentity(index) ^ 2;
+        bankOnField1 = gBattlePartyID[bank];
+        status = GetBankIdentity(bank) ^ 2;
         bankOnField2 = gBattlePartyID[GetBankByIdentity(status)];
     }
     else // in singles there's only one bank by side
     {
-        bankOnField1 = gBattlePartyID[index];
-        bankOnField2 = gBattlePartyID[index];
+        bankOnField1 = gBattlePartyID[bank];
+        bankOnField2 = gBattlePartyID[bank];
     }
 
     for (i = 0; i < 6; i++)
@@ -1358,60 +1358,60 @@ static void BattleAICmd_get_considered_move_effect(void)
 
 static void BattleAICmd_get_ability(void)
 {
-    u8 index;
+    u8 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        index = sBank_AI;
+        bank = sBank_AI;
     else
-        index = gBankTarget;
+        bank = gBankTarget;
 
-    if(gActiveBank != index)
+    if(gActiveBank != bank)
     {
-        if(BATTLE_HISTORY->abilities[index] != 0)
+        if(BATTLE_HISTORY->abilities[bank] != 0)
         {
-            AI_THINKING_STRUCT->funcResult = BATTLE_HISTORY->abilities[index];
+            AI_THINKING_STRUCT->funcResult = BATTLE_HISTORY->abilities[bank];
             gAIScriptPtr += 2;
             return;
         }
 
         // abilities that prevent fleeing.
-        if (gBattleMons[index].ability == ABILITY_SHADOW_TAG
-        || gBattleMons[index].ability == ABILITY_MAGNET_PULL
-        || gBattleMons[index].ability == ABILITY_ARENA_TRAP)
+        if (gBattleMons[bank].ability == ABILITY_SHADOW_TAG
+        || gBattleMons[bank].ability == ABILITY_MAGNET_PULL
+        || gBattleMons[bank].ability == ABILITY_ARENA_TRAP)
         {
-            AI_THINKING_STRUCT->funcResult = gBattleMons[index].ability;
+            AI_THINKING_STRUCT->funcResult = gBattleMons[bank].ability;
             gAIScriptPtr += 2;
             return;
         }
 
-        if (gBaseStats[gBattleMons[index].species].ability1 != ABILITY_NONE)
+        if (gBaseStats[gBattleMons[bank].species].ability1 != ABILITY_NONE)
         {
-            if (gBaseStats[gBattleMons[index].species].ability2 != ABILITY_NONE)
+            if (gBaseStats[gBattleMons[bank].species].ability2 != ABILITY_NONE)
             {
                 // AI has no knowledge of opponent, so it guesses which ability.
                 if (Random() & 1)
                 {
-                    AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[index].species].ability1;
+                    AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[bank].species].ability1;
                 }
                 else
                 {
-                    AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[index].species].ability2;
+                    AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[bank].species].ability2;
                 }
             }
             else
             {
-                AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[index].species].ability1; // it's definitely ability 1.
+                AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[bank].species].ability1; // it's definitely ability 1.
             }
         }
         else
         {
-            AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[index].species].ability2; // AI cant actually reach this part since every mon has at least 1 ability.
+            AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[bank].species].ability2; // AI cant actually reach this part since every mon has at least 1 ability.
         }
     }
     else
     {
         // The AI knows its own ability.
-        AI_THINKING_STRUCT->funcResult = gBattleMons[index].ability;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[bank].ability;
     }
     gAIScriptPtr += 2;
 }
@@ -1569,19 +1569,19 @@ static void BattleAICmd_if_status_in_party(void)
     struct Pokemon *party;
     int i;
     u32 statusToCompareTo;
-    u8 index;
+    u8 bank;
 
     switch(gAIScriptPtr[1])
     {
         case AI_USER:
-            index = sBank_AI;
+            bank = sBank_AI;
             break;
         default:
-            index = gBankTarget;
+            bank = gBankTarget;
             break;
     }
 
-    party = (GetBankSide(index) == 0) ? gPlayerParty : gEnemyParty;
+    party = (GetBankSide(bank) == 0) ? gPlayerParty : gEnemyParty;
 
     statusToCompareTo = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -1606,19 +1606,19 @@ static void BattleAICmd_if_status_not_in_party(void)
     struct Pokemon *party;
     int i;
     u32 statusToCompareTo;
-    u8 index;
+    u8 bank;
 
     switch(gAIScriptPtr[1])
     {
         case 1:
-            index = sBank_AI;
+            bank = sBank_AI;
             break;
         default:
-            index = gBankTarget;
+            bank = gBankTarget;
             break;
     }
 
-    party = (GetBankSide(index) == 0) ? gPlayerParty : gEnemyParty;
+    party = (GetBankSide(bank) == 0) ? gPlayerParty : gEnemyParty;
 
     statusToCompareTo = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -2280,9 +2280,9 @@ static void BattleAICmd_if_target_is_ally(void)
 
 static void BattleAICmd_if_flash_fired(void)
 {
-    u8 index = BattleAI_GetWantedBank(gAIScriptPtr[1]);
+    u8 bank = BattleAI_GetWantedBank(gAIScriptPtr[1]);
 
-    if(gBattleResources->flags->flags[index] & UNKNOWN_FLAG_FLASH_FIRE)
+    if(gBattleResources->flags->flags[bank] & UNKNOWN_FLAG_FLASH_FIRE)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
-- 
cgit v1.2.3


From 15c92318d3a4c1008bf4f3bbb7334d74e0077712 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sun, 24 Dec 2017 22:52:28 -0600
Subject: Extract data from misc files

Also split data4d.s
---
 src/evolution_scene.c | 102 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 84 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index bfb558444..580e88ad7 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -60,16 +60,8 @@ extern u8 gBattleCommunication[];
 
 extern const struct WindowTemplate gUnknown_0833900C;
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-extern const u8 gUnknown_085B58C9[][4];
-extern const u16 gUnknown_085B5884[];
-extern const u8 gUnknown_085B58D9[];
-extern const u16 gUnknown_085B51E4[];
-extern const u32 gUnknown_085B4134[];
-extern const u32 gUnknown_085B482C[];
-extern const u32 gUnknown_085B4D10[];
 
 // strings
-extern const u8 gText_ShedinjaJapaneseName2[];
 extern const u8 gText_PkmnIsEvolving[];
 extern const u8 gText_CongratsPkmnEvolved[];
 extern const u8 gText_BattleYesNoChoice[];
@@ -108,6 +100,80 @@ static void InitMovingBackgroundTask(bool8 isLink);
 static void sub_813FEE8(u8 taskId);
 static void sub_8140174(void);
 
+// const data
+static const u16 sUnknown_085B4114[] = INCBIN_U16("graphics/evolution_scene/unknown_5B4114.gbapal");
+static const u32 sUnknown_085B4134[] = INCBIN_U32("graphics/evolution_scene/bg.4bpp.lz");
+static const u32 sUnknown_085B482C[] = INCBIN_U32("graphics/evolution_scene/bg.bin.lz");
+static const u32 sUnknown_085B4D10[] = INCBIN_U32("graphics/evolution_scene/bg2.bin.lz");
+static const u16 sUnknown_085B51E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_intro.gbapal");
+static const u16 sUnknown_085B53E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_lighten.gbapal");
+static const u16 sUnknown_085B5544[] = INCBIN_U16("graphics/evolution_scene/gray_transition_darken.gbapal");
+static const u16 sUnknown_085B56E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_outro.gbapal");
+static const u16 sUnknown_085B5884[] = INCBIN_U16("graphics/evolution_scene/transition.gbapal");
+
+static const u8 Text_ShedinjaJapaneseName[] = _("ヌケニン");
+
+static const u8 sUnknown_085B58C9[][4] = 
+{
+    { 0x00, 0x0C, 0x01, 0x06 },
+    { 0x0D, 0x24, 0x05, 0x02 },
+    { 0x0D, 0x18, 0x01, 0x02 },
+    { 0x25, 0x31, 0x01, 0x06 },
+};
+
+static const u8 sUnknown_085B58D9[][16] = {
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x0B, 0x00, 0x00 },
+    { 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00 },
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x00 },
+    { 0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x00, 0x00 },
+    { 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x00, 0x00 },
+    { 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x00, 0x00 },
+    { 0x00, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x00, 0x00 },
+    { 0x00, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x00, 0x00 },
+    { 0x00, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x00, 0x00 },
+    { 0x00, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x00, 0x00 },
+    { 0x00, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x00, 0x00 },
+    { 0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x00, 0x00 },
+    { 0x00, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x00, 0x00 },
+    { 0x00, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x00, 0x00 },
+    { 0x00, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00 },
+    { 0x00, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x00, 0x00 },
+    { 0x00, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x00, 0x00 },
+    { 0x00, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00 },
+    { 0x00, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00 },
+    { 0x00, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00 },
+    { 0x00, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00 },
+    { 0x00, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00, 0x00 },
+    { 0x00, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00 },
+    { 0x00, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x00 },
+    { 0x00, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x00, 0x00 },
+    { 0x00, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00 },
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x00 },
+    { 0x00, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00 },
+    { 0x00, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+};
+
 static void CB2_BeginEvolutionScene(void)
 {
     UpdatePaletteFade();
@@ -544,7 +610,7 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
         if (GetMonData(Shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA
             && GetMonData(Shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE
             && GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NINJASK)
-                SetMonData(Shedinja, MON_DATA_NICKNAME, gText_ShedinjaJapaneseName2);
+                SetMonData(Shedinja, MON_DATA_NICKNAME, Text_ShedinjaJapaneseName);
     }
 }
 
@@ -1330,17 +1396,17 @@ static void sub_813FDEC(u8 taskId)
     if (data[5]++ < 20)
         return;
 
-    if (data[0]++ > gUnknown_085B58C9[data[2]][3])
+    if (data[0]++ > sUnknown_085B58C9[data[2]][3])
     {
-        if (gUnknown_085B58C9[data[2]][1] == data[1])
+        if (sUnknown_085B58C9[data[2]][1] == data[1])
         {
             data[3]++;
-            if (data[3] == gUnknown_085B58C9[data[2]][2])
+            if (data[3] == sUnknown_085B58C9[data[2]][2])
             {
                 data[3] = 0;
                 data[2]++;
             }
-            data[1] = gUnknown_085B58C9[data[2]][0];
+            data[1] = sUnknown_085B58C9[data[2]][0];
         }
         else
         {
@@ -1411,7 +1477,7 @@ static void InitMovingBgValues(u16 *movingBgs)
     {
         for (j = 0; j < 16; j++)
         {
-            movingBgs[i * 16 + j] = gUnknown_085B5884[gUnknown_085B58D9[i * 16 + j]];
+            movingBgs[i * 16 + j] = sUnknown_085B5884[sUnknown_085B58D9[i][j]];
         }
     }
 }
@@ -1428,11 +1494,11 @@ static void InitMovingBackgroundTask(bool8 isLink)
     else
         innerBgId = 1, outerBgId = 3;
 
-    LoadPalette(gUnknown_085B51E4, 0xA0, 0x20);
+    LoadPalette(sUnknown_085B51E4, 0xA0, 0x20);
 
-    copy_decompressed_tile_data_to_vram_autofree(1, gUnknown_085B4134, FALSE, 0, 0);
-    CopyToBgTilemapBuffer(1, gUnknown_085B482C, 0, 0);
-    CopyToBgTilemapBuffer(outerBgId, gUnknown_085B4D10, 0, 0);
+    copy_decompressed_tile_data_to_vram_autofree(1, sUnknown_085B4134, FALSE, 0, 0);
+    CopyToBgTilemapBuffer(1, sUnknown_085B482C, 0, 0);
+    CopyToBgTilemapBuffer(outerBgId, sUnknown_085B4D10, 0, 0);
     CopyBgTilemapBufferToVram(1);
     CopyBgTilemapBufferToVram(outerBgId);
 
-- 
cgit v1.2.3


From 0af942e0b84066a1824a22343efb4619bbc9ff44 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 26 Dec 2017 01:39:01 -0500
Subject: twelfth wave of graphics.s dumps

---
 src/pokemon_summary_screen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index ba0c4dde7..45aaf0e08 100755
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -93,7 +93,7 @@ extern struct CompressedSpriteSheet gUnknown_0861D074;
 extern struct CompressedSpriteSheet gUnknown_0861D0F8;
 extern struct CompressedSpritePalette gUnknown_0861D100;
 extern struct CompressedSpritePalette gUnknown_0861D07C;
-extern u8 gUnknown_08D97B84;
+extern u8 gMoveTypes_Pal;
 extern u8 gUnknown_08D97D0C;
 extern void reset_temp_tile_data_buffers();
 extern void decompress_and_copy_tile_data_to_vram(u8 a, void* tiledata, u8 b, u8 c, u8 d);
@@ -648,7 +648,7 @@ u8 sub_81BFEB0()
         gUnknown_0203CF1C->unk40F0++;
         break;
     case 12:
-        LoadCompressedPalette(&gUnknown_08D97B84, 0x1D0, 0x60);
+        LoadCompressedPalette(&gMoveTypes_Pal, 0x1D0, 0x60);
         gUnknown_0203CF1C->unk40F0 = 0;
         return 1;
     }
-- 
cgit v1.2.3


From f9a9391ff38fb78636efebbfd1da4c05b93c6026 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 26 Dec 2017 21:20:29 -0600
Subject: Split/extract/port landmark

---
 src/decoration.c |   2 +-
 src/landmark.c   | 441 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/region_map.c |  11 +-
 src/tv.c         |   7 +-
 4 files changed, 451 insertions(+), 10 deletions(-)
 create mode 100644 src/landmark.c

(limited to 'src')

diff --git a/src/decoration.c b/src/decoration.c
index faef779b7..512252f7d 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -25,7 +25,7 @@
 #include "sound.h"
 #include "event_scripts.h"
 #include "event_data.h"
-#include "region_map.h"
+#include "region_map_sections.h"
 #include "player_pc.h"
 #include "strings.h"
 #include "tv.h"
diff --git a/src/landmark.c b/src/landmark.c
new file mode 100644
index 000000000..3d4ed862b
--- /dev/null
+++ b/src/landmark.c
@@ -0,0 +1,441 @@
+#include "global.h"
+#include "event_data.h"
+#include "region_map_sections.h"
+
+struct Landmark
+{
+    const u8 *name;
+    u16 flag;
+};
+
+struct LandmarkList
+{
+    u8 mapSection;
+    u8 id;
+    const struct Landmark *const *landmarks;
+};
+
+static const u8 LandmarkName_FlowerShop[] = _("FLOWER SHOP");
+static const u8 LandmarkName_PetalburgWoods[] = _("PETALBURG WOODS");
+static const u8 LandmarkName_MrBrineysCottage[] = _("MR. BRINEY’S COTTAGE");
+static const u8 LandmarkName_AbandonedShip[] = _("ABANDONED SHIP");
+static const u8 LandmarkName_SeashoreHouse[] = _("SEASHORE HOUSE");
+static const u8 LandmarkName_SlateportBeach[] = _("SLATEPORT BEACH");
+static const u8 LandmarkName_CyclingRoad[] = _("CYCLING ROAD");
+static const u8 LandmarkName_NewMauville[] = _("NEW MAUVILLE");
+static const u8 LandmarkName_TrickHouse[] = _("TRICK HOUSE");
+static const u8 LandmarkName_OldLadysRestShop[] = _("OLD LADY’S REST STOP");
+static const u8 LandmarkName_Desert[] = _("DESERT");
+static const u8 LandmarkName_WinstrateFamily[] = _("THE WINSTRATE FAMILY");
+static const u8 LandmarkName_CableCar[] = _("CABLE CAR");
+static const u8 LandmarkName_GlassWorkshop[] = _("GLASS WORKSHOP");
+static const u8 LandmarkName_WeatherInstitute[] = _("WEATHER INSTITUTE");
+static const u8 LandmarkName_MeteorFalls[] = _("METEOR FALLS");
+static const u8 LandmarkName_TunnelersRestHouse[] = _("TUNNELER’S RESTHOUSE");
+static const u8 LandmarkName_RusturfTunnel[] = _("RUSTURF TUNNEL");
+static const u8 LandmarkName_PokemonDayCare[] = _("POKéMON DAY CARE");
+static const u8 LandmarkName_SafariZoneEntrance[] = _("SAFARI ZONE ENTRANCE");
+static const u8 LandmarkName_MtPyre[] = _("MT. PYRE");
+static const u8 LandmarkName_ShoalCave[] = _("SHOAL CAVE");
+static const u8 LandmarkName_SeafloorCavern[] = _("SEAFLOOR CAVERN");
+static const u8 LandmarkName_GraniteCave[] = _("GRANITE CAVE");
+static const u8 LandmarkName_OceanCurrent[] = _("OCEAN CURRENT");
+static const u8 LandmarkName_LanettesHouse[] = _("LANETTE’S HOUSE");
+static const u8 LandmarkName_FieryPath[] = _("FIERY PATH");
+static const u8 LandmarkName_JaggedPass[] = _("JAGGED PASS");
+static const u8 LandmarkName_SkyPillar[] = _("SKY PILLAR");
+static const u8 LandmarkName_BerryMastersHouse[] = _("BERRY MASTER’S HOUSE");
+static const u8 LandmarkName_IslandCave[] = _("ISLAND CAVE");
+static const u8 LandmarkName_DesertRuins[] = _("DESERT RUINS");
+static const u8 LandmarkName_ScorchedSlab[] = _("SCORCHED SLAB");
+static const u8 LandmarkName_AncientTomb[] = _("ANCIENT TOMB");
+static const u8 LandmarkName_SealedChamber[] = _("SEALED CHAMBER");
+static const u8 LandmarkName_FossilManiacsHouse[] = _("FOSSIL MANIAC’S HOUSE");
+static const u8 LandmarkName_HuntersHouse[] = _("HUNTER’S HOUSE");
+static const u8 LandmarkName_MagmaHideout[] = _("MAGMA HIDEOUT");
+static const u8 LandmarkName_MirageTower[] = _("MIRAGE TOWER");
+static const u8 LandmarkName_AlteringCave[] = _("ALTERING CAVE");
+static const u8 LandmarkName_DesertUnderpass[] = _("DESERT UNDERPASS");
+static const u8 LandmarkName_TrainerHill[] = _("TRAINER HILL");
+
+static const struct Landmark Landmark_FlowerShop = {LandmarkName_FlowerShop, FLAG_LANDMARK_FLOWER_SHOP};
+static const struct Landmark Landmark_PetalburgWoods = {LandmarkName_PetalburgWoods, -1};
+static const struct Landmark Landmark_MrBrineysCottage = {LandmarkName_MrBrineysCottage, FLAG_LANDMARK_MR_BRINEY_HOUSE};
+static const struct Landmark Landmark_AbandonedShip = {LandmarkName_AbandonedShip, FLAG_LANDMARK_ABANDONED_SHIP};
+static const struct Landmark Landmark_SeashoreHouse = {LandmarkName_SeashoreHouse, FLAG_LANDMARK_SEASHORE_HOUSE};
+static const struct Landmark Landmark_SlateportBeach = {LandmarkName_SlateportBeach, -1};
+static const struct Landmark Landmark_CyclingRoad = {LandmarkName_CyclingRoad, -1};
+static const struct Landmark Landmark_NewMauville = {LandmarkName_NewMauville, FLAG_LANDMARK_NEW_MAUVILLE};
+static const struct Landmark Landmark_TrickHouse = {LandmarkName_TrickHouse, FLAG_LANDMARK_TRICK_HOUSE};
+static const struct Landmark Landmark_OldLadysRestShop = {LandmarkName_OldLadysRestShop, FLAG_LANDMARK_OLD_LADY_REST_SHOP};
+static const struct Landmark Landmark_Desert = {LandmarkName_Desert, -1};
+static const struct Landmark Landmark_WinstrateFamily = {LandmarkName_WinstrateFamily, FLAG_LANDMARK_WINSTRATE_FAMILY};
+static const struct Landmark Landmark_CableCar = {LandmarkName_CableCar, -1};
+static const struct Landmark Landmark_GlassWorkshop = {LandmarkName_GlassWorkshop, FLAG_LANDMARK_GLASS_WORKSHOP};
+static const struct Landmark Landmark_WeatherInstitute = {LandmarkName_WeatherInstitute, -1};
+static const struct Landmark Landmark_MeteorFalls = {LandmarkName_MeteorFalls, -1};
+static const struct Landmark Landmark_TunnelersRestHouse = {LandmarkName_TunnelersRestHouse, FLAG_LANDMARK_TUNNELERS_REST_HOUSE};
+static const struct Landmark Landmark_RusturfTunnel = {LandmarkName_RusturfTunnel, -1};
+static const struct Landmark Landmark_PokemonDayCare = {LandmarkName_PokemonDayCare, FLAG_LANDMARK_POKEMON_DAYCARE};
+static const struct Landmark Landmark_SafariZoneEntrance = {LandmarkName_SafariZoneEntrance, -1};
+static const struct Landmark Landmark_MtPyre = {LandmarkName_MtPyre, -1};
+static const struct Landmark Landmark_ShoalCave = {LandmarkName_ShoalCave, -1};
+static const struct Landmark Landmark_SeafloorCavern = {LandmarkName_SeafloorCavern, FLAG_LANDMARK_SEAFLOOR_CAVERN};
+static const struct Landmark Landmark_GraniteCave = {LandmarkName_GraniteCave, -1};
+static const struct Landmark Landmark_OceanCurrent = {LandmarkName_OceanCurrent, -1};
+static const struct Landmark Landmark_LanettesHouse = {LandmarkName_LanettesHouse, FLAG_LANDMARK_LANETTES_HOUSE};
+static const struct Landmark Landmark_FieryPath = {LandmarkName_FieryPath, FLAG_LANDMARK_FIERY_PATH};
+static const struct Landmark Landmark_JaggedPass = {LandmarkName_JaggedPass, -1};
+static const struct Landmark Landmark_BerryMastersHouse = {LandmarkName_BerryMastersHouse, FLAG_LANDMARK_BERRY_MASTERS_HOUSE};
+static const struct Landmark Landmark_IslandCave = {LandmarkName_IslandCave, FLAG_LANDMARK_ISLAND_CAVE};
+static const struct Landmark Landmark_DesertRuins = {LandmarkName_DesertRuins, FLAG_LANDMARK_DESERT_RUINS};
+static const struct Landmark Landmark_ScorchedSlab = {LandmarkName_ScorchedSlab, FLAG_LANDMARK_SCORCHED_SLAB};
+static const struct Landmark Landmark_AncientTomb = {LandmarkName_AncientTomb, FLAG_LANDMARK_ANCIENT_TOMB};
+static const struct Landmark Landmark_SealedChamber = {LandmarkName_SealedChamber, FLAG_LANDMARK_SEALED_CHAMBER};
+static const struct Landmark Landmark_FossilManiacsHouse = {LandmarkName_FossilManiacsHouse, FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE};
+static const struct Landmark Landmark_HuntersHouse = {LandmarkName_HuntersHouse, FLAG_LANDMARK_HUNTERS_HOUSE};
+static const struct Landmark Landmark_SkyPillar = {LandmarkName_SkyPillar, FLAG_LANDMARK_SKY_PILLAR};
+static const struct Landmark Landmark_MirageTower = {LandmarkName_MirageTower, FLAG_LANDMARK_MIRAGE_TOWER};
+static const struct Landmark Landmark_AlteringCave = {LandmarkName_AlteringCave, FLAG_LANDMARK_ALTERING_CAVE};
+static const struct Landmark Landmark_DesertUnderpass = {LandmarkName_DesertUnderpass, FLAG_LANDMARK_DESERT_UNDERPASS};
+static const struct Landmark Landmark_TrainerHill = {LandmarkName_TrainerHill, FLAG_LANDMARK_TRAINER_HILL};
+
+static const struct Landmark *const Landmarks_Route103_2[]  =
+{
+    &Landmark_AlteringCave,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route104_0[]  =
+{
+    &Landmark_FlowerShop,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route104_1[]  =
+{
+    &Landmark_PetalburgWoods,
+    &Landmark_MrBrineysCottage,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route105_0[]  =
+{
+    &Landmark_IslandCave,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route106_1[]  =
+{
+    &Landmark_GraniteCave,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route108_0[]  =
+{
+    &Landmark_AbandonedShip,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route109_0[]  =
+{
+    &Landmark_SeashoreHouse,
+    &Landmark_SlateportBeach,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route110_0[]  =
+{
+    &Landmark_CyclingRoad,
+    &Landmark_NewMauville,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route110_1[]  =
+{
+    &Landmark_CyclingRoad,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route110_2[]  =
+{
+    &Landmark_CyclingRoad,
+    &Landmark_TrickHouse,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route111_0[]  =
+{
+    &Landmark_OldLadysRestShop,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route111_1[]  =
+{
+    &Landmark_Desert,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route111_2[]  =
+{
+    &Landmark_MirageTower,
+    &Landmark_Desert,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route111_3[]  =
+{
+    &Landmark_DesertRuins,
+    &Landmark_Desert,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route111_4[]  =
+{
+    &Landmark_TrainerHill,
+    &Landmark_WinstrateFamily,
+    &Landmark_Desert,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route112_0[]  =
+{
+    &Landmark_FieryPath,
+    &Landmark_JaggedPass,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route112_1[]  =
+{
+    &Landmark_CableCar,
+    &Landmark_FieryPath,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route113_1[]  =
+{
+    &Landmark_GlassWorkshop,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route114_1[]  =
+{
+    &Landmark_DesertUnderpass,
+    &Landmark_FossilManiacsHouse,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route114_2[]  =
+{
+    &Landmark_LanettesHouse,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_MeteorFalls[]  =
+{
+    &Landmark_MeteorFalls,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route116_1[]  =
+{
+    &Landmark_TunnelersRestHouse,
+    &Landmark_RusturfTunnel,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route116_2[]  =
+{
+    &Landmark_RusturfTunnel,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route117_2[]  =
+{
+    &Landmark_PokemonDayCare,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route119_1[]  =
+{
+    &Landmark_WeatherInstitute,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route120_0[]  =
+{
+    &Landmark_ScorchedSlab,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route120_2[]  =
+{
+    &Landmark_AncientTomb,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route121_2[]  =
+{
+    &Landmark_SafariZoneEntrance,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route122_0[]  =
+{
+    &Landmark_MtPyre,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route123_0[]  =
+{
+    &Landmark_BerryMastersHouse,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route124_7[]  =
+{
+    &Landmark_HuntersHouse,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route125_2[]  =
+{
+    &Landmark_ShoalCave,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route128_1[]  =
+{
+    &Landmark_SeafloorCavern,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route131_1[]  =
+{
+    &Landmark_SkyPillar,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_OceanCurrent[]  =
+{
+    &Landmark_OceanCurrent,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_Route134_2[]  =
+{
+    &Landmark_SealedChamber,
+    &Landmark_OceanCurrent,
+    NULL,
+};
+
+static const struct Landmark *const Landmarks_MtChimney_2[]  =
+{
+    &Landmark_CableCar,
+    &Landmark_JaggedPass,
+    NULL,
+};
+
+static const struct LandmarkList gLandmarkLists[] =
+{
+	{MAPSEC_ROUTE_103, 2, Landmarks_Route103_2},
+	{MAPSEC_ROUTE_104, 0, Landmarks_Route104_0},
+    {MAPSEC_ROUTE_104, 1, Landmarks_Route104_1},
+    {MAPSEC_ROUTE_105, 0, Landmarks_Route105_0},
+    {MAPSEC_ROUTE_106, 1, Landmarks_Route106_1},
+    {MAPSEC_ROUTE_108, 0, Landmarks_Route108_0},
+    {MAPSEC_ROUTE_109, 0, Landmarks_Route109_0},
+    {MAPSEC_ROUTE_110, 0, Landmarks_Route110_0},
+    {MAPSEC_ROUTE_110, 1, Landmarks_Route110_1},
+    {MAPSEC_ROUTE_110, 2, Landmarks_Route110_2},
+    {MAPSEC_ROUTE_111, 0, Landmarks_Route111_0},
+    {MAPSEC_ROUTE_111, 1, Landmarks_Route111_1},
+    {MAPSEC_ROUTE_111, 2, Landmarks_Route111_2},
+    {MAPSEC_ROUTE_111, 3, Landmarks_Route111_3},
+    {MAPSEC_ROUTE_111, 4, Landmarks_Route111_4},
+    {MAPSEC_ROUTE_112, 0, Landmarks_Route112_0},
+    {MAPSEC_ROUTE_112, 1, Landmarks_Route112_1},
+    {MAPSEC_ROUTE_113, 1, Landmarks_Route113_1},
+    {MAPSEC_ROUTE_114, 1, Landmarks_Route114_1},
+    {MAPSEC_ROUTE_114, 2, Landmarks_Route114_2},
+    {MAPSEC_ROUTE_114, 3, Landmarks_MeteorFalls},
+    {MAPSEC_ROUTE_115, 0, Landmarks_MeteorFalls},
+    {MAPSEC_ROUTE_115, 1, Landmarks_MeteorFalls},
+    {MAPSEC_ROUTE_116, 1, Landmarks_Route116_1},
+    {MAPSEC_ROUTE_116, 2, Landmarks_Route116_2},
+    {MAPSEC_ROUTE_117, 2, Landmarks_Route117_2},
+    {MAPSEC_ROUTE_119, 1, Landmarks_Route119_1},
+    {MAPSEC_ROUTE_120, 0, Landmarks_Route120_0},
+    {MAPSEC_ROUTE_120, 2, Landmarks_Route120_2},
+    {MAPSEC_ROUTE_121, 2, Landmarks_Route121_2},
+    {MAPSEC_ROUTE_122, 0, Landmarks_Route122_0},
+    {MAPSEC_ROUTE_123, 0, Landmarks_Route123_0},
+    {MAPSEC_ROUTE_122, 1, Landmarks_Route122_0},
+    {MAPSEC_ROUTE_124, 7, Landmarks_Route124_7},
+    {MAPSEC_ROUTE_125, 2, Landmarks_Route125_2},
+    {MAPSEC_ROUTE_128, 1, Landmarks_Route128_1},
+    {MAPSEC_ROUTE_131, 1, Landmarks_Route131_1},
+    {MAPSEC_ROUTE_132, 0, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_132, 1, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_133, 0, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_133, 1, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_133, 2, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_134, 0, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_134, 1, Landmarks_OceanCurrent},
+    {MAPSEC_ROUTE_134, 2, Landmarks_Route134_2},
+    {MAPSEC_MT_CHIMNEY, 2, Landmarks_MtChimney_2},
+    {MAPSEC_NONE, 0, NULL},
+};
+
+static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id);
+
+const u8 *GetLandmarkName(u8 mapSection, u8 id, u8 count)
+{
+    const struct Landmark *const *landmarks = GetLandmarks(mapSection, id);
+
+    if (!landmarks)
+        return NULL;
+
+    while (1)
+    {
+        const struct Landmark *landmark = *landmarks;
+
+        if (landmark->flag == 0xFFFF || FlagGet(landmark->flag) == TRUE)
+        {
+            if (count == 0)
+                break;
+            else
+                count--;
+        }
+
+        landmarks++;
+        if (!*landmarks)
+            return NULL;
+    }
+
+    return (*landmarks)->name;
+}
+
+static const struct Landmark *const *GetLandmarks(u8 mapSection, u8 id)
+{
+    u16 i = 0;
+
+    for (; gLandmarkLists[i].mapSection != MAPSEC_NONE; i++)
+    {
+        if (gLandmarkLists[i].mapSection > mapSection)
+            return NULL;
+        if (gLandmarkLists[i].mapSection == mapSection)
+            break;
+    }
+
+    if (gLandmarkLists[i].mapSection == MAPSEC_NONE)
+        return NULL;
+
+    for (; gLandmarkLists[i].mapSection == mapSection; i++)
+    {
+        if (gLandmarkLists[i].id == id)
+            return gLandmarkLists[i].landmarks;
+    }
+
+    return NULL;
+}
diff --git a/src/region_map.c b/src/region_map.c
index f28f07d52..261243792 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -21,6 +21,7 @@
 #include "m4a.h"
 #include "field_effect.h"
 #include "region_map.h"
+#include "region_map_sections.h"
 
 #define MAP_WIDTH 28
 #define MAP_HEIGHT 15
@@ -306,7 +307,7 @@ static const struct {
 } gUnknown_085A1EDC[] = {
     gUnknown_085A1ED4,
     MAPSEC_EVER_GRANDE_CITY,
-    FLAG_SYS_POKEMON_LEAGUE_FLY
+    FLAG_LANDMARK_POKEMON_LEAGUE
 };
 
 static const struct BgTemplate gUnknown_085A1EE4[] = {
@@ -327,7 +328,7 @@ static const struct SpritePalette gUnknown_085A1F10 = {
 };
 
 static const u16 sUnknown_085A1F18[][2] = {
-    {FLAG_UNLOCK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER},
+    {FLAG_LANDMARK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER},
     {-1, MAPSEC_NONE}
 };
 
@@ -1126,9 +1127,9 @@ static u8 get_flagnr_blue_points(u16 mapSecId)
         case MAPSEC_EVER_GRANDE_CITY:
             return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? MAPSECTYPE_CITY_CANFLY : MAPSECTYPE_CITY_CANTFLY;
         case MAPSEC_BATTLE_FRONTIER:
-            return FlagGet(FLAG_UNLOCK_BATTLE_FRONTIER) ? MAPSECTYPE_BATTLE_FRONTIER : MAPSECTYPE_NONE;
+            return FlagGet(FLAG_LANDMARK_BATTLE_FRONTIER) ? MAPSECTYPE_BATTLE_FRONTIER : MAPSECTYPE_NONE;
         case MAPSEC_SOUTHERN_ISLAND:
-            return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? MAPSECTYPE_PLAIN : MAPSECTYPE_NONE;
+            return FlagGet(FLAG_LANDMARK_SOUTHERN_ISLAND) ? MAPSECTYPE_PLAIN : MAPSECTYPE_NONE;
         default:
             return MAPSECTYPE_PLAIN;
     }
@@ -1916,7 +1917,7 @@ static void sub_8124E0C(void)
                             sub_8084CCC(gSaveBlock2Ptr->playerGender == MALE ? 0x0C : 0x0D);
                             break;
                         case MAPSEC_EVER_GRANDE_CITY:
-                            sub_8084CCC(FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B);
+                            sub_8084CCC(FlagGet(FLAG_LANDMARK_POKEMON_LEAGUE) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B);
                             break;
                         default:
                             if (sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0)
diff --git a/src/tv.c b/src/tv.c
index 205adbf4d..1621a9934 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1,5 +1,3 @@
-
-// Includes
 #include "global.h"
 #include "rtc.h"
 #include "overworld.h"
@@ -34,6 +32,7 @@
 #include "naming_screen.h"
 #include "malloc.h"
 #include "region_map.h"
+#include "region_map_sections.h"
 #include "decoration.h"
 #include "secret_base.h"
 #include "tv.h"
@@ -6504,7 +6503,7 @@ void DoTVShowTodaysRivalTrainer(void)
             break;
         case 1:
             TV_PrintIntToStringVar(0, show->rivalTrainer.badgeCount);
-            if (FlagGet(CODE_FLAGS + 0x48))
+            if (FlagGet(FLAG_LANDMARK_BATTLE_FRONTIER))
             {
                 if (show->rivalTrainer.nSilverSymbols || show->rivalTrainer.nGoldSymbols)
                 {
@@ -6521,7 +6520,7 @@ void DoTVShowTodaysRivalTrainer(void)
             }
             break;
         case 2:
-            if (FlagGet(CODE_FLAGS + 0x48))
+            if (FlagGet(FLAG_LANDMARK_BATTLE_FRONTIER))
             {
                 if (show->rivalTrainer.nSilverSymbols || show->rivalTrainer.nGoldSymbols)
                 {
-- 
cgit v1.2.3


From 8a338f44db2151412c383f4495ddd0d1fe23e984 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 26 Dec 2017 22:37:36 -0500
Subject: thirteenth wave of graphics.s dumps

---
 src/rayquaza_scene.c | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 577294f0c..ce8747395 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -431,12 +431,12 @@ static const union AnimCmd *const sSpriteAnimTable_862A8BC[] =
 
 const struct CompressedSpriteSheet gUnknown_0862A8C4 =
 {
-    gUnknown_08DA1E78, 0x3000, 30505
+    gRaySceneGroudon_Gfx, 0x3000, 30505
 };
 
 const struct CompressedSpritePalette gUnknown_0862A8CC =
 {
-    gUnknown_08DA3370, 30505
+    gRaySceneGroudon_Pal, 30505
 };
 
 const struct SpriteTemplate gUnknown_0862A8D4 =
@@ -463,7 +463,7 @@ static const union AnimCmd *const sSpriteAnimTable_862A8F4[] =
 
 const struct CompressedSpriteSheet gUnknown_0862A8F8 =
 {
-    gUnknown_08DA2A5C, 0x200, 30506
+    gRaySceneGroudon2_Gfx, 0x200, 30506
 };
 
 const struct SpriteTemplate gUnknown_0862A900 =
@@ -490,7 +490,7 @@ static const union AnimCmd *const sSpriteAnimTable_862A920[] =
 
 const struct CompressedSpriteSheet gUnknown_0862A924 =
 {
-    gUnknown_08DA2B28, 0x400, 30507
+    gRaySceneGroudon3_Gfx, 0x400, 30507
 };
 
 const struct SpriteTemplate gUnknown_0862A92C =
@@ -582,12 +582,12 @@ static const union AnimCmd *const sSpriteAnimTable_862A9B0[] =
 
 const struct CompressedSpriteSheet gUnknown_0862A9D4 =
 {
-    gUnknown_08DA2D1C, 0xF00, 30508
+    gRaySceneKyogre_Gfx, 0xF00, 30508
 };
 
 const struct CompressedSpritePalette gUnknown_0862A9DC =
 {
-    gUnknown_08DA3398, 30508
+    gRaySceneKyogre_Pal, 30508
 };
 
 const struct SpriteTemplate gUnknown_0862A9E4 =
@@ -617,7 +617,7 @@ static const union AnimCmd *const sSpriteAnimTable_862AA10[] =
 
 const struct CompressedSpriteSheet gUnknown_0862AA14 =
 {
-    gUnknown_08DA3250, 0xC0, 30509
+    gRaySceneKyogre2_Gfx, 0xC0, 30509
 };
 
 const struct SpriteTemplate gUnknown_0862AA1C =
@@ -633,7 +633,7 @@ const struct SpriteTemplate gUnknown_0862AA1C =
 
 const struct CompressedSpriteSheet gUnknown_0862AA34 =
 {
-    gUnknown_08DA32A4, 0x200, 30510
+    gRaySceneKyogre3_Gfx, 0x200, 30510
 };
 
 const struct SpriteTemplate gUnknown_0862AA3C =
@@ -704,12 +704,12 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_862AA8C[] =
 
 const struct CompressedSpriteSheet gUnknown_0862AA90 =
 {
-    gUnknown_08DA3BC0, 0x100, 30555
+    gRaySceneSmoke_Gfx, 0x100, 30555
 };
 
 const struct CompressedSpritePalette gUnknown_0862AA98 =
 {
-    gUnknown_08DA3C7C, 30555
+    gRaySceneSmoke_Pal, 30555
 };
 
 const struct SpriteTemplate gUnknown_0862AAA0 =
@@ -803,17 +803,17 @@ static const union AnimCmd *const sSpriteAnimTable_862AAF8[] =
 
 const struct CompressedSpriteSheet gUnknown_0862AAFC =
 {
-    gUnknown_08DA6440, 0x1000, 30556
+    gRaySceneRayquazaFly1_Gfx, 0x1000, 30556
 };
 
 const struct CompressedSpriteSheet gUnknown_0862AB04 =
 {
-    gUnknown_08DA68AC, 0x200, 30557
+    gRaySceneRayquazaTail_Gfx, 0x200, 30557
 };
 
 const struct CompressedSpritePalette gUnknown_0862AB0C =
 {
-    gUnknown_08DA4DA8, 30556
+    gRaySceneRayquaza_Pal, 30556
 };
 
 const struct SpriteTemplate gUnknown_0862AB14 =
@@ -1017,52 +1017,52 @@ static const union AnimCmd *const sSpriteAnimTable_862AC24[] =
 
 const struct CompressedSpriteSheet gUnknown_0862AC28 =
 {
-    gUnknown_08DA8ED8, 0x1800, 30565
+    gRaySceneGroudonLeft_Gfx, 0x1800, 30565
 };
 
 const struct CompressedSpriteSheet gUnknown_0862AC30 =
 {
-    gUnknown_08DA9670, 0x80, 30566
+    gRaySceneGroudonTail_Gfx, 0x80, 30566
 };
 
 const struct CompressedSpriteSheet gUnknown_0862AC38 =
 {
-    gUnknown_08DA96B4, 0x600, 30568
+    gRaySceneKyogreRight_Gfx, 0x600, 30568
 };
 
 const struct CompressedSpriteSheet gUnknown_0862AC40 =
 {
-    gUnknown_08DA98FC, 0x2000, 30569
+    gRaySceneRayquazaHover_Gfx, 0x2000, 30569
 };
 
 const struct CompressedSpriteSheet gUnknown_0862AC48 =
 {
-    gUnknown_08DAA5A4, 0x800, 30570
+    gRaySceneRayquazaFlyIn_Gfx, 0x800, 30570
 };
 
 const struct CompressedSpriteSheet gUnknown_0862AC50 =
 {
-    gUnknown_08DAA794, 0x300, 30571
+    gRaySceneSplash_Gfx, 0x300, 30571
 };
 
 const struct CompressedSpritePalette gUnknown_0862AC58 =
 {
-    gUnknown_08DAA82C, 30565
+    gRaySceneGroudonLeft_Pal, 30565
 };
 
 const struct CompressedSpritePalette gUnknown_0862AC60 =
 {
-    gUnknown_08DAA854, 30568
+    gRaySceneKyogreRight_Pal, 30568
 };
 
 const struct CompressedSpritePalette gUnknown_0862AC68 =
 {
-    gUnknown_08DAA87C, 30569
+    gRaySceneRayquazaHover_Pal, 30569
 };
 
 const struct CompressedSpritePalette gUnknown_0862AC70 =
 {
-    gUnknown_08DAA8A4, 30571
+    gRaySceneSplash_Pal, 30571
 };
 
 const struct SpriteTemplate gUnknown_0862AC78 =
-- 
cgit v1.2.3


From 2d04eb22abd3f60902ee1f9bc87bd510518709e3 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Thu, 28 Dec 2017 02:09:11 -0600
Subject: Split rom_81370FC and port function names

---
 src/battle_gfx_sfx_util.c | 10 +++++-----
 src/decoration.c          |  2 +-
 src/hall_of_fame.c        |  4 ++--
 src/landmark.c            |  2 +-
 src/region_map.c          |  2 +-
 src/tv.c                  |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 22be086f0..70b4d7d31 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -63,7 +63,7 @@ extern const u8 gUnknown_08C1F46C[];
 extern const u8 gUnknown_08C1F5E8[];
 extern const u8 gUnknown_08C1F76C[];
 extern const u8 gUnknown_08C1F8E8[];
-extern const u8 gUnknown_08C0237C[];
+extern const u8 gBlankGfxCompressed[];
 extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
 
@@ -110,10 +110,10 @@ static const struct CompressedSpriteSheet gUnknown_0832C100 =
 
 static const struct CompressedSpriteSheet gUnknown_0832C108[BATTLE_BANKS_COUNT] =
 {
-    {gUnknown_08C0237C, 0x0100, 0xd704},
-    {gUnknown_08C0237C, 0x0120, 0xd705},
-    {gUnknown_08C0237C, 0x0100, 0xd706},
-    {gUnknown_08C0237C, 0x0120, 0xd707}
+    {gBlankGfxCompressed, 0x0100, 0xd704},
+    {gBlankGfxCompressed, 0x0120, 0xd705},
+    {gBlankGfxCompressed, 0x0100, 0xd706},
+    {gBlankGfxCompressed, 0x0120, 0xd707}
 };
 
 static const struct SpritePalette gUnknown_0832C128[2] =
diff --git a/src/decoration.c b/src/decoration.c
index 512252f7d..c539091c8 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -25,7 +25,7 @@
 #include "sound.h"
 #include "event_scripts.h"
 #include "event_data.h"
-#include "region_map_sections.h"
+#include "constants/region_map_sections.h"
 #include "player_pc.h"
 #include "strings.h"
 #include "tv.h"
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 2496b9564..414959882 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -97,7 +97,7 @@ extern u16 sub_818D7D8(u16 species, u32 trainerId, u32 personality, u8 arg3, s16
 extern void sub_8198204(u8 *dst, const u8 *src, u8, u8, u8);
 extern bool8 sub_80F9C30(void);
 extern void sub_8198314(void);
-extern void sub_8137C3C(void);
+extern void ReturnFromHallOfFamePC(void);
 extern void sub_8198180(const u8 *src, u8, u8);
 extern void sub_80F9BF4(u16, u16, u8);
 extern void sub_81980F0(u8, u8, u8, u8, u16);
@@ -1108,7 +1108,7 @@ static void Task_HofPC_HandleExit(u8 taskId)
         if (sHofMonPtr != NULL)
             FREE_AND_SET_NULL(sHofMonPtr);
 
-        sub_8137C3C();
+        ReturnFromHallOfFamePC();
     }
 }
 
diff --git a/src/landmark.c b/src/landmark.c
index 3d4ed862b..4eade159a 100644
--- a/src/landmark.c
+++ b/src/landmark.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "event_data.h"
-#include "region_map_sections.h"
+#include "constants/region_map_sections.h"
 
 struct Landmark
 {
diff --git a/src/region_map.c b/src/region_map.c
index 261243792..086c0ba68 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -21,7 +21,7 @@
 #include "m4a.h"
 #include "field_effect.h"
 #include "region_map.h"
-#include "region_map_sections.h"
+#include "constants/region_map_sections.h"
 
 #define MAP_WIDTH 28
 #define MAP_HEIGHT 15
diff --git a/src/tv.c b/src/tv.c
index 1621a9934..af0c7069c 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -32,7 +32,7 @@
 #include "naming_screen.h"
 #include "malloc.h"
 #include "region_map.h"
-#include "region_map_sections.h"
+#include "constants/region_map_sections.h"
 #include "decoration.h"
 #include "secret_base.h"
 #include "tv.h"
-- 
cgit v1.2.3


From 03a2a3b81bba374bdf3a74a37a4dc3e2d17a196f Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Thu, 28 Dec 2017 17:15:37 -0500
Subject: fourteenth wave of graphics.s dumps

---
 src/mail.c                   | 96 ++++++++++++++++++++++----------------------
 src/pokedex.c                |  4 +-
 src/pokemon_summary_screen.c | 18 ++++-----
 3 files changed, 59 insertions(+), 59 deletions(-)

(limited to 'src')

diff --git a/src/mail.c b/src/mail.c
index ec7ff2ce2..68a55e242 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -20,42 +20,42 @@
 #include "malloc.h"
 #include "easy_chat.h"
 
-extern const u16 gUnknown_08DBE818[];
-extern const u16 gUnknown_08DBE838[];
-extern const u16 gUnknown_08DBE858[];
-extern const u16 gUnknown_08DBE878[];
-extern const u16 gUnknown_08DBE898[];
-extern const u16 gUnknown_08DBE8B8[];
-extern const u16 gUnknown_08DBE8D8[];
-extern const u16 gUnknown_08DBE8F8[];
-extern const u16 gUnknown_08DBE918[];
-extern const u16 gUnknown_08DBE938[];
-extern const u16 gUnknown_08DBE958[];
-extern const u16 gUnknown_08DBE978[];
-extern const u8 gUnknown_08DBE998[];
-extern const u8 gUnknown_08DBFBA4[];
-extern const u8 gUnknown_08DBEB38[];
-extern const u8 gUnknown_08DBFC7C[];
-extern const u8 gUnknown_08DBEC74[];
-extern const u8 gUnknown_08DBFD5C[];
-extern const u8 gUnknown_08DBEE84[];
-extern const u8 gUnknown_08DBFE68[];
-extern const u8 gUnknown_08DBEF5C[];
-extern const u8 gUnknown_08DBFF44[];
-extern const u8 gUnknown_08DBF154[];
-extern const u8 gUnknown_08DC0034[];
-extern const u8 gUnknown_08DBF2D4[];
-extern const u8 gUnknown_08DC0114[];
-extern const u8 gUnknown_08DBF37C[];
-extern const u8 gUnknown_08DC01F4[];
-extern const u8 gUnknown_08DBF50C[];
-extern const u8 gUnknown_08DC0300[];
-extern const u8 gUnknown_08DBF64C[];
-extern const u8 gUnknown_08DC03F0[];
-extern const u8 gUnknown_08DBF7B4[];
-extern const u8 gUnknown_08DC04E8[];
-extern const u8 gUnknown_08DBF904[];
-extern const u8 gUnknown_08DC0600[];
+extern const u16 gMailPalette_Orange[];
+extern const u16 gMailPalette_Harbor[];
+extern const u16 gMailPalette_Glitter[];
+extern const u16 gMailPalette_Mech[];
+extern const u16 gMailPalette_Wood[];
+extern const u16 gMailPalette_Wave[];
+extern const u16 gMailPalette_Bead[];
+extern const u16 gMailPalette_Shadow[];
+extern const u16 gMailPalette_Tropic[];
+extern const u16 gMailPalette_Dream[];
+extern const u16 gMailPalette_Fab[];
+extern const u16 gMailPalette_Retro[];
+extern const u8 gMailTiles_Orange[];
+extern const u8 gMailTilemap_Orange[];
+extern const u8 gMailTiles_Harbor[];
+extern const u8 gMailTilemap_Harbor[];
+extern const u8 gMailTiles_Glitter[];
+extern const u8 gMailTilemap_Glitter[];
+extern const u8 gMailTiles_Mech[];
+extern const u8 gMailTilemap_Mech[];
+extern const u8 gMailTiles_Wood[];
+extern const u8 gMailTilemap_Wood[];
+extern const u8 gMailTiles_Wave[];
+extern const u8 gMailTilemap_Wave[];
+extern const u8 gMailTiles_Bead[];
+extern const u8 gMailTilemap_Bead[];
+extern const u8 gMailTiles_Shadow[];
+extern const u8 gMailTilemap_Shadow[];
+extern const u8 gMailTiles_Tropic[];
+extern const u8 gMailTilemap_Tropic[];
+extern const u8 gMailTiles_Dream[];
+extern const u8 gMailTilemap_Dream[];
+extern const u8 gMailTiles_Fab[];
+extern const u8 gMailTilemap_Fab[];
+extern const u8 gMailTiles_Retro[];
+extern const u8 gMailTilemap_Retro[];
 
 // Static type declarations
 
@@ -170,29 +170,29 @@ static const u16 sUnknown_0859F2B0[][2] = {
 
 static const struct MailGraphics sUnknown_0859F2B8[] = {
     {
-        gUnknown_08DBE818, gUnknown_08DBE998, gUnknown_08DBFBA4, 0x02c0, 0x0000, 0x294a, 0x6739
+        gMailPalette_Orange, gMailTiles_Orange, gMailTilemap_Orange, 0x02c0, 0x0000, 0x294a, 0x6739
     }, {
-        gUnknown_08DBE838, gUnknown_08DBEB38, gUnknown_08DBFC7C, 0x02e0, 0x0000, 0x7fff, 0x4631
+        gMailPalette_Harbor, gMailTiles_Harbor, gMailTilemap_Harbor, 0x02e0, 0x0000, 0x7fff, 0x4631
     }, {
-        gUnknown_08DBE858, gUnknown_08DBEC74, gUnknown_08DBFD5C, 0x0400, 0x0000, 0x294a, 0x6739
+        gMailPalette_Glitter, gMailTiles_Glitter, gMailTilemap_Glitter, 0x0400, 0x0000, 0x294a, 0x6739
     }, {
-        gUnknown_08DBE878, gUnknown_08DBEE84, gUnknown_08DBFE68, 0x01e0, 0x0000, 0x7fff, 0x4631
+        gMailPalette_Mech, gMailTiles_Mech, gMailTilemap_Mech, 0x01e0, 0x0000, 0x7fff, 0x4631
     }, {
-        gUnknown_08DBE898, gUnknown_08DBEF5C, gUnknown_08DBFF44, 0x02e0, 0x0000, 0x7fff, 0x4631
+        gMailPalette_Wood, gMailTiles_Wood, gMailTilemap_Wood, 0x02e0, 0x0000, 0x7fff, 0x4631
     }, {
-        gUnknown_08DBE8B8, gUnknown_08DBF154, gUnknown_08DC0034, 0x0300, 0x0000, 0x294a, 0x6739
+        gMailPalette_Wave, gMailTiles_Wave, gMailTilemap_Wave, 0x0300, 0x0000, 0x294a, 0x6739
     }, {
-        gUnknown_08DBE8D8, gUnknown_08DBF2D4, gUnknown_08DC0114, 0x0140, 0x0000, 0x7fff, 0x4631
+        gMailPalette_Bead, gMailTiles_Bead, gMailTilemap_Bead, 0x0140, 0x0000, 0x7fff, 0x4631
     }, {
-        gUnknown_08DBE8F8, gUnknown_08DBF37C, gUnknown_08DC01F4, 0x0300, 0x0000, 0x7fff, 0x4631
+        gMailPalette_Shadow, gMailTiles_Shadow, gMailTilemap_Shadow, 0x0300, 0x0000, 0x7fff, 0x4631
     }, {
-        gUnknown_08DBE918, gUnknown_08DBF50C, gUnknown_08DC0300, 0x0220, 0x0000, 0x294a, 0x6739
+        gMailPalette_Tropic, gMailTiles_Tropic, gMailTilemap_Tropic, 0x0220, 0x0000, 0x294a, 0x6739
     }, {
-        gUnknown_08DBE938, gUnknown_08DBF64C, gUnknown_08DC03F0, 0x0340, 0x0000, 0x294a, 0x6739
+        gMailPalette_Dream, gMailTiles_Dream, gMailTilemap_Dream, 0x0340, 0x0000, 0x294a, 0x6739
     }, {
-        gUnknown_08DBE958, gUnknown_08DBF7B4, gUnknown_08DC04E8, 0x02a0, 0x0000, 0x294a, 0x6739
+        gMailPalette_Fab, gMailTiles_Fab, gMailTilemap_Fab, 0x02a0, 0x0000, 0x294a, 0x6739
     }, {
-        gUnknown_08DBE978, gUnknown_08DBF904, gUnknown_08DC0600, 0x0520, 0x0000, 0x294a, 0x6739
+        gMailPalette_Retro, gMailTiles_Retro, gMailTilemap_Retro, 0x0520, 0x0000, 0x294a, 0x6739
     }
 };
 
diff --git a/src/pokedex.c b/src/pokedex.c
index 964f41716..a74594865 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -481,13 +481,13 @@ const struct SpriteTemplate gUnknown_0855D254 =
 
 const struct CompressedSpriteSheet gSpriteSheets_0855D26C[] =
 {
-    {gUnknown_08DC234C, 0x2000, 4096},
+    {gPokedexMenu2_Gfx, 0x2000, 4096},
     {0}
 };
 
 const struct CompressedSpritePalette gSpritePalettes_0855D26C[] =
 {
-    {gUnknown_08DC16F4, 4096},
+    {gPokedexText_Pal, 4096},
     {0}
 };
 
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 45aaf0e08..d659b2a02 100755
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -50,7 +50,7 @@ extern struct UnkStruct_61CC04 gUnknown_0861CC04;
 extern struct UnkStruct_61CC04 gUnknown_0861CC10;
 extern struct UnkStruct_61CC04 gUnknown_0861CBEC;
 extern struct UnkStruct_61CC04 gUnknown_0861CBF8;
-extern u16 gUnknown_08DC3CD4[];
+extern u16 gSummaryScreenWindow_Tilemap[];
 extern struct ContestMove gContestMoves[];
 extern struct ContestEffect gContestEffects[];
 extern struct WindowTemplate gUnknown_0861CC24;
@@ -2343,18 +2343,18 @@ void sub_81C2194(u16 *a, u16 b, u8 c)
     {
         for (i = 0; i < 20; i++)
         {
-            a[(i + var) << 1] = gUnknown_08DC3CD4[i] + b;
-            a[((i + var) << 1) + 0x40] = gUnknown_08DC3CD4[i] + b;
-            a[((i + var) << 1) + 0x80] = gUnknown_08DC3CD4[i + 20] + b;
+            a[(i + var) << 1] = gSummaryScreenWindow_Tilemap[i] + b;
+            a[((i + var) << 1) + 0x40] = gSummaryScreenWindow_Tilemap[i] + b;
+            a[((i + var) << 1) + 0x80] = gSummaryScreenWindow_Tilemap[i + 20] + b;
         }
     }
     else
     {
         for (i = 0; i < 20; i++)
         {
-            a[(i + var)] = gUnknown_08DC3CD4[i + 20] + b;
-            a[((i + var)) + 0x40] = gUnknown_08DC3CD4[i + 40] + b;
-            a[((i + var)) + 0x80] = gUnknown_08DC3CD4[i + 40] + b;
+            a[(i + var)] = gSummaryScreenWindow_Tilemap[i + 20] + b;
+            a[((i + var)) + 0x40] = gSummaryScreenWindow_Tilemap[i + 40] + b;
+            a[((i + var)) + 0x80] = gSummaryScreenWindow_Tilemap[i + 40] + b;
         }
     }
 }
@@ -2372,7 +2372,7 @@ void sub_81C2194(u16 *a, u16 b, u8 c)
 	cmp r2, 0\n\
 	bne _081C21E4\n\
 	movs r3, 0\n\
-	ldr r5, =gUnknown_08DC3CD4\n\
+	ldr r5, =gSummaryScreenWindow_Tilemap\n\
 _081C21A8:\n\
 	adds r2, r7, r3\n\
 	lsls r2, 1\n\
@@ -2402,7 +2402,7 @@ _081C21A8:\n\
 	.pool\n\
 _081C21E4:\n\
 	movs r3, 0\n\
-	ldr r5, =gUnknown_08DC3CD4\n\
+	ldr r5, =gSummaryScreenWindow_Tilemap\n\
 _081C21E8:\n\
 	adds r1, r7, r3\n\
 	lsls r1, 1\n\
-- 
cgit v1.2.3


From 06aa07306e36e5674eeb0114120829e9ae114c25 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 29 Dec 2017 20:25:32 -0500
Subject: sixteenth wave of graphics.s dumps

---
 src/wallclock.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/wallclock.c b/src/wallclock.c
index 897576719..ea6137c5d 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -92,8 +92,8 @@ static const struct CompressedSpriteSheet gUnknown_085B2208 = {
 };
 static const u32 filler_85B2210[2] = {};
 static const struct SpritePalette gUnknown_085B2218[] = {
-    { gUnknown_08DCC01C, TAG_PAL_WALL_CLOCK_HAND },
-    { gUnknown_08DCC03C, 0x1001 },
+    { gWallclockMale_Pal, TAG_PAL_WALL_CLOCK_HAND },
+    { gWallclockFemale_Pal, 0x1001 },
     {}
 };
 static const struct OamData Unknown_085B2230 = {
@@ -561,14 +561,14 @@ static void LoadWallClockGraphics(void)
     DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000);
     DmaClear32(3, (void *)OAM, OAM_SIZE);
     DmaClear16(3, (void *)PLTT, PLTT_SIZE);
-    LZ77UnCompVram(gUnknown_08DCC05C, (void *)VRAM);
+    LZ77UnCompVram(gWallclock_Gfx, (void *)VRAM);
     if (gSpecialVar_0x8004 == 0)
     {
-        LoadPalette(gUnknown_08DCC01C, 0x00, 0x20);
+        LoadPalette(gWallclockMale_Pal, 0x00, 0x20);
     }
     else
     {
-        LoadPalette(gUnknown_08DCC03C, 0x00, 0x20);
+        LoadPalette(gWallclockFemale_Pal, 0x00, 0x20);
     }
     LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 0x20);
     LoadPalette(sUnknown_085B21D4, 0xc0, 0x08);
-- 
cgit v1.2.3


From 48378f791c5cf0ee10931626ef5b01aed26238bb Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 30 Dec 2017 01:09:06 -0500
Subject: last wave of graphics.s dumps

---
 src/berry_fix_program.c | 72 ++++++++++++++++++++++++-------------------------
 src/egg_hatch.c         |  8 +++---
 src/unk_81BAD84.c       | 36 ++++++++++++-------------
 3 files changed, 58 insertions(+), 58 deletions(-)

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 195490543..3b2bfb5f7 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -81,50 +81,50 @@ static const u8 *const gUnknown_08618160[] = {
     Unknown_08617EA3
 };
 
-extern const u8 gUnknown_08DD87C0[];
-extern const u8 gUnknown_08DD8EE0[];
-extern const u8 gUnknown_08DD8780[];
-extern const u8 gUnknown_08DD90E0[];
-extern const u8 gUnknown_08DD9718[];
-extern const u8 gUnknown_08DD9080[];
-extern const u8 gUnknown_08DD98B4[];
-extern const u8 gUnknown_08DD9E58[];
-extern const u8 gUnknown_08DD9874[];
-extern const u8 gUnknown_08DDA02C[];
-extern const u8 gUnknown_08DDA63C[];
-extern const u8 gUnknown_08DD9FEC[];
-extern const u8 gUnknown_08DDA840[];
-extern const u8 gUnknown_08DDAE40[];
-extern const u8 gUnknown_08DDA800[];
-extern const u8 gUnknown_08DDB020[];
-extern const u8 gUnknown_08DDB2C4[];
-extern const u8 gUnknown_08DDAFE0[];
+extern const u8 gBerryFixGameboy_Gfx[];
+extern const u8 gBerryFixGameboy_Tilemap[];
+extern const u8 gBerryFixGameboy_Pal[];
+extern const u8 gBerryFixGameboyLogo_Gfx[];
+extern const u8 gBerryFixGameboyLogo_Tilemap[];
+extern const u8 gBerryFixGameboyLogo_Pal[];
+extern const u8 gBerryFixGbaTransfer_Gfx[];
+extern const u8 gBerryFixGbaTransfer_Tilemap[];
+extern const u8 gBerryFixGbaTransfer_Pal[];
+extern const u8 gBerryFixGbaTransferHighlight_Gfx[];
+extern const u8 gBerryFixGbaTransferHighlight_Tilemap[];
+extern const u8 gBerryFixGbaTransferHighlight_Pal[];
+extern const u8 gBerryFixGbaTransferError_Gfx[];
+extern const u8 gBerryFixGbaTransferError_Tilemap[];
+extern const u8 gBerryFixGbaTransferError_Pal[];
+extern const u8 gBerryFixWindow_Gfx[];
+extern const u8 gBerryFixWindow_Tilemap[];
+extern const u8 gBerryFixWindow_Pal[];
 
 static const u8 *const gUnknown_08618178[][3] = {
     {
-        gUnknown_08DD87C0,
-        gUnknown_08DD8EE0,
-        gUnknown_08DD8780
+        gBerryFixGameboy_Gfx,
+        gBerryFixGameboy_Tilemap,
+        gBerryFixGameboy_Pal
     }, {
-        gUnknown_08DD90E0,
-        gUnknown_08DD9718,
-        gUnknown_08DD9080
+        gBerryFixGameboyLogo_Gfx,
+        gBerryFixGameboyLogo_Tilemap,
+        gBerryFixGameboyLogo_Pal
     }, {
-        gUnknown_08DD98B4,
-        gUnknown_08DD9E58,
-        gUnknown_08DD9874
+        gBerryFixGbaTransfer_Gfx,
+        gBerryFixGbaTransfer_Tilemap,
+        gBerryFixGbaTransfer_Pal
     }, {
-        gUnknown_08DDA02C,
-        gUnknown_08DDA63C,
-        gUnknown_08DD9FEC
+        gBerryFixGbaTransferHighlight_Gfx,
+        gBerryFixGbaTransferHighlight_Tilemap,
+        gBerryFixGbaTransferHighlight_Pal
     }, {
-        gUnknown_08DDA840,
-        gUnknown_08DDAE40,
-        gUnknown_08DDA800
+        gBerryFixGbaTransferError_Gfx,
+        gBerryFixGbaTransferError_Tilemap,
+        gBerryFixGbaTransferError_Pal
     }, {
-        gUnknown_08DDB020,
-        gUnknown_08DDB2C4,
-        gUnknown_08DDAFE0
+        gBerryFixWindow_Gfx,
+        gBerryFixWindow_Tilemap,
+        gBerryFixWindow_Pal
     },
 };
 
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 721ba4a4f..1aff894b9 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -51,8 +51,8 @@ extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const u8 gBattleTextboxTiles[];
 extern const u8 gBattleTextboxTilemap[];
 extern const u8 gBattleTextboxPalette[];
-extern const u16 gUnknown_08DD7300[]; // palette, gameboy advance
-extern const u32 gUnknown_08DD7360[]; // tileset gameboy advance
+extern const u16 gTradeGba2_Pal[]; // palette, gameboy advance
+extern const u32 gTradeGba_Gfx[]; // tileset gameboy advance
 extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle
 extern const u8 gText_HatchedFromEgg[];
 extern const u8 gText_NickHatchPrompt[];
@@ -548,8 +548,8 @@ static void CB2_EggHatch_0(void)
         break;
     case 7:
         SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
-        LoadPalette(gUnknown_08DD7300, 0x10, 0xA0);
-        LoadBgTiles(1, gUnknown_08DD7360, 0x1420, 0);
+        LoadPalette(gTradeGba2_Pal, 0x10, 0xA0);
+        LoadBgTiles(1, gTradeGba_Gfx, 0x1420, 0);
         CopyToBgTilemapBuffer(1, gUnknown_08331F60, 0x1000, 0);
         CopyBgTilemapBufferToVram(1);
         gMain.state++;
diff --git a/src/unk_81BAD84.c b/src/unk_81BAD84.c
index 9ba98dd87..c0d891c12 100644
--- a/src/unk_81BAD84.c
+++ b/src/unk_81BAD84.c
@@ -7,29 +7,29 @@ const struct {
     const u16 *pltt;
 } gUnknown_08617128[] = {
     {
-        gUnknown_08DD87C0,
-        gUnknown_08DD8EE0,
-        gUnknown_08DD8780
+        gBerryFixGameboy_Gfx,
+        gBerryFixGameboy_Tilemap,
+        gBerryFixGameboy_Pal
     }, {
-        gUnknown_08DD90E0,
-        gUnknown_08DD9718,
-        gUnknown_08DD9080
+        gBerryFixGameboyLogo_Gfx,
+        gBerryFixGameboyLogo_Tilemap,
+        gBerryFixGameboyLogo_Pal
     }, {
-        gUnknown_08DD98B4,
-        gUnknown_08DD9E58,
-        gUnknown_08DD9874
+        gBerryFixGbaTransfer_Gfx,
+        gBerryFixGbaTransfer_Tilemap,
+        gBerryFixGbaTransfer_Pal
     }, {
-        gUnknown_08DDA02C,
-        gUnknown_08DDA63C,
-        gUnknown_08DD9FEC
+        gBerryFixGbaTransferHighlight_Gfx,
+        gBerryFixGbaTransferHighlight_Tilemap,
+        gBerryFixGbaTransferHighlight_Pal
     }, {
-        gUnknown_08DDA840,
-        gUnknown_08DDAE40,
-        gUnknown_08DDA800
+        gBerryFixGbaTransferError_Gfx,
+        gBerryFixGbaTransferError_Tilemap,
+        gBerryFixGbaTransferError_Pal
     }, {
-        gUnknown_08DDB020,
-        gUnknown_08DDB2C4,
-        gUnknown_08DDAFE0
+        gBerryFixWindow_Gfx,
+        gBerryFixWindow_Tilemap,
+        gBerryFixWindow_Pal
     }
 };
 
-- 
cgit v1.2.3


From 5ae6461cc5c43bbeca4cd38efcb340207f762303 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 30 Dec 2017 12:19:02 +0100
Subject: commit

---
 src/battle_ai_script_commands.c | 177 ++++++++++++++++++++--------------------
 1 file changed, 87 insertions(+), 90 deletions(-)

(limited to 'src')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 7a30de75b..f03381f70 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -104,30 +104,30 @@ static void BattleAICmd_if_less_than(void);
 static void BattleAICmd_if_more_than(void);
 static void BattleAICmd_if_equal(void);
 static void BattleAICmd_if_not_equal(void);
-static void BattleAICmd_if_less_than_32(void);
-static void BattleAICmd_if_more_than_32(void);
-static void BattleAICmd_if_equal_32(void);
-static void BattleAICmd_if_not_equal_32(void);
+static void BattleAICmd_if_less_than_ptr(void);
+static void BattleAICmd_if_more_than_ptr(void);
+static void BattleAICmd_if_equal_ptr(void);
+static void BattleAICmd_if_not_equal_ptr(void);
 static void BattleAICmd_if_move(void);
 static void BattleAICmd_if_not_move(void);
 static void BattleAICmd_if_in_bytes(void);
 static void BattleAICmd_if_not_in_bytes(void);
 static void BattleAICmd_if_in_hwords(void);
 static void BattleAICmd_if_not_in_hwords(void);
-static void BattleAICmd_if_user_can_damage(void);
-static void BattleAICmd_if_user_cant_damage(void);
+static void BattleAICmd_if_user_has_attacking_move(void);
+static void BattleAICmd_if_user_has_no_attacking_moves(void);
 static void BattleAICmd_get_turn_count(void);
 static void BattleAICmd_get_type(void);
-static void BattleAICmd_get_last_used_bank_move_power(void);
-static void BattleAICmd_is_most_powerful_move(void);
+static void BattleAICmd_get_considered_move_power(void);
+static void BattleAICmd_get_how_powerful_move_is(void);
 static void BattleAICmd_get_last_used_bank_move(void);
-static void BattleAICmd_if_arg_equal(void);
-static void BattleAICmd_if_arg_not_equal(void);
-static void BattleAICmd_if_would_go_first(void);
-static void BattleAICmd_if_would_not_go_first(void);
+static void BattleAICmd_if_equal_(void);
+static void BattleAICmd_if_not_equal_(void);
+static void BattleAICmd_if_user_goes(void);
+static void BattleAICmd_if_user_doesnt_go(void);
 static void BattleAICmd_nullsub_2A(void);
 static void BattleAICmd_nullsub_2B(void);
-static void BattleAICmd_count_alive_pokemon(void);
+static void BattleAICmd_count_usable_party_mons(void);
 static void BattleAICmd_get_considered_move(void);
 static void BattleAICmd_get_considered_move_effect(void);
 static void BattleAICmd_get_ability(void);
@@ -147,17 +147,17 @@ static void BattleAICmd_if_stat_level_not_equal(void);
 static void BattleAICmd_if_can_faint(void);
 static void BattleAICmd_if_cant_faint(void);
 static void BattleAICmd_if_has_move(void);
-static void BattleAICmd_if_dont_have_move(void);
-static void BattleAICmd_if_move_effect(void);
-static void BattleAICmd_if_not_move_effect(void);
+static void BattleAICmd_if_doesnt_have_move(void);
+static void BattleAICmd_if_has_move_with_effect(void);
+static void BattleAICmd_if_doesnt_have_move_with_effect(void);
 static void BattleAICmd_if_any_move_disabled_or_encored(void);
 static void BattleAICmd_if_curr_move_disabled_or_encored(void);
 static void BattleAICmd_flee(void);
-static void BattleAICmd_if_random_100(void);
+static void BattleAICmd_if_random_safari_flee(void);
 static void BattleAICmd_watch(void);
 static void BattleAICmd_get_hold_effect(void);
 static void BattleAICmd_get_gender(void);
-static void BattleAICmd_is_first_turn(void);
+static void BattleAICmd_is_first_turn_for(void);
 static void BattleAICmd_get_stockpile_count(void);
 static void BattleAICmd_is_double_battle(void);
 static void BattleAICmd_get_used_held_item(void);
@@ -172,7 +172,7 @@ static void BattleAICmd_nullsub_55(void);
 static void BattleAICmd_nullsub_56(void);
 static void BattleAICmd_nullsub_57(void);
 static void BattleAICmd_call(void);
-static void BattleAICmd_jump(void);
+static void BattleAICmd_goto(void);
 static void BattleAICmd_end(void);
 static void BattleAICmd_if_level_cond(void);
 static void BattleAICmd_if_target_taunted(void);
@@ -215,30 +215,30 @@ static const BattleAICmdFunc sBattleAICmdTable[] =
     BattleAICmd_if_more_than,                // 0x12
     BattleAICmd_if_equal,                    // 0x13
     BattleAICmd_if_not_equal,                // 0x14
-    BattleAICmd_if_less_than_32,             // 0x15
-    BattleAICmd_if_more_than_32,             // 0x16
-    BattleAICmd_if_equal_32,                 // 0x17
-    BattleAICmd_if_not_equal_32,             // 0x18
+    BattleAICmd_if_less_than_ptr,             // 0x15
+    BattleAICmd_if_more_than_ptr,             // 0x16
+    BattleAICmd_if_equal_ptr,                 // 0x17
+    BattleAICmd_if_not_equal_ptr,             // 0x18
     BattleAICmd_if_move,                     // 0x19
     BattleAICmd_if_not_move,                 // 0x1A
     BattleAICmd_if_in_bytes,                 // 0x1B
     BattleAICmd_if_not_in_bytes,             // 0x1C
     BattleAICmd_if_in_hwords,                 // 0x1D
     BattleAICmd_if_not_in_hwords,             // 0x1E
-    BattleAICmd_if_user_can_damage,          // 0x1F
-    BattleAICmd_if_user_cant_damage,         // 0x20
+    BattleAICmd_if_user_has_attacking_move,          // 0x1F
+    BattleAICmd_if_user_has_no_attacking_moves,         // 0x20
     BattleAICmd_get_turn_count,              // 0x21
     BattleAICmd_get_type,                    // 0x22
-    BattleAICmd_get_last_used_bank_move_power,              // 0x23
-    BattleAICmd_is_most_powerful_move,       // 0x24
+    BattleAICmd_get_considered_move_power,              // 0x23
+    BattleAICmd_get_how_powerful_move_is,       // 0x24
     BattleAICmd_get_last_used_bank_move,                    // 0x25
-    BattleAICmd_if_arg_equal,                // 0x26
-    BattleAICmd_if_arg_not_equal,            // 0x27
-    BattleAICmd_if_would_go_first,           // 0x28
-    BattleAICmd_if_would_not_go_first,       // 0x29
+    BattleAICmd_if_equal_,                // 0x26
+    BattleAICmd_if_not_equal_,            // 0x27
+    BattleAICmd_if_user_goes,           // 0x28
+    BattleAICmd_if_user_doesnt_go,       // 0x29
     BattleAICmd_nullsub_2A,                  // 0x2A
     BattleAICmd_nullsub_2B,                  // 0x2B
-    BattleAICmd_count_alive_pokemon,         // 0x2C
+    BattleAICmd_count_usable_party_mons,         // 0x2C
     BattleAICmd_get_considered_move,         // 0x2D
     BattleAICmd_get_considered_move_effect,  // 0x2E
     BattleAICmd_get_ability,                 // 0x2F
@@ -258,17 +258,17 @@ static const BattleAICmdFunc sBattleAICmdTable[] =
     BattleAICmd_if_can_faint,                // 0x3D
     BattleAICmd_if_cant_faint,               // 0x3E
     BattleAICmd_if_has_move,                 // 0x3F
-    BattleAICmd_if_dont_have_move,           // 0x40
-    BattleAICmd_if_move_effect,              // 0x41
-    BattleAICmd_if_not_move_effect,          // 0x42
+    BattleAICmd_if_doesnt_have_move,           // 0x40
+    BattleAICmd_if_has_move_with_effect,              // 0x41
+    BattleAICmd_if_doesnt_have_move_with_effect,          // 0x42
     BattleAICmd_if_any_move_disabled_or_encored,            // 0x43
     BattleAICmd_if_curr_move_disabled_or_encored,           // 0x44
     BattleAICmd_flee,                        // 0x45
-    BattleAICmd_if_random_100,               // 0x46
+    BattleAICmd_if_random_safari_flee,               // 0x46
     BattleAICmd_watch,                       // 0x47
     BattleAICmd_get_hold_effect,             // 0x48
     BattleAICmd_get_gender,                  // 0x49
-    BattleAICmd_is_first_turn,               // 0x4A
+    BattleAICmd_is_first_turn_for,               // 0x4A
     BattleAICmd_get_stockpile_count,         // 0x4B
     BattleAICmd_is_double_battle,            // 0x4C
     BattleAICmd_get_used_held_item,          // 0x4D
@@ -283,7 +283,7 @@ static const BattleAICmdFunc sBattleAICmdTable[] =
     BattleAICmd_nullsub_56,                  // 0x56
     BattleAICmd_nullsub_57,                  // 0x57
     BattleAICmd_call,                        // 0x58
-    BattleAICmd_jump,                        // 0x59
+    BattleAICmd_goto,                        // 0x59
     BattleAICmd_end,                         // 0x5A
     BattleAICmd_if_level_cond,               // 0x5B
     BattleAICmd_if_target_taunted,           // 0x5C
@@ -959,41 +959,41 @@ static void BattleAICmd_if_not_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_less_than_32(void)
+static void BattleAICmd_if_less_than_ptr(void)
 {
-    const u8 *temp = AIScriptReadPtr(gAIScriptPtr + 1);
+    const u8 *value = AIScriptReadPtr(gAIScriptPtr + 1);
 
-    if (AI_THINKING_STRUCT->funcResult < *temp)
+    if (AI_THINKING_STRUCT->funcResult < *value)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
     else
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_more_than_32(void)
+static void BattleAICmd_if_more_than_ptr(void)
 {
-    const u8 *temp = AIScriptReadPtr(gAIScriptPtr + 1);
+    const u8 *value = AIScriptReadPtr(gAIScriptPtr + 1);
 
-    if (AI_THINKING_STRUCT->funcResult > *temp)
+    if (AI_THINKING_STRUCT->funcResult > *value)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
     else
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_equal_32(void)
+static void BattleAICmd_if_equal_ptr(void)
 {
-    const u8 *temp = AIScriptReadPtr(gAIScriptPtr + 1);
+    const u8 *value = AIScriptReadPtr(gAIScriptPtr + 1);
 
-    if (AI_THINKING_STRUCT->funcResult == *temp)
+    if (AI_THINKING_STRUCT->funcResult == *value)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
     else
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_not_equal_32(void)
+static void BattleAICmd_if_not_equal_ptr(void)
 {
-    const u8 *temp = AIScriptReadPtr(gAIScriptPtr + 1);
+    const u8 *value = AIScriptReadPtr(gAIScriptPtr + 1);
 
-    if (AI_THINKING_STRUCT->funcResult != *temp)
+    if (AI_THINKING_STRUCT->funcResult != *value)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
     else
         gAIScriptPtr += 9;
@@ -1083,7 +1083,7 @@ static void BattleAICmd_if_not_in_hwords(void)
     gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 5);
 }
 
-static void BattleAICmd_if_user_can_damage(void)
+static void BattleAICmd_if_user_has_attacking_move(void)
 {
     s32 i;
 
@@ -1099,7 +1099,7 @@ static void BattleAICmd_if_user_can_damage(void)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
 }
 
-static void BattleAICmd_if_user_cant_damage(void)
+static void BattleAICmd_if_user_has_no_attacking_moves(void)
 {
     s32 i;
 
@@ -1168,23 +1168,23 @@ static void BattleAICmd_is_of_type(void)
 
     if(gBattleMons[bank].type1 == gAIScriptPtr[2] || gBattleMons[bank].type2 == gAIScriptPtr[2])
     {
-        AI_THINKING_STRUCT->funcResult = 1;
+        AI_THINKING_STRUCT->funcResult = TRUE;
     }
     else
     {
-        AI_THINKING_STRUCT->funcResult = 0;
+        AI_THINKING_STRUCT->funcResult = FALSE;
     }
 
     gAIScriptPtr += 3;
 }
 
-static void BattleAICmd_get_last_used_bank_move_power(void)
+static void BattleAICmd_get_considered_move_power(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power;
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_is_most_powerful_move(void)
+static void BattleAICmd_get_how_powerful_move_is(void)
 {
     s32 i, checkedMove;
     s32 moveDmgs[4];
@@ -1258,7 +1258,7 @@ static void BattleAICmd_get_last_used_bank_move(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_if_arg_equal(void)
+static void BattleAICmd_if_equal_(void) // same as if_equal
 {
     if (gAIScriptPtr[1] == AI_THINKING_STRUCT->funcResult)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
@@ -1266,7 +1266,7 @@ static void BattleAICmd_if_arg_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_arg_not_equal(void)
+static void BattleAICmd_if_not_equal_(void) // same as if_not_equal
 {
     if (gAIScriptPtr[1] != AI_THINKING_STRUCT->funcResult)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
@@ -1274,7 +1274,7 @@ static void BattleAICmd_if_arg_not_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_would_go_first(void)
+static void BattleAICmd_if_user_goes(void)
 {
     if (GetWhoStrikesFirst(sBank_AI, gBankTarget, TRUE) == gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
@@ -1282,7 +1282,7 @@ static void BattleAICmd_if_would_go_first(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_would_not_go_first(void)
+static void BattleAICmd_if_user_doesnt_go(void)
 {
     if (GetWhoStrikesFirst(sBank_AI, gBankTarget, TRUE) != gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
@@ -1298,7 +1298,7 @@ static void BattleAICmd_nullsub_2B(void)
 {
 }
 
-static void BattleAICmd_count_alive_pokemon(void)
+static void BattleAICmd_count_usable_party_mons(void)
 {
     u8 bank;
     u8 bankOnField1, bankOnField2;
@@ -1319,10 +1319,10 @@ static void BattleAICmd_count_alive_pokemon(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        u32 status;
+        u32 identity;
         bankOnField1 = gBattlePartyID[bank];
-        status = GetBankIdentity(bank) ^ 2;
-        bankOnField2 = gBattlePartyID[GetBankByIdentity(status)];
+        identity = GetBankIdentity(bank) ^ BIT_MON;
+        bankOnField2 = gBattlePartyID[GetBankByIdentity(identity)];
     }
     else // in singles there's only one bank by side
     {
@@ -1330,7 +1330,7 @@ static void BattleAICmd_count_alive_pokemon(void)
         bankOnField2 = gBattlePartyID[bank];
     }
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         if (i != bankOnField1 && i != bankOnField2
          && GetMonData(&party[i], MON_DATA_HP) != 0
@@ -1365,9 +1365,9 @@ static void BattleAICmd_get_ability(void)
     else
         bank = gBankTarget;
 
-    if(gActiveBank != bank)
+    if (gActiveBank != bank)
     {
-        if(BATTLE_HISTORY->abilities[bank] != 0)
+        if (BATTLE_HISTORY->abilities[bank] != 0)
         {
             AI_THINKING_STRUCT->funcResult = BATTLE_HISTORY->abilities[bank];
             gAIScriptPtr += 2;
@@ -1581,11 +1581,11 @@ static void BattleAICmd_if_status_in_party(void)
             break;
     }
 
-    party = (GetBankSide(bank) == 0) ? gPlayerParty : gEnemyParty;
+    party = (GetBankSide(bank) == SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
 
     statusToCompareTo = AIScriptRead32(gAIScriptPtr + 2);
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         u16 species = GetMonData(&party[i], MON_DATA_SPECIES);
         u16 hp = GetMonData(&party[i], MON_DATA_HP);
@@ -1622,7 +1622,7 @@ static void BattleAICmd_if_status_not_in_party(void)
 
     statusToCompareTo = AIScriptRead32(gAIScriptPtr + 2);
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         u16 species = GetMonData(&party[i], MON_DATA_SPECIES);
         u16 hp = GetMonData(&party[i], MON_DATA_HP);
@@ -1786,14 +1786,14 @@ static void BattleAICmd_if_cant_faint(void)
 static void BattleAICmd_if_has_move(void)
 {
     int i;
-    const u16 *temp_ptr = (u16 *)(gAIScriptPtr + 2);
+    const u16 *movePtr = (u16 *)(gAIScriptPtr + 2);
 
-    switch(gAIScriptPtr[1])
+    switch (gAIScriptPtr[1])
     {
         case AI_USER:
             for (i = 0; i < 4; i++)
             {
-                if (gBattleMons[sBank_AI].moves[i] == *temp_ptr)
+                if (gBattleMons[sBank_AI].moves[i] == *movePtr)
                     break;
             }
             if (i == 4)
@@ -1807,7 +1807,7 @@ static void BattleAICmd_if_has_move(void)
                 return;
             }
         case AI_USER_PARTNER:
-            if (gBattleMons[sBank_AI ^ 2].hp == 0)
+            if (gBattleMons[sBank_AI ^ BIT_MON].hp == 0)
             {
                 gAIScriptPtr += 8;
                 return;
@@ -1816,7 +1816,7 @@ static void BattleAICmd_if_has_move(void)
             {
                 for (i = 0; i < 4; i++)
                 {
-                    if (gBattleMons[sBank_AI ^ 2].moves[i] == *temp_ptr)
+                    if (gBattleMons[sBank_AI ^ BIT_MON].moves[i] == *movePtr)
                         break;
                 }
             }
@@ -1834,7 +1834,7 @@ static void BattleAICmd_if_has_move(void)
         case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
-                if (BATTLE_HISTORY->usedMoves[gBankTarget].moves[i] == *temp_ptr)
+                if (BATTLE_HISTORY->usedMoves[gBankTarget].moves[i] == *movePtr)
                     break;
             }
             if (i == 4)
@@ -1850,10 +1850,10 @@ static void BattleAICmd_if_has_move(void)
     }
 }
 
-static void BattleAICmd_if_dont_have_move(void)
+static void BattleAICmd_if_doesnt_have_move(void)
 {
     int i;
-    const u16 *temp_ptr = (u16 *)(gAIScriptPtr + 2);
+    const u16 *movePtr = (u16 *)(gAIScriptPtr + 2);
 
     switch(gAIScriptPtr[1])
     {
@@ -1861,7 +1861,7 @@ static void BattleAICmd_if_dont_have_move(void)
         case AI_USER_PARTNER: // UB: no separate check for user partner
             for (i = 0; i < 4; i++)
             {
-                if (gBattleMons[sBank_AI].moves[i] == *temp_ptr)
+                if (gBattleMons[sBank_AI].moves[i] == *movePtr)
                     break;
             }
             if (i != 4)
@@ -1878,7 +1878,7 @@ static void BattleAICmd_if_dont_have_move(void)
         case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
-                if (BATTLE_HISTORY->usedMoves[gBankTarget].moves[i] == *temp_ptr)
+                if (BATTLE_HISTORY->usedMoves[gBankTarget].moves[i] == *movePtr)
                     break;
             }
             if (i != 4)
@@ -1894,7 +1894,7 @@ static void BattleAICmd_if_dont_have_move(void)
     }
 }
 
-static void BattleAICmd_if_move_effect(void)
+static void BattleAICmd_if_has_move_with_effect(void)
 {
     int i;
 
@@ -1927,7 +1927,7 @@ static void BattleAICmd_if_move_effect(void)
     }
 }
 
-static void BattleAICmd_if_not_move_effect(void)
+static void BattleAICmd_if_doesnt_have_move_with_effect(void)
 {
     int i;
 
@@ -2023,7 +2023,7 @@ static void BattleAICmd_flee(void)
     AI_THINKING_STRUCT->aiAction |= (AI_ACTION_DONE | AI_ACTION_FLEE | AI_ACTION_DO_NOT_ATTACK);
 }
 
-static void BattleAICmd_if_random_100(void)
+static void BattleAICmd_if_random_safari_flee(void)
 {
     u8 safariFleeRate = gBattleStruct->field_7B * 5; // safari flee rate, from 0-20
 
@@ -2041,7 +2041,6 @@ static void BattleAICmd_watch(void)
 static void BattleAICmd_get_hold_effect(void)
 {
     u8 bank;
-    u16 status;
 
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
@@ -2049,9 +2048,7 @@ static void BattleAICmd_get_hold_effect(void)
         bank = gBankTarget;
 
     if (gActiveBank != bank)
-    {
         AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(BATTLE_HISTORY->itemEffects[bank]);
-    }
     else
         AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(gBattleMons[bank].item);
 
@@ -2093,7 +2090,7 @@ static void BattleAICmd_get_gender(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_is_first_turn(void)
+static void BattleAICmd_is_first_turn_for(void)
 {
     u8 bank;
 
@@ -2212,7 +2209,7 @@ static void BattleAICmd_call(void)
     gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
 }
 
-static void BattleAICmd_jump(void)
+static void BattleAICmd_goto(void)
 {
     gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
 }
@@ -2272,7 +2269,7 @@ static void BattleAICmd_if_target_not_taunted(void)
 
 static void BattleAICmd_if_target_is_ally(void)
 {
-    if((sBank_AI & 1) == (gBankTarget & 1))
+    if ((sBank_AI & BIT_SIDE) == (gBankTarget & BIT_SIDE))
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -2282,7 +2279,7 @@ static void BattleAICmd_if_flash_fired(void)
 {
     u8 bank = BattleAI_GetWantedBank(gAIScriptPtr[1]);
 
-    if(gBattleResources->flags->flags[bank] & UNKNOWN_FLAG_FLASH_FIRE)
+    if (gBattleResources->flags->flags[bank] & UNKNOWN_FLAG_FLASH_FIRE)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
-- 
cgit v1.2.3


From ca29ad22e8522910e906863e3ab0bfe1f0686d48 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 30 Dec 2017 16:04:31 +0100
Subject: dump trainer ai scripts

---
 src/battle_ai_script_commands.c | 80 ++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 42 deletions(-)

(limited to 'src')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index f03381f70..42cf0595f 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -9,6 +9,7 @@
 #include "constants/battle_move_effects.h"
 #include "constants/moves.h"
 #include "util.h"
+#include "constants/battle_ai.h"
 
 #define AIScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24)
 #define AIScriptRead16(ptr) ((ptr)[0] | (ptr)[1] << 8)
@@ -26,14 +27,6 @@
 #define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(gBattleResources->ai))
 #define BATTLE_HISTORY ((struct BattleHistory *)(gBattleResources->battleHistory))
 
-enum
-{
-    AI_TARGET,
-    AI_USER,
-    AI_TARGET_PARTNER,
-    AI_USER_PARTNER
-};
-
 // AI states
 enum
 {
@@ -374,32 +367,34 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves)
     // decide a random target bank in doubles
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        gBankTarget = (Random() & 2) + (GetBankSide(gActiveBank) ^ 1);
+        gBankTarget = (Random() & BIT_MON) + (GetBankSide(gActiveBank) ^ BIT_SIDE);
         if (gAbsentBankFlags & gBitTable[gBankTarget])
-            gBankTarget ^= 2;
+            gBankTarget ^= BIT_MON;
     }
     // in singles there's only one choice
     else
-        gBankTarget = sBank_AI ^ 1;
+    {
+        gBankTarget = sBank_AI ^ BIT_SIDE;
+    }
 
     if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         AI_THINKING_STRUCT->aiFlags = GetAiScriptsInRecordedBattle();
     else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-        AI_THINKING_STRUCT->aiFlags = 0x40000000;
+        AI_THINKING_STRUCT->aiFlags = AI_SCRIPT_SAFARI;
     else if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
-        AI_THINKING_STRUCT->aiFlags = 0x20000000;
+        AI_THINKING_STRUCT->aiFlags = AI_SCRIPT_ROAMING;
     else if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE)
-        AI_THINKING_STRUCT->aiFlags = 0x80000000;
+        AI_THINKING_STRUCT->aiFlags = AI_SCRIPT_FIRST_BATTLE;
     else if (gBattleTypeFlags & BATTLE_TYPE_FACTORY)
         AI_THINKING_STRUCT->aiFlags = GetAiScriptsInBattleFactory();
     else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE))
-        AI_THINKING_STRUCT->aiFlags = 7; // the smartest possible set
+        AI_THINKING_STRUCT->aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_TRY_TO_FAINT;
     else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
         AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent_A].aiFlags | gTrainers[gTrainerBattleOpponent_B].aiFlags;
     else
        AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent_A].aiFlags;
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-        AI_THINKING_STRUCT->aiFlags |= 0x80; // act smart in doubles and don't attack your partner
+        AI_THINKING_STRUCT->aiFlags |= AI_SCRIPT_DOUBLE_BATTLE; // act smart in doubles and don't attack your partner
 }
 
 u8 BattleAI_ChooseMoveOrAction(void)
@@ -1127,19 +1122,19 @@ static void BattleAICmd_get_type(void)
 
     switch (typeVar)
     {
-    case 1: // player primary type
+    case AI_TYPE1_USER: // AI user primary type
         AI_THINKING_STRUCT->funcResult = gBattleMons[sBank_AI].type1;
         break;
-    case 0: // enemy primary type
+    case AI_TYPE1_TARGET: // target primary type
         AI_THINKING_STRUCT->funcResult = gBattleMons[gBankTarget].type1;
         break;
-    case 3: // player secondary type
+    case AI_TYPE2_USER: // AI user secondary type
         AI_THINKING_STRUCT->funcResult = gBattleMons[sBank_AI].type2;
         break;
-    case 2: // enemy secondary type
+    case AI_TYPE2_TARGET: // target secondary type
         AI_THINKING_STRUCT->funcResult = gBattleMons[gBankTarget].type2;
         break;
-    case 4: // type of move being pointed to
+    case AI_TYPE_MOVE: // type of move being pointed to
         AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].type;
         break;
     }
@@ -1236,13 +1231,13 @@ static void BattleAICmd_get_how_powerful_move_is(void)
         }
 
         if (checkedMove == 4)
-            AI_THINKING_STRUCT->funcResult = 2; // is the most powerful
+            AI_THINKING_STRUCT->funcResult = MOVE_MOST_POWERFUL; // is the most powerful
         else
-            AI_THINKING_STRUCT->funcResult = 1; // not most powerful
+            AI_THINKING_STRUCT->funcResult = MOVE_NOT_MOST_POWERFUL; // not most powerful
     }
     else
     {
-        AI_THINKING_STRUCT->funcResult = 0; // highly discouraged in terms of power
+        AI_THINKING_STRUCT->funcResult = MOVE_POWER_DISCOURAGED; // highly discouraged in terms of power
     }
 
     gAIScriptPtr++;
@@ -1493,7 +1488,7 @@ static void BattleAICmd_get_highest_type_effectiveness(void)
 
     for (i = 0; i < 4; i++)
     {
-        gBattleMoveDamage = 40;
+        gBattleMoveDamage = AI_EFFECTIVENESS_x1;
         gCurrentMove = gBattleMons[sBank_AI].moves[i];
 
         if (gCurrentMove)
@@ -1502,16 +1497,16 @@ static void BattleAICmd_get_highest_type_effectiveness(void)
 
             // reduce by 1/3.
             if (gBattleMoveDamage == 120)
-                gBattleMoveDamage = 80;
+                gBattleMoveDamage = AI_EFFECTIVENESS_x2;
             if (gBattleMoveDamage == 240)
-                gBattleMoveDamage = 160;
+                gBattleMoveDamage = AI_EFFECTIVENESS_x4;
             if (gBattleMoveDamage == 30)
-                gBattleMoveDamage = 20;
+                gBattleMoveDamage = AI_EFFECTIVENESS_x0_5;
             if (gBattleMoveDamage == 15)
-                gBattleMoveDamage = 10;
+                gBattleMoveDamage = AI_EFFECTIVENESS_x0_25;
 
             if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
-                gBattleMoveDamage = 0;
+                gBattleMoveDamage = AI_EFFECTIVENESS_x0;
 
             if (AI_THINKING_STRUCT->funcResult < gBattleMoveDamage)
                 AI_THINKING_STRUCT->funcResult = gBattleMoveDamage;
@@ -1530,22 +1525,22 @@ static void BattleAICmd_if_type_effectiveness(void)
     gBattleMoveFlags = 0;
     gCritMultiplier = 1;
 
-    gBattleMoveDamage = 40;
+    gBattleMoveDamage = AI_EFFECTIVENESS_x1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
 
     TypeCalc(gCurrentMove, sBank_AI, gBankTarget);
 
     if (gBattleMoveDamage == 120)
-        gBattleMoveDamage = 80;
+        gBattleMoveDamage = AI_EFFECTIVENESS_x2;
     if (gBattleMoveDamage == 240)
-        gBattleMoveDamage = 160;
+        gBattleMoveDamage = AI_EFFECTIVENESS_x4;
     if (gBattleMoveDamage == 30)
-        gBattleMoveDamage = 20;
+        gBattleMoveDamage = AI_EFFECTIVENESS_x0_5;
     if (gBattleMoveDamage == 15)
-        gBattleMoveDamage = 10;
+        gBattleMoveDamage = AI_EFFECTIVENESS_x0_25;
 
     if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
-        gBattleMoveDamage = 0;
+        gBattleMoveDamage = AI_EFFECTIVENESS_x0;
 
     // store gBattleMoveDamage in a u8 variable because gAIScriptPtr[1] is a u8.
     damageVar = gBattleMoveDamage;
@@ -1618,7 +1613,7 @@ static void BattleAICmd_if_status_not_in_party(void)
             break;
     }
 
-    party = (GetBankSide(bank) == 0) ? gPlayerParty : gEnemyParty;
+    party = (GetBankSide(bank) == SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
 
     statusToCompareTo = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -1640,13 +1635,13 @@ static void BattleAICmd_if_status_not_in_party(void)
 static void BattleAICmd_get_weather(void)
 {
     if (gBattleWeather & WEATHER_RAIN_ANY)
-        AI_THINKING_STRUCT->funcResult = 1;
+        AI_THINKING_STRUCT->funcResult = AI_WEATHER_RAIN;
     if (gBattleWeather & WEATHER_SANDSTORM_ANY)
-        AI_THINKING_STRUCT->funcResult = 2;
+        AI_THINKING_STRUCT->funcResult = AI_WEATHER_SANDSTORM;
     if (gBattleWeather & WEATHER_SUN_ANY)
-        AI_THINKING_STRUCT->funcResult = 0;
+        AI_THINKING_STRUCT->funcResult = AI_WEATHER_SUN;
     if (gBattleWeather & WEATHER_HAIL_ANY)
-        AI_THINKING_STRUCT->funcResult = 3;
+        AI_THINKING_STRUCT->funcResult = AI_WEATHER_HAIL;
 
     gAIScriptPtr += 1;
 }
@@ -1904,7 +1899,7 @@ static void BattleAICmd_if_has_move_with_effect(void)
     case AI_USER_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            if(gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBank_AI].moves[i]].effect == gAIScriptPtr[2])
+            if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBank_AI].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i == 4)
@@ -1916,6 +1911,7 @@ static void BattleAICmd_if_has_move_with_effect(void)
     case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
+            // UB: checks sBank_AI instead of gBankTarget
             if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBankTarget].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
-- 
cgit v1.2.3


From 4f950d698c241af92d81b0e1a55e3fd0a85cb83a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 31 Dec 2017 16:28:57 +0100
Subject: dump battle animation scripts

---
 src/battle_anim.c                         | 55 ++++++++++++++++---------------
 src/battle_controller_link_opponent.c     |  1 +
 src/battle_controller_link_partner.c      |  1 +
 src/battle_controller_opponent.c          |  1 +
 src/battle_controller_player.c            |  1 +
 src/battle_controller_player_partner.c    |  1 +
 src/battle_controller_recorded_opponent.c |  1 +
 src/battle_controller_recorded_player.c   |  1 +
 src/battle_controller_safari.c            |  1 +
 src/battle_controller_wally.c             |  1 +
 src/battle_gfx_sfx_util.c                 | 11 ++++---
 src/battle_script_commands.c              |  1 +
 src/battle_util.c                         |  1 +
 13 files changed, 45 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/battle_anim.c b/src/battle_anim.c
index 2eec0bed5..fa4dfb48f 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "sprite.h"
 #include "contest.h"
 #include "m4a.h"
@@ -67,7 +68,7 @@ static void ScriptCmd_return(void);
 static void ScriptCmd_setarg(void);
 static void ScriptCmd_choosetwoturnanim(void);
 static void ScriptCmd_jumpifmoveturn(void);
-static void ScriptCmd_jump(void);
+static void ScriptCmd_goto(void);
 static void ScriptCmd_fadetobg(void);
 static void ScriptCmd_restorebg(void);
 static void ScriptCmd_waitbgfadeout(void);
@@ -156,7 +157,7 @@ static void (* const sScriptCmdTable[])(void) =
 	ScriptCmd_setarg,
 	ScriptCmd_choosetwoturnanim,
 	ScriptCmd_jumpifmoveturn,
-	ScriptCmd_jump,
+	ScriptCmd_goto,
 	ScriptCmd_fadetobg,
 	ScriptCmd_restorebg,
 	ScriptCmd_waitbgfadeout,
@@ -605,7 +606,7 @@ static void ScriptCmd_monbg(void)
     sBattleAnimScriptPtr++;
 
     animBank = sBattleAnimScriptPtr[0];
-    if (animBank & ANIM_BANK_TARGET)
+    if (animBank & ANIM_TARGET)
         bank = gAnimBankTarget;
     else
         bank = gAnimBankAttacker;
@@ -862,12 +863,12 @@ static void ScriptCmd_clearmonbg(void)
     sBattleAnimScriptPtr++;
     animBankId = sBattleAnimScriptPtr[0];
 
-    if (animBankId == ANIM_BANK_ATTACKER)
-        animBankId = ANIM_BANK_ATK_PARTNER;
-    else if (animBankId == ANIM_BANK_TARGET)
-        animBankId = ANIM_BANK_DEF_PARTNER;
+    if (animBankId == ANIM_ATTACKER)
+        animBankId = ANIM_ATK_PARTNER;
+    else if (animBankId == ANIM_TARGET)
+        animBankId = ANIM_DEF_PARTNER;
 
-    if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
+    if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER)
         bank = gAnimBankAttacker;
     else
         bank = gAnimBankTarget;
@@ -924,12 +925,12 @@ static void ScriptCmd_monbg_22(void)
 
     animBankId = sBattleAnimScriptPtr[0];
 
-    if (animBankId == ANIM_BANK_ATTACKER)
-        animBankId = ANIM_BANK_ATK_PARTNER;
-    else if (animBankId == ANIM_BANK_TARGET)
-        animBankId = ANIM_BANK_DEF_PARTNER;
+    if (animBankId == ANIM_ATTACKER)
+        animBankId = ANIM_ATK_PARTNER;
+    else if (animBankId == ANIM_TARGET)
+        animBankId = ANIM_DEF_PARTNER;
 
-    if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
+    if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER)
         bank = gAnimBankAttacker;
     else
         bank = gAnimBankTarget;
@@ -969,12 +970,12 @@ static void ScriptCmd_clearmonbg_23(void)
     sBattleAnimScriptPtr++;
     animBankId = sBattleAnimScriptPtr[0];
 
-    if (animBankId == ANIM_BANK_ATTACKER)
-        animBankId = ANIM_BANK_ATK_PARTNER;
-    else if (animBankId == ANIM_BANK_TARGET)
-        animBankId = ANIM_BANK_DEF_PARTNER;
+    if (animBankId == ANIM_ATTACKER)
+        animBankId = ANIM_ATK_PARTNER;
+    else if (animBankId == ANIM_TARGET)
+        animBankId = ANIM_DEF_PARTNER;
 
-    if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
+    if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER)
         bank = gAnimBankAttacker;
     else
         bank = gAnimBankTarget;
@@ -1099,7 +1100,7 @@ static void ScriptCmd_jumpifmoveturn(void)
         sBattleAnimScriptPtr += 4;
 }
 
-static void ScriptCmd_jump(void)
+static void ScriptCmd_goto(void)
 {
     sBattleAnimScriptPtr++;
     sBattleAnimScriptPtr = SCRIPT_READ_PTR(sBattleAnimScriptPtr);
@@ -1699,7 +1700,7 @@ static void ScriptCmd_monbgprio_28(void)
     wantedBank = sBattleAnimScriptPtr[1];
     sBattleAnimScriptPtr += 2;
 
-    if (wantedBank != ANIM_BANK_ATTACKER)
+    if (wantedBank != ANIM_ATTACKER)
         bank = gAnimBankTarget;
     else
         bank = gAnimBankAttacker;
@@ -1732,7 +1733,7 @@ static void ScriptCmd_monbgprio_2A(void)
     sBattleAnimScriptPtr += 2;
     if (GetBankSide(gAnimBankAttacker) != GetBankSide(gAnimBankTarget))
     {
-        if (wantedBank != ANIM_BANK_ATTACKER)
+        if (wantedBank != ANIM_ATTACKER)
             bank = gAnimBankTarget;
         else
             bank = gAnimBankAttacker;
@@ -1779,15 +1780,15 @@ static void ScriptCmd_doublebattle_2D(void)
     if (!IsContest() && IsDoubleBattle()
      && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
     {
-        if (wantedBank == ANIM_BANK_ATTACKER)
+        if (wantedBank == ANIM_ATTACKER)
         {
             r4 = sub_80A8364(gAnimBankAttacker);
-            spriteId = GetAnimBankSpriteId(0);
+            spriteId = GetAnimBankSpriteId(ANIM_ATTACKER);
         }
         else
         {
             r4 = sub_80A8364(gAnimBankTarget);
-            spriteId = GetAnimBankSpriteId(1);
+            spriteId = GetAnimBankSpriteId(ANIM_TARGET);
         }
         if (spriteId != 0xFF)
         {
@@ -1814,15 +1815,15 @@ static void ScriptCmd_doublebattle_2E(void)
     if (!IsContest() && IsDoubleBattle()
      && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
     {
-        if (wantedBank == ANIM_BANK_ATTACKER)
+        if (wantedBank == ANIM_ATTACKER)
         {
             r4 = sub_80A8364(gAnimBankAttacker);
-            spriteId = GetAnimBankSpriteId(0);
+            spriteId = GetAnimBankSpriteId(ANIM_ATTACKER);
         }
         else
         {
             r4 = sub_80A8364(gAnimBankTarget);
-            spriteId = GetAnimBankSpriteId(1);
+            spriteId = GetAnimBankSpriteId(ANIM_TARGET);
         }
 
         if (spriteId != 0xFF && r4 == 2)
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index dd8582618..58360b9a1 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -4,6 +4,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "battle_ai_script_commands.h"
 #include "battle_link_817C95C.h"
 #include "pokemon.h"
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 9da468761..082b134b4 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -4,6 +4,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "battle_ai_script_commands.h"
 #include "battle_link_817C95C.h"
 #include "pokemon.h"
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 0862e72a7..8aeab6a55 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -4,6 +4,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "battle_link_817C95C.h"
 #include "battle_ai_script_commands.h"
 #include "pokemon.h"
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 08c666d11..6023552c3 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -4,6 +4,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "battle_link_817C95C.h"
 #include "pokemon.h"
 #include "link.h"
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index dc4a213cc..6b5211ceb 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -4,6 +4,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "battle_ai_script_commands.h"
 #include "pokemon.h"
 #include "link.h"
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 8e2f31879..64dea0200 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -4,6 +4,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "battle_ai_script_commands.h"
 #include "battle_link_817C95C.h"
 #include "recorded_battle.h"
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index f558fde87..52fd803e1 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -4,6 +4,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "battle_ai_script_commands.h"
 #include "recorded_battle.h"
 #include "pokemon.h"
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 64e6a0bc3..682e8333d 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -4,6 +4,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "pokemon.h"
 #include "link.h"
 #include "util.h"
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 446027944..eeb0b596d 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -4,6 +4,7 @@
 #include "battle_message.h"
 #include "battle_interface.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "battle_link_817C95C.h"
 #include "pokemon.h"
 #include "link.h"
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 70b4d7d31..4f444b8bf 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -3,6 +3,7 @@
 #include "battle_controllers.h"
 #include "battle_ai_script_commands.h"
 #include "battle_anim.h"
+#include "constants/battle_anim.h"
 #include "battle_interface.h"
 #include "main.h"
 #include "malloc.h"
@@ -39,8 +40,8 @@ extern struct MusicPlayerInfo gMPlay_BGM;
 
 extern const struct BattleMove gBattleMoves[];
 extern const u8 gUnknown_0831C604[];
-extern const u8 * const gUnknown_082C9320[];
-extern const u8 * const gUnknown_082C937C[];
+extern const u8 * const gBattleAnims_VariousTable[];
+extern const u8 * const gBattleAnims_Special[];
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const struct CompressedSpriteSheet gMonBackPicTable[];
 extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
@@ -414,7 +415,7 @@ void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status)
         else if (status & STATUS2_NIGHTMARE)
             LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_NIGHTMARE);
         else if (status & STATUS2_WRAPPED)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_WRAPPED);
+            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_WRAPPED); // this animation doesn't actually exist
         else // no animation
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive = 0;
     }
@@ -448,7 +449,7 @@ bool8 TryHandleLaunchBattleTableAnimation(u8 activeBank, u8 atkBank, u8 defBank,
     gAnimBankAttacker = atkBank;
     gAnimBankTarget = defBank;
     gBattleSpritesDataPtr->animationData->animArg = argument;
-    LaunchBattleAnimation(gUnknown_082C9320, tableId, FALSE);
+    LaunchBattleAnimation(gBattleAnims_VariousTable, tableId, FALSE);
     taskId = CreateTask(Task_ClearBitWhenBattleTableAnimDone, 10);
     gTasks[taskId].tBank = activeBank;
     gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBank].animFromTableActive = 1;
@@ -492,7 +493,7 @@ void InitAndLaunchSpecialAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tab
 
     gAnimBankAttacker = atkBank;
     gAnimBankTarget = defBank;
-    LaunchBattleAnimation(gUnknown_082C937C, tableId, FALSE);
+    LaunchBattleAnimation(gBattleAnims_Special, tableId, FALSE);
     taskId = CreateTask(Task_ClearBitWhenSpecialAnimDone, 10);
     gTasks[taskId].tBank = activeBank;
     gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBank].specialAnimActive = 1;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 43b802d0b..4ddf2472e 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -18,6 +18,7 @@
 #include "constants/species.h"
 #include "constants/songs.h"
 #include "constants/trainers.h"
+#include "constants/battle_anim.h"
 #include "text.h"
 #include "sound.h"
 #include "pokedex.h"
diff --git a/src/battle_util.c b/src/battle_util.c
index 1a624641d..2ce37cfbd 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -3,6 +3,7 @@
 #include "constants/abilities.h"
 #include "constants/moves.h"
 #include "constants/hold_effects.h"
+#include "constants/battle_anim.h"
 #include "pokemon.h"
 #include "constants/species.h"
 #include "item.h"
-- 
cgit v1.2.3


From ba176dfe0729e8c8c46a8f79c2f1b6e732ee13c8 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 1 Jan 2018 17:41:34 +0100
Subject: start working on battle transition

---
 src/battle_transition.c | 287 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 287 insertions(+)
 create mode 100644 src/battle_transition.c

(limited to 'src')

diff --git a/src/battle_transition.c b/src/battle_transition.c
new file mode 100644
index 000000000..386b0dd79
--- /dev/null
+++ b/src/battle_transition.c
@@ -0,0 +1,287 @@
+#include "global.h"
+#include "battle_transition.h"
+#include "unk_transition.h"
+#include "main.h"
+#include "overworld.h"
+#include "task.h"
+#include "palette.h"
+#include "trig.h"
+#include "field_effect.h"
+#include "random.h"
+#include "sprite.h"
+#include "sound.h"
+#include "constants/songs.h"
+#include "constants/trainers.h"
+#include "field_camera.h"
+#include "unknown_task.h"
+#include "malloc.h"
+
+struct TransitionData
+{
+    vs8 VBlank_DMA;
+    u16 WININ;
+    u16 WINOUT;
+    u16 field_6;
+    u16 WIN0V;
+    u16 field_A;
+    u16 field_C;
+    u16 BLDCNT;
+    u16 BLDALPHA;
+    u16 BLDY;
+    s16 field_14;
+    s16 field_16;
+    s16 field_18;
+    s16 field_1A;
+    s16 field_1C;
+    s16 field_1E; // unused
+    s16 field_20;
+    s16 field_22; // unused
+    s16 data[11];
+};
+
+typedef bool8 (*TransitionState)(struct Task *task);
+typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite);
+
+extern void c2_exit_to_overworld_2_switch(void);
+extern void sub_80AC3D0(void);
+
+// this file's functions
+void LaunchBattleTransitionTask(u8 transitionId);
+void Task_BattleTransitionMain(u8 taskId);
+void Phase1Task_TransitionAll(u8 taskId);
+void Phase2Task_Transition_Blur(u8 taskId);
+void Phase2Task_Transition_Swirl(u8 taskId);
+void Phase2Task_Transition_Shuffle(u8 taskId);
+void Phase2Task_Transition_BigPokeball(u8 taskId);
+void Phase2Task_Transition_PokeballsTrail(u8 taskId);
+void Phase2Task_Transition_Clockwise_BlackFade(u8 taskId);
+void Phase2Task_Transition_Ripple(u8 taskId);
+void Phase2Task_Transition_Wave(u8 taskId);
+void Phase2Task_Transition_Slice(u8 taskId);
+void Phase2Task_Transition_WhiteFade(u8 taskId);
+void Phase2Task_Transition_GridSquares(u8 taskId);
+void Phase2Task_Transition_Shards(u8 taskId);
+void Phase2Task_Transition_Sydney(u8 taskId);
+void Phase2Task_Transition_Phoebe(u8 taskId);
+void Phase2Task_Transition_Glacia(u8 taskId);
+void Phase2Task_Transition_Drake(u8 taskId);
+void Phase2Task_Transition_Wallace(u8 taskId);
+void Phase2Task_Transition_Aqua(u8 taskId);
+void Phase2Task_Transition_Magma(u8 taskId);
+void Phase2Task_Transition_Regice(u8 taskId);
+void Phase2Task_Transition_Registeel(u8 taskId);
+void Phase2Task_Transition_Regirock(u8 taskId);
+void Phase2Task_Transition_Kyogre(u8 taskId);
+void Phase2Task_Transition_Groudon(u8 taskId);
+void Phase2Task_Transition_Rayquaza(u8 taskId);
+void Phase2Task_Transition_25(u8 taskId);
+void Phase2Task_Transition_26(u8 taskId);
+void Phase2Task_Transition_27(u8 taskId);
+void Phase2Task_Transition_28(u8 taskId);
+void Phase2Task_Transition_29(u8 taskId);
+void Phase2Task_Transition_30(u8 taskId);
+void Phase2Task_Transition_31(u8 taskId);
+void Phase2Task_Transition_32(u8 taskId);
+void Phase2Task_Transition_33(u8 taskId);
+bool8 Transition_Phase1(struct Task *task);
+bool8 Transition_WaitForPhase1(struct Task *task);
+bool8 Transition_Phase2(struct Task *task);
+bool8 Transition_WaitForPhase2(struct Task *task);
+
+// iwram bss vars
+IWRAM_DATA u16 gUnknown_03001208;
+IWRAM_DATA static u8 sTestingTransitionId;
+IWRAM_DATA static u8 sTestingTransitionState;
+
+// ewram vars
+EWRAM_DATA struct TransitionData *sTransitionStructPtr = NULL;
+
+// const rom data
+const u32 sBigPokeball_Tileset[] = INCBIN_U32("graphics/battle_transitions/big_pokeball.4bpp");
+const u32 sPokeballTrail_Tileset[] = INCBIN_U32("graphics/battle_transitions/pokeball_trail.4bpp");
+const u32 sSpriteImage_85B98F0[] = INCBIN_U32("graphics/battle_transitions/pokeball.4bpp");
+const u32 sUnknown_085B9AF0[] = INCBIN_U32("graphics/battle_transitions/elite_four_bg.4bpp");
+const u32 sSpriteImage_85B9CD0[] = INCBIN_U32("graphics/battle_transitions/unused_brendan.4bpp");
+const u32 sSpriteImage_85BA4D0[] = INCBIN_U32("graphics/battle_transitions/unused_lass.4bpp");
+const u32 sShrinkingBoxTileset[] = INCBIN_U32("graphics/battle_transitions/shrinking_box.4bpp");
+const u32 sEvilTeam_Palette[] = INCBIN_U32("graphics/battle_transitions/evil_team.gbapal");
+const u32 sTeamAqua_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_aqua.4bpp.lz");
+const u32 sTeamAqua_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_aqua.bin.lz");
+const u32 sTeamMagma_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_magma.4bpp.lz");
+const u32 sTeamMagma_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_magma.bin.lz");
+const u32 gUnknown_085BBC14[] = INCBIN_U32("graphics/battle_transitions/85BBC14.4bpp");
+const u32 gUnknown_085BC2B4[] = INCBIN_U32("graphics/battle_transitions/85BC2B4.gbapal");
+const u32 gUnknown_085BC2D4[] = INCBIN_U32("graphics/battle_transitions/85BC2D4.gbapal");
+const u32 gUnknown_085BC2F4[] = INCBIN_U32("graphics/battle_transitions/85BC2F4.gbapal");
+const u32 gUnknown_085BC314[] = INCBIN_U32("graphics/battle_transitions/85BC314.bin");
+const u32 gUnknown_085BCB14[] = INCBIN_U32("graphics/battle_transitions/85BCB14.bin");
+const u32 gUnknown_085BD314[] = INCBIN_U32("graphics/battle_transitions/85BD314.bin");
+const u32 gUnknown_085BDB14[] = INCBIN_U32("graphics/battle_transitions/85BDB14.gbapal");
+const u32 gUnknown_085BDB34[] = INCBIN_U32("graphics/battle_transitions/kyogre.4bpp.lz");
+const u32 gUnknown_085BE1E8[] = INCBIN_U32("graphics/battle_transitions/kyogre.bin.lz");
+const u32 gUnknown_085BE51C[] = INCBIN_U32("graphics/battle_transitions/groudon.4bpp.lz");
+const u32 gUnknown_085BEA88[] = INCBIN_U32("graphics/battle_transitions/groudon.bin.lz");
+const u32 gUnknown_085BEDA0[] = INCBIN_U32("graphics/battle_transitions/kyogre_pt1.gbapal");
+const u32 gUnknown_085BEEE0[] = INCBIN_U32("graphics/battle_transitions/kyogre_pt2.gbapal");
+const u32 gUnknown_085BF0A0[] = INCBIN_U32("graphics/battle_transitions/groudon_pt1.gbapal");
+const u32 gUnknown_085BF2A0[] = INCBIN_U32("graphics/battle_transitions/groudon_pt2.gbapal");
+const u32 gUnknown_085BF4A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.gbapal");
+const u32 gUnknown_085BF6A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.4bpp");
+const u32 gUnknown_085C6BE0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin");
+const u32 gUnknown_085C7BE0[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.gbapal");
+const u32 gUnknown_085C7C00[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.4bpp.lz");
+const u32 gUnknown_085C828C[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.bin.lz");
+const u32 gUnknown_085C8578[] = INCBIN_U32("graphics/battle_transitions/frontier_squares_blanktiles.gbapal");
+const u32 gUnknown_085C8598[] = INCBIN_U32("graphics/battle_transitions/frontier_square_1.4bpp.lz");
+const u32 gUnknown_085C86F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_2.4bpp.lz");
+const u32 gUnknown_085C87F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_3.4bpp.lz");
+const u32 gUnknown_085C88A4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_4.4bpp.lz");
+const u32 gUnknown_085C8928[] = INCBIN_U32("graphics/battle_transitions/frontier_squares.bin");
+
+const TaskFunc sPhase1_Tasks[B_TRANSITION_COUNT] =
+{
+    [0 ... B_TRANSITION_COUNT - 1] = &Phase1Task_TransitionAll
+};
+
+const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] =
+{
+    Phase2Task_Transition_Blur,                        // 0
+    Phase2Task_Transition_Swirl,                       // 1
+    Phase2Task_Transition_Shuffle,                     // 2
+    Phase2Task_Transition_BigPokeball,                 // 3
+    Phase2Task_Transition_PokeballsTrail,              // 4
+    Phase2Task_Transition_Clockwise_BlackFade,         // 5
+    Phase2Task_Transition_Ripple,                      // 6
+    Phase2Task_Transition_Wave,                        // 7
+    Phase2Task_Transition_Slice,                       // 8
+    Phase2Task_Transition_WhiteFade,                   // 9
+    Phase2Task_Transition_GridSquares,                 // 10
+    Phase2Task_Transition_Shards,                      // 11
+    Phase2Task_Transition_Sydney,                      // 12
+    Phase2Task_Transition_Phoebe,                      // 13
+    Phase2Task_Transition_Glacia,                      // 14
+    Phase2Task_Transition_Drake,                       // 15
+    Phase2Task_Transition_Wallace,                     // 16
+    Phase2Task_Transition_Aqua,                        // 17
+    Phase2Task_Transition_Magma,                       // 18
+    Phase2Task_Transition_Regice,                      // 19
+    Phase2Task_Transition_Registeel,                   // 20
+    Phase2Task_Transition_Regirock,                    // 21
+    Phase2Task_Transition_Kyogre,                      // 22
+    Phase2Task_Transition_Groudon,                     // 23
+    Phase2Task_Transition_Rayquaza,                    // 24
+    Phase2Task_Transition_25,                          // 25
+    Phase2Task_Transition_26,                          // 26
+    Phase2Task_Transition_27,                          // 27
+    Phase2Task_Transition_28,                          // 28
+    Phase2Task_Transition_29,                          // 29
+    Phase2Task_Transition_30,                          // 30
+    Phase2Task_Transition_31,                          // 31
+    Phase2Task_Transition_32,                          // 32
+    Phase2Task_Transition_33,                          // 33
+    Phase2Task_Transition_34,                          // 34
+    Phase2Task_Transition_35,                          // 35
+    Phase2Task_Transition_36,                          // 36
+    Phase2Task_Transition_37,                          // 37
+    Phase2Task_Transition_38,                          // 38
+    Phase2Task_Transition_39,                          // 39
+    Phase2Task_Transition_40,                          // 40
+    Phase2Task_Transition_41,                          // 41
+};
+
+const TransitionState sMainTransitionPhases[] =
+{
+    &Transition_Phase1,
+    &Transition_WaitForPhase1,
+    &Transition_Phase2,
+    &Transition_WaitForPhase2
+};
+
+// code
+static void CB2_TestBattleTransition(void)
+{
+    switch (sTestingTransitionState)
+    {
+    case 0:
+        LaunchBattleTransitionTask(sTestingTransitionId);
+        sTestingTransitionState++;
+        break;
+    case 1:
+        if (IsBattleTransitionDone())
+        {
+            sTestingTransitionState = 0;
+            SetMainCallback2(c2_exit_to_overworld_2_switch);
+        }
+        break;
+    }
+
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+void TestBattleTransition(u8 transitionId)
+{
+    sTestingTransitionId = transitionId;
+    SetMainCallback2(CB2_TestBattleTransition);
+}
+
+void BattleTransition_StartOnField(u8 transitionId)
+{
+    gMain.callback2 = CB2_OverworldBasic;
+    LaunchBattleTransitionTask(transitionId);
+}
+
+void BattleTransition_Start(u8 transitionId)
+{
+    LaunchBattleTransitionTask(transitionId);
+}
+
+#define tState          data[0]
+#define tTransitionID   data[1]
+#define tTransitionDone data[15]
+
+bool8 IsBattleTransitionDone(void)
+{
+    u8 taskId = FindTaskIdByFunc(Task_BattleTransitionMain);
+    if (gTasks[taskId].tTransitionDone)
+    {
+        DestroyTask(taskId);
+        FREE_AND_SET_NULL(sTransitionStructPtr);
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+void LaunchBattleTransitionTask(u8 transitionId)
+{
+    u8 taskId = CreateTask(Task_BattleTransitionMain, 2);
+    gTasks[taskId].tTransitionID = transitionId;
+    sTransitionStructPtr = AllocZeroed(sizeof(*sTransitionStructPtr));
+}
+
+void Task_BattleTransitionMain(u8 taskId)
+{
+    while (sMainTransitionPhases[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Transition_Phase1(struct Task *task)
+{
+    sub_80AC3D0();
+    CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
+    if (sPhase1_Tasks[task->tTransitionID] != NULL)
+    {
+        CreateTask(sPhase1_Tasks[task->tTransitionID], 4);
+        task->tState++;
+        return FALSE;
+    }
+    else
+    {
+        task->tState = 2;
+        return TRUE;
+    }
+}
-- 
cgit v1.2.3


From d8c329b888e0184b33c409fa8266fe79ec3f7e92 Mon Sep 17 00:00:00 2001
From: EternalCode <dilshan.gunasekera@mail.utoronto.ca>
Date: Mon, 1 Jan 2018 14:36:27 -0500
Subject: Update fldeff_teleport.c

---
 src/fldeff_teleport.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 1730f8355..72896904e 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -4,17 +4,18 @@
 
 extern bool8 is_light_level_1_2_3_or_6(u8 mapType);
 extern void* hm_add_c3_launch_phase_2(void);
-extern void hm_teleport_run_dp02scr(void);
-extern void* gUnknown_0203CEEC;
-extern void* gUnknown_03005DB0;
 extern void sub_808469C(void);
 extern u8 GetCursorSelectionMonId(void);
-extern void sub_817C94C(void);
 extern u8 oei_task_add(void);
 extern void FieldEffectActiveListRemove(u8 id);
 extern void sub_80B7FC8(void);
 extern void SetPlayerAvatarTransitionFlags(u8);
 
+extern void* gUnknown_0203CEEC;
+extern void* gUnknown_03005DB0;
+
+void hm_teleport_run_dp02scr(void);
+void sub_817C94C(void);
 
 // 817C8BC
 bool8 SetUpFieldMove_Teleport(void)
-- 
cgit v1.2.3


From e3585d7d6641b9f8338a8ac34e0b898e6fb5a982 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Mon, 1 Jan 2018 19:21:30 -0600
Subject: Review fixes

---
 src/fldeff_teleport.c | 44 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 72896904e..5b3492db0 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -1,55 +1,45 @@
 #include "global.h"
+#include "fldeff_teleport.h"
 #include "field_effect.h"
+#include "field_player_avatar.h"
+#include "party_menu.h"
+#include "overworld.h"
+#include "rom6.h"
 #include "task.h"
 
-extern bool8 is_light_level_1_2_3_or_6(u8 mapType);
-extern void* hm_add_c3_launch_phase_2(void);
-extern void sub_808469C(void);
-extern u8 GetCursorSelectionMonId(void);
-extern u8 oei_task_add(void);
-extern void FieldEffectActiveListRemove(u8 id);
-extern void sub_80B7FC8(void);
-extern void SetPlayerAvatarTransitionFlags(u8);
+extern bool8 (*gUnknown_03005DB0)(void);
+extern void (*gUnknown_0203CEEC)(void);
 
-extern void* gUnknown_0203CEEC;
-extern void* gUnknown_03005DB0;
-
-void hm_teleport_run_dp02scr(void);
-void sub_817C94C(void);
-
-// 817C8BC
 bool8 SetUpFieldMove_Teleport(void)
 {
-    if (is_light_level_1_2_3_or_6(gMapHeader.mapType) == TRUE)
+    if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE)
     {
-        gUnknown_03005DB0 = hm_add_c3_launch_phase_2;
+        gUnknown_03005DB0 = FieldCallback_Teleport;
         gUnknown_0203CEEC = hm_teleport_run_dp02scr;   
         return TRUE;
     } 
     return FALSE;
 }
 
-// 817C8FC
 void hm_teleport_run_dp02scr(void)
 {
-    sub_808469C();
-    FieldEffectStart(0x3F);
+    Overworld_ResetStateAfterTeleport();
+    FieldEffectStart(FLDEFF_USE_TELEPORT);
     gFieldEffectArguments[0] = (u32)GetCursorSelectionMonId();
 }
 
-// 817C91C
-u8 FldEff_UseTeleport(void)
+bool8 FldEff_UseTeleport(void)
 {
-    u8 taskID = oei_task_add();
-    gTasks[taskID].data[8] = (u32)sub_817C94C >> 16;
-    gTasks[taskID].data[9] = (u32)sub_817C94C;
+    u8 taskId = oei_task_add();
+    gTasks[taskId].data[8] = (u32)sub_817C94C >> 16;
+    gTasks[taskId].data[9] = (u32)sub_817C94C;
     SetPlayerAvatarTransitionFlags(1);
-    return 0;
+    return FALSE;
 }
 
 void sub_817C94C(void)
 {
-    FieldEffectActiveListRemove(0x3F);
+    FieldEffectActiveListRemove(FLDEFF_USE_TELEPORT);
     sub_80B7FC8();
 }
 
-- 
cgit v1.2.3


From eb00e8ba4acab773b5bcebbc622563c60abb512d Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 2 Jan 2018 20:38:33 +0100
Subject: more work on battle transition

---
 src/battle_transition.c | 2072 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 1988 insertions(+), 84 deletions(-)

(limited to 'src')

diff --git a/src/battle_transition.c b/src/battle_transition.c
index 386b0dd79..e60a2d91f 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -15,6 +15,8 @@
 #include "field_camera.h"
 #include "unknown_task.h"
 #include "malloc.h"
+#include "gpu_regs.h"
+#include "decompress.h"
 
 struct TransitionData
 {
@@ -39,54 +41,169 @@ struct TransitionData
     s16 data[11];
 };
 
-typedef bool8 (*TransitionState)(struct Task *task);
+typedef bool8 (*TransitionStateFunc)(struct Task *task);
 typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite);
 
+extern u16 gUnknown_020393A8[];
+extern u16 gUnknown_02038C28[][0x3C0];
+
 extern void c2_exit_to_overworld_2_switch(void);
 extern void sub_80AC3D0(void);
+extern void dp12_8087EA4(void);
 
 // this file's functions
 void LaunchBattleTransitionTask(u8 transitionId);
 void Task_BattleTransitionMain(u8 taskId);
 void Phase1Task_TransitionAll(u8 taskId);
-void Phase2Task_Transition_Blur(u8 taskId);
-void Phase2Task_Transition_Swirl(u8 taskId);
-void Phase2Task_Transition_Shuffle(u8 taskId);
-void Phase2Task_Transition_BigPokeball(u8 taskId);
-void Phase2Task_Transition_PokeballsTrail(u8 taskId);
-void Phase2Task_Transition_Clockwise_BlackFade(u8 taskId);
-void Phase2Task_Transition_Ripple(u8 taskId);
-void Phase2Task_Transition_Wave(u8 taskId);
-void Phase2Task_Transition_Slice(u8 taskId);
-void Phase2Task_Transition_WhiteFade(u8 taskId);
-void Phase2Task_Transition_GridSquares(u8 taskId);
-void Phase2Task_Transition_Shards(u8 taskId);
-void Phase2Task_Transition_Sydney(u8 taskId);
-void Phase2Task_Transition_Phoebe(u8 taskId);
-void Phase2Task_Transition_Glacia(u8 taskId);
-void Phase2Task_Transition_Drake(u8 taskId);
-void Phase2Task_Transition_Wallace(u8 taskId);
-void Phase2Task_Transition_Aqua(u8 taskId);
-void Phase2Task_Transition_Magma(u8 taskId);
-void Phase2Task_Transition_Regice(u8 taskId);
-void Phase2Task_Transition_Registeel(u8 taskId);
-void Phase2Task_Transition_Regirock(u8 taskId);
-void Phase2Task_Transition_Kyogre(u8 taskId);
-void Phase2Task_Transition_Groudon(u8 taskId);
-void Phase2Task_Transition_Rayquaza(u8 taskId);
-void Phase2Task_Transition_25(u8 taskId);
-void Phase2Task_Transition_26(u8 taskId);
-void Phase2Task_Transition_27(u8 taskId);
-void Phase2Task_Transition_28(u8 taskId);
-void Phase2Task_Transition_29(u8 taskId);
-void Phase2Task_Transition_30(u8 taskId);
-void Phase2Task_Transition_31(u8 taskId);
-void Phase2Task_Transition_32(u8 taskId);
-void Phase2Task_Transition_33(u8 taskId);
+void Phase2Task_Blur(u8 taskId);
+void Phase2Task_Swirl(u8 taskId);
+void Phase2Task_Shuffle(u8 taskId);
+void Phase2Task_BigPokeball(u8 taskId);
+void Phase2Task_PokeballsTrail(u8 taskId);
+void Phase2Task_Clockwise_BlackFade(u8 taskId);
+void Phase2Task_Ripple(u8 taskId);
+void Phase2Task_Wave(u8 taskId);
+void Phase2Task_Slice(u8 taskId);
+void Phase2Task_WhiteFade(u8 taskId);
+void Phase2Task_GridSquares(u8 taskId);
+void Phase2Task_Shards(u8 taskId);
+void Phase2Task_Sydney(u8 taskId);
+void Phase2Task_Phoebe(u8 taskId);
+void Phase2Task_Glacia(u8 taskId);
+void Phase2Task_Drake(u8 taskId);
+void Phase2Task_Champion(u8 taskId);
+void Phase2Task_Aqua(u8 taskId);
+void Phase2Task_Magma(u8 taskId);
+void Phase2Task_Regice(u8 taskId);
+void Phase2Task_Registeel(u8 taskId);
+void Phase2Task_Regirock(u8 taskId);
+void Phase2Task_Kyogre(u8 taskId);
+void Phase2Task_Groudon(u8 taskId);
+void Phase2Task_Rayquaza(u8 taskId);
+void Phase2Task_25(u8 taskId);
+void Phase2Task_26(u8 taskId);
+void Phase2Task_27(u8 taskId);
+void Phase2Task_28(u8 taskId);
+void Phase2Task_29(u8 taskId);
+void Phase2Task_30(u8 taskId);
+void Phase2Task_31(u8 taskId);
+void Phase2Task_32(u8 taskId);
+void Phase2Task_33(u8 taskId);
+void VBlankCB_BattleTransition(void);
+void VBlankCB_Phase2_Swirl(void);
+void HBlankCB_Phase2_Swirl(void);
+void VBlankCB_Phase2_Shuffle(void);
+void HBlankCB_Phase2_Shuffle(void);
+void VBlankCB0_Phase2_BigPokeball(void);
+void VBlankCB1_Phase2_BigPokeball(void);
+void VBlankCB_Phase2_Clockwise_BlackFade(void);
+void VBlankCB_Phase2_Ripple(void);
+void HBlankCB_Phase2_Ripple(void);
+void VBlankCB_Phase2_Wave(void);
+void VBlankCB_Phase2_Slice(void);
+void HBlankCB_Phase2_Slice(void);
+void VBlankCB0_Phase2_WhiteFade(void);
+void VBlankCB1_Phase2_WhiteFade(void);
+void HBlankCB_Phase2_WhiteFade(void);
+void VBlankCB_Phase2_Shards(void);
+bool8 Phase2_Blur_Func1(struct Task *task);
+bool8 Phase2_Blur_Func2(struct Task *task);
+bool8 Phase2_Blur_Func3(struct Task *task);
+bool8 Phase2_Swirl_Func1(struct Task *task);
+bool8 Phase2_Swirl_Func2(struct Task *task);
+bool8 Phase2_Shuffle_Func1(struct Task *task);
+bool8 Phase2_Shuffle_Func2(struct Task *task);
+bool8 Phase2_Aqua_Func1(struct Task *task);
+bool8 Phase2_Aqua_Func2(struct Task *task);
+bool8 Phase2_Magma_Func1(struct Task *task);
+bool8 Phase2_Magma_Func2(struct Task *task);
+bool8 Phase2_FramesCountdown(struct Task *task);
+bool8 Phase2_Regi_Func1(struct Task *task);
+bool8 Phase2_Regice_Func2(struct Task *task);
+bool8 Phase2_Registeel_Func2(struct Task *task);
+bool8 Phase2_Regirock_Func2(struct Task *task);
+bool8 Phase2_WeatherTrio_Func1(struct Task *task);
+bool8 Phase2_WaitPaletteFade(struct Task *task);
+bool8 Phase2_Kyogre_Func3(struct Task *task);
+bool8 Phase2_Kyogre_Func4(struct Task *task);
+bool8 Phase2_Kyogre_Func5(struct Task *task);
+bool8 Phase2_WeatherDuo_Func6(struct Task *task);
+bool8 Phase2_WeatherDuo_Func7(struct Task *task);
+bool8 Phase2_BigPokeball_Func1(struct Task *task);
+bool8 Phase2_BigPokeball_Func2(struct Task *task);
+bool8 Phase2_BigPokeball_Func3(struct Task *task);
+bool8 Phase2_BigPokeball_Func4(struct Task *task);
+bool8 Phase2_BigPokeball_Func5(struct Task *task);
+bool8 Phase2_BigPokeball_Func6(struct Task *task);
+bool8 Phase2_PokeballsTrail_Func1(struct Task *task);
+bool8 Phase2_PokeballsTrail_Func2(struct Task *task);
+bool8 Phase2_PokeballsTrail_Func3(struct Task *task);
+bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task);
+bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task);
+bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task);
+bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task);
+bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task);
+bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task);
+bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task);
+bool8 Phase2_Ripple_Func1(struct Task *task);
+bool8 Phase2_Ripple_Func2(struct Task *task);
+bool8 Phase2_Wave_Func1(struct Task *task);
+bool8 Phase2_Wave_Func2(struct Task *task);
+bool8 Phase2_Wave_Func3(struct Task *task);
+bool8 Phase2_Slice_Func1(struct Task *task);
+bool8 Phase2_Slice_Func2(struct Task *task);
+bool8 Phase2_Slice_Func3(struct Task *task);
+bool8 Phase2_WhiteFade_Func1(struct Task *task);
+bool8 Phase2_WhiteFade_Func2(struct Task *task);
+bool8 Phase2_WhiteFade_Func3(struct Task *task);
+bool8 Phase2_WhiteFade_Func4(struct Task *task);
+bool8 Phase2_WhiteFade_Func5(struct Task *task);
+bool8 Phase2_GridSquares_Func1(struct Task *task);
+bool8 Phase2_GridSquares_Func2(struct Task *task);
+bool8 Phase2_GridSquares_Func3(struct Task *task);
+bool8 Phase2_Shards_Func1(struct Task *task);
+bool8 Phase2_Shards_Func2(struct Task *task);
+bool8 Phase2_Shards_Func3(struct Task *task);
+bool8 Phase2_Shards_Func4(struct Task *task);
+bool8 Phase2_Shards_Func5(struct Task *task);
+bool8 Phase2_Mugshot_Func1(struct Task *task);
+bool8 Phase2_Mugshot_Func2(struct Task *task);
+bool8 Phase2_Mugshot_Func3(struct Task *task);
+bool8 Phase2_Mugshot_Func4(struct Task *task);
+bool8 Phase2_Mugshot_Func5(struct Task *task);
+bool8 Phase2_Mugshot_Func6(struct Task *task);
+bool8 Phase2_Mugshot_Func7(struct Task *task);
+bool8 Phase2_Mugshot_Func8(struct Task *task);
+bool8 Phase2_Mugshot_Func9(struct Task *task);
+bool8 Phase2_Mugshot_Func10(struct Task *task);
+void Phase2Task_MugShotTransition(u8 taskId);
+void Mugshots_CreateOpponentPlayerSprites(struct Task *task);
+void VBlankCB0_Phase2_Mugshots(void);
+void VBlankCB1_Phase2_Mugshots(void);
+void HBlankCB_Phase2_Mugshots(void);
 bool8 Transition_Phase1(struct Task *task);
 bool8 Transition_WaitForPhase1(struct Task *task);
 bool8 Transition_Phase2(struct Task *task);
 bool8 Transition_WaitForPhase2(struct Task *task);
+void sub_8149F08(void);
+void sub_8149F84(void);
+void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4);
+void sub_814A014(u16 *a0, s16 a1, s16 a2, s16 a3);
+void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize);
+void sub_8149F58(u16 **a0, u16 **a1);
+void sub_814A1AC(s16 *a0, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6);
+bool8 sub_814A228(s16 *a0, bool8 a1, bool8 a2);
+void sub_8148484(s16 spriteId, s16 value);
+void sub_814849C(s16 spriteId);
+s16 sub_81484B8(s16 spriteId);
+bool8 IsPhase1Done(void);
+void sub_814713C(struct Sprite *sprite);
+void sub_8148380(struct Sprite *sprite);
+bool8 sub_81483A8(struct Sprite *sprite);
+bool8 sub_81483AC(struct Sprite *sprite);
+bool8 sub_81483F8(struct Sprite *sprite);
+bool8 sub_814842C(struct Sprite *sprite);
+bool8 sub_8148458(struct Sprite *sprite);
 
 // iwram bss vars
 IWRAM_DATA u16 gUnknown_03001208;
@@ -116,16 +233,16 @@ const u32 gUnknown_085BC2F4[] = INCBIN_U32("graphics/battle_transitions/85BC2F4.
 const u32 gUnknown_085BC314[] = INCBIN_U32("graphics/battle_transitions/85BC314.bin");
 const u32 gUnknown_085BCB14[] = INCBIN_U32("graphics/battle_transitions/85BCB14.bin");
 const u32 gUnknown_085BD314[] = INCBIN_U32("graphics/battle_transitions/85BD314.bin");
-const u32 gUnknown_085BDB14[] = INCBIN_U32("graphics/battle_transitions/85BDB14.gbapal");
+const u16 gUnknown_085BDB14[] = INCBIN_U16("graphics/battle_transitions/85BDB14.gbapal");
 const u32 gUnknown_085BDB34[] = INCBIN_U32("graphics/battle_transitions/kyogre.4bpp.lz");
 const u32 gUnknown_085BE1E8[] = INCBIN_U32("graphics/battle_transitions/kyogre.bin.lz");
 const u32 gUnknown_085BE51C[] = INCBIN_U32("graphics/battle_transitions/groudon.4bpp.lz");
 const u32 gUnknown_085BEA88[] = INCBIN_U32("graphics/battle_transitions/groudon.bin.lz");
-const u32 gUnknown_085BEDA0[] = INCBIN_U32("graphics/battle_transitions/kyogre_pt1.gbapal");
-const u32 gUnknown_085BEEE0[] = INCBIN_U32("graphics/battle_transitions/kyogre_pt2.gbapal");
-const u32 gUnknown_085BF0A0[] = INCBIN_U32("graphics/battle_transitions/groudon_pt1.gbapal");
-const u32 gUnknown_085BF2A0[] = INCBIN_U32("graphics/battle_transitions/groudon_pt2.gbapal");
-const u32 gUnknown_085BF4A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.gbapal");
+const u16 gUnknown_085BEDA0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt1.gbapal");
+const u16 gUnknown_085BEEE0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt2.gbapal");
+const u16 gUnknown_085BF0A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt1.gbapal");
+const u16 gUnknown_085BF2A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt2.gbapal");
+const u16 gUnknown_085BF4A0[] = INCBIN_U16("graphics/battle_transitions/rayquaza.gbapal");
 const u32 gUnknown_085BF6A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.4bpp");
 const u32 gUnknown_085C6BE0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin");
 const u32 gUnknown_085C7BE0[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.gbapal");
@@ -145,51 +262,51 @@ const TaskFunc sPhase1_Tasks[B_TRANSITION_COUNT] =
 
 const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] =
 {
-    Phase2Task_Transition_Blur,                        // 0
-    Phase2Task_Transition_Swirl,                       // 1
-    Phase2Task_Transition_Shuffle,                     // 2
-    Phase2Task_Transition_BigPokeball,                 // 3
-    Phase2Task_Transition_PokeballsTrail,              // 4
-    Phase2Task_Transition_Clockwise_BlackFade,         // 5
-    Phase2Task_Transition_Ripple,                      // 6
-    Phase2Task_Transition_Wave,                        // 7
-    Phase2Task_Transition_Slice,                       // 8
-    Phase2Task_Transition_WhiteFade,                   // 9
-    Phase2Task_Transition_GridSquares,                 // 10
-    Phase2Task_Transition_Shards,                      // 11
-    Phase2Task_Transition_Sydney,                      // 12
-    Phase2Task_Transition_Phoebe,                      // 13
-    Phase2Task_Transition_Glacia,                      // 14
-    Phase2Task_Transition_Drake,                       // 15
-    Phase2Task_Transition_Wallace,                     // 16
-    Phase2Task_Transition_Aqua,                        // 17
-    Phase2Task_Transition_Magma,                       // 18
-    Phase2Task_Transition_Regice,                      // 19
-    Phase2Task_Transition_Registeel,                   // 20
-    Phase2Task_Transition_Regirock,                    // 21
-    Phase2Task_Transition_Kyogre,                      // 22
-    Phase2Task_Transition_Groudon,                     // 23
-    Phase2Task_Transition_Rayquaza,                    // 24
-    Phase2Task_Transition_25,                          // 25
-    Phase2Task_Transition_26,                          // 26
-    Phase2Task_Transition_27,                          // 27
-    Phase2Task_Transition_28,                          // 28
-    Phase2Task_Transition_29,                          // 29
-    Phase2Task_Transition_30,                          // 30
-    Phase2Task_Transition_31,                          // 31
-    Phase2Task_Transition_32,                          // 32
-    Phase2Task_Transition_33,                          // 33
-    Phase2Task_Transition_34,                          // 34
-    Phase2Task_Transition_35,                          // 35
-    Phase2Task_Transition_36,                          // 36
-    Phase2Task_Transition_37,                          // 37
-    Phase2Task_Transition_38,                          // 38
-    Phase2Task_Transition_39,                          // 39
-    Phase2Task_Transition_40,                          // 40
-    Phase2Task_Transition_41,                          // 41
+    Phase2Task_Blur,                        // 0
+    Phase2Task_Swirl,                       // 1
+    Phase2Task_Shuffle,                     // 2
+    Phase2Task_BigPokeball,                 // 3
+    Phase2Task_PokeballsTrail,              // 4
+    Phase2Task_Clockwise_BlackFade,         // 5
+    Phase2Task_Ripple,                      // 6
+    Phase2Task_Wave,                        // 7
+    Phase2Task_Slice,                       // 8
+    Phase2Task_WhiteFade,                   // 9
+    Phase2Task_GridSquares,                 // 10
+    Phase2Task_Shards,                      // 11
+    Phase2Task_Sydney,                      // 12
+    Phase2Task_Phoebe,                      // 13
+    Phase2Task_Glacia,                      // 14
+    Phase2Task_Drake,                       // 15
+    Phase2Task_Champion,                    // 16
+    Phase2Task_Aqua,                        // 17
+    Phase2Task_Magma,                       // 18
+    Phase2Task_Regice,                      // 19
+    Phase2Task_Registeel,                   // 20
+    Phase2Task_Regirock,                    // 21
+    Phase2Task_Kyogre,                      // 22
+    Phase2Task_Groudon,                     // 23
+    Phase2Task_Rayquaza,                    // 24
+    Phase2Task_25,                          // 25
+    Phase2Task_26,                          // 26
+    Phase2Task_27,                          // 27
+    Phase2Task_28,                          // 28
+    Phase2Task_29,                          // 29
+    Phase2Task_30,                          // 30
+    Phase2Task_31,                          // 31
+    Phase2Task_32,                          // 32
+    Phase2Task_33,                          // 33
+    Phase2Task_34,                          // 34
+    Phase2Task_35,                          // 35
+    Phase2Task_36,                          // 36
+    Phase2Task_37,                          // 37
+    Phase2Task_38,                          // 38
+    Phase2Task_39,                          // 39
+    Phase2Task_40,                          // 40
+    Phase2Task_41,                          // 41
 };
 
-const TransitionState sMainTransitionPhases[] =
+const TransitionStateFunc sMainTransitionPhases[] =
 {
     &Transition_Phase1,
     &Transition_WaitForPhase1,
@@ -197,6 +314,201 @@ const TransitionState sMainTransitionPhases[] =
     &Transition_WaitForPhase2
 };
 
+const TransitionStateFunc sPhase2_Blur_Funcs[] =
+{
+    Phase2_Blur_Func1,
+    Phase2_Blur_Func2,
+    Phase2_Blur_Func3
+};
+
+const TransitionStateFunc sPhase2_Swirl_Funcs[] =
+{
+    Phase2_Swirl_Func1,
+    Phase2_Swirl_Func2,
+};
+
+const TransitionStateFunc sPhase2_Shuffle_Funcs[] =
+{
+    Phase2_Shuffle_Func1,
+    Phase2_Shuffle_Func2,
+};
+
+const TransitionStateFunc sPhase2_Aqua_Funcs[] =
+{
+    Phase2_Aqua_Func1,
+    Phase2_Aqua_Func2,
+    Phase2_BigPokeball_Func3,
+    Phase2_BigPokeball_Func4,
+    Phase2_BigPokeball_Func5,
+    Phase2_FramesCountdown,
+    Phase2_BigPokeball_Func6
+};
+
+const TransitionStateFunc sPhase2_Magma_Funcs[] =
+{
+    Phase2_Magma_Func1,
+    Phase2_Magma_Func2,
+    Phase2_BigPokeball_Func3,
+    Phase2_BigPokeball_Func4,
+    Phase2_BigPokeball_Func5,
+    Phase2_FramesCountdown,
+    Phase2_BigPokeball_Func6
+};
+
+const TransitionStateFunc sPhase2_BigPokeball_Funcs[] =
+{
+    Phase2_BigPokeball_Func1,
+    Phase2_BigPokeball_Func2,
+    Phase2_BigPokeball_Func3,
+    Phase2_BigPokeball_Func4,
+    Phase2_BigPokeball_Func5,
+    Phase2_BigPokeball_Func6
+};
+
+const TransitionStateFunc sPhase2_Regice_Funcs[] =
+{
+    Phase2_Regi_Func1,
+    Phase2_Regice_Func2,
+    Phase2_BigPokeball_Func3,
+    Phase2_BigPokeball_Func4,
+    Phase2_BigPokeball_Func5,
+    Phase2_BigPokeball_Func6
+};
+
+const TransitionStateFunc sPhase2_Registeel_Funcs[] =
+{
+    Phase2_Regi_Func1,
+    Phase2_Registeel_Func2,
+    Phase2_BigPokeball_Func3,
+    Phase2_BigPokeball_Func4,
+    Phase2_BigPokeball_Func5,
+    Phase2_BigPokeball_Func6
+};
+
+const TransitionStateFunc sPhase2_Regirock_Funcs[] =
+{
+    Phase2_Regi_Func1,
+    Phase2_Regirock_Func2,
+    Phase2_BigPokeball_Func3,
+    Phase2_BigPokeball_Func4,
+    Phase2_BigPokeball_Func5,
+    Phase2_BigPokeball_Func6
+};
+
+const TransitionStateFunc sPhase2_Kyogre_Funcs[] =
+{
+    Phase2_WeatherTrio_Func1,
+    Phase2_WaitPaletteFade,
+    Phase2_Kyogre_Func3,
+    Phase2_Kyogre_Func4,
+    Phase2_Kyogre_Func5,
+    Phase2_FramesCountdown,
+    Phase2_WeatherDuo_Func6,
+    Phase2_WeatherDuo_Func7
+};
+
+const TransitionStateFunc sPhase2_PokeballsTrail_Funcs[] =
+{
+    Phase2_PokeballsTrail_Func1,
+    Phase2_PokeballsTrail_Func2,
+    Phase2_PokeballsTrail_Func3
+};
+
+const s16 sUnknown_085C8B88[2] = {-16, 256};
+const s16 sUnknown_085C8B8C[5] = {0, 32, 64, 18, 48};
+const s16 sUnknown_085C8B96[2] = {8, -8};
+
+const TransitionStateFunc sPhase2_Clockwise_BlackFade_Funcs[] =
+{
+    Phase2_Clockwise_BlackFade_Func1,
+    Phase2_Clockwise_BlackFade_Func2,
+    Phase2_Clockwise_BlackFade_Func3,
+    Phase2_Clockwise_BlackFade_Func4,
+    Phase2_Clockwise_BlackFade_Func5,
+    Phase2_Clockwise_BlackFade_Func6,
+    Phase2_Clockwise_BlackFade_Func7
+};
+
+const TransitionStateFunc sPhase2_Ripple_Funcs[] =
+{
+    Phase2_Ripple_Func1,
+    Phase2_Ripple_Func2
+};
+
+const TransitionStateFunc sPhase2_Wave_Funcs[] =
+{
+    Phase2_Wave_Func1,
+    Phase2_Wave_Func2,
+    Phase2_Wave_Func3
+};
+
+const TransitionStateFunc sPhase2_Mugshot_Funcs[] =
+{
+    Phase2_Mugshot_Func1,
+    Phase2_Mugshot_Func2,
+    Phase2_Mugshot_Func3,
+    Phase2_Mugshot_Func4,
+    Phase2_Mugshot_Func5,
+    Phase2_Mugshot_Func6,
+    Phase2_Mugshot_Func7,
+    Phase2_Mugshot_Func8,
+    Phase2_Mugshot_Func9,
+    Phase2_Mugshot_Func10
+};
+
+const u8 sMugshotsTrainerPicIDsTable[MUGSHOTS_COUNT] =
+{
+    TRAINER_PIC_ELITE_FOUR_SIDNEY,
+    TRAINER_PIC_ELITE_FOUR_PHOEBE,
+    TRAINER_PIC_ELITE_FOUR_GLACIA,
+    TRAINER_PIC_ELITE_FOUR_DRAKE,
+    TRAINER_PIC_CHAMPION_WALLACE
+};
+const s16 sMugshotsOpponentRotationScales[MUGSHOTS_COUNT][2] =
+{
+    {0x200, 0x200},
+    {0x200, 0x200},
+    {0x1B0, 0x1B0},
+    {0x1A0, 0x1A0},
+    {0x188, 0x188},
+};
+const s16 sMugshotsOpponentCoords[MUGSHOTS_COUNT][2] =
+{
+    {0,     0},
+    {0,     0},
+    {-4,    4},
+    {0,     5},
+    {-8,    7},
+};
+
+const TransitionSpriteCallback sUnknown_085C8C24[] =
+{
+    sub_81483A8,
+    sub_81483AC,
+    sub_81483F8,
+    sub_814842C,
+    sub_81483A8,
+    sub_8148458,
+    sub_81483A8
+};
+
+const s16 sUnknown_085C8C40[2] = {12, -12};
+const s16 sUnknown_085C8C44[2] = {-1, 1};
+
+const TransitionStateFunc sPhase2_Slice_Funcs[] =
+{
+    Phase2_Slice_Func1,
+    Phase2_Slice_Func2,
+    Phase2_Slice_Func3
+};
+
+extern const u16 gFieldEffectObjectPalette10[];
+extern const u16 sBigPokeball_Tilemap[];
+extern const u16 sMugshotsTilemap[];
+extern const struct SpriteTemplate gUnknown_085C8E68;
+extern const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT];
+extern const u16 *const sPlayerMugshotsPals[2];
+
 // code
 static void CB2_TestBattleTransition(void)
 {
@@ -238,6 +550,7 @@ void BattleTransition_Start(u8 transitionId)
     LaunchBattleTransitionTask(transitionId);
 }
 
+// main task that launches sub-tasks for phase1 and phase2
 #define tState          data[0]
 #define tTransitionID   data[1]
 #define tTransitionDone data[15]
@@ -285,3 +598,1594 @@ bool8 Transition_Phase1(struct Task *task)
         return TRUE;
     }
 }
+
+bool8 Transition_WaitForPhase1(struct Task *task)
+{
+    if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionID]) == 0xFF)
+    {
+        task->tState++;
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+bool8 Transition_Phase2(struct Task *task)
+{
+    CreateTask(sPhase2_Tasks[task->tTransitionID], 0);
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Transition_WaitForPhase2(struct Task *task)
+{
+    task->tTransitionDone = FALSE;
+    if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionID]) == 0xFF)
+        task->tTransitionDone = TRUE;
+    return FALSE;
+}
+
+#undef tState
+#undef tTransitionID
+#undef tTransitionDone
+
+// sub-task for phase1
+#define tState          data[0]
+
+void Phase1Task_TransitionAll(u8 taskId)
+{
+    if (gTasks[taskId].tState == 0)
+    {
+        gTasks[taskId].tState++;
+        CreatePhase1Task(0, 0, 3, 2, 2); // creates a sub-task for this sub-task
+    }
+    else if (IsPhase1Done())
+    {
+        DestroyTask(taskId);
+    }
+}
+
+#undef tState
+
+// sub-task for phase2
+#define tState              data[0]
+#define tFrames             data[8]
+#define tOpponentSpriteId   data[13]
+#define tPlayerSpriteId     data[14]
+#define tMugshotId          data[15]
+
+void Phase2Task_Blur(u8 taskId)
+{
+    while (sPhase2_Blur_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Blur_Func1(struct Task *task)
+{
+    SetGpuReg(REG_OFFSET_MOSAIC, 0);
+    SetGpuRegBits(REG_OFFSET_BG1CNT, BGCNT_MOSAIC);
+    SetGpuRegBits(REG_OFFSET_BG2CNT, BGCNT_MOSAIC);
+    SetGpuRegBits(REG_OFFSET_BG3CNT, BGCNT_MOSAIC);
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_Blur_Func2(struct Task *task)
+{
+    if (task->data[1] != 0)
+    {
+        task->data[1]--;
+    }
+    else
+    {
+        task->data[1] = 4;
+        if (++task->data[2] == 10)
+            BeginNormalPaletteFade(-1, -1, 0, 0x10, 0);
+        SetGpuReg(REG_OFFSET_MOSAIC, (task->data[2] & 15) * 17);
+        if (task->data[2] > 14)
+            task->tState++;
+    }
+    return FALSE;
+}
+
+bool8 Phase2_Blur_Func3(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 taskId = FindTaskIdByFunc(Phase2Task_Blur);
+        DestroyTask(taskId);
+    }
+    return FALSE;
+}
+
+void Phase2Task_Swirl(u8 taskId)
+{
+    while (sPhase2_Swirl_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Swirl_Func1(struct Task *task)
+{
+    sub_8149F08();
+    dp12_8087EA4();
+    BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
+    sub_8149F98(gUnknown_020393A8, sTransitionStructPtr->field_14, 0, 2, 0, 160);
+
+    SetVBlankCallback(VBlankCB_Phase2_Swirl);
+    SetHBlankCallback(HBlankCB_Phase2_Swirl);
+
+    EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_HBLANK);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Swirl_Func2(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+    task->data[1] += 4;
+    task->data[2] += 8;
+
+    sub_8149F98(gUnknown_02038C28[0], sTransitionStructPtr->field_14, task->data[1], 2, task->data[2], 160);
+
+    if (!gPaletteFade.active)
+    {
+        u8 taskId = FindTaskIdByFunc(Phase2Task_Swirl);
+        DestroyTask(taskId);
+    }
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+void VBlankCB_Phase2_Swirl(void)
+{
+    VBlankCB_BattleTransition();
+    if (sTransitionStructPtr->VBlank_DMA)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+}
+
+void HBlankCB_Phase2_Swirl(void)
+{
+    u16 var = gUnknown_02038C28[1][REG_VCOUNT];
+    REG_BG1HOFS = var;
+    REG_BG2HOFS = var;
+    REG_BG3HOFS = var;
+}
+
+void Phase2Task_Shuffle(u8 taskId)
+{
+    while (sPhase2_Shuffle_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Shuffle_Func1(struct Task *task)
+{
+    sub_8149F08();
+    dp12_8087EA4();
+
+    BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
+    memset(gUnknown_020393A8, sTransitionStructPtr->field_16, 0x140);
+
+    SetVBlankCallback(VBlankCB_Phase2_Shuffle);
+    SetHBlankCallback(HBlankCB_Phase2_Shuffle);
+
+    EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_HBLANK);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Shuffle_Func2(struct Task *task)
+{
+    u8 i;
+    u16 r3, r4;
+
+    sTransitionStructPtr->VBlank_DMA = 0;
+    r4 = task->data[1];
+    r3 = task->data[2] >> 8;
+    task->data[1] += 4224;
+    task->data[2] += 384;
+
+    for (i = 0; i < 160; i++, r4 += 4224)
+    {
+        u16 var = r4 / 256;
+        gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3);
+    }
+
+    if (!gPaletteFade.active)
+        DestroyTask(FindTaskIdByFunc(Phase2Task_Shuffle));
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+void VBlankCB_Phase2_Shuffle(void)
+{
+    VBlankCB_BattleTransition();
+    if (sTransitionStructPtr->VBlank_DMA)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+}
+
+void HBlankCB_Phase2_Shuffle(void)
+{
+    u16 var = gUnknown_02038C28[1][REG_VCOUNT];
+    REG_BG1VOFS = var;
+    REG_BG2VOFS = var;
+    REG_BG3VOFS = var;
+}
+
+void Phase2Task_BigPokeball(u8 taskId)
+{
+    while (sPhase2_BigPokeball_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void Phase2Task_Aqua(u8 taskId)
+{
+    while (sPhase2_Aqua_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void Phase2Task_Magma(u8 taskId)
+{
+    while (sPhase2_Magma_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void Phase2Task_Regice(u8 taskId)
+{
+    while (sPhase2_Regice_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void Phase2Task_Registeel(u8 taskId)
+{
+    while (sPhase2_Registeel_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void Phase2Task_Regirock(u8 taskId)
+{
+    while (sPhase2_Regirock_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void Phase2Task_Kyogre(u8 taskId)
+{
+    while (sPhase2_Kyogre_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void sub_814669C(struct Task *task)
+{
+    s32 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+
+    task->data[1] = 16;
+    task->data[2] = 0;
+    task->data[4] = 0;
+    task->data[5] = 0x4000;
+    sTransitionStructPtr->WININ = 63;
+    sTransitionStructPtr->WINOUT = 0;
+    sTransitionStructPtr->field_6 = 240;
+    sTransitionStructPtr->WIN0V = 160;
+    sTransitionStructPtr->BLDCNT = 0x3F41;
+    sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | (task->data[2]);
+
+    for (i = 0; i < 160; i++)
+    {
+        gUnknown_02038C28[1][i] = 240;
+    }
+
+    SetVBlankCallback(VBlankCB0_Phase2_BigPokeball);
+}
+
+bool8 Phase2_Aqua_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    task->tFrames = 60;
+    sub_814669C(task);
+    sub_8149F58(&dst1, &dst2);
+    CpuFill16(0, dst1, 0x800);
+    LZ77UnCompVram(sTeamAqua_Tileset, dst2);
+    LoadPalette(sEvilTeam_Palette, 0xF0, 0x20);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Magma_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    task->tFrames = 60;
+    sub_814669C(task);
+    sub_8149F58(&dst1, &dst2);
+    CpuFill16(0, dst1, 0x800);
+    LZ77UnCompVram(sTeamMagma_Tileset, dst2);
+    LoadPalette(sEvilTeam_Palette, 0xF0, 0x20);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Regi_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    task->tFrames = 60;
+    sub_814669C(task);
+    sub_8149F58(&dst1, &dst2);
+    CpuFill16(0, dst1, 0x800);
+    CpuCopy16(gUnknown_085BBC14, dst2, 0x2000);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_BigPokeball_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_814669C(task);
+    sub_8149F58(&dst1, &dst2);
+    CpuFill16(0, dst1, 0x800);
+    CpuCopy16(sBigPokeball_Tileset, dst2, 0x580);
+    LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_BigPokeball_Func2(struct Task *task)
+{
+    s16 i, j;
+    u16 *dst1, *dst2;
+    const u16 *BigPokeballMap;
+
+    sub_8149F58(&dst1, &dst2);
+    BigPokeballMap = sBigPokeball_Tilemap;
+    for (i = 0; i < 20; i++)
+    {
+        for (j = 0; j < 30; j++, BigPokeballMap++)
+        {
+            dst1[i * 32 + j] = *BigPokeballMap | 0xF000;
+        }
+    }
+    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_Aqua_Func2(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LZ77UnCompVram(sTeamAqua_Tilemap, dst1);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Magma_Func2(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LZ77UnCompVram(sTeamMagma_Tilemap, dst1);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Regice_Func2(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LoadPalette(gUnknown_085BC2B4, 0xF0, 0x20);
+    CpuCopy16(gUnknown_085BC314, dst1, 0x500);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Registeel_Func2(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LoadPalette(gUnknown_085BC2D4, 0xF0, 0x20);
+    CpuCopy16(gUnknown_085BCB14, dst1, 0x500);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Regirock_Func2(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LoadPalette(gUnknown_085BC2F4, 0xF0, 0x20);
+    CpuCopy16(gUnknown_085BD314, dst1, 0x500);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Kyogre_Func3(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    CpuFill16(0, dst1, 0x800);
+    LZ77UnCompVram(gUnknown_085BDB34, dst2);
+    LZ77UnCompVram(gUnknown_085BE1E8, dst1);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Kyogre_Func4(struct Task *task)
+{
+    if (task->data[1] % 3 == 0)
+    {
+        u16 var = task->data[1] % 30;
+        var /= 3;
+        LoadPalette(gUnknown_085BEDA0 + (var * 16), 0xF0, 0x20);
+    }
+    if (++task->data[1] > 58)
+    {
+        task->tState++;
+        task->data[1] = 0;
+    }
+
+    return FALSE;
+}
+
+bool8 Phase2_Kyogre_Func5(struct Task *task)
+{
+    if (task->data[1] % 5 == 0)
+    {
+        s16 var = task->data[1] / 5;
+        LoadPalette(gUnknown_085BEEE0 + (var * 16), 0xF0, 0x20);
+    }
+    if (++task->data[1] > 68)
+    {
+        task->tState++;
+        task->data[1] = 0;
+        task->tFrames = 30;
+    }
+
+    return FALSE;
+}
+
+bool8 Phase2_WeatherDuo_Func6(struct Task *task)
+{
+    BeginNormalPaletteFade(0xFFFF8000, 1, 0, 0x10, 0);
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_WeatherDuo_Func7(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        DmaStop(0);
+        sub_8149F84();
+        DestroyTask(FindTaskIdByFunc(task->func));
+    }
+    return FALSE;
+}
+
+bool8 Phase2_BigPokeball_Func3(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+    if (task->data[3] == 0 || --task->data[3] == 0)
+    {
+        task->data[2]++;
+        task->data[3] = 2;
+    }
+    sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | task->data[2];
+    if (task->data[2] > 15)
+        task->tState++;
+    task->data[4] += 8;
+    task->data[5] -= 256;
+
+    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160);
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_BigPokeball_Func4(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+    if (task->data[3] == 0 || --task->data[3] == 0)
+    {
+        task->data[1]--;
+        task->data[3] = 2;
+    }
+    sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | task->data[2];
+    if (task->data[1] == 0)
+        task->tState++;
+    task->data[4] += 8;
+    task->data[5] -= 256;
+
+    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160);
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_BigPokeball_Func5(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+    task->data[4] += 8;
+    task->data[5] -= 256;
+
+    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160);
+
+    if (task->data[5] <= 0)
+    {
+        task->tState++;
+        task->data[1] = 160;
+        task->data[2] = 256;
+        task->data[3] = 0;
+    }
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_FramesCountdown(struct Task *task)
+{
+    if (--task->tFrames == 0)
+        task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_WeatherTrio_Func1(struct Task *task)
+{
+    BeginNormalPaletteFade(0x0000FFFF, 1, 0, 0x10, 0);
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_WaitPaletteFade(struct Task *task)
+{
+    if (!gPaletteFade.active)
+        task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_BigPokeball_Func6(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+    if (task->data[2] < 1024)
+        task->data[2] += 128;
+    if (task->data[1] != 0)
+    {
+        task->data[1] -= (task->data[2] >> 8);
+        if (task->data[1] < 0)
+            task->data[1] = 0;
+    }
+    sub_814A014(gUnknown_02038C28[0], 120, 80, task->data[1]);
+    if (task->data[1] == 0)
+    {
+        SetVBlankCallback(NULL);
+        DmaStop(0);
+        sub_8149F84();
+        DestroyTask(FindTaskIdByFunc(task->func));
+    }
+    else
+    {
+        if (task->data[3] == 0)
+        {
+            task->data[3]++;
+            SetVBlankCallback(VBlankCB1_Phase2_BigPokeball);
+        }
+
+        sTransitionStructPtr->VBlank_DMA++;
+    }
+
+    return FALSE;
+}
+
+void Transition_BigPokeball_Vblank(void)
+{
+    DmaStop(0);
+    VBlankCB_BattleTransition();
+    if (sTransitionStructPtr->VBlank_DMA)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+    REG_WININ = sTransitionStructPtr->WININ;
+    REG_WINOUT = sTransitionStructPtr->WINOUT;
+    REG_WIN0V = sTransitionStructPtr->WIN0V;
+    REG_BLDCNT = sTransitionStructPtr->BLDCNT;
+    REG_BLDALPHA = sTransitionStructPtr->BLDALPHA;
+}
+
+void VBlankCB0_Phase2_BigPokeball(void)
+{
+    Transition_BigPokeball_Vblank();
+    DmaSet(0, gUnknown_020393A8, &REG_BG0HOFS, 0xA2400001);
+}
+
+void VBlankCB1_Phase2_BigPokeball(void)
+{
+    Transition_BigPokeball_Vblank();
+    DmaSet(0, gUnknown_020393A8, &REG_WIN0H, 0xA2400001);
+}
+
+void Phase2Task_PokeballsTrail(u8 taskId)
+{
+    while (sPhase2_PokeballsTrail_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_PokeballsTrail_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    CpuSet(sPokeballTrail_Tileset, dst2, 0x20);
+    CpuFill32(0, dst1, 0x800);
+    LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_PokeballsTrail_Func2(struct Task *task)
+{
+    s16 i;
+    s16 rand;
+    s16 arr0[ARRAY_COUNT(sUnknown_085C8B88)];
+    s16 arr1[ARRAY_COUNT(sUnknown_085C8B8C)];
+
+    memcpy(arr0, sUnknown_085C8B88, sizeof(sUnknown_085C8B88));
+    memcpy(arr1, sUnknown_085C8B8C, sizeof(sUnknown_085C8B8C));
+    rand = Random() & 1;
+    for (i = 0; i <= 4; i++, rand ^= 1)
+    {
+        gFieldEffectArguments[0] = arr0[rand];      // x
+        gFieldEffectArguments[1] = (i * 32) + 16;   // y
+        gFieldEffectArguments[2] = rand;
+        gFieldEffectArguments[3] = arr1[i];
+        FieldEffectStart(FLDEFF_POKEBALL);
+    }
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_PokeballsTrail_Func3(struct Task *task)
+{
+    if (!FieldEffectActiveListContains(FLDEFF_POKEBALL))
+    {
+        sub_8149F84();
+        DestroyTask(FindTaskIdByFunc(Phase2Task_PokeballsTrail));
+    }
+    return FALSE;
+}
+
+bool8 FldEff_Pokeball(void)
+{
+    u8 spriteId = CreateSpriteAtEnd(&gUnknown_085C8E68, gFieldEffectArguments[0], gFieldEffectArguments[1], 0);
+    gSprites[spriteId].oam.priority = 0;
+    gSprites[spriteId].oam.affineMode = 1;
+    gSprites[spriteId].data[0] = gFieldEffectArguments[2];
+    gSprites[spriteId].data[1] = gFieldEffectArguments[3];
+    gSprites[spriteId].data[2] = -1;
+    InitSpriteAffineAnim(&gSprites[spriteId]);
+    StartSpriteAffineAnim(&gSprites[spriteId], gFieldEffectArguments[2]);
+    return FALSE;
+}
+
+#define SOME_VRAM_STORE(ptr, posY, posX, toStore)                       \
+{                                                                       \
+    u32 index = (posY) * 32 + posX;                                     \
+    ptr[index] = toStore;                                               \
+}
+
+void sub_814713C(struct Sprite *sprite)
+{
+    s16 arr0[ARRAY_COUNT(sUnknown_085C8B96)];
+
+    memcpy(arr0, sUnknown_085C8B96, sizeof(sUnknown_085C8B96));
+    if (sprite->data[1] != 0)
+    {
+        sprite->data[1]--;
+    }
+    else
+    {
+        if (sprite->pos1.x >= 0 && sprite->pos1.x <= 240)
+        {
+            s16 posX = sprite->pos1.x >> 3;
+            s16 posY = sprite->pos1.y >> 3;
+
+            if (posX != sprite->data[2])
+            {
+                u32 var;
+                u16 *ptr;
+
+                sprite->data[2] = posX;
+                var = (((REG_BG0CNT >> 8) & 0x1F) << 11);  // r2
+                ptr = (u16 *)(VRAM + var);
+
+                SOME_VRAM_STORE(ptr, posY - 2, posX, 0xF001);
+                SOME_VRAM_STORE(ptr, posY - 1, posX, 0xF001);
+                SOME_VRAM_STORE(ptr, posY - 0, posX, 0xF001);
+                SOME_VRAM_STORE(ptr, posY + 1, posX, 0xF001);
+            }
+        }
+        sprite->pos1.x += arr0[sprite->data[0]];
+        if (sprite->pos1.x < -15 || sprite->pos1.x > 255)
+            FieldEffectStop(sprite, FLDEFF_POKEBALL);
+    }
+}
+
+void Phase2Task_Clockwise_BlackFade(u8 taskId)
+{
+    while (sPhase2_Clockwise_BlackFade_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task)
+{
+    u16 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+
+    sTransitionStructPtr->WININ = 0;
+    sTransitionStructPtr->WINOUT = 63;
+    sTransitionStructPtr->field_6 = -3855;
+    sTransitionStructPtr->WIN0V = 160;
+
+    for (i = 0; i < 160; i++)
+    {
+        gUnknown_020393A8[i] = 0xF3F4;
+    }
+
+    SetVBlankCallback(VBlankCB_Phase2_Clockwise_BlackFade);
+    sTransitionStructPtr->data[4] = 120;
+
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], -1, 1, 1);
+    do
+    {
+        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (sTransitionStructPtr->data[2] + 1) | 0x7800;
+    } while (!sub_814A228(sTransitionStructPtr->data, 1, 1));
+
+    sTransitionStructPtr->data[4] += 16;
+    if (sTransitionStructPtr->data[4] >= 240)
+    {
+        sTransitionStructPtr->data[5] = 0;
+        task->tState++;
+    }
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task)
+{
+    s16 r1, r3;
+    vu8 var = 0;
+
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    sub_814A1AC(sTransitionStructPtr->data, 120, 80, 240, sTransitionStructPtr->data[5], 1, 1);
+
+    while (1)
+    {
+        r1 = 120, r3 = sTransitionStructPtr->data[2] + 1;
+        if (sTransitionStructPtr->data[5] >= 80)
+            r1 = sTransitionStructPtr->data[2], r3 = 240;
+        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (r3) | (r1 << 8);
+        if (var != 0)
+            break;
+        var = sub_814A228(sTransitionStructPtr->data, 1, 1);
+    }
+
+    sTransitionStructPtr->data[5] += 8;
+    if (sTransitionStructPtr->data[5] >= 160)
+    {
+        sTransitionStructPtr->data[4] = 240;
+        task->tState++;
+    }
+    else
+    {
+        while (sTransitionStructPtr->data[3] < sTransitionStructPtr->data[5])
+        {
+            gUnknown_02038C28[0][++sTransitionStructPtr->data[3]] = (r3) | (r1 << 8);
+        }
+    }
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], 160, 1, 1);
+    do
+    {
+        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (sTransitionStructPtr->data[2] << 8) | 0xF0;
+    } while (!sub_814A228(sTransitionStructPtr->data, 1, 1));
+
+    sTransitionStructPtr->data[4] -= 16;
+    if (sTransitionStructPtr->data[4] <= 0)
+    {
+        sTransitionStructPtr->data[5] = 160;
+        task->tState++;
+    }
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task)
+{
+    s16 r1, r2, var4;
+    vu8 var = 0;
+
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    sub_814A1AC(sTransitionStructPtr->data, 120, 80, 0, sTransitionStructPtr->data[5], 1, 1);
+
+    while (1)
+    {
+        r1 = (gUnknown_02038C28[0][sTransitionStructPtr->data[3]]) & 0xFF;
+        r2 = sTransitionStructPtr->data[2];
+        if (sTransitionStructPtr->data[5] <= 80)
+            r2 = 120, r1 = sTransitionStructPtr->data[2];
+        var4 = (r1) | (r2 << 8);
+        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = var4;
+        if (var != 0)
+            break;
+        var = sub_814A228(sTransitionStructPtr->data, 1, 1);
+    }
+
+    sTransitionStructPtr->data[5] -= 8;
+    if (sTransitionStructPtr->data[5] <= 0)
+    {
+        sTransitionStructPtr->data[4] = 0;
+        task->tState++;
+    }
+    else
+    {
+        while (sTransitionStructPtr->data[3] > sTransitionStructPtr->data[5])
+        {
+            gUnknown_02038C28[0][--sTransitionStructPtr->data[3]] = (r1) | (r2 << 8);
+        }
+    }
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], 0, 1, 1);
+    do
+    {
+        s16 r2, r3;
+
+        r2 = 120, r3 = sTransitionStructPtr->data[2];
+        if (sTransitionStructPtr->data[2] >= 120)
+            r2 = 0, r3 = 240;
+        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (r3) | (r2 << 8);
+
+    } while (!sub_814A228(sTransitionStructPtr->data, 1, 1));
+
+    sTransitionStructPtr->data[4] += 16;
+    if (sTransitionStructPtr->data[2] > 120)
+        task->tState++;
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task)
+{
+    DmaStop(0);
+    sub_8149F84();
+    DestroyTask(FindTaskIdByFunc(Phase2Task_Clockwise_BlackFade));
+    return FALSE;
+}
+
+void VBlankCB_Phase2_Clockwise_BlackFade(void)
+{
+    DmaStop(0);
+    VBlankCB_BattleTransition();
+    if (sTransitionStructPtr->VBlank_DMA != 0)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+    REG_WININ = sTransitionStructPtr->WININ;
+    REG_WINOUT = sTransitionStructPtr->WINOUT;
+    REG_WIN0V = sTransitionStructPtr->WIN0V;
+    REG_WIN0H = gUnknown_02038C28[1][0];
+    DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
+}
+
+void Phase2Task_Ripple(u8 taskId)
+{
+    while (sPhase2_Ripple_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Ripple_Func1(struct Task *task)
+{
+    u8 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+
+    for (i = 0; i < 160; i++)
+    {
+        gUnknown_020393A8[i] = sTransitionStructPtr->field_16;
+    }
+
+    SetVBlankCallback(VBlankCB_Phase2_Ripple);
+    SetHBlankCallback(HBlankCB_Phase2_Ripple);
+
+    EnableInterrupts(INTR_FLAG_HBLANK);
+
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_Ripple_Func2(struct Task *task)
+{
+    u8 i;
+    s16 r3;
+    u16 r4, r8;
+
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    r3 = task->data[2] >> 8;
+    r4 = task->data[1];
+    r8 = 384;
+    task->data[1] += 0x400;
+    if (task->data[2] <= 0x1FFF)
+        task->data[2] += 0x180;
+
+    for (i = 0; i < 160; i++, r4 += r8)
+    {
+        // todo: fix the asm
+        s16 var = r4 >> 8;
+        asm("");
+        gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3);
+    }
+
+    if (++task->data[3] == 81)
+    {
+        task->data[4]++;
+        BeginNormalPaletteFade(-1, -2, 0, 0x10, 0);
+    }
+
+    if (task->data[4] != 0 && !gPaletteFade.active)
+        DestroyTask(FindTaskIdByFunc(Phase2Task_Ripple));
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+void VBlankCB_Phase2_Ripple(void)
+{
+    VBlankCB_BattleTransition();
+    if (sTransitionStructPtr->VBlank_DMA)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+}
+
+void HBlankCB_Phase2_Ripple(void)
+{
+    u16 var = gUnknown_02038C28[1][REG_VCOUNT];
+    REG_BG1VOFS = var;
+    REG_BG2VOFS = var;
+    REG_BG3VOFS = var;
+}
+
+void Phase2Task_Wave(u8 taskId)
+{
+    while (sPhase2_Wave_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Wave_Func1(struct Task *task)
+{
+    u8 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+
+    sTransitionStructPtr->WININ = 63;
+    sTransitionStructPtr->WINOUT = 0;
+    sTransitionStructPtr->field_6 = 240;
+    sTransitionStructPtr->WIN0V = 160;
+
+    for (i = 0; i < 160; i++)
+    {
+        gUnknown_02038C28[1][i] = 242;
+    }
+
+    SetVBlankCallback(VBlankCB_Phase2_Wave);
+
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_Wave_Func2(struct Task *task)
+{
+    u8 i, r5;
+    u16* toStore;
+    bool8 nextFunc;
+
+    sTransitionStructPtr->VBlank_DMA = 0;
+    toStore = gUnknown_02038C28[0];
+    r5 = task->data[2];
+    task->data[2] += 16;
+    task->data[1] += 8;
+
+    for (i = 0, nextFunc = TRUE; i < 160; i++, r5 += 4, toStore++)
+    {
+        s16 value = task->data[1] + Sin(r5, 40);
+        if (value < 0)
+            value = 0;
+        if (value > 240)
+            value = 240;
+        *toStore = (value << 8) | (0xF1);
+        if (value < 240)
+            nextFunc = FALSE;
+    }
+    if (nextFunc)
+        task->tState++;
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Wave_Func3(struct Task *task)
+{
+    DmaStop(0);
+    sub_8149F84();
+    DestroyTask(FindTaskIdByFunc(Phase2Task_Wave));
+    return FALSE;
+}
+
+void VBlankCB_Phase2_Wave(void)
+{
+    DmaStop(0);
+    VBlankCB_BattleTransition();
+    if (sTransitionStructPtr->VBlank_DMA != 0)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+    REG_WININ = sTransitionStructPtr->WININ;
+    REG_WINOUT = sTransitionStructPtr->WINOUT;
+    REG_WIN0V = sTransitionStructPtr->WIN0V;
+    DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
+}
+
+void Phase2Task_Sydney(u8 taskId)
+{
+    gTasks[taskId].tMugshotId = MUGSHOT_SYDNEY;
+    Phase2Task_MugShotTransition(taskId);
+}
+
+void Phase2Task_Phoebe(u8 taskId)
+{
+    gTasks[taskId].tMugshotId = MUGSHOT_PHOEBE;
+    Phase2Task_MugShotTransition(taskId);
+}
+
+void Phase2Task_Glacia(u8 taskId)
+{
+    gTasks[taskId].tMugshotId = MUGSHOT_GLACIA;
+    Phase2Task_MugShotTransition(taskId);
+}
+
+void Phase2Task_Drake(u8 taskId)
+{
+    gTasks[taskId].tMugshotId = MUGSHOT_DRAKE;
+    Phase2Task_MugShotTransition(taskId);
+}
+
+void Phase2Task_Champion(u8 taskId)
+{
+    gTasks[taskId].tMugshotId = MUGSHOT_CHAMPION;
+    Phase2Task_MugShotTransition(taskId);
+}
+
+void Phase2Task_MugShotTransition(u8 taskId)
+{
+    while (sPhase2_Mugshot_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Mugshot_Func1(struct Task *task)
+{
+    u8 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+    Mugshots_CreateOpponentPlayerSprites(task);
+
+    task->data[1] = 0;
+    task->data[2] = 1;
+    task->data[3] = 239;
+    sTransitionStructPtr->WININ = 63;
+    sTransitionStructPtr->WINOUT = 62;
+    sTransitionStructPtr->WIN0V = 160;
+
+    for (i = 0; i < 160; i++)
+    {
+        gUnknown_02038C28[1][i] = 0xF0F1;
+    }
+
+    SetVBlankCallback(VBlankCB0_Phase2_Mugshots);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Mugshot_Func2(struct Task *task)
+{
+    s16 i, j;
+    u16 *dst1, *dst2;
+    const u16 *MugshotsMap;
+
+    MugshotsMap = sMugshotsTilemap;
+    sub_8149F58(&dst1, &dst2);
+    CpuSet(sUnknown_085B9AF0, dst2, 0xF0);
+    LoadPalette(sOpponentMugshotsPals[task->tMugshotId], 0xF0, 0x20);
+    LoadPalette(sPlayerMugshotsPals[gSaveBlock2Ptr->playerGender], 0xFA, 0xC);
+
+    for (i = 0; i < 20; i++)
+    {
+        for (j = 0; j < 32; j++, MugshotsMap++)
+        {
+            dst1[i * 32 + j] = *MugshotsMap | 0xF000;
+        }
+    }
+
+    EnableInterrupts(INTR_FLAG_HBLANK);
+
+    SetHBlankCallback(HBlankCB_Phase2_Mugshots);
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Mugshot_Func3(struct Task *task)
+{
+    u8 i, r5;
+    u16* toStore;
+    s16 value;
+    s32 mergedValue;
+
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    toStore = gUnknown_02038C28[0];
+    r5 = task->data[1];
+    task->data[1] += 0x10;
+
+    for (i = 0; i < 80; i++, toStore++, r5 += 0x10)
+    {
+        value = task->data[2] + Sin(r5, 0x10);
+        if (value < 0)
+            value = 1;
+        if (value > 0xF0)
+            value = 0xF0;
+        *toStore = value;
+    }
+    for (; i < 160; i++, toStore++, r5 += 0x10)
+    {
+        value = task->data[3] - Sin(r5, 0x10);
+        if (value < 0)
+            value = 0;
+        if (value > 0xEF)
+            value = 0xEF;
+        *toStore = (value << 8) | (0xF0);
+    }
+
+    task->data[2] += 8;
+    task->data[3] -= 8;
+    if (task->data[2] > 0xF0)
+        task->data[2] = 0xF0;
+    if (task->data[3] < 0)
+        task->data[3] = 0;
+    mergedValue = *(s32*)(&task->data[2]);
+    if (mergedValue == 0xF0)
+        task->tState++;
+
+    sTransitionStructPtr->field_18 -= 8;
+    sTransitionStructPtr->field_1A += 8;
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Mugshot_Func4(struct Task *task)
+{
+    u8 i;
+    u16* toStore;
+
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    for (i = 0, toStore = gUnknown_02038C28[0]; i < 160; i++, toStore++)
+    {
+        *toStore = 0xF0;
+    }
+
+    task->tState++;
+    task->data[1] = 0;
+    task->data[2] = 0;
+    task->data[3] = 0;
+    sTransitionStructPtr->field_18 -= 8;
+    sTransitionStructPtr->field_1A += 8;
+
+    sub_8148484(task->tOpponentSpriteId, 0);
+    sub_8148484(task->tPlayerSpriteId, 1);
+    sub_814849C(task->tOpponentSpriteId);
+
+    PlaySE(SE_BT_START);
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Mugshot_Func5(struct Task *task)
+{
+    sTransitionStructPtr->field_18 -= 8;
+    sTransitionStructPtr->field_1A += 8;
+    if (sub_81484B8(task->tOpponentSpriteId))
+    {
+        task->tState++;
+        sub_814849C(task->tPlayerSpriteId);
+    }
+    return FALSE;
+}
+
+bool8 Phase2_Mugshot_Func6(struct Task *task)
+{
+    sTransitionStructPtr->field_18 -= 8;
+    sTransitionStructPtr->field_1A += 8;
+    if (sub_81484B8(task->tPlayerSpriteId))
+    {
+        sTransitionStructPtr->VBlank_DMA = 0;
+        SetVBlankCallback(NULL);
+        DmaStop(0);
+        memset(gUnknown_02038C28[0], 0, 0x140);
+        memset(gUnknown_02038C28[1], 0, 0x140);
+        SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
+        SetGpuReg(REG_OFFSET_BLDY, 0);
+        task->tState++;
+        task->data[3] = 0;
+        task->data[4] = 0;
+        sTransitionStructPtr->BLDCNT = 0xBF;
+        SetVBlankCallback(VBlankCB1_Phase2_Mugshots);
+    }
+    return FALSE;
+}
+
+bool8 Phase2_Mugshot_Func7(struct Task *task)
+{
+    bool32 r6;
+
+    sTransitionStructPtr->VBlank_DMA = 0;
+    r6 = TRUE;
+    sTransitionStructPtr->field_18 -= 8;
+    sTransitionStructPtr->field_1A += 8;
+
+    if (task->data[4] < 0x50)
+        task->data[4] += 2;
+    if (task->data[4] > 0x50)
+        task->data[4] = 0x50;
+
+    if (++task->data[3] & 1)
+    {
+        s16 i;
+        for (i = 0, r6 = FALSE; i <= task->data[4]; i++)
+        {
+            s16 index1 = 0x50 - i;
+            s16 index2 = 0x50 + i;
+            if (gUnknown_02038C28[0][index1] <= 15)
+            {
+                r6 = TRUE;
+                gUnknown_02038C28[0][index1]++;
+            }
+            if (gUnknown_02038C28[0][index2] <= 15)
+            {
+                r6 = TRUE;
+                gUnknown_02038C28[0][index2]++;
+            }
+        }
+    }
+
+    if (task->data[4] == 0x50 && !r6)
+        task->tState++;
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Mugshot_Func8(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+    BlendPalettes(-1, 0x10, 0x7FFF);
+    sTransitionStructPtr->BLDCNT = 0xFF;
+    task->data[3] = 0;
+
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_Mugshot_Func9(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    task->data[3]++;
+    memset(gUnknown_02038C28[0], task->data[3], 0x140);
+    if (task->data[3] > 15)
+        task->tState++;
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Mugshot_Func10(struct Task *task)
+{
+    DmaStop(0);
+    sub_8149F84();
+    DestroyTask(FindTaskIdByFunc(task->func));
+    return FALSE;
+}
+
+void VBlankCB0_Phase2_Mugshots(void)
+{
+    DmaStop(0);
+    VBlankCB_BattleTransition();
+    if (sTransitionStructPtr->VBlank_DMA != 0)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+    REG_BG0VOFS = sTransitionStructPtr->field_1C;
+    REG_WININ = sTransitionStructPtr->WININ;
+    REG_WINOUT = sTransitionStructPtr->WINOUT;
+    REG_WIN0V = sTransitionStructPtr->WIN0V;
+    DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
+}
+
+void VBlankCB1_Phase2_Mugshots(void)
+{
+    DmaStop(0);
+    VBlankCB_BattleTransition();
+    if (sTransitionStructPtr->VBlank_DMA != 0)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+    REG_BLDCNT = sTransitionStructPtr->BLDCNT;
+    DmaSet(0, gUnknown_02038C28[1], &REG_BLDY, 0xA2400001);
+}
+
+void HBlankCB_Phase2_Mugshots(void)
+{
+    if (REG_VCOUNT < 80)
+        REG_BG0HOFS = sTransitionStructPtr->field_18;
+    else
+        REG_BG0HOFS = sTransitionStructPtr->field_1A;
+}
+
+void Mugshots_CreateOpponentPlayerSprites(struct Task *task)
+{
+    struct Sprite *opponentSprite, *playerSprite;
+
+    s16 mugshotId = task->tMugshotId;
+    task->tOpponentSpriteId = CreateTrainerSprite(sMugshotsTrainerPicIDsTable[mugshotId],
+                                                     sMugshotsOpponentCoords[mugshotId][0] - 32,
+                                                     sMugshotsOpponentCoords[mugshotId][1] + 42,
+                                                     0, gDecompressionBuffer);
+    task->tPlayerSpriteId = CreateTrainerSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), 272, 106, 0, gDecompressionBuffer);
+
+    opponentSprite = &gSprites[task->tOpponentSpriteId];
+    playerSprite = &gSprites[task->tPlayerSpriteId];
+
+    opponentSprite->callback = sub_8148380;
+    playerSprite->callback = sub_8148380;
+
+    opponentSprite->oam.affineMode = 3;
+    playerSprite->oam.affineMode = 3;
+
+    opponentSprite->oam.matrixNum = AllocOamMatrix();
+    playerSprite->oam.matrixNum = AllocOamMatrix();
+
+    opponentSprite->oam.shape = 1;
+    playerSprite->oam.shape = 1;
+
+    opponentSprite->oam.size = 3;
+    playerSprite->oam.size = 3;
+
+    CalcCenterToCornerVec(opponentSprite, 1, 3, 3);
+    CalcCenterToCornerVec(playerSprite, 1, 3, 3);
+
+    SetOamMatrixRotationScaling(opponentSprite->oam.matrixNum, sMugshotsOpponentRotationScales[mugshotId][0], sMugshotsOpponentRotationScales[mugshotId][1], 0);
+    SetOamMatrixRotationScaling(playerSprite->oam.matrixNum, -512, 512, 0);
+}
+
+void sub_8148380(struct Sprite *sprite)
+{
+    while (sUnknown_085C8C24[sprite->data[0]](sprite));
+}
+
+bool8 sub_81483A8(struct Sprite *sprite)
+{
+    return FALSE;
+}
+
+bool8 sub_81483AC(struct Sprite *sprite)
+{
+    s16 arr0[2];
+    s16 arr1[2];
+
+    memcpy(arr0, sUnknown_085C8C40, sizeof(sUnknown_085C8C40));
+    memcpy(arr1, sUnknown_085C8C44, sizeof(sUnknown_085C8C44));
+
+    sprite->data[0]++;
+    sprite->data[1] = arr0[sprite->data[7]];
+    sprite->data[2] = arr1[sprite->data[7]];
+    return TRUE;
+}
+
+bool8 sub_81483F8(struct Sprite *sprite)
+{
+    sprite->pos1.x += sprite->data[1];
+    if (sprite->data[7] && sprite->pos1.x < 133)
+        sprite->data[0]++;
+    else if (!sprite->data[7] && sprite->pos1.x > 103)
+        sprite->data[0]++;
+    return FALSE;
+}
+
+bool8 sub_814842C(struct Sprite *sprite)
+{
+    sprite->data[1] += sprite->data[2];
+    sprite->pos1.x += sprite->data[1];
+    if (sprite->data[1] == 0)
+    {
+        sprite->data[0]++;
+        sprite->data[2] = -sprite->data[2];
+        sprite->data[6] = 1;
+    }
+    return FALSE;
+}
+
+bool8 sub_8148458(struct Sprite *sprite)
+{
+    sprite->data[1] += sprite->data[2];
+    sprite->pos1.x += sprite->data[1];
+    if (sprite->pos1.x < -31 || sprite->pos1.x > 271)
+        sprite->data[0]++;
+    return FALSE;
+}
+
+void sub_8148484(s16 spriteId, s16 value)
+{
+    gSprites[spriteId].data[7] = value;
+}
+
+void sub_814849C(s16 spriteId)
+{
+    gSprites[spriteId].data[0]++;
+}
+
+s16 sub_81484B8(s16 spriteId)
+{
+    return gSprites[spriteId].data[6];
+}
+
+void Phase2Task_Slice(u8 taskId)
+{
+    while (sPhase2_Slice_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Slice_Func1(struct Task *task)
+{
+    u16 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+
+    task->data[2] = 256;
+    task->data[3] = 1;
+    sTransitionStructPtr->WININ = 63;
+    sTransitionStructPtr->WINOUT = 0;
+    sTransitionStructPtr->WIN0V = 160;
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    for (i = 0; i < 160; i++)
+    {
+        gUnknown_02038C28[1][i] = sTransitionStructPtr->field_14;
+        gUnknown_02038C28[1][160 + i] = 0xF0;
+    }
+
+    EnableInterrupts(INTR_FLAG_HBLANK);
+    SetGpuRegBits(REG_OFFSET_DISPSTAT, DISPSTAT_HBLANK_INTR);
+
+    SetVBlankCallback(VBlankCB_Phase2_Slice);
+    SetHBlankCallback(HBlankCB_Phase2_Slice);
+
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_Slice_Func2(struct Task *task)
+{
+    u16 i;
+
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    task->data[1] += (task->data[2] >> 8);
+    if (task->data[1] > 0xF0)
+        task->data[1] = 0xF0;
+    if (task->data[2] <= 0xFFF)
+        task->data[2] += task->data[3];
+    if (task->data[3] < 128)
+        task->data[3] <<= 1; // multiplying by two
+
+    for (i = 0; i < 160; i++)
+    {
+        u16* storeLoc1 = &gUnknown_02038C28[0][i];
+        u16* storeLoc2 = &gUnknown_02038C28[0][i + 160];
+        if (1 & i)
+        {
+            *storeLoc1 = sTransitionStructPtr->field_14 + task->data[1];
+            *storeLoc2 = 0xF0 - task->data[1];
+        }
+        else
+        {
+            *storeLoc1 = sTransitionStructPtr->field_14 - task->data[1];
+            *storeLoc2 = (task->data[1] << 8) | (0xF1);
+        }
+    }
+
+    if (task->data[1] > 0xEF)
+        task->tState++;
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Slice_Func3(struct Task *task)
+{
+    DmaStop(0);
+    sub_8149F84();
+    DestroyTask(FindTaskIdByFunc(Phase2Task_Slice));
+    return FALSE;
+}
+
+void VBlankCB_Phase2_Slice(void)
+{
+    DmaStop(0);
+    VBlankCB_BattleTransition();
+    REG_WININ = sTransitionStructPtr->WININ;
+    REG_WINOUT = sTransitionStructPtr->WINOUT;
+    REG_WIN0V = sTransitionStructPtr->WIN0V;
+    if (sTransitionStructPtr->VBlank_DMA)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 640);
+    DmaSet(0, &gUnknown_02038C28[1][160], &REG_WIN0H, 0xA2400001);
+}
+
+void HBlankCB_Phase2_Slice(void)
+{
+    if (REG_VCOUNT < 160)
+    {
+        u16 var = gUnknown_02038C28[1][REG_VCOUNT];
+        REG_BG1HOFS = var;
+        REG_BG2HOFS = var;
+        REG_BG3HOFS = var;
+    }
+}
-- 
cgit v1.2.3


From 462a0030aec788c5c1ff81ddaba555a99bcb2a84 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sat, 6 Jan 2018 00:17:31 -0600
Subject: match MoveSaveBlocks_ResetHeap

---
 src/load_save.c | 162 ++++++++------------------------------------------------
 1 file changed, 21 insertions(+), 141 deletions(-)

(limited to 'src')

diff --git a/src/load_save.c b/src/load_save.c
index e0106c0a8..734f7398b 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -80,45 +80,15 @@ void SetSaveBlocksPointers(u16 offset)
     SetDecorationInventoriesPointers();
 }
 
-// stuff i used to try and match MoveSaveBlocks_ResetHeap
-struct SaveBlocksInOne
-{
-    struct SaveBlock2 sav2;
-    struct SaveBlock1 sav1;
-    struct PokemonStorage sav3;
-};
+extern u8 gHeap[];
 
-extern struct SaveBlocksInOne gHeap;
-
-#define ewram_addr 0x02000000 // oh no...
-#define ewram_addr2 0x02000f2c
-#define ewram_addr3 0x02004cb4
-
-#define eSaveBlockCopy            (*(struct SaveBlocksInOne *)(ewram_addr + 0x0))
-#define eSaveBlock2Copy           (*(struct SaveBlock2 *)((void*)(ewram_addr + 0x0)))
-#define eSaveBlock1Copy           (*(struct SaveBlock1 *)((void*)(ewram_addr + sizeof(struct SaveBlock2))))
-#define eSaveBlock3Copy           (*(struct PokemonStorage *)((void*)(ewram_addr + sizeof(struct SaveBlock2) + sizeof(struct SaveBlock1))))
-
-#ifdef NONMATCHING // this is one devil of a motherfucker
-/*
-    The reason MoveSaveBlocks_ResetHeap mismatches is due to incorrect memcpys. Various
-    things have been tried, such as: direct struct copys, ewram casts, use of defining
-    the addresses manually, using memcpy anyway, delayed allocation of pointers at
-    the start of function, as seen above and below. Scope declaration has been used to try and
-    reproduce the correct macro thought to be used, but nothing has worked. It is worth
-    noting that at this point that the compiler will delay the allocation of the save block
-    pointers at the beginningto be allocated later: which might matter for matching this.
-    Due to loading shared ewram heap areas directly, it is very likely emerald used ewram
-    defines for this function, but there is no known example of a matching define.
-    In addition, dead code might be present in the form of a runtime variable used
-    to fix the address of the save blocks. This has been tested and is shown to affect
-    the registers as well.
-*/
 void MoveSaveBlocks_ResetHeap(void)
 {
     void *vblankCB, *hblankCB;
     u32 encryptionKey;
-    struct SaveBlock1 **sav1Copy = &gSaveBlock1Ptr; // r10;
+    struct SaveBlock2 *saveBlock2Copy;
+    struct SaveBlock1 *saveBlock1Copy;
+    struct PokemonStorage *pokemonStorageCopy;
 
     // save interrupt functions and turn them off
     vblankCB = gMain.vblankCallback;
@@ -127,22 +97,30 @@ void MoveSaveBlocks_ResetHeap(void)
     gMain.hblankCallback = NULL;
     gUnknown_0203CF5C = NULL;
 
+    saveBlock2Copy = (struct SaveBlock2 *)(gHeap);
+    saveBlock1Copy = (struct SaveBlock1 *)(gHeap + sizeof(struct SaveBlock2));
+    pokemonStorageCopy = (struct PokemonStorage *)(gHeap + sizeof(struct SaveBlock2) + sizeof(struct SaveBlock1));
+
     // backup the saves.
-    eSaveBlock1Copy = **sav1Copy;
-    eSaveBlock2Copy = *gSaveBlock2Ptr;
-    eSaveBlock3Copy = *gPokemonStoragePtr;
+    *saveBlock2Copy = *gSaveBlock2Ptr;
+    *saveBlock1Copy = *gSaveBlock1Ptr;
+    *pokemonStorageCopy = *gPokemonStoragePtr;
 
     // change saveblocks' pointers
     // argument is a sum of the individual trainerId bytes
-    SetSaveBlocksPointers(eSaveBlock2Copy.playerTrainerId[0] + eSaveBlock2Copy.playerTrainerId[1] + eSaveBlock2Copy.playerTrainerId[2] + eSaveBlock2Copy.playerTrainerId[3]);
+    SetSaveBlocksPointers(
+      saveBlock2Copy->playerTrainerId[0] +
+      saveBlock2Copy->playerTrainerId[1] +
+      saveBlock2Copy->playerTrainerId[2] +
+      saveBlock2Copy->playerTrainerId[3]);
 
     // restore saveblock data since the pointers changed
-    **sav1Copy = eSaveBlock1Copy;
-    *gSaveBlock2Ptr = eSaveBlock2Copy;
-    *gPokemonStoragePtr = eSaveBlock3Copy;
+    memcpy(gSaveBlock2Ptr, saveBlock2Copy, sizeof(*gSaveBlock2Ptr));
+    memcpy(gSaveBlock1Ptr, saveBlock1Copy, sizeof(*gSaveBlock1Ptr));
+    memcpy(gPokemonStoragePtr, pokemonStorageCopy, sizeof(*gPokemonStoragePtr));
 
     // heap was destroyed in the copying process, so reset it
-    InitHeap((void*)(0x02000000), 0x1C000);
+    InitHeap(gHeap, 0x1C000);
 
     // restore interrupt functions
     gMain.hblankCallback = hblankCB;
@@ -153,105 +131,7 @@ void MoveSaveBlocks_ResetHeap(void)
     ApplyNewEncryptionKeyToAllEncryptedData(encryptionKey);
     gSaveBlock2Ptr->encryptionKey = encryptionKey;
 }
-#else
-__attribute__((naked))
-void MoveSaveBlocks_ResetHeap(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x8\n\
-    ldr r5, =gMain\n\
-    ldr r0, [r5, 0xC]\n\
-    str r0, [sp]\n\
-    ldr r1, [r5, 0x10]\n\
-    str r1, [sp, 0x4]\n\
-    movs r0, 0\n\
-    str r0, [r5, 0xC]\n\
-    str r0, [r5, 0x10]\n\
-    ldr r1, =gUnknown_0203CF5C\n\
-    str r0, [r1]\n\
-    ldr r4, =0x02000000\n\
-    ldr r0, =gSaveBlock2Ptr\n\
-    ldr r1, [r0]\n\
-    ldr r6, =0x00000f2c\n\
-    adds r0, r4, 0\n\
-    adds r2, r6, 0\n\
-    bl memcpy\n\
-    ldr r1, =gSaveBlock1Ptr\n\
-    mov r10, r1\n\
-    ldr r1, [r1]\n\
-    ldr r7, =0x00003d88\n\
-    ldr r0, =0x02000f2c\n\
-    adds r2, r7, 0\n\
-    bl memcpy\n\
-    ldr r0, =gPokemonStoragePtr\n\
-    mov r8, r0\n\
-    ldr r1, [r0]\n\
-    ldr r0, =0x000083d0\n\
-    mov r9, r0\n\
-    ldr r0, =0x02004cb4\n\
-    mov r2, r9\n\
-    bl memcpy\n\
-    ldrb r1, [r4, 0xA]\n\
-    ldrb r0, [r4, 0xB]\n\
-    adds r1, r0\n\
-    ldrb r0, [r4, 0xC]\n\
-    adds r1, r0\n\
-    ldrb r0, [r4, 0xD]\n\
-    adds r0, r1\n\
-    bl SetSaveBlocksPointers\n\
-    ldr r1, =gSaveBlock2Ptr\n\
-    ldr r0, [r1]\n\
-    adds r1, r4, 0\n\
-    adds r2, r6, 0\n\
-    bl memcpy\n\
-    mov r1, r10\n\
-    ldr r0, [r1]\n\
-    ldr r1, =0x02000f2c\n\
-    adds r2, r7, 0\n\
-    bl memcpy\n\
-    mov r1, r8\n\
-    ldr r0, [r1]\n\
-    ldr r1, =0x02004cb4\n\
-    mov r2, r9\n\
-    bl memcpy\n\
-    movs r1, 0xE0\n\
-    lsls r1, 9\n\
-    adds r0, r4, 0\n\
-    bl InitHeap\n\
-    ldr r0, [sp, 0x4]\n\
-    str r0, [r5, 0x10]\n\
-    ldr r1, [sp]\n\
-    str r1, [r5, 0xC]\n\
-    bl Random\n\
-    adds r4, r0, 0\n\
-    bl Random\n\
-    lsls r4, 16\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    adds r4, r0\n\
-    adds r0, r4, 0\n\
-    bl ApplyNewEncryptionKeyToAllEncryptedData\n\
-    ldr r1, =gSaveBlock2Ptr\n\
-    ldr r0, [r1]\n\
-    adds r0, 0xAC\n\
-    str r4, [r0]\n\
-    add sp, 0x8\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .pool\n\
-    .syntax divided\n");
-}
-#endif
+
 
 u8 sav2_x1_query_bit1(void)
 {
-- 
cgit v1.2.3


From 601ec28721b250d74e7fd61300226ff07c8a710b Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sat, 6 Jan 2018 00:35:48 -0600
Subject: remove explicit memcpy and add HEAP_SIZE constant

---
 src/load_save.c       | 8 ++++----
 src/main.c            | 2 +-
 src/reset_save_heap.c | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/load_save.c b/src/load_save.c
index 734f7398b..a516c08c2 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -115,12 +115,12 @@ void MoveSaveBlocks_ResetHeap(void)
       saveBlock2Copy->playerTrainerId[3]);
 
     // restore saveblock data since the pointers changed
-    memcpy(gSaveBlock2Ptr, saveBlock2Copy, sizeof(*gSaveBlock2Ptr));
-    memcpy(gSaveBlock1Ptr, saveBlock1Copy, sizeof(*gSaveBlock1Ptr));
-    memcpy(gPokemonStoragePtr, pokemonStorageCopy, sizeof(*gPokemonStoragePtr));
+    *gSaveBlock2Ptr = *saveBlock2Copy;
+    *gSaveBlock1Ptr = *saveBlock1Copy;
+    *gPokemonStoragePtr = *pokemonStorageCopy;
 
     // heap was destroyed in the copying process, so reset it
-    InitHeap(gHeap, 0x1C000);
+    InitHeap(gHeap, HEAP_SIZE);
 
     // restore interrupt functions
     gMain.hblankCallback = hblankCB;
diff --git a/src/main.c b/src/main.c
index 07ce07f1c..18d1abdc2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -122,7 +122,7 @@ void AgbMain()
     ClearDma3Requests();
     ResetBgs();
     SetDefaultFontsPointer();
-    InitHeap(gHeap, 0x1C000);
+    InitHeap(gHeap, HEAP_SIZE);
 
     gSoftResetDisabled = FALSE;
 
diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c
index d4dbc5f42..099edce49 100644
--- a/src/reset_save_heap.c
+++ b/src/reset_save_heap.c
@@ -23,10 +23,8 @@ void sub_81700F8(void)
     ResetSaveCounters();
     sub_81534D0(0);
     if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
-    {
         Sav2_ClearSetDefault();
-    }
     SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound);
-    InitHeap(gHeap, 0x1c000);
+    InitHeap(gHeap, HEAP_SIZE);
     SetMainCallback2(sub_8086230);
 }
-- 
cgit v1.2.3


From 7be61cfb1a55feb9ab30cfda9e78ed33c74eb097 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 6 Jan 2018 21:12:42 -0500
Subject: add assert support to pokeemerald.

---
 src/libc.c | 173 -------------------------------------------------------------
 1 file changed, 173 deletions(-)
 delete mode 100644 src/libc.c

(limited to 'src')

diff --git a/src/libc.c b/src/libc.c
deleted file mode 100644
index 1f457957b..000000000
--- a/src/libc.c
+++ /dev/null
@@ -1,173 +0,0 @@
-#include "global.h"
-#include <stddef.h>
-
-#define LBLOCKSIZE (sizeof(long))
-
-// Nonzero if (long)X contains a NULL byte.
-#define CONTAINSNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-
-// Nonzero if X is not aligned on a "long" boundary.
-#define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1))
-
-void *memcpy(void *dst0, const void *src0, size_t len0)
-{
-    char *dst = dst0;
-    const char *src = src0;
-    long *aligned_dst;
-    const long *aligned_src;
-    unsigned int len = len0;
-
-    // If the size is small, or either src or dst is unaligned,
-    // then go to the byte copy loop. This should be rare.
-    if(len >= 16 && !(UNALIGNED(src) | UNALIGNED(dst)))
-    {
-        aligned_dst = (long *)dst;
-        aligned_src = (long *)src;
-
-        // Copy 4X long words at a time if possible.
-        while(len >= 16)
-        {
-            *aligned_dst++ = *aligned_src++;
-            *aligned_dst++ = *aligned_src++;
-            *aligned_dst++ = *aligned_src++;
-            *aligned_dst++ = *aligned_src++;
-            len -= 16;
-        }
-
-        // Copy one long word at a time if possible
-        while(len >= 4)
-        {
-            *aligned_dst++ = *aligned_src++;
-            len -= 4;
-        }
-
-        dst = (char *)aligned_dst;
-        src = (char *)aligned_src;
-    }
-
-    // Pick up any remaining bytes with a byte copier.
-    while(len--)
-        *dst++ = *src++;
-
-    return dst0;
-}
-
-void *memset(void *m, int c, size_t n)
-{
-    char *s = (char *)m;
-    int count, i;
-    unsigned long buffer;
-    unsigned long *aligned_addr;
-    unsigned char *unaligned_addr;
-
-    // If the size is small or m is unaligned,
-    // then go to the byte copy loop. This should be rare.
-    if(n >= LBLOCKSIZE && !UNALIGNED(m))
-    {
-        // We know that n is large and m is word-aligned.
-        aligned_addr = (unsigned long *)m;
-
-        // Store C into each char sized location in buffer so that
-        // we can set large blocks quickly.
-        c &= 0xFF;
-        if(LBLOCKSIZE == 4)
-        {
-            buffer = (c << 8) | c;
-            buffer |= (buffer << 16);
-        }
-        else
-        {
-            buffer = 0;
-            for(i = 0; i < LBLOCKSIZE; i++)
-                buffer = (buffer << 8) | c;
-        }
-
-        while(n >= LBLOCKSIZE * 4)
-        {
-            *aligned_addr++ = buffer;
-            *aligned_addr++ = buffer;
-            *aligned_addr++ = buffer;
-            *aligned_addr++ = buffer;
-            n -= LBLOCKSIZE * 4;
-        }
-        while(n >= LBLOCKSIZE)
-        {
-            *aligned_addr++ = buffer;
-            n -= LBLOCKSIZE;
-        }
-
-        s = (char *)aligned_addr;
-    }
-
-    // Pick up the remainder with a bytewise loop.
-    while(n--)
-        *s++ = (char)c;
-
-    return m;
-}
-
-int strcmp(const char *s1, const char *s2)
-{
-    unsigned long *a1;
-    unsigned long *a2;
-
-    // If s1 or s2 are unaligned, then skip this and compare bytes.
-    if(!(UNALIGNED(s1) | UNALIGNED(s2)))
-    {
-        // Compare them a word at a time.
-        a1 = (unsigned long *)s1;
-        a2 = (unsigned long *)s2;
-        while(*a1 == *a2)
-        {
-            // If *a1 == *a2, and we find a null in *a1,
-            // then the strings must be equal, so return zero.
-            if(CONTAINSNULL(*a1))
-                return 0;
-
-            a1++;
-            a2++;
-        }
-
-        s1 = (char *)a1;
-        s2 = (char *)a2;
-    }
-
-    // Check the remaining few bytes.
-    while(*s1 != '\0' && *s1 == *s2)
-    {
-        s1++;
-        s2++;
-    }
-
-    return (*(unsigned char *) s1) - (*(unsigned char *) s2);
-}
-
-char* strcpy(char *dst0, const char *src0)
-{
-    char *dst = dst0;
-    const char *src = src0;
-    unsigned long *a1;
-    const unsigned long *a2;
-
-    // If SRC or DEST is unaligned, then copy bytes.
-    if(!(UNALIGNED(src) | UNALIGNED(dst)))
-    {
-        // SRC and DEST are both "long int" aligned, try to do "long int"
-        // sized copies.
-        a1 = (unsigned long *)dst;
-        a2 = (unsigned long *)src;
-        while(!CONTAINSNULL(*a2))
-        {
-            *a1++ = *a2++;
-        }
-
-        dst = (char *)a1;
-        src = (char *)a2;
-    }
-
-    // Copy the remaining few bytes.
-    while(*dst++ = *src++);
-
-    return dst0;
-}
-
-- 
cgit v1.2.3


From 8cf6da7a3b77bdceb38bbc4d9c1460028e8d9180 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 6 Jan 2018 21:13:18 -0500
Subject: don't forget to add the file dummy

---
 src/libisagbprn.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 167 insertions(+)
 create mode 100755 src/libisagbprn.c

(limited to 'src')

diff --git a/src/libisagbprn.c b/src/libisagbprn.c
new file mode 100755
index 000000000..867044217
--- /dev/null
+++ b/src/libisagbprn.c
@@ -0,0 +1,167 @@
+#include <stdarg.h>
+#include <stdio.h>
+#include "gba/gba.h"
+#include "config.h"
+#include "assert.h"
+
+#define AGB_PRINT_FLUSH_ADDR 0x9FE209D
+#define AGB_PRINT_STRUCT_ADDR 0x9FE20F8
+#define AGB_PRINT_PROTECT_ADDR 0x9FE2FFE
+#define WSCNT_DATA (WAITCNT_PHI_OUT_16MHZ | WAITCNT_WS0_S_2 | WAITCNT_WS0_N_4)
+
+// TODO: make no$gba support not shit
+
+// for auto no$gba support, the string "no$gba" should be at this address.
+#define NOGBAIDADDR 0x4FFFA00
+#define NOGBAPRINTADDR 0x4FFFA14
+
+struct AGBPrintStruct
+{
+    u16 m_nRequest;
+    u16 m_nBank;
+    u16 m_nGet;
+    u16 m_nPut;
+};
+
+typedef void (*LPFN_PRINT_FLUSH)(void);
+
+#ifndef NOAGBPRN
+void AGBPrintFlush1Block(void);
+
+void AGBPrintInit(void)
+{
+    volatile struct AGBPrintStruct *pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR;
+    u16 *pWSCNT = (u16 *)REG_ADDR_WAITCNT;
+    u16 *pProtect = (u16 *)AGB_PRINT_PROTECT_ADDR;
+    u16 nOldWSCNT = *pWSCNT;
+    *pWSCNT = WSCNT_DATA;
+    *pProtect = 0x20;
+    pPrint->m_nRequest = pPrint->m_nGet = pPrint->m_nPut = 0;
+    pPrint->m_nBank = 0xFD;
+    *pProtect = 0;
+    *pWSCNT = nOldWSCNT;
+}
+
+static void AGBPutcInternal(const char cChr)
+{
+    volatile struct AGBPrintStruct *pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR;
+    u16 *pPrintBuf = (u16 *)(0x8000000 + (pPrint->m_nBank << 16));
+    u16 *pProtect = (u16 *)AGB_PRINT_PROTECT_ADDR;
+    u16 nData = pPrintBuf[pPrint->m_nPut / 2];
+    *pProtect = 0x20;
+    nData = (pPrint->m_nPut & 1) ? (nData & 0xFF) | (cChr << 8) : (nData & 0xFF00) | cChr;
+    pPrintBuf[pPrint->m_nPut / 2] = nData;
+    pPrint->m_nPut++;
+    *pProtect = 0;
+}
+
+void AGBPutc(const char cChr)
+{
+    u16 *pWSCNT = (u16 *)REG_ADDR_WAITCNT;
+    u16 nOldWSCNT = *pWSCNT;
+    volatile struct AGBPrintStruct *pPrint;
+    *pWSCNT = WSCNT_DATA;
+    AGBPutcInternal(cChr);
+    *pWSCNT = nOldWSCNT;
+    pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR;
+    if (pPrint->m_nPut == ((pPrint->m_nGet - 1) & 0xFFFF))
+        AGBPrintFlush1Block();
+}
+
+void AGBPrint(const char *pBuf)
+{
+    volatile struct AGBPrintStruct *pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR;
+    u16 *pWSCNT = (u16 *)REG_ADDR_WAITCNT;
+    u16 nOldWSCNT = *pWSCNT;
+    *pWSCNT = WSCNT_DATA;
+    while (*pBuf)
+    {
+        AGBPutc(*pBuf);
+        pBuf++;
+    }
+    *pWSCNT = nOldWSCNT;
+}
+
+void AGBPrintf(const char *pBuf, ...)
+{
+    char bufPrint[0x100];
+    va_list vArgv;
+    va_start(vArgv, pBuf);
+    vsprintf(bufPrint, pBuf, vArgv);
+    va_end(vArgv);
+    AGBPrint(bufPrint);
+}
+
+static void AGBPrintTransferDataInternal(u32 bAllData)
+{
+    LPFN_PRINT_FLUSH lpfnFuncFlush;
+    u16 *pIME;
+    u16 nIME;
+    u16 *pWSCNT;
+    u16 nOldWSCNT;
+    u16 *pProtect;
+    volatile struct AGBPrintStruct *pPrint;
+
+    pProtect = (u16 *)AGB_PRINT_PROTECT_ADDR;
+    pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR;
+    lpfnFuncFlush = (LPFN_PRINT_FLUSH)AGB_PRINT_FLUSH_ADDR;
+    pIME = (u16 *)REG_ADDR_IME;
+    nIME = *pIME;
+    pWSCNT = (u16 *)REG_ADDR_WAITCNT;
+    nOldWSCNT = *pWSCNT;
+    *pIME = nIME & ~1;
+    *pWSCNT = WSCNT_DATA;
+
+    if (bAllData)
+    {
+        while (pPrint->m_nPut != pPrint->m_nGet)
+        {
+            *pProtect = 0x20;
+            lpfnFuncFlush();
+            *pProtect = 0;
+        }
+    }
+    else if (pPrint->m_nPut != pPrint->m_nGet)
+    {
+        *pProtect = 0x20;
+        lpfnFuncFlush();
+        *pProtect = 0;
+    }
+
+    *pWSCNT = nOldWSCNT;
+    *pIME = nIME;
+}
+
+void AGBPrintFlush1Block(void)
+{
+    AGBPrintTransferDataInternal(FALSE);
+}
+
+void AGBPrintFlush(void)
+{
+    AGBPrintTransferDataInternal(TRUE);
+}
+
+void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram)
+{
+    if (nStopProgram)
+    {
+        AGBPrintf("ASSERTION FAILED  FILE=[%s] LINE=[%d]  EXP=[%s] \n", pFile, nLine, pExpression);
+        AGBPrintFlush();
+        asm(".hword 0xEFFF");
+    }
+    else
+    {
+        AGBPrintf("WARING FILE=[%s] LINE=[%d]  EXP=[%s] \n", pFile, nLine, pExpression);
+    }
+}
+
+// TODO: Find a way to seamlessly support no$gba without shit hack defines
+// nogba print function
+/*
+void NOGBAPrint(const char *pBuf)
+{
+    *(volatile u32*)NOGBAPRINTADDR = (u32)pBuf;
+}*/
+
+#endif
-- 
cgit v1.2.3


From 10ddfac7abab614d2c4488244cee35054ed06fa8 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 6 Jan 2018 22:00:08 -0500
Subject: consistency

---
 src/libisagbprn.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/libisagbprn.c b/src/libisagbprn.c
index 867044217..f056be5d2 100755
--- a/src/libisagbprn.c
+++ b/src/libisagbprn.c
@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include "gba/gba.h"
 #include "config.h"
-#include "assert.h"
 
 #define AGB_PRINT_FLUSH_ADDR 0x9FE209D
 #define AGB_PRINT_STRUCT_ADDR 0x9FE20F8
@@ -25,7 +24,7 @@ struct AGBPrintStruct
 
 typedef void (*LPFN_PRINT_FLUSH)(void);
 
-#ifndef NOAGBPRN
+#ifndef NDEBUG
 void AGBPrintFlush1Block(void);
 
 void AGBPrintInit(void)
-- 
cgit v1.2.3


From 0fd6ae47911d3dc4828a30a23d88096e83d9ff02 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 7 Jan 2018 15:06:16 -0600
Subject: match ProcessDma3Requests

---
 src/dma3_manager.c | 430 ++++++++---------------------------------------------
 1 file changed, 65 insertions(+), 365 deletions(-)

(limited to 'src')

diff --git a/src/dma3_manager.c b/src/dma3_manager.c
index bb015c5cf..725bfb0e7 100644
--- a/src/dma3_manager.c
+++ b/src/dma3_manager.c
@@ -29,76 +29,92 @@ void ClearDma3Requests(void)
     gDma3ManagerLocked = FALSE;
 }
 
-#ifdef NONMATCHING
+// Maximum amount of data will will transfer in one operation
+#define DMA_MAX_BLOCK_SIZE 0x1000
+
+#define Dma3CopyLarge_(src, dest, size, bit)               \
+{                                                          \
+    const void *_src = src;                                \
+    void *_dest = dest;                                    \
+    u32 _size = size;                                      \
+    while (1)                                              \
+    {                                                      \
+        if (_size <= DMA_MAX_BLOCK_SIZE)                   \
+        {                                                  \
+            DmaCopy##bit(3, _src, _dest, _size);           \
+            break;                                         \
+        }                                                  \
+        DmaCopy##bit(3, _src, _dest, DMA_MAX_BLOCK_SIZE);  \
+        _src += DMA_MAX_BLOCK_SIZE;                        \
+        _dest += DMA_MAX_BLOCK_SIZE;                       \
+        _size -= DMA_MAX_BLOCK_SIZE;                       \
+    }                                                      \
+}
+
+#define Dma3CopyLarge16_(src, dest, size) Dma3CopyLarge_(src, dest, size, 16)
+#define Dma3CopyLarge32_(src, dest, size) Dma3CopyLarge_(src, dest, size, 32)
+
+#define Dma3FillLarge_(value, dest, size, bit)             \
+{                                                          \
+    void *_dest = dest;                                    \
+    u32 _size = size;                                      \
+    while (1)                                              \
+    {                                                      \
+        if (_size <= DMA_MAX_BLOCK_SIZE)                   \
+        {                                                  \
+            DmaFill##bit(3, value, _dest, _size);          \
+            break;                                         \
+        }                                                  \
+        DmaFill##bit(3, value, _dest, DMA_MAX_BLOCK_SIZE); \
+        _dest += DMA_MAX_BLOCK_SIZE;                       \
+        _size -= DMA_MAX_BLOCK_SIZE;                       \
+    }                                                      \
+}
+
+#define Dma3FillLarge16_(value, dest, size) Dma3FillLarge_(value, dest, size, 16)
+#define Dma3FillLarge32_(value, dest, size) Dma3FillLarge_(value, dest, size, 32)
+
+
 void ProcessDma3Requests(void)
 {
-    // NOTE: the fillerA member of the DMA struct is actually u32 value;
-    u16 total_size;
+    u16 totalSize;
 
     if (gDma3ManagerLocked)
         return;
 
-    total_size = 0;
+    totalSize = 0;
 
     // as long as there are DMA requests to process (unless size or vblank is an issue), do not exit
-    while (gDma3Requests[gDma3RequestCursor].size)
+    while (gDma3Requests[gDma3RequestCursor].size != 0)
     {
-        total_size += gDma3Requests[gDma3RequestCursor].size;
+        totalSize += gDma3Requests[gDma3RequestCursor].size;
 
-        if (total_size > 0xA000)
+        if (totalSize > 0xA000)
             return; // don't do too much at once
-
-        if (REG_VCOUNT > 224)
-            return;// we're about to leave vblank, stop
+        if (*(u8 *)REG_ADDR_VCOUNT > 224)
+            return; // we're about to leave vblank, stop
 
         switch (gDma3Requests[gDma3RequestCursor].mode)
         {
         case 1: // regular 32-bit copy
-            // _08000C8C
-            if(gDma3Requests[gDma3RequestCursor].size <= 0x1000)
-            {
-                DmaCopy32(3, gDma3Requests[gDma3RequestCursor].src, gDma3Requests[gDma3RequestCursor].dest, gDma3Requests[gDma3RequestCursor].size);
-                break;
-            }
-            while (gDma3Requests[gDma3RequestCursor].size > 0x1000)
-            {
-                DmaCopy32(3, gDma3Requests[gDma3RequestCursor].src, gDma3Requests[gDma3RequestCursor].dest, 0x1000);
-                gDma3Requests[gDma3RequestCursor].src += 0x1000;
-                gDma3Requests[gDma3RequestCursor].dest += 0x1000;
-                gDma3Requests[gDma3RequestCursor].size -= 0x1000;
-            }
-            DmaCopy32(3, gDma3Requests[gDma3RequestCursor].src, gDma3Requests[gDma3RequestCursor].dest, gDma3Requests[gDma3RequestCursor].size);
+            Dma3CopyLarge32_(gDma3Requests[gDma3RequestCursor].src,
+                             gDma3Requests[gDma3RequestCursor].dest,
+                             gDma3Requests[gDma3RequestCursor].size);
             break;
         case 2: // repeat a single 32-bit value across RAM
-            // _08000CD0
-            while (gDma3Requests[gDma3RequestCursor].size > 0x1000)
-            {
-                DmaFill32(3, gDma3Requests[gDma3RequestCursor].value, gDma3Requests[gDma3RequestCursor].dest, 0x1000);
-                gDma3Requests[gDma3RequestCursor].dest += 0x1000;
-                gDma3Requests[gDma3RequestCursor].size -= 0x1000;
-            }
-            DmaFill32(3, gDma3Requests[gDma3RequestCursor].value, gDma3Requests[gDma3RequestCursor].dest, gDma3Requests[gDma3RequestCursor].size);
+            Dma3FillLarge32_(gDma3Requests[gDma3RequestCursor].value,
+                             gDma3Requests[gDma3RequestCursor].dest,
+                             gDma3Requests[gDma3RequestCursor].size);
             break;
         case 3:    // regular 16-bit copy
-             // _08000D3C
-            while (gDma3Requests[gDma3RequestCursor].size > 0x1000)
-            {
-                DmaCopy16(3, gDma3Requests[gDma3RequestCursor].src, gDma3Requests[gDma3RequestCursor].dest, 0x1000);
-                gDma3Requests[gDma3RequestCursor].src += 0x1000;
-                gDma3Requests[gDma3RequestCursor].dest += 0x1000;
-                gDma3Requests[gDma3RequestCursor].size -= 0x1000;
-            }
-            DmaCopy16(3, gDma3Requests[gDma3RequestCursor].src, gDma3Requests[gDma3RequestCursor].dest, gDma3Requests[gDma3RequestCursor].size);
+            Dma3CopyLarge16_(gDma3Requests[gDma3RequestCursor].src,
+                             gDma3Requests[gDma3RequestCursor].dest,
+                             gDma3Requests[gDma3RequestCursor].size);
             break;
         case 4: // repeat a single 16-bit value across RAM
-            // _08000D88
-            while (gDma3Requests[gDma3RequestCursor].size > 0x1000)
-            {
-                DmaFill16(3, gDma3Requests[gDma3RequestCursor].value, gDma3Requests[gDma3RequestCursor].dest, 0x1000);
-                gDma3Requests[gDma3RequestCursor].dest += 0x1000;
-                gDma3Requests[gDma3RequestCursor].size -= 0x1000;
-            }
-            DmaFill16(3, gDma3Requests[gDma3RequestCursor].value, gDma3Requests[gDma3RequestCursor].dest, gDma3Requests[gDma3RequestCursor].size);
+            Dma3FillLarge16_(gDma3Requests[gDma3RequestCursor].value,
+                             gDma3Requests[gDma3RequestCursor].dest,
+                             gDma3Requests[gDma3RequestCursor].size);
             break;
         }
         gDma3Requests[gDma3RequestCursor].src = NULL;
@@ -112,322 +128,6 @@ void ProcessDma3Requests(void)
             gDma3RequestCursor = 0;
     }
 }
-#else
-__attribute__((naked))
-void ProcessDma3Requests(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0xC\n\
-    ldr r0, =gDma3ManagerLocked\n\
-    ldrb r0, [r0]\n\
-    cmp r0, 0\n\
-    beq _08000C06\n\
-    b _08000E46\n\
-_08000C06:\n\
-    movs r0, 0\n\
-    str r0, [sp, 0x8]\n\
-    ldr r1, =gDma3Requests\n\
-    ldr r2, =gDma3RequestCursor\n\
-    ldrb r0, [r2]\n\
-    lsls r0, 4\n\
-    adds r0, r1\n\
-    ldrh r0, [r0, 0x8]\n\
-    mov r12, r2\n\
-    cmp r0, 0\n\
-    bne _08000C1E\n\
-    b _08000E46\n\
-_08000C1E:\n\
-    mov r8, r1\n\
-    adds r1, 0x4\n\
-    mov r10, r1\n\
-    movs r6, 0x80\n\
-    lsls r6, 5\n\
-    ldr r7, =0x040000D4 @REG_DMA3\n\
-    movs r2, 0\n\
-    mov r9, r2\n\
-_08000C2E:\n\
-    mov r3, r12 @ gDma3RequestCursor\n\
-    ldrb r0, [r3]\n\
-    lsls r5, r0, 4\n\
-    mov r0, r8  @ gDma3Requests\n\
-    adds r1, r5, r0 @ gDma3Requests[gDma3RequestCursor]\n\
-    ldrh r0, [r1, 0x8] @ gDma3Requests[gDma3RequestCursor].size\n\
-    ldr r2, [sp, 0x8]\n\
-    adds r0, r2, r0\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    str r0, [sp, 0x8]\n\
-    movs r0, 0xA0\n\
-    lsls r0, 8\n\
-    ldr r3, [sp, 0x8]\n\
-    cmp r3, r0\n\
-    bls _08000C50\n\
-    b _08000E46\n\
-_08000C50:\n\
-    ldr r0, =0x04000006 @REG_VCOUNT\n\
-    ldrb r0, [r0]\n\
-    cmp r0, 0xE0\n\
-    bls _08000C5A\n\
-    b _08000E46\n\
-_08000C5A:\n\
-    ldrh r0, [r1, 0xA]\n\
-    cmp r0, 0x2\n\
-    beq _08000CD0\n\
-    cmp r0, 0x2\n\
-    bgt _08000C80\n\
-    cmp r0, 0x1\n\
-    beq _08000C8C\n\
-    b _08000DF0\n\
-    .pool\n\
-_08000C80:\n\
-    cmp r0, 0x3\n\
-    beq _08000D3C\n\
-    cmp r0, 0x4\n\
-    bne _08000C8A\n\
-    b _08000D88\n\
-_08000C8A:\n\
-    b _08000DF0\n\
-_08000C8C:\n\
-    ldr r3, [r1]\n\
-    mov r2, r10\n\
-    adds r0, r5, r2\n\
-    ldr r2, [r0]\n\
-    ldrh r1, [r1, 0x8]\n\
-    cmp r1, r6\n\
-    bhi _08000CA6\n\
-    str r3, [r7]\n\
-    str r2, [r7, 0x4]\n\
-    lsrs r0, r1, 2\n\
-    movs r1, 0x84\n\
-    lsls r1, 24\n\
-    b _08000DAA\n\
-_08000CA6:\n\
-    ldr r4, =0x040000D4 @REG_DMA3\n\
-    str r3, [r4]\n\
-    str r2, [r4, 0x4]\n\
-    ldr r0, =0x84000400\n\
-    str r0, [r4, 0x8]\n\
-    ldr r0, [r4, 0x8]\n\
-    adds r3, r6\n\
-    adds r2, r6\n\
-    subs r1, r6\n\
-    cmp r1, r6\n\
-    bhi _08000CA6\n\
-    str r3, [r4]\n\
-    str r2, [r4, 0x4]\n\
-    lsrs r0, r1, 2\n\
-    movs r1, 0x84\n\
-    lsls r1, 24\n\
-    b _08000D76\n\
-    .pool\n\
-_08000CD0:\n\
-    mov r3, r10\n\
-    adds r0, r5, r3\n\
-    ldr r4, [r0]\n\
-    ldrh r1, [r1, 0x8]\n\
-    cmp r1, r6\n\
-    bhi _08000CF4\n\
-    mov r0, r8\n\
-    adds r0, 0xC\n\
-    adds r0, r5, r0\n\
-    ldr r0, [r0]\n\
-    str r0, [sp]\n\
-    mov r5, sp\n\
-    str r5, [r7]\n\
-    str r4, [r7, 0x4]\n\
-    lsrs r0, r1, 2\n\
-    movs r1, 0x85\n\
-    lsls r1, 24\n\
-    b _08000DAA\n\
-_08000CF4:\n\
-    mov r2, r12\n\
-    ldrb r0, [r2]\n\
-    lsls r0, 4\n\
-    mov r5, r8\n\
-    adds r5, 0xC\n\
-    adds r0, r5\n\
-    ldr r0, [r0]\n\
-    str r0, [sp]\n\
-    ldr r3, =0x040000D4 @REG_DMA3\n\
-    mov r0, sp\n\
-    str r0, [r3]\n\
-    str r4, [r3, 0x4]\n\
-    ldr r0, =0x85000400\n\
-    str r0, [r3, 0x8]\n\
-    ldr r0, [r3, 0x8]\n\
-    adds r4, r6\n\
-    subs r1, r6\n\
-    cmp r1, r6\n\
-    bhi _08000CF4\n\
-    ldrb r0, [r2]\n\
-    lsls r0, 4\n\
-    adds r0, r5\n\
-    ldr r0, [r0]\n\
-    str r0, [sp]\n\
-    mov r2, sp\n\
-    str r2, [r3]\n\
-    str r4, [r3, 0x4]\n\
-    lsrs r0, r1, 2\n\
-    movs r1, 0x85\n\
-    lsls r1, 24\n\
-    b _08000DEA\n\
-    .pool\n\
-_08000D3C:\n\
-    ldr r3, [r1]\n\
-    mov r2, r10\n\
-    adds r0, r5, r2\n\
-    ldr r2, [r0]\n\
-    ldrh r1, [r1, 0x8]\n\
-    cmp r1, r6\n\
-    bhi _08000D56\n\
-    str r3, [r7]\n\
-    str r2, [r7, 0x4]\n\
-    lsrs r0, r1, 1\n\
-    movs r1, 0x80\n\
-    lsls r1, 24\n\
-    b _08000DAA\n\
-_08000D56:\n\
-    ldr r4, =0x040000D4 @REG_DMA3\n\
-    str r3, [r4]\n\
-    str r2, [r4, 0x4]\n\
-    ldr r0, =0x80000800\n\
-    str r0, [r4, 0x8]\n\
-    ldr r0, [r4, 0x8]\n\
-    adds r3, r6\n\
-    adds r2, r6\n\
-    subs r1, r6\n\
-    cmp r1, r6\n\
-    bhi _08000D56\n\
-    str r3, [r4]\n\
-    str r2, [r4, 0x4]\n\
-    lsrs r0, r1, 1\n\
-    movs r1, 0x80\n\
-    lsls r1, 24\n\
-_08000D76:\n\
-    orrs r0, r1\n\
-    str r0, [r4, 0x8]\n\
-    ldr r0, [r4, 0x8]\n\
-    b _08000DF0\n\
-    .pool\n\
-_08000D88:\n\
-    mov r3, r10\n\
-    adds r0, r5, r3\n\
-    ldr r2, [r0]\n\
-    ldrh r4, [r1, 0x8]\n\
-    add r1, sp, 0x4\n\
-    cmp r4, r6\n\
-    bhi _08000DB2\n\
-    mov r0, r8\n\
-    adds r0, 0xC\n\
-    adds r0, r5, r0\n\
-    ldr r0, [r0]\n\
-    strh r0, [r1]\n\
-    str r1, [r7]\n\
-    str r2, [r7, 0x4]\n\
-    lsrs r0, r4, 1\n\
-    movs r1, 0x81\n\
-    lsls r1, 24\n\
-_08000DAA:\n\
-    orrs r0, r1\n\
-    str r0, [r7, 0x8]\n\
-    ldr r0, [r7, 0x8]\n\
-    b _08000DF0\n\
-_08000DB2:\n\
-    mov r5, r12\n\
-    ldrb r0, [r5]\n\
-    lsls r0, 4\n\
-    ldr r3, =gDma3Requests + 0x0C\n\
-    adds r0, r3\n\
-    ldr r0, [r0]\n\
-    strh r0, [r1]\n\
-    ldr r3, =0x040000D4 @REG_DMA3\n\
-    str r1, [r3]\n\
-    str r2, [r3, 0x4]\n\
-    ldr r0, =0x81000800\n\
-    str r0, [r3, 0x8]\n\
-    ldr r0, [r3, 0x8]\n\
-    adds r2, r6\n\
-    subs r4, r6\n\
-    cmp r4, r6\n\
-    bhi _08000DB2\n\
-    ldrb r0, [r5]\n\
-    lsls r0, 4\n\
-    ldr r5, =gDma3Requests + 0x0C\n\
-    adds r0, r5\n\
-    ldr r0, [r0]\n\
-    strh r0, [r1]\n\
-    str r1, [r3]\n\
-    str r2, [r3, 0x4]\n\
-    lsrs r0, r4, 1\n\
-    movs r1, 0x81\n\
-    lsls r1, 24\n\
-_08000DEA:\n\
-    orrs r0, r1\n\
-    str r0, [r3, 0x8]\n\
-    ldr r0, [r3, 0x8]\n\
-_08000DF0:\n\
-    ldr r1, =gDma3Requests\n\
-    mov r3, r12\n\
-    ldrb r0, [r3]\n\
-    lsls r0, 4\n\
-    adds r0, r1\n\
-    mov r2, r9\n\
-    str r2, [r0]\n\
-    ldrb r0, [r3]\n\
-    lsls r0, 4\n\
-    add r0, r10\n\
-    str r2, [r0]\n\
-    ldrb r0, [r3]\n\
-    lsls r0, 4\n\
-    adds r0, r1\n\
-    movs r4, 0\n\
-    strh r2, [r0, 0x8]\n\
-    ldrb r0, [r3]\n\
-    lsls r0, 4\n\
-    adds r0, r1\n\
-    mov r5, r9\n\
-    strh r5, [r0, 0xA]\n\
-    ldrb r0, [r3]\n\
-    lsls r0, 4\n\
-    adds r1, 0xC\n\
-    adds r0, r1\n\
-    mov r1, r9\n\
-    str r1, [r0]\n\
-    ldrb r0, [r3]\n\
-    adds r0, 0x1\n\
-    strb r0, [r3]\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    bge _08000E34\n\
-    strb r4, [r3]\n\
-_08000E34:\n\
-    mov r2, r12\n\
-    ldrb r0, [r2]\n\
-    lsls r0, 4\n\
-    ldr r3, =gDma3Requests\n\
-    adds r0, r3\n\
-    ldrh r0, [r0, 0x8]\n\
-    cmp r0, 0\n\
-    beq _08000E46\n\
-    b _08000C2E\n\
-_08000E46:\n\
-    add sp, 0xC\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .pool\n\
-    .syntax divided");
-}
-#endif
 
 int RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode)
 {
-- 
cgit v1.2.3


From 75c359e3001badee4eaaf496255d3a51bdcb124e Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 7 Jan 2018 16:58:20 -0600
Subject: match ScrollWindow

---
 src/window.c | 736 +++++------------------------------------------------------
 1 file changed, 57 insertions(+), 679 deletions(-)

(limited to 'src')

diff --git a/src/window.c b/src/window.c
index f4cb48ec0..3913b5800 100644
--- a/src/window.c
+++ b/src/window.c
@@ -465,696 +465,74 @@ void FillWindowPixelBuffer(u8 windowId, u8 fillValue)
     CpuFastFill8(fillValue, gWindows[windowId].tileData, 0x20 * fillSize);
 }
 
-// functionally equivalent, its fucking hard to match
-#ifdef NONMATCHING
+#define MOVE_TILES_DOWN(a)                                                      \
+{                                                                               \
+    destOffset = i + (a);                                                       \
+    srcOffset = i + (((width * (distanceLoop & ~7)) | (distanceLoop & 7)) * 4); \
+    if (srcOffset < size)                                                       \
+        *(u32*)(tileData + destOffset) = *(u32*)(tileData + srcOffset);         \
+    else                                                                        \
+        *(u32*)(tileData + destOffset) = fillValue32;                           \
+    distanceLoop++;                                                             \
+}
+
+#define MOVE_TILES_UP(a)                                                        \
+{                                                                               \
+    destOffset = i + (a);                                                       \
+    srcOffset = i + (((width * (distanceLoop & ~7)) | (distanceLoop & 7)) * 4); \
+    if (srcOffset < size)                                                       \
+        *(u32*)(tileData - destOffset) = *(u32*)(tileData - srcOffset);         \
+    else                                                                        \
+        *(u32*)(tileData - destOffset) = fillValue32;                           \
+    distanceLoop++;                                                             \
+}
+
 void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue)
 {
-    s32 i, id1, id2, size;
-    u32 distanceLoop, toFill, width;
-    u8 *tileData;
-    struct WindowTemplate window;
-
-    tileData = gWindows[windowId].tileData;
-    toFill = (fillValue << 0x18) | (fillValue << 0x10) | (fillValue << 8) | fillValue;
-    window = gWindows[windowId].window;
-    size = 0x20 * (window.height * window.width);
-    width = window.width;
-    if (direction != 1)
+    struct WindowTemplate window = gWindows[windowId].window;
+    u8 *tileData = gWindows[windowId].tileData;
+    u32 fillValue32 = (fillValue << 24) | (fillValue << 16) | (fillValue << 8) | fillValue;
+    s32 size = window.height * window.width * 32;
+    u32 width = window.width;
+    s32 i;
+    s32 srcOffset, destOffset;
+    u32 distanceLoop;
+
+    switch (direction)
     {
-        s32 signedDirection = direction;
-        if (signedDirection <= 1)
+    case 0:
+        for (i = 0; i < size; i += 32)
         {
-            if (signedDirection == 0)
-            {
-                for (i = 0; i < size; i += 0x20)
-                {
-                    distanceLoop = distance;
-                    id1 = i + 0;
-                    id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-                    if (id2 < size)
-                        *(u32*)(tileData + id1) = *(u32*)(tileData + id2);
-                    else
-                        *(u32*)(tileData + id1) = toFill;
-
-                    distanceLoop++;
-                    id1 = i + 4;
-                    id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-                    if (id2 < size)
-                        *(u32*)(tileData + id1) = *(u32*)(tileData + id2);
-                    else
-                        *(u32*)(tileData + id1) = toFill;
-
-                    distanceLoop++;
-                    id1 = i + 8;
-                    id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-                    if (id2 < size)
-                        *(u32*)(tileData + id1) = *(u32*)(tileData + id2);
-                    else
-                        *(u32*)(tileData + id1) = toFill;
-
-                    distanceLoop++;
-                    id1 = i + 12;
-                    id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-                    if (id2 < size)
-                        *(u32*)(tileData + id1) = *(u32*)(tileData + id2);
-                    else
-                        *(u32*)(tileData + id1) = toFill;
-
-                    distanceLoop++;
-                    id1 = i + 16;
-                    id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-                    if (id2 < size)
-                        *(u32*)(tileData + id1) = *(u32*)(tileData + id2);
-                    else
-                        *(u32*)(tileData + id1) = toFill;
-
-                    distanceLoop++;
-                    id1 = i + 20;
-                    id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-                    if (id2 < size)
-                        *(u32*)(tileData + id1) = *(u32*)(tileData + id2);
-                    else
-                        *(u32*)(tileData + id1) = toFill;
-
-                    distanceLoop++;
-                    id1 = i + 24;
-                    id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-                    if (id2 < size)
-                        *(u32*)(tileData + id1) = *(u32*)(tileData + id2);
-                    else
-                        *(u32*)(tileData + id1) = toFill;
-
-                    distanceLoop++;
-                    id1 = i + 28;
-                    id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-                    if (id2 < size)
-                        *(u32*)(tileData + id1) = *(u32*)(tileData + id2);
-                    else
-                        *(u32*)(tileData + id1) = toFill;
-                }
-            }
+            distanceLoop = distance;
+            MOVE_TILES_DOWN(0)
+            MOVE_TILES_DOWN(4)
+            MOVE_TILES_DOWN(8)
+            MOVE_TILES_DOWN(12)
+            MOVE_TILES_DOWN(16)
+            MOVE_TILES_DOWN(20)
+            MOVE_TILES_DOWN(24)
+            MOVE_TILES_DOWN(28)
         }
-    }
-    else
-    {
+        break;
+    case 1:
         tileData += size - 4;
-        for (i = 0; i < size; i += 0x20)
+        for (i = 0; i < size; i += 32)
         {
             distanceLoop = distance;
-            id1 = i + 0;
-            id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-            if (id2 < size)
-                *(u32*)(tileData - id1) = *(u32*)(tileData - id2);
-            else
-                *(u32*)(tileData - id1)  = toFill;
-
-            distanceLoop++;
-            id1 = i + 4;
-            id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-            if (id2 < size)
-                *(u32*)(tileData - id1) = *(u32*)(tileData - id2);
-            else
-                *(u32*)(tileData - id1)  = toFill;
-
-            distanceLoop++;
-            id1 = i + 8;
-            id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-            if (id2 < size)
-                *(u32*)(tileData - id1) = *(u32*)(tileData - id2);
-            else
-                *(u32*)(tileData - id1)  = toFill;
-
-            distanceLoop++;
-            id1 = i + 12;
-            id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-            if (id2 < size)
-                *(u32*)(tileData - id1) = *(u32*)(tileData - id2);
-            else
-                *(u32*)(tileData - id1)  = toFill;
-
-            distanceLoop++;
-            id1 = i + 16;
-            id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-            if (id2 < size)
-                *(u32*)(tileData - id1) = *(u32*)(tileData - id2);
-            else
-                *(u32*)(tileData - id1)  = toFill;
-
-            distanceLoop++;
-            id1 = i + 20;
-            id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-            if (id2 < size)
-                *(u32*)(tileData - id1) = *(u32*)(tileData - id2);
-            else
-                *(u32*)(tileData - id1)  = toFill;
-
-            distanceLoop++;
-            id1 = i + 24;
-            id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-            if (id2 < size)
-                *(u32*)(tileData - id1) = *(u32*)(tileData - id2);
-            else
-                *(u32*)(tileData - id1)  = toFill;
-
-            distanceLoop++;
-            id1 = i + 28;
-            id2 = i + (((width * ((distanceLoop) & ~(7))) | ((distanceLoop) & 7)) * 4);
-            if (id2 < size)
-                *(u32*)(tileData - id1) = *(u32*)(tileData - id2);
-            else
-                *(u32*)(tileData - id1)  = toFill;
+            MOVE_TILES_UP(0)
+            MOVE_TILES_UP(4)
+            MOVE_TILES_UP(8)
+            MOVE_TILES_UP(12)
+            MOVE_TILES_UP(16)
+            MOVE_TILES_UP(20)
+            MOVE_TILES_UP(24)
+            MOVE_TILES_UP(28)
         }
+        break;
+    case 2:
+        break;
     }
 }
-#else
-__attribute__((naked))
-void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x8\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	lsls r1, 24\n\
-	lsrs r1, 24\n\
-	mov r8, r1\n\
-	lsls r2, 24\n\
-	lsrs r2, 24\n\
-	str r2, [sp]\n\
-	lsls r3, 24\n\
-	lsrs r3, 24\n\
-	ldr r2, =gWindows\n\
-	lsls r1, r0, 1\n\
-	adds r1, r0\n\
-	lsls r1, 2\n\
-	adds r4, r1, r2\n\
-	adds r2, 0x8\n\
-	adds r1, r2\n\
-	ldr r5, [r1]\n\
-	lsls r7, r3, 24\n\
-	lsls r0, r3, 16\n\
-	orrs r7, r0\n\
-	lsls r0, r3, 8\n\
-	orrs r7, r0\n\
-	orrs r7, r3\n\
-	ldr r1, [r4]\n\
-	ldr r2, [r4, 0x4]\n\
-	ldrb r3, [r4, 0x4]\n\
-	lsrs r0, r1, 24\n\
-	muls r0, r3\n\
-	lsls r6, r0, 5\n\
-	lsrs r1, 24\n\
-	mov r12, r1\n\
-	mov r0, r8\n\
-	cmp r0, 0x1\n\
-	bne _08003CE8\n\
-	b _08003E9E\n\
-_08003CE8:\n\
-	cmp r0, 0x1\n\
-	ble _08003CEE\n\
-	b _08004046\n\
-_08003CEE:\n\
-	cmp r0, 0\n\
-	beq _08003CF4\n\
-	b _08004046\n\
-_08003CF4:\n\
-	movs r4, 0\n\
-	cmp r4, r6\n\
-	blt _08003CFC\n\
-	b _08004046\n\
-_08003CFC:\n\
-	movs r1, 0x8\n\
-	negs r1, r1\n\
-	mov r9, r1\n\
-	movs r2, 0x7\n\
-	mov r8, r2\n\
-	mov r10, r5\n\
-_08003D08:\n\
-	ldr r3, [sp]\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	adds r0, r3, 0\n\
-	mov r2, r8\n\
-	ands r0, r2\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003D34\n\
-	adds r0, r5, r1\n\
-	ldr r0, [r0]\n\
-	mov r1, r10\n\
-	str r0, [r1]\n\
-	b _08003D38\n\
-	.pool\n\
-_08003D34:\n\
-	mov r2, r10\n\
-	str r7, [r2]\n\
-_08003D38:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0x4\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003D64\n\
-	adds r0, r5, r2\n\
-	adds r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003D68\n\
-_08003D64:\n\
-	adds r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003D68:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0x8\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003D96\n\
-	adds r0, r5, r2\n\
-	adds r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003D9A\n\
-_08003D96:\n\
-	adds r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003D9A:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0xC\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003DC8\n\
-	adds r0, r5, r2\n\
-	adds r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003DCC\n\
-_08003DC8:\n\
-	adds r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003DCC:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0x10\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003DFA\n\
-	adds r0, r5, r2\n\
-	adds r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003DFE\n\
-_08003DFA:\n\
-	adds r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003DFE:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0x14\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003E2C\n\
-	adds r0, r5, r2\n\
-	adds r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003E30\n\
-_08003E2C:\n\
-	adds r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003E30:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0x18\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003E5E\n\
-	adds r0, r5, r2\n\
-	adds r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003E62\n\
-_08003E5E:\n\
-	adds r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003E62:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0x1C\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	adds r0, r1, 0\n\
-	mov r1, r8\n\
-	ands r3, r1\n\
-	orrs r0, r3\n\
-	lsls r0, 2\n\
-	adds r1, r4, r0\n\
-	cmp r1, r6\n\
-	bge _08003E8C\n\
-	adds r0, r5, r2\n\
-	adds r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003E90\n\
-_08003E8C:\n\
-	adds r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003E90:\n\
-	movs r2, 0x20\n\
-	add r10, r2\n\
-	adds r4, 0x20\n\
-	cmp r4, r6\n\
-	bge _08003E9C\n\
-	b _08003D08\n\
-_08003E9C:\n\
-	b _08004046\n\
-_08003E9E:\n\
-	subs r0, r6, 0x4\n\
-	adds r5, r0\n\
-	movs r4, 0\n\
-	cmp r4, r6\n\
-	blt _08003EAA\n\
-	b _08004046\n\
-_08003EAA:\n\
-	movs r0, 0x8\n\
-	negs r0, r0\n\
-	mov r9, r0\n\
-	movs r1, 0x7\n\
-	mov r8, r1\n\
-	mov r10, r5\n\
-_08003EB6:\n\
-	ldr r3, [sp]\n\
-	adds r0, r3, 0\n\
-	mov r2, r9\n\
-	ands r0, r2\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	adds r0, r3, 0\n\
-	mov r2, r8\n\
-	ands r0, r2\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003EDC\n\
-	subs r0, r5, r1\n\
-	ldr r0, [r0]\n\
-	mov r1, r10\n\
-	str r0, [r1]\n\
-	b _08003EE0\n\
-_08003EDC:\n\
-	mov r2, r10\n\
-	str r7, [r2]\n\
-_08003EE0:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0x4\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003F0C\n\
-	subs r0, r5, r2\n\
-	subs r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003F10\n\
-_08003F0C:\n\
-	subs r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003F10:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0x8\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003F3E\n\
-	subs r0, r5, r2\n\
-	subs r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003F42\n\
-_08003F3E:\n\
-	subs r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003F42:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0xC\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003F70\n\
-	subs r0, r5, r2\n\
-	subs r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003F74\n\
-_08003F70:\n\
-	subs r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003F74:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0x10\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003FA2\n\
-	subs r0, r5, r2\n\
-	subs r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003FA6\n\
-_08003FA2:\n\
-	subs r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003FA6:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0x14\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08003FD4\n\
-	subs r0, r5, r2\n\
-	subs r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08003FD8\n\
-_08003FD4:\n\
-	subs r0, r5, r2\n\
-	str r7, [r0]\n\
-_08003FD8:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0x18\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	str r1, [sp, 0x4]\n\
-	adds r0, r3, 0\n\
-	mov r1, r8\n\
-	ands r0, r1\n\
-	ldr r1, [sp, 0x4]\n\
-	orrs r1, r0\n\
-	lsls r1, 2\n\
-	adds r1, r4, r1\n\
-	cmp r1, r6\n\
-	bge _08004006\n\
-	subs r0, r5, r2\n\
-	subs r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _0800400A\n\
-_08004006:\n\
-	subs r0, r5, r2\n\
-	str r7, [r0]\n\
-_0800400A:\n\
-	adds r3, 0x1\n\
-	adds r2, r4, 0\n\
-	adds r2, 0x1C\n\
-	adds r0, r3, 0\n\
-	mov r1, r9\n\
-	ands r0, r1\n\
-	mov r1, r12\n\
-	muls r1, r0\n\
-	adds r0, r1, 0\n\
-	mov r1, r8\n\
-	ands r3, r1\n\
-	orrs r0, r3\n\
-	lsls r0, 2\n\
-	adds r1, r4, r0\n\
-	cmp r1, r6\n\
-	bge _08004034\n\
-	subs r0, r5, r2\n\
-	subs r1, r5, r1\n\
-	ldr r1, [r1]\n\
-	str r1, [r0]\n\
-	b _08004038\n\
-_08004034:\n\
-	subs r0, r5, r2\n\
-	str r7, [r0]\n\
-_08004038:\n\
-	movs r2, 0x20\n\
-	negs r2, r2\n\
-	add r10, r2\n\
-	adds r4, 0x20\n\
-	cmp r4, r6\n\
-	bge _08004046\n\
-	b _08003EB6\n\
-_08004046:\n\
-	add sp, 0x8\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-        .syntax divided");
-}
-#endif // NONMATCHING
 
 void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8))
 {
-- 
cgit v1.2.3


From a11c65ff1ac380cd213b26d0bb7a2787936b33f9 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sun, 7 Jan 2018 17:50:13 -0600
Subject: Port field_door

---
 src/field_door.c | 896 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 896 insertions(+)
 create mode 100644 src/field_door.c

(limited to 'src')

diff --git a/src/field_door.c b/src/field_door.c
new file mode 100644
index 000000000..38c031264
--- /dev/null
+++ b/src/field_door.c
@@ -0,0 +1,896 @@
+#include "global.h"
+#include "field_door.h"
+#include "field_camera.h"
+#include "fieldmap.h"
+#include "metatile_behavior.h"
+#include "event_data.h"
+#include "constants/songs.h"
+#include "constants/flags.h"
+#include "constants/maps.h"
+#include "task.h"
+
+const u8 DoorAnimTiles_04[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/04/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/04/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/04/2.4bpp"),
+};
+
+// TODO: Make these blank palette includes?
+asm(".space 32");
+
+const u8 DoorAnimTiles_05[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/05/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/05/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/05/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_08[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/08/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/08/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/08/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_15[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/15/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/15/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/15/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_16[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/16/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/16/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/16/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_00[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/00/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/00/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/00/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_01[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/01/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/01/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/01/2.4bpp"),
+};
+
+const u8 DoorAnimTiles_02[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/02/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/02/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/02/2.4bpp"),
+};
+
+const u8 DoorAnimTiles_03[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/03/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/03/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/03/2.4bpp"),
+};
+
+const u8 DoorAnimTiles_06[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/06/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/06/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/06/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_07[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/07/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/07/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/07/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_09[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/09/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/09/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/09/2.4bpp"),
+};
+
+asm(".space 0x5900");
+
+const u8 DoorAnimTiles_UnusedTops[][0x40] =
+{
+    INCBIN_U8("graphics/door_anims/unused_848EDEC/0_top.4bpp"),
+    INCBIN_U8("graphics/door_anims/unused_848EDEC/1_top.4bpp"),
+    INCBIN_U8("graphics/door_anims/unused_848EDEC/2_top.4bpp"),
+};
+
+asm(".space 0x140");
+
+const u8 DoorAnimTiles_UnusedBottoms[][0x40] =
+{
+    INCBIN_U8("graphics/door_anims/unused_848EDEC/0_bottom.4bpp"),
+    INCBIN_U8("graphics/door_anims/unused_848EDEC/1_bottom.4bpp"),
+    INCBIN_U8("graphics/door_anims/unused_848EDEC/2_bottom.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_10[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/10/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/10/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/10/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_11[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/11/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/11/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/11/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_12[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/12/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/12/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/12/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_13[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/13/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/13/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/13/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_14[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/14/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/14/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/14/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_17[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/17/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/17/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/17/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_18[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/18/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/18/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/18/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_19[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/19/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/19/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/19/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_20[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/20/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/20/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/20/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_21[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/21/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/21/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/21/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_22[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/22/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/22/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/22/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_23[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/23/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/23/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/23/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_24[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/24/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/24/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/24/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_25[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/25/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/25/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/25/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_26[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/26/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/26/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/26/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_27[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/27/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/27/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/27/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_28[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/28/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/28/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/28/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_29[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/29/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/29/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/29/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_30[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/30/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/30/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/30/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_31[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/31/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/31/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/31/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_32[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/32/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/32/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/32/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_33[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/33/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/33/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/33/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_34[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/34/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/34/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/34/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_35[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/35/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/35/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/35/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_36[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/36/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/36/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/36/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_37[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/37/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/37/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/37/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_38[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/38/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/38/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/38/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_39[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/39/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/39/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/39/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_40[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/40/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/40/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/40/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_41[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/41/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/41/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/41/2.4bpp"),
+};
+
+const u8 DoorAnimTiles_42[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/42/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/42/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/42/2.4bpp"),
+    INCBIN_U8("graphics/door_anims/42/3.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_43[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/43/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/43/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/43/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_44[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/44/0_left.4bpp"),
+    INCBIN_U8("graphics/door_anims/44/0_right.4bpp"),
+    INCBIN_U8("graphics/door_anims/44/1_left.4bpp"),
+    INCBIN_U8("graphics/door_anims/44/1_right.4bpp"),
+    INCBIN_U8("graphics/door_anims/44/2_left.4bpp"),
+    INCBIN_U8("graphics/door_anims/44/2_right.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_45[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/45/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/45/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/45/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_46[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/46/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/46/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/46/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_47[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/47/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/47/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/47/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_48[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/48/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/48/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/48/2.4bpp"),
+    INCBIN_U8("graphics/door_anims/48/3.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_49[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/49/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/49/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/49/2.4bpp"),
+};
+
+asm(".space 32");
+
+const u8 DoorAnimTiles_50[][0x100] =
+{
+    INCBIN_U8("graphics/door_anims/50/0.4bpp"),
+    INCBIN_U8("graphics/door_anims/50/1.4bpp"),
+    INCBIN_U8("graphics/door_anims/50/2.4bpp"),
+};
+
+asm(".space 32");
+
+static const struct DoorAnimFrame gDoorOpenAnimFrames[] =
+{
+    {4, -1},
+    {4, 0},
+    {4, 0x100},
+    {4, 0x200},
+    {0, 0},
+};
+
+static const struct DoorAnimFrame gDoorCloseAnimFrames[] =
+{
+    {4, 0x200},
+    {4, 0x100},
+    {4, 0},
+    {4, -1},
+    {0, 0},
+};
+
+static const struct DoorAnimFrame gBigDoorOpenAnimFrames[] =
+{
+    {4, -1},
+    {4, 0},
+    {4, 0x200},
+    {4, 0x400},
+    {0, 0},
+};
+
+static const struct DoorAnimFrame gBigDoorCloseAnimFrames[] =
+{
+    {4, 0x400},
+    {4, 0x200},
+    {4, 0},
+    {4, -1},
+    {0, 0},
+};
+
+const u8 DoorAnimPalettes_8496FDC[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 00
+const u8 DoorAnimPalettes_8496FE4[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 01
+const u8 DoorAnimPalettes_8496FEC[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 02
+const u8 DoorAnimPalettes_8496FF4[] = {0, 0, 1, 1, 1, 1, 1, 1}; // door 03
+const u8 DoorAnimPalettes_8496FFC[] = {10, 10, 6, 6, 6, 6, 6, 6}; // door 04
+const u8 DoorAnimPalettes_8497004[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 05
+const u8 DoorAnimPalettes_849700C[] = {11, 11, 11, 11, 11, 11, 11, 11}; // door 06
+const u8 DoorAnimPalettes_8497014[] = {10, 10, 10, 10, 10, 10, 10, 10}; // door 07
+const u8 DoorAnimPalettes_849701C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 08
+const u8 DoorAnimPalettes_8497024[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 09
+const u8 DoorAnimPalettes_849702C[] = {10, 10, 9, 9, 9, 9, 9, 9}; // door 10
+const u8 DoorAnimPalettes_8497034[] = {9, 9, 1, 1, 1, 1, 1, 1}; // door 11
+const u8 DoorAnimPalettes_849703C[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 12
+const u8 DoorAnimPalettes_8497044[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 13
+const u8 DoorAnimPalettes_849704C[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 14
+const u8 DoorAnimPalettes_8497054[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 15
+const u8 DoorAnimPalettes_849705C[] = {0, 0, 5, 5, 5, 5, 5, 5}; // door 16
+const u8 DoorAnimPalettes_8497064[] = {6, 6, 1, 1, 1, 1, 1, 1}; // door 17
+const u8 DoorAnimPalettes_849706C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 18
+const u8 DoorAnimPalettes_8497074[] = {6, 6, 5, 5, 5, 5, 5, 5}; // door 19
+const u8 DoorAnimPalettes_849707C[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 20
+const u8 DoorAnimPalettes_8497084[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 21
+const u8 DoorAnimPalettes_849708C[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 22
+const u8 DoorAnimPalettes_8497094[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 23
+const u8 DoorAnimPalettes_849709C[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 24
+const u8 DoorAnimPalettes_84970A4[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 25
+const u8 DoorAnimPalettes_84970AC[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 26
+const u8 DoorAnimPalettes_84970B4[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 27
+const u8 DoorAnimPalettes_84970BC[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 28
+const u8 DoorAnimPalettes_84970C4[] = {11, 11, 7, 7, 7, 7, 7, 7}; // door 29
+const u8 DoorAnimPalettes_84970CC[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 30
+const u8 DoorAnimPalettes_84970D4[] = {6, 6, 7, 7, 7, 7, 7, 7}; // door 31
+const u8 DoorAnimPalettes_84970DC[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 32
+const u8 DoorAnimPalettes_84970E4[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 33
+const u8 DoorAnimPalettes_84970EC[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 34
+const u8 DoorAnimPalettes_84970F4[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 35
+const u8 DoorAnimPalettes_84970FC[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 36
+const u8 DoorAnimPalettes_8497104[] = {0, 0, 0, 0, 0, 0, 0, 0}; // door 37
+const u8 DoorAnimPalettes_849710C[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 38
+const u8 DoorAnimPalettes_8497114[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 39
+const u8 DoorAnimPalettes_849711C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 40
+const u8 DoorAnimPalettes_8497124[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 41
+const u8 DoorAnimPalettes_849712C[] = {1, 1, 1, 1, 1, 1, 1, 1}; // doors 42, 43, and 44
+const u8 DoorAnimPalettes_8497134[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 45
+const u8 DoorAnimPalettes_849713C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 46
+const u8 DoorAnimPalettes_8497144[] = {1, 1, 1, 1, 1, 1, 1, 1}; // unused 
+const u8 DoorAnimPalettes_849714C[] = {1, 1, 1, 1, 1, 1, 1, 1}; // doors 47 and 48
+const u8 DoorAnimPalettes_8497154[] = {9, 9, 7, 7, 7, 7, 7, 7}; // door 49
+const u8 DoorAnimPalettes_849715C[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 50
+const u8 DoorAnimPalettes_8497164[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 51
+const u8 DoorAnimPalettes_849716C[] = {9, 9, 7, 7, 7, 7, 7, 7}; // door 52
+
+static const struct DoorGraphics gDoorAnimGraphicsTable[] =
+{
+    {0x021, 0, 1, DoorAnimTiles_00, DoorAnimPalettes_8496FDC}, // door 00
+    {0x061, 1, 1, DoorAnimTiles_01, DoorAnimPalettes_8496FE4}, // door 01
+    {0x1CD, 1, 1, DoorAnimTiles_02, DoorAnimPalettes_8496FEC}, // door 02
+    {0x041, 1, 1, DoorAnimTiles_03, DoorAnimPalettes_8496FF4}, // door 03
+    {0x248, 0, 1, DoorAnimTiles_04, DoorAnimPalettes_8496FFC}, // door 04
+    {0x249, 0, 1, DoorAnimTiles_05, DoorAnimPalettes_8497004}, // door 05
+    {0x22F, 0, 1, DoorAnimTiles_06, DoorAnimPalettes_849700C}, // door 06
+    {0x21F, 0, 1, DoorAnimTiles_07, DoorAnimPalettes_8497014}, // door 07
+    {0x2A5, 0, 1, DoorAnimTiles_08, DoorAnimPalettes_849701C}, // door 08
+    {0x287, 0, 1, DoorAnimTiles_09, DoorAnimPalettes_849702C}, // door 09
+    {0x2AC, 0, 1, DoorAnimTiles_10, DoorAnimPalettes_849706C}, // door 10
+    {0x3A1, 0, 1, DoorAnimTiles_11, DoorAnimPalettes_8497074}, // door 11
+    {0x2DC, 0, 1, DoorAnimTiles_12, DoorAnimPalettes_8497064}, // door 12
+    {0x225, 0, 1, DoorAnimTiles_13, DoorAnimPalettes_849705C}, // door 13
+    {0x1DB, 1, 1, DoorAnimTiles_14, DoorAnimPalettes_8497084}, // door 14
+    {0x246, 0, 1, DoorAnimTiles_15, DoorAnimPalettes_8497024}, // door 15
+    {0x28E, 0, 1, DoorAnimTiles_16, DoorAnimPalettes_849707C}, // door 16
+    {0x2A1, 0, 1, DoorAnimTiles_17, DoorAnimPalettes_8497034}, // door 17
+    {0x21C, 0, 1, DoorAnimTiles_18, DoorAnimPalettes_849704C}, // door 18
+    {0x21E, 0, 1, DoorAnimTiles_19, DoorAnimPalettes_8497054}, // door 19
+    {0x21D, 1, 1, DoorAnimTiles_20, DoorAnimPalettes_849703C}, // door 20
+    {0x21A, 0, 1, DoorAnimTiles_21, DoorAnimPalettes_8497044}, // door 21
+    {0x224, 0, 1, DoorAnimTiles_22, DoorAnimPalettes_849708C}, // door 22
+    {0x289, 0, 1, DoorAnimTiles_23, DoorAnimPalettes_8497094}, // door 23
+    {0x30C, 1, 1, DoorAnimTiles_24, DoorAnimPalettes_849709C}, // door 24
+    {0x32D, 1, 1, DoorAnimTiles_25, DoorAnimPalettes_84970A4}, // door 25
+    {0x2ED, 1, 1, DoorAnimTiles_26, DoorAnimPalettes_84970AC}, // door 26
+    {0x264, 1, 1, DoorAnimTiles_27, DoorAnimPalettes_84970B4}, // door 27
+    {0x22B, 0, 1, DoorAnimTiles_28, DoorAnimPalettes_84970BC}, // door 28
+    {0x2F7, 0, 1, DoorAnimTiles_29, DoorAnimPalettes_84970C4}, // door 29
+    {0x297, 0, 1, DoorAnimTiles_30, DoorAnimPalettes_84970CC}, // door 30
+    {0x285, 1, 1, DoorAnimTiles_31, DoorAnimPalettes_84970D4}, // door 31
+    {0x25D, 1, 1, DoorAnimTiles_32, DoorAnimPalettes_84970DC}, // door 32
+    {0x20E, 1, 1, DoorAnimTiles_33, DoorAnimPalettes_84970E4}, // door 33
+    {0x3B0, 1, 1, DoorAnimTiles_34, DoorAnimPalettes_84970EC}, // door 34
+    {0x28A, 1, 1, DoorAnimTiles_35, DoorAnimPalettes_84970F4}, // door 35
+    {0x263, 1, 1, DoorAnimTiles_36, DoorAnimPalettes_84970FC}, // door 36
+    {0x329, 1, 1, DoorAnimTiles_37, DoorAnimPalettes_8497104}, // door 37
+    {0x291, 0, 1, DoorAnimTiles_38, DoorAnimPalettes_849710C}, // door 38
+    {0x21B, 2, 1, DoorAnimTiles_39, DoorAnimPalettes_8497114}, // door 39
+    {0x209, 1, 1, DoorAnimTiles_40, DoorAnimPalettes_849711C}, // door 40
+    {0x219, 0, 1, DoorAnimTiles_41, DoorAnimPalettes_8497124}, // door 41
+    {0x393, 1, 1, DoorAnimTiles_42, DoorAnimPalettes_849712C}, // door 42
+    {0x3D4, 1, 1, DoorAnimTiles_42, DoorAnimPalettes_849712C}, // door 43
+    {0x36C, 1, 1, DoorAnimTiles_42, DoorAnimPalettes_849712C}, // door 44
+    {0x25E, 1, 1, DoorAnimTiles_43, DoorAnimPalettes_8497134}, // door 45
+    {0x2AD, 1, 2, DoorAnimTiles_44, DoorAnimPalettes_849713C}, // door 46
+    {0x3FC, 0, 1, DoorAnimTiles_45, DoorAnimPalettes_849714C}, // door 47
+    {0x396, 1, 1, DoorAnimTiles_46, DoorAnimPalettes_849714C}, // door 48
+    {0x20A, 1, 1, DoorAnimTiles_47, DoorAnimPalettes_8497154}, // door 49
+    {0x26B, 1, 1, DoorAnimTiles_48, DoorAnimPalettes_849715C}, // door 50
+    {0x32C, 1, 1, DoorAnimTiles_49, DoorAnimPalettes_8497164}, // door 51
+    {0x383, 1, 1, DoorAnimTiles_50, DoorAnimPalettes_849716C}, // door 52
+    {0, 0, 0, NULL, NULL},
+};
+
+static void CopyDoorTilesToVram(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frame)
+{
+    if (gfx->size == 2)
+        CpuFastSet(gfx->tiles + frame->offset, (void *)(VRAM + 0x7E00), 0x80);
+    else
+        CpuFastSet(gfx->tiles + frame->offset, (void *)(VRAM + 0x7F00), 0x40);
+}
+
+static void door_build_blockdef(u16 *a, u16 b, const u8 *c)
+{
+    int i;
+    u16 unk;
+
+    for (i = 0; i < 4; i++)
+    {
+        unk = *(c++) << 12;
+        a[i] = unk | (b + i);
+    }
+    for (; i < 8; i++)
+    {
+        unk = *(c++) << 12;
+        a[i] = unk;
+    }
+}
+
+static void DrawCurrentDoorAnimFrame(const struct DoorGraphics *gfx, u32 x, u32 y, const u8 *pal)
+{
+    u16 arr[24];
+    
+    if (gfx->size == 2)
+    {
+        door_build_blockdef(&arr[8], 0x3F0, pal);
+        DrawDoorMetatileAt(x, y - 1, &arr[8]);
+        door_build_blockdef(&arr[8], 0x3F4, pal + 4);
+        DrawDoorMetatileAt(x, y, &arr[8]);
+        door_build_blockdef(&arr[8], 0x3F8, pal);
+        DrawDoorMetatileAt(x + 1, y - 1, &arr[8]);
+        door_build_blockdef(&arr[8], 0x3FC, pal + 4);
+        DrawDoorMetatileAt(x + 1, y, &arr[8]);
+    }
+    else
+    {
+        door_build_blockdef(&arr[0], 0x3F8, pal);
+        DrawDoorMetatileAt(x, y - 1, &arr[0]);
+        door_build_blockdef(&arr[0], 0x3FC, pal + 4);
+        DrawDoorMetatileAt(x, y, &arr[0]);
+    }
+}
+
+static void DrawClosedDoorTiles(const struct DoorGraphics *gfx, u32 x, u32 y)
+{
+    CurrentMapDrawMetatileAt(x, y - 1);
+    CurrentMapDrawMetatileAt(x, y);
+
+    if (gfx->size == 2)
+    {
+        CurrentMapDrawMetatileAt(x + 1, y - 1);
+        CurrentMapDrawMetatileAt(x + 1, y);
+    }
+}
+
+static void DrawDoor(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frame, u32 x, u32 y)
+{
+    if (frame->offset == 0xFFFF)
+    {
+        DrawClosedDoorTiles(gfx, x, y);
+        if (sub_808A964())
+            DrawClosedDoorTiles(gfx, gSpecialVar_0x8004 + 7, gSpecialVar_0x8005 + 7);
+    }
+    else
+    {
+        CopyDoorTilesToVram(gfx, frame);
+        DrawCurrentDoorAnimFrame(gfx, x, y, gfx->palette);
+        if (sub_808A964())
+            DrawCurrentDoorAnimFrame(gfx, gSpecialVar_0x8004 + 7, gSpecialVar_0x8005 + 7, gfx->palette);
+    }
+}
+
+enum
+{
+    TD_FRAMELIST = 0,
+    TD_GFX = 2,
+    TD_FRAME = 4,
+    TD_COUNTER,
+    TD_X,
+    TD_Y
+};
+
+static bool32 sub_808A5F0(struct DoorGraphics *gfx, struct DoorAnimFrame *frames, s16 *taskData)
+{
+    if (taskData[TD_COUNTER] == 0)
+        DrawDoor(gfx, &frames[taskData[TD_FRAME]], taskData[TD_X], taskData[TD_Y]);
+    if (taskData[TD_COUNTER] == frames[taskData[TD_FRAME]].time)
+    {
+        taskData[TD_COUNTER] = 0;
+        taskData[TD_FRAME]++;
+        if (frames[taskData[TD_FRAME]].time == 0)
+            return FALSE;
+        else
+            return TRUE;
+    }
+    taskData[TD_COUNTER]++;
+    return TRUE;
+}
+
+static void Task_AnimateDoor(u8 taskId)
+{
+    u16 *taskData = gTasks[taskId].data;
+    struct DoorAnimFrame *frames = (struct DoorAnimFrame *)(taskData[TD_FRAMELIST] << 16 | taskData[TD_FRAMELIST + 1]);
+    struct DoorGraphics *gfx = (struct DoorGraphics *)(taskData[TD_GFX] << 16 | taskData[TD_GFX + 1]);
+
+    if (sub_808A5F0(gfx, frames, taskData) == FALSE)
+        DestroyTask(taskId);
+}
+
+static const struct DoorAnimFrame *GetLastDoorFrame(const struct DoorAnimFrame *frame, const void *unused)
+{
+    while (frame->time != 0)
+        frame++;
+    return frame - 1;
+}
+
+static const struct DoorGraphics *GetDoorGraphics(const struct DoorGraphics *gfx, u16 metatileNum)
+{
+    while (gfx->tiles != NULL)
+    {
+        if (gfx->metatileNum == metatileNum)
+            return gfx;
+        gfx++;
+    }
+    return NULL;
+}
+
+static s8 StartDoorAnimationTask(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frames, u32 x, u32 y)
+{
+    if (FuncIsActiveTask(Task_AnimateDoor) == TRUE)
+        return -1;
+    else
+    {
+        u8 taskId = CreateTask(Task_AnimateDoor, 0x50);
+        s16 *taskData = gTasks[taskId].data;
+
+        taskData[TD_X] = x;
+        taskData[TD_Y] = y;
+
+        taskData[TD_FRAMELIST + 1] = (u32)frames;
+        taskData[TD_FRAMELIST] = (u32)frames >> 16;
+
+        taskData[TD_GFX + 1] = (u32)gfx;
+        taskData[TD_GFX] = (u32)gfx >> 16;
+
+        return taskId;
+    }
+}
+
+static void DrawClosedDoor(const struct DoorGraphics *gfx, u32 x, u32 y)
+{
+    DrawClosedDoorTiles(gfx, x, y);
+}
+
+static void DrawOpenedDoor(const struct DoorGraphics *gfx, u32 x, u32 y)
+{
+    gfx = GetDoorGraphics(gfx, MapGridGetMetatileIdAt(x, y));
+    if (gfx != NULL)
+        DrawDoor(gfx, GetLastDoorFrame(gDoorOpenAnimFrames, gDoorOpenAnimFrames), x, y);
+}
+
+static s8 StartDoorOpenAnimation(const struct DoorGraphics *gfx, u32 x, u32 y)
+{
+    gfx = GetDoorGraphics(gfx, MapGridGetMetatileIdAt(x, y));
+    if (gfx == NULL)
+    {
+        return -1;
+    }
+    else
+    {
+        if (gfx->size == 2)
+            return StartDoorAnimationTask(gfx, gBigDoorOpenAnimFrames, x, y);
+        else
+            return StartDoorAnimationTask(gfx, gDoorOpenAnimFrames, x, y);
+    }
+}
+
+static s8 StartDoorCloseAnimation(const struct DoorGraphics *gfx, u32 x, u32 y)
+{
+    gfx = GetDoorGraphics(gfx, MapGridGetMetatileIdAt(x, y));
+    if (gfx == NULL)
+        return -1;
+    else
+        return StartDoorAnimationTask(gfx, gDoorCloseAnimFrames, x, y);
+}
+
+static s8 cur_mapdata_get_door_x2_at(const struct DoorGraphics *gfx, u32 x, u32 y)
+{
+    gfx = GetDoorGraphics(gfx, MapGridGetMetatileIdAt(x, y));
+    if (gfx == NULL)
+        return -1;
+    else
+        return gfx->sound;
+}
+
+void unref_sub_808A83C(u32 x, u32 y)
+{
+    StartDoorOpenAnimation(gDoorAnimGraphicsTable, x, y);
+}
+
+void FieldSetDoorOpened(u32 x, u32 y)
+{
+    if (MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y)))
+        DrawOpenedDoor(gDoorAnimGraphicsTable, x, y);
+}
+
+void FieldSetDoorClosed(u32 x, u32 y)
+{
+    if (MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y)))
+        DrawClosedDoor(gDoorAnimGraphicsTable, x, y);
+}
+
+s8 FieldAnimateDoorClose(u32 x, u32 y)
+{
+    if (!MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y)))
+        return -1;
+    else
+        return StartDoorCloseAnimation(gDoorAnimGraphicsTable, x, y);
+}
+
+s8 FieldAnimateDoorOpen(u32 x, u32 y)
+{
+    if (!MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y)))
+        return -1;
+    else
+        return StartDoorOpenAnimation(gDoorAnimGraphicsTable, x, y);
+}
+
+bool8 FieldIsDoorAnimationRunning(void)
+{
+    return FuncIsActiveTask(Task_AnimateDoor);
+}
+
+u32 GetDoorSoundEffect(u32 x, u32 y)
+{
+    int sound = cur_mapdata_get_door_x2_at(gDoorAnimGraphicsTable, x, y);
+    
+    if (sound == 0)
+        return SE_DOOR;
+    else if (sound == 1)
+        return SE_JIDO_DOA;
+    else if (sound == 2)
+        return SE_TU_SAA;
+    else
+        return SE_DOOR;
+}
+
+bool8 sub_808A964(void)
+{
+    if (FlagGet(FLAG_SPECIAL_FLAG_0x4002))
+    {
+        if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2))
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From 0eadf71b1a0676f70024ac93a7b4bfa325fa09a3 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sun, 7 Jan 2018 18:58:52 -0600
Subject: Move forward declaration

---
 src/field_door.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/field_door.c b/src/field_door.c
index 38c031264..f73c6bb55 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -9,6 +9,8 @@
 #include "constants/maps.h"
 #include "task.h"
 
+bool8 sub_808A964(void);
+
 const u8 DoorAnimTiles_04[][0x100] =
 {
     INCBIN_U8("graphics/door_anims/04/0.4bpp"),
-- 
cgit v1.2.3


From 3b097262f5c0244d3517008df76e8683f61e459d Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 7 Jan 2018 23:59:42 -0600
Subject: completely label and document dma3_manager.c

---
 src/dma3_manager.c | 155 +++++++++++++++++++++++++++--------------------------
 src/main.c         |   1 -
 2 files changed, 79 insertions(+), 77 deletions(-)

(limited to 'src')

diff --git a/src/dma3_manager.c b/src/dma3_manager.c
index 725bfb0e7..3832c3663 100644
--- a/src/dma3_manager.c
+++ b/src/dma3_manager.c
@@ -1,13 +1,24 @@
 #include "global.h"
 #include "dma3.h"
 
-IWRAM_DATA struct {
-    /* 0x00 */ const u8 *src;
-    /* 0x04 */ u8 *dest;
-    /* 0x08 */ u16 size;
-    /* 0x0A */ u16 mode;
-    /* 0x0C */ u32 value;
-} gDma3Requests[128];
+// Maximum amount of data we will transfer in one operation
+#define MAX_DMA_BLOCK_SIZE 0x1000
+
+#define MAX_DMA_REQUESTS 128
+
+#define DMA_REQUEST_COPY32 1
+#define DMA_REQUEST_FILL32 2
+#define DMA_REQUEST_COPY16 3
+#define DMA_REQUEST_FILL16 4
+
+IWRAM_DATA struct
+{
+    const u8 *src;
+    u8 *dest;
+    u16 size;
+    u16 mode;
+    u32 value;
+} gDma3Requests[MAX_DMA_REQUESTS];
 
 static bool8 gDma3ManagerLocked;
 static u8 gDma3RequestCursor;
@@ -19,19 +30,16 @@ void ClearDma3Requests(void)
     gDma3ManagerLocked = TRUE;
     gDma3RequestCursor = 0;
 
-    for(i = 0; i < (u8)ARRAY_COUNT(gDma3Requests); i++)
+    for (i = 0; i < MAX_DMA_REQUESTS; i++)
     {
         gDma3Requests[i].size = 0;
-        gDma3Requests[i].src = 0;
-        gDma3Requests[i].dest = 0;
+        gDma3Requests[i].src = NULL;
+        gDma3Requests[i].dest = NULL;
     }
 
     gDma3ManagerLocked = FALSE;
 }
 
-// Maximum amount of data will will transfer in one operation
-#define DMA_MAX_BLOCK_SIZE 0x1000
-
 #define Dma3CopyLarge_(src, dest, size, bit)               \
 {                                                          \
     const void *_src = src;                                \
@@ -39,15 +47,15 @@ void ClearDma3Requests(void)
     u32 _size = size;                                      \
     while (1)                                              \
     {                                                      \
-        if (_size <= DMA_MAX_BLOCK_SIZE)                   \
+        if (_size <= MAX_DMA_BLOCK_SIZE)                   \
         {                                                  \
             DmaCopy##bit(3, _src, _dest, _size);           \
             break;                                         \
         }                                                  \
-        DmaCopy##bit(3, _src, _dest, DMA_MAX_BLOCK_SIZE);  \
-        _src += DMA_MAX_BLOCK_SIZE;                        \
-        _dest += DMA_MAX_BLOCK_SIZE;                       \
-        _size -= DMA_MAX_BLOCK_SIZE;                       \
+        DmaCopy##bit(3, _src, _dest, MAX_DMA_BLOCK_SIZE);  \
+        _src += MAX_DMA_BLOCK_SIZE;                        \
+        _dest += MAX_DMA_BLOCK_SIZE;                       \
+        _size -= MAX_DMA_BLOCK_SIZE;                       \
     }                                                      \
 }
 
@@ -60,14 +68,14 @@ void ClearDma3Requests(void)
     u32 _size = size;                                      \
     while (1)                                              \
     {                                                      \
-        if (_size <= DMA_MAX_BLOCK_SIZE)                   \
+        if (_size <= MAX_DMA_BLOCK_SIZE)                   \
         {                                                  \
             DmaFill##bit(3, value, _dest, _size);          \
             break;                                         \
         }                                                  \
-        DmaFill##bit(3, value, _dest, DMA_MAX_BLOCK_SIZE); \
-        _dest += DMA_MAX_BLOCK_SIZE;                       \
-        _size -= DMA_MAX_BLOCK_SIZE;                       \
+        DmaFill##bit(3, value, _dest, MAX_DMA_BLOCK_SIZE); \
+        _dest += MAX_DMA_BLOCK_SIZE;                       \
+        _size -= MAX_DMA_BLOCK_SIZE;                       \
     }                                                      \
 }
 
@@ -77,46 +85,48 @@ void ClearDma3Requests(void)
 
 void ProcessDma3Requests(void)
 {
-    u16 totalSize;
+    u16 bytesTransferred;
 
     if (gDma3ManagerLocked)
         return;
 
-    totalSize = 0;
+    bytesTransferred = 0;
 
     // as long as there are DMA requests to process (unless size or vblank is an issue), do not exit
     while (gDma3Requests[gDma3RequestCursor].size != 0)
     {
-        totalSize += gDma3Requests[gDma3RequestCursor].size;
+        bytesTransferred += gDma3Requests[gDma3RequestCursor].size;
 
-        if (totalSize > 0xA000)
-            return; // don't do too much at once
+        if (bytesTransferred > 40 * 1024)
+            return; // don't transfer more than 40 KiB
         if (*(u8 *)REG_ADDR_VCOUNT > 224)
             return; // we're about to leave vblank, stop
 
         switch (gDma3Requests[gDma3RequestCursor].mode)
         {
-        case 1: // regular 32-bit copy
+        case DMA_REQUEST_COPY32: // regular 32-bit copy
             Dma3CopyLarge32_(gDma3Requests[gDma3RequestCursor].src,
                              gDma3Requests[gDma3RequestCursor].dest,
                              gDma3Requests[gDma3RequestCursor].size);
             break;
-        case 2: // repeat a single 32-bit value across RAM
+        case DMA_REQUEST_FILL32: // repeat a single 32-bit value across RAM
             Dma3FillLarge32_(gDma3Requests[gDma3RequestCursor].value,
                              gDma3Requests[gDma3RequestCursor].dest,
                              gDma3Requests[gDma3RequestCursor].size);
             break;
-        case 3:    // regular 16-bit copy
+        case DMA_REQUEST_COPY16:    // regular 16-bit copy
             Dma3CopyLarge16_(gDma3Requests[gDma3RequestCursor].src,
                              gDma3Requests[gDma3RequestCursor].dest,
                              gDma3Requests[gDma3RequestCursor].size);
             break;
-        case 4: // repeat a single 16-bit value across RAM
+        case DMA_REQUEST_FILL16: // repeat a single 16-bit value across RAM
             Dma3FillLarge16_(gDma3Requests[gDma3RequestCursor].value,
                              gDma3Requests[gDma3RequestCursor].dest,
                              gDma3Requests[gDma3RequestCursor].size);
             break;
         }
+
+        // Free the request
         gDma3Requests[gDma3RequestCursor].src = NULL;
         gDma3Requests[gDma3RequestCursor].dest = NULL;
         gDma3Requests[gDma3RequestCursor].size = 0;
@@ -124,59 +134,54 @@ void ProcessDma3Requests(void)
         gDma3Requests[gDma3RequestCursor].value = 0;
         gDma3RequestCursor++;
 
-        if (gDma3RequestCursor >= 128) // loop back to the first DMA request
+        if (gDma3RequestCursor >= MAX_DMA_REQUESTS) // loop back to the first DMA request
             gDma3RequestCursor = 0;
     }
 }
 
-int RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode)
+s16 RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode)
 {
     int cursor;
-    int var = 0;
-
-    gDma3ManagerLocked = 1;
+    int i = 0;
 
+    gDma3ManagerLocked = TRUE;
     cursor = gDma3RequestCursor;
-    while(1)
+
+    while (i < MAX_DMA_REQUESTS)
     {
-        if(!gDma3Requests[cursor].size) // an empty copy was found and the current cursor will be returned.
+        if (gDma3Requests[cursor].size == 0) // an empty request was found.
         {
             gDma3Requests[cursor].src = src;
             gDma3Requests[cursor].dest = dest;
             gDma3Requests[cursor].size = size;
 
-            if(mode == 1)
-                gDma3Requests[cursor].mode = mode;
+            if (mode == 1)
+                gDma3Requests[cursor].mode = DMA_REQUEST_COPY32;
             else
-                gDma3Requests[cursor].mode = 3;
+                gDma3Requests[cursor].mode = DMA_REQUEST_COPY16;
 
             gDma3ManagerLocked = FALSE;
-            return (s16)cursor;
+            return cursor;
         }
-        if(++cursor >= 0x80) // loop back to start.
-        {
+        if (++cursor >= MAX_DMA_REQUESTS) // loop back to start.
             cursor = 0;
-        }
-        if(++var >= 0x80) // max checks were made. all resulted in failure.
-        {
-            break;
-        }
+        i++;
     }
     gDma3ManagerLocked = FALSE;
-    return -1;
+    return -1;  // no free DMA request was found
 }
 
-int RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode)
+s16 RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode)
 {
     int cursor;
-    int var = 0;
+    int i = 0;
 
     cursor = gDma3RequestCursor;
-    gDma3ManagerLocked = 1;
+    gDma3ManagerLocked = TRUE;
 
-    while(1)
+    while (i < MAX_DMA_REQUESTS)
     {
-        if(!gDma3Requests[cursor].size)
+        if (gDma3Requests[cursor].size == 0) // an empty request was found.
         {
             gDma3Requests[cursor].dest = dest;
             gDma3Requests[cursor].size = size;
@@ -184,41 +189,39 @@ int RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode)
             gDma3Requests[cursor].value = value;
 
             if(mode == 1)
-                gDma3Requests[cursor].mode = 2;
+                gDma3Requests[cursor].mode = DMA_REQUEST_FILL32;
             else
-                gDma3Requests[cursor].mode = 4;
+                gDma3Requests[cursor].mode = DMA_REQUEST_FILL16;
 
             gDma3ManagerLocked = FALSE;
-            return (s16)cursor;
+            return cursor;
         }
-        if(++cursor >= 0x80) // loop back to start.
-        {
+        if (++cursor >= MAX_DMA_REQUESTS) // loop back to start.
             cursor = 0;
-        }
-        if(++var >= 0x80) // max checks were made. all resulted in failure.
-        {
-            break;
-        }
+        i++;
     }
     gDma3ManagerLocked = FALSE;
-    return -1;
+    return -1;  // no free DMA request was found
 }
 
 int CheckForSpaceForDma3Request(s16 index)
 {
-    int current = 0;
+    int i = 0;
 
-    if (index == -1)
+    if (index == -1)  // check if all requests are free
     {
-        for (; current < 0x80; current ++)
-            if (gDma3Requests[current].size)
+        while (i < MAX_DMA_REQUESTS)
+        {
+            if (gDma3Requests[i].size != 0)
                 return -1;
-
+            i++;
+        }
+        return 0;
+    }
+    else  // check the specified request
+    {
+        if (gDma3Requests[index].size != 0)
+            return -1;
         return 0;
     }
-
-    if (gDma3Requests[index].size)
-        return -1;
-
-    return 0;
 }
diff --git a/src/main.c b/src/main.c
index 18d1abdc2..07b7d9147 100644
--- a/src/main.c
+++ b/src/main.c
@@ -332,7 +332,6 @@ void SetSerialCallback(IntrCallback callback)
 }
 
 extern void CopyBufferedValuesToGpuRegs(void);
-extern void ProcessDma3Requests(void);
 
 static void VBlankIntr(void)
 {
-- 
cgit v1.2.3


From 7d501c8b13de92f8fc26c283e745fd1ea37e9b27 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 8 Jan 2018 17:03:28 -0500
Subject: let the user deal with nogbaprint, forget this

---
 src/libisagbprn.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/libisagbprn.c b/src/libisagbprn.c
index f056be5d2..a0eb09c8a 100755
--- a/src/libisagbprn.c
+++ b/src/libisagbprn.c
@@ -8,9 +8,8 @@
 #define AGB_PRINT_PROTECT_ADDR 0x9FE2FFE
 #define WSCNT_DATA (WAITCNT_PHI_OUT_16MHZ | WAITCNT_WS0_S_2 | WAITCNT_WS0_N_4)
 
-// TODO: make no$gba support not shit
-
 // for auto no$gba support, the string "no$gba" should be at this address.
+// except it's not, blame Martin, hence I'm letting the user deal with this nonsense.
 #define NOGBAIDADDR 0x4FFFA00
 #define NOGBAPRINTADDR 0x4FFFA14
 
@@ -25,6 +24,7 @@ struct AGBPrintStruct
 typedef void (*LPFN_PRINT_FLUSH)(void);
 
 #ifndef NDEBUG
+
 void AGBPrintFlush1Block(void);
 
 void AGBPrintInit(void)
-- 
cgit v1.2.3


From d215fcc78ea590ed897f83f5d1b3855e0f99fc51 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 8 Jan 2018 17:05:26 -0500
Subject: actually change NOGBAPrint, stupid

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

(limited to 'src')

diff --git a/src/libisagbprn.c b/src/libisagbprn.c
index a0eb09c8a..c066a41a0 100755
--- a/src/libisagbprn.c
+++ b/src/libisagbprn.c
@@ -155,12 +155,12 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP
     }
 }
 
-// TODO: Find a way to seamlessly support no$gba without shit hack defines
-// nogba print function
+// nogba print function, uncomment to use
 /*
 void NOGBAPrint(const char *pBuf)
 {
     *(volatile u32*)NOGBAPRINTADDR = (u32)pBuf;
-}*/
+}
+*/
 
 #endif
-- 
cgit v1.2.3


From ba1eb6d952bfbeacd9345629997b3bdc18befde3 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 8 Jan 2018 21:39:07 -0500
Subject: nogba to nocashgba

---
 src/libisagbprn.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/libisagbprn.c b/src/libisagbprn.c
index c066a41a0..007f90bb7 100755
--- a/src/libisagbprn.c
+++ b/src/libisagbprn.c
@@ -10,8 +10,8 @@
 
 // for auto no$gba support, the string "no$gba" should be at this address.
 // except it's not, blame Martin, hence I'm letting the user deal with this nonsense.
-#define NOGBAIDADDR 0x4FFFA00
-#define NOGBAPRINTADDR 0x4FFFA14
+#define NOCASHGBAIDADDR 0x4FFFA00
+#define NOCASHGBAPRINTADDR 0x4FFFA14
 
 struct AGBPrintStruct
 {
@@ -155,11 +155,11 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP
     }
 }
 
-// nogba print function, uncomment to use
+// no$gba print function, uncomment to use
 /*
-void NOGBAPrint(const char *pBuf)
+void NoCashGBAPrint(const char *pBuf)
 {
-    *(volatile u32*)NOGBAPRINTADDR = (u32)pBuf;
+    *(volatile u32*)NOCASHGBAPRINTADDR = (u32)pBuf;
 }
 */
 
-- 
cgit v1.2.3


From 0bf530da12f671c678f7e524b4318213d49b30e0 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 8 Jan 2018 22:03:07 -0500
Subject: nocashgba printf

---
 src/libisagbprn.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/libisagbprn.c b/src/libisagbprn.c
index 007f90bb7..a9656f3c5 100755
--- a/src/libisagbprn.c
+++ b/src/libisagbprn.c
@@ -155,12 +155,22 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP
     }
 }
 
-// no$gba print function, uncomment to use
+// no$gba print functions, uncomment to use
 /*
 void NoCashGBAPrint(const char *pBuf)
 {
     *(volatile u32*)NOCASHGBAPRINTADDR = (u32)pBuf;
 }
+
+void NoCashGBAPrintf(const char *pBuf, ...)
+{
+    char bufPrint[0x100];
+    va_list vArgv;
+    va_start(vArgv, pBuf);
+    vsprintf(bufPrint, pBuf, vArgv);
+    va_end(vArgv);
+    NoCashGBAPrint(bufPrint);
+}
 */
 
 #endif
-- 
cgit v1.2.3


From ecc2408cd5165da34fdc5966af1ad903ba09032d Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 9 Jan 2018 19:28:32 -0500
Subject: comment

---
 src/libisagbprn.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/libisagbprn.c b/src/libisagbprn.c
index a9656f3c5..98231dcf5 100755
--- a/src/libisagbprn.c
+++ b/src/libisagbprn.c
@@ -8,8 +8,8 @@
 #define AGB_PRINT_PROTECT_ADDR 0x9FE2FFE
 #define WSCNT_DATA (WAITCNT_PHI_OUT_16MHZ | WAITCNT_WS0_S_2 | WAITCNT_WS0_N_4)
 
-// for auto no$gba support, the string "no$gba" should be at this address.
-// except it's not, blame Martin, hence I'm letting the user deal with this nonsense.
+// originally for auto no$gba support, the string "no$gba" should be at this address,
+// the user needs to read this string out as the memory viewer won't show it.
 #define NOCASHGBAIDADDR 0x4FFFA00
 #define NOCASHGBAPRINTADDR 0x4FFFA14
 
-- 
cgit v1.2.3


From e1801885a0619724860cb322ba1cb8dba2b2c0f3 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 9 Jan 2018 19:39:51 -0500
Subject: both print defines for nocashgba

---
 src/libisagbprn.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/libisagbprn.c b/src/libisagbprn.c
index 98231dcf5..e0e979e95 100755
--- a/src/libisagbprn.c
+++ b/src/libisagbprn.c
@@ -11,7 +11,8 @@
 // originally for auto no$gba support, the string "no$gba" should be at this address,
 // the user needs to read this string out as the memory viewer won't show it.
 #define NOCASHGBAIDADDR 0x4FFFA00
-#define NOCASHGBAPRINTADDR 0x4FFFA14
+#define NOCASHGBAPRINTADDR1 0x4FFFA10 // automatically adds a newline after the string has finished
+#define NOCASHGBAPRINTADDR2 0x4FFFA14 // does not automatically add the newline. by default, NOCASHGBAPRINTADDR2 is used. this is used to keep strings consistent between no$gba and VBA-RR, but a user can choose to forgo this.
 
 struct AGBPrintStruct
 {
@@ -159,7 +160,7 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP
 /*
 void NoCashGBAPrint(const char *pBuf)
 {
-    *(volatile u32*)NOCASHGBAPRINTADDR = (u32)pBuf;
+    *(volatile u32*)NOCASHGBAPRINTADDR2 = (u32)pBuf;
 }
 
 void NoCashGBAPrintf(const char *pBuf, ...)
-- 
cgit v1.2.3


From 3241b1405f003217d3041ae445eb10d039c0a654 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 9 Jan 2018 21:30:54 -0600
Subject: Add symbols to music_player_table

Also rename gMPlay structs to gMPlayInfo
---
 src/battle_2.c                            |  8 ++--
 src/battle_anim.c                         | 22 ++++-----
 src/battle_controller_link_opponent.c     |  8 ++--
 src/battle_controller_opponent.c          |  8 ++--
 src/battle_controller_player.c            | 10 ++--
 src/battle_controller_recorded_opponent.c |  8 ++--
 src/battle_controller_recorded_player.c   |  6 +--
 src/battle_controller_wally.c             |  2 +-
 src/battle_gfx_sfx_util.c                 | 10 ++--
 src/battle_script_commands.c              |  6 +--
 src/berry_blender.c                       | 14 +++---
 src/hall_of_fame.c                        |  6 +--
 src/m4a_2.c                               |  8 ++--
 src/pokeball.c                            |  6 +--
 src/pokeblock_feed.c                      |  4 +-
 src/pokemon_summary_screen.c              |  4 +-
 src/sound.c                               | 76 +++++++++++++++----------------
 src/text.c                                |  4 +-
 18 files changed, 105 insertions(+), 105 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 6752c4d4f..61e39b39f 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -92,8 +92,8 @@ extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for
 extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
 extern u8 gUnknown_02039B28[]; // possibly a struct?
 extern struct UnknownStruct6 gUnknown_02038C28; // todo: identify & document
-extern struct MusicPlayerInfo gMPlay_SE1;
-extern struct MusicPlayerInfo gMPlay_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern u8 gDecompressionBuffer[];
 extern u16 gUnknown_020243FC;
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
@@ -1610,8 +1610,8 @@ void CB2_QuitRecordedBattle(void)
     UpdatePaletteFade();
     if (!gPaletteFade.active)
     {
-        m4aMPlayStop(&gMPlay_SE1);
-        m4aMPlayStop(&gMPlay_SE2);
+        m4aMPlayStop(&gMPlayInfo_SE1);
+        m4aMPlayStop(&gMPlayInfo_SE2);
         FreeRestoreBattleData();
         FreeAllWindowBuffers();
         SetMainCallback2(gMain.savedCallback);
diff --git a/src/battle_anim.c b/src/battle_anim.c
index fa4dfb48f..d991a702d 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -37,9 +37,9 @@ extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern struct MusicPlayerInfo gMPlay_BGM;
-extern struct MusicPlayerInfo gMPlay_SE1;
-extern struct MusicPlayerInfo gMPlay_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern u8 gDecompressionBuffer[];
 
 extern const u16 gUnknown_082C8D64[];
@@ -272,7 +272,7 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
         {
             if (tableId == gUnknown_082C8D64[i])
             {
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128);
                 break;
             }
         }
@@ -514,8 +514,8 @@ static void ScriptCmd_end(void)
         }
         else
         {
-            m4aMPlayStop(&gMPlay_SE1);
-            m4aMPlayStop(&gMPlay_SE2);
+            m4aMPlayStop(&gMPlayInfo_SE1);
+            m4aMPlayStop(&gMPlayInfo_SE2);
         }
     }
 
@@ -534,7 +534,7 @@ static void ScriptCmd_end(void)
 
     if (!continuousAnim) // may have been used for debug?
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
         if (!IsContest())
         {
             sub_80A8278();
@@ -1650,8 +1650,8 @@ static void ScriptCmd_waitsound(void)
     {
         if (++sSoundAnimFramesToWait > 90)
         {
-            m4aMPlayStop(&gMPlay_SE1);
-            m4aMPlayStop(&gMPlay_SE2);
+            m4aMPlayStop(&gMPlayInfo_SE1);
+            m4aMPlayStop(&gMPlayInfo_SE2);
             sSoundAnimFramesToWait = 0;
         }
         else
@@ -1833,7 +1833,7 @@ static void ScriptCmd_doublebattle_2E(void)
 
 static void ScriptCmd_stopsound(void)
 {
-    m4aMPlayStop(&gMPlay_SE1);
-    m4aMPlayStop(&gMPlay_SE2);
+    m4aMPlayStop(&gMPlayInfo_SE1);
+    m4aMPlayStop(&gMPlayInfo_SE2);
     sBattleAnimScriptPtr++;
 }
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 58360b9a1..cb510bb5b 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -51,7 +51,7 @@ extern u8 gBankTarget;
 extern u8 gAbsentBankFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
@@ -353,11 +353,11 @@ static void sub_8064734(void)
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
                 if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1)
-                    m4aMPlayContinue(&gMPlay_BGM);
+                    m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
             {
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             }
         }
 
@@ -499,7 +499,7 @@ static void sub_8064DD0(void)
         if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
             || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2)
         {
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             LinkOpponentBufferExecCompleted();
         }
     }
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 8aeab6a55..30414d53a 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -38,7 +38,7 @@ extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
 extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
 extern void *gUnknown_020244D8;
@@ -350,10 +350,10 @@ static void sub_805F560(void)
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
                 if (GetBankIdentity(gActiveBank) == 1)
-                    m4aMPlayContinue(&gMPlay_BGM);
+                    m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
         sp = TRUE;
@@ -485,7 +485,7 @@ static void sub_805FC80(void)
     {
         if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2)
         {
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             OpponentBufferExecCompleted();
         }
     }
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 6023552c3..a9d5b70eb 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -43,7 +43,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern u8 gMultiUsePlayerCursor;
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u16 gPartnerTrainerId;
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
@@ -1054,9 +1054,9 @@ static void sub_8058B40(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
-                m4aMPlayContinue(&gMPlay_BGM);
+                m4aMPlayContinue(&gMPlayInfo_BGM);
             else
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
         r9 = TRUE;
@@ -1119,7 +1119,7 @@ static void sub_8058FC0(void)
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive
         && !IsCryPlayingOrClearCrySongs())
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
         PlayerBufferExecCompleted();
     }
@@ -1148,7 +1148,7 @@ void c3_0802FDF4(u8 taskId)
 {
     if (!IsCryPlayingOrClearCrySongs())
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         DestroyTask(taskId);
     }
 }
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 64dea0200..6e29fa951 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -52,7 +52,7 @@ extern u8 gBankTarget;
 extern u8 gAbsentBankFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
@@ -331,11 +331,11 @@ static void sub_818686C(void)
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
                 if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1)
-                    m4aMPlayContinue(&gMPlay_BGM);
+                    m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
             {
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             }
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
@@ -484,7 +484,7 @@ static void sub_8186F14(void)
         if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
             || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2)
         {
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             RecordedOpponentBufferExecCompleted();
         }
     }
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 52fd803e1..f101d811f 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -54,7 +54,7 @@ extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
 extern u8 gBattleCommunication[];
 extern u8 gUnknown_0203C7B4;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
@@ -354,11 +354,11 @@ static void sub_8189D40(void)
             if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && (gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
                 if (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON1)
-                    m4aMPlayContinue(&gMPlay_BGM);
+                    m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
             {
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             }
 
         }
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index eeb0b596d..b0e1e1480 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -42,7 +42,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
 extern u8 gMultiUsePlayerCursor;
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u16 gPartnerTrainerId;
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 4f444b8bf..775578ca2 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -34,9 +34,9 @@ extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
 extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
-extern struct MusicPlayerInfo gMPlay_SE1;
-extern struct MusicPlayerInfo gMPlay_SE2;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 extern const struct BattleMove gBattleMoves[];
 extern const u8 gUnknown_0831C604[];
@@ -527,8 +527,8 @@ bool8 mplay_80342A4(u8 bank)
         if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_8 < 30)
             return TRUE;
 
-        m4aMPlayStop(&gMPlay_SE1);
-        m4aMPlayStop(&gMPlay_SE2);
+        m4aMPlayStop(&gMPlayInfo_SE1);
+        m4aMPlayStop(&gMPlayInfo_SE2);
     }
     if (zero == 0)
     {
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 4ddf2472e..c7976fc2a 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -112,7 +112,7 @@ extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG3_X;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 struct TrainerMoney
 {
@@ -7103,10 +7103,10 @@ static void atk76_various(void)
         }
         break;
     case 21:
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x55);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x55);
         break;
     case 22:
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         break;
     case 23:
         gBattleStruct->field_2A2 |= gBitTable[gActiveBank];
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 9aa80612c..51580b50b 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -127,8 +127,8 @@ struct BerryBlenderData
     struct BlenderGameBlock gameBlock;
 };
 
-extern struct MusicPlayerInfo gMPlay_SE2;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u16 gSpecialVar_ItemId;
 extern u8 gInGameOpponentsNo;
 extern u8 gUnknown_020322D5;
@@ -801,7 +801,7 @@ static const struct WindowTemplate sBlenderRecordWindowTemplate = {0, 6, 4, 0x12
 
 static void Blender_ControlHitPitch(void)
 {
-    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, 2 * (sBerryBlenderData->field_4C - 128));
+    m4aMPlayPitchControl(&gMPlayInfo_SE2, 0xFFFF, 2 * (sBerryBlenderData->field_4C - 128));
 }
 
 static void VBlankCB0_BerryBlender(void)
@@ -1938,9 +1938,9 @@ static void sub_80814F4(void)
             if (gRecvCmds[i][2] == 0x2345 || gRecvCmds[2][i] == 0x4523 || gRecvCmds[2][i] == 0x5432) // could be a bug, 2 and i are reversed
             {
                 if (sBerryBlenderData->field_4C > 1500)
-                    m4aMPlayTempoControl(&gMPlay_BGM, ((sBerryBlenderData->field_4C - 750) / 20) + 256);
+                    m4aMPlayTempoControl(&gMPlayInfo_BGM, ((sBerryBlenderData->field_4C - 750) / 20) + 256);
                 else
-                    m4aMPlayTempoControl(&gMPlay_BGM, 0x100);
+                    m4aMPlayTempoControl(&gMPlayInfo_BGM, 0x100);
             }
         }
     }
@@ -2335,7 +2335,7 @@ static void CB2_HandleBlenderEndGame(void)
     switch (sBerryBlenderData->gameEndState)
     {
     case 1:
-        m4aMPlayTempoControl(&gMPlay_BGM, 256);
+        m4aMPlayTempoControl(&gMPlayInfo_BGM, 256);
         for (i = 0; i < gSpecialVar_0x8004; i++)
         {
             DestroyTask(sBerryBlenderData->field_120[i]);
@@ -2355,7 +2355,7 @@ static void CB2_HandleBlenderEndGame(void)
                 sBerryBlenderData->gameEndState = 5;
 
             sBerryBlenderData->mainState = 0;
-            m4aMPlayStop(&gMPlay_SE2);
+            m4aMPlayStop(&gMPlayInfo_SE2);
         }
         Blender_ControlHitPitch();
         break;
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 414959882..4465f65a3 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -54,7 +54,7 @@ static EWRAM_DATA struct HofGfx *sHofGfxPtr = NULL;
 extern bool8 gHasHallOfFameRecords;
 extern u32 gUnknown_0203BCD4;
 extern u8 gDecompressionBuffer[];
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern MainCallback gGameContinueCallback;
 extern u32 gDamagedSaveSectors;
 extern u8 gReservedSpritePaletteCount;
@@ -1040,7 +1040,7 @@ static void Task_HofPC_HandleInput(u8 taskId)
             if (IsCryPlayingOrClearCrySongs())
             {
                 StopCryAndClearCrySongs();
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             }
             gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit;
         }
@@ -1050,7 +1050,7 @@ static void Task_HofPC_HandleInput(u8 taskId)
         if (IsCryPlayingOrClearCrySongs())
         {
             StopCryAndClearCrySongs();
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         }
         gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit;
     }
diff --git a/src/m4a_2.c b/src/m4a_2.c
index 2d3c65848..0625f05d1 100644
--- a/src/m4a_2.c
+++ b/src/m4a_2.c
@@ -11,10 +11,10 @@ void *gMPlayJumpTable[36];
 struct CgbChannel gCgbChans[4];
 struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2];
 struct PokemonCrySong gPokemonCrySong;
-struct MusicPlayerInfo gMPlay_BGM;
-struct MusicPlayerInfo gMPlay_SE1;
-struct MusicPlayerInfo gMPlay_SE2;
-struct MusicPlayerInfo gMPlay_SE3;
+struct MusicPlayerInfo gMPlayInfo_BGM;
+struct MusicPlayerInfo gMPlayInfo_SE1;
+struct MusicPlayerInfo gMPlayInfo_SE2;
+struct MusicPlayerInfo gMPlayInfo_SE3;
 u8 gMPlayMemAccArea[0x10];
 
 u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust)
diff --git a/src/pokeball.c b/src/pokeball.c
index 13969a5d1..b48e55135 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -21,7 +21,7 @@ extern u8 gBankTarget;
 extern u16 gBattlePartyID[];
 extern u8 gBankSpriteIds[];
 extern u8 gHealthBoxesIds[];
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 // this file's functions
 static void Task_DoPokeballSendOutAnim(u8 taskId);
@@ -773,11 +773,11 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
                 if (IsBGMPlaying())
-                    m4aMPlayStop(&gMPlay_BGM);
+                    m4aMPlayStop(&gMPlayInfo_BGM);
             }
             else
             {
-                m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128);
+                m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128);
             }
         }
 
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 1bf40bbe5..b26da118c 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -50,7 +50,7 @@ struct PokeblockFeedStruct
 };
 
 extern u16 gSpecialVar_ItemId;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct SpriteTemplate gUnknown_0202499C;
 
 extern const u8 gBattleTerrainPalette_Frontier[];
@@ -802,7 +802,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskId)
     {
         ResetSpriteData();
         FreeAllSpritePalettes();
-        m4aMPlayVolumeControl(&gMPlay_BGM, -1, 0x100);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, -1, 0x100);
         SetMainCallback2(gMain.savedCallback);
         DestroyTask(taskId);
         FreeAllWindowBuffers();
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index d659b2a02..e56448d8b 100755
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -41,7 +41,7 @@ struct ContestEffect
 extern struct UnkSummaryStruct* gUnknown_0203CF1C;
 extern struct BgTemplate gUnknown_0861CBB4;
 extern u8 gUnknown_0203CF20;
-extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern s8 gUnknown_0861CC1C[];
 extern u8 gUnknown_08329D22[];
 extern u8 gUnknown_0203CF21;
@@ -793,7 +793,7 @@ void sub_81C0484(u8 taskId)
         ResetSpriteData();
         FreeAllSpritePalettes();
         StopCryAndClearCrySongs();
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         if (gMonSpritesGfxPtr == 0)
             sub_806F47C(0);
         sub_81C0434();
diff --git a/src/sound.c b/src/sound.c
index 0cb11d5a5..ba3f659cc 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -29,10 +29,10 @@ IWRAM_DATA static u16 sFanfareCounter;
 bool8 gDisableMusic;
 
 extern u32 gBattleTypeFlags;
-extern struct MusicPlayerInfo gMPlay_BGM;
-extern struct MusicPlayerInfo gMPlay_SE1;
-extern struct MusicPlayerInfo gMPlay_SE2;
-extern struct MusicPlayerInfo gMPlay_SE3;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
+extern struct MusicPlayerInfo gMPlayInfo_SE3;
 extern struct ToneData gCryTable[];
 extern struct ToneData gCryTable2[];
 extern const struct Fanfare sFanfares[];
@@ -171,7 +171,7 @@ bool8 IsNotWaitingForBGMStop(void)
 void PlayFanfareByFanfareNum(u8 fanfareNum)
 {
     u16 songNum;
-    m4aMPlayStop(&gMPlay_BGM);
+    m4aMPlayStop(&gMPlayInfo_BGM);
     songNum = sFanfares[fanfareNum].songNum;
     sFanfareCounter = sFanfares[fanfareNum].duration;
     m4aSongNumStart(songNum);
@@ -187,7 +187,7 @@ bool8 WaitFanfare(bool8 stop)
     else
     {
         if (!stop)
-            m4aMPlayContinue(&gMPlay_BGM);
+            m4aMPlayContinue(&gMPlayInfo_BGM);
         else
             m4aSongNumStart(MUS_DUMMY);
 
@@ -232,7 +232,7 @@ static void Task_Fanfare(u8 taskId)
     }
     else
     {
-        m4aMPlayContinue(&gMPlay_BGM);
+        m4aMPlayContinue(&gMPlayInfo_BGM);
         DestroyTask(taskId);
     }
 }
@@ -250,46 +250,46 @@ void FadeInNewBGM(u16 songNum, u8 speed)
     if (songNum == 0xFFFF)
         songNum = 0;
     m4aSongNumStart(songNum);
-    m4aMPlayImmInit(&gMPlay_BGM);
-    m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0);
+    m4aMPlayImmInit(&gMPlayInfo_BGM);
+    m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0);
     m4aSongNumStop(songNum);
-    m4aMPlayFadeIn(&gMPlay_BGM, speed);
+    m4aMPlayFadeIn(&gMPlayInfo_BGM, speed);
 }
 
 void FadeOutBGMTemporarily(u8 speed)
 {
-    m4aMPlayFadeOutTemporarily(&gMPlay_BGM, speed);
+    m4aMPlayFadeOutTemporarily(&gMPlayInfo_BGM, speed);
 }
 
 bool8 IsBGMPausedOrStopped(void)
 {
-    if (gMPlay_BGM.status & MUSICPLAYER_STATUS_PAUSE)
+    if (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE)
         return TRUE;
-    if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK))
+    if (!(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK))
         return TRUE;
     return FALSE;
 }
 
 void FadeInBGM(u8 speed)
 {
-    m4aMPlayFadeIn(&gMPlay_BGM, speed);
+    m4aMPlayFadeIn(&gMPlayInfo_BGM, speed);
 }
 
 void FadeOutBGM(u8 speed)
 {
-    m4aMPlayFadeOut(&gMPlay_BGM, speed);
+    m4aMPlayFadeOut(&gMPlayInfo_BGM, speed);
 }
 
 bool8 IsBGMStopped(void)
 {
-    if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK))
+    if (!(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK))
         return TRUE;
     return FALSE;
 }
 
 void PlayCry1(u16 species, s8 pan)
 {
-    m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+    m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
     PlayCryInternal(species, pan, CRY_VOLUME, 10, 0);
     gPokemonCryBGMDuckingCounter = 2;
     RestoreBGMVolumeAfterPokemonCry();
@@ -308,7 +308,7 @@ void PlayCry3(u16 species, s8 pan, u8 mode)
     }
     else
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
         PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
         gPokemonCryBGMDuckingCounter = 2;
         RestoreBGMVolumeAfterPokemonCry();
@@ -324,7 +324,7 @@ void PlayCry4(u16 species, s8 pan, u8 mode)
     else
     {
         if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+            m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
         PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
     }
 }
@@ -337,7 +337,7 @@ void PlayCry6(u16 species, s8 pan, u8 mode) // not present in R/S
     }
     else
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
         PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
         gPokemonCryBGMDuckingCounter = 2;
     }
@@ -345,7 +345,7 @@ void PlayCry6(u16 species, s8 pan, u8 mode) // not present in R/S
 
 void PlayCry5(u16 species, u8 mode)
 {
-    m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+    m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85);
     PlayCryInternal(species, 0, CRY_VOLUME, 10, mode);
     gPokemonCryBGMDuckingCounter = 2;
     RestoreBGMVolumeAfterPokemonCry();
@@ -529,7 +529,7 @@ static void Task_DuckBGMForPokemonCry(u8 taskId)
 
     if (!IsPokemonCryPlaying(gMPlay_PokemonCry))
     {
-        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
+        m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
         DestroyTask(taskId);
     }
 }
@@ -557,55 +557,55 @@ void PlaySE(u16 songNum)
 void PlaySE12WithPanning(u16 songNum, s8 pan)
 {
     m4aSongNumStart(songNum);
-    m4aMPlayImmInit(&gMPlay_SE1);
-    m4aMPlayImmInit(&gMPlay_SE2);
-    m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan);
-    m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan);
+    m4aMPlayImmInit(&gMPlayInfo_SE1);
+    m4aMPlayImmInit(&gMPlayInfo_SE2);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
 }
 
 void PlaySE1WithPanning(u16 songNum, s8 pan)
 {
     m4aSongNumStart(songNum);
-    m4aMPlayImmInit(&gMPlay_SE1);
-    m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan);
+    m4aMPlayImmInit(&gMPlayInfo_SE1);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
 }
 
 void PlaySE2WithPanning(u16 songNum, s8 pan)
 {
     m4aSongNumStart(songNum);
-    m4aMPlayImmInit(&gMPlay_SE2);
-    m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan);
+    m4aMPlayImmInit(&gMPlayInfo_SE2);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
 }
 
 void SE12PanpotControl(s8 pan)
 {
-    m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan);
-    m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
+    m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
 }
 
 bool8 IsSEPlaying(void)
 {
-    if ((gMPlay_SE1.status & MUSICPLAYER_STATUS_PAUSE) && (gMPlay_SE2.status & MUSICPLAYER_STATUS_PAUSE))
+    if ((gMPlayInfo_SE1.status & MUSICPLAYER_STATUS_PAUSE) && (gMPlayInfo_SE2.status & MUSICPLAYER_STATUS_PAUSE))
         return FALSE;
-    if (!(gMPlay_SE1.status & MUSICPLAYER_STATUS_TRACK) && !(gMPlay_SE2.status & MUSICPLAYER_STATUS_TRACK))
+    if (!(gMPlayInfo_SE1.status & MUSICPLAYER_STATUS_TRACK) && !(gMPlayInfo_SE2.status & MUSICPLAYER_STATUS_TRACK))
         return FALSE;
     return TRUE;
 }
 
 bool8 IsBGMPlaying(void)
 {
-    if (gMPlay_BGM.status & MUSICPLAYER_STATUS_PAUSE)
+    if (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE)
         return FALSE;
-    if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK))
+    if (!(gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_TRACK))
         return FALSE;
     return TRUE;
 }
 
 bool8 IsSpecialSEPlaying(void)
 {
-    if (gMPlay_SE3.status & MUSICPLAYER_STATUS_PAUSE)
+    if (gMPlayInfo_SE3.status & MUSICPLAYER_STATUS_PAUSE)
         return FALSE;
-    if (!(gMPlay_SE3.status & MUSICPLAYER_STATUS_TRACK))
+    if (!(gMPlayInfo_SE3.status & MUSICPLAYER_STATUS_TRACK))
         return FALSE;
     return TRUE;
 }
diff --git a/src/text.c b/src/text.c
index a13ed162d..5db3ba308 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2418,12 +2418,12 @@ _08005ABA:\n\
 	strb r0, [r6, #0x9]\n\
 	b _08005A0A\n\
 _08005ABE:\n\
-	ldr r0, =gMPlay_BGM\n\
+	ldr r0, =gMPlayInfo_BGM\n\
 	bl m4aMPlayStop\n\
 	b _08005A0A\n\
 	.pool\n\
 _08005ACC:\n\
-	ldr r0, =gMPlay_BGM\n\
+	ldr r0, =gMPlayInfo_BGM\n\
 	bl m4aMPlayContinue\n\
 	b _08005A0A\n\
 	.pool\n\
-- 
cgit v1.2.3


From 9106d8df1856c65b2bc85da6d61b6968669814ea Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 13 Jan 2018 21:03:07 +0100
Subject: up to groudon transition

---
 src/battle_transition.c | 679 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 651 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/battle_transition.c b/src/battle_transition.c
index e60a2d91f..04f48b126 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -41,6 +41,15 @@ struct TransitionData
     s16 data[11];
 };
 
+struct StructRectangularSpiral
+{
+    u8 field_0;
+    s16 field_2;
+    u8 field_4;
+    s16 field_6;
+    u8 field_8;
+};
+
 typedef bool8 (*TransitionStateFunc)(struct Task *task);
 typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite);
 
@@ -81,9 +90,9 @@ void Phase2Task_Kyogre(u8 taskId);
 void Phase2Task_Groudon(u8 taskId);
 void Phase2Task_Rayquaza(u8 taskId);
 void Phase2Task_25(u8 taskId);
-void Phase2Task_26(u8 taskId);
-void Phase2Task_27(u8 taskId);
-void Phase2Task_28(u8 taskId);
+void Phase2Task_Blackhole1(u8 taskId);
+void Phase2Task_Blackhole2(u8 taskId);
+void Phase2Task_RectangularSpiral(u8 taskId);
 void Phase2Task_29(u8 taskId);
 void Phase2Task_30(u8 taskId);
 void Phase2Task_31(u8 taskId);
@@ -127,6 +136,9 @@ bool8 Phase2_WaitPaletteFade(struct Task *task);
 bool8 Phase2_Kyogre_Func3(struct Task *task);
 bool8 Phase2_Kyogre_Func4(struct Task *task);
 bool8 Phase2_Kyogre_Func5(struct Task *task);
+bool8 Phase2_Groudon_Func3(struct Task *task);
+bool8 Phase2_Groudon_Func4(struct Task *task);
+bool8 Phase2_Groudon_Func5(struct Task *task);
 bool8 Phase2_WeatherDuo_Func6(struct Task *task);
 bool8 Phase2_WeatherDuo_Func7(struct Task *task);
 bool8 Phase2_BigPokeball_Func1(struct Task *task);
@@ -166,6 +178,17 @@ bool8 Phase2_Shards_Func2(struct Task *task);
 bool8 Phase2_Shards_Func3(struct Task *task);
 bool8 Phase2_Shards_Func4(struct Task *task);
 bool8 Phase2_Shards_Func5(struct Task *task);
+bool8 Phase2_25_Func1(struct Task *task);
+bool8 Phase2_25_Func2(struct Task *task);
+bool8 Phase2_25_Func3(struct Task *task);
+bool8 Phase2_25_Func4(struct Task *task);
+bool8 Phase2_Blackhole_Func1(struct Task *task);
+bool8 Phase2_Blackhole1_Func2(struct Task *task);
+bool8 Phase2_Blackhole1_Func3(struct Task *task);
+bool8 Phase2_Blackhole2_Func2(struct Task *task);
+bool8 Phase2_RectangularSpiral_Func1(struct Task *task);
+bool8 Phase2_RectangularSpiral_Func2(struct Task *task);
+bool8 Phase2_RectangularSpiral_Func3(struct Task *task);
 bool8 Phase2_Mugshot_Func1(struct Task *task);
 bool8 Phase2_Mugshot_Func2(struct Task *task);
 bool8 Phase2_Mugshot_Func3(struct Task *task);
@@ -197,6 +220,7 @@ void sub_8148484(s16 spriteId, s16 value);
 void sub_814849C(s16 spriteId);
 s16 sub_81484B8(s16 spriteId);
 bool8 IsPhase1Done(void);
+bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1);
 void sub_814713C(struct Sprite *sprite);
 void sub_8148380(struct Sprite *sprite);
 bool8 sub_81483A8(struct Sprite *sprite);
@@ -206,9 +230,10 @@ bool8 sub_814842C(struct Sprite *sprite);
 bool8 sub_8148458(struct Sprite *sprite);
 
 // iwram bss vars
-IWRAM_DATA u16 gUnknown_03001208;
+IWRAM_DATA static s16 sUnusedRectangularSpiralVar;
 IWRAM_DATA static u8 sTestingTransitionId;
 IWRAM_DATA static u8 sTestingTransitionState;
+IWRAM_DATA static struct StructRectangularSpiral sRectangularSpiralTransition[4];
 
 // ewram vars
 EWRAM_DATA struct TransitionData *sTransitionStructPtr = NULL;
@@ -288,9 +313,9 @@ const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] =
     Phase2Task_Groudon,                     // 23
     Phase2Task_Rayquaza,                    // 24
     Phase2Task_25,                          // 25
-    Phase2Task_26,                          // 26
-    Phase2Task_27,                          // 27
-    Phase2Task_28,                          // 28
+    Phase2Task_Blackhole1,                  // 26
+    Phase2Task_Blackhole2,                  // 27
+    Phase2Task_RectangularSpiral,           // 28
     Phase2Task_29,                          // 29
     Phase2Task_30,                          // 30
     Phase2Task_31,                          // 31
@@ -502,6 +527,98 @@ const TransitionStateFunc sPhase2_Slice_Funcs[] =
     Phase2_Slice_Func3
 };
 
+const TransitionStateFunc sPhase2_25_Funcs[] =
+{
+    Phase2_25_Func1,
+    Phase2_25_Func2,
+    Phase2_25_Func3,
+    Phase2_25_Func4
+};
+
+const u8 gUnknown_085C8C64[] = {39, 119};
+const s16 gUnknown_085C8C66[] = {1, -1};
+
+const TransitionStateFunc sPhase2_Blackhole1_Funcs[] =
+{
+    Phase2_Blackhole_Func1,
+    Phase2_Blackhole1_Func2,
+    Phase2_Blackhole1_Func3
+};
+
+const TransitionStateFunc sPhase2_Blackhole2_Funcs[] =
+{
+    Phase2_Blackhole_Func1,
+    Phase2_Blackhole2_Func2
+};
+
+const s16 gUnknown_085C8C80[] = {-6, 4};
+
+const TransitionStateFunc sPhase2_RectangularSpiral_Funcs[] =
+{
+    Phase2_RectangularSpiral_Func1,
+    Phase2_RectangularSpiral_Func2,
+    Phase2_RectangularSpiral_Func3
+};
+
+const s16 gUnknown_085C8C90[] = {1, 27, 275, -1};
+const s16 gUnknown_085C8C98[] = {2, 486, -1};
+const s16 gUnknown_085C8C9E[] = {3, 262, -1};
+const s16 gUnknown_085C8CA4[] = {4, 507, -2};
+const s16 gUnknown_085C8CAA[] = {1, 213, -1};
+const s16 gUnknown_085C8CB0[] = {2, 548, -2};
+const s16 gUnknown_085C8CB6[] = {3, 196, -1};
+const s16 gUnknown_085C8CBC[] = {4, 573, 309, -1};
+const s16 gUnknown_085C8CC4[] = {1, 474, -1};
+const s16 gUnknown_085C8CCA[] = {2, 295, 32, -1};
+const s16 gUnknown_085C8CD2[] = {3, 58, -1};
+const s16 gUnknown_085C8CD8[] = {4, 455, -1};
+const s16 gUnknown_085C8CDE[] = {1, 540, -1};
+const s16 gUnknown_085C8CE4[] = {2, 229, -1};
+const s16 gUnknown_085C8CEA[] = {3, 244, 28, -1};
+const s16 gUnknown_085C8CF2[] = {4, 517, -1};
+
+const s16 *const gUnknown_085C8CF8[] =
+{
+	gUnknown_085C8C90,
+	gUnknown_085C8CA4,
+	gUnknown_085C8C98,
+	gUnknown_085C8C9E,
+	gUnknown_085C8CEA,
+	gUnknown_085C8CE4,
+	gUnknown_085C8CF2,
+	gUnknown_085C8CDE
+};
+
+const s16 *const gUnknown_085C8D18[] =
+{
+	gUnknown_085C8CBC,
+	gUnknown_085C8CB0,
+	gUnknown_085C8CB6,
+	gUnknown_085C8CAA,
+	gUnknown_085C8CCA,
+	gUnknown_085C8CD8,
+	gUnknown_085C8CC4,
+	gUnknown_085C8CD2
+};
+
+const s16 *const *const gUnknown_085C8D38[] =
+{
+	gUnknown_085C8CF8,
+	gUnknown_085C8D18
+};
+
+const TransitionStateFunc sPhase2_Groudon_Funcs[] =
+{
+    Phase2_WeatherTrio_Func1,
+    Phase2_WaitPaletteFade,
+    Phase2_Groudon_Func3,
+    Phase2_Groudon_Func4,
+    Phase2_Groudon_Func5,
+    Phase2_FramesCountdown,
+    Phase2_WeatherDuo_Func6,
+    Phase2_WeatherDuo_Func7
+};
+
 extern const u16 gFieldEffectObjectPalette10[];
 extern const u16 sBigPokeball_Tilemap[];
 extern const u16 sMugshotsTilemap[];
@@ -722,7 +839,7 @@ bool8 Phase2_Swirl_Func1(struct Task *task)
 
 bool8 Phase2_Swirl_Func2(struct Task *task)
 {
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
     task->data[1] += 4;
     task->data[2] += 8;
 
@@ -780,7 +897,7 @@ bool8 Phase2_Shuffle_Func2(struct Task *task)
     u8 i;
     u16 r3, r4;
 
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
     r4 = task->data[1];
     r3 = task->data[2] >> 8;
     task->data[1] += 4224;
@@ -1084,7 +1201,7 @@ bool8 Phase2_WeatherDuo_Func7(struct Task *task)
 
 bool8 Phase2_BigPokeball_Func3(struct Task *task)
 {
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
     if (task->data[3] == 0 || --task->data[3] == 0)
     {
         task->data[2]++;
@@ -1104,7 +1221,7 @@ bool8 Phase2_BigPokeball_Func3(struct Task *task)
 
 bool8 Phase2_BigPokeball_Func4(struct Task *task)
 {
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
     if (task->data[3] == 0 || --task->data[3] == 0)
     {
         task->data[1]--;
@@ -1124,7 +1241,7 @@ bool8 Phase2_BigPokeball_Func4(struct Task *task)
 
 bool8 Phase2_BigPokeball_Func5(struct Task *task)
 {
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
     task->data[4] += 8;
     task->data[5] -= 256;
 
@@ -1165,7 +1282,7 @@ bool8 Phase2_WaitPaletteFade(struct Task *task)
 
 bool8 Phase2_BigPokeball_Func6(struct Task *task)
 {
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
     if (task->data[2] < 1024)
         task->data[2] += 128;
     if (task->data[1] != 0)
@@ -1359,7 +1476,7 @@ bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task)
 
 bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task)
 {
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], -1, 1, 1);
     do
@@ -1383,7 +1500,7 @@ bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task)
     s16 r1, r3;
     vu8 var = 0;
 
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     sub_814A1AC(sTransitionStructPtr->data, 120, 80, 240, sTransitionStructPtr->data[5], 1, 1);
 
@@ -1418,7 +1535,7 @@ bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task)
 
 bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task)
 {
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], 160, 1, 1);
     do
@@ -1442,7 +1559,7 @@ bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task)
     s16 r1, r2, var4;
     vu8 var = 0;
 
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     sub_814A1AC(sTransitionStructPtr->data, 120, 80, 0, sTransitionStructPtr->data[5], 1, 1);
 
@@ -1479,7 +1596,7 @@ bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task)
 
 bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task)
 {
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], 0, 1, 1);
     do
@@ -1554,7 +1671,7 @@ bool8 Phase2_Ripple_Func2(struct Task *task)
     s16 r3;
     u16 r4, r8;
 
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     r3 = task->data[2] >> 8;
     r4 = task->data[1];
@@ -1633,7 +1750,7 @@ bool8 Phase2_Wave_Func2(struct Task *task)
     u16* toStore;
     bool8 nextFunc;
 
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
     toStore = gUnknown_02038C28[0];
     r5 = task->data[2];
     task->data[2] += 16;
@@ -1772,7 +1889,7 @@ bool8 Phase2_Mugshot_Func3(struct Task *task)
     s16 value;
     s32 mergedValue;
 
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     toStore = gUnknown_02038C28[0];
     r5 = task->data[1];
@@ -1818,7 +1935,7 @@ bool8 Phase2_Mugshot_Func4(struct Task *task)
     u8 i;
     u16* toStore;
 
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     for (i = 0, toStore = gUnknown_02038C28[0]; i < 160; i++, toStore++)
     {
@@ -1860,7 +1977,7 @@ bool8 Phase2_Mugshot_Func6(struct Task *task)
     sTransitionStructPtr->field_1A += 8;
     if (sub_81484B8(task->tPlayerSpriteId))
     {
-        sTransitionStructPtr->VBlank_DMA = 0;
+        sTransitionStructPtr->VBlank_DMA = FALSE;
         SetVBlankCallback(NULL);
         DmaStop(0);
         memset(gUnknown_02038C28[0], 0, 0x140);
@@ -1880,7 +1997,7 @@ bool8 Phase2_Mugshot_Func7(struct Task *task)
 {
     bool32 r6;
 
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
     r6 = TRUE;
     sTransitionStructPtr->field_18 -= 8;
     sTransitionStructPtr->field_1A += 8;
@@ -1919,7 +2036,7 @@ bool8 Phase2_Mugshot_Func7(struct Task *task)
 
 bool8 Phase2_Mugshot_Func8(struct Task *task)
 {
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
     BlendPalettes(-1, 0x10, 0x7FFF);
     sTransitionStructPtr->BLDCNT = 0xFF;
     task->data[3] = 0;
@@ -1930,7 +2047,7 @@ bool8 Phase2_Mugshot_Func8(struct Task *task)
 
 bool8 Phase2_Mugshot_Func9(struct Task *task)
 {
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     task->data[3]++;
     memset(gUnknown_02038C28[0], task->data[3], 0x140);
@@ -2104,7 +2221,7 @@ bool8 Phase2_Slice_Func1(struct Task *task)
     sTransitionStructPtr->WININ = 63;
     sTransitionStructPtr->WINOUT = 0;
     sTransitionStructPtr->WIN0V = 160;
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     for (i = 0; i < 160; i++)
     {
@@ -2126,7 +2243,7 @@ bool8 Phase2_Slice_Func2(struct Task *task)
 {
     u16 i;
 
-    sTransitionStructPtr->VBlank_DMA = 0;
+    sTransitionStructPtr->VBlank_DMA = FALSE;
 
     task->data[1] += (task->data[2] >> 8);
     if (task->data[1] > 0xF0)
@@ -2189,3 +2306,509 @@ void HBlankCB_Phase2_Slice(void)
         REG_BG3HOFS = var;
     }
 }
+
+void Phase2Task_25(u8 taskId)
+{
+    while (sPhase2_25_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_25_Func1(struct Task *task)
+{
+    u16 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+
+    sTransitionStructPtr->WININ = 63;
+    sTransitionStructPtr->WINOUT = 0;
+    sTransitionStructPtr->WIN0V = 160;
+
+    for (i = 0; i < 0xA0; i++)
+    {
+        gUnknown_02038C28[1][i] = sTransitionStructPtr->field_14;
+        gUnknown_02038C28[1][0xA0 + i] = 0xF0;
+        gUnknown_02038C28[0][i] = sTransitionStructPtr->field_14;
+        gUnknown_02038C28[0][0xA0 + i] = 0xF0;
+        gUnknown_02038C28[0][0x140 + i] = 0;
+        gUnknown_02038C28[0][0x1E0 + i] = 0x100;
+        gUnknown_02038C28[0][0x280 + i] = 1;
+    }
+
+    task->data[4] = 0;
+    task->data[5] = 0;
+    task->data[6] = 7;
+
+    EnableInterrupts(INTR_FLAG_HBLANK);
+
+    SetVBlankCallback(VBlankCB_Phase2_Slice);
+    SetHBlankCallback(HBlankCB_Phase2_Slice);
+
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_25_Func2(struct Task *task)
+{
+    u16 i, j, k;
+    u8 arr1[ARRAY_COUNT(gUnknown_085C8C64)];
+    s16 arr2[ARRAY_COUNT(gUnknown_085C8C66)];
+    u8 var;
+    u16 *ptr4, *ptr3, *ptr1, *ptr2;
+    s16 unkVar;
+
+    memcpy(arr1, gUnknown_085C8C64, sizeof(arr1));
+    memcpy(arr2, gUnknown_085C8C66, sizeof(arr2));
+
+    sTransitionStructPtr->VBlank_DMA = FALSE;
+    var = 0;
+
+    for (i = 0; i <= task->data[5]; i++)
+    {
+        for (j = 0; j < 2; j++)
+        {
+            for (k = 0; k < 2; k++)
+            {
+                unkVar = (arr1[j]) + (arr2[k] * -(i) * 2);
+                if (unkVar >= 0 && (unkVar != 79 || j != 1))
+                {
+                    ptr4 = &gUnknown_02038C28[0][unkVar + 320];
+                    ptr3 = &gUnknown_02038C28[0][unkVar + 480];
+                    ptr1 = &gUnknown_02038C28[0][unkVar + 640];
+                    if (*ptr4 > 0xEF)
+                    {
+                        *ptr4 = 0xF0;
+                        var++;
+                    }
+                    else
+                    {
+                        *ptr4 += (*ptr3 >> 8);
+                        if (*ptr1 <= 0x7F)
+                            *ptr1 *= 2;
+                        if (*ptr3 <= 0xFFF)
+                            *ptr3 += *ptr1;
+                    }
+                    ptr2 = &gUnknown_02038C28[0][unkVar];
+                    ptr3 = &gUnknown_02038C28[0][unkVar + 160];
+                    *ptr2 = sTransitionStructPtr->field_14 + *ptr4;
+                    *ptr3 = 0xF0 - *ptr4;
+
+                    if (i == 0)
+                        break;
+                }
+            }
+        }
+
+        for (j = 0; j < 2; j++)
+        {
+            for (k = 0; k < 2; k++)
+            {
+                unkVar = (arr1[j] + 1) + (arr2[k] * -(i) * 2);
+                if (unkVar <= 160 && (unkVar != 80 || j != 1))
+                {
+                    ptr4 = &gUnknown_02038C28[0][unkVar + 320];
+                    ptr3 = &gUnknown_02038C28[0][unkVar + 480];
+                    ptr1 = &gUnknown_02038C28[0][unkVar + 640];
+                    if (*ptr4 > 0xEF)
+                    {
+                        *ptr4 = 0xF0;
+                        var++;
+                    }
+                    else
+                    {
+                        *ptr4 += (*ptr3 >> 8);
+                        if (*ptr1 <= 0x7F)
+                            *ptr1 *= 2;
+                        if (*ptr3 <= 0xFFF)
+                            *ptr3 += *ptr1;
+                    }
+                    ptr2 = &gUnknown_02038C28[0][unkVar];
+                    ptr3 = &gUnknown_02038C28[0][unkVar + 160];
+                    *ptr2 = sTransitionStructPtr->field_14 - *ptr4;
+                    *ptr3 = (*ptr4 << 8) | (0xF1);
+
+                    if (i == 0)
+                        break;
+                }
+            }
+        }
+    }
+
+    if (--task->data[4] < 0)
+        task->data[4] = 0;
+    if (task->data[4] <= 0 && task->data[5] + 1 <= 20)
+        task->data[4] = task->data[6], task->data[5]++;
+    if (var > 0x9F)
+        task->tState++;
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_25_Func3(struct Task *task)
+{
+    u16 i;
+    bool32 done = TRUE;
+    u16 checkVar2 = 0xFF10;
+
+    for (i = 0; i < 0xA0; i++)
+    {
+        if (gUnknown_02038C28[1][i] != 0xF0 && gUnknown_02038C28[1][i] != checkVar2)
+            done = FALSE; // a break statement should be put here
+    }
+
+    if (done == TRUE)
+        task->tState++;
+
+    return FALSE;
+}
+
+bool8 Phase2_25_Func4(struct Task *task)
+{
+    DmaStop(0);
+    sub_8149F84();
+    DestroyTask(FindTaskIdByFunc(Phase2Task_25));
+    return FALSE;
+}
+
+void Phase2Task_Blackhole1(u8 taskId)
+{
+    while (sPhase2_Blackhole1_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void Phase2Task_Blackhole2(u8 taskId)
+{
+    while (sPhase2_Blackhole2_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Blackhole_Func1(struct Task *task)
+{
+    s32 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+
+    sTransitionStructPtr->WININ = 0;
+    sTransitionStructPtr->WINOUT = 63;
+    sTransitionStructPtr->field_6 = 240;
+    sTransitionStructPtr->WIN0V = 160;
+
+    for (i = 0; i < 0xA0; i++)
+    {
+        gUnknown_02038C28[1][i] = 0;
+    }
+
+    SetVBlankCallback(VBlankCB1_Phase2_BigPokeball);
+
+    task->tState++;
+    task->data[1] = 1;
+    task->data[2] = 0x100;
+    task->data[7] = 0;
+
+    return FALSE;
+}
+
+bool8 Phase2_Blackhole1_Func3(struct Task *task)
+{
+    if (task->data[7] == 1)
+    {
+        DmaStop(0);
+        SetVBlankCallback(NULL);
+        DestroyTask(FindTaskIdByFunc(task->func));
+    }
+    else
+    {
+        sTransitionStructPtr->VBlank_DMA = FALSE;
+        if (task->data[2] < 0x400)
+            task->data[2] += 0x80;
+        if (task->data[1] < 0xA0)
+            task->data[1] += (task->data[2] >> 8);
+        if (task->data[1] > 0xA0)
+            task->data[1] = 0xA0;
+        sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]);
+        if (task->data[1] == 0xA0)
+        {
+            task->data[7] = 1;
+            sub_8149F84();
+        }
+        else
+        {
+            sTransitionStructPtr->VBlank_DMA++;
+        }
+    }
+
+    return FALSE;
+}
+
+bool8 Phase2_Blackhole1_Func2(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = FALSE;
+    if (task->data[7] == 0)
+    {
+        task->data[7]++;
+        task->data[1] = 0x30;
+        task->data[6] = 0;
+    }
+    task->data[1] += gUnknown_085C8C80[task->data[6]];
+    task->data[6] = (task->data[6] + 1) % 2;
+    sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]);
+    if (task->data[1] < 9)
+    {
+        task->tState++;
+        task->data[7] = 0;
+    }
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Blackhole2_Func2(struct Task *task)
+{
+    u16 index; // should be s16 I think
+    s16 amplitude;
+
+    sTransitionStructPtr->VBlank_DMA = FALSE;
+    if (task->data[7] == 0)
+    {
+        task->data[7]++;
+        task->data[5] = 2;
+        task->data[6] = 2;
+    }
+    if (task->data[1] > 0xA0)
+        task->data[1] = 0xA0;
+
+    sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]);
+    if (task->data[1] == 0xA0)
+    {
+        DmaStop(0);
+        sub_8149F84();
+        DestroyTask(FindTaskIdByFunc(task->func));
+    }
+
+    index = task->data[5];
+    if ((task->data[5] & 0xFF) <= 128)
+    {
+        amplitude = task->data[6];
+        task->data[5] += 8;
+    }
+    else
+    {
+        amplitude = task->data[6] - 1;
+        task->data[5] += 16;
+    }
+    task->data[1] += Sin(index & 0xFF, amplitude);
+
+    if (task->data[1] <= 0)
+        task->data[1] = 1;
+    if (task->data[5] > 0xFE)
+        task->data[5] >>= 8, task->data[6]++;
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+void Phase2Task_RectangularSpiral(u8 taskId)
+{
+    while (sPhase2_RectangularSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_RectangularSpiral_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    CpuCopy16(sShrinkingBoxTileset, dst2, 0x20);
+    CpuCopy16(sShrinkingBoxTileset + 0x70, dst2 + 0x20, 0x20);
+    CpuFill16(0xF000, dst1, 0x800);
+    LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
+
+    task->data[3] = 1;
+    task->tState++;
+
+    sRectangularSpiralTransition[0].field_0 = 0;
+    sRectangularSpiralTransition[0].field_2 = -1;
+    sRectangularSpiralTransition[0].field_4 = 1;
+    sRectangularSpiralTransition[0].field_6 = 308;
+    sRectangularSpiralTransition[0].field_8 = 0;
+
+    sRectangularSpiralTransition[1].field_0 = 0;
+    sRectangularSpiralTransition[1].field_2 = -1;
+    sRectangularSpiralTransition[1].field_4 = 1;
+    sRectangularSpiralTransition[1].field_6 = 308;
+    sRectangularSpiralTransition[1].field_8 = 0;
+
+    sRectangularSpiralTransition[2].field_0 = 0;
+    sRectangularSpiralTransition[2].field_2 = -3;
+    sRectangularSpiralTransition[2].field_4 = 1;
+    sRectangularSpiralTransition[2].field_6 = 307;
+    sRectangularSpiralTransition[2].field_8 = 0;
+
+    sRectangularSpiralTransition[3].field_0 = 0;
+    sRectangularSpiralTransition[3].field_2 = -3;
+    sRectangularSpiralTransition[3].field_4 = 1;
+    sRectangularSpiralTransition[3].field_6 = 307;
+    sRectangularSpiralTransition[3].field_8 = 0;
+
+    return FALSE;
+}
+
+bool8 Phase2_RectangularSpiral_Func2(struct Task *task)
+{
+    u16 *dst1, *dst2;
+    u8 i;
+    u16 j;
+    bool32 done = TRUE;
+
+    sub_8149F58(&dst1, &dst2);
+
+    for (i = 0; i < 2; i++)
+    {
+        for (j = 0; j < ARRAY_COUNT(sRectangularSpiralTransition); j++)
+        {
+            s16 var = 0, var2 = 0;
+            s32 var3 = 0;
+
+            if (sub_8149048(gUnknown_085C8D38[j / 2], &sRectangularSpiralTransition[j]))
+            {
+                u32 one;
+                done = FALSE;
+                var = sRectangularSpiralTransition[j].field_2;
+                one = 1;
+                if ((j & 1) == one)
+                    var = 0x27D - var;
+
+                var2 = var % 32;
+                var3 = var / 32 * 32;
+
+                dst1[var3 + var2] = 0xF002;
+            }
+        }
+    }
+
+    if (done == TRUE)
+        task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_RectangularSpiral_Func3(struct Task *task)
+{
+    DmaStop(0);
+    sub_8149F84();
+    DestroyTask(FindTaskIdByFunc(task->func));
+    return FALSE;
+}
+
+bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1)
+{
+    const s16 *array = arg0[arg1->field_0];
+    if (array[arg1->field_4] == -1)
+        return FALSE;
+
+    // ??
+    sUnusedRectangularSpiralVar = array[0];
+    sUnusedRectangularSpiralVar = array[1];
+    sUnusedRectangularSpiralVar = array[2];
+    sUnusedRectangularSpiralVar = array[3];
+
+    switch (array[0])
+    {
+    case 1:
+        arg1->field_2 += 0x1;
+        break;
+    case 2:
+        arg1->field_2 -= 0x1;
+        break;
+    case 3:
+        arg1->field_2 -= 0x20;
+        break;
+    case 4:
+        arg1->field_2 += 0x20;
+        break;
+    }
+
+    if (arg1->field_2 > 0x27F || array[arg1->field_4] == -1)
+        return FALSE;
+
+    if (arg1->field_8 == 0 && array[arg1->field_4] == -2)
+    {
+        arg1->field_8 = 1;
+        arg1->field_4 = 1;
+        arg1->field_2 = arg1->field_6;
+        arg1->field_0 = 4;
+    }
+
+    if (arg1->field_2 == array[arg1->field_4])
+    {
+        (arg1->field_0)++;
+        if (arg1->field_8 == 1)
+        {
+            if (arg1->field_0 > 7)
+            {
+                (arg1->field_4)++;
+                (arg1->field_0) = 4;
+            }
+        }
+        else
+        {
+            if (arg1->field_0 > 3)
+            {
+                (arg1->field_4)++;
+                (arg1->field_0) = 0;
+            }
+        }
+    }
+
+    return TRUE;
+}
+
+void Phase2Task_Groudon(u8 taskId)
+{
+    while (sPhase2_Groudon_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Groudon_Func3(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    CpuFill16(0, dst1, 0x800);
+    LZ77UnCompVram(gUnknown_085BE51C, dst2);
+    LZ77UnCompVram(gUnknown_085BEA88, dst1);
+
+    task->tState++;
+    task->data[1] = 0;
+    return FALSE;
+}
+
+bool8 Phase2_Groudon_Func4(struct Task *task)
+{
+    if (task->data[1] % 3 == 0)
+    {
+        u16 var = (task->data[1] % 30) / 3;
+        LoadPalette(gUnknown_085BF0A0 + (var * 16), 0xF0, 0x20);
+    }
+    if (++task->data[1] > 58)
+    {
+        task->tState++;
+        task->data[1] = 0;
+    }
+
+    return FALSE;
+}
+
+bool8 Phase2_Groudon_Func5(struct Task *task)
+{
+    if (task->data[1] % 5 == 0)
+    {
+        s16 var = task->data[1] / 5;
+        LoadPalette(gUnknown_085BF2A0 + (var * 16), 0xF0, 0x20);
+    }
+    if (++task->data[1] > 68)
+    {
+        task->tState++;
+        task->data[1] = 0;
+        task->tFrames = 30;
+    }
+
+    return FALSE;
+}
+
-- 
cgit v1.2.3


From fdbe7fa7de9b2e1f8a22efca87201901fcea32b4 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 14 Jan 2018 20:45:44 +0100
Subject: up to 30 battle transitions

---
 src/battle_transition.c | 1664 ++++++++++++++++++++++++++++++++++++++++-------
 src/tileset_anims.c     |    5 +-
 2 files changed, 1443 insertions(+), 226 deletions(-)

(limited to 'src')

diff --git a/src/battle_transition.c b/src/battle_transition.c
index 04f48b126..def302889 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -7,6 +7,7 @@
 #include "palette.h"
 #include "trig.h"
 #include "field_effect.h"
+#include "field_camera.h"
 #include "random.h"
 #include "sprite.h"
 #include "sound.h"
@@ -56,6 +57,8 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite);
 extern u16 gUnknown_020393A8[];
 extern u16 gUnknown_02038C28[][0x3C0];
 
+extern const struct OamData gFieldObjectBaseOam_32x32;
+
 extern void c2_exit_to_overworld_2_switch(void);
 extern void sub_80AC3D0(void);
 extern void dp12_8087EA4(void);
@@ -89,7 +92,7 @@ void Phase2Task_Regirock(u8 taskId);
 void Phase2Task_Kyogre(u8 taskId);
 void Phase2Task_Groudon(u8 taskId);
 void Phase2Task_Rayquaza(u8 taskId);
-void Phase2Task_25(u8 taskId);
+void Phase2Task_ShredSplit(u8 taskId);
 void Phase2Task_Blackhole1(u8 taskId);
 void Phase2Task_Blackhole2(u8 taskId);
 void Phase2Task_RectangularSpiral(u8 taskId);
@@ -108,6 +111,8 @@ void VBlankCB1_Phase2_BigPokeball(void);
 void VBlankCB_Phase2_Clockwise_BlackFade(void);
 void VBlankCB_Phase2_Ripple(void);
 void HBlankCB_Phase2_Ripple(void);
+void VBlankCB_Phase2_30(void);
+void HBlankCB_Phase2_30(void);
 void VBlankCB_Phase2_Wave(void);
 void VBlankCB_Phase2_Slice(void);
 void HBlankCB_Phase2_Slice(void);
@@ -115,6 +120,7 @@ void VBlankCB0_Phase2_WhiteFade(void);
 void VBlankCB1_Phase2_WhiteFade(void);
 void HBlankCB_Phase2_WhiteFade(void);
 void VBlankCB_Phase2_Shards(void);
+void VBlankCB_Phase2_Rayquaza(void);
 bool8 Phase2_Blur_Func1(struct Task *task);
 bool8 Phase2_Blur_Func2(struct Task *task);
 bool8 Phase2_Blur_Func3(struct Task *task);
@@ -178,10 +184,10 @@ bool8 Phase2_Shards_Func2(struct Task *task);
 bool8 Phase2_Shards_Func3(struct Task *task);
 bool8 Phase2_Shards_Func4(struct Task *task);
 bool8 Phase2_Shards_Func5(struct Task *task);
-bool8 Phase2_25_Func1(struct Task *task);
-bool8 Phase2_25_Func2(struct Task *task);
-bool8 Phase2_25_Func3(struct Task *task);
-bool8 Phase2_25_Func4(struct Task *task);
+bool8 Phase2_ShredSplit_Func1(struct Task *task);
+bool8 Phase2_ShredSplit_Func2(struct Task *task);
+bool8 Phase2_ShredSplit_Func3(struct Task *task);
+bool8 Phase2_ShredSplit_Func4(struct Task *task);
 bool8 Phase2_Blackhole_Func1(struct Task *task);
 bool8 Phase2_Blackhole1_Func2(struct Task *task);
 bool8 Phase2_Blackhole1_Func3(struct Task *task);
@@ -189,6 +195,32 @@ bool8 Phase2_Blackhole2_Func2(struct Task *task);
 bool8 Phase2_RectangularSpiral_Func1(struct Task *task);
 bool8 Phase2_RectangularSpiral_Func2(struct Task *task);
 bool8 Phase2_RectangularSpiral_Func3(struct Task *task);
+bool8 Phase2_29_Func1(struct Task *task);
+bool8 Phase2_29_Func2(struct Task *task);
+bool8 Phase2_30_Func1(struct Task *task);
+bool8 Phase2_30_Func2(struct Task *task);
+bool8 Phase2_30_Func3(struct Task *task);
+bool8 Phase2_30_Func4(struct Task *task);
+bool8 Phase2_Rayquaza_Func3(struct Task *task);
+bool8 Phase2_Rayquaza_Func4(struct Task *task);
+bool8 Phase2_Rayquaza_Func5(struct Task *task);
+bool8 Phase2_Rayquaza_Func6(struct Task *task);
+bool8 Phase2_Rayquaza_Func7(struct Task *task);
+bool8 Phase2_Rayquaza_Func8(struct Task *task);
+bool8 Phase2_Rayquaza_Func9(struct Task *task);
+bool8 Phase2_31_Func1(struct Task *task);
+bool8 Phase2_31_Func2(struct Task *task);
+bool8 Phase2_31_Func3(struct Task *task);
+bool8 Phase2_31_33_Func5(struct Task *task);
+bool8 Phase2_33_Func1(struct Task *task);
+bool8 Phase2_33_Func2(struct Task *task);
+bool8 Phase2_33_Func3(struct Task *task);
+bool8 Phase2_33_Func4(struct Task *task);
+bool8 Phase2_32_Func1(struct Task *task);
+bool8 Phase2_32_Func2(struct Task *task);
+bool8 Phase2_32_Func3(struct Task *task);
+bool8 Phase2_32_Func4(struct Task *task);
+bool8 Phase2_32_Func5(struct Task *task);
 bool8 Phase2_Mugshot_Func1(struct Task *task);
 bool8 Phase2_Mugshot_Func2(struct Task *task);
 bool8 Phase2_Mugshot_Func3(struct Task *task);
@@ -214,15 +246,19 @@ void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4);
 void sub_814A014(u16 *a0, s16 a1, s16 a2, s16 a3);
 void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize);
 void sub_8149F58(u16 **a0, u16 **a1);
+void sub_8149F40(u16 **a0);
 void sub_814A1AC(s16 *a0, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6);
 bool8 sub_814A228(s16 *a0, bool8 a1, bool8 a2);
 void sub_8148484(s16 spriteId, s16 value);
 void sub_814849C(s16 spriteId);
 s16 sub_81484B8(s16 spriteId);
+bool8 Phase1_TransitionAll_Func1(struct Task *task);
+bool8 Phase1_TransitionAll_Func2(struct Task *task);
 bool8 IsPhase1Done(void);
 bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1);
 void sub_814713C(struct Sprite *sprite);
 void sub_8148380(struct Sprite *sprite);
+void sub_8149864(struct Sprite *sprite);
 bool8 sub_81483A8(struct Sprite *sprite);
 bool8 sub_81483AC(struct Sprite *sprite);
 bool8 sub_81483F8(struct Sprite *sprite);
@@ -236,15 +272,15 @@ IWRAM_DATA static u8 sTestingTransitionState;
 IWRAM_DATA static struct StructRectangularSpiral sRectangularSpiralTransition[4];
 
 // ewram vars
-EWRAM_DATA struct TransitionData *sTransitionStructPtr = NULL;
+EWRAM_DATA static struct TransitionData *sTransitionStructPtr = NULL;
 
 // const rom data
 const u32 sBigPokeball_Tileset[] = INCBIN_U32("graphics/battle_transitions/big_pokeball.4bpp");
 const u32 sPokeballTrail_Tileset[] = INCBIN_U32("graphics/battle_transitions/pokeball_trail.4bpp");
-const u32 sSpriteImage_85B98F0[] = INCBIN_U32("graphics/battle_transitions/pokeball.4bpp");
+const u8 sSpriteImage_85B98F0[] = INCBIN_U8("graphics/battle_transitions/pokeball.4bpp");
 const u32 sUnknown_085B9AF0[] = INCBIN_U32("graphics/battle_transitions/elite_four_bg.4bpp");
-const u32 sSpriteImage_85B9CD0[] = INCBIN_U32("graphics/battle_transitions/unused_brendan.4bpp");
-const u32 sSpriteImage_85BA4D0[] = INCBIN_U32("graphics/battle_transitions/unused_lass.4bpp");
+const u8 sSpriteImage_85B9CD0[] = INCBIN_U8("graphics/battle_transitions/unused_brendan.4bpp");
+const u8 sSpriteImage_85BA4D0[] = INCBIN_U8("graphics/battle_transitions/unused_lass.4bpp");
 const u32 sShrinkingBoxTileset[] = INCBIN_U32("graphics/battle_transitions/shrinking_box.4bpp");
 const u32 sEvilTeam_Palette[] = INCBIN_U32("graphics/battle_transitions/evil_team.gbapal");
 const u32 sTeamAqua_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_aqua.4bpp.lz");
@@ -312,7 +348,7 @@ const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] =
     Phase2Task_Kyogre,                      // 22
     Phase2Task_Groudon,                     // 23
     Phase2Task_Rayquaza,                    // 24
-    Phase2Task_25,                          // 25
+    Phase2Task_ShredSplit,                  // 25
     Phase2Task_Blackhole1,                  // 26
     Phase2Task_Blackhole2,                  // 27
     Phase2Task_RectangularSpiral,           // 28
@@ -527,12 +563,12 @@ const TransitionStateFunc sPhase2_Slice_Funcs[] =
     Phase2_Slice_Func3
 };
 
-const TransitionStateFunc sPhase2_25_Funcs[] =
+const TransitionStateFunc sPhase2_ShredSplit_Funcs[] =
 {
-    Phase2_25_Func1,
-    Phase2_25_Func2,
-    Phase2_25_Func3,
-    Phase2_25_Func4
+    Phase2_ShredSplit_Func1,
+    Phase2_ShredSplit_Func2,
+    Phase2_ShredSplit_Func3,
+    Phase2_ShredSplit_Func4
 };
 
 const u8 gUnknown_085C8C64[] = {39, 119};
@@ -619,12 +655,257 @@ const TransitionStateFunc sPhase2_Groudon_Funcs[] =
     Phase2_WeatherDuo_Func7
 };
 
-extern const u16 gFieldEffectObjectPalette10[];
-extern const u16 sBigPokeball_Tilemap[];
-extern const u16 sMugshotsTilemap[];
-extern const struct SpriteTemplate gUnknown_085C8E68;
-extern const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT];
-extern const u16 *const sPlayerMugshotsPals[2];
+const TransitionStateFunc sPhase2_Rayquaza_Funcs[] =
+{
+    Phase2_WeatherTrio_Func1,
+    Phase2_WaitPaletteFade,
+    Phase2_Rayquaza_Func3,
+    Phase2_Rayquaza_Func4,
+    Phase2_Rayquaza_Func5,
+    Phase2_Rayquaza_Func6,
+    Phase2_Rayquaza_Func7,
+    Phase2_Rayquaza_Func8,
+    Phase2_Rayquaza_Func9,
+    Phase2_Blackhole1_Func2,
+    Phase2_Blackhole1_Func3
+};
+
+const TransitionStateFunc sPhase2_WhiteFade_Funcs[] =
+{
+    Phase2_WhiteFade_Func1,
+    Phase2_WhiteFade_Func2,
+    Phase2_WhiteFade_Func3,
+    Phase2_WhiteFade_Func4,
+    Phase2_WhiteFade_Func5
+};
+
+const s16 sUnknown_085C8DA0[] = {0, 20, 15, 40, 10, 25, 35, 5};
+
+const TransitionStateFunc sPhase2_GridSquares_Funcs[] =
+{
+    Phase2_GridSquares_Func1,
+    Phase2_GridSquares_Func2,
+    Phase2_GridSquares_Func3
+};
+
+const TransitionStateFunc sPhase2_Shards_Funcs[] =
+{
+    Phase2_Shards_Func1,
+    Phase2_Shards_Func2,
+    Phase2_Shards_Func3,
+    Phase2_Shards_Func4,
+    Phase2_Shards_Func5
+};
+
+const s16 sUnknown_085C8DD0[][5] =
+{
+    {56,    0,      0,      160,    0},
+    {104,   160,    240,    88,     1},
+    {240,   72,     56,     0,      1},
+    {0,     32,     144,    160,    0},
+    {144,   160,    184,    0,      1},
+    {56,    0,      168,    160,    0},
+    {168,   160,    48,     0,      1},
+};
+
+const s16 sUnknown_085C8E16[] = {8, 4, 2, 1, 1, 1, 0};
+
+const TransitionStateFunc sPhase1_TransitionAll_Funcs[] =
+{
+    Phase1_TransitionAll_Func1,
+    Phase1_TransitionAll_Func2
+};
+
+const struct SpriteFrameImage sSpriteImageTable_85C8E2C[] =
+{
+    sSpriteImage_85B98F0, 0x200
+};
+
+const union AnimCmd sSpriteAnim_85C8E34[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const sSpriteAnimTable_85C8E3C[] =
+{
+    sSpriteAnim_85C8E34
+};
+
+const union AffineAnimCmd sSpriteAffineAnim_85C8E40[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, -4, 1),
+    AFFINEANIMCMD_JUMP(0)
+};
+
+const union AffineAnimCmd sSpriteAffineAnim_85C8E50[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, 4, 1),
+    AFFINEANIMCMD_JUMP(0)
+};
+
+const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] =
+{
+    sSpriteAffineAnim_85C8E40,
+    sSpriteAffineAnim_85C8E50
+};
+
+const struct SpriteTemplate gUnknown_085C8E68 =
+{
+    .tileTag = 0xFFFF,
+    .paletteTag = 4105,
+    .oam = &gFieldObjectBaseOam_32x32,
+    .anims = sSpriteAnimTable_85C8E3C,
+    .images = sSpriteImageTable_85C8E2C,
+    .affineAnims = sSpriteAffineAnimTable_85C8E60,
+    .callback = sub_814713C
+};
+
+const struct OamData gOamData_85C8E80 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+const struct SpriteFrameImage sSpriteImageTable_85C8E88[] =
+{
+    sSpriteImage_85B9CD0, 0x800
+};
+
+const struct SpriteFrameImage sSpriteImageTable_85C8E90[] =
+{
+    sSpriteImage_85BA4D0, 0x800
+};
+
+const union AnimCmd sSpriteAnim_85C8E98[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const sSpriteAnimTable_85C8EA0[] =
+{
+    sSpriteAnim_85C8E98
+};
+
+const struct SpriteTemplate sSpriteTemplate_85C8EA4 =
+{
+    .tileTag = 0xFFFF,
+    .paletteTag = 4106,
+    .oam = &gOamData_85C8E80,
+    .anims = sSpriteAnimTable_85C8EA0,
+    .images = sSpriteImageTable_85C8E88,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_8148380
+};
+
+const struct SpriteTemplate sSpriteTemplate_85C8EBC =
+{
+    .tileTag = 0xFFFF,
+    .paletteTag = 4106,
+    .oam = &gOamData_85C8E80,
+    .anims = sSpriteAnimTable_85C8EA0,
+    .images = sSpriteImageTable_85C8E90,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_8148380
+};
+
+const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_10.gbapal");
+
+const struct SpritePalette gFieldEffectObjectPaletteInfo10 =
+{
+    gFieldEffectObjectPalette10, 0x1009
+};
+
+const u16 sMugshotPal_Sydney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal");
+const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal");
+const u16 sMugshotPal_Glacia[] = INCBIN_U16("graphics/battle_transitions/glacia_bg.gbapal");
+const u16 sMugshotPal_Drake[] = INCBIN_U16("graphics/battle_transitions/drake_bg.gbapal");
+const u16 sMugshotPal_Champion[] = INCBIN_U16("graphics/battle_transitions/wallace_bg.gbapal");
+const u16 sMugshotPal_Brendan[] = INCBIN_U16("graphics/battle_transitions/brendan_bg.gbapal");
+const u16 sMugshotPal_May[] = INCBIN_U16("graphics/battle_transitions/may_bg.gbapal");
+
+const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] =
+{
+    sMugshotPal_Sydney,
+    sMugshotPal_Phoebe,
+    sMugshotPal_Glacia,
+    sMugshotPal_Drake,
+    sMugshotPal_Champion
+};
+
+const u16 *const sPlayerMugshotsPals[2] =
+{
+    sMugshotPal_Brendan,
+    sMugshotPal_May
+};
+
+const u16 sUnusedTrainerPalette[] = INCBIN_U16("graphics/battle_transitions/unused_trainer.gbapal");
+const struct SpritePalette sSpritePalette_UnusedTrainer =
+{
+    sUnusedTrainerPalette, 0x100A
+};
+
+const u16 sBigPokeball_Tilemap[] = INCBIN_U16("graphics/battle_transitions/big_pokeball_map.bin");
+const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/elite_four_bg_map.bin");
+
+const TransitionStateFunc sPhase2_29_Funcs[] =
+{
+    Phase2_29_Func1,
+    Phase2_29_Func2,
+    Phase2_BigPokeball_Func3,
+    Phase2_BigPokeball_Func4,
+    Phase2_BigPokeball_Func5,
+    Phase2_BigPokeball_Func6
+};
+
+const TransitionStateFunc sPhase2_30_Funcs[] =
+{
+    Phase2_30_Func1,
+    Phase2_30_Func2,
+    Phase2_30_Func3,
+    Phase2_30_Func4
+};
+
+const TransitionStateFunc sPhase2_31_Funcs[] =
+{
+    Phase2_31_Func1,
+    Phase2_31_Func2,
+    Phase2_31_Func3,
+    Phase2_31_33_Func5
+};
+
+const TransitionStateFunc sPhase2_33_Funcs[] =
+{
+    Phase2_33_Func1,
+    Phase2_33_Func2,
+    Phase2_33_Func3,
+    Phase2_33_Func4,
+    Phase2_31_33_Func5
+};
+
+const TransitionStateFunc sPhase2_32_Funcs[] =
+{
+    Phase2_32_Func1,
+    Phase2_32_Func2,
+    Phase2_32_Func3,
+    Phase2_32_Func4,
+    Phase2_32_Func5
+};
+
+const u8 gUnknown_085C9A30[] = {0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x1b, 0x14, 0x0d, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x07, 0x0e, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x13, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x0f, 0x10, 0x11, 0x12};
+const u8 gUnknown_085C9A53[] = {0x00, 0x10, 0x29, 0x16, 0x2c, 0x02, 0x2b, 0x15, 0x2e, 0x1b, 0x09, 0x30, 0x26, 0x05, 0x39, 0x3b, 0x0c, 0x3f, 0x23, 0x1c, 0x0a, 0x35, 0x07, 0x31, 0x27, 0x17, 0x37, 0x01, 0x3e, 0x11, 0x3d, 0x1e, 0x06, 0x22, 0x0f, 0x33, 0x20, 0x3a, 0x0d, 0x2d, 0x25, 0x34, 0x0b, 0x18, 0x3c, 0x13, 0x38, 0x21, 0x1d, 0x32, 0x28, 0x36, 0x0e, 0x03, 0x2f, 0x14, 0x12, 0x19, 0x04, 0x24, 0x1a, 0x2a, 0x1f, 0x08, 0x00};
 
 // code
 static void CB2_TestBattleTransition(void)
@@ -667,9 +948,11 @@ void BattleTransition_Start(u8 transitionId)
     LaunchBattleTransitionTask(transitionId);
 }
 
-// main task that launches sub-tasks for phase1 and phase2
+// in all tasks data[0] is reserved for the state
 #define tState          data[0]
-#define tTransitionID   data[1]
+
+// main task that launches sub-tasks for phase1 and phase2
+#define tTransitionId   data[1]
 #define tTransitionDone data[15]
 
 bool8 IsBattleTransitionDone(void)
@@ -690,7 +973,7 @@ bool8 IsBattleTransitionDone(void)
 void LaunchBattleTransitionTask(u8 transitionId)
 {
     u8 taskId = CreateTask(Task_BattleTransitionMain, 2);
-    gTasks[taskId].tTransitionID = transitionId;
+    gTasks[taskId].tTransitionId = transitionId;
     sTransitionStructPtr = AllocZeroed(sizeof(*sTransitionStructPtr));
 }
 
@@ -703,9 +986,9 @@ bool8 Transition_Phase1(struct Task *task)
 {
     sub_80AC3D0();
     CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
-    if (sPhase1_Tasks[task->tTransitionID] != NULL)
+    if (sPhase1_Tasks[task->tTransitionId] != NULL)
     {
-        CreateTask(sPhase1_Tasks[task->tTransitionID], 4);
+        CreateTask(sPhase1_Tasks[task->tTransitionId], 4);
         task->tState++;
         return FALSE;
     }
@@ -718,7 +1001,7 @@ bool8 Transition_Phase1(struct Task *task)
 
 bool8 Transition_WaitForPhase1(struct Task *task)
 {
-    if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionID]) == 0xFF)
+    if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF)
     {
         task->tState++;
         return TRUE;
@@ -731,7 +1014,7 @@ bool8 Transition_WaitForPhase1(struct Task *task)
 
 bool8 Transition_Phase2(struct Task *task)
 {
-    CreateTask(sPhase2_Tasks[task->tTransitionID], 0);
+    CreateTask(sPhase2_Tasks[task->tTransitionId], 0);
     task->tState++;
     return FALSE;
 }
@@ -739,18 +1022,14 @@ bool8 Transition_Phase2(struct Task *task)
 bool8 Transition_WaitForPhase2(struct Task *task)
 {
     task->tTransitionDone = FALSE;
-    if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionID]) == 0xFF)
+    if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF)
         task->tTransitionDone = TRUE;
     return FALSE;
 }
 
-#undef tState
-#undef tTransitionID
+#undef tTransitionId
 #undef tTransitionDone
 
-// sub-task for phase1
-#define tState          data[0]
-
 void Phase1Task_TransitionAll(u8 taskId)
 {
     if (gTasks[taskId].tState == 0)
@@ -764,10 +1043,14 @@ void Phase1Task_TransitionAll(u8 taskId)
     }
 }
 
-#undef tState
-
 // sub-task for phase2
-#define tState              data[0]
+#define tData1              data[1]
+#define tData2              data[2]
+#define tData3              data[3]
+#define tData4              data[4]
+#define tData5              data[5]
+#define tData6              data[6]
+#define tFuncState          data[7]
 #define tFrames             data[8]
 #define tOpponentSpriteId   data[13]
 #define tPlayerSpriteId     data[14]
@@ -790,17 +1073,17 @@ bool8 Phase2_Blur_Func1(struct Task *task)
 
 bool8 Phase2_Blur_Func2(struct Task *task)
 {
-    if (task->data[1] != 0)
+    if (task->tData1 != 0)
     {
-        task->data[1]--;
+        task->tData1--;
     }
     else
     {
-        task->data[1] = 4;
-        if (++task->data[2] == 10)
+        task->tData1 = 4;
+        if (++task->tData2 == 10)
             BeginNormalPaletteFade(-1, -1, 0, 0x10, 0);
-        SetGpuReg(REG_OFFSET_MOSAIC, (task->data[2] & 15) * 17);
-        if (task->data[2] > 14)
+        SetGpuReg(REG_OFFSET_MOSAIC, (task->tData2 & 15) * 17);
+        if (task->tData2 > 14)
             task->tState++;
     }
     return FALSE;
@@ -840,10 +1123,10 @@ bool8 Phase2_Swirl_Func1(struct Task *task)
 bool8 Phase2_Swirl_Func2(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
-    task->data[1] += 4;
-    task->data[2] += 8;
+    task->tData1 += 4;
+    task->tData2 += 8;
 
-    sub_8149F98(gUnknown_02038C28[0], sTransitionStructPtr->field_14, task->data[1], 2, task->data[2], 160);
+    sub_8149F98(gUnknown_02038C28[0], sTransitionStructPtr->field_14, task->tData1, 2, task->tData2, 160);
 
     if (!gPaletteFade.active)
     {
@@ -898,10 +1181,10 @@ bool8 Phase2_Shuffle_Func2(struct Task *task)
     u16 r3, r4;
 
     sTransitionStructPtr->VBlank_DMA = FALSE;
-    r4 = task->data[1];
-    r3 = task->data[2] >> 8;
-    task->data[1] += 4224;
-    task->data[2] += 384;
+    r4 = task->tData1;
+    r3 = task->tData2 >> 8;
+    task->tData1 += 4224;
+    task->tData2 += 384;
 
     for (i = 0; i < 160; i++, r4 += 4224)
     {
@@ -973,16 +1256,16 @@ void sub_814669C(struct Task *task)
     sub_8149F08();
     dp12_8087EA4();
 
-    task->data[1] = 16;
-    task->data[2] = 0;
-    task->data[4] = 0;
-    task->data[5] = 0x4000;
+    task->tData1 = 16;
+    task->tData2 = 0;
+    task->tData4 = 0;
+    task->tData5 = 0x4000;
     sTransitionStructPtr->WININ = 63;
     sTransitionStructPtr->WINOUT = 0;
     sTransitionStructPtr->field_6 = 240;
     sTransitionStructPtr->WIN0V = 160;
     sTransitionStructPtr->BLDCNT = 0x3F41;
-    sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | (task->data[2]);
+    sTransitionStructPtr->BLDALPHA = (task->tData1 << 8) | (task->tData2);
 
     for (i = 0; i < 160; i++)
     {
@@ -1065,7 +1348,7 @@ bool8 Phase2_BigPokeball_Func2(struct Task *task)
             dst1[i * 32 + j] = *BigPokeballMap | 0xF000;
         }
     }
-    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return TRUE;
@@ -1077,7 +1360,7 @@ bool8 Phase2_Aqua_Func2(struct Task *task)
 
     sub_8149F58(&dst1, &dst2);
     LZ77UnCompVram(sTeamAqua_Tilemap, dst1);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return FALSE;
@@ -1089,7 +1372,7 @@ bool8 Phase2_Magma_Func2(struct Task *task)
 
     sub_8149F58(&dst1, &dst2);
     LZ77UnCompVram(sTeamMagma_Tilemap, dst1);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return FALSE;
@@ -1102,7 +1385,7 @@ bool8 Phase2_Regice_Func2(struct Task *task)
     sub_8149F58(&dst1, &dst2);
     LoadPalette(gUnknown_085BC2B4, 0xF0, 0x20);
     CpuCopy16(gUnknown_085BC314, dst1, 0x500);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return FALSE;
@@ -1115,7 +1398,7 @@ bool8 Phase2_Registeel_Func2(struct Task *task)
     sub_8149F58(&dst1, &dst2);
     LoadPalette(gUnknown_085BC2D4, 0xF0, 0x20);
     CpuCopy16(gUnknown_085BCB14, dst1, 0x500);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return FALSE;
@@ -1128,7 +1411,7 @@ bool8 Phase2_Regirock_Func2(struct Task *task)
     sub_8149F58(&dst1, &dst2);
     LoadPalette(gUnknown_085BC2F4, 0xF0, 0x20);
     CpuCopy16(gUnknown_085BD314, dst1, 0x500);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5], 160);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return FALSE;
@@ -1149,16 +1432,16 @@ bool8 Phase2_Kyogre_Func3(struct Task *task)
 
 bool8 Phase2_Kyogre_Func4(struct Task *task)
 {
-    if (task->data[1] % 3 == 0)
+    if (task->tData1 % 3 == 0)
     {
-        u16 var = task->data[1] % 30;
+        u16 var = task->tData1 % 30;
         var /= 3;
         LoadPalette(gUnknown_085BEDA0 + (var * 16), 0xF0, 0x20);
     }
-    if (++task->data[1] > 58)
+    if (++task->tData1 > 58)
     {
         task->tState++;
-        task->data[1] = 0;
+        task->tData1 = 0;
     }
 
     return FALSE;
@@ -1166,15 +1449,15 @@ bool8 Phase2_Kyogre_Func4(struct Task *task)
 
 bool8 Phase2_Kyogre_Func5(struct Task *task)
 {
-    if (task->data[1] % 5 == 0)
+    if (task->tData1 % 5 == 0)
     {
-        s16 var = task->data[1] / 5;
+        s16 var = task->tData1 / 5;
         LoadPalette(gUnknown_085BEEE0 + (var * 16), 0xF0, 0x20);
     }
-    if (++task->data[1] > 68)
+    if (++task->tData1 > 68)
     {
         task->tState++;
-        task->data[1] = 0;
+        task->tData1 = 0;
         task->tFrames = 30;
     }
 
@@ -1202,18 +1485,18 @@ bool8 Phase2_WeatherDuo_Func7(struct Task *task)
 bool8 Phase2_BigPokeball_Func3(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
-    if (task->data[3] == 0 || --task->data[3] == 0)
+    if (task->tData3 == 0 || --task->tData3 == 0)
     {
-        task->data[2]++;
-        task->data[3] = 2;
+        task->tData2++;
+        task->tData3 = 2;
     }
-    sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | task->data[2];
-    if (task->data[2] > 15)
+    sTransitionStructPtr->BLDALPHA = (task->tData1 << 8) | task->tData2;
+    if (task->tData2 > 15)
         task->tState++;
-    task->data[4] += 8;
-    task->data[5] -= 256;
+    task->tData4 += 8;
+    task->tData5 -= 256;
 
-    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5 >> 8, 160);
 
     sTransitionStructPtr->VBlank_DMA++;
     return FALSE;
@@ -1222,18 +1505,18 @@ bool8 Phase2_BigPokeball_Func3(struct Task *task)
 bool8 Phase2_BigPokeball_Func4(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
-    if (task->data[3] == 0 || --task->data[3] == 0)
+    if (task->tData3 == 0 || --task->tData3 == 0)
     {
-        task->data[1]--;
-        task->data[3] = 2;
+        task->tData1--;
+        task->tData3 = 2;
     }
-    sTransitionStructPtr->BLDALPHA = (task->data[1] << 8) | task->data[2];
-    if (task->data[1] == 0)
+    sTransitionStructPtr->BLDALPHA = (task->tData1 << 8) | task->tData2;
+    if (task->tData1 == 0)
         task->tState++;
-    task->data[4] += 8;
-    task->data[5] -= 256;
+    task->tData4 += 8;
+    task->tData5 -= 256;
 
-    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5 >> 8, 160);
 
     sTransitionStructPtr->VBlank_DMA++;
     return FALSE;
@@ -1242,17 +1525,17 @@ bool8 Phase2_BigPokeball_Func4(struct Task *task)
 bool8 Phase2_BigPokeball_Func5(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
-    task->data[4] += 8;
-    task->data[5] -= 256;
+    task->tData4 += 8;
+    task->tData5 -= 256;
 
-    sub_8149F98(gUnknown_02038C28[0], 0, task->data[4], 132, task->data[5] >> 8, 160);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5 >> 8, 160);
 
-    if (task->data[5] <= 0)
+    if (task->tData5 <= 0)
     {
         task->tState++;
-        task->data[1] = 160;
-        task->data[2] = 256;
-        task->data[3] = 0;
+        task->tData1 = 160;
+        task->tData2 = 256;
+        task->tData3 = 0;
     }
 
     sTransitionStructPtr->VBlank_DMA++;
@@ -1283,16 +1566,16 @@ bool8 Phase2_WaitPaletteFade(struct Task *task)
 bool8 Phase2_BigPokeball_Func6(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
-    if (task->data[2] < 1024)
-        task->data[2] += 128;
-    if (task->data[1] != 0)
+    if (task->tData2 < 1024)
+        task->tData2 += 128;
+    if (task->tData1 != 0)
     {
-        task->data[1] -= (task->data[2] >> 8);
-        if (task->data[1] < 0)
-            task->data[1] = 0;
+        task->tData1 -= (task->tData2 >> 8);
+        if (task->tData1 < 0)
+            task->tData1 = 0;
     }
-    sub_814A014(gUnknown_02038C28[0], 120, 80, task->data[1]);
-    if (task->data[1] == 0)
+    sub_814A014(gUnknown_02038C28[0], 120, 80, task->tData1);
+    if (task->tData1 == 0)
     {
         SetVBlankCallback(NULL);
         DmaStop(0);
@@ -1301,9 +1584,9 @@ bool8 Phase2_BigPokeball_Func6(struct Task *task)
     }
     else
     {
-        if (task->data[3] == 0)
+        if (task->tData3 == 0)
         {
-            task->data[3]++;
+            task->tData3++;
             SetVBlankCallback(VBlankCB1_Phase2_BigPokeball);
         }
 
@@ -1673,12 +1956,12 @@ bool8 Phase2_Ripple_Func2(struct Task *task)
 
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
-    r3 = task->data[2] >> 8;
-    r4 = task->data[1];
+    r3 = task->tData2 >> 8;
+    r4 = task->tData1;
     r8 = 384;
-    task->data[1] += 0x400;
-    if (task->data[2] <= 0x1FFF)
-        task->data[2] += 0x180;
+    task->tData1 += 0x400;
+    if (task->tData2 <= 0x1FFF)
+        task->tData2 += 0x180;
 
     for (i = 0; i < 160; i++, r4 += r8)
     {
@@ -1688,13 +1971,13 @@ bool8 Phase2_Ripple_Func2(struct Task *task)
         gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3);
     }
 
-    if (++task->data[3] == 81)
+    if (++task->tData3 == 81)
     {
-        task->data[4]++;
+        task->tData4++;
         BeginNormalPaletteFade(-1, -2, 0, 0x10, 0);
     }
 
-    if (task->data[4] != 0 && !gPaletteFade.active)
+    if (task->tData4 != 0 && !gPaletteFade.active)
         DestroyTask(FindTaskIdByFunc(Phase2Task_Ripple));
 
     sTransitionStructPtr->VBlank_DMA++;
@@ -1752,13 +2035,13 @@ bool8 Phase2_Wave_Func2(struct Task *task)
 
     sTransitionStructPtr->VBlank_DMA = FALSE;
     toStore = gUnknown_02038C28[0];
-    r5 = task->data[2];
-    task->data[2] += 16;
-    task->data[1] += 8;
+    r5 = task->tData2;
+    task->tData2 += 16;
+    task->tData1 += 8;
 
     for (i = 0, nextFunc = TRUE; i < 160; i++, r5 += 4, toStore++)
     {
-        s16 value = task->data[1] + Sin(r5, 40);
+        s16 value = task->tData1 + Sin(r5, 40);
         if (value < 0)
             value = 0;
         if (value > 240)
@@ -1837,9 +2120,9 @@ bool8 Phase2_Mugshot_Func1(struct Task *task)
     dp12_8087EA4();
     Mugshots_CreateOpponentPlayerSprites(task);
 
-    task->data[1] = 0;
-    task->data[2] = 1;
-    task->data[3] = 239;
+    task->tData1 = 0;
+    task->tData2 = 1;
+    task->tData3 = 239;
     sTransitionStructPtr->WININ = 63;
     sTransitionStructPtr->WINOUT = 62;
     sTransitionStructPtr->WIN0V = 160;
@@ -1892,12 +2175,12 @@ bool8 Phase2_Mugshot_Func3(struct Task *task)
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
     toStore = gUnknown_02038C28[0];
-    r5 = task->data[1];
-    task->data[1] += 0x10;
+    r5 = task->tData1;
+    task->tData1 += 0x10;
 
     for (i = 0; i < 80; i++, toStore++, r5 += 0x10)
     {
-        value = task->data[2] + Sin(r5, 0x10);
+        value = task->tData2 + Sin(r5, 0x10);
         if (value < 0)
             value = 1;
         if (value > 0xF0)
@@ -1906,7 +2189,7 @@ bool8 Phase2_Mugshot_Func3(struct Task *task)
     }
     for (; i < 160; i++, toStore++, r5 += 0x10)
     {
-        value = task->data[3] - Sin(r5, 0x10);
+        value = task->tData3 - Sin(r5, 0x10);
         if (value < 0)
             value = 0;
         if (value > 0xEF)
@@ -1914,13 +2197,13 @@ bool8 Phase2_Mugshot_Func3(struct Task *task)
         *toStore = (value << 8) | (0xF0);
     }
 
-    task->data[2] += 8;
-    task->data[3] -= 8;
-    if (task->data[2] > 0xF0)
-        task->data[2] = 0xF0;
-    if (task->data[3] < 0)
-        task->data[3] = 0;
-    mergedValue = *(s32*)(&task->data[2]);
+    task->tData2 += 8;
+    task->tData3 -= 8;
+    if (task->tData2 > 0xF0)
+        task->tData2 = 0xF0;
+    if (task->tData3 < 0)
+        task->tData3 = 0;
+    mergedValue = *(s32*)(&task->tData2);
     if (mergedValue == 0xF0)
         task->tState++;
 
@@ -1943,9 +2226,9 @@ bool8 Phase2_Mugshot_Func4(struct Task *task)
     }
 
     task->tState++;
-    task->data[1] = 0;
-    task->data[2] = 0;
-    task->data[3] = 0;
+    task->tData1 = 0;
+    task->tData2 = 0;
+    task->tData3 = 0;
     sTransitionStructPtr->field_18 -= 8;
     sTransitionStructPtr->field_1A += 8;
 
@@ -1985,8 +2268,8 @@ bool8 Phase2_Mugshot_Func6(struct Task *task)
         SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
         SetGpuReg(REG_OFFSET_BLDY, 0);
         task->tState++;
-        task->data[3] = 0;
-        task->data[4] = 0;
+        task->tData3 = 0;
+        task->tData4 = 0;
         sTransitionStructPtr->BLDCNT = 0xBF;
         SetVBlankCallback(VBlankCB1_Phase2_Mugshots);
     }
@@ -2002,15 +2285,15 @@ bool8 Phase2_Mugshot_Func7(struct Task *task)
     sTransitionStructPtr->field_18 -= 8;
     sTransitionStructPtr->field_1A += 8;
 
-    if (task->data[4] < 0x50)
-        task->data[4] += 2;
-    if (task->data[4] > 0x50)
-        task->data[4] = 0x50;
+    if (task->tData4 < 0x50)
+        task->tData4 += 2;
+    if (task->tData4 > 0x50)
+        task->tData4 = 0x50;
 
-    if (++task->data[3] & 1)
+    if (++task->tData3 & 1)
     {
         s16 i;
-        for (i = 0, r6 = FALSE; i <= task->data[4]; i++)
+        for (i = 0, r6 = FALSE; i <= task->tData4; i++)
         {
             s16 index1 = 0x50 - i;
             s16 index2 = 0x50 + i;
@@ -2027,7 +2310,7 @@ bool8 Phase2_Mugshot_Func7(struct Task *task)
         }
     }
 
-    if (task->data[4] == 0x50 && !r6)
+    if (task->tData4 == 0x50 && !r6)
         task->tState++;
 
     sTransitionStructPtr->VBlank_DMA++;
@@ -2039,7 +2322,7 @@ bool8 Phase2_Mugshot_Func8(struct Task *task)
     sTransitionStructPtr->VBlank_DMA = FALSE;
     BlendPalettes(-1, 0x10, 0x7FFF);
     sTransitionStructPtr->BLDCNT = 0xFF;
-    task->data[3] = 0;
+    task->tData3 = 0;
 
     task->tState++;
     return TRUE;
@@ -2049,9 +2332,9 @@ bool8 Phase2_Mugshot_Func9(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
-    task->data[3]++;
-    memset(gUnknown_02038C28[0], task->data[3], 0x140);
-    if (task->data[3] > 15)
+    task->tData3++;
+    memset(gUnknown_02038C28[0], task->tData3, 0x140);
+    if (task->tData3 > 15)
         task->tState++;
 
     sTransitionStructPtr->VBlank_DMA++;
@@ -2216,8 +2499,8 @@ bool8 Phase2_Slice_Func1(struct Task *task)
     sub_8149F08();
     dp12_8087EA4();
 
-    task->data[2] = 256;
-    task->data[3] = 1;
+    task->tData2 = 256;
+    task->tData3 = 1;
     sTransitionStructPtr->WININ = 63;
     sTransitionStructPtr->WINOUT = 0;
     sTransitionStructPtr->WIN0V = 160;
@@ -2245,13 +2528,13 @@ bool8 Phase2_Slice_Func2(struct Task *task)
 
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
-    task->data[1] += (task->data[2] >> 8);
-    if (task->data[1] > 0xF0)
-        task->data[1] = 0xF0;
-    if (task->data[2] <= 0xFFF)
-        task->data[2] += task->data[3];
-    if (task->data[3] < 128)
-        task->data[3] <<= 1; // multiplying by two
+    task->tData1 += (task->tData2 >> 8);
+    if (task->tData1 > 0xF0)
+        task->tData1 = 0xF0;
+    if (task->tData2 <= 0xFFF)
+        task->tData2 += task->tData3;
+    if (task->tData3 < 128)
+        task->tData3 <<= 1; // multiplying by two
 
     for (i = 0; i < 160; i++)
     {
@@ -2259,17 +2542,17 @@ bool8 Phase2_Slice_Func2(struct Task *task)
         u16* storeLoc2 = &gUnknown_02038C28[0][i + 160];
         if (1 & i)
         {
-            *storeLoc1 = sTransitionStructPtr->field_14 + task->data[1];
-            *storeLoc2 = 0xF0 - task->data[1];
+            *storeLoc1 = sTransitionStructPtr->field_14 + task->tData1;
+            *storeLoc2 = 0xF0 - task->tData1;
         }
         else
         {
-            *storeLoc1 = sTransitionStructPtr->field_14 - task->data[1];
-            *storeLoc2 = (task->data[1] << 8) | (0xF1);
+            *storeLoc1 = sTransitionStructPtr->field_14 - task->tData1;
+            *storeLoc2 = (task->tData1 << 8) | (0xF1);
         }
     }
 
-    if (task->data[1] > 0xEF)
+    if (task->tData1 > 0xEF)
         task->tState++;
 
     sTransitionStructPtr->VBlank_DMA++;
@@ -2307,12 +2590,12 @@ void HBlankCB_Phase2_Slice(void)
     }
 }
 
-void Phase2Task_25(u8 taskId)
+void Phase2Task_ShredSplit(u8 taskId)
 {
-    while (sPhase2_25_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+    while (sPhase2_ShredSplit_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_25_Func1(struct Task *task)
+bool8 Phase2_ShredSplit_Func1(struct Task *task)
 {
     u16 i;
 
@@ -2334,9 +2617,9 @@ bool8 Phase2_25_Func1(struct Task *task)
         gUnknown_02038C28[0][0x280 + i] = 1;
     }
 
-    task->data[4] = 0;
-    task->data[5] = 0;
-    task->data[6] = 7;
+    task->tData4 = 0;
+    task->tData5 = 0;
+    task->tData6 = 7;
 
     EnableInterrupts(INTR_FLAG_HBLANK);
 
@@ -2347,7 +2630,7 @@ bool8 Phase2_25_Func1(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_25_Func2(struct Task *task)
+bool8 Phase2_ShredSplit_Func2(struct Task *task)
 {
     u16 i, j, k;
     u8 arr1[ARRAY_COUNT(gUnknown_085C8C64)];
@@ -2362,7 +2645,7 @@ bool8 Phase2_25_Func2(struct Task *task)
     sTransitionStructPtr->VBlank_DMA = FALSE;
     var = 0;
 
-    for (i = 0; i <= task->data[5]; i++)
+    for (i = 0; i <= task->tData5; i++)
     {
         for (j = 0; j < 2; j++)
         {
@@ -2433,10 +2716,10 @@ bool8 Phase2_25_Func2(struct Task *task)
         }
     }
 
-    if (--task->data[4] < 0)
-        task->data[4] = 0;
-    if (task->data[4] <= 0 && task->data[5] + 1 <= 20)
-        task->data[4] = task->data[6], task->data[5]++;
+    if (--task->tData4 < 0)
+        task->tData4 = 0;
+    if (task->tData4 <= 0 && task->tData5 + 1 <= 20)
+        task->tData4 = task->tData6, task->tData5++;
     if (var > 0x9F)
         task->tState++;
 
@@ -2444,7 +2727,7 @@ bool8 Phase2_25_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_25_Func3(struct Task *task)
+bool8 Phase2_ShredSplit_Func3(struct Task *task)
 {
     u16 i;
     bool32 done = TRUE;
@@ -2462,11 +2745,11 @@ bool8 Phase2_25_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_25_Func4(struct Task *task)
+bool8 Phase2_ShredSplit_Func4(struct Task *task)
 {
     DmaStop(0);
     sub_8149F84();
-    DestroyTask(FindTaskIdByFunc(Phase2Task_25));
+    DestroyTask(FindTaskIdByFunc(Phase2Task_ShredSplit));
     return FALSE;
 }
 
@@ -2500,16 +2783,16 @@ bool8 Phase2_Blackhole_Func1(struct Task *task)
     SetVBlankCallback(VBlankCB1_Phase2_BigPokeball);
 
     task->tState++;
-    task->data[1] = 1;
-    task->data[2] = 0x100;
-    task->data[7] = 0;
+    task->tData1 = 1;
+    task->tData2 = 0x100;
+    task->tFuncState = 0;
 
     return FALSE;
 }
 
 bool8 Phase2_Blackhole1_Func3(struct Task *task)
 {
-    if (task->data[7] == 1)
+    if (task->tFuncState == 1)
     {
         DmaStop(0);
         SetVBlankCallback(NULL);
@@ -2518,16 +2801,16 @@ bool8 Phase2_Blackhole1_Func3(struct Task *task)
     else
     {
         sTransitionStructPtr->VBlank_DMA = FALSE;
-        if (task->data[2] < 0x400)
-            task->data[2] += 0x80;
-        if (task->data[1] < 0xA0)
-            task->data[1] += (task->data[2] >> 8);
-        if (task->data[1] > 0xA0)
-            task->data[1] = 0xA0;
-        sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]);
-        if (task->data[1] == 0xA0)
+        if (task->tData2 < 0x400)
+            task->tData2 += 0x80;
+        if (task->tData1 < 0xA0)
+            task->tData1 += (task->tData2 >> 8);
+        if (task->tData1 > 0xA0)
+            task->tData1 = 0xA0;
+        sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->tData1);
+        if (task->tData1 == 0xA0)
         {
-            task->data[7] = 1;
+            task->tFuncState = 1;
             sub_8149F84();
         }
         else
@@ -2542,19 +2825,19 @@ bool8 Phase2_Blackhole1_Func3(struct Task *task)
 bool8 Phase2_Blackhole1_Func2(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
-    if (task->data[7] == 0)
+    if (task->tFuncState == 0)
     {
-        task->data[7]++;
-        task->data[1] = 0x30;
-        task->data[6] = 0;
+        task->tFuncState++;
+        task->tData1 = 0x30;
+        task->tData6 = 0;
     }
-    task->data[1] += gUnknown_085C8C80[task->data[6]];
-    task->data[6] = (task->data[6] + 1) % 2;
-    sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]);
-    if (task->data[1] < 9)
+    task->tData1 += gUnknown_085C8C80[task->tData6];
+    task->tData6 = (task->tData6 + 1) % 2;
+    sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->tData1);
+    if (task->tData1 < 9)
     {
         task->tState++;
-        task->data[7] = 0;
+        task->tFuncState = 0;
     }
 
     sTransitionStructPtr->VBlank_DMA++;
@@ -2567,40 +2850,40 @@ bool8 Phase2_Blackhole2_Func2(struct Task *task)
     s16 amplitude;
 
     sTransitionStructPtr->VBlank_DMA = FALSE;
-    if (task->data[7] == 0)
+    if (task->tFuncState == 0)
     {
-        task->data[7]++;
-        task->data[5] = 2;
-        task->data[6] = 2;
+        task->tFuncState++;
+        task->tData5 = 2;
+        task->tData6 = 2;
     }
-    if (task->data[1] > 0xA0)
-        task->data[1] = 0xA0;
+    if (task->tData1 > 0xA0)
+        task->tData1 = 0xA0;
 
-    sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->data[1]);
-    if (task->data[1] == 0xA0)
+    sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->tData1);
+    if (task->tData1 == 0xA0)
     {
         DmaStop(0);
         sub_8149F84();
         DestroyTask(FindTaskIdByFunc(task->func));
     }
 
-    index = task->data[5];
-    if ((task->data[5] & 0xFF) <= 128)
+    index = task->tData5;
+    if ((task->tData5 & 0xFF) <= 128)
     {
-        amplitude = task->data[6];
-        task->data[5] += 8;
+        amplitude = task->tData6;
+        task->tData5 += 8;
     }
     else
     {
-        amplitude = task->data[6] - 1;
-        task->data[5] += 16;
+        amplitude = task->tData6 - 1;
+        task->tData5 += 16;
     }
-    task->data[1] += Sin(index & 0xFF, amplitude);
+    task->tData1 += Sin(index & 0xFF, amplitude);
 
-    if (task->data[1] <= 0)
-        task->data[1] = 1;
-    if (task->data[5] > 0xFE)
-        task->data[5] >>= 8, task->data[6]++;
+    if (task->tData1 <= 0)
+        task->tData1 = 1;
+    if (task->tData5 > 0xFE)
+        task->tData5 >>= 8, task->tData6++;
 
     sTransitionStructPtr->VBlank_DMA++;
     return FALSE;
@@ -2621,7 +2904,7 @@ bool8 Phase2_RectangularSpiral_Func1(struct Task *task)
     CpuFill16(0xF000, dst1, 0x800);
     LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
 
-    task->data[3] = 1;
+    task->tData3 = 1;
     task->tState++;
 
     sRectangularSpiralTransition[0].field_0 = 0;
@@ -2775,21 +3058,21 @@ bool8 Phase2_Groudon_Func3(struct Task *task)
     LZ77UnCompVram(gUnknown_085BEA88, dst1);
 
     task->tState++;
-    task->data[1] = 0;
+    task->tData1 = 0;
     return FALSE;
 }
 
 bool8 Phase2_Groudon_Func4(struct Task *task)
 {
-    if (task->data[1] % 3 == 0)
+    if (task->tData1 % 3 == 0)
     {
-        u16 var = (task->data[1] % 30) / 3;
+        u16 var = (task->tData1 % 30) / 3;
         LoadPalette(gUnknown_085BF0A0 + (var * 16), 0xF0, 0x20);
     }
-    if (++task->data[1] > 58)
+    if (++task->tData1 > 58)
     {
         task->tState++;
-        task->data[1] = 0;
+        task->tData1 = 0;
     }
 
     return FALSE;
@@ -2797,18 +3080,951 @@ bool8 Phase2_Groudon_Func4(struct Task *task)
 
 bool8 Phase2_Groudon_Func5(struct Task *task)
 {
-    if (task->data[1] % 5 == 0)
+    if (task->tData1 % 5 == 0)
     {
-        s16 var = task->data[1] / 5;
+        s16 var = task->tData1 / 5;
         LoadPalette(gUnknown_085BF2A0 + (var * 16), 0xF0, 0x20);
     }
-    if (++task->data[1] > 68)
+    if (++task->tData1 > 68)
     {
         task->tState++;
-        task->data[1] = 0;
+        task->tData1 = 0;
         task->tFrames = 30;
     }
 
     return FALSE;
 }
 
+void Phase2Task_Rayquaza(u8 taskId)
+{
+    while (sPhase2_Rayquaza_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Rayquaza_Func3(struct Task *task)
+{
+    u16 *dst1, *dst2;
+    u16 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+
+    SetGpuReg(REG_OFFSET_BG0CNT, 0x9A08);
+    sub_8149F58(&dst1, &dst2);
+    CpuFill16(0, dst1, 0x800);
+    CpuCopy16(gUnknown_085BF6A0, dst2, 0x2000);
+
+    sTransitionStructPtr->field_20 = 0;
+    task->tState++;
+    LoadPalette(gUnknown_085BF4A0 + 0x50, 0xF0, 0x20);
+
+    for (i = 0; i < 160; i++)
+    {
+        gUnknown_02038C28[0][i] = 0;
+        gUnknown_02038C28[1][i] = 0x100;
+    }
+
+    SetVBlankCallback(VBlankCB_Phase2_Rayquaza);
+    return FALSE;
+}
+
+bool8 Phase2_Rayquaza_Func4(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    CpuCopy16(gUnknown_085C6BE0, dst1, 0x1000);
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Rayquaza_Func5(struct Task *task)
+{
+    if ((task->tData1 % 4) == 0)
+    {
+        u16 value = task->tData1 / 4;
+        const u16 *palPtr = &gUnknown_085BF4A0[(value + 5) * 16];
+        LoadPalette(palPtr, 0xF0, 0x20);
+    }
+    if (++task->tData1 > 40)
+    {
+        task->tState++;
+        task->tData1 = 0;
+    }
+
+    return FALSE;
+}
+
+bool8 Phase2_Rayquaza_Func6(struct Task *task)
+{
+    if (++task->tData1 > 20)
+    {
+        task->tState++;
+        task->tData1 = 0;
+        BeginNormalPaletteFade(0xFFFF8000, 2, 0, 0x10, 0);
+    }
+
+    return FALSE;
+}
+
+bool8 Phase2_Rayquaza_Func7(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        sTransitionStructPtr->field_20 = 1;
+        task->tState++;
+    }
+
+    return FALSE;
+}
+
+bool8 Phase2_Rayquaza_Func8(struct Task *task)
+{
+    BlendPalettes(0x00007FFF, 8, 0);
+    BlendPalettes(0xFFFF8000, 0, 0);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_Rayquaza_Func9(struct Task *task)
+{
+    if ((task->tData1 % 3) == 0)
+    {
+        u16 value = task->tData1 / 3;
+        const u16 *palPtr = &gUnknown_085BF4A0[(value + 0) * 16];
+        LoadPalette(palPtr, 0xF0, 0x20);
+    }
+    if (++task->tData1 >= 40)
+    {
+        u16 i;
+
+        sTransitionStructPtr->WININ = 0;
+        sTransitionStructPtr->WINOUT = 63;
+        sTransitionStructPtr->field_6 = 240;
+        sTransitionStructPtr->WIN0V = 160;
+
+        for (i = 0; i < 160; i++)
+        {
+            gUnknown_02038C28[1][i] = 0;
+        }
+
+        SetVBlankCallback(VBlankCB1_Phase2_BigPokeball);
+        task->tState++;
+        task->tData2 = 0x100;
+        task->tFuncState = 0;
+        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON);
+    }
+
+    return FALSE;
+}
+
+void VBlankCB_Phase2_Rayquaza(void)
+{
+    void *dmaSrc;
+
+    DmaStop(0);
+    VBlankCB_BattleTransition();
+
+    if (sTransitionStructPtr->field_20 == 0)
+        dmaSrc = gUnknown_02038C28[0];
+    else if (sTransitionStructPtr->field_20 == 1)
+        dmaSrc = gUnknown_02038C28[1];
+    else
+        dmaSrc = gUnknown_02038C28[0];
+
+    DmaSet(0, dmaSrc, &REG_BG0VOFS, 0xA2400001);
+}
+
+void Phase2Task_WhiteFade(u8 taskId)
+{
+    while (sPhase2_WhiteFade_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_WhiteFade_Func1(struct Task *task)
+{
+    u16 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+
+    sTransitionStructPtr->BLDCNT = 0xBF;
+    sTransitionStructPtr->BLDY = 0;
+    sTransitionStructPtr->WININ = 0x1E;
+    sTransitionStructPtr->WINOUT = 0x3F;
+    sTransitionStructPtr->WIN0V = 0xA0;
+
+    for (i = 0; i < 160; i++)
+    {
+        gUnknown_02038C28[1][i] = 0;
+        gUnknown_02038C28[1][i + 160] = 0xF0;
+    }
+
+    EnableInterrupts(INTR_FLAG_HBLANK);
+    SetHBlankCallback(HBlankCB_Phase2_WhiteFade);
+    SetVBlankCallback(VBlankCB0_Phase2_WhiteFade);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_WhiteFade_Func2(struct Task *task)
+{
+    s16 i, posY;
+    s16 arr1[ARRAY_COUNT(sUnknown_085C8DA0)];
+    struct Sprite *sprite;
+
+    memcpy(arr1, sUnknown_085C8DA0, sizeof(sUnknown_085C8DA0));
+    for (i = 0, posY = 0; i < 8; i++, posY += 0x14)
+    {
+        sprite = &gSprites[CreateInvisibleSprite(sub_8149864)];
+        sprite->pos1.x = 0xF0;
+        sprite->pos1.y = posY;
+        sprite->data[5] = arr1[i];
+    }
+    sprite->data[6]++;
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_WhiteFade_Func3(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+    if (sTransitionStructPtr->field_20 > 7)
+    {
+        BlendPalettes(-1, 0x10, 0x7FFF);
+        task->tState++;
+    }
+    return FALSE;
+}
+
+bool8 Phase2_WhiteFade_Func4(struct Task *task)
+{
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    DmaStop(0);
+    SetVBlankCallback(0);
+    SetHBlankCallback(0);
+
+    sTransitionStructPtr->field_6 = 0xF0;
+    sTransitionStructPtr->BLDY = 0;
+    sTransitionStructPtr->BLDCNT = 0xFF;
+    sTransitionStructPtr->WININ = 0x3F;
+
+    SetVBlankCallback(VBlankCB1_Phase2_WhiteFade);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_WhiteFade_Func5(struct Task *task)
+{
+   if (++sTransitionStructPtr->BLDY > 16)
+   {
+       sub_8149F84();
+       DestroyTask(FindTaskIdByFunc(Phase2Task_WhiteFade));
+   }
+   return FALSE;
+}
+
+void VBlankCB0_Phase2_WhiteFade(void)
+{
+    DmaStop(0);
+    VBlankCB_BattleTransition();
+    REG_BLDCNT = sTransitionStructPtr->BLDCNT;
+    REG_WININ = sTransitionStructPtr->WININ;
+    REG_WINOUT = sTransitionStructPtr->WINOUT;
+    REG_WIN0V = sTransitionStructPtr->WIN0V;
+    if (sTransitionStructPtr->VBlank_DMA)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 640);
+    DmaSet(0, &gUnknown_02038C28[1][160], &REG_WIN0H, 0xA2400001);
+}
+
+void VBlankCB1_Phase2_WhiteFade(void)
+{
+    VBlankCB_BattleTransition();
+    REG_BLDY = sTransitionStructPtr->BLDY;
+    REG_BLDCNT = sTransitionStructPtr->BLDCNT;
+    REG_WININ = sTransitionStructPtr->WININ;
+    REG_WINOUT = sTransitionStructPtr->WINOUT;
+    REG_WIN0H = sTransitionStructPtr->field_6;
+    REG_WIN0V = sTransitionStructPtr->WIN0V;
+}
+
+void HBlankCB_Phase2_WhiteFade(void)
+{
+    REG_BLDY = gUnknown_02038C28[1][REG_VCOUNT];
+}
+
+void sub_8149864(struct Sprite *sprite)
+{
+    if (sprite->data[5])
+    {
+        sprite->data[5]--;
+        if (sprite->data[6])
+            sTransitionStructPtr->VBlank_DMA = 1;
+    }
+    else
+    {
+        u16 i;
+        u16* ptr1 = &gUnknown_02038C28[0][sprite->pos1.y];
+        u16* ptr2 = &gUnknown_02038C28[0][sprite->pos1.y + 160];
+        for (i = 0; i < 20; i++)
+        {
+            ptr1[i] = sprite->data[0] >> 8;
+            ptr2[i] = (u8)(sprite->pos1.x);
+        }
+        if (sprite->pos1.x == 0 && sprite->data[0] == 0x1000)
+            sprite->data[1] = 1;
+
+        sprite->pos1.x -= 16;
+        sprite->data[0] += 0x80;
+
+        if (sprite->pos1.x < 0)
+            sprite->pos1.x = 0;
+        if (sprite->data[0] > 0x1000)
+            sprite->data[0] = 0x1000;
+
+        if (sprite->data[6])
+            sTransitionStructPtr->VBlank_DMA = 1;
+
+        if (sprite->data[1])
+        {
+            if (sprite->data[6] == 0 || (sTransitionStructPtr->field_20 > 6 && sprite->data[2]++ > 7))
+            {
+                sTransitionStructPtr->field_20++;
+                DestroySprite(sprite);
+            }
+        }
+    }
+}
+
+void Phase2Task_GridSquares(u8 taskId)
+{
+    while (sPhase2_GridSquares_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_GridSquares_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    CpuSet(sShrinkingBoxTileset, dst2, 0x10);
+    CpuFill16(0xF000, dst1, 0x800);
+    LoadPalette(gFieldEffectObjectPalette10, 0xF0, 0x20);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_GridSquares_Func2(struct Task *task)
+{
+    u16* dst1;
+
+    if (task->tData1 == 0)
+    {
+        sub_8149F40(&dst1);
+        task->tData1 = 3;
+        task->tData2++;
+        CpuSet(sShrinkingBoxTileset + (task->tData2 * 8), dst1, 0x10);
+        if (task->tData2 > 0xD)
+        {
+            task->tState++;
+            task->tData1 = 16;
+        }
+    }
+
+    task->tData1--;
+    return FALSE;
+}
+
+bool8 Phase2_GridSquares_Func3(struct Task *task)
+{
+    if (--task->tData1 == 0)
+    {
+        sub_8149F84();
+        DestroyTask(FindTaskIdByFunc(Phase2Task_GridSquares));
+    }
+    return FALSE;
+}
+
+void Phase2Task_Shards(u8 taskId)
+{
+    while (sPhase2_Shards_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_Shards_Func1(struct Task *task)
+{
+    u16 i;
+
+    sub_8149F08();
+    dp12_8087EA4();
+
+    sTransitionStructPtr->WININ = 0x3F;
+    sTransitionStructPtr->WINOUT = 0;
+    sTransitionStructPtr->WIN0V = 0xA0;
+
+    for (i = 0; i < 160; i++)
+    {
+        gUnknown_02038C28[0][i] = 0xF0;
+    }
+
+    CpuSet(gUnknown_02038C28[0], gUnknown_02038C28[1], 0xA0);
+    SetVBlankCallback(VBlankCB_Phase2_Shards);
+
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_Shards_Func2(struct Task *task)
+{
+    sub_814A1AC(sTransitionStructPtr->data,
+                sUnknown_085C8DD0[task->tData1][0],
+                sUnknown_085C8DD0[task->tData1][1],
+                sUnknown_085C8DD0[task->tData1][2],
+                sUnknown_085C8DD0[task->tData1][3],
+                1, 1);
+    task->tData2 = sUnknown_085C8DD0[task->tData1][4];
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_Shards_Func3(struct Task *task)
+{
+    s16 i;
+    bool8 nextFunc;
+
+    sTransitionStructPtr->VBlank_DMA = 0;
+
+    for (i = 0, nextFunc = FALSE; i < 16; i++)
+    {
+        s16 r3 = gUnknown_02038C28[0][sTransitionStructPtr->data[3]] >> 8;
+        s16 r4 = gUnknown_02038C28[0][sTransitionStructPtr->data[3]] & 0xFF;
+        if (task->tData2 == 0)
+        {
+            if (r3 < sTransitionStructPtr->data[2])
+                r3 = sTransitionStructPtr->data[2];
+            if (r3 > r4)
+                r3 = r4;
+        }
+        else
+        {
+            if (r4 > sTransitionStructPtr->data[2])
+                r4 = sTransitionStructPtr->data[2];
+            if (r4 <= r3)
+                r4 = r3;
+        }
+        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (r4) | (r3 << 8);
+        if (nextFunc)
+        {
+            task->tState++;
+            break;
+        }
+        else
+            nextFunc = sub_814A228(sTransitionStructPtr->data, 1, 1);
+    }
+
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+bool8 Phase2_Shards_Func4(struct Task *task)
+{
+    if (++task->tData1 < 7)
+    {
+        task->tState++;
+        task->tData3 = sUnknown_085C8E16[task->tData1 - 1];
+        return TRUE;
+    }
+    else
+    {
+        DmaStop(0);
+        sub_8149F84();
+        DestroyTask(FindTaskIdByFunc(Phase2Task_Shards));
+        return FALSE;
+    }
+}
+
+bool8 Phase2_Shards_Func5(struct Task *task)
+{
+    if (--task->tData3 == 0)
+    {
+        task->tState = 1;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+void VBlankCB_Phase2_Shards(void)
+{
+    DmaStop(0);
+    VBlankCB_BattleTransition();
+    if (sTransitionStructPtr->VBlank_DMA)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+    REG_WININ = sTransitionStructPtr->WININ;
+    REG_WINOUT = sTransitionStructPtr->WINOUT;
+    REG_WIN0V = sTransitionStructPtr->WIN0V;
+    REG_WIN0H = gUnknown_02038C28[1][0];
+    DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
+}
+
+// sub-task for phase2
+#undef tData1
+#undef tData2
+#undef tData3
+#undef tData4
+#undef tData5
+#undef tData6
+#undef tFuncState
+#undef tFrames
+#undef tOpponentSpriteId
+#undef tPlayerSpriteId
+#undef tMugshotId
+
+// sub-task for sub-task phase
+#define tData1      data[1]
+#define tData2      data[2]
+#define tData3      data[3]
+#define tData4      data[4]
+#define tData5      data[5]
+#define tData6      data[6]
+#define tData7      data[7]
+
+void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4)
+{
+    u8 taskId = CreateTask(Phase1_Task_RunFuncs, 3);
+    gTasks[taskId].tData1 = a0;
+    gTasks[taskId].tData2 = a1;
+    gTasks[taskId].tData3 = a2;
+    gTasks[taskId].tData4 = a3;
+    gTasks[taskId].tData5 = a4;
+    gTasks[taskId].tData6 = a0;
+}
+
+bool8 IsPhase1Done(void)
+{
+    if (FindTaskIdByFunc(Phase1_Task_RunFuncs) == 0xFF)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void Phase1_Task_RunFuncs(u8 taskId)
+{
+    while (sPhase1_TransitionAll_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase1_TransitionAll_Func1(struct Task *task)
+{
+    if (task->tData6 == 0 || --task->tData6 == 0)
+    {
+        task->tData6 = task->tData1;
+        task->tData7 += task->tData4;
+        if (task->tData7 > 16)
+            task->tData7 = 16;
+        BlendPalettes(-1, task->tData7, 0x2D6B);
+    }
+    if (task->tData7 > 15)
+    {
+        task->tState++;
+        task->tData6 = task->tData2;
+    }
+    return FALSE;
+}
+
+bool8 Phase1_TransitionAll_Func2(struct Task *task)
+{
+    if (task->tData6 == 0 || --task->tData6 == 0)
+    {
+        task->tData6 = task->tData2;
+        task->tData7 -= task->tData5;
+        if (task->tData7 < 0)
+            task->tData7 = 0;
+        BlendPalettes(-1, task->tData7, 0x2D6B);
+    }
+    if (task->tData7 == 0)
+    {
+        if (--task->tData3 == 0)
+            DestroyTask(FindTaskIdByFunc(Phase1_Task_RunFuncs));
+        else
+        {
+            task->tData6 = task->tData1;
+            task->tState = 0;
+        }
+    }
+    return FALSE;
+}
+
+#undef tData1
+#undef tData2
+#undef tData3
+#undef tData4
+#undef tData5
+#undef tData6
+#undef tData7
+
+void sub_8149F08(void)
+{
+    memset(sTransitionStructPtr, 0, sizeof(*sTransitionStructPtr));
+    sub_8089C08(&sTransitionStructPtr->field_14, &sTransitionStructPtr->field_16);
+}
+
+void VBlankCB_BattleTransition(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_8149F40(u16 **a0)
+{
+    u16 reg, *vram;
+
+    reg = REG_BG0CNT >> 2;
+    reg <<= 0xE;
+    vram = (u16*)(VRAM + reg);
+
+    *a0 = vram;
+}
+
+void sub_8149F58(u16 **a0, u16 **a1)
+{
+    u16 reg0, reg1, *vram0, *vram1;
+
+    reg0 = REG_BG0CNT >> 8;
+    reg1 = REG_BG0CNT >> 2;
+
+    reg0 <<= 0xB;
+    reg1 <<= 0xE;
+
+    vram0 = (u16*)(VRAM + reg0);
+    *a0 = vram0;
+
+    vram1 = (u16*)(VRAM + reg1);
+    *a1 = vram1;
+}
+
+void sub_8149F84(void)
+{
+    BlendPalettes(-1, 0x10, 0);
+}
+
+void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize)
+{
+    u8 i;
+    for (i = 0; arrSize > 0; arrSize--, i++, index += indexIncrementer)
+    {
+        array[i] = sinAdd + Sin(0xFF & index, amplitude);
+    }
+}
+
+void sub_814A014(u16 *array, s16 a1, s16 a2, s16 a3)
+{
+    s16 i;
+
+    memset(array, 0xA, 160 * sizeof(s16));
+    for (i = 0; i < 64; i++)
+    {
+        s16 sinResult, cosResult;
+        s16 toStoreOrr, r2, r3, toStore, r7, r8;
+
+        sinResult = Sin(i, a3);
+        cosResult = Cos(i, a3);
+
+        toStoreOrr = a1 - sinResult;
+        toStore = a1 + sinResult;
+        r7 = a2 - cosResult;
+        r8 = a2 + cosResult;
+
+        if (toStoreOrr < 0)
+            toStoreOrr = 0;
+        if (toStore > 0xF0)
+            toStore = 0xF0;
+        if (r7 < 0)
+            r7 = 0;
+        if (r8 > 0x9F)
+            r8 = 0x9F;
+
+        toStore |= (toStoreOrr << 8);
+        array[r7] = toStore;
+        array[r8] = toStore;
+
+        cosResult = Cos(i + 1, a3);
+        r3 = a2 - cosResult;
+        r2 = a2 + cosResult;
+
+        if (r3 < 0)
+            r3 = 0;
+        if (r2 > 0x9F)
+            r2 = 0x9F;
+
+        while (r7 > r3)
+            array[--r7] = toStore;
+        while (r7 < r3)
+            array[++r7] = toStore;
+
+        while (r8 > r2)
+            array[--r8] = toStore;
+        while (r8 < r2)
+            array[++r8] = toStore;
+    }
+}
+
+void sub_814A1AC(s16 *data, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6)
+{
+    data[0] = a1;
+    data[1] = a2;
+    data[2] = a1;
+    data[3] = a2;
+    data[4] = a3;
+    data[5] = a4;
+    data[6] = a5;
+    data[7] = a6;
+    data[8] = a3 - a1;
+    if (data[8] < 0)
+    {
+        data[8] = -data[8];
+        data[6] = -a5;
+    }
+    data[9] = a4 - a2;
+    if (data[9] < 0)
+    {
+        data[9] = -data[9];
+        data[7] = -a6;
+    }
+    data[10] = 0;
+}
+
+bool8 sub_814A228(s16 *data, bool8 a1, bool8 a2)
+{
+    u8 var;
+    if (data[8] > data[9])
+    {
+        data[2] += data[6];
+        data[10] += data[9];
+        if (data[10] > data[8])
+        {
+            data[3] += data[7];
+            data[10] -= data[8];
+        }
+    }
+    else
+    {
+        data[3] += data[7];
+        data[10] += data[8];
+        if (data[10] > data[9])
+        {
+            data[2] += data[6];
+            data[10] -= data[9];
+        }
+    }
+    var = 0;
+    if ((data[6] > 0 && data[2] >= data[4]) || (data[6] < 0 && data[2] <= data[4]))
+    {
+        var++;
+        if (a1)
+            data[2] = data[4];
+    }
+    if ((data[7] > 0 && data[3] >= data[5]) || (data[7] < 0 && data[3] <= data[5]))
+    {
+        var++;
+        if (a2)
+            data[3] = data[5];
+    }
+
+    if (var == 2)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+// sub-task for phase2 of a couple of new transitions
+#define tData1      data[1]
+#define tData2      data[2]
+#define tData3      data[3]
+#define tData4      data[4]
+#define tData5      data[5]
+#define tData6      data[6]
+#define tData7      data[7]
+
+bool8 Phase2_29_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_814669C(task);
+    sub_8149F58(&dst1, &dst2);
+    CpuFill16(0, dst1, 0x800);
+    LZ77UnCompVram(gUnknown_085C7C00, dst2);
+    LoadPalette(gUnknown_085C7BE0, 0xF0, 0x20);
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_29_Func2(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LZ77UnCompVram(gUnknown_085C828C, dst1);
+    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 0x84, task->tData5, 160);
+
+    task->tState++;
+    return TRUE;
+}
+
+void Phase2Task_29(u8 taskId)
+{
+    while (sPhase2_29_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void Phase2Task_30(u8 taskId)
+{
+    while (sPhase2_30_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+bool8 Phase2_30_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F08();
+    dp12_8087EA4();
+    ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_WIN1_ON);
+    task->data[2] = 0x2000;
+    task->data[1] = 0x7FFF;
+    task->data[5] = 0;
+    task->data[6] = 16;
+    task->data[7] = 2560;
+    sTransitionStructPtr->BLDCNT = 0x3F41;
+    sTransitionStructPtr->BLDALPHA = (task->tData6 << 8) | (task->tData5);
+    REG_BLDCNT = sTransitionStructPtr->BLDCNT;
+    REG_BLDALPHA = sTransitionStructPtr->BLDALPHA;
+    sub_8149F58(&dst1, &dst2);
+    CpuFill16(0, dst1, 0x800);
+    LZ77UnCompVram(gUnknown_085C7C00, dst2);
+    LoadPalette(gUnknown_085C7BE0, 0xF0, 0x20);
+    sTransitionStructPtr->field_16 = 0;
+
+    task->tState++;
+    return FALSE;
+}
+
+bool8 Phase2_30_Func2(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LZ77UnCompVram(gUnknown_085C828C, dst1);
+
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_30_Func3(struct Task *task)
+{
+    u8 i;
+
+    for (i = 0; i < 160; i++)
+    {
+        gUnknown_02038C28[1][i] = sTransitionStructPtr->field_16;
+    }
+
+    SetVBlankCallback(VBlankCB_Phase2_30);
+    SetHBlankCallback(HBlankCB_Phase2_30);
+    EnableInterrupts(INTR_FLAG_HBLANK);
+
+    task->tState++;
+    return TRUE;
+}
+
+bool8 Phase2_30_Func4(struct Task *task)
+{
+    u8 i;
+    u16 var6, amplitude, var8;
+
+    sTransitionStructPtr->VBlank_DMA = FALSE;
+
+    amplitude = task->tData2 >> 8;
+    var6 = task->tData1;
+    var8 = 384;
+
+    task->tData1 = var6 - task->tData7;
+
+    if (task->tData3 >= 70)
+    {
+        if (task->tData2 - 384 >= 0)
+            task->tData2 -= 384;
+        else
+            task->tData2 = 0;
+    }
+
+    if (task->tData3 >= 0 && task->tData3 % 3 == 0)
+    {
+        if (task->tData5 < 16)
+            task->tData5++;
+        else if (task->tData6 > 0)
+            task->tData6--;
+
+        sTransitionStructPtr->BLDALPHA = (task->tData6 << 8) | (task->tData5);
+    }
+
+    for (i = 0; i < 160; i++, var6 += var8)
+    {
+        s16 index = var6 / 256;
+        asm("");
+        gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(index, amplitude);
+    }
+
+    if (++task->tData3 == 101)
+    {
+        task->tData4++;
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    }
+
+    if (task->tData4 != 0 && !gPaletteFade.active)
+        DestroyTask(FindTaskIdByFunc(Phase2Task_30));
+
+    task->tData7 -= 17;
+    sTransitionStructPtr->VBlank_DMA++;
+    return FALSE;
+}
+
+void VBlankCB_Phase2_30(void)
+{
+    VBlankCB_BattleTransition();
+    REG_BLDCNT = sTransitionStructPtr->BLDCNT;
+    REG_BLDALPHA = sTransitionStructPtr->BLDALPHA;
+
+    if (sTransitionStructPtr->VBlank_DMA)
+        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+}
+
+void HBlankCB_Phase2_30(void)
+{
+    u16 var = gUnknown_02038C28[1][REG_VCOUNT];
+    REG_BG0VOFS = var;
+}
+
+void Phase2Task_31(u8 taskId)
+{
+    while (sPhase2_31_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void Phase2Task_33(u8 taskId)
+{
+    while (sPhase2_33_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+void Phase2Task_32(u8 taskId)
+{
+    while (sPhase2_32_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+#undef tData1
+#undef tData2
+#undef tData3
+#undef tData4
+#undef tData5
+#undef tData6
+#undef tData7
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index 4ad787e1c..062647202 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -5,6 +5,7 @@
 #include "blend_palette.h"
 #include "battle_transition.h"
 #include "task.h"
+#include "battle_transition.h"
 
 // Static type declarations
 
@@ -1392,7 +1393,7 @@ static void sub_80A1818(u16 a1)
 {
     CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
     BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
-    if ((u8)FindTaskIdByFunc(sub_8149DFC) != 0xFF )
+    if ((u8)FindTaskIdByFunc(Phase1_Task_RunFuncs) != 0xFF )
     {
         sSecondaryTilesetCB = sub_80A1670;
         sSecondaryTilesetCBBufferSize = 0x20;
@@ -1402,7 +1403,7 @@ static void sub_80A1818(u16 a1)
 static void sub_80A1884(u16 a1)
 {
     CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
-    if ((u8)FindTaskIdByFunc(sub_8149DFC) == 0xFF )
+    if ((u8)FindTaskIdByFunc(Phase1_Task_RunFuncs) == 0xFF )
     {
         BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
         if (!--sSecondaryTilesetCBBufferSize)
-- 
cgit v1.2.3


From d7644cd3d8070cb12c84263a4707ec0211bd434a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 14 Jan 2018 22:09:35 +0100
Subject: battle transition is decompiled

---
 src/battle_transition.c | 1390 +++++++++++++++++++++++++++++------------------
 src/tileset_anims.c     |    4 +-
 2 files changed, 855 insertions(+), 539 deletions(-)

(limited to 'src')

diff --git a/src/battle_transition.c b/src/battle_transition.c
index def302889..af156da12 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -18,6 +18,8 @@
 #include "malloc.h"
 #include "gpu_regs.h"
 #include "decompress.h"
+#include "bg.h"
+#include "blend_palette.h"
 
 struct TransitionData
 {
@@ -56,6 +58,8 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite);
 
 extern u16 gUnknown_020393A8[];
 extern u16 gUnknown_02038C28[][0x3C0];
+extern u16 gBattle_BG0_X;
+extern u16 gBattle_BG0_Y;
 
 extern const struct OamData gFieldObjectBaseOam_32x32;
 
@@ -64,206 +68,205 @@ extern void sub_80AC3D0(void);
 extern void dp12_8087EA4(void);
 
 // this file's functions
-void LaunchBattleTransitionTask(u8 transitionId);
-void Task_BattleTransitionMain(u8 taskId);
-void Phase1Task_TransitionAll(u8 taskId);
-void Phase2Task_Blur(u8 taskId);
-void Phase2Task_Swirl(u8 taskId);
-void Phase2Task_Shuffle(u8 taskId);
-void Phase2Task_BigPokeball(u8 taskId);
-void Phase2Task_PokeballsTrail(u8 taskId);
-void Phase2Task_Clockwise_BlackFade(u8 taskId);
-void Phase2Task_Ripple(u8 taskId);
-void Phase2Task_Wave(u8 taskId);
-void Phase2Task_Slice(u8 taskId);
-void Phase2Task_WhiteFade(u8 taskId);
-void Phase2Task_GridSquares(u8 taskId);
-void Phase2Task_Shards(u8 taskId);
-void Phase2Task_Sydney(u8 taskId);
-void Phase2Task_Phoebe(u8 taskId);
-void Phase2Task_Glacia(u8 taskId);
-void Phase2Task_Drake(u8 taskId);
-void Phase2Task_Champion(u8 taskId);
-void Phase2Task_Aqua(u8 taskId);
-void Phase2Task_Magma(u8 taskId);
-void Phase2Task_Regice(u8 taskId);
-void Phase2Task_Registeel(u8 taskId);
-void Phase2Task_Regirock(u8 taskId);
-void Phase2Task_Kyogre(u8 taskId);
-void Phase2Task_Groudon(u8 taskId);
-void Phase2Task_Rayquaza(u8 taskId);
-void Phase2Task_ShredSplit(u8 taskId);
-void Phase2Task_Blackhole1(u8 taskId);
-void Phase2Task_Blackhole2(u8 taskId);
-void Phase2Task_RectangularSpiral(u8 taskId);
-void Phase2Task_29(u8 taskId);
-void Phase2Task_30(u8 taskId);
-void Phase2Task_31(u8 taskId);
-void Phase2Task_32(u8 taskId);
-void Phase2Task_33(u8 taskId);
-void VBlankCB_BattleTransition(void);
-void VBlankCB_Phase2_Swirl(void);
-void HBlankCB_Phase2_Swirl(void);
-void VBlankCB_Phase2_Shuffle(void);
-void HBlankCB_Phase2_Shuffle(void);
-void VBlankCB0_Phase2_BigPokeball(void);
-void VBlankCB1_Phase2_BigPokeball(void);
-void VBlankCB_Phase2_Clockwise_BlackFade(void);
-void VBlankCB_Phase2_Ripple(void);
-void HBlankCB_Phase2_Ripple(void);
-void VBlankCB_Phase2_30(void);
-void HBlankCB_Phase2_30(void);
-void VBlankCB_Phase2_Wave(void);
-void VBlankCB_Phase2_Slice(void);
-void HBlankCB_Phase2_Slice(void);
-void VBlankCB0_Phase2_WhiteFade(void);
-void VBlankCB1_Phase2_WhiteFade(void);
-void HBlankCB_Phase2_WhiteFade(void);
-void VBlankCB_Phase2_Shards(void);
-void VBlankCB_Phase2_Rayquaza(void);
-bool8 Phase2_Blur_Func1(struct Task *task);
-bool8 Phase2_Blur_Func2(struct Task *task);
-bool8 Phase2_Blur_Func3(struct Task *task);
-bool8 Phase2_Swirl_Func1(struct Task *task);
-bool8 Phase2_Swirl_Func2(struct Task *task);
-bool8 Phase2_Shuffle_Func1(struct Task *task);
-bool8 Phase2_Shuffle_Func2(struct Task *task);
-bool8 Phase2_Aqua_Func1(struct Task *task);
-bool8 Phase2_Aqua_Func2(struct Task *task);
-bool8 Phase2_Magma_Func1(struct Task *task);
-bool8 Phase2_Magma_Func2(struct Task *task);
-bool8 Phase2_FramesCountdown(struct Task *task);
-bool8 Phase2_Regi_Func1(struct Task *task);
-bool8 Phase2_Regice_Func2(struct Task *task);
-bool8 Phase2_Registeel_Func2(struct Task *task);
-bool8 Phase2_Regirock_Func2(struct Task *task);
-bool8 Phase2_WeatherTrio_Func1(struct Task *task);
-bool8 Phase2_WaitPaletteFade(struct Task *task);
-bool8 Phase2_Kyogre_Func3(struct Task *task);
-bool8 Phase2_Kyogre_Func4(struct Task *task);
-bool8 Phase2_Kyogre_Func5(struct Task *task);
-bool8 Phase2_Groudon_Func3(struct Task *task);
-bool8 Phase2_Groudon_Func4(struct Task *task);
-bool8 Phase2_Groudon_Func5(struct Task *task);
-bool8 Phase2_WeatherDuo_Func6(struct Task *task);
-bool8 Phase2_WeatherDuo_Func7(struct Task *task);
-bool8 Phase2_BigPokeball_Func1(struct Task *task);
-bool8 Phase2_BigPokeball_Func2(struct Task *task);
-bool8 Phase2_BigPokeball_Func3(struct Task *task);
-bool8 Phase2_BigPokeball_Func4(struct Task *task);
-bool8 Phase2_BigPokeball_Func5(struct Task *task);
-bool8 Phase2_BigPokeball_Func6(struct Task *task);
-bool8 Phase2_PokeballsTrail_Func1(struct Task *task);
-bool8 Phase2_PokeballsTrail_Func2(struct Task *task);
-bool8 Phase2_PokeballsTrail_Func3(struct Task *task);
-bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task);
-bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task);
-bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task);
-bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task);
-bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task);
-bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task);
-bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task);
-bool8 Phase2_Ripple_Func1(struct Task *task);
-bool8 Phase2_Ripple_Func2(struct Task *task);
-bool8 Phase2_Wave_Func1(struct Task *task);
-bool8 Phase2_Wave_Func2(struct Task *task);
-bool8 Phase2_Wave_Func3(struct Task *task);
-bool8 Phase2_Slice_Func1(struct Task *task);
-bool8 Phase2_Slice_Func2(struct Task *task);
-bool8 Phase2_Slice_Func3(struct Task *task);
-bool8 Phase2_WhiteFade_Func1(struct Task *task);
-bool8 Phase2_WhiteFade_Func2(struct Task *task);
-bool8 Phase2_WhiteFade_Func3(struct Task *task);
-bool8 Phase2_WhiteFade_Func4(struct Task *task);
-bool8 Phase2_WhiteFade_Func5(struct Task *task);
-bool8 Phase2_GridSquares_Func1(struct Task *task);
-bool8 Phase2_GridSquares_Func2(struct Task *task);
-bool8 Phase2_GridSquares_Func3(struct Task *task);
-bool8 Phase2_Shards_Func1(struct Task *task);
-bool8 Phase2_Shards_Func2(struct Task *task);
-bool8 Phase2_Shards_Func3(struct Task *task);
-bool8 Phase2_Shards_Func4(struct Task *task);
-bool8 Phase2_Shards_Func5(struct Task *task);
-bool8 Phase2_ShredSplit_Func1(struct Task *task);
-bool8 Phase2_ShredSplit_Func2(struct Task *task);
-bool8 Phase2_ShredSplit_Func3(struct Task *task);
-bool8 Phase2_ShredSplit_Func4(struct Task *task);
-bool8 Phase2_Blackhole_Func1(struct Task *task);
-bool8 Phase2_Blackhole1_Func2(struct Task *task);
-bool8 Phase2_Blackhole1_Func3(struct Task *task);
-bool8 Phase2_Blackhole2_Func2(struct Task *task);
-bool8 Phase2_RectangularSpiral_Func1(struct Task *task);
-bool8 Phase2_RectangularSpiral_Func2(struct Task *task);
-bool8 Phase2_RectangularSpiral_Func3(struct Task *task);
-bool8 Phase2_29_Func1(struct Task *task);
-bool8 Phase2_29_Func2(struct Task *task);
-bool8 Phase2_30_Func1(struct Task *task);
-bool8 Phase2_30_Func2(struct Task *task);
-bool8 Phase2_30_Func3(struct Task *task);
-bool8 Phase2_30_Func4(struct Task *task);
-bool8 Phase2_Rayquaza_Func3(struct Task *task);
-bool8 Phase2_Rayquaza_Func4(struct Task *task);
-bool8 Phase2_Rayquaza_Func5(struct Task *task);
-bool8 Phase2_Rayquaza_Func6(struct Task *task);
-bool8 Phase2_Rayquaza_Func7(struct Task *task);
-bool8 Phase2_Rayquaza_Func8(struct Task *task);
-bool8 Phase2_Rayquaza_Func9(struct Task *task);
-bool8 Phase2_31_Func1(struct Task *task);
-bool8 Phase2_31_Func2(struct Task *task);
-bool8 Phase2_31_Func3(struct Task *task);
-bool8 Phase2_31_33_Func5(struct Task *task);
-bool8 Phase2_33_Func1(struct Task *task);
-bool8 Phase2_33_Func2(struct Task *task);
-bool8 Phase2_33_Func3(struct Task *task);
-bool8 Phase2_33_Func4(struct Task *task);
-bool8 Phase2_32_Func1(struct Task *task);
-bool8 Phase2_32_Func2(struct Task *task);
-bool8 Phase2_32_Func3(struct Task *task);
-bool8 Phase2_32_Func4(struct Task *task);
-bool8 Phase2_32_Func5(struct Task *task);
-bool8 Phase2_Mugshot_Func1(struct Task *task);
-bool8 Phase2_Mugshot_Func2(struct Task *task);
-bool8 Phase2_Mugshot_Func3(struct Task *task);
-bool8 Phase2_Mugshot_Func4(struct Task *task);
-bool8 Phase2_Mugshot_Func5(struct Task *task);
-bool8 Phase2_Mugshot_Func6(struct Task *task);
-bool8 Phase2_Mugshot_Func7(struct Task *task);
-bool8 Phase2_Mugshot_Func8(struct Task *task);
-bool8 Phase2_Mugshot_Func9(struct Task *task);
-bool8 Phase2_Mugshot_Func10(struct Task *task);
-void Phase2Task_MugShotTransition(u8 taskId);
-void Mugshots_CreateOpponentPlayerSprites(struct Task *task);
-void VBlankCB0_Phase2_Mugshots(void);
-void VBlankCB1_Phase2_Mugshots(void);
-void HBlankCB_Phase2_Mugshots(void);
-bool8 Transition_Phase1(struct Task *task);
-bool8 Transition_WaitForPhase1(struct Task *task);
-bool8 Transition_Phase2(struct Task *task);
-bool8 Transition_WaitForPhase2(struct Task *task);
-void sub_8149F08(void);
-void sub_8149F84(void);
-void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4);
-void sub_814A014(u16 *a0, s16 a1, s16 a2, s16 a3);
-void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize);
-void sub_8149F58(u16 **a0, u16 **a1);
-void sub_8149F40(u16 **a0);
-void sub_814A1AC(s16 *a0, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6);
-bool8 sub_814A228(s16 *a0, bool8 a1, bool8 a2);
-void sub_8148484(s16 spriteId, s16 value);
-void sub_814849C(s16 spriteId);
-s16 sub_81484B8(s16 spriteId);
-bool8 Phase1_TransitionAll_Func1(struct Task *task);
-bool8 Phase1_TransitionAll_Func2(struct Task *task);
-bool8 IsPhase1Done(void);
-bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1);
-void sub_814713C(struct Sprite *sprite);
-void sub_8148380(struct Sprite *sprite);
-void sub_8149864(struct Sprite *sprite);
-bool8 sub_81483A8(struct Sprite *sprite);
-bool8 sub_81483AC(struct Sprite *sprite);
-bool8 sub_81483F8(struct Sprite *sprite);
-bool8 sub_814842C(struct Sprite *sprite);
-bool8 sub_8148458(struct Sprite *sprite);
+static void LaunchBattleTransitionTask(u8 transitionId);
+static void Task_BattleTransitionMain(u8 taskId);
+static void Phase1Task_TransitionAll(u8 taskId);
+static void Phase2Task_Blur(u8 taskId);
+static void Phase2Task_Swirl(u8 taskId);
+static void Phase2Task_Shuffle(u8 taskId);
+static void Phase2Task_BigPokeball(u8 taskId);
+static void Phase2Task_PokeballsTrail(u8 taskId);
+static void Phase2Task_Clockwise_BlackFade(u8 taskId);
+static void Phase2Task_Ripple(u8 taskId);
+static void Phase2Task_Wave(u8 taskId);
+static void Phase2Task_Slice(u8 taskId);
+static void Phase2Task_WhiteFade(u8 taskId);
+static void Phase2Task_GridSquares(u8 taskId);
+static void Phase2Task_Shards(u8 taskId);
+static void Phase2Task_Sydney(u8 taskId);
+static void Phase2Task_Phoebe(u8 taskId);
+static void Phase2Task_Glacia(u8 taskId);
+static void Phase2Task_Drake(u8 taskId);
+static void Phase2Task_Champion(u8 taskId);
+static void Phase2Task_Aqua(u8 taskId);
+static void Phase2Task_Magma(u8 taskId);
+static void Phase2Task_Regice(u8 taskId);
+static void Phase2Task_Registeel(u8 taskId);
+static void Phase2Task_Regirock(u8 taskId);
+static void Phase2Task_Kyogre(u8 taskId);
+static void Phase2Task_Groudon(u8 taskId);
+static void Phase2Task_Rayquaza(u8 taskId);
+static void Phase2Task_ShredSplit(u8 taskId);
+static void Phase2Task_Blackhole1(u8 taskId);
+static void Phase2Task_Blackhole2(u8 taskId);
+static void Phase2Task_RectangularSpiral(u8 taskId);
+static void Phase2Task_29(u8 taskId);
+static void Phase2Task_30(u8 taskId);
+static void Phase2Task_31(u8 taskId);
+static void Phase2Task_32(u8 taskId);
+static void Phase2Task_33(u8 taskId);
+static void VBlankCB_BattleTransition(void);
+static void VBlankCB_Phase2_Swirl(void);
+static void HBlankCB_Phase2_Swirl(void);
+static void VBlankCB_Phase2_Shuffle(void);
+static void HBlankCB_Phase2_Shuffle(void);
+static void VBlankCB0_Phase2_BigPokeball(void);
+static void VBlankCB1_Phase2_BigPokeball(void);
+static void VBlankCB_Phase2_Clockwise_BlackFade(void);
+static void VBlankCB_Phase2_Ripple(void);
+static void HBlankCB_Phase2_Ripple(void);
+static void VBlankCB_Phase2_30(void);
+static void HBlankCB_Phase2_30(void);
+static void VBlankCB_Phase2_Wave(void);
+static void VBlankCB_Phase2_Slice(void);
+static void HBlankCB_Phase2_Slice(void);
+static void VBlankCB0_Phase2_WhiteFade(void);
+static void VBlankCB1_Phase2_WhiteFade(void);
+static void HBlankCB_Phase2_WhiteFade(void);
+static void VBlankCB_Phase2_Shards(void);
+static void VBlankCB_Phase2_Rayquaza(void);
+static bool8 Phase2_Blur_Func1(struct Task *task);
+static bool8 Phase2_Blur_Func2(struct Task *task);
+static bool8 Phase2_Blur_Func3(struct Task *task);
+static bool8 Phase2_Swirl_Func1(struct Task *task);
+static bool8 Phase2_Swirl_Func2(struct Task *task);
+static bool8 Phase2_Shuffle_Func1(struct Task *task);
+static bool8 Phase2_Shuffle_Func2(struct Task *task);
+static bool8 Phase2_Aqua_Func1(struct Task *task);
+static bool8 Phase2_Aqua_Func2(struct Task *task);
+static bool8 Phase2_Magma_Func1(struct Task *task);
+static bool8 Phase2_Magma_Func2(struct Task *task);
+static bool8 Phase2_FramesCountdown(struct Task *task);
+static bool8 Phase2_Regi_Func1(struct Task *task);
+static bool8 Phase2_Regice_Func2(struct Task *task);
+static bool8 Phase2_Registeel_Func2(struct Task *task);
+static bool8 Phase2_Regirock_Func2(struct Task *task);
+static bool8 Phase2_WeatherTrio_Func1(struct Task *task);
+static bool8 Phase2_WaitPaletteFade(struct Task *task);
+static bool8 Phase2_Kyogre_Func3(struct Task *task);
+static bool8 Phase2_Kyogre_Func4(struct Task *task);
+static bool8 Phase2_Kyogre_Func5(struct Task *task);
+static bool8 Phase2_Groudon_Func3(struct Task *task);
+static bool8 Phase2_Groudon_Func4(struct Task *task);
+static bool8 Phase2_Groudon_Func5(struct Task *task);
+static bool8 Phase2_WeatherDuo_Func6(struct Task *task);
+static bool8 Phase2_WeatherDuo_Func7(struct Task *task);
+static bool8 Phase2_BigPokeball_Func1(struct Task *task);
+static bool8 Phase2_BigPokeball_Func2(struct Task *task);
+static bool8 Phase2_BigPokeball_Func3(struct Task *task);
+static bool8 Phase2_BigPokeball_Func4(struct Task *task);
+static bool8 Phase2_BigPokeball_Func5(struct Task *task);
+static bool8 Phase2_BigPokeball_Func6(struct Task *task);
+static bool8 Phase2_PokeballsTrail_Func1(struct Task *task);
+static bool8 Phase2_PokeballsTrail_Func2(struct Task *task);
+static bool8 Phase2_PokeballsTrail_Func3(struct Task *task);
+static bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task);
+static bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task);
+static bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task);
+static bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task);
+static bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task);
+static bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task);
+static bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task);
+static bool8 Phase2_Ripple_Func1(struct Task *task);
+static bool8 Phase2_Ripple_Func2(struct Task *task);
+static bool8 Phase2_Wave_Func1(struct Task *task);
+static bool8 Phase2_Wave_Func2(struct Task *task);
+static bool8 Phase2_Wave_Func3(struct Task *task);
+static bool8 Phase2_Slice_Func1(struct Task *task);
+static bool8 Phase2_Slice_Func2(struct Task *task);
+static bool8 Phase2_Slice_Func3(struct Task *task);
+static bool8 Phase2_WhiteFade_Func1(struct Task *task);
+static bool8 Phase2_WhiteFade_Func2(struct Task *task);
+static bool8 Phase2_WhiteFade_Func3(struct Task *task);
+static bool8 Phase2_WhiteFade_Func4(struct Task *task);
+static bool8 Phase2_WhiteFade_Func5(struct Task *task);
+static bool8 Phase2_GridSquares_Func1(struct Task *task);
+static bool8 Phase2_GridSquares_Func2(struct Task *task);
+static bool8 Phase2_GridSquares_Func3(struct Task *task);
+static bool8 Phase2_Shards_Func1(struct Task *task);
+static bool8 Phase2_Shards_Func2(struct Task *task);
+static bool8 Phase2_Shards_Func3(struct Task *task);
+static bool8 Phase2_Shards_Func4(struct Task *task);
+static bool8 Phase2_Shards_Func5(struct Task *task);
+static bool8 Phase2_ShredSplit_Func1(struct Task *task);
+static bool8 Phase2_ShredSplit_Func2(struct Task *task);
+static bool8 Phase2_ShredSplit_Func3(struct Task *task);
+static bool8 Phase2_ShredSplit_Func4(struct Task *task);
+static bool8 Phase2_Blackhole_Func1(struct Task *task);
+static bool8 Phase2_Blackhole1_Func2(struct Task *task);
+static bool8 Phase2_Blackhole1_Func3(struct Task *task);
+static bool8 Phase2_Blackhole2_Func2(struct Task *task);
+static bool8 Phase2_RectangularSpiral_Func1(struct Task *task);
+static bool8 Phase2_RectangularSpiral_Func2(struct Task *task);
+static bool8 Phase2_RectangularSpiral_Func3(struct Task *task);
+static bool8 Phase2_29_Func1(struct Task *task);
+static bool8 Phase2_29_Func2(struct Task *task);
+static bool8 Phase2_30_Func1(struct Task *task);
+static bool8 Phase2_30_Func2(struct Task *task);
+static bool8 Phase2_30_Func3(struct Task *task);
+static bool8 Phase2_30_Func4(struct Task *task);
+static bool8 Phase2_Rayquaza_Func3(struct Task *task);
+static bool8 Phase2_Rayquaza_Func4(struct Task *task);
+static bool8 Phase2_Rayquaza_Func5(struct Task *task);
+static bool8 Phase2_Rayquaza_Func6(struct Task *task);
+static bool8 Phase2_Rayquaza_Func7(struct Task *task);
+static bool8 Phase2_Rayquaza_Func8(struct Task *task);
+static bool8 Phase2_Rayquaza_Func9(struct Task *task);
+static bool8 Phase2_31_Func1(struct Task *task);
+static bool8 Phase2_31_Func2(struct Task *task);
+static bool8 Phase2_31_Func3(struct Task *task);
+static bool8 Phase2_31_33_Func5(struct Task *task);
+static bool8 Phase2_33_Func1(struct Task *task);
+static bool8 Phase2_33_Func2(struct Task *task);
+static bool8 Phase2_33_Func3(struct Task *task);
+static bool8 Phase2_33_Func4(struct Task *task);
+static bool8 Phase2_32_Func1(struct Task *task);
+static bool8 Phase2_32_Func2(struct Task *task);
+static bool8 Phase2_32_Func3(struct Task *task);
+static bool8 Phase2_32_Func4(struct Task *task);
+static bool8 Phase2_32_Func5(struct Task *task);
+static bool8 Phase2_Mugshot_Func1(struct Task *task);
+static bool8 Phase2_Mugshot_Func2(struct Task *task);
+static bool8 Phase2_Mugshot_Func3(struct Task *task);
+static bool8 Phase2_Mugshot_Func4(struct Task *task);
+static bool8 Phase2_Mugshot_Func5(struct Task *task);
+static bool8 Phase2_Mugshot_Func6(struct Task *task);
+static bool8 Phase2_Mugshot_Func7(struct Task *task);
+static bool8 Phase2_Mugshot_Func8(struct Task *task);
+static bool8 Phase2_Mugshot_Func9(struct Task *task);
+static bool8 Phase2_Mugshot_Func10(struct Task *task);
+static void Phase2Task_MugShotTransition(u8 taskId);
+static void Mugshots_CreateOpponentPlayerSprites(struct Task *task);
+static void VBlankCB0_Phase2_Mugshots(void);
+static void VBlankCB1_Phase2_Mugshots(void);
+static void HBlankCB_Phase2_Mugshots(void);
+static bool8 Transition_Phase1(struct Task *task);
+static bool8 Transition_WaitForPhase1(struct Task *task);
+static bool8 Transition_Phase2(struct Task *task);
+static bool8 Transition_WaitForPhase2(struct Task *task);
+static void sub_8149F08(void);
+static void sub_8149F84(void);
+static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4);
+static void sub_814A014(u16 *a0, s16 a1, s16 a2, s16 a3);
+static void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize);
+static void sub_8149F40(u16 **a0);
+static void sub_814A1AC(s16 *a0, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6);
+static bool8 sub_814A228(s16 *a0, bool8 a1, bool8 a2);
+static void sub_8148484(s16 spriteId, s16 value);
+static void sub_814849C(s16 spriteId);
+static s16 sub_81484B8(s16 spriteId);
+static bool8 Phase1_TransitionAll_Func1(struct Task *task);
+static bool8 Phase1_TransitionAll_Func2(struct Task *task);
+static bool8 IsPhase1Done(void);
+static bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1);
+static void sub_814713C(struct Sprite *sprite);
+static void sub_8148380(struct Sprite *sprite);
+static void sub_8149864(struct Sprite *sprite);
+static bool8 sub_81483A8(struct Sprite *sprite);
+static bool8 sub_81483AC(struct Sprite *sprite);
+static bool8 sub_81483F8(struct Sprite *sprite);
+static bool8 sub_814842C(struct Sprite *sprite);
+static bool8 sub_8148458(struct Sprite *sprite);
 
 // iwram bss vars
 IWRAM_DATA static s16 sUnusedRectangularSpiralVar;
@@ -275,53 +278,53 @@ IWRAM_DATA static struct StructRectangularSpiral sRectangularSpiralTransition[4]
 EWRAM_DATA static struct TransitionData *sTransitionStructPtr = NULL;
 
 // const rom data
-const u32 sBigPokeball_Tileset[] = INCBIN_U32("graphics/battle_transitions/big_pokeball.4bpp");
-const u32 sPokeballTrail_Tileset[] = INCBIN_U32("graphics/battle_transitions/pokeball_trail.4bpp");
-const u8 sSpriteImage_85B98F0[] = INCBIN_U8("graphics/battle_transitions/pokeball.4bpp");
-const u32 sUnknown_085B9AF0[] = INCBIN_U32("graphics/battle_transitions/elite_four_bg.4bpp");
-const u8 sSpriteImage_85B9CD0[] = INCBIN_U8("graphics/battle_transitions/unused_brendan.4bpp");
-const u8 sSpriteImage_85BA4D0[] = INCBIN_U8("graphics/battle_transitions/unused_lass.4bpp");
-const u32 sShrinkingBoxTileset[] = INCBIN_U32("graphics/battle_transitions/shrinking_box.4bpp");
-const u32 sEvilTeam_Palette[] = INCBIN_U32("graphics/battle_transitions/evil_team.gbapal");
-const u32 sTeamAqua_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_aqua.4bpp.lz");
-const u32 sTeamAqua_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_aqua.bin.lz");
-const u32 sTeamMagma_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_magma.4bpp.lz");
-const u32 sTeamMagma_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_magma.bin.lz");
-const u32 gUnknown_085BBC14[] = INCBIN_U32("graphics/battle_transitions/85BBC14.4bpp");
-const u32 gUnknown_085BC2B4[] = INCBIN_U32("graphics/battle_transitions/85BC2B4.gbapal");
-const u32 gUnknown_085BC2D4[] = INCBIN_U32("graphics/battle_transitions/85BC2D4.gbapal");
-const u32 gUnknown_085BC2F4[] = INCBIN_U32("graphics/battle_transitions/85BC2F4.gbapal");
-const u32 gUnknown_085BC314[] = INCBIN_U32("graphics/battle_transitions/85BC314.bin");
-const u32 gUnknown_085BCB14[] = INCBIN_U32("graphics/battle_transitions/85BCB14.bin");
-const u32 gUnknown_085BD314[] = INCBIN_U32("graphics/battle_transitions/85BD314.bin");
-const u16 gUnknown_085BDB14[] = INCBIN_U16("graphics/battle_transitions/85BDB14.gbapal");
-const u32 gUnknown_085BDB34[] = INCBIN_U32("graphics/battle_transitions/kyogre.4bpp.lz");
-const u32 gUnknown_085BE1E8[] = INCBIN_U32("graphics/battle_transitions/kyogre.bin.lz");
-const u32 gUnknown_085BE51C[] = INCBIN_U32("graphics/battle_transitions/groudon.4bpp.lz");
-const u32 gUnknown_085BEA88[] = INCBIN_U32("graphics/battle_transitions/groudon.bin.lz");
-const u16 gUnknown_085BEDA0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt1.gbapal");
-const u16 gUnknown_085BEEE0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt2.gbapal");
-const u16 gUnknown_085BF0A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt1.gbapal");
-const u16 gUnknown_085BF2A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt2.gbapal");
-const u16 gUnknown_085BF4A0[] = INCBIN_U16("graphics/battle_transitions/rayquaza.gbapal");
-const u32 gUnknown_085BF6A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.4bpp");
-const u32 gUnknown_085C6BE0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin");
-const u32 gUnknown_085C7BE0[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.gbapal");
-const u32 gUnknown_085C7C00[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.4bpp.lz");
-const u32 gUnknown_085C828C[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.bin.lz");
-const u32 gUnknown_085C8578[] = INCBIN_U32("graphics/battle_transitions/frontier_squares_blanktiles.gbapal");
-const u32 gUnknown_085C8598[] = INCBIN_U32("graphics/battle_transitions/frontier_square_1.4bpp.lz");
-const u32 gUnknown_085C86F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_2.4bpp.lz");
-const u32 gUnknown_085C87F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_3.4bpp.lz");
-const u32 gUnknown_085C88A4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_4.4bpp.lz");
-const u32 gUnknown_085C8928[] = INCBIN_U32("graphics/battle_transitions/frontier_squares.bin");
-
-const TaskFunc sPhase1_Tasks[B_TRANSITION_COUNT] =
+static const u32 sBigPokeball_Tileset[] = INCBIN_U32("graphics/battle_transitions/big_pokeball.4bpp");
+static const u32 sPokeballTrail_Tileset[] = INCBIN_U32("graphics/battle_transitions/pokeball_trail.4bpp");
+static const u8 sSpriteImage_85B98F0[] = INCBIN_U8("graphics/battle_transitions/pokeball.4bpp");
+static const u32 sUnknown_085B9AF0[] = INCBIN_U32("graphics/battle_transitions/elite_four_bg.4bpp");
+static const u8 sSpriteImage_85B9CD0[] = INCBIN_U8("graphics/battle_transitions/unused_brendan.4bpp");
+static const u8 sSpriteImage_85BA4D0[] = INCBIN_U8("graphics/battle_transitions/unused_lass.4bpp");
+static const u32 sShrinkingBoxTileset[] = INCBIN_U32("graphics/battle_transitions/shrinking_box.4bpp");
+static const u32 sEvilTeam_Palette[] = INCBIN_U32("graphics/battle_transitions/evil_team.gbapal");
+static const u32 sTeamAqua_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_aqua.4bpp.lz");
+static const u32 sTeamAqua_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_aqua.bin.lz");
+static const u32 sTeamMagma_Tileset[] = INCBIN_U32("graphics/battle_transitions/team_magma.4bpp.lz");
+static const u32 sTeamMagma_Tilemap[] = INCBIN_U32("graphics/battle_transitions/team_magma.bin.lz");
+static const u32 gUnknown_085BBC14[] = INCBIN_U32("graphics/battle_transitions/85BBC14.4bpp");
+static const u32 gUnknown_085BC2B4[] = INCBIN_U32("graphics/battle_transitions/85BC2B4.gbapal");
+static const u32 gUnknown_085BC2D4[] = INCBIN_U32("graphics/battle_transitions/85BC2D4.gbapal");
+static const u32 gUnknown_085BC2F4[] = INCBIN_U32("graphics/battle_transitions/85BC2F4.gbapal");
+static const u32 gUnknown_085BC314[] = INCBIN_U32("graphics/battle_transitions/85BC314.bin");
+static const u32 gUnknown_085BCB14[] = INCBIN_U32("graphics/battle_transitions/85BCB14.bin");
+static const u32 gUnknown_085BD314[] = INCBIN_U32("graphics/battle_transitions/85BD314.bin");
+static const u16 gUnknown_085BDB14[] = INCBIN_U16("graphics/battle_transitions/85BDB14.gbapal");
+static const u32 gUnknown_085BDB34[] = INCBIN_U32("graphics/battle_transitions/kyogre.4bpp.lz");
+static const u32 gUnknown_085BE1E8[] = INCBIN_U32("graphics/battle_transitions/kyogre.bin.lz");
+static const u32 gUnknown_085BE51C[] = INCBIN_U32("graphics/battle_transitions/groudon.4bpp.lz");
+static const u32 gUnknown_085BEA88[] = INCBIN_U32("graphics/battle_transitions/groudon.bin.lz");
+static const u16 gUnknown_085BEDA0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt1.gbapal");
+static const u16 gUnknown_085BEEE0[] = INCBIN_U16("graphics/battle_transitions/kyogre_pt2.gbapal");
+static const u16 gUnknown_085BF0A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt1.gbapal");
+static const u16 gUnknown_085BF2A0[] = INCBIN_U16("graphics/battle_transitions/groudon_pt2.gbapal");
+static const u16 gUnknown_085BF4A0[] = INCBIN_U16("graphics/battle_transitions/rayquaza.gbapal");
+static const u32 gUnknown_085BF6A0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.4bpp");
+static const u32 gUnknown_085C6BE0[] = INCBIN_U32("graphics/battle_transitions/rayquaza.bin");
+static const u32 gUnknown_085C7BE0[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.gbapal");
+static const u32 gUnknown_085C7C00[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.4bpp.lz");
+static const u32 gUnknown_085C828C[] = INCBIN_U32("graphics/battle_transitions/frontier_brain.bin.lz");
+static const u32 gUnknown_085C8578[] = INCBIN_U32("graphics/battle_transitions/frontier_squares_blanktiles.gbapal");
+static const u32 gUnknown_085C8598[] = INCBIN_U32("graphics/battle_transitions/frontier_square_1.4bpp.lz");
+static const u32 gUnknown_085C86F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_2.4bpp.lz");
+static const u32 gUnknown_085C87F4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_3.4bpp.lz");
+static const u32 gUnknown_085C88A4[] = INCBIN_U32("graphics/battle_transitions/frontier_square_4.4bpp.lz");
+static const u32 gUnknown_085C8928[] = INCBIN_U32("graphics/battle_transitions/frontier_squares.bin");
+
+static const TaskFunc sPhase1_Tasks[B_TRANSITION_COUNT] =
 {
     [0 ... B_TRANSITION_COUNT - 1] = &Phase1Task_TransitionAll
 };
 
-const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] =
+static const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] =
 {
     Phase2Task_Blur,                        // 0
     Phase2Task_Swirl,                       // 1
@@ -367,7 +370,7 @@ const TaskFunc sPhase2_Tasks[B_TRANSITION_COUNT] =
     Phase2Task_41,                          // 41
 };
 
-const TransitionStateFunc sMainTransitionPhases[] =
+static const TransitionStateFunc sMainTransitionPhases[] =
 {
     &Transition_Phase1,
     &Transition_WaitForPhase1,
@@ -375,26 +378,26 @@ const TransitionStateFunc sMainTransitionPhases[] =
     &Transition_WaitForPhase2
 };
 
-const TransitionStateFunc sPhase2_Blur_Funcs[] =
+static const TransitionStateFunc sPhase2_Blur_Funcs[] =
 {
     Phase2_Blur_Func1,
     Phase2_Blur_Func2,
     Phase2_Blur_Func3
 };
 
-const TransitionStateFunc sPhase2_Swirl_Funcs[] =
+static const TransitionStateFunc sPhase2_Swirl_Funcs[] =
 {
     Phase2_Swirl_Func1,
     Phase2_Swirl_Func2,
 };
 
-const TransitionStateFunc sPhase2_Shuffle_Funcs[] =
+static const TransitionStateFunc sPhase2_Shuffle_Funcs[] =
 {
     Phase2_Shuffle_Func1,
     Phase2_Shuffle_Func2,
 };
 
-const TransitionStateFunc sPhase2_Aqua_Funcs[] =
+static const TransitionStateFunc sPhase2_Aqua_Funcs[] =
 {
     Phase2_Aqua_Func1,
     Phase2_Aqua_Func2,
@@ -405,7 +408,7 @@ const TransitionStateFunc sPhase2_Aqua_Funcs[] =
     Phase2_BigPokeball_Func6
 };
 
-const TransitionStateFunc sPhase2_Magma_Funcs[] =
+static const TransitionStateFunc sPhase2_Magma_Funcs[] =
 {
     Phase2_Magma_Func1,
     Phase2_Magma_Func2,
@@ -416,7 +419,7 @@ const TransitionStateFunc sPhase2_Magma_Funcs[] =
     Phase2_BigPokeball_Func6
 };
 
-const TransitionStateFunc sPhase2_BigPokeball_Funcs[] =
+static const TransitionStateFunc sPhase2_BigPokeball_Funcs[] =
 {
     Phase2_BigPokeball_Func1,
     Phase2_BigPokeball_Func2,
@@ -426,7 +429,7 @@ const TransitionStateFunc sPhase2_BigPokeball_Funcs[] =
     Phase2_BigPokeball_Func6
 };
 
-const TransitionStateFunc sPhase2_Regice_Funcs[] =
+static const TransitionStateFunc sPhase2_Regice_Funcs[] =
 {
     Phase2_Regi_Func1,
     Phase2_Regice_Func2,
@@ -436,7 +439,7 @@ const TransitionStateFunc sPhase2_Regice_Funcs[] =
     Phase2_BigPokeball_Func6
 };
 
-const TransitionStateFunc sPhase2_Registeel_Funcs[] =
+static const TransitionStateFunc sPhase2_Registeel_Funcs[] =
 {
     Phase2_Regi_Func1,
     Phase2_Registeel_Func2,
@@ -446,7 +449,7 @@ const TransitionStateFunc sPhase2_Registeel_Funcs[] =
     Phase2_BigPokeball_Func6
 };
 
-const TransitionStateFunc sPhase2_Regirock_Funcs[] =
+static const TransitionStateFunc sPhase2_Regirock_Funcs[] =
 {
     Phase2_Regi_Func1,
     Phase2_Regirock_Func2,
@@ -456,7 +459,7 @@ const TransitionStateFunc sPhase2_Regirock_Funcs[] =
     Phase2_BigPokeball_Func6
 };
 
-const TransitionStateFunc sPhase2_Kyogre_Funcs[] =
+static const TransitionStateFunc sPhase2_Kyogre_Funcs[] =
 {
     Phase2_WeatherTrio_Func1,
     Phase2_WaitPaletteFade,
@@ -468,18 +471,18 @@ const TransitionStateFunc sPhase2_Kyogre_Funcs[] =
     Phase2_WeatherDuo_Func7
 };
 
-const TransitionStateFunc sPhase2_PokeballsTrail_Funcs[] =
+static const TransitionStateFunc sPhase2_PokeballsTrail_Funcs[] =
 {
     Phase2_PokeballsTrail_Func1,
     Phase2_PokeballsTrail_Func2,
     Phase2_PokeballsTrail_Func3
 };
 
-const s16 sUnknown_085C8B88[2] = {-16, 256};
-const s16 sUnknown_085C8B8C[5] = {0, 32, 64, 18, 48};
-const s16 sUnknown_085C8B96[2] = {8, -8};
+static const s16 sUnknown_085C8B88[2] = {-16, 256};
+static const s16 sUnknown_085C8B8C[5] = {0, 32, 64, 18, 48};
+static const s16 sUnknown_085C8B96[2] = {8, -8};
 
-const TransitionStateFunc sPhase2_Clockwise_BlackFade_Funcs[] =
+static const TransitionStateFunc sPhase2_Clockwise_BlackFade_Funcs[] =
 {
     Phase2_Clockwise_BlackFade_Func1,
     Phase2_Clockwise_BlackFade_Func2,
@@ -490,20 +493,20 @@ const TransitionStateFunc sPhase2_Clockwise_BlackFade_Funcs[] =
     Phase2_Clockwise_BlackFade_Func7
 };
 
-const TransitionStateFunc sPhase2_Ripple_Funcs[] =
+static const TransitionStateFunc sPhase2_Ripple_Funcs[] =
 {
     Phase2_Ripple_Func1,
     Phase2_Ripple_Func2
 };
 
-const TransitionStateFunc sPhase2_Wave_Funcs[] =
+static const TransitionStateFunc sPhase2_Wave_Funcs[] =
 {
     Phase2_Wave_Func1,
     Phase2_Wave_Func2,
     Phase2_Wave_Func3
 };
 
-const TransitionStateFunc sPhase2_Mugshot_Funcs[] =
+static const TransitionStateFunc sPhase2_Mugshot_Funcs[] =
 {
     Phase2_Mugshot_Func1,
     Phase2_Mugshot_Func2,
@@ -517,7 +520,7 @@ const TransitionStateFunc sPhase2_Mugshot_Funcs[] =
     Phase2_Mugshot_Func10
 };
 
-const u8 sMugshotsTrainerPicIDsTable[MUGSHOTS_COUNT] =
+static const u8 sMugshotsTrainerPicIDsTable[MUGSHOTS_COUNT] =
 {
     TRAINER_PIC_ELITE_FOUR_SIDNEY,
     TRAINER_PIC_ELITE_FOUR_PHOEBE,
@@ -525,7 +528,7 @@ const u8 sMugshotsTrainerPicIDsTable[MUGSHOTS_COUNT] =
     TRAINER_PIC_ELITE_FOUR_DRAKE,
     TRAINER_PIC_CHAMPION_WALLACE
 };
-const s16 sMugshotsOpponentRotationScales[MUGSHOTS_COUNT][2] =
+static const s16 sMugshotsOpponentRotationScales[MUGSHOTS_COUNT][2] =
 {
     {0x200, 0x200},
     {0x200, 0x200},
@@ -533,7 +536,7 @@ const s16 sMugshotsOpponentRotationScales[MUGSHOTS_COUNT][2] =
     {0x1A0, 0x1A0},
     {0x188, 0x188},
 };
-const s16 sMugshotsOpponentCoords[MUGSHOTS_COUNT][2] =
+static const s16 sMugshotsOpponentCoords[MUGSHOTS_COUNT][2] =
 {
     {0,     0},
     {0,     0},
@@ -542,7 +545,7 @@ const s16 sMugshotsOpponentCoords[MUGSHOTS_COUNT][2] =
     {-8,    7},
 };
 
-const TransitionSpriteCallback sUnknown_085C8C24[] =
+static const TransitionSpriteCallback sUnknown_085C8C24[] =
 {
     sub_81483A8,
     sub_81483AC,
@@ -553,17 +556,17 @@ const TransitionSpriteCallback sUnknown_085C8C24[] =
     sub_81483A8
 };
 
-const s16 sUnknown_085C8C40[2] = {12, -12};
-const s16 sUnknown_085C8C44[2] = {-1, 1};
+static const s16 sUnknown_085C8C40[2] = {12, -12};
+static const s16 sUnknown_085C8C44[2] = {-1, 1};
 
-const TransitionStateFunc sPhase2_Slice_Funcs[] =
+static const TransitionStateFunc sPhase2_Slice_Funcs[] =
 {
     Phase2_Slice_Func1,
     Phase2_Slice_Func2,
     Phase2_Slice_Func3
 };
 
-const TransitionStateFunc sPhase2_ShredSplit_Funcs[] =
+static const TransitionStateFunc sPhase2_ShredSplit_Funcs[] =
 {
     Phase2_ShredSplit_Func1,
     Phase2_ShredSplit_Func2,
@@ -571,49 +574,49 @@ const TransitionStateFunc sPhase2_ShredSplit_Funcs[] =
     Phase2_ShredSplit_Func4
 };
 
-const u8 gUnknown_085C8C64[] = {39, 119};
-const s16 gUnknown_085C8C66[] = {1, -1};
+static const u8 gUnknown_085C8C64[] = {39, 119};
+static const s16 gUnknown_085C8C66[] = {1, -1};
 
-const TransitionStateFunc sPhase2_Blackhole1_Funcs[] =
+static const TransitionStateFunc sPhase2_Blackhole1_Funcs[] =
 {
     Phase2_Blackhole_Func1,
     Phase2_Blackhole1_Func2,
     Phase2_Blackhole1_Func3
 };
 
-const TransitionStateFunc sPhase2_Blackhole2_Funcs[] =
+static const TransitionStateFunc sPhase2_Blackhole2_Funcs[] =
 {
     Phase2_Blackhole_Func1,
     Phase2_Blackhole2_Func2
 };
 
-const s16 gUnknown_085C8C80[] = {-6, 4};
+static const s16 gUnknown_085C8C80[] = {-6, 4};
 
-const TransitionStateFunc sPhase2_RectangularSpiral_Funcs[] =
+static const TransitionStateFunc sPhase2_RectangularSpiral_Funcs[] =
 {
     Phase2_RectangularSpiral_Func1,
     Phase2_RectangularSpiral_Func2,
     Phase2_RectangularSpiral_Func3
 };
 
-const s16 gUnknown_085C8C90[] = {1, 27, 275, -1};
-const s16 gUnknown_085C8C98[] = {2, 486, -1};
-const s16 gUnknown_085C8C9E[] = {3, 262, -1};
-const s16 gUnknown_085C8CA4[] = {4, 507, -2};
-const s16 gUnknown_085C8CAA[] = {1, 213, -1};
-const s16 gUnknown_085C8CB0[] = {2, 548, -2};
-const s16 gUnknown_085C8CB6[] = {3, 196, -1};
-const s16 gUnknown_085C8CBC[] = {4, 573, 309, -1};
-const s16 gUnknown_085C8CC4[] = {1, 474, -1};
-const s16 gUnknown_085C8CCA[] = {2, 295, 32, -1};
-const s16 gUnknown_085C8CD2[] = {3, 58, -1};
-const s16 gUnknown_085C8CD8[] = {4, 455, -1};
-const s16 gUnknown_085C8CDE[] = {1, 540, -1};
-const s16 gUnknown_085C8CE4[] = {2, 229, -1};
-const s16 gUnknown_085C8CEA[] = {3, 244, 28, -1};
-const s16 gUnknown_085C8CF2[] = {4, 517, -1};
-
-const s16 *const gUnknown_085C8CF8[] =
+static const s16 gUnknown_085C8C90[] = {1, 27, 275, -1};
+static const s16 gUnknown_085C8C98[] = {2, 486, -1};
+static const s16 gUnknown_085C8C9E[] = {3, 262, -1};
+static const s16 gUnknown_085C8CA4[] = {4, 507, -2};
+static const s16 gUnknown_085C8CAA[] = {1, 213, -1};
+static const s16 gUnknown_085C8CB0[] = {2, 548, -2};
+static const s16 gUnknown_085C8CB6[] = {3, 196, -1};
+static const s16 gUnknown_085C8CBC[] = {4, 573, 309, -1};
+static const s16 gUnknown_085C8CC4[] = {1, 474, -1};
+static const s16 gUnknown_085C8CCA[] = {2, 295, 32, -1};
+static const s16 gUnknown_085C8CD2[] = {3, 58, -1};
+static const s16 gUnknown_085C8CD8[] = {4, 455, -1};
+static const s16 gUnknown_085C8CDE[] = {1, 540, -1};
+static const s16 gUnknown_085C8CE4[] = {2, 229, -1};
+static const s16 gUnknown_085C8CEA[] = {3, 244, 28, -1};
+static const s16 gUnknown_085C8CF2[] = {4, 517, -1};
+
+static const s16 *const gUnknown_085C8CF8[] =
 {
 	gUnknown_085C8C90,
 	gUnknown_085C8CA4,
@@ -625,7 +628,7 @@ const s16 *const gUnknown_085C8CF8[] =
 	gUnknown_085C8CDE
 };
 
-const s16 *const gUnknown_085C8D18[] =
+static const s16 *const gUnknown_085C8D18[] =
 {
 	gUnknown_085C8CBC,
 	gUnknown_085C8CB0,
@@ -637,13 +640,13 @@ const s16 *const gUnknown_085C8D18[] =
 	gUnknown_085C8CD2
 };
 
-const s16 *const *const gUnknown_085C8D38[] =
+static const s16 *const *const gUnknown_085C8D38[] =
 {
 	gUnknown_085C8CF8,
 	gUnknown_085C8D18
 };
 
-const TransitionStateFunc sPhase2_Groudon_Funcs[] =
+static const TransitionStateFunc sPhase2_Groudon_Funcs[] =
 {
     Phase2_WeatherTrio_Func1,
     Phase2_WaitPaletteFade,
@@ -655,7 +658,7 @@ const TransitionStateFunc sPhase2_Groudon_Funcs[] =
     Phase2_WeatherDuo_Func7
 };
 
-const TransitionStateFunc sPhase2_Rayquaza_Funcs[] =
+static const TransitionStateFunc sPhase2_Rayquaza_Funcs[] =
 {
     Phase2_WeatherTrio_Func1,
     Phase2_WaitPaletteFade,
@@ -670,7 +673,7 @@ const TransitionStateFunc sPhase2_Rayquaza_Funcs[] =
     Phase2_Blackhole1_Func3
 };
 
-const TransitionStateFunc sPhase2_WhiteFade_Funcs[] =
+static const TransitionStateFunc sPhase2_WhiteFade_Funcs[] =
 {
     Phase2_WhiteFade_Func1,
     Phase2_WhiteFade_Func2,
@@ -679,16 +682,16 @@ const TransitionStateFunc sPhase2_WhiteFade_Funcs[] =
     Phase2_WhiteFade_Func5
 };
 
-const s16 sUnknown_085C8DA0[] = {0, 20, 15, 40, 10, 25, 35, 5};
+static const s16 sUnknown_085C8DA0[] = {0, 20, 15, 40, 10, 25, 35, 5};
 
-const TransitionStateFunc sPhase2_GridSquares_Funcs[] =
+static const TransitionStateFunc sPhase2_GridSquares_Funcs[] =
 {
     Phase2_GridSquares_Func1,
     Phase2_GridSquares_Func2,
     Phase2_GridSquares_Func3
 };
 
-const TransitionStateFunc sPhase2_Shards_Funcs[] =
+static const TransitionStateFunc sPhase2_Shards_Funcs[] =
 {
     Phase2_Shards_Func1,
     Phase2_Shards_Func2,
@@ -697,7 +700,7 @@ const TransitionStateFunc sPhase2_Shards_Funcs[] =
     Phase2_Shards_Func5
 };
 
-const s16 sUnknown_085C8DD0[][5] =
+static const s16 sUnknown_085C8DD0[][5] =
 {
     {56,    0,      0,      160,    0},
     {104,   160,    240,    88,     1},
@@ -708,49 +711,49 @@ const s16 sUnknown_085C8DD0[][5] =
     {168,   160,    48,     0,      1},
 };
 
-const s16 sUnknown_085C8E16[] = {8, 4, 2, 1, 1, 1, 0};
+static const s16 sUnknown_085C8E16[] = {8, 4, 2, 1, 1, 1, 0};
 
-const TransitionStateFunc sPhase1_TransitionAll_Funcs[] =
+static const TransitionStateFunc sPhase1_TransitionAll_Funcs[] =
 {
     Phase1_TransitionAll_Func1,
     Phase1_TransitionAll_Func2
 };
 
-const struct SpriteFrameImage sSpriteImageTable_85C8E2C[] =
+static const struct SpriteFrameImage sSpriteImageTable_85C8E2C[] =
 {
     sSpriteImage_85B98F0, 0x200
 };
 
-const union AnimCmd sSpriteAnim_85C8E34[] =
+static const union AnimCmd sSpriteAnim_85C8E34[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END
 };
 
-const union AnimCmd *const sSpriteAnimTable_85C8E3C[] =
+static const union AnimCmd *const sSpriteAnimTable_85C8E3C[] =
 {
     sSpriteAnim_85C8E34
 };
 
-const union AffineAnimCmd sSpriteAffineAnim_85C8E40[] =
+static const union AffineAnimCmd sSpriteAffineAnim_85C8E40[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, -4, 1),
     AFFINEANIMCMD_JUMP(0)
 };
 
-const union AffineAnimCmd sSpriteAffineAnim_85C8E50[] =
+static const union AffineAnimCmd sSpriteAffineAnim_85C8E50[] =
 {
     AFFINEANIMCMD_FRAME(0, 0, 4, 1),
     AFFINEANIMCMD_JUMP(0)
 };
 
-const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] =
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] =
 {
     sSpriteAffineAnim_85C8E40,
     sSpriteAffineAnim_85C8E50
 };
 
-const struct SpriteTemplate gUnknown_085C8E68 =
+static const struct SpriteTemplate gUnknown_085C8E68 =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 4105,
@@ -761,7 +764,7 @@ const struct SpriteTemplate gUnknown_085C8E68 =
     .callback = sub_814713C
 };
 
-const struct OamData gOamData_85C8E80 =
+static const struct OamData gOamData_85C8E80 =
 {
     .y = 0,
     .affineMode = 0,
@@ -778,28 +781,28 @@ const struct OamData gOamData_85C8E80 =
     .affineParam = 0,
 };
 
-const struct SpriteFrameImage sSpriteImageTable_85C8E88[] =
+static const struct SpriteFrameImage sSpriteImageTable_85C8E88[] =
 {
     sSpriteImage_85B9CD0, 0x800
 };
 
-const struct SpriteFrameImage sSpriteImageTable_85C8E90[] =
+static const struct SpriteFrameImage sSpriteImageTable_85C8E90[] =
 {
     sSpriteImage_85BA4D0, 0x800
 };
 
-const union AnimCmd sSpriteAnim_85C8E98[] =
+static const union AnimCmd sSpriteAnim_85C8E98[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END
 };
 
-const union AnimCmd *const sSpriteAnimTable_85C8EA0[] =
+static const union AnimCmd *const sSpriteAnimTable_85C8EA0[] =
 {
     sSpriteAnim_85C8E98
 };
 
-const struct SpriteTemplate sSpriteTemplate_85C8EA4 =
+static const struct SpriteTemplate sSpriteTemplate_85C8EA4 =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 4106,
@@ -810,7 +813,7 @@ const struct SpriteTemplate sSpriteTemplate_85C8EA4 =
     .callback = sub_8148380
 };
 
-const struct SpriteTemplate sSpriteTemplate_85C8EBC =
+static const struct SpriteTemplate sSpriteTemplate_85C8EBC =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 4106,
@@ -821,22 +824,22 @@ const struct SpriteTemplate sSpriteTemplate_85C8EBC =
     .callback = sub_8148380
 };
 
-const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_10.gbapal");
+static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/field_effect_object_palette_10.gbapal");
 
 const struct SpritePalette gFieldEffectObjectPaletteInfo10 =
 {
     gFieldEffectObjectPalette10, 0x1009
 };
 
-const u16 sMugshotPal_Sydney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal");
-const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal");
-const u16 sMugshotPal_Glacia[] = INCBIN_U16("graphics/battle_transitions/glacia_bg.gbapal");
-const u16 sMugshotPal_Drake[] = INCBIN_U16("graphics/battle_transitions/drake_bg.gbapal");
-const u16 sMugshotPal_Champion[] = INCBIN_U16("graphics/battle_transitions/wallace_bg.gbapal");
-const u16 sMugshotPal_Brendan[] = INCBIN_U16("graphics/battle_transitions/brendan_bg.gbapal");
-const u16 sMugshotPal_May[] = INCBIN_U16("graphics/battle_transitions/may_bg.gbapal");
+static const u16 sMugshotPal_Sydney[] = INCBIN_U16("graphics/battle_transitions/sidney_bg.gbapal");
+static const u16 sMugshotPal_Phoebe[] = INCBIN_U16("graphics/battle_transitions/phoebe_bg.gbapal");
+static const u16 sMugshotPal_Glacia[] = INCBIN_U16("graphics/battle_transitions/glacia_bg.gbapal");
+static const u16 sMugshotPal_Drake[] = INCBIN_U16("graphics/battle_transitions/drake_bg.gbapal");
+static const u16 sMugshotPal_Champion[] = INCBIN_U16("graphics/battle_transitions/wallace_bg.gbapal");
+static const u16 sMugshotPal_Brendan[] = INCBIN_U16("graphics/battle_transitions/brendan_bg.gbapal");
+static const u16 sMugshotPal_May[] = INCBIN_U16("graphics/battle_transitions/may_bg.gbapal");
 
-const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] =
+static const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] =
 {
     sMugshotPal_Sydney,
     sMugshotPal_Phoebe,
@@ -845,22 +848,22 @@ const u16 *const sOpponentMugshotsPals[MUGSHOTS_COUNT] =
     sMugshotPal_Champion
 };
 
-const u16 *const sPlayerMugshotsPals[2] =
+static const u16 *const sPlayerMugshotsPals[2] =
 {
     sMugshotPal_Brendan,
     sMugshotPal_May
 };
 
-const u16 sUnusedTrainerPalette[] = INCBIN_U16("graphics/battle_transitions/unused_trainer.gbapal");
-const struct SpritePalette sSpritePalette_UnusedTrainer =
+static const u16 sUnusedTrainerPalette[] = INCBIN_U16("graphics/battle_transitions/unused_trainer.gbapal");
+static const struct SpritePalette sSpritePalette_UnusedTrainer =
 {
     sUnusedTrainerPalette, 0x100A
 };
 
-const u16 sBigPokeball_Tilemap[] = INCBIN_U16("graphics/battle_transitions/big_pokeball_map.bin");
-const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/elite_four_bg_map.bin");
+static const u16 sBigPokeball_Tilemap[] = INCBIN_U16("graphics/battle_transitions/big_pokeball_map.bin");
+static const u16 sMugshotsTilemap[] = INCBIN_U16("graphics/battle_transitions/elite_four_bg_map.bin");
 
-const TransitionStateFunc sPhase2_29_Funcs[] =
+static const TransitionStateFunc sPhase2_29_Funcs[] =
 {
     Phase2_29_Func1,
     Phase2_29_Func2,
@@ -870,7 +873,7 @@ const TransitionStateFunc sPhase2_29_Funcs[] =
     Phase2_BigPokeball_Func6
 };
 
-const TransitionStateFunc sPhase2_30_Funcs[] =
+static const TransitionStateFunc sPhase2_30_Funcs[] =
 {
     Phase2_30_Func1,
     Phase2_30_Func2,
@@ -878,7 +881,7 @@ const TransitionStateFunc sPhase2_30_Funcs[] =
     Phase2_30_Func4
 };
 
-const TransitionStateFunc sPhase2_31_Funcs[] =
+static const TransitionStateFunc sPhase2_31_Funcs[] =
 {
     Phase2_31_Func1,
     Phase2_31_Func2,
@@ -886,7 +889,7 @@ const TransitionStateFunc sPhase2_31_Funcs[] =
     Phase2_31_33_Func5
 };
 
-const TransitionStateFunc sPhase2_33_Funcs[] =
+static const TransitionStateFunc sPhase2_33_Funcs[] =
 {
     Phase2_33_Func1,
     Phase2_33_Func2,
@@ -895,7 +898,7 @@ const TransitionStateFunc sPhase2_33_Funcs[] =
     Phase2_31_33_Func5
 };
 
-const TransitionStateFunc sPhase2_32_Funcs[] =
+static const TransitionStateFunc sPhase2_32_Funcs[] =
 {
     Phase2_32_Func1,
     Phase2_32_Func2,
@@ -904,8 +907,8 @@ const TransitionStateFunc sPhase2_32_Funcs[] =
     Phase2_32_Func5
 };
 
-const u8 gUnknown_085C9A30[] = {0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x1b, 0x14, 0x0d, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x07, 0x0e, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x13, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x0f, 0x10, 0x11, 0x12};
-const u8 gUnknown_085C9A53[] = {0x00, 0x10, 0x29, 0x16, 0x2c, 0x02, 0x2b, 0x15, 0x2e, 0x1b, 0x09, 0x30, 0x26, 0x05, 0x39, 0x3b, 0x0c, 0x3f, 0x23, 0x1c, 0x0a, 0x35, 0x07, 0x31, 0x27, 0x17, 0x37, 0x01, 0x3e, 0x11, 0x3d, 0x1e, 0x06, 0x22, 0x0f, 0x33, 0x20, 0x3a, 0x0d, 0x2d, 0x25, 0x34, 0x0b, 0x18, 0x3c, 0x13, 0x38, 0x21, 0x1d, 0x32, 0x28, 0x36, 0x0e, 0x03, 0x2f, 0x14, 0x12, 0x19, 0x04, 0x24, 0x1a, 0x2a, 0x1f, 0x08, 0x00};
+static const u8 gUnknown_085C9A30[] = {0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x1b, 0x14, 0x0d, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x07, 0x0e, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x13, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x0f, 0x10, 0x11, 0x12};
+static const u8 gUnknown_085C9A53[] = {0x00, 0x10, 0x29, 0x16, 0x2c, 0x02, 0x2b, 0x15, 0x2e, 0x1b, 0x09, 0x30, 0x26, 0x05, 0x39, 0x3b, 0x0c, 0x3f, 0x23, 0x1c, 0x0a, 0x35, 0x07, 0x31, 0x27, 0x17, 0x37, 0x01, 0x3e, 0x11, 0x3d, 0x1e, 0x06, 0x22, 0x0f, 0x33, 0x20, 0x3a, 0x0d, 0x2d, 0x25, 0x34, 0x0b, 0x18, 0x3c, 0x13, 0x38, 0x21, 0x1d, 0x32, 0x28, 0x36, 0x0e, 0x03, 0x2f, 0x14, 0x12, 0x19, 0x04, 0x24, 0x1a, 0x2a, 0x1f, 0x08, 0x00};
 
 // code
 static void CB2_TestBattleTransition(void)
@@ -970,19 +973,19 @@ bool8 IsBattleTransitionDone(void)
     }
 }
 
-void LaunchBattleTransitionTask(u8 transitionId)
+static void LaunchBattleTransitionTask(u8 transitionId)
 {
     u8 taskId = CreateTask(Task_BattleTransitionMain, 2);
     gTasks[taskId].tTransitionId = transitionId;
     sTransitionStructPtr = AllocZeroed(sizeof(*sTransitionStructPtr));
 }
 
-void Task_BattleTransitionMain(u8 taskId)
+static void Task_BattleTransitionMain(u8 taskId)
 {
     while (sMainTransitionPhases[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Transition_Phase1(struct Task *task)
+static bool8 Transition_Phase1(struct Task *task)
 {
     sub_80AC3D0();
     CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
@@ -999,7 +1002,7 @@ bool8 Transition_Phase1(struct Task *task)
     }
 }
 
-bool8 Transition_WaitForPhase1(struct Task *task)
+static bool8 Transition_WaitForPhase1(struct Task *task)
 {
     if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF)
     {
@@ -1012,14 +1015,14 @@ bool8 Transition_WaitForPhase1(struct Task *task)
     }
 }
 
-bool8 Transition_Phase2(struct Task *task)
+static bool8 Transition_Phase2(struct Task *task)
 {
     CreateTask(sPhase2_Tasks[task->tTransitionId], 0);
     task->tState++;
     return FALSE;
 }
 
-bool8 Transition_WaitForPhase2(struct Task *task)
+static bool8 Transition_WaitForPhase2(struct Task *task)
 {
     task->tTransitionDone = FALSE;
     if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF)
@@ -1030,7 +1033,7 @@ bool8 Transition_WaitForPhase2(struct Task *task)
 #undef tTransitionId
 #undef tTransitionDone
 
-void Phase1Task_TransitionAll(u8 taskId)
+static void Phase1Task_TransitionAll(u8 taskId)
 {
     if (gTasks[taskId].tState == 0)
     {
@@ -1056,12 +1059,12 @@ void Phase1Task_TransitionAll(u8 taskId)
 #define tPlayerSpriteId     data[14]
 #define tMugshotId          data[15]
 
-void Phase2Task_Blur(u8 taskId)
+static void Phase2Task_Blur(u8 taskId)
 {
     while (sPhase2_Blur_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Blur_Func1(struct Task *task)
+static bool8 Phase2_Blur_Func1(struct Task *task)
 {
     SetGpuReg(REG_OFFSET_MOSAIC, 0);
     SetGpuRegBits(REG_OFFSET_BG1CNT, BGCNT_MOSAIC);
@@ -1071,7 +1074,7 @@ bool8 Phase2_Blur_Func1(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_Blur_Func2(struct Task *task)
+static bool8 Phase2_Blur_Func2(struct Task *task)
 {
     if (task->tData1 != 0)
     {
@@ -1089,7 +1092,7 @@ bool8 Phase2_Blur_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Blur_Func3(struct Task *task)
+static bool8 Phase2_Blur_Func3(struct Task *task)
 {
     if (!gPaletteFade.active)
     {
@@ -1099,12 +1102,12 @@ bool8 Phase2_Blur_Func3(struct Task *task)
     return FALSE;
 }
 
-void Phase2Task_Swirl(u8 taskId)
+static void Phase2Task_Swirl(u8 taskId)
 {
     while (sPhase2_Swirl_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Swirl_Func1(struct Task *task)
+static bool8 Phase2_Swirl_Func1(struct Task *task)
 {
     sub_8149F08();
     dp12_8087EA4();
@@ -1120,7 +1123,7 @@ bool8 Phase2_Swirl_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Swirl_Func2(struct Task *task)
+static bool8 Phase2_Swirl_Func2(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
     task->tData1 += 4;
@@ -1138,14 +1141,14 @@ bool8 Phase2_Swirl_Func2(struct Task *task)
     return FALSE;
 }
 
-void VBlankCB_Phase2_Swirl(void)
+static void VBlankCB_Phase2_Swirl(void)
 {
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA)
         DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
 }
 
-void HBlankCB_Phase2_Swirl(void)
+static void HBlankCB_Phase2_Swirl(void)
 {
     u16 var = gUnknown_02038C28[1][REG_VCOUNT];
     REG_BG1HOFS = var;
@@ -1153,12 +1156,12 @@ void HBlankCB_Phase2_Swirl(void)
     REG_BG3HOFS = var;
 }
 
-void Phase2Task_Shuffle(u8 taskId)
+static void Phase2Task_Shuffle(u8 taskId)
 {
     while (sPhase2_Shuffle_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Shuffle_Func1(struct Task *task)
+static bool8 Phase2_Shuffle_Func1(struct Task *task)
 {
     sub_8149F08();
     dp12_8087EA4();
@@ -1175,7 +1178,7 @@ bool8 Phase2_Shuffle_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Shuffle_Func2(struct Task *task)
+static bool8 Phase2_Shuffle_Func2(struct Task *task)
 {
     u8 i;
     u16 r3, r4;
@@ -1199,14 +1202,14 @@ bool8 Phase2_Shuffle_Func2(struct Task *task)
     return FALSE;
 }
 
-void VBlankCB_Phase2_Shuffle(void)
+static void VBlankCB_Phase2_Shuffle(void)
 {
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA)
         DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
 }
 
-void HBlankCB_Phase2_Shuffle(void)
+static void HBlankCB_Phase2_Shuffle(void)
 {
     u16 var = gUnknown_02038C28[1][REG_VCOUNT];
     REG_BG1VOFS = var;
@@ -1214,42 +1217,42 @@ void HBlankCB_Phase2_Shuffle(void)
     REG_BG3VOFS = var;
 }
 
-void Phase2Task_BigPokeball(u8 taskId)
+static void Phase2Task_BigPokeball(u8 taskId)
 {
     while (sPhase2_BigPokeball_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void Phase2Task_Aqua(u8 taskId)
+static void Phase2Task_Aqua(u8 taskId)
 {
     while (sPhase2_Aqua_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void Phase2Task_Magma(u8 taskId)
+static void Phase2Task_Magma(u8 taskId)
 {
     while (sPhase2_Magma_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void Phase2Task_Regice(u8 taskId)
+static void Phase2Task_Regice(u8 taskId)
 {
     while (sPhase2_Regice_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void Phase2Task_Registeel(u8 taskId)
+static void Phase2Task_Registeel(u8 taskId)
 {
     while (sPhase2_Registeel_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void Phase2Task_Regirock(u8 taskId)
+static void Phase2Task_Regirock(u8 taskId)
 {
     while (sPhase2_Regirock_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void Phase2Task_Kyogre(u8 taskId)
+static void Phase2Task_Kyogre(u8 taskId)
 {
     while (sPhase2_Kyogre_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void sub_814669C(struct Task *task)
+static void sub_814669C(struct Task *task)
 {
     s32 i;
 
@@ -1275,7 +1278,7 @@ void sub_814669C(struct Task *task)
     SetVBlankCallback(VBlankCB0_Phase2_BigPokeball);
 }
 
-bool8 Phase2_Aqua_Func1(struct Task *task)
+static bool8 Phase2_Aqua_Func1(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1290,7 +1293,7 @@ bool8 Phase2_Aqua_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Magma_Func1(struct Task *task)
+static bool8 Phase2_Magma_Func1(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1305,7 +1308,7 @@ bool8 Phase2_Magma_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Regi_Func1(struct Task *task)
+static bool8 Phase2_Regi_Func1(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1319,7 +1322,7 @@ bool8 Phase2_Regi_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_BigPokeball_Func1(struct Task *task)
+static bool8 Phase2_BigPokeball_Func1(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1333,7 +1336,7 @@ bool8 Phase2_BigPokeball_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_BigPokeball_Func2(struct Task *task)
+static bool8 Phase2_BigPokeball_Func2(struct Task *task)
 {
     s16 i, j;
     u16 *dst1, *dst2;
@@ -1354,7 +1357,7 @@ bool8 Phase2_BigPokeball_Func2(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_Aqua_Func2(struct Task *task)
+static bool8 Phase2_Aqua_Func2(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1366,7 +1369,7 @@ bool8 Phase2_Aqua_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Magma_Func2(struct Task *task)
+static bool8 Phase2_Magma_Func2(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1378,7 +1381,7 @@ bool8 Phase2_Magma_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Regice_Func2(struct Task *task)
+static bool8 Phase2_Regice_Func2(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1391,7 +1394,7 @@ bool8 Phase2_Regice_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Registeel_Func2(struct Task *task)
+static bool8 Phase2_Registeel_Func2(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1404,7 +1407,7 @@ bool8 Phase2_Registeel_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Regirock_Func2(struct Task *task)
+static bool8 Phase2_Regirock_Func2(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1417,7 +1420,7 @@ bool8 Phase2_Regirock_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Kyogre_Func3(struct Task *task)
+static bool8 Phase2_Kyogre_Func3(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1430,7 +1433,7 @@ bool8 Phase2_Kyogre_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Kyogre_Func4(struct Task *task)
+static bool8 Phase2_Kyogre_Func4(struct Task *task)
 {
     if (task->tData1 % 3 == 0)
     {
@@ -1447,7 +1450,7 @@ bool8 Phase2_Kyogre_Func4(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Kyogre_Func5(struct Task *task)
+static bool8 Phase2_Kyogre_Func5(struct Task *task)
 {
     if (task->tData1 % 5 == 0)
     {
@@ -1464,14 +1467,14 @@ bool8 Phase2_Kyogre_Func5(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_WeatherDuo_Func6(struct Task *task)
+static bool8 Phase2_WeatherDuo_Func6(struct Task *task)
 {
     BeginNormalPaletteFade(0xFFFF8000, 1, 0, 0x10, 0);
     task->tState++;
     return FALSE;
 }
 
-bool8 Phase2_WeatherDuo_Func7(struct Task *task)
+static bool8 Phase2_WeatherDuo_Func7(struct Task *task)
 {
     if (!gPaletteFade.active)
     {
@@ -1482,7 +1485,7 @@ bool8 Phase2_WeatherDuo_Func7(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_BigPokeball_Func3(struct Task *task)
+static bool8 Phase2_BigPokeball_Func3(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
     if (task->tData3 == 0 || --task->tData3 == 0)
@@ -1502,7 +1505,7 @@ bool8 Phase2_BigPokeball_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_BigPokeball_Func4(struct Task *task)
+static bool8 Phase2_BigPokeball_Func4(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
     if (task->tData3 == 0 || --task->tData3 == 0)
@@ -1522,7 +1525,7 @@ bool8 Phase2_BigPokeball_Func4(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_BigPokeball_Func5(struct Task *task)
+static bool8 Phase2_BigPokeball_Func5(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
     task->tData4 += 8;
@@ -1542,28 +1545,28 @@ bool8 Phase2_BigPokeball_Func5(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_FramesCountdown(struct Task *task)
+static bool8 Phase2_FramesCountdown(struct Task *task)
 {
     if (--task->tFrames == 0)
         task->tState++;
     return FALSE;
 }
 
-bool8 Phase2_WeatherTrio_Func1(struct Task *task)
+static bool8 Phase2_WeatherTrio_Func1(struct Task *task)
 {
     BeginNormalPaletteFade(0x0000FFFF, 1, 0, 0x10, 0);
     task->tState++;
     return FALSE;
 }
 
-bool8 Phase2_WaitPaletteFade(struct Task *task)
+static bool8 Phase2_WaitPaletteFade(struct Task *task)
 {
     if (!gPaletteFade.active)
         task->tState++;
     return FALSE;
 }
 
-bool8 Phase2_BigPokeball_Func6(struct Task *task)
+static bool8 Phase2_BigPokeball_Func6(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
     if (task->tData2 < 1024)
@@ -1596,7 +1599,7 @@ bool8 Phase2_BigPokeball_Func6(struct Task *task)
     return FALSE;
 }
 
-void Transition_BigPokeball_Vblank(void)
+static void Transition_BigPokeball_Vblank(void)
 {
     DmaStop(0);
     VBlankCB_BattleTransition();
@@ -1609,24 +1612,24 @@ void Transition_BigPokeball_Vblank(void)
     REG_BLDALPHA = sTransitionStructPtr->BLDALPHA;
 }
 
-void VBlankCB0_Phase2_BigPokeball(void)
+static void VBlankCB0_Phase2_BigPokeball(void)
 {
     Transition_BigPokeball_Vblank();
     DmaSet(0, gUnknown_020393A8, &REG_BG0HOFS, 0xA2400001);
 }
 
-void VBlankCB1_Phase2_BigPokeball(void)
+static void VBlankCB1_Phase2_BigPokeball(void)
 {
     Transition_BigPokeball_Vblank();
     DmaSet(0, gUnknown_020393A8, &REG_WIN0H, 0xA2400001);
 }
 
-void Phase2Task_PokeballsTrail(u8 taskId)
+static void Phase2Task_PokeballsTrail(u8 taskId)
 {
     while (sPhase2_PokeballsTrail_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_PokeballsTrail_Func1(struct Task *task)
+static bool8 Phase2_PokeballsTrail_Func1(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -1639,7 +1642,7 @@ bool8 Phase2_PokeballsTrail_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_PokeballsTrail_Func2(struct Task *task)
+static bool8 Phase2_PokeballsTrail_Func2(struct Task *task)
 {
     s16 i;
     s16 rand;
@@ -1662,7 +1665,7 @@ bool8 Phase2_PokeballsTrail_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_PokeballsTrail_Func3(struct Task *task)
+static bool8 Phase2_PokeballsTrail_Func3(struct Task *task)
 {
     if (!FieldEffectActiveListContains(FLDEFF_POKEBALL))
     {
@@ -1691,7 +1694,7 @@ bool8 FldEff_Pokeball(void)
     ptr[index] = toStore;                                               \
 }
 
-void sub_814713C(struct Sprite *sprite)
+static void sub_814713C(struct Sprite *sprite)
 {
     s16 arr0[ARRAY_COUNT(sUnknown_085C8B96)];
 
@@ -1728,12 +1731,12 @@ void sub_814713C(struct Sprite *sprite)
     }
 }
 
-void Phase2Task_Clockwise_BlackFade(u8 taskId)
+static void Phase2Task_Clockwise_BlackFade(u8 taskId)
 {
     while (sPhase2_Clockwise_BlackFade_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task)
+static bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task)
 {
     u16 i;
 
@@ -1757,7 +1760,7 @@ bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task)
+static bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
@@ -1778,7 +1781,7 @@ bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task)
+static bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task)
 {
     s16 r1, r3;
     vu8 var = 0;
@@ -1816,7 +1819,7 @@ bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task)
+static bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
@@ -1837,7 +1840,7 @@ bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task)
+static bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task)
 {
     s16 r1, r2, var4;
     vu8 var = 0;
@@ -1877,7 +1880,7 @@ bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task)
+static bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
@@ -1901,7 +1904,7 @@ bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task)
+static bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task)
 {
     DmaStop(0);
     sub_8149F84();
@@ -1909,7 +1912,7 @@ bool8 Phase2_Clockwise_BlackFade_Func7(struct Task *task)
     return FALSE;
 }
 
-void VBlankCB_Phase2_Clockwise_BlackFade(void)
+static void VBlankCB_Phase2_Clockwise_BlackFade(void)
 {
     DmaStop(0);
     VBlankCB_BattleTransition();
@@ -1922,12 +1925,12 @@ void VBlankCB_Phase2_Clockwise_BlackFade(void)
     DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
 }
 
-void Phase2Task_Ripple(u8 taskId)
+static void Phase2Task_Ripple(u8 taskId)
 {
     while (sPhase2_Ripple_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Ripple_Func1(struct Task *task)
+static bool8 Phase2_Ripple_Func1(struct Task *task)
 {
     u8 i;
 
@@ -1948,7 +1951,7 @@ bool8 Phase2_Ripple_Func1(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_Ripple_Func2(struct Task *task)
+static bool8 Phase2_Ripple_Func2(struct Task *task)
 {
     u8 i;
     s16 r3;
@@ -1984,14 +1987,14 @@ bool8 Phase2_Ripple_Func2(struct Task *task)
     return FALSE;
 }
 
-void VBlankCB_Phase2_Ripple(void)
+static void VBlankCB_Phase2_Ripple(void)
 {
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA)
         DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
 }
 
-void HBlankCB_Phase2_Ripple(void)
+static void HBlankCB_Phase2_Ripple(void)
 {
     u16 var = gUnknown_02038C28[1][REG_VCOUNT];
     REG_BG1VOFS = var;
@@ -1999,12 +2002,12 @@ void HBlankCB_Phase2_Ripple(void)
     REG_BG3VOFS = var;
 }
 
-void Phase2Task_Wave(u8 taskId)
+static void Phase2Task_Wave(u8 taskId)
 {
     while (sPhase2_Wave_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Wave_Func1(struct Task *task)
+static bool8 Phase2_Wave_Func1(struct Task *task)
 {
     u8 i;
 
@@ -2027,7 +2030,7 @@ bool8 Phase2_Wave_Func1(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_Wave_Func2(struct Task *task)
+static bool8 Phase2_Wave_Func2(struct Task *task)
 {
     u8 i, r5;
     u16* toStore;
@@ -2057,7 +2060,7 @@ bool8 Phase2_Wave_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Wave_Func3(struct Task *task)
+static bool8 Phase2_Wave_Func3(struct Task *task)
 {
     DmaStop(0);
     sub_8149F84();
@@ -2065,7 +2068,7 @@ bool8 Phase2_Wave_Func3(struct Task *task)
     return FALSE;
 }
 
-void VBlankCB_Phase2_Wave(void)
+static void VBlankCB_Phase2_Wave(void)
 {
     DmaStop(0);
     VBlankCB_BattleTransition();
@@ -2077,42 +2080,42 @@ void VBlankCB_Phase2_Wave(void)
     DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
 }
 
-void Phase2Task_Sydney(u8 taskId)
+static void Phase2Task_Sydney(u8 taskId)
 {
     gTasks[taskId].tMugshotId = MUGSHOT_SYDNEY;
     Phase2Task_MugShotTransition(taskId);
 }
 
-void Phase2Task_Phoebe(u8 taskId)
+static void Phase2Task_Phoebe(u8 taskId)
 {
     gTasks[taskId].tMugshotId = MUGSHOT_PHOEBE;
     Phase2Task_MugShotTransition(taskId);
 }
 
-void Phase2Task_Glacia(u8 taskId)
+static void Phase2Task_Glacia(u8 taskId)
 {
     gTasks[taskId].tMugshotId = MUGSHOT_GLACIA;
     Phase2Task_MugShotTransition(taskId);
 }
 
-void Phase2Task_Drake(u8 taskId)
+static void Phase2Task_Drake(u8 taskId)
 {
     gTasks[taskId].tMugshotId = MUGSHOT_DRAKE;
     Phase2Task_MugShotTransition(taskId);
 }
 
-void Phase2Task_Champion(u8 taskId)
+static void Phase2Task_Champion(u8 taskId)
 {
     gTasks[taskId].tMugshotId = MUGSHOT_CHAMPION;
     Phase2Task_MugShotTransition(taskId);
 }
 
-void Phase2Task_MugShotTransition(u8 taskId)
+static void Phase2Task_MugShotTransition(u8 taskId)
 {
     while (sPhase2_Mugshot_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Mugshot_Func1(struct Task *task)
+static bool8 Phase2_Mugshot_Func1(struct Task *task)
 {
     u8 i;
 
@@ -2138,7 +2141,7 @@ bool8 Phase2_Mugshot_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Mugshot_Func2(struct Task *task)
+static bool8 Phase2_Mugshot_Func2(struct Task *task)
 {
     s16 i, j;
     u16 *dst1, *dst2;
@@ -2165,7 +2168,7 @@ bool8 Phase2_Mugshot_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Mugshot_Func3(struct Task *task)
+static bool8 Phase2_Mugshot_Func3(struct Task *task)
 {
     u8 i, r5;
     u16* toStore;
@@ -2213,7 +2216,7 @@ bool8 Phase2_Mugshot_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Mugshot_Func4(struct Task *task)
+static bool8 Phase2_Mugshot_Func4(struct Task *task)
 {
     u8 i;
     u16* toStore;
@@ -2242,7 +2245,7 @@ bool8 Phase2_Mugshot_Func4(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Mugshot_Func5(struct Task *task)
+static bool8 Phase2_Mugshot_Func5(struct Task *task)
 {
     sTransitionStructPtr->field_18 -= 8;
     sTransitionStructPtr->field_1A += 8;
@@ -2254,7 +2257,7 @@ bool8 Phase2_Mugshot_Func5(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Mugshot_Func6(struct Task *task)
+static bool8 Phase2_Mugshot_Func6(struct Task *task)
 {
     sTransitionStructPtr->field_18 -= 8;
     sTransitionStructPtr->field_1A += 8;
@@ -2276,7 +2279,7 @@ bool8 Phase2_Mugshot_Func6(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Mugshot_Func7(struct Task *task)
+static bool8 Phase2_Mugshot_Func7(struct Task *task)
 {
     bool32 r6;
 
@@ -2317,7 +2320,7 @@ bool8 Phase2_Mugshot_Func7(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Mugshot_Func8(struct Task *task)
+static bool8 Phase2_Mugshot_Func8(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
     BlendPalettes(-1, 0x10, 0x7FFF);
@@ -2328,7 +2331,7 @@ bool8 Phase2_Mugshot_Func8(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_Mugshot_Func9(struct Task *task)
+static bool8 Phase2_Mugshot_Func9(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
@@ -2341,7 +2344,7 @@ bool8 Phase2_Mugshot_Func9(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Mugshot_Func10(struct Task *task)
+static bool8 Phase2_Mugshot_Func10(struct Task *task)
 {
     DmaStop(0);
     sub_8149F84();
@@ -2349,7 +2352,7 @@ bool8 Phase2_Mugshot_Func10(struct Task *task)
     return FALSE;
 }
 
-void VBlankCB0_Phase2_Mugshots(void)
+static void VBlankCB0_Phase2_Mugshots(void)
 {
     DmaStop(0);
     VBlankCB_BattleTransition();
@@ -2362,7 +2365,7 @@ void VBlankCB0_Phase2_Mugshots(void)
     DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
 }
 
-void VBlankCB1_Phase2_Mugshots(void)
+static void VBlankCB1_Phase2_Mugshots(void)
 {
     DmaStop(0);
     VBlankCB_BattleTransition();
@@ -2372,7 +2375,7 @@ void VBlankCB1_Phase2_Mugshots(void)
     DmaSet(0, gUnknown_02038C28[1], &REG_BLDY, 0xA2400001);
 }
 
-void HBlankCB_Phase2_Mugshots(void)
+static void HBlankCB_Phase2_Mugshots(void)
 {
     if (REG_VCOUNT < 80)
         REG_BG0HOFS = sTransitionStructPtr->field_18;
@@ -2380,7 +2383,7 @@ void HBlankCB_Phase2_Mugshots(void)
         REG_BG0HOFS = sTransitionStructPtr->field_1A;
 }
 
-void Mugshots_CreateOpponentPlayerSprites(struct Task *task)
+static void Mugshots_CreateOpponentPlayerSprites(struct Task *task)
 {
     struct Sprite *opponentSprite, *playerSprite;
 
@@ -2416,17 +2419,17 @@ void Mugshots_CreateOpponentPlayerSprites(struct Task *task)
     SetOamMatrixRotationScaling(playerSprite->oam.matrixNum, -512, 512, 0);
 }
 
-void sub_8148380(struct Sprite *sprite)
+static void sub_8148380(struct Sprite *sprite)
 {
     while (sUnknown_085C8C24[sprite->data[0]](sprite));
 }
 
-bool8 sub_81483A8(struct Sprite *sprite)
+static bool8 sub_81483A8(struct Sprite *sprite)
 {
     return FALSE;
 }
 
-bool8 sub_81483AC(struct Sprite *sprite)
+static bool8 sub_81483AC(struct Sprite *sprite)
 {
     s16 arr0[2];
     s16 arr1[2];
@@ -2440,7 +2443,7 @@ bool8 sub_81483AC(struct Sprite *sprite)
     return TRUE;
 }
 
-bool8 sub_81483F8(struct Sprite *sprite)
+static bool8 sub_81483F8(struct Sprite *sprite)
 {
     sprite->pos1.x += sprite->data[1];
     if (sprite->data[7] && sprite->pos1.x < 133)
@@ -2450,7 +2453,7 @@ bool8 sub_81483F8(struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_814842C(struct Sprite *sprite)
+static bool8 sub_814842C(struct Sprite *sprite)
 {
     sprite->data[1] += sprite->data[2];
     sprite->pos1.x += sprite->data[1];
@@ -2463,7 +2466,7 @@ bool8 sub_814842C(struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8148458(struct Sprite *sprite)
+static bool8 sub_8148458(struct Sprite *sprite)
 {
     sprite->data[1] += sprite->data[2];
     sprite->pos1.x += sprite->data[1];
@@ -2472,27 +2475,27 @@ bool8 sub_8148458(struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_8148484(s16 spriteId, s16 value)
+static void sub_8148484(s16 spriteId, s16 value)
 {
     gSprites[spriteId].data[7] = value;
 }
 
-void sub_814849C(s16 spriteId)
+static void sub_814849C(s16 spriteId)
 {
     gSprites[spriteId].data[0]++;
 }
 
-s16 sub_81484B8(s16 spriteId)
+static s16 sub_81484B8(s16 spriteId)
 {
     return gSprites[spriteId].data[6];
 }
 
-void Phase2Task_Slice(u8 taskId)
+static void Phase2Task_Slice(u8 taskId)
 {
     while (sPhase2_Slice_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Slice_Func1(struct Task *task)
+static bool8 Phase2_Slice_Func1(struct Task *task)
 {
     u16 i;
 
@@ -2522,7 +2525,7 @@ bool8 Phase2_Slice_Func1(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_Slice_Func2(struct Task *task)
+static bool8 Phase2_Slice_Func2(struct Task *task)
 {
     u16 i;
 
@@ -2559,7 +2562,7 @@ bool8 Phase2_Slice_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Slice_Func3(struct Task *task)
+static bool8 Phase2_Slice_Func3(struct Task *task)
 {
     DmaStop(0);
     sub_8149F84();
@@ -2567,7 +2570,7 @@ bool8 Phase2_Slice_Func3(struct Task *task)
     return FALSE;
 }
 
-void VBlankCB_Phase2_Slice(void)
+static void VBlankCB_Phase2_Slice(void)
 {
     DmaStop(0);
     VBlankCB_BattleTransition();
@@ -2579,7 +2582,7 @@ void VBlankCB_Phase2_Slice(void)
     DmaSet(0, &gUnknown_02038C28[1][160], &REG_WIN0H, 0xA2400001);
 }
 
-void HBlankCB_Phase2_Slice(void)
+static void HBlankCB_Phase2_Slice(void)
 {
     if (REG_VCOUNT < 160)
     {
@@ -2590,12 +2593,12 @@ void HBlankCB_Phase2_Slice(void)
     }
 }
 
-void Phase2Task_ShredSplit(u8 taskId)
+static void Phase2Task_ShredSplit(u8 taskId)
 {
     while (sPhase2_ShredSplit_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_ShredSplit_Func1(struct Task *task)
+static bool8 Phase2_ShredSplit_Func1(struct Task *task)
 {
     u16 i;
 
@@ -2630,7 +2633,7 @@ bool8 Phase2_ShredSplit_Func1(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_ShredSplit_Func2(struct Task *task)
+static bool8 Phase2_ShredSplit_Func2(struct Task *task)
 {
     u16 i, j, k;
     u8 arr1[ARRAY_COUNT(gUnknown_085C8C64)];
@@ -2727,7 +2730,7 @@ bool8 Phase2_ShredSplit_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_ShredSplit_Func3(struct Task *task)
+static bool8 Phase2_ShredSplit_Func3(struct Task *task)
 {
     u16 i;
     bool32 done = TRUE;
@@ -2745,7 +2748,7 @@ bool8 Phase2_ShredSplit_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_ShredSplit_Func4(struct Task *task)
+static bool8 Phase2_ShredSplit_Func4(struct Task *task)
 {
     DmaStop(0);
     sub_8149F84();
@@ -2753,17 +2756,17 @@ bool8 Phase2_ShredSplit_Func4(struct Task *task)
     return FALSE;
 }
 
-void Phase2Task_Blackhole1(u8 taskId)
+static void Phase2Task_Blackhole1(u8 taskId)
 {
     while (sPhase2_Blackhole1_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void Phase2Task_Blackhole2(u8 taskId)
+static void Phase2Task_Blackhole2(u8 taskId)
 {
     while (sPhase2_Blackhole2_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Blackhole_Func1(struct Task *task)
+static bool8 Phase2_Blackhole_Func1(struct Task *task)
 {
     s32 i;
 
@@ -2790,7 +2793,7 @@ bool8 Phase2_Blackhole_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Blackhole1_Func3(struct Task *task)
+static bool8 Phase2_Blackhole1_Func3(struct Task *task)
 {
     if (task->tFuncState == 1)
     {
@@ -2822,7 +2825,7 @@ bool8 Phase2_Blackhole1_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Blackhole1_Func2(struct Task *task)
+static bool8 Phase2_Blackhole1_Func2(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = FALSE;
     if (task->tFuncState == 0)
@@ -2844,7 +2847,7 @@ bool8 Phase2_Blackhole1_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Blackhole2_Func2(struct Task *task)
+static bool8 Phase2_Blackhole2_Func2(struct Task *task)
 {
     u16 index; // should be s16 I think
     s16 amplitude;
@@ -2889,12 +2892,12 @@ bool8 Phase2_Blackhole2_Func2(struct Task *task)
     return FALSE;
 }
 
-void Phase2Task_RectangularSpiral(u8 taskId)
+static void Phase2Task_RectangularSpiral(u8 taskId)
 {
     while (sPhase2_RectangularSpiral_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_RectangularSpiral_Func1(struct Task *task)
+static bool8 Phase2_RectangularSpiral_Func1(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -2934,7 +2937,7 @@ bool8 Phase2_RectangularSpiral_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_RectangularSpiral_Func2(struct Task *task)
+static bool8 Phase2_RectangularSpiral_Func2(struct Task *task)
 {
     u16 *dst1, *dst2;
     u8 i;
@@ -2972,7 +2975,7 @@ bool8 Phase2_RectangularSpiral_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_RectangularSpiral_Func3(struct Task *task)
+static bool8 Phase2_RectangularSpiral_Func3(struct Task *task)
 {
     DmaStop(0);
     sub_8149F84();
@@ -2980,7 +2983,7 @@ bool8 Phase2_RectangularSpiral_Func3(struct Task *task)
     return FALSE;
 }
 
-bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1)
+static bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1)
 {
     const s16 *array = arg0[arg1->field_0];
     if (array[arg1->field_4] == -1)
@@ -3043,12 +3046,12 @@ bool16 sub_8149048(const s16 * const *arg0, struct StructRectangularSpiral *arg1
     return TRUE;
 }
 
-void Phase2Task_Groudon(u8 taskId)
+static void Phase2Task_Groudon(u8 taskId)
 {
     while (sPhase2_Groudon_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Groudon_Func3(struct Task *task)
+static bool8 Phase2_Groudon_Func3(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -3062,7 +3065,7 @@ bool8 Phase2_Groudon_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Groudon_Func4(struct Task *task)
+static bool8 Phase2_Groudon_Func4(struct Task *task)
 {
     if (task->tData1 % 3 == 0)
     {
@@ -3078,7 +3081,7 @@ bool8 Phase2_Groudon_Func4(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Groudon_Func5(struct Task *task)
+static bool8 Phase2_Groudon_Func5(struct Task *task)
 {
     if (task->tData1 % 5 == 0)
     {
@@ -3095,12 +3098,12 @@ bool8 Phase2_Groudon_Func5(struct Task *task)
     return FALSE;
 }
 
-void Phase2Task_Rayquaza(u8 taskId)
+static void Phase2Task_Rayquaza(u8 taskId)
 {
     while (sPhase2_Rayquaza_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Rayquaza_Func3(struct Task *task)
+static bool8 Phase2_Rayquaza_Func3(struct Task *task)
 {
     u16 *dst1, *dst2;
     u16 i;
@@ -3127,7 +3130,7 @@ bool8 Phase2_Rayquaza_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Rayquaza_Func4(struct Task *task)
+static bool8 Phase2_Rayquaza_Func4(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -3137,7 +3140,7 @@ bool8 Phase2_Rayquaza_Func4(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Rayquaza_Func5(struct Task *task)
+static bool8 Phase2_Rayquaza_Func5(struct Task *task)
 {
     if ((task->tData1 % 4) == 0)
     {
@@ -3154,7 +3157,7 @@ bool8 Phase2_Rayquaza_Func5(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Rayquaza_Func6(struct Task *task)
+static bool8 Phase2_Rayquaza_Func6(struct Task *task)
 {
     if (++task->tData1 > 20)
     {
@@ -3166,7 +3169,7 @@ bool8 Phase2_Rayquaza_Func6(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Rayquaza_Func7(struct Task *task)
+static bool8 Phase2_Rayquaza_Func7(struct Task *task)
 {
     if (!gPaletteFade.active)
     {
@@ -3177,7 +3180,7 @@ bool8 Phase2_Rayquaza_Func7(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Rayquaza_Func8(struct Task *task)
+static bool8 Phase2_Rayquaza_Func8(struct Task *task)
 {
     BlendPalettes(0x00007FFF, 8, 0);
     BlendPalettes(0xFFFF8000, 0, 0);
@@ -3186,7 +3189,7 @@ bool8 Phase2_Rayquaza_Func8(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Rayquaza_Func9(struct Task *task)
+static bool8 Phase2_Rayquaza_Func9(struct Task *task)
 {
     if ((task->tData1 % 3) == 0)
     {
@@ -3218,7 +3221,7 @@ bool8 Phase2_Rayquaza_Func9(struct Task *task)
     return FALSE;
 }
 
-void VBlankCB_Phase2_Rayquaza(void)
+static void VBlankCB_Phase2_Rayquaza(void)
 {
     void *dmaSrc;
 
@@ -3235,12 +3238,12 @@ void VBlankCB_Phase2_Rayquaza(void)
     DmaSet(0, dmaSrc, &REG_BG0VOFS, 0xA2400001);
 }
 
-void Phase2Task_WhiteFade(u8 taskId)
+static void Phase2Task_WhiteFade(u8 taskId)
 {
     while (sPhase2_WhiteFade_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_WhiteFade_Func1(struct Task *task)
+static bool8 Phase2_WhiteFade_Func1(struct Task *task)
 {
     u16 i;
 
@@ -3267,7 +3270,7 @@ bool8 Phase2_WhiteFade_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_WhiteFade_Func2(struct Task *task)
+static bool8 Phase2_WhiteFade_Func2(struct Task *task)
 {
     s16 i, posY;
     s16 arr1[ARRAY_COUNT(sUnknown_085C8DA0)];
@@ -3287,7 +3290,7 @@ bool8 Phase2_WhiteFade_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_WhiteFade_Func3(struct Task *task)
+static bool8 Phase2_WhiteFade_Func3(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = 0;
     if (sTransitionStructPtr->field_20 > 7)
@@ -3298,7 +3301,7 @@ bool8 Phase2_WhiteFade_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_WhiteFade_Func4(struct Task *task)
+static bool8 Phase2_WhiteFade_Func4(struct Task *task)
 {
     sTransitionStructPtr->VBlank_DMA = 0;
 
@@ -3317,7 +3320,7 @@ bool8 Phase2_WhiteFade_Func4(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_WhiteFade_Func5(struct Task *task)
+static bool8 Phase2_WhiteFade_Func5(struct Task *task)
 {
    if (++sTransitionStructPtr->BLDY > 16)
    {
@@ -3327,7 +3330,7 @@ bool8 Phase2_WhiteFade_Func5(struct Task *task)
    return FALSE;
 }
 
-void VBlankCB0_Phase2_WhiteFade(void)
+static void VBlankCB0_Phase2_WhiteFade(void)
 {
     DmaStop(0);
     VBlankCB_BattleTransition();
@@ -3340,7 +3343,7 @@ void VBlankCB0_Phase2_WhiteFade(void)
     DmaSet(0, &gUnknown_02038C28[1][160], &REG_WIN0H, 0xA2400001);
 }
 
-void VBlankCB1_Phase2_WhiteFade(void)
+static void VBlankCB1_Phase2_WhiteFade(void)
 {
     VBlankCB_BattleTransition();
     REG_BLDY = sTransitionStructPtr->BLDY;
@@ -3351,12 +3354,12 @@ void VBlankCB1_Phase2_WhiteFade(void)
     REG_WIN0V = sTransitionStructPtr->WIN0V;
 }
 
-void HBlankCB_Phase2_WhiteFade(void)
+static void HBlankCB_Phase2_WhiteFade(void)
 {
     REG_BLDY = gUnknown_02038C28[1][REG_VCOUNT];
 }
 
-void sub_8149864(struct Sprite *sprite)
+static void sub_8149864(struct Sprite *sprite)
 {
     if (sprite->data[5])
     {
@@ -3399,12 +3402,12 @@ void sub_8149864(struct Sprite *sprite)
     }
 }
 
-void Phase2Task_GridSquares(u8 taskId)
+static void Phase2Task_GridSquares(u8 taskId)
 {
     while (sPhase2_GridSquares_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_GridSquares_Func1(struct Task *task)
+static bool8 Phase2_GridSquares_Func1(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -3417,7 +3420,7 @@ bool8 Phase2_GridSquares_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_GridSquares_Func2(struct Task *task)
+static bool8 Phase2_GridSquares_Func2(struct Task *task)
 {
     u16* dst1;
 
@@ -3438,7 +3441,7 @@ bool8 Phase2_GridSquares_Func2(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_GridSquares_Func3(struct Task *task)
+static bool8 Phase2_GridSquares_Func3(struct Task *task)
 {
     if (--task->tData1 == 0)
     {
@@ -3448,12 +3451,12 @@ bool8 Phase2_GridSquares_Func3(struct Task *task)
     return FALSE;
 }
 
-void Phase2Task_Shards(u8 taskId)
+static void Phase2Task_Shards(u8 taskId)
 {
     while (sPhase2_Shards_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_Shards_Func1(struct Task *task)
+static bool8 Phase2_Shards_Func1(struct Task *task)
 {
     u16 i;
 
@@ -3476,7 +3479,7 @@ bool8 Phase2_Shards_Func1(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_Shards_Func2(struct Task *task)
+static bool8 Phase2_Shards_Func2(struct Task *task)
 {
     sub_814A1AC(sTransitionStructPtr->data,
                 sUnknown_085C8DD0[task->tData1][0],
@@ -3489,7 +3492,7 @@ bool8 Phase2_Shards_Func2(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_Shards_Func3(struct Task *task)
+static bool8 Phase2_Shards_Func3(struct Task *task)
 {
     s16 i;
     bool8 nextFunc;
@@ -3528,7 +3531,7 @@ bool8 Phase2_Shards_Func3(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_Shards_Func4(struct Task *task)
+static bool8 Phase2_Shards_Func4(struct Task *task)
 {
     if (++task->tData1 < 7)
     {
@@ -3545,7 +3548,7 @@ bool8 Phase2_Shards_Func4(struct Task *task)
     }
 }
 
-bool8 Phase2_Shards_Func5(struct Task *task)
+static bool8 Phase2_Shards_Func5(struct Task *task)
 {
     if (--task->tData3 == 0)
     {
@@ -3556,7 +3559,7 @@ bool8 Phase2_Shards_Func5(struct Task *task)
         return FALSE;
 }
 
-void VBlankCB_Phase2_Shards(void)
+static void VBlankCB_Phase2_Shards(void)
 {
     DmaStop(0);
     VBlankCB_BattleTransition();
@@ -3591,9 +3594,9 @@ void VBlankCB_Phase2_Shards(void)
 #define tData6      data[6]
 #define tData7      data[7]
 
-void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4)
+static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4)
 {
-    u8 taskId = CreateTask(Phase1_Task_RunFuncs, 3);
+    u8 taskId = CreateTask(TransitionPhase1_Task_RunFuncs, 3);
     gTasks[taskId].tData1 = a0;
     gTasks[taskId].tData2 = a1;
     gTasks[taskId].tData3 = a2;
@@ -3602,20 +3605,20 @@ void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4)
     gTasks[taskId].tData6 = a0;
 }
 
-bool8 IsPhase1Done(void)
+static bool8 IsPhase1Done(void)
 {
-    if (FindTaskIdByFunc(Phase1_Task_RunFuncs) == 0xFF)
+    if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF)
         return TRUE;
     else
         return FALSE;
 }
 
-void Phase1_Task_RunFuncs(u8 taskId)
+void TransitionPhase1_Task_RunFuncs(u8 taskId)
 {
     while (sPhase1_TransitionAll_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase1_TransitionAll_Func1(struct Task *task)
+static bool8 Phase1_TransitionAll_Func1(struct Task *task)
 {
     if (task->tData6 == 0 || --task->tData6 == 0)
     {
@@ -3633,7 +3636,7 @@ bool8 Phase1_TransitionAll_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase1_TransitionAll_Func2(struct Task *task)
+static bool8 Phase1_TransitionAll_Func2(struct Task *task)
 {
     if (task->tData6 == 0 || --task->tData6 == 0)
     {
@@ -3646,7 +3649,7 @@ bool8 Phase1_TransitionAll_Func2(struct Task *task)
     if (task->tData7 == 0)
     {
         if (--task->tData3 == 0)
-            DestroyTask(FindTaskIdByFunc(Phase1_Task_RunFuncs));
+            DestroyTask(FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs));
         else
         {
             task->tData6 = task->tData1;
@@ -3664,20 +3667,20 @@ bool8 Phase1_TransitionAll_Func2(struct Task *task)
 #undef tData6
 #undef tData7
 
-void sub_8149F08(void)
+static void sub_8149F08(void)
 {
     memset(sTransitionStructPtr, 0, sizeof(*sTransitionStructPtr));
     sub_8089C08(&sTransitionStructPtr->field_14, &sTransitionStructPtr->field_16);
 }
 
-void VBlankCB_BattleTransition(void)
+static void VBlankCB_BattleTransition(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void sub_8149F40(u16 **a0)
+static void sub_8149F40(u16 **a0)
 {
     u16 reg, *vram;
 
@@ -3705,12 +3708,12 @@ void sub_8149F58(u16 **a0, u16 **a1)
     *a1 = vram1;
 }
 
-void sub_8149F84(void)
+static void sub_8149F84(void)
 {
     BlendPalettes(-1, 0x10, 0);
 }
 
-void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize)
+static void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize)
 {
     u8 i;
     for (i = 0; arrSize > 0; arrSize--, i++, index += indexIncrementer)
@@ -3719,7 +3722,7 @@ void sub_8149F98(s16 *array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 am
     }
 }
 
-void sub_814A014(u16 *array, s16 a1, s16 a2, s16 a3)
+static void sub_814A014(u16 *array, s16 a1, s16 a2, s16 a3)
 {
     s16 i;
 
@@ -3771,7 +3774,7 @@ void sub_814A014(u16 *array, s16 a1, s16 a2, s16 a3)
     }
 }
 
-void sub_814A1AC(s16 *data, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6)
+static void sub_814A1AC(s16 *data, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6)
 {
     data[0] = a1;
     data[1] = a2;
@@ -3796,7 +3799,7 @@ void sub_814A1AC(s16 *data, s16 a1, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6)
     data[10] = 0;
 }
 
-bool8 sub_814A228(s16 *data, bool8 a1, bool8 a2)
+static bool8 sub_814A228(s16 *data, bool8 a1, bool8 a2)
 {
     u8 var;
     if (data[8] > data[9])
@@ -3848,7 +3851,7 @@ bool8 sub_814A228(s16 *data, bool8 a1, bool8 a2)
 #define tData6      data[6]
 #define tData7      data[7]
 
-bool8 Phase2_29_Func1(struct Task *task)
+static bool8 Phase2_29_Func1(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -3862,7 +3865,7 @@ bool8 Phase2_29_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_29_Func2(struct Task *task)
+static bool8 Phase2_29_Func2(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -3874,28 +3877,28 @@ bool8 Phase2_29_Func2(struct Task *task)
     return TRUE;
 }
 
-void Phase2Task_29(u8 taskId)
+static void Phase2Task_29(u8 taskId)
 {
     while (sPhase2_29_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void Phase2Task_30(u8 taskId)
+static void Phase2Task_30(u8 taskId)
 {
     while (sPhase2_30_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-bool8 Phase2_30_Func1(struct Task *task)
+static bool8 Phase2_30_Func1(struct Task *task)
 {
     u16 *dst1, *dst2;
 
     sub_8149F08();
     dp12_8087EA4();
     ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_WIN1_ON);
-    task->data[2] = 0x2000;
-    task->data[1] = 0x7FFF;
-    task->data[5] = 0;
-    task->data[6] = 16;
-    task->data[7] = 2560;
+    task->tData2 = 0x2000;
+    task->tData1 = 0x7FFF;
+    task->tData5 = 0;
+    task->tData6 = 16;
+    task->tData7 = 2560;
     sTransitionStructPtr->BLDCNT = 0x3F41;
     sTransitionStructPtr->BLDALPHA = (task->tData6 << 8) | (task->tData5);
     REG_BLDCNT = sTransitionStructPtr->BLDCNT;
@@ -3910,7 +3913,7 @@ bool8 Phase2_30_Func1(struct Task *task)
     return FALSE;
 }
 
-bool8 Phase2_30_Func2(struct Task *task)
+static bool8 Phase2_30_Func2(struct Task *task)
 {
     u16 *dst1, *dst2;
 
@@ -3921,7 +3924,7 @@ bool8 Phase2_30_Func2(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_30_Func3(struct Task *task)
+static bool8 Phase2_30_Func3(struct Task *task)
 {
     u8 i;
 
@@ -3938,7 +3941,7 @@ bool8 Phase2_30_Func3(struct Task *task)
     return TRUE;
 }
 
-bool8 Phase2_30_Func4(struct Task *task)
+static bool8 Phase2_30_Func4(struct Task *task)
 {
     u8 i;
     u16 var6, amplitude, var8;
@@ -3990,7 +3993,7 @@ bool8 Phase2_30_Func4(struct Task *task)
     return FALSE;
 }
 
-void VBlankCB_Phase2_30(void)
+static void VBlankCB_Phase2_30(void)
 {
     VBlankCB_BattleTransition();
     REG_BLDCNT = sTransitionStructPtr->BLDCNT;
@@ -4000,27 +4003,340 @@ void VBlankCB_Phase2_30(void)
         DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
 }
 
-void HBlankCB_Phase2_30(void)
+static void HBlankCB_Phase2_30(void)
 {
     u16 var = gUnknown_02038C28[1][REG_VCOUNT];
     REG_BG0VOFS = var;
 }
 
-void Phase2Task_31(u8 taskId)
+static void Phase2Task_31(u8 taskId)
 {
     while (sPhase2_31_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void Phase2Task_33(u8 taskId)
+static void Phase2Task_33(u8 taskId)
 {
     while (sPhase2_33_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
-void Phase2Task_32(u8 taskId)
+static void Phase2Task_32(u8 taskId)
 {
     while (sPhase2_32_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
 }
 
+static bool8 Phase2_31_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LZ77UnCompVram(gUnknown_085C8598, dst2);
+
+    FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
+    FillBgTilemapBufferRect(0, 1, 0, 0, 1, 0x20, 0xF);
+    FillBgTilemapBufferRect(0, 1, 0x1D, 0, 1, 0x20, 0xF);
+    CopyBgTilemapBufferToVram(0);
+    LoadPalette(gUnknown_085C8578, 0xF0, 0x20);
+
+    task->tData2 = 1;
+    task->tData3 = 0;
+    task->tData4 = 0;
+    task->tData7 = 10;
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 Phase2_31_Func2(struct Task *task)
+{
+    CopyRectToBgTilemapBufferRect(0, gUnknown_085C8928, 0, 0, 4, 4, task->tData2, task->tData3, 4, 4, 0xF, 0, 0);
+    CopyBgTilemapBufferToVram(0);
+
+    task->tData2 += 4;
+    if (++task->tData4 == 7)
+    {
+        task->tData2 = 1;
+        task->tData3 += 4;
+        task->tData4 = 0;
+        if (task->tData3 > 19)
+            task->tState++;
+    }
+
+    return FALSE;
+}
+
+static bool8 Phase2_31_Func3(struct Task *task)
+{
+    u8 i;
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    if (task->tData6++ >= task->tData7)
+    {
+        switch (task->tData5)
+        {
+        case 0:
+            for (i = 250; i < 255; i++)
+            {
+                gPlttBufferUnfaded[i] = 0;
+                gPlttBufferFaded[i] = 0;
+            }
+            break;
+        case 1:
+            BlendPalettes(0xFFFF7FFF, 0x10, 0);
+            LZ77UnCompVram(gUnknown_085C86F4, dst2);
+            break;
+        case 2:
+            LZ77UnCompVram(gUnknown_085C87F4, dst2);
+            break;
+        case 3:
+            LZ77UnCompVram(gUnknown_085C88A4, dst2);
+            break;
+        default:
+            FillBgTilemapBufferRect_Palette0(0, 1, 0, 0, 0x20, 0x20);
+            CopyBgTilemapBufferToVram(0);
+            task->tState++;
+            return FALSE;
+        }
+
+        task->tData6 = 0;
+        task->tData5++;
+    }
+
+    return FALSE;
+}
+
+static bool8 Phase2_33_Func1(struct Task *task)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LZ77UnCompVram(gUnknown_085C8598, dst2);
+
+    FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
+    FillBgTilemapBufferRect(0, 1, 0, 0, 1, 0x20, 0xF);
+    FillBgTilemapBufferRect(0, 1, 0x1D, 0, 1, 0x20, 0xF);
+    CopyBgTilemapBufferToVram(0);
+    LoadPalette(gUnknown_085C8578, 0xE0, 0x20);
+    LoadPalette(gUnknown_085C8578, 0xF0, 0x20);
+    BlendPalette(0xE0, 0x10, 8, 0);
+
+    task->tData2 = 34;
+    task->tData3 = 0;
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 Phase2_33_Func2(struct Task *task)
+{
+    u8 var = gUnknown_085C9A30[task->tData2];
+    u8 varMod = var % 7;
+    u8 varDiv = var / 7;
+    CopyRectToBgTilemapBufferRect(0, &gUnknown_085C8928, 0, 0, 4, 4, 4 * varMod + 1, 4 * varDiv, 4, 4, 0xF, 0, 0);
+    CopyBgTilemapBufferToVram(0);
+
+    if (--task->tData2 < 0)
+        task->tState++;
+    return FALSE;
+}
+
+static bool8 Phase2_33_Func3(struct Task *task)
+{
+    BlendPalette(0xE0, 0x10, 3, 0);
+    BlendPalettes(0xFFFF3FFF, 0x10, 0);
+
+    task->tData2 = 0;
+    task->tData3 = 0;
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 Phase2_33_Func4(struct Task *task)
+{
+    if ((task->tData3 ^= 1))
+    {
+        CopyRectToBgTilemapBufferRect(
+        0,
+        gUnknown_085C8928,
+        0,
+        0,
+        4,
+        4,
+        4 * (gUnknown_085C9A30[task->tData2] % 7) + 1,
+        4 * (gUnknown_085C9A30[task->tData2] / 7),
+        4,
+        4,
+        0xE,
+        0,
+        0);
+    }
+    else
+    {
+        if (task->tData2 > 0)
+        {
+            FillBgTilemapBufferRect(
+            0,
+            1,
+            4 * (gUnknown_085C9A30[task->tData2 - 1] % 7) + 1,
+            4 * (gUnknown_085C9A30[task->tData2 - 1] / 7),
+            4,
+            4,
+            0xF);
+        }
+
+        task->tData2++;
+    }
+
+    if (task->tData2 > 34)
+        task->tState++;
+
+    CopyBgTilemapBufferToVram(0);
+    return FALSE;
+}
+
+static bool8 Phase2_31_33_Func5(struct Task *task)
+{
+    FillBgTilemapBufferRect_Palette0(0, 1, 0, 0, 0x20, 0x20);
+    CopyBgTilemapBufferToVram(0);
+    BlendPalettes(0xFFFFFFFF, 0x10, 0);
+    DestroyTask(FindTaskIdByFunc(task->func));
+    return FALSE;
+}
+
+// sub task for phase2 32
+#define tSub32_X_delta  data[0]
+#define tSub32_Y_delta  data[1]
+#define tSub32_Bool     data[2]
+
+static void sub_814ABE4(u8 taskId)
+{
+    if (!(gTasks[taskId].tSub32_Bool ^= 1))
+    {
+        SetGpuReg(REG_OFFSET_BG0VOFS, gBattle_BG0_X);
+        SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_Y);
+        gBattle_BG0_X += gTasks[taskId].tSub32_X_delta;
+        gBattle_BG0_Y += gTasks[taskId].tSub32_Y_delta;
+    }
+}
+
+static bool8 Phase2_32_Func1(struct Task *task)
+{
+    u8 taskId = 0;
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LZ77UnCompVram(gUnknown_085C8598, dst2);
+    FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
+    CopyBgTilemapBufferToVram(0);
+    LoadPalette(gUnknown_085C8578, 0xF0, 0x20);
+
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    SetGpuReg(REG_OFFSET_BG0VOFS, gBattle_BG0_X);
+    SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_Y);
+
+    task->tData2 = 0;
+    taskId = CreateTask(sub_814ABE4, 1);
+    switch (Random() % 4)
+    {
+    case 0:
+        gTasks[taskId].tSub32_X_delta = 1;
+        gTasks[taskId].tSub32_Y_delta = 1;
+        break;
+    case 1:
+        gTasks[taskId].tSub32_X_delta = -1;
+        gTasks[taskId].tSub32_Y_delta = -1;
+        break;
+    case 2:
+        gTasks[taskId].tSub32_X_delta = 1;
+        gTasks[taskId].tSub32_Y_delta = -1;
+        break;
+    default:
+        gTasks[taskId].tSub32_X_delta = -1;
+        gTasks[taskId].tSub32_Y_delta = 1;
+        break;
+    }
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 Phase2_32_Func2(struct Task *task)
+{
+    u8 var = gUnknown_085C9A53[task->tData2];
+    u8 varDiv = var / 8;
+    u8 varAnd = var & 7;
+
+    CopyRectToBgTilemapBufferRect(
+    0,
+    &gUnknown_085C8928,
+    0,
+    0,
+    4,
+    4,
+    4 * varDiv + 1,
+    4 * varAnd,
+    4,
+    4,
+    0xF,
+    0,
+    0);
+    CopyBgTilemapBufferToVram(0);
+
+    if (++task->tData2 > 63)
+        task->tState++;
+    return 0;
+}
+
+static bool8 Phase2_32_Func3(struct Task *task)
+{
+    BlendPalettes(0xFFFF7FFF, 0x10, 0);
+
+    task->tData2 = 0;
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 Phase2_32_Func4(struct Task *task)
+{
+    u8 var = gUnknown_085C9A53[task->tData2];
+    u8 varDiv = var / 8;
+    u8 varAnd = var & 7;
+
+    FillBgTilemapBufferRect(0, 1, 4 * varDiv + 1, 4 * varAnd, 4, 4, 0xF);
+    CopyBgTilemapBufferToVram(0);
+
+    if (++task->tData2 > 63)
+    {
+        DestroyTask(FindTaskIdByFunc(sub_814ABE4));
+        task->tState++;
+    }
+
+    return FALSE;
+}
+
+#undef tSub32_X_delta
+#undef tSub32_Y_delta
+#undef tSub32_Bool
+
+static bool8 Phase2_32_Func5(struct Task *task)
+{
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    SetGpuReg(REG_OFFSET_BG0VOFS, 0);
+    SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_Y);
+
+    FillBgTilemapBufferRect_Palette0(0, 1, 0, 0, 0x20, 0x20);
+    CopyBgTilemapBufferToVram(0);
+    BlendPalettes(0xFFFFFFFF, 0x10, 0);
+
+    DestroyTask(FindTaskIdByFunc(task->func));
+    task->tState++; // UB: changing value of a destroyed task
+    return FALSE;
+}
+
 #undef tData1
 #undef tData2
 #undef tData3
diff --git a/src/tileset_anims.c b/src/tileset_anims.c
index 062647202..f89cfdd2b 100644
--- a/src/tileset_anims.c
+++ b/src/tileset_anims.c
@@ -1393,7 +1393,7 @@ static void sub_80A1818(u16 a1)
 {
     CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
     BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
-    if ((u8)FindTaskIdByFunc(Phase1_Task_RunFuncs) != 0xFF )
+    if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) != 0xFF )
     {
         sSecondaryTilesetCB = sub_80A1670;
         sSecondaryTilesetCBBufferSize = 0x20;
@@ -1403,7 +1403,7 @@ static void sub_80A1818(u16 a1)
 static void sub_80A1884(u16 a1)
 {
     CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32);
-    if ((u8)FindTaskIdByFunc(Phase1_Task_RunFuncs) == 0xFF )
+    if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF )
     {
         BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
         if (!--sSecondaryTilesetCBBufferSize)
-- 
cgit v1.2.3


From bc1a957674e84daf181c508afd2b623304de121d Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 14 Jan 2018 22:15:50 +0100
Subject: make battle transition compile

---
 src/bg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/bg.c b/src/bg.c
index 74e3ea830..b699a0b1f 100644
--- a/src/bg.c
+++ b/src/bg.c
@@ -1007,7 +1007,7 @@ void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 dest
 }
 // Skipping for now, it probably uses structs passed by value
 /*
-void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
+void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
 {
     u16 attribute;
     u16 mode;
@@ -1049,7 +1049,7 @@ void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWid
     }
 }*/
 __attribute__((naked))
-void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
+void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
 {
     asm("push {r4-r7,lr}\n\
     mov r7, r10\n\
-- 
cgit v1.2.3


From a6072ae293b0c0c3577b280274a2fd755033ab9f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 16 Jan 2018 18:59:06 +0100
Subject: decompile option menu

---
 src/berry_fix_program.c      |   2 +-
 src/diploma.c                |   2 +-
 src/egg_hatch.c              |   4 +-
 src/evolution_scene.c        |   2 +-
 src/hall_of_fame.c           |   2 +-
 src/mail.c                   |   2 +-
 src/main.c                   |   4 +-
 src/option_menu.c            | 630 +++++++++++++++++++++++++++++++++++++++++++
 src/pokeblock.c              |   2 +-
 src/pokemon_summary_screen.c |   4 +-
 src/starter_choose.c         |   4 +-
 src/text_window.c            |   8 +-
 src/wallclock.c              |   2 +-
 13 files changed, 649 insertions(+), 19 deletions(-)
 create mode 100644 src/option_menu.c

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 3b2bfb5f7..f487489d4 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -141,7 +141,7 @@ void InitBerryFixProgram(void)
     SetVBlankCallback(NULL);
     ResetSpriteData();
     ResetTasks();
-    remove_some_task();
+    ScanlineEffect_Stop();
     SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
     berry_fix_mb_manager = AllocZeroed(0x50);
     berry_fix_mb_manager->state = 0;
diff --git a/src/diploma.c b/src/diploma.c
index d4a269757..fedc10bd0 100755
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -72,7 +72,7 @@ void CB2_ShowDiploma(void)
     DmaFill16(3, 0, VRAM, VRAM_SIZE);
     DmaFill32(3, 0, OAM, OAM_SIZE);
     DmaFill16(3, 0, PLTT, PLTT_SIZE);
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
     ResetPaletteFade();
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 1aff894b9..37f2b2e19 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -66,7 +66,7 @@ extern void overworld_free_bg_tilemaps(void);
 extern void sub_80AF168(void);
 extern void AllocateMonSpritesGfx(void);
 extern void FreeMonSpritesGfx(void);
-extern void remove_some_task(void);
+extern void ScanlineEffect_Stop(void);
 extern void reset_temp_tile_data_buffers(void);
 extern void c2_exit_to_overworld_2_switch(void);
 extern void play_some_sound(void);
@@ -512,7 +512,7 @@ static void CB2_EggHatch_0(void)
         FreeAllSpritePalettes();
         ResetSpriteData();
         ResetTasks();
-        remove_some_task();
+        ScanlineEffect_Stop();
         m4aSoundVSyncOn();
         gMain.state++;
         break;
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 4b59147ff..5dfc36cb2 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -269,7 +269,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
     sub_80356D0();
     LoadBattleTextboxAndBackground();
     ResetSpriteData();
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     FreeAllSpritePalettes();
 
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 4465f65a3..3e70e22fa 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -1302,7 +1302,7 @@ static void ClearVramOamPltt_LoadHofPal(void)
 
 static void sub_8174F70(void)
 {
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
     reset_temp_tile_data_buffers();
diff --git a/src/mail.c b/src/mail.c
index 68a55e242..774e3ec19 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -329,7 +329,7 @@ static bool8 MailReadBuildGraphics(void)
     {
         case 0:
             SetVBlankCallback(NULL);
-            remove_some_task();
+            ScanlineEffect_Stop();
             SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
             break;
         case 1:
diff --git a/src/main.c b/src/main.c
index 07b7d9147..d4601293b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,7 +29,7 @@ extern void MapMusicMain(void);
 extern void EnableInterrupts(u16);
 extern void sub_8033648(void);
 extern u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void));
-extern void remove_some_task(void);
+extern void ScanlineEffect_Stop(void);
 
 extern struct SoundInfo gSoundInfo;
 extern u32 gFlashMemoryPresent;
@@ -425,7 +425,7 @@ void DoSoftReset(void)
 {
     REG_IME = 0;
     m4aSoundVSyncOff();
-    remove_some_task();
+    ScanlineEffect_Stop();
     DmaStop(1);
     DmaStop(2);
     DmaStop(3);
diff --git a/src/option_menu.c b/src/option_menu.c
new file mode 100644
index 000000000..5b88338ab
--- /dev/null
+++ b/src/option_menu.c
@@ -0,0 +1,630 @@
+#include "global.h"
+#include "option_menu.h"
+#include "main.h"
+#include "menu.h"
+#include "unknown_task.h"
+#include "palette.h"
+#include "sprite.h"
+#include "task.h"
+#include "bg.h"
+#include "gpu_regs.h"
+#include "window.h"
+#include "text.h"
+#include "text_window.h"
+#include "international_string_util.h"
+#include "strings.h"
+
+extern void SetPokemonCryStereo(u32 val);
+
+// Task data
+enum
+{
+    TD_MENUSELECTION,
+    TD_TEXTSPEED,
+    TD_BATTLESCENE,
+    TD_BATTLESTYLE,
+    TD_SOUND,
+    TD_BUTTONMODE,
+    TD_FRAMETYPE,
+};
+
+// Menu items
+enum
+{
+    MENUITEM_TEXTSPEED,
+    MENUITEM_BATTLESCENE,
+    MENUITEM_BATTLESTYLE,
+    MENUITEM_SOUND,
+    MENUITEM_BUTTONMODE,
+    MENUITEM_FRAMETYPE,
+    MENUITEM_CANCEL,
+    MENUITEM_COUNT,
+};
+
+// Window Ids
+enum
+{
+    WIN_TEXT_OPTION,
+    WIN_OPTIONS
+};
+
+// this file's functions
+static void Task_OptionMenuFadeIn(u8 taskId);
+static void Task_OptionMenuProcessInput(u8 taskId);
+static void Task_OptionMenuSave(u8 taskId);
+static void Task_OptionMenuFadeOut(u8 taskId);
+static void HighlightOptionMenuItem(u8 selection);
+static u8   TextSpeed_ProcessInput(u8 selection);
+static void TextSpeed_DrawChoices(u8 selection);
+static u8   BattleScene_ProcessInput(u8 selection);
+static void BattleScene_DrawChoices(u8 selection);
+static u8   BattleStyle_ProcessInput(u8 selection);
+static void BattleStyle_DrawChoices(u8 selection);
+static u8   Sound_ProcessInput(u8 selection);
+static void Sound_DrawChoices(u8 selection);
+static u8   FrameType_ProcessInput(u8 selection);
+static void FrameType_DrawChoices(u8 selection);
+static u8   ButtonMode_ProcessInput(u8 selection);
+static void ButtonMode_DrawChoices(u8 selection);
+static void DrawTextOption(void);
+static void DrawOptionMenuTexts(void);
+static void sub_80BB154(void);
+
+// EWRAM vars
+EWRAM_DATA static bool8 sArrowPressed = FALSE;
+
+// const rom data
+/*
+const u16 gUnknown_0839F5FC[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal");
+// note: this is only used in the Japanese release
+const static u8 gUnknown_0839F63C[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp");
+*/
+extern const struct BgTemplate gUnknown_0855C698[2];
+extern const struct WindowTemplate gUnknown_0855C680[];
+extern const u16 gUnknown_0855C6A0[1];
+extern const u16 gUnknown_0855C604[16];
+extern const u8 *const gUnknown_0855C664[MENUITEM_COUNT];
+
+// code
+static void MainCB2(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+static void VBlankCB(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void CB2_InitOptionMenu(void)
+{
+    switch (gMain.state)
+    {
+    default:
+    case 0:
+        SetVBlankCallback(NULL);
+        gMain.state++;
+        break;
+    case 1:
+    {
+        u8 *addr;
+        u32 size;
+
+        addr = (u8 *)VRAM;
+        size = 0x18000;
+        while (1)
+        {
+            DmaFill16(3, 0, addr, 0x1000);
+            addr += 0x1000;
+            size -= 0x1000;
+            if (size <= 0x1000)
+            {
+                DmaFill16(3, 0, addr, size);
+                break;
+            }
+        }
+        DmaClear32(3, OAM, OAM_SIZE);
+        DmaClear16(3, PLTT, PLTT_SIZE);
+        SetGpuReg(REG_OFFSET_DISPCNT, 0);
+        ResetBgsAndClearDma3BusyFlags(0);
+        InitBgsFromTemplates(0, gUnknown_0855C698, ARRAY_COUNT(gUnknown_0855C698));
+        ChangeBgX(0, 0, 0);
+        ChangeBgY(0, 0, 0);
+        ChangeBgX(1, 0, 0);
+        ChangeBgY(1, 0, 0);
+        ChangeBgX(2, 0, 0);
+        ChangeBgY(2, 0, 0);
+        ChangeBgX(3, 0, 0);
+        ChangeBgY(3, 0, 0);
+        InitWindows(gUnknown_0855C680);
+        DeactivateAllTextPrinters();
+        SetGpuReg(REG_OFFSET_WIN0H, 0);
+        SetGpuReg(REG_OFFSET_WIN0V, 0);
+        SetGpuReg(REG_OFFSET_WININ, 1);
+        SetGpuReg(REG_OFFSET_WINOUT, 35);
+        SetGpuReg(REG_OFFSET_BLDCNT, 193);
+        SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+        SetGpuReg(REG_OFFSET_BLDY, 4);
+        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+        ShowBg(0);
+        ShowBg(1);
+        gMain.state++;
+    }
+        break;
+    case 2:
+        ResetPaletteFade();
+        ScanlineEffect_Stop();
+        ResetTasks();
+        ResetSpriteData();
+        gMain.state++;
+        break;
+    case 3:
+        LoadBgTiles(1, GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->tiles, 0x120, 0x1A2);
+        gMain.state++;
+        break;
+    case 4:
+        LoadPalette(gUnknown_0855C6A0, 0, sizeof(gUnknown_0855C6A0));
+        LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 0x70, 0x20);
+        gMain.state++;
+        break;
+    case 5:
+        LoadPalette(gUnknown_0855C604, 0x10, sizeof(gUnknown_0855C604));
+        gMain.state++;
+        break;
+    case 6:
+        PutWindowTilemap(0);
+        DrawTextOption();
+        gMain.state++;
+        break;
+    case 7:
+        gMain.state++;
+        break;
+    case 8:
+        PutWindowTilemap(1);
+        DrawOptionMenuTexts();
+        gMain.state++;
+    case 9:
+        sub_80BB154();
+        gMain.state++;
+        break;
+    case 10:
+    {
+        u8 taskId = CreateTask(Task_OptionMenuFadeIn, 0);
+
+        gTasks[taskId].data[TD_MENUSELECTION] = 0;
+        gTasks[taskId].data[TD_TEXTSPEED] = gSaveBlock2Ptr->optionsTextSpeed;
+        gTasks[taskId].data[TD_BATTLESCENE] = gSaveBlock2Ptr->optionsBattleSceneOff;
+        gTasks[taskId].data[TD_BATTLESTYLE] = gSaveBlock2Ptr->optionsBattleStyle;
+        gTasks[taskId].data[TD_SOUND] = gSaveBlock2Ptr->optionsSound;
+        gTasks[taskId].data[TD_BUTTONMODE] = gSaveBlock2Ptr->optionsButtonMode;
+        gTasks[taskId].data[TD_FRAMETYPE] = gSaveBlock2Ptr->optionsWindowFrameType;
+
+        TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
+        BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
+        BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]);
+        Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]);
+        ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]);
+        FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]);
+        HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
+
+        CopyWindowToVram(WIN_OPTIONS, 3);
+        gMain.state++;
+        break;
+    }
+    case 11:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        SetVBlankCallback(VBlankCB);
+        SetMainCallback2(MainCB2);
+        return;
+    }
+}
+
+static void Task_OptionMenuFadeIn(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        gTasks[taskId].func = Task_OptionMenuProcessInput;
+    }
+}
+
+static void Task_OptionMenuProcessInput(u8 taskId)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        if (gTasks[taskId].data[TD_MENUSELECTION] == MENUITEM_CANCEL)
+            gTasks[taskId].func = Task_OptionMenuSave;
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        gTasks[taskId].func = Task_OptionMenuSave;
+    }
+    else if (gMain.newKeys & DPAD_UP)
+    {
+        if (gTasks[taskId].data[TD_MENUSELECTION] > 0)
+            gTasks[taskId].data[TD_MENUSELECTION]--;
+        else
+            gTasks[taskId].data[TD_MENUSELECTION] = 6;
+        HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        if (gTasks[taskId].data[TD_MENUSELECTION] <= 5)
+            gTasks[taskId].data[TD_MENUSELECTION]++;
+        else
+            gTasks[taskId].data[TD_MENUSELECTION] = 0;
+        HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
+    }
+    else
+    {
+        u8 previousOption;
+
+        switch (gTasks[taskId].data[TD_MENUSELECTION])
+        {
+        case MENUITEM_TEXTSPEED:
+            previousOption = gTasks[taskId].data[TD_TEXTSPEED];
+            gTasks[taskId].data[TD_TEXTSPEED] = TextSpeed_ProcessInput(gTasks[taskId].data[TD_TEXTSPEED]);
+
+            if (previousOption != gTasks[taskId].data[TD_TEXTSPEED])
+                TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
+            break;
+        case MENUITEM_BATTLESCENE:
+            previousOption = gTasks[taskId].data[TD_BATTLESCENE];
+            gTasks[taskId].data[TD_BATTLESCENE] = BattleScene_ProcessInput(gTasks[taskId].data[TD_BATTLESCENE]);
+
+            if (previousOption != gTasks[taskId].data[TD_BATTLESCENE])
+                BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
+            break;
+        case MENUITEM_BATTLESTYLE:
+            previousOption = gTasks[taskId].data[TD_BATTLESTYLE];
+            gTasks[taskId].data[TD_BATTLESTYLE] = BattleStyle_ProcessInput(gTasks[taskId].data[TD_BATTLESTYLE]);
+
+            if (previousOption != gTasks[taskId].data[TD_BATTLESTYLE])
+                BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]);
+            break;
+        case MENUITEM_SOUND:
+            previousOption = gTasks[taskId].data[TD_SOUND];
+            gTasks[taskId].data[TD_SOUND] = Sound_ProcessInput(gTasks[taskId].data[TD_SOUND]);
+
+            if (previousOption != gTasks[taskId].data[TD_SOUND])
+                Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]);
+            break;
+        case MENUITEM_BUTTONMODE:
+            previousOption = gTasks[taskId].data[TD_BUTTONMODE];
+            gTasks[taskId].data[TD_BUTTONMODE] = ButtonMode_ProcessInput(gTasks[taskId].data[TD_BUTTONMODE]);
+
+            if (previousOption != gTasks[taskId].data[TD_BUTTONMODE])
+                ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]);
+            break;
+        case MENUITEM_FRAMETYPE:
+            previousOption = gTasks[taskId].data[TD_FRAMETYPE];
+            gTasks[taskId].data[TD_FRAMETYPE] = FrameType_ProcessInput(gTasks[taskId].data[TD_FRAMETYPE]);
+
+            if (previousOption != gTasks[taskId].data[TD_FRAMETYPE])
+                FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]);
+            break;
+        default:
+            return;
+        }
+
+        if (sArrowPressed)
+        {
+            sArrowPressed = FALSE;
+            CopyWindowToVram(WIN_OPTIONS, 2);
+        }
+    }
+}
+
+static void Task_OptionMenuSave(u8 taskId)
+{
+    gSaveBlock2Ptr->optionsTextSpeed = gTasks[taskId].data[TD_TEXTSPEED];
+    gSaveBlock2Ptr->optionsBattleSceneOff = gTasks[taskId].data[TD_BATTLESCENE];
+    gSaveBlock2Ptr->optionsBattleStyle = gTasks[taskId].data[TD_BATTLESTYLE];
+    gSaveBlock2Ptr->optionsSound = gTasks[taskId].data[TD_SOUND];
+    gSaveBlock2Ptr->optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE];
+    gSaveBlock2Ptr->optionsWindowFrameType = gTasks[taskId].data[TD_FRAMETYPE];
+
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskId].func = Task_OptionMenuFadeOut;
+}
+
+static void Task_OptionMenuFadeOut(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        DestroyTask(taskId);
+        FreeAllWindowBuffers();
+        SetMainCallback2(gMain.savedCallback);
+    }
+}
+
+static void HighlightOptionMenuItem(u8 index)
+{
+    SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(16, 224));
+    SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(index * 16 + 40, index * 16 + 56));
+}
+
+static void DrawOptionMenuChoice(const u8 *text, u8 x, u8 y, u8 style)
+{
+    u8 dst[16];
+    u16 i;
+
+    for (i = 0; *text != EOS && i <= 14; i++)
+        dst[i] = *(text++);
+
+    if (style != 0)
+    {
+        dst[2] = 4;
+        dst[5] = 5;
+    }
+
+    dst[i] = EOS;
+    PrintTextOnWindow(WIN_OPTIONS, 1, dst, x, y + 1, TEXT_SPEED_FF, NULL);
+}
+
+static u8 TextSpeed_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & DPAD_RIGHT)
+    {
+        if (selection <= 1)
+            selection++;
+        else
+            selection = 0;
+
+        sArrowPressed = TRUE;
+    }
+    if (gMain.newKeys & DPAD_LEFT)
+    {
+        if (selection != 0)
+            selection--;
+        else
+            selection = 2;
+
+        sArrowPressed = TRUE;
+    }
+    return selection;
+}
+
+static void TextSpeed_DrawChoices(u8 selection)
+{
+    u8 styles[3];
+    s32 widthSlow, widthMid, widthFast, xMid;
+
+    styles[0] = 0;
+    styles[1] = 0;
+    styles[2] = 0;
+    styles[selection] = 1;
+
+    DrawOptionMenuChoice(gText_TextSpeedSlow, 104, 0, styles[0]);
+
+    widthSlow = GetStringWidth(1, gText_TextSpeedSlow, 0);
+    widthMid = GetStringWidth(1, gText_TextSpeedMid, 0);
+    widthFast = GetStringWidth(1, gText_TextSpeedFast, 0);
+
+    widthMid -= 94;
+    xMid = (widthSlow - widthMid - widthFast) / 2 + 104;
+    DrawOptionMenuChoice(gText_TextSpeedMid, xMid, 0, styles[1]);
+
+    DrawOptionMenuChoice(gText_TextSpeedFast, GetStringRightAlignXOffset(1, gText_TextSpeedFast, 198), 0, styles[2]);
+}
+
+static u8 BattleScene_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
+    {
+        selection ^= 1;
+        sArrowPressed = TRUE;
+    }
+
+    return selection;
+}
+
+static void BattleScene_DrawChoices(u8 selection)
+{
+    u8 styles[2];
+
+    styles[0] = 0;
+    styles[1] = 0;
+    styles[selection] = 1;
+
+    DrawOptionMenuChoice(gText_BattleSceneOn, 104, 16, styles[0]);
+    DrawOptionMenuChoice(gText_BattleSceneOff, GetStringRightAlignXOffset(1, gText_BattleSceneOff, 198), 16, styles[1]);
+}
+
+static u8 BattleStyle_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
+    {
+        selection ^= 1;
+        sArrowPressed = TRUE;
+    }
+
+    return selection;
+}
+
+static void BattleStyle_DrawChoices(u8 selection)
+{
+    u8 styles[2];
+
+    styles[0] = 0;
+    styles[1] = 0;
+    styles[selection] = 1;
+
+    DrawOptionMenuChoice(gText_BattleStyleShift, 104, 32, styles[0]);
+    DrawOptionMenuChoice(gText_BattleStyleSet, GetStringRightAlignXOffset(1, gText_BattleStyleSet, 198), 32, styles[1]);
+}
+
+static u8 Sound_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
+    {
+        selection ^= 1;
+        SetPokemonCryStereo(selection);
+        sArrowPressed = TRUE;
+    }
+
+    return selection;
+}
+
+static void Sound_DrawChoices(u8 selection)
+{
+    u8 styles[2];
+
+    styles[0] = 0;
+    styles[1] = 0;
+    styles[selection] = 1;
+
+    DrawOptionMenuChoice(gText_SoundMono, 104, 48, styles[0]);
+    DrawOptionMenuChoice(gText_SoundStereo, GetStringRightAlignXOffset(1, gText_SoundStereo, 198), 48, styles[1]);
+}
+
+// TODO: 19 should be defined in text_window.h
+static u8 FrameType_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & DPAD_RIGHT)
+    {
+        if (selection < 19)
+            selection++;
+        else
+            selection = 0;
+
+        LoadBgTiles(1, GetWindowFrameTilesPal(selection)->tiles, 0x120, 0x1A2);
+        LoadPalette(GetWindowFrameTilesPal(selection)->pal, 0x70, 0x20);
+        sArrowPressed = TRUE;
+    }
+    if (gMain.newKeys & DPAD_LEFT)
+    {
+        if (selection != 0)
+            selection--;
+        else
+            selection = 19;
+
+        LoadBgTiles(1, GetWindowFrameTilesPal(selection)->tiles, 0x120, 0x1A2);
+        LoadPalette(GetWindowFrameTilesPal(selection)->pal, 0x70, 0x20);
+        sArrowPressed = TRUE;
+    }
+    return selection;
+}
+
+static void FrameType_DrawChoices(u8 selection)
+{
+    u8 text[16];
+    u8 n = selection + 1;
+    u16 i;
+
+    for (i = 0; gText_FrameTypeNumber[i] != EOS && i <= 5; i++)
+        text[i] = gText_FrameTypeNumber[i];
+
+    // Convert a number to decimal string
+    if (n / 10 != 0)
+    {
+        text[i] = n / 10 + CHAR_0;
+        i++;
+        text[i] = n % 10 + CHAR_0;
+        i++;
+    }
+    else
+    {
+        text[i] = n % 10 + CHAR_0;
+        i++;
+        text[i] = 0x77;
+        i++;
+    }
+
+    text[i] = EOS;
+
+    DrawOptionMenuChoice(gText_FrameType, 104, 80, 0);
+    DrawOptionMenuChoice(text, 128, 80, 1);
+}
+
+static u8 ButtonMode_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & DPAD_RIGHT)
+    {
+        if (selection <= 1)
+            selection++;
+        else
+            selection = 0;
+
+        sArrowPressed = TRUE;
+    }
+    if (gMain.newKeys & DPAD_LEFT)
+    {
+        if (selection != 0)
+            selection--;
+        else
+            selection = 2;
+
+        sArrowPressed = TRUE;
+    }
+    return selection;
+}
+
+static void ButtonMode_DrawChoices(u8 selection)
+{
+    s32 widthNormal, widthLR, widthLA, yLR;
+    u8 styles[3];
+
+    styles[0] = 0;
+    styles[1] = 0;
+    styles[2] = 0;
+    styles[selection] = 1;
+
+    DrawOptionMenuChoice(gText_ButtonTypeNormal, 104, 64, styles[0]);
+
+    widthNormal = GetStringWidth(1, gText_ButtonTypeNormal, 0);
+    widthLR = GetStringWidth(1, gText_ButtonTypeLR, 0);
+    widthLA = GetStringWidth(1, gText_ButtonTypeLEqualsA, 0);
+
+    widthLR -= 94;
+    yLR = (widthNormal - widthLR - widthLA) / 2 + 104;
+    DrawOptionMenuChoice(gText_ButtonTypeLR, yLR, 64, styles[1]);
+
+    DrawOptionMenuChoice(gText_ButtonTypeLEqualsA, GetStringRightAlignXOffset(1, gText_ButtonTypeLEqualsA, 198), 64, styles[2]);
+}
+
+static void DrawTextOption(void)
+{
+    FillWindowPixelBuffer(WIN_TEXT_OPTION, 0x11);
+    PrintTextOnWindow(WIN_TEXT_OPTION, 1, gText_Option, 8, 1, TEXT_SPEED_FF, NULL);
+    CopyWindowToVram(WIN_TEXT_OPTION, 3);
+}
+
+static void DrawOptionMenuTexts(void)
+{
+    u8 i;
+
+    FillWindowPixelBuffer(WIN_OPTIONS, 0x11);
+    for (i = 0; i < MENUITEM_COUNT; i++)
+    {
+        PrintTextOnWindow(WIN_OPTIONS, 1, gUnknown_0855C664[i], 8, (i * 16) + 1, TEXT_SPEED_FF, NULL);
+    }
+    CopyWindowToVram(WIN_OPTIONS, 3);
+}
+
+static void sub_80BB154(void)
+{
+    //                   bg, tileNum, x,    y,    width, height,  pal
+    FillBgTilemapBufferRect(1, 0x1A2, 1,    0,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A3, 2,    0,      0x1B,   1,      7);
+    FillBgTilemapBufferRect(1, 0x1A4, 28,   0,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A5, 1,    1,      1,      2,      7);
+    FillBgTilemapBufferRect(1, 0x1A7, 28,   1,      1,      2,      7);
+    FillBgTilemapBufferRect(1, 0x1A8, 1,    3,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A9, 2,    3,      0x1B,   1,      7);
+    FillBgTilemapBufferRect(1, 0x1AA, 28,   3,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A2, 1,    4,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A3, 2,    4,      0x1A,   1,      7);
+    FillBgTilemapBufferRect(1, 0x1A4, 28,   4,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A5, 1,    5,      1,      0x12,   7);
+    FillBgTilemapBufferRect(1, 0x1A7, 28,   5,      1,      0x12,   7);
+    FillBgTilemapBufferRect(1, 0x1A8, 1,    19,     1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A9, 2,    19,     0x1A,   1,      7);
+    FillBgTilemapBufferRect(1, 0x1AA, 28,   19,     1,      1,      7);
+
+    CopyBgTilemapBufferToVram(1);
+}
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 737f2c6f3..573eed52b 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -419,7 +419,7 @@ static bool8 InitPokeblockMenu(void)
         gMain.state++;
         break;
     case 1:
-        remove_some_task();
+        ScanlineEffect_Stop();
         gMain.state++;
         break;
     case 2:
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index e56448d8b..a900badd1 100755
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -75,7 +75,7 @@ extern u8 sub_81221AC();
 extern void SetVBlankHBlankCallbacksToNull();
 extern void ResetVramOamAndBgCntRegs();
 extern void clear_scheduled_bg_copies_to_vram();
-extern void remove_some_task();
+extern void ScanlineEffect_Stop();
 extern void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable);
 extern void ShowBg(u8 a);
 extern void SetGpuReg(u8 regOffset, u16 value);
@@ -455,7 +455,7 @@ bool8 sub_81BFB10(void)
         gMain.state++;
         break;
     case 1:
-        remove_some_task();
+        ScanlineEffect_Stop();
         gMain.state++;
         break;
     case 2:
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 2d78af8fb..a47adb4e4 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -53,7 +53,7 @@ extern const u8 gUnknown_085B1E0C[];
 extern const u8 gUnknown_085B1E28[][2];
 
 extern void sub_809882C(u8, u16, u8);
-extern void remove_some_task(void);
+extern void ScanlineEffect_Stop(void);
 extern void clear_scheduled_bg_copies_to_vram(void);
 extern void dp13_810BB8C(void);
 extern void do_scheduled_bg_tilemap_copies_to_vram(void);
@@ -134,7 +134,7 @@ void CB2_ChooseStarter(void)
     DeactivateAllTextPrinters();
     sub_809882C(0, 0x2A8, 0xD0);
     clear_scheduled_bg_copies_to_vram();
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
     ResetPaletteFade();
diff --git a/src/text_window.c b/src/text_window.c
index 336536c04..67ff309f0 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -7,14 +7,14 @@
 extern u8 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset);
 extern void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette);
 
-extern const struct TilesPal gUnknown_0851021C[];
+extern const struct TilesPal gUnknown_0851021C[20];
 extern const u32 gUnknown_08DDD748[];
 extern const u16 gUnknown_0851017C[];
 extern const u16 gUnknown_08DDD728[];
 
-const struct TilesPal* sub_8098758(u8 id)
+const struct TilesPal* GetWindowFrameTilesPal(u8 id)
 {
-    if (id > 19)
+    if (id >= ARRAY_COUNT(gUnknown_0851021C))
         return &gUnknown_0851021C[0];
     else
         return &gUnknown_0851021C[id];
@@ -121,5 +121,5 @@ const u16* GetOverworldTextboxPalettePtr(void)
 void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset)
 {
     LoadBgTiles(bg, gUnknown_0851021C[gSaveBlock2Ptr->optionsWindowFrameType].tiles, 0x120, destOffset);
-    LoadPalette(sub_8098758(gSaveBlock2Ptr->optionsWindowFrameType)->pal, palOffset, 0x20);
+    LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, palOffset, 0x20);
 }
diff --git a/src/wallclock.c b/src/wallclock.c
index ea6137c5d..dbea24b4c 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -578,7 +578,7 @@ static void LoadWallClockGraphics(void)
     DeactivateAllTextPrinters();
     sub_809882C(0, 0x250, 0xd0);
     clear_scheduled_bg_copies_to_vram();
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
     ResetPaletteFade();
-- 
cgit v1.2.3


From 4dd06dbcd327e2af38912e09d31d5c3e00bc93ba Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 16 Jan 2018 19:39:35 +0100
Subject: optiom menu move data to C

---
 src/option_menu.c | 63 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/option_menu.c b/src/option_menu.c
index 5b88338ab..07d22eeb0 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -74,16 +74,51 @@ static void sub_80BB154(void);
 EWRAM_DATA static bool8 sArrowPressed = FALSE;
 
 // const rom data
-/*
-const u16 gUnknown_0839F5FC[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal");
+static const u16 sUnknown_0855C604[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal");
 // note: this is only used in the Japanese release
-const static u8 gUnknown_0839F63C[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp");
-*/
-extern const struct BgTemplate gUnknown_0855C698[2];
-extern const struct WindowTemplate gUnknown_0855C680[];
-extern const u16 gUnknown_0855C6A0[1];
-extern const u16 gUnknown_0855C604[16];
-extern const u8 *const gUnknown_0855C664[MENUITEM_COUNT];
+static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp");
+
+static const u8 *const OptionMenuItemsNames[MENUITEM_COUNT] =
+{
+    gText_TextSpeed,
+    gText_BattleScene,
+    gText_BattleStyle,
+    gText_Sound,
+    gText_ButtonMode,
+    gText_Frame,
+    gText_OptionMenuCancel,
+};
+
+static const struct WindowTemplate sOptionMenuWinTemplates[] =
+{
+    {1, 2, 1, 0x1A, 2, 1, 2},
+    {0, 2, 5, 0x1A, 0xE, 1, 0x36},
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct BgTemplate sOptionMenuBgTemplates[] =
+{
+   {
+       .bg = 1,
+       .charBaseIndex = 1,
+       .mapBaseIndex = 30,
+       .screenSize = 0,
+       .paletteMode = 0,
+       .priority = 0,
+       .baseTile = 0
+   },
+   {
+       .bg = 0,
+       .charBaseIndex = 1,
+       .mapBaseIndex = 31,
+       .screenSize = 0,
+       .paletteMode = 0,
+       .priority = 1,
+       .baseTile = 0
+   }
+};
+
+static const u16 sUnknown_0855C6A0[] = {0x7E51};
 
 // code
 static void MainCB2(void)
@@ -132,7 +167,7 @@ void CB2_InitOptionMenu(void)
         DmaClear16(3, PLTT, PLTT_SIZE);
         SetGpuReg(REG_OFFSET_DISPCNT, 0);
         ResetBgsAndClearDma3BusyFlags(0);
-        InitBgsFromTemplates(0, gUnknown_0855C698, ARRAY_COUNT(gUnknown_0855C698));
+        InitBgsFromTemplates(0, sOptionMenuBgTemplates, ARRAY_COUNT(sOptionMenuBgTemplates));
         ChangeBgX(0, 0, 0);
         ChangeBgY(0, 0, 0);
         ChangeBgX(1, 0, 0);
@@ -141,7 +176,7 @@ void CB2_InitOptionMenu(void)
         ChangeBgY(2, 0, 0);
         ChangeBgX(3, 0, 0);
         ChangeBgY(3, 0, 0);
-        InitWindows(gUnknown_0855C680);
+        InitWindows(sOptionMenuWinTemplates);
         DeactivateAllTextPrinters();
         SetGpuReg(REG_OFFSET_WIN0H, 0);
         SetGpuReg(REG_OFFSET_WIN0V, 0);
@@ -168,12 +203,12 @@ void CB2_InitOptionMenu(void)
         gMain.state++;
         break;
     case 4:
-        LoadPalette(gUnknown_0855C6A0, 0, sizeof(gUnknown_0855C6A0));
+        LoadPalette(sUnknown_0855C6A0, 0, sizeof(sUnknown_0855C6A0));
         LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 0x70, 0x20);
         gMain.state++;
         break;
     case 5:
-        LoadPalette(gUnknown_0855C604, 0x10, sizeof(gUnknown_0855C604));
+        LoadPalette(sUnknown_0855C604, 0x10, sizeof(sUnknown_0855C604));
         gMain.state++;
         break;
     case 6:
@@ -601,7 +636,7 @@ static void DrawOptionMenuTexts(void)
     FillWindowPixelBuffer(WIN_OPTIONS, 0x11);
     for (i = 0; i < MENUITEM_COUNT; i++)
     {
-        PrintTextOnWindow(WIN_OPTIONS, 1, gUnknown_0855C664[i], 8, (i * 16) + 1, TEXT_SPEED_FF, NULL);
+        PrintTextOnWindow(WIN_OPTIONS, 1, OptionMenuItemsNames[i], 8, (i * 16) + 1, TEXT_SPEED_FF, NULL);
     }
     CopyWindowToVram(WIN_OPTIONS, 3);
 }
-- 
cgit v1.2.3


From 77352c7ee480fe3127692ce50a6bdd019de87291 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 16 Jan 2018 19:41:25 +0100
Subject: give the s prefix to a variable

---
 src/option_menu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/option_menu.c b/src/option_menu.c
index 07d22eeb0..b76d9e0e6 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -78,7 +78,7 @@ static const u16 sUnknown_0855C604[] = INCBIN_U16("graphics/misc/option_menu_tex
 // note: this is only used in the Japanese release
 static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp");
 
-static const u8 *const OptionMenuItemsNames[MENUITEM_COUNT] =
+static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] =
 {
     gText_TextSpeed,
     gText_BattleScene,
@@ -636,7 +636,7 @@ static void DrawOptionMenuTexts(void)
     FillWindowPixelBuffer(WIN_OPTIONS, 0x11);
     for (i = 0; i < MENUITEM_COUNT; i++)
     {
-        PrintTextOnWindow(WIN_OPTIONS, 1, OptionMenuItemsNames[i], 8, (i * 16) + 1, TEXT_SPEED_FF, NULL);
+        PrintTextOnWindow(WIN_OPTIONS, 1, sOptionMenuItemsNames[i], 8, (i * 16) + 1, TEXT_SPEED_FF, NULL);
     }
     CopyWindowToVram(WIN_OPTIONS, 3);
 }
-- 
cgit v1.2.3


From 157b88b6dbfa7816cac9c6cf2ef20bd70a573b10 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 16 Jan 2018 14:01:31 -0600
Subject: identity -> position

---
 src/battle_2.c                            | 140 +++++++++++++++---------------
 src/battle_ai_script_commands.c           |   2 +-
 src/battle_ai_switch_items.c              |  26 +++---
 src/battle_anim.c                         |  38 ++++----
 src/battle_controller_link_opponent.c     |  20 ++---
 src/battle_controller_link_partner.c      |  12 +--
 src/battle_controller_opponent.c          |  30 +++----
 src/battle_controller_player.c            |  54 ++++++------
 src/battle_controller_player_partner.c    |  20 ++---
 src/battle_controller_recorded_opponent.c |  16 ++--
 src/battle_controller_recorded_player.c   |  20 ++---
 src/battle_controller_safari.c            |   6 +-
 src/battle_controller_wally.c             |  12 +--
 src/battle_controllers.c                  | 140 +++++++++++++++---------------
 src/battle_gfx_sfx_util.c                 |  54 ++++++------
 src/battle_interface.c                    |  26 +++---
 src/battle_message.c                      |   8 +-
 src/battle_script_commands.c              |  42 ++++-----
 src/battle_util.c                         |  32 +++----
 src/battle_util2.c                        |   6 +-
 src/pokeball.c                            |  24 ++---
 src/pokemon_2.c                           |   4 +-
 src/reshow_battle_screen.c                |  20 ++---
 23 files changed, 376 insertions(+), 376 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 61e39b39f..78f577fda 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -2517,7 +2517,7 @@ static void sub_8039A48(struct Sprite *sprite)
         }
         else
         {
-            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBankIdentity(sprite->tBank)] + (gBattleMonForms[sprite->tBank] << 11) + (sprite->data[3] << 8);
+            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBankPosition(sprite->tBank)] + (gBattleMonForms[sprite->tBank] << 11) + (sprite->data[3] << 8);
 
             for (i = 0; i < 0x100; i++)
                 *(dst++) = 0;
@@ -3116,7 +3116,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
             gBattleMons[gActiveBank].status2 = 0;
         }
 
-        if (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON1)
+        if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_LEFT)
         {
             EmitDrawTrainerPic(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3124,7 +3124,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
 
         if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
         {
-            if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1)
+            if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_LEFT)
             {
                 EmitDrawTrainerPic(0);
                 MarkBufferBankForExecution(gActiveBank);
@@ -3159,15 +3159,15 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
 
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
-            if (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON2
-             || GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON2)
+            if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_RIGHT
+             || GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
             {
                 EmitDrawTrainerPic(0);
                 MarkBufferBankForExecution(gActiveBank);
             }
         }
 
-        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON2)
+        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
         {
             EmitDrawTrainerPic(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3203,7 +3203,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
                 hpStatus[i].status = GetMonData(&gEnemyParty[i], MON_DATA_STATUS);
             }
         }
-        gActiveBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        gActiveBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
         EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
         MarkBufferBankForExecution(gActiveBank);
 
@@ -3221,7 +3221,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
                 hpStatus[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
             }
         }
-        gActiveBank = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+        gActiveBank = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
         EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
         MarkBufferBankForExecution(gActiveBank);
 
@@ -3257,7 +3257,7 @@ static void BattleIntroPrintTrainerWantsToBattle(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        gActiveBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
         PrepareStringBattle(STRINGID_INTROMSG, gActiveBank);
         gBattleMainFunc = BattleIntroPrintOpponentSendsOut;
     }
@@ -3280,16 +3280,16 @@ static void BattleIntroPrintOpponentSendsOut(void)
         return;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = IDENTITY_OPPONENT_MON1;
+        identity = B_POSITION_OPPONENT_LEFT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = IDENTITY_OPPONENT_MON1;
+            identity = B_POSITION_OPPONENT_LEFT;
         else
-            identity = IDENTITY_PLAYER_MON1;
+            identity = B_POSITION_PLAYER_LEFT;
     }
     else
-        identity = IDENTITY_OPPONENT_MON1;
+        identity = B_POSITION_OPPONENT_LEFT;
 
     PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByIdentity(identity));
     gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
@@ -3300,20 +3300,20 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void)
     u32 identity;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = IDENTITY_OPPONENT_MON2;
+        identity = B_POSITION_OPPONENT_RIGHT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = IDENTITY_OPPONENT_MON2;
+            identity = B_POSITION_OPPONENT_RIGHT;
         else
-            identity = IDENTITY_PLAYER_MON2;
+            identity = B_POSITION_PLAYER_RIGHT;
     }
     else
-        identity = IDENTITY_OPPONENT_MON2;
+        identity = B_POSITION_OPPONENT_RIGHT;
 
     for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
     {
-        if (GetBankIdentity(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == identity)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3329,23 +3329,23 @@ static void BattleIntroOpponent1SendsOutMonAnimation(void)
     u32 identity;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = IDENTITY_OPPONENT_MON1;
+        identity = B_POSITION_OPPONENT_LEFT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = IDENTITY_OPPONENT_MON1;
+            identity = B_POSITION_OPPONENT_LEFT;
         else
-            identity = IDENTITY_PLAYER_MON1;
+            identity = B_POSITION_PLAYER_LEFT;
     }
     else
-        identity = IDENTITY_OPPONENT_MON1;
+        identity = B_POSITION_OPPONENT_LEFT;
 
     if (gBattleExecBuffer)
         return;
 
     for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
     {
-        if (GetBankIdentity(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == identity)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3408,7 +3408,7 @@ _0803B29A:\n\
 	adds r6, r4, 0\n\
 _0803B2B2:\n\
 	ldrb r0, [r4]\n\
-	bl GetBankIdentity\n\
+	bl GetBankPosition\n\
 	lsls r0, 24\n\
 	lsrs r0, 24\n\
 	cmp r0, r5\n\
@@ -3482,16 +3482,16 @@ static void BattleIntroPrintPlayerSendsOut(void)
         u8 identity;
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-            identity = IDENTITY_PLAYER_MON1;
+            identity = B_POSITION_PLAYER_LEFT;
         else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-                identity = IDENTITY_PLAYER_MON1;
+                identity = B_POSITION_PLAYER_LEFT;
             else
-                identity = IDENTITY_OPPONENT_MON1;
+                identity = B_POSITION_OPPONENT_LEFT;
         }
         else
-            identity = IDENTITY_PLAYER_MON1;
+            identity = B_POSITION_PLAYER_LEFT;
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
             PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByIdentity(identity));
@@ -3505,20 +3505,20 @@ static void BattleIntroPlayer2SendsOutMonAnimation(void)
     u32 identity;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = IDENTITY_PLAYER_MON2;
+        identity = B_POSITION_PLAYER_RIGHT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = IDENTITY_PLAYER_MON2;
+            identity = B_POSITION_PLAYER_RIGHT;
         else
-            identity = IDENTITY_OPPONENT_MON2;
+            identity = B_POSITION_OPPONENT_RIGHT;
     }
     else
-        identity = IDENTITY_PLAYER_MON2;
+        identity = B_POSITION_PLAYER_RIGHT;
 
     for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
     {
-        if (GetBankIdentity(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == identity)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3537,23 +3537,23 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void)
     u32 identity;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = IDENTITY_PLAYER_MON1;
+        identity = B_POSITION_PLAYER_LEFT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = IDENTITY_PLAYER_MON1;
+            identity = B_POSITION_PLAYER_LEFT;
         else
-            identity = IDENTITY_OPPONENT_MON1;
+            identity = B_POSITION_OPPONENT_LEFT;
     }
     else
-        identity = IDENTITY_PLAYER_MON1;
+        identity = B_POSITION_PLAYER_LEFT;
 
     if (gBattleExecBuffer)
         return;
 
     for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
     {
-        if (GetBankIdentity(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == identity)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3891,7 +3891,7 @@ static void HandleTurnActionSelectionState(void)
     gBattleCommunication[ACTIONS_CONFIRMED_COUNT] = 0;
     for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
     {
-        u8 identity = GetBankIdentity(gActiveBank);
+        u8 identity = GetBankPosition(gActiveBank);
         switch (gBattleCommunication[gActiveBank])
         {
         case STATE_TURN_START_RECORD: // recorded battle related on start of every turn
@@ -4041,38 +4041,38 @@ static void HandleTurnActionSelectionState(void)
                     break;
                 case ACTION_CANCEL_PARTNER:
                     gBattleCommunication[gActiveBank] = 7;
-                    gBattleCommunication[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] = 1;
+                    gBattleCommunication[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)] = 1;
                     RecordedBattle_ClearBankAction(gActiveBank, 1);
-                    if (gBattleMons[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].status2 & STATUS2_MULTIPLETURNS
-                        || gBattleMons[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].status2 & STATUS2_RECHARGE)
+                    if (gBattleMons[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_MULTIPLETURNS
+                        || gBattleMons[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_RECHARGE)
                     {
                         EmitCmd50(0);
                         MarkBufferBankForExecution(gActiveBank);
                         return;
                     }
-                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == ACTION_SWITCH)
+                    else if (gActionForBanks[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_SWITCH)
                     {
-                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 2);
+                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON), 2);
                     }
-                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == ACTION_RUN)
+                    else if (gActionForBanks[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_RUN)
                     {
-                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 1);
+                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
                     }
-                    else if (gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE
-                             && (gProtectStructs[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].onlyStruggle
-                                || gDisableStructs[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].encoredMove))
+                    else if (gActionForBanks[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE
+                             && (gProtectStructs[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)].onlyStruggle
+                                || gDisableStructs[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)].encoredMove))
                     {
-                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 1);
+                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
                     }
                     else if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-                             && gActionForBanks[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE)
+                             && gActionForBanks[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE)
                     {
                         gRngValue = gBattlePalaceMoveSelectionRngValue;
-                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 1);
+                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
                     }
                     else
                     {
-                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 3);
+                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON), 3);
                     }
                     EmitCmd50(0);
                     MarkBufferBankForExecution(gActiveBank);
@@ -4727,7 +4727,7 @@ static void HandleEndTurn_BattleWon(void)
     {
         gSpecialVar_Result = gBattleOutcome;
         gBattleTextBuff1[0] = gBattleOutcome;
-        gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+        gBankAttacker = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
         gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
         gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
     }
@@ -4800,7 +4800,7 @@ static void HandleEndTurn_BattleLost(void)
         else
         {
             gBattleTextBuff1[0] = gBattleOutcome;
-            gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+            gBankAttacker = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
             gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
             gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
         }
@@ -5127,16 +5127,16 @@ static void HandleAction_UseMove(void)
                 if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
                 {
                     if (Random() & 1)
-                        gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+                        gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
                     else
-                        gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+                        gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
                 }
                 else
                 {
                     if (Random() & 1)
-                        gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+                        gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
                     else
-                        gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+                        gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
                 }
             }
             else
@@ -5148,13 +5148,13 @@ static void HandleAction_UseMove(void)
             {
                 if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
                 {
-                    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+                    gBankTarget = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
                 }
                 else
                 {
-                    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_SIDE);
+                    gBankTarget = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
                     if (gAbsentBankFlags & gBitTable[gBankTarget])
-                        gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+                        gBankTarget = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
                 }
             }
         }
@@ -5172,22 +5172,22 @@ static void HandleAction_UseMove(void)
         if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
         {
             if (Random() & 1)
-                gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+                gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
             else
-                gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+                gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
         }
         else
         {
             if (Random() & 1)
-                gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+                gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
             else
-                gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+                gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
         }
 
         if (gAbsentBankFlags & gBitTable[gBankTarget]
             && GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
         {
-            gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+            gBankTarget = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
         }
     }
     else
@@ -5197,13 +5197,13 @@ static void HandleAction_UseMove(void)
         {
             if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
             {
-                gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+                gBankTarget = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
             }
             else
             {
-                gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_SIDE);
+                gBankTarget = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
                 if (gAbsentBankFlags & gBitTable[gBankTarget])
-                    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+                    gBankTarget = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
             }
         }
     }
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 42cf0595f..a10dab976 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1316,7 +1316,7 @@ static void BattleAICmd_count_usable_party_mons(void)
     {
         u32 identity;
         bankOnField1 = gBattlePartyID[bank];
-        identity = GetBankIdentity(bank) ^ BIT_MON;
+        identity = GetBankPosition(bank) ^ BIT_MON;
         bankOnField2 = gBattlePartyID[GetBankByIdentity(identity)];
     }
     else // in singles there's only one bank by side
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index b3fccb17f..092d4a7c7 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -60,7 +60,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         return FALSE;
 
-    opposingIdentity = GetBankIdentity(gActiveBank) ^ BIT_SIDE;
+    opposingIdentity = GetBankPosition(gActiveBank) ^ BIT_SIDE;
 
     if (gBattleMons[GetBankByIdentity(opposingIdentity)].ability != ABILITY_WONDER_GUARD)
         return FALSE;
@@ -151,10 +151,10 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = gActiveBank;
-        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)])
+        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)])
             bankIn2 = gActiveBank;
         else
-            bankIn2 = GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON);
+            bankIn2 = GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON);
     }
     else
     {
@@ -273,7 +273,7 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
     u8 moveFlags;
     u16 move;
 
-    opposingIdentity = GetBankIdentity(gActiveBank) ^ BIT_SIDE;
+    opposingIdentity = GetBankPosition(gActiveBank) ^ BIT_SIDE;
     opposingBank = GetBankByIdentity(opposingIdentity);
 
     if (!(gAbsentBankFlags & gBitTable[opposingBank]))
@@ -357,10 +357,10 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = gActiveBank;
-        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)])
+        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)])
             bankIn2 = gActiveBank;
         else
-            bankIn2 = GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON);
+            bankIn2 = GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON);
     }
     else
     {
@@ -468,10 +468,10 @@ static bool8 ShouldSwitch(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = *activeBankPtr;
-        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankIdentity(*activeBankPtr) ^ BIT_MON)])
+        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankPosition(*activeBankPtr) ^ BIT_MON)])
             bankIn2 = *activeBankPtr;
         else
-            bankIn2 = GetBankByIdentity(GetBankIdentity(*activeBankPtr) ^ BIT_MON);
+            bankIn2 = GetBankByIdentity(GetBankPosition(*activeBankPtr) ^ BIT_MON);
     }
     else
     {
@@ -543,7 +543,7 @@ void AI_TrySwitchOrUseItem(void)
     u8 bankIn1, bankIn2;
     s32 firstId;
     s32 lastId; // + 1
-    u8 bankIdentity = GetBankIdentity(gActiveBank);
+    u8 bankIdentity = GetBankPosition(gActiveBank);
 
     if (GetBankSide(gActiveBank) == SIDE_PLAYER)
         party = gPlayerParty;
@@ -659,10 +659,10 @@ u8 GetMostSuitableMonToSwitchInto(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = gActiveBank;
-        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)])
+        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)])
             bankIn2 = gActiveBank;
         else
-            bankIn2 = GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON);
+            bankIn2 = GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON);
 
         // UB: It considers the opponent only player's side even though it can battle alongside player;
         opposingBank = Random() & BIT_MON;
@@ -671,7 +671,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
     }
     else
     {
-        opposingBank = GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_SIDE);
+        opposingBank = GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_SIDE);
         bankIn1 = gActiveBank;
         bankIn2 = gActiveBank;
     }
@@ -817,7 +817,7 @@ static bool8 ShouldUseItem(void)
     u8 validMons = 0;
     bool8 shouldUse = FALSE;
 
-    if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON2)
+    if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBankPosition(gActiveBank) == B_POSITION_PLAYER_RIGHT)
         return FALSE;
 
     if (GetBankSide(gActiveBank) == SIDE_PLAYER)
diff --git a/src/battle_anim.c b/src/battle_anim.c
index d991a702d..ecaff67a8 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -424,7 +424,7 @@ static void ScriptCmd_createsprite(void)
     if (subpriority < 3)
         subpriority = 3;
 
-    CreateSpriteAndAnimate(template, GetBankPosition(gAnimBankTarget, 2), GetBankPosition(gAnimBankTarget, 3), subpriority);
+    CreateSpriteAndAnimate(template, GetBankCoord(gAnimBankTarget, 2), GetBankCoord(gAnimBankTarget, 3), subpriority);
     gAnimVisualTaskCount++;
 }
 
@@ -613,8 +613,8 @@ static void ScriptCmd_monbg(void)
 
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankIdentity(bank);
-        if (identity == IDENTITY_OPPONENT_MON1 || identity == IDENTITY_PLAYER_MON2 || IsContest())
+        u8 identity = GetBankPosition(bank);
+        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -632,8 +632,8 @@ static void ScriptCmd_monbg(void)
     bank ^= BIT_MON;
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankIdentity(bank);
-        if (identity == IDENTITY_OPPONENT_MON1 || identity == IDENTITY_PLAYER_MON2 || IsContest())
+        u8 identity = GetBankPosition(bank);
+        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -718,7 +718,7 @@ void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible)
         if (IsContest())
             bankIdentity = 0;
         else
-            bankIdentity = GetBankIdentity(bank);
+            bankIdentity = GetBankPosition(bank);
 
         sub_8118FBC(1, 0, 0, bankIdentity, unknownStruct.unk8, unknownStruct.unk0, unknownStruct.unk4, unknownStruct.unkA);
 
@@ -750,7 +750,7 @@ void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible)
         LoadPalette(&gPlttBufferUnfaded[0x100 + bank * 16], 0x90, 0x20);
         CpuCopy32(&gPlttBufferUnfaded[0x100 + bank * 16], (void*)(BG_PLTT + 0x120), 0x20);
 
-        sub_8118FBC(2, 0, 0, GetBankIdentity(bank), unknownStruct.unk8, unknownStruct.unk0 + 0x1000, unknownStruct.unk4 + 0x400, unknownStruct.unkA);
+        sub_8118FBC(2, 0, 0, GetBankPosition(bank), unknownStruct.unk8, unknownStruct.unk0 + 0x1000, unknownStruct.unk4 + 0x400, unknownStruct.unkA);
     }
 }
 
@@ -893,8 +893,8 @@ static void sub_80A4980(u8 taskId)
     if (gTasks[taskId].data[1] != 1)
     {
         u8 to_BG2;
-        u8 identity = GetBankIdentity(gTasks[taskId].data[2]);
-        if (identity == IDENTITY_OPPONENT_MON1 || identity == IDENTITY_PLAYER_MON2 || IsContest())
+        u8 identity = GetBankPosition(gTasks[taskId].data[2]);
+        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
             to_BG2 = FALSE;
         else
             to_BG2 = TRUE;
@@ -937,8 +937,8 @@ static void ScriptCmd_monbg_22(void)
 
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankIdentity(bank);
-        if (identity == IDENTITY_OPPONENT_MON1 || identity == IDENTITY_PLAYER_MON2 || IsContest())
+        u8 identity = GetBankPosition(bank);
+        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -949,8 +949,8 @@ static void ScriptCmd_monbg_22(void)
     bank ^= BIT_MON;
     if (animBankId > 1 && IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankIdentity(bank);
-        if (identity == IDENTITY_OPPONENT_MON1 || identity == IDENTITY_PLAYER_MON2 || IsContest())
+        u8 identity = GetBankPosition(bank);
+        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -1001,8 +1001,8 @@ static void sub_80A4BB0(u8 taskId)
     {
         bool8 toBG_2;
         u8 bank = gTasks[taskId].data[2];
-        u8 identity = GetBankIdentity(bank);
-        if (identity == IDENTITY_OPPONENT_MON1 || identity == IDENTITY_PLAYER_MON2 || IsContest())
+        u8 identity = GetBankPosition(bank);
+        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -1705,8 +1705,8 @@ static void ScriptCmd_monbgprio_28(void)
     else
         bank = gAnimBankAttacker;
 
-    bankIdentity = GetBankIdentity(bank);
-    if (!IsContest() && (bankIdentity == IDENTITY_PLAYER_MON1 || bankIdentity == IDENTITY_OPPONENT_MON2))
+    bankIdentity = GetBankPosition(bank);
+    if (!IsContest() && (bankIdentity == B_POSITION_PLAYER_LEFT || bankIdentity == B_POSITION_OPPONENT_RIGHT))
     {
         SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
         SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 2);
@@ -1738,8 +1738,8 @@ static void ScriptCmd_monbgprio_2A(void)
         else
             bank = gAnimBankAttacker;
 
-        bankIdentity = GetBankIdentity(bank);
-        if (!IsContest() && (bankIdentity == IDENTITY_PLAYER_MON1 || bankIdentity == IDENTITY_OPPONENT_MON2))
+        bankIdentity = GetBankPosition(bank);
+        if (!IsContest() && (bankIdentity == B_POSITION_PLAYER_LEFT || bankIdentity == B_POSITION_OPPONENT_RIGHT))
         {
             SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
             SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 2);
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index cb510bb5b..a72650537 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -295,7 +295,7 @@ static void sub_8064520(void)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
 
-            if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON2)
+            if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
             {
                 FreeSpriteTilesByTag(0x27F9);
                 FreeSpritePaletteByTag(0x27F9);
@@ -352,7 +352,7 @@ static void sub_8064734(void)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
-                if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1)
+                if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_LEFT)
                     m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
@@ -370,7 +370,7 @@ static void sub_8064734(void)
         if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
             && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
         {
-            if (gBattleTypeFlags & BATTLE_TYPE_MULTI && GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON2)
+            if (gBattleTypeFlags & BATTLE_TYPE_MULTI && GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
             {
                 if (++gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 == 1)
                     return;
@@ -1161,10 +1161,10 @@ static void LinkOpponentHandleLoadMonSprite(void)
     u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
 
     BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    sub_806A068(species, GetBankIdentity(gActiveBank));
+    sub_806A068(species, GetBankPosition(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankPosition(gActiveBank, 2),
+                                               GetBankCoord(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
 
@@ -1194,11 +1194,11 @@ static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
     species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
-    sub_806A068(species, GetBankIdentity(bank));
+    sub_806A068(species, GetBankPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      GetBankPosition(bank, 2),
+      GetBankCoord(bank, 2),
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
@@ -1262,7 +1262,7 @@ static void LinkOpponentHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if ((GetBankIdentity(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
             xPos = 152;
         else // first mon
             xPos = 200;
@@ -1328,7 +1328,7 @@ static void LinkOpponentHandleDrawTrainerPic(void)
     }
 
     DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankIdentity(gActiveBank));
+    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                xPos,
                                                (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40,
@@ -1353,7 +1353,7 @@ static void LinkOpponentHandleTrainerSlide(void)
         trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_B);
 
     DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankIdentity(gActiveBank));
+    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E);
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 96;
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 082b134b4..14061b3a9 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -1047,10 +1047,10 @@ static void LinkPartnerHandleLoadMonSprite(void)
 
     BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
     species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
-    sub_806A068(species, GetBankIdentity(gActiveBank));
+    sub_806A068(species, GetBankPosition(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankPosition(gActiveBank, 2),
+                                               GetBankCoord(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
@@ -1077,11 +1077,11 @@ static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    sub_806A068(species, GetBankIdentity(bank));
+    sub_806A068(species, GetBankPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      GetBankPosition(bank, 2),
+      GetBankCoord(bank, 2),
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
@@ -1144,7 +1144,7 @@ static void LinkPartnerHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if ((GetBankIdentity(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
             xPos = 90;
         else // first mon
             xPos = 32;
@@ -1170,7 +1170,7 @@ static void LinkPartnerHandleDrawTrainerPic(void)
     }
 
     DecompressTrainerBackPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankIdentity(gActiveBank));
+    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, sub_80A82E4(gActiveBank));
 
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 30414d53a..d3e72c0ad 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -293,7 +293,7 @@ static void sub_805F2F0(void)
         }
         else if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
         {
-            if (GetBankIdentity(gActiveBank) == 3)
+            if (GetBankPosition(gActiveBank) == 3)
             {
                 if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 == 0 && gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1 == 0)
                 {
@@ -349,7 +349,7 @@ static void sub_805F560(void)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
-                if (GetBankIdentity(gActiveBank) == 1)
+                if (GetBankPosition(gActiveBank) == 1)
                     m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
@@ -1149,10 +1149,10 @@ static void OpponentHandleLoadMonSprite(void)
     u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
 
     BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    sub_806A068(species, GetBankIdentity(gActiveBank));
+    sub_806A068(species, GetBankPosition(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankPosition(gActiveBank, 2),
+                                               GetBankCoord(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
 
@@ -1184,10 +1184,10 @@ static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
     species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
-    sub_806A068(species, GetBankIdentity(bank));
+    sub_806A068(species, GetBankPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
-                                        GetBankPosition(bank, 2),
+                                        GetBankCoord(bank, 2),
                                         GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
@@ -1304,7 +1304,7 @@ static void OpponentHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS))
     {
-        if ((GetBankIdentity(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
             xPos = 152;
         else // first mon
             xPos = 200;
@@ -1315,7 +1315,7 @@ static void OpponentHandleDrawTrainerPic(void)
     }
 
     DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankIdentity(gActiveBank));
+    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                xPos,
                                                (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40,
@@ -1387,7 +1387,7 @@ static void OpponentHandleTrainerSlide(void)
     }
 
     DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankIdentity(gActiveBank));
+    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E);
 
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 96;
@@ -1588,9 +1588,9 @@ static void OpponentHandleChooseMove(void)
                     gBankTarget = gActiveBank;
                 if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH)
                 {
-                    gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+                    gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
                     if (gAbsentBankFlags & gBitTable[gBankTarget])
-                        gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+                        gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
                 }
                 EmitTwoReturnValues(1, 10, (chosenMoveId) | (gBankTarget << 8));
                 break;
@@ -1611,7 +1611,7 @@ static void OpponentHandleChooseMove(void)
             else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
                 EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBankByIdentity(Random() & 2) << 8));
             else
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBankByIdentity(IDENTITY_PLAYER_MON1) << 8));
+                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBankByIdentity(B_POSITION_PLAYER_LEFT) << 8));
 
             OpponentBufferExecCompleted();
         }
@@ -1638,12 +1638,12 @@ static void OpponentHandleChoosePokemon(void)
 
             if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
             {
-                bank2 = bank1 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+                bank2 = bank1 = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
             }
             else
             {
-                bank1 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
-                bank2 = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+                bank1 = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+                bank2 = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
             }
 
             if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index a9d5b70eb..dfbf9df94 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -232,7 +232,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     nullsub_22
 };
 
-static const u8 sTargetIdentities[] = {IDENTITY_PLAYER_MON1, IDENTITY_PLAYER_MON2, IDENTITY_OPPONENT_MON2, IDENTITY_OPPONENT_MON1};
+static const u8 sTargetIdentities[] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT};
 
 // unknown unused data
 static const u8 sUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58};
@@ -357,8 +357,8 @@ static void HandleInputChooseAction(void)
     else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59)
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-         && GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON2
-         && !(gAbsentBankFlags & gBitTable[GetBankByIdentity(IDENTITY_PLAYER_MON1)])
+         && GetBankPosition(gActiveBank) == B_POSITION_PLAYER_RIGHT
+         && !(gAbsentBankFlags & gBitTable[GetBankByIdentity(B_POSITION_PLAYER_LEFT)])
          && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
             if (gBattleBufferA[gActiveBank][1] == ACTION_USE_ITEM)
@@ -436,7 +436,7 @@ static void HandleInputChooseTarget(void)
 
         do
         {
-            u8 currSelIdentity = GetBankIdentity(gMultiUsePlayerCursor);
+            u8 currSelIdentity = GetBankPosition(gMultiUsePlayerCursor);
 
             for (i = 0; i < BATTLE_BANKS_COUNT; i++)
             {
@@ -451,17 +451,17 @@ static void HandleInputChooseTarget(void)
             } while (gMultiUsePlayerCursor == gNoOfAllBanks);
 
             i = 0;
-            switch (GetBankIdentity(gMultiUsePlayerCursor))
+            switch (GetBankPosition(gMultiUsePlayerCursor))
             {
-            case IDENTITY_PLAYER_MON1:
-            case IDENTITY_PLAYER_MON2:
+            case B_POSITION_PLAYER_LEFT:
+            case B_POSITION_PLAYER_RIGHT:
                 if (gActiveBank != gMultiUsePlayerCursor)
                     i++;
                 else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBank])].target & MOVE_TARGET_USER)
                     i++;
                 break;
-            case IDENTITY_OPPONENT_MON1:
-            case IDENTITY_OPPONENT_MON2:
+            case B_POSITION_OPPONENT_LEFT:
+            case B_POSITION_OPPONENT_RIGHT:
                 i++;
                 break;
             }
@@ -478,7 +478,7 @@ static void HandleInputChooseTarget(void)
 
         do
         {
-            u8 currSelIdentity = GetBankIdentity(gMultiUsePlayerCursor);
+            u8 currSelIdentity = GetBankPosition(gMultiUsePlayerCursor);
 
             for (i = 0; i < BATTLE_BANKS_COUNT; i++)
             {
@@ -493,17 +493,17 @@ static void HandleInputChooseTarget(void)
             } while (gMultiUsePlayerCursor == gNoOfAllBanks);
 
             i = 0;
-            switch (GetBankIdentity(gMultiUsePlayerCursor))
+            switch (GetBankPosition(gMultiUsePlayerCursor))
             {
-            case IDENTITY_PLAYER_MON1:
-            case IDENTITY_PLAYER_MON2:
+            case B_POSITION_PLAYER_LEFT:
+            case B_POSITION_PLAYER_RIGHT:
                 if (gActiveBank != gMultiUsePlayerCursor)
                     i++;
                 else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBank])].target & MOVE_TARGET_USER)
                     i++;
                 break;
-            case IDENTITY_OPPONENT_MON1:
-            case IDENTITY_OPPONENT_MON2:
+            case B_POSITION_OPPONENT_LEFT:
+            case B_POSITION_OPPONENT_RIGHT:
                 i++;
                 break;
             }
@@ -545,7 +545,7 @@ static void HandleInputChooseMove(void)
         if (moveTarget & MOVE_TARGET_x10)
             gMultiUsePlayerCursor = gActiveBank;
         else
-            gMultiUsePlayerCursor = GetBankByIdentity((GetBankIdentity(gActiveBank) & BIT_SIDE) ^ BIT_SIDE);
+            gMultiUsePlayerCursor = GetBankByIdentity((GetBankPosition(gActiveBank) & BIT_SIDE) ^ BIT_SIDE);
 
         if (!gBattleBufferA[gActiveBank][1]) // not a double battle
         {
@@ -579,10 +579,10 @@ static void HandleInputChooseMove(void)
 
             if (moveTarget & (MOVE_TARGET_x10 | MOVE_TARGET_USER))
                 gMultiUsePlayerCursor = gActiveBank;
-            else if (gAbsentBankFlags & gBitTable[GetBankByIdentity(IDENTITY_OPPONENT_MON1)])
-                gMultiUsePlayerCursor = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+            else if (gAbsentBankFlags & gBitTable[GetBankByIdentity(B_POSITION_OPPONENT_LEFT)])
+                gMultiUsePlayerCursor = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
             else
-                gMultiUsePlayerCursor = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+                gMultiUsePlayerCursor = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
 
             gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
         }
@@ -2234,11 +2234,11 @@ static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    sub_806A068(species, GetBankIdentity(bank));
+    sub_806A068(species, GetBankPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      GetBankPosition(bank, 2),
+      GetBankCoord(bank, 2),
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
@@ -2326,7 +2326,7 @@ static void PlayerHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if ((GetBankIdentity(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
             xPos = 90;
         else // first mon
             xPos = 32;
@@ -2353,7 +2353,7 @@ static void PlayerHandleDrawTrainerPic(void)
     {
         trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender);
         DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-        sub_806A1C0(trainerPicId, GetBankIdentity(gActiveBank));
+        sub_806A1C0(trainerPicId, GetBankPosition(gActiveBank));
         gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
 
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
@@ -2368,7 +2368,7 @@ static void PlayerHandleDrawTrainerPic(void)
     else
     {
         DecompressTrainerBackPic(trainerPicId, gActiveBank);
-        sub_806A12C(trainerPicId, GetBankIdentity(gActiveBank));
+        sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
         gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
 
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
@@ -2407,7 +2407,7 @@ static void PlayerHandleTrainerSlide(void)
     }
 
     DecompressTrainerBackPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankIdentity(gActiveBank));
+    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, 80, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, 30);
 
     gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
@@ -2463,7 +2463,7 @@ static void PlayerHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
@@ -2473,7 +2473,7 @@ static void PlayerHandleBallThrowAnim(void)
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 6b5211ceb..5d6f07a48 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -1234,10 +1234,10 @@ static void PlayerPartnerHandleLoadMonSprite(void)
 
     BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
     species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
-    sub_806A068(species, GetBankIdentity(gActiveBank));
+    sub_806A068(species, GetBankPosition(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankPosition(gActiveBank, 2),
+                                               GetBankCoord(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
@@ -1264,11 +1264,11 @@ static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    sub_806A068(species, GetBankIdentity(bank));
+    sub_806A068(species, GetBankPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      GetBankPosition(bank, 2),
+      GetBankCoord(bank, 2),
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
@@ -1349,7 +1349,7 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
     if (gPartnerTrainerId == STEVEN_PARTNER_ID)
     {
         DecompressTrainerBackPic(trainerPicId, gActiveBank);
-        sub_806A12C(trainerPicId, GetBankIdentity(gActiveBank));
+        sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
         gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
 
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
@@ -1360,7 +1360,7 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
     else // otherwise use front sprite
     {
         DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-        sub_806A1C0(trainerPicId, GetBankIdentity(gActiveBank));
+        sub_806A1C0(trainerPicId, GetBankPosition(gActiveBank));
         gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
 
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
@@ -1548,9 +1548,9 @@ static void PlayerPartnerHandleChooseMove(void)
         gBankTarget = gActiveBank;
     if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH)
     {
-        gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
         if (gAbsentBankFlags & gBitTable[gBankTarget])
-            gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+            gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
     }
 
     EmitTwoReturnValues(1, 10, chosenMoveId | (gBankTarget << 8));
@@ -1568,8 +1568,8 @@ static void PlayerPartnerHandleChoosePokemon(void)
 
     if (chosenMonId == 6) // just switch to the next mon
     {
-        u8 playerMonIdentity = GetBankByIdentity(IDENTITY_PLAYER_MON1);
-        u8 selfIdentity = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+        u8 playerMonIdentity = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+        u8 selfIdentity = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
 
         for (chosenMonId = 3; chosenMonId < 6; chosenMonId++)
         {
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 6e29fa951..e5e0bef84 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -274,7 +274,7 @@ static void sub_8186678(void)
 
     if (var)
     {
-        if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1)
+        if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_LEFT)
         {
             if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
                 return;
@@ -330,7 +330,7 @@ static void sub_818686C(void)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
-                if (GetBankIdentity(gActiveBank) == IDENTITY_OPPONENT_MON1)
+                if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_LEFT)
                     m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
@@ -1146,10 +1146,10 @@ static void RecordedOpponentHandleLoadMonSprite(void)
     u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
 
     BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    sub_806A068(species, GetBankIdentity(gActiveBank));
+    sub_806A068(species, GetBankPosition(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankPosition(gActiveBank, 2),
+                                               GetBankCoord(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
 
@@ -1181,10 +1181,10 @@ static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
     species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
-    sub_806A068(species, GetBankIdentity(bank));
+    sub_806A068(species, GetBankPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
-                                        GetBankPosition(bank, 2),
+                                        GetBankCoord(bank, 2),
                                         GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
@@ -1248,7 +1248,7 @@ static void RecordedOpponentHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if ((GetBankIdentity(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
             xPos = 152;
         else // first mon
             xPos = 200;
@@ -1279,7 +1279,7 @@ static void RecordedOpponentHandleDrawTrainerPic(void)
     }
 
     DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankIdentity(gActiveBank));
+    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                xPos,
                                                (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40,
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index f101d811f..183da6bfd 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -245,7 +245,7 @@ static void sub_8189AA0(void)
 {
     bool32 r6 = FALSE;
 
-    if (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON1)
+    if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_LEFT)
     {
         if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
         {
@@ -312,7 +312,7 @@ static void sub_8189D40(void)
 {
     bool32 r10 = FALSE;
 
-    if (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON1)
+    if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_LEFT)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
@@ -353,7 +353,7 @@ static void sub_8189D40(void)
         {
             if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && (gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                if (GetBankIdentity(gActiveBank) == IDENTITY_PLAYER_MON1)
+                if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_LEFT)
                     m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
@@ -1132,10 +1132,10 @@ static void RecordedPlayerHandleLoadMonSprite(void)
 
     BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
     species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
-    sub_806A068(species, GetBankIdentity(gActiveBank));
+    sub_806A068(species, GetBankPosition(gActiveBank));
 
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankPosition(gActiveBank, 2),
+                                               GetBankCoord(gActiveBank, 2),
                                                GetBankSpriteDefault_Y(gActiveBank),
                                                sub_80A82E4(gActiveBank));
     gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
@@ -1162,11 +1162,11 @@ static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    sub_806A068(species, GetBankIdentity(bank));
+    sub_806A068(species, GetBankPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      GetBankPosition(bank, 2),
+      GetBankCoord(bank, 2),
       GetBankSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
@@ -1241,7 +1241,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if ((GetBankIdentity(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
             xPos = 90;
         else // first mon
             xPos = 32;
@@ -1267,7 +1267,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
     {
         trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender);
         DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-        sub_806A1C0(trainerPicId, GetBankIdentity(gActiveBank));
+        sub_806A1C0(trainerPicId, GetBankPosition(gActiveBank));
         gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
 
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
@@ -1281,7 +1281,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
     else
     {
         DecompressTrainerBackPic(trainerPicId, gActiveBank);
-        sub_806A12C(trainerPicId, GetBankIdentity(gActiveBank));
+        sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
         gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
 
         gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 682e8333d..a04f06d8c 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -378,7 +378,7 @@ static void SafariHandleReturnMonToBall(void)
 static void SafariHandleDrawTrainerPic(void)
 {
     DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, gActiveBank);
-    sub_806A12C(gSaveBlock2Ptr->playerGender, GetBankIdentity(gActiveBank));
+    sub_806A12C(gSaveBlock2Ptr->playerGender, GetBankPosition(gActiveBank));
     gBankSpriteIds[gActiveBank] = CreateSprite(
       &gUnknown_0202499C,
       80,
@@ -415,7 +415,7 @@ static void SafariHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
@@ -425,7 +425,7 @@ static void SafariHandleBallThrowAnim(void)
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index b0e1e1480..8a34763f6 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -1067,7 +1067,7 @@ static void WallyHandleReturnMonToBall(void)
 static void WallyHandleDrawTrainerPic(void)
 {
     DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBank);
-    sub_806A12C(BACK_PIC_WALLY, GetBankIdentity(gActiveBank));
+    sub_806A12C(BACK_PIC_WALLY, GetBankPosition(gActiveBank));
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                80,
                                                80 + 4 * (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords),
@@ -1082,7 +1082,7 @@ static void WallyHandleDrawTrainerPic(void)
 static void WallyHandleTrainerSlide(void)
 {
     DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBank);
-    sub_806A12C(BACK_PIC_WALLY, GetBankIdentity(gActiveBank));
+    sub_806A12C(BACK_PIC_WALLY, GetBankPosition(gActiveBank));
     gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
                                                80,
                                                80 + 4 * (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords),
@@ -1113,7 +1113,7 @@ static void WallyHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnFinishedAnimation;
 }
 
@@ -1123,7 +1123,7 @@ static void WallyHandleBallThrowAnim(void)
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnFinishedAnimation;
 }
 
@@ -1494,9 +1494,9 @@ static void sub_816AA80(u8 bank)
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    sub_806A068(species, GetBankIdentity(bank));
+    sub_806A068(species, GetBankPosition(bank));
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
-                                        GetBankPosition(bank, 2),
+                                        GetBankCoord(bank, 2),
                                         GetBankSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index c6d47e71e..467ce3640 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -16,7 +16,7 @@ extern u32 gBattleTypeFlags;
 extern u32 gBattleExecBuffer;
 extern void (*gBattleMainFunc)(void);
 extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
-extern u8 gBanksByIdentity[BATTLE_BANKS_COUNT];
+extern u8 gBankPositions[BATTLE_BANKS_COUNT];
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
 extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
 extern u8 gNoOfAllBanks;
@@ -79,7 +79,7 @@ void SetUpBattleVarsAndBirchZigzagoon(void)
     for (i = 0; i < BATTLE_BANKS_COUNT; i++)
     {
         gBattleBankFunc[i] = nullsub_21;
-        gBanksByIdentity[i] = 0xFF;
+        gBankPositions[i] = 0xFF;
         gActionSelectionCursor[i] = 0;
         gMoveSelectionCursor[i] = 0;
     }
@@ -146,30 +146,30 @@ static void SetControllersVariables(void)
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         {
             gBattleBankFunc[0] = SetControllerToRecordedPlayer;
-            gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
             gBattleBankFunc[1] = SetControllerToOpponent;
-            gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
             gBattleBankFunc[2] = SetControllerToPlayerPartner;
-            gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+            gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
 
             gBattleBankFunc[3] = SetControllerToOpponent;
-            gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+            gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
         }
         else
         {
             gBattleBankFunc[0] = SetControllerToPlayer;
-            gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
             gBattleBankFunc[1] = SetControllerToOpponent;
-            gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
             gBattleBankFunc[2] = SetControllerToPlayerPartner;
-            gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+            gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
 
             gBattleBankFunc[3] = SetControllerToOpponent;
-            gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+            gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
         }
 
         gNoOfAllBanks = 4;
@@ -195,10 +195,10 @@ static void SetControllersVariables(void)
         else
             gBattleBankFunc[0] = SetControllerToPlayer;
 
-        gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+        gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
         gBattleBankFunc[1] = SetControllerToOpponent;
-        gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+        gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
         gNoOfAllBanks = 2;
 
@@ -211,20 +211,20 @@ static void SetControllersVariables(void)
                     gBattleMainFunc = BeginBattleIntro;
 
                     gBattleBankFunc[0] = SetControllerToRecordedPlayer;
-                    gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+                    gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
                     gBattleBankFunc[1] = SetControllerToRecordedOpponent;
-                    gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+                    gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
                     gNoOfAllBanks = 2;
                 }
                 else // see how the banks are switched
                 {
                     gBattleBankFunc[1] = SetControllerToRecordedPlayer;
-                    gBanksByIdentity[1] = IDENTITY_PLAYER_MON1;
+                    gBankPositions[1] = B_POSITION_PLAYER_LEFT;
 
                     gBattleBankFunc[0] = SetControllerToRecordedOpponent;
-                    gBanksByIdentity[0] = IDENTITY_OPPONENT_MON1;
+                    gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
 
                     gNoOfAllBanks = 2;
                 }
@@ -232,10 +232,10 @@ static void SetControllersVariables(void)
             else
             {
                 gBattleBankFunc[0] = SetControllerToRecordedPlayer;
-                gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+                gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
                 gBattleBankFunc[1] = SetControllerToOpponent;
-                gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+                gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
             }
         }
     }
@@ -244,16 +244,16 @@ static void SetControllersVariables(void)
         gBattleMainFunc = BeginBattleIntro;
 
         gBattleBankFunc[0] = SetControllerToPlayer;
-        gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+        gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
         gBattleBankFunc[1] = SetControllerToOpponent;
-        gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+        gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
         gBattleBankFunc[2] = SetControllerToPlayer;
-        gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+        gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
 
         gBattleBankFunc[3] = SetControllerToOpponent;
-        gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+        gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
         gNoOfAllBanks = 4;
 
@@ -264,16 +264,16 @@ static void SetControllersVariables(void)
                 gBattleMainFunc = BeginBattleIntro;
 
                 gBattleBankFunc[0] = SetControllerToRecordedPlayer;
-                gBanksByIdentity[0] = 0;
+                gBankPositions[0] = 0;
 
                 gBattleBankFunc[1] = SetControllerToOpponent;
-                gBanksByIdentity[1] = 1;
+                gBankPositions[1] = 1;
 
                 gBattleBankFunc[2] = SetControllerToRecordedPlayer;
-                gBanksByIdentity[2] = 2;
+                gBankPositions[2] = 2;
 
                 gBattleBankFunc[3] = SetControllerToOpponent;
-                gBanksByIdentity[3] = 3;
+                gBankPositions[3] = 3;
 
                 gNoOfAllBanks = 4;
 
@@ -312,12 +312,12 @@ static void SetControllersVariables(void)
                         {
                         case 0:
                         case 3:
-                            gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_PLAYER_MON1;
+                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                             break;
                         case 1:
                         case 2:
-                            gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_PLAYER_MON2;
+                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                             break;
                         }
@@ -330,12 +330,12 @@ static void SetControllersVariables(void)
                         {
                         case 0:
                         case 3:
-                            gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_PLAYER_MON1;
+                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                             break;
                         case 1:
                         case 2:
-                            gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_PLAYER_MON2;
+                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                             break;
                         }
@@ -347,12 +347,12 @@ static void SetControllersVariables(void)
                         {
                         case 0:
                         case 3:
-                            gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_OPPONENT_MON1;
+                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_LEFT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                             break;
                         case 1:
                         case 2:
-                            gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_OPPONENT_MON2;
+                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_RIGHT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                             break;
                         }
@@ -362,51 +362,51 @@ static void SetControllersVariables(void)
             else if (gBattleTypeFlags & BATTLE_TYPE_WILD)
             {
                 gBattleBankFunc[0] = SetControllerToRecordedPlayer;
-                gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+                gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
                 gBattleBankFunc[2] = SetControllerToRecordedPlayer;
-                gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+                gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
 
                 if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
                 {
                   gBattleBankFunc[1] = SetControllerToRecordedOpponent;
-                  gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+                  gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
                   gBattleBankFunc[3] = SetControllerToRecordedOpponent;
-                  gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+                  gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
                 }
                 else
                 {
                   gBattleBankFunc[1] = SetControllerToOpponent;
-                  gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+                  gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
                   gBattleBankFunc[3] = SetControllerToOpponent;
-                  gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+                  gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
                 }
             }
             else
             {
                 gBattleBankFunc[1] = SetControllerToRecordedPlayer;
-                gBanksByIdentity[1] = IDENTITY_PLAYER_MON1;
+                gBankPositions[1] = B_POSITION_PLAYER_LEFT;
 
                 gBattleBankFunc[3] = SetControllerToRecordedPlayer;
-                gBanksByIdentity[3] = IDENTITY_PLAYER_MON2;
+                gBankPositions[3] = B_POSITION_PLAYER_RIGHT;
 
                 if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
                 {
                     gBattleBankFunc[0] = SetControllerToRecordedOpponent;
-                    gBanksByIdentity[0] = IDENTITY_OPPONENT_MON1;
+                    gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
 
                     gBattleBankFunc[2] = SetControllerToRecordedOpponent;
-                    gBanksByIdentity[2] = IDENTITY_OPPONENT_MON2;
+                    gBankPositions[2] = B_POSITION_OPPONENT_RIGHT;
                 }
                 else
                 {
                     gBattleBankFunc[0] = SetControllerToOpponent;
-                    gBanksByIdentity[0] = IDENTITY_OPPONENT_MON1;
+                    gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
 
                     gBattleBankFunc[2] = SetControllerToOpponent;
-                    gBanksByIdentity[2] = IDENTITY_OPPONENT_MON2;
+                    gBankPositions[2] = B_POSITION_OPPONENT_RIGHT;
                 }
             }
         }
@@ -425,20 +425,20 @@ static void SetControllersVariablesInLinkBattle(void)
             gBattleMainFunc = BeginBattleIntro;
 
             gBattleBankFunc[0] = SetControllerToPlayer;
-            gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
             gBattleBankFunc[1] = SetControllerToLinkOpponent;
-            gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
             gNoOfAllBanks = 2;
         }
         else
         {
             gBattleBankFunc[1] = SetControllerToPlayer;
-            gBanksByIdentity[1] = IDENTITY_PLAYER_MON1;
+            gBankPositions[1] = B_POSITION_PLAYER_LEFT;
 
             gBattleBankFunc[0] = SetControllerToLinkOpponent;
-            gBanksByIdentity[0] = IDENTITY_OPPONENT_MON1;
+            gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
 
             gNoOfAllBanks = 2;
         }
@@ -450,32 +450,32 @@ static void SetControllersVariablesInLinkBattle(void)
             gBattleMainFunc = BeginBattleIntro;
 
             gBattleBankFunc[0] = SetControllerToPlayer;
-            gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
             gBattleBankFunc[1] = SetControllerToLinkOpponent;
-            gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
             gBattleBankFunc[2] = SetControllerToPlayer;
-            gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+            gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
 
             gBattleBankFunc[3] = SetControllerToLinkOpponent;
-            gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+            gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
             gNoOfAllBanks = 4;
         }
         else
         {
             gBattleBankFunc[1] = SetControllerToPlayer;
-            gBanksByIdentity[1] = IDENTITY_PLAYER_MON1;
+            gBankPositions[1] = B_POSITION_PLAYER_LEFT;
 
             gBattleBankFunc[0] = SetControllerToLinkOpponent;
-            gBanksByIdentity[0] = IDENTITY_OPPONENT_MON1;
+            gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
 
             gBattleBankFunc[3] = SetControllerToPlayer;
-            gBanksByIdentity[3] = IDENTITY_PLAYER_MON2;
+            gBankPositions[3] = B_POSITION_PLAYER_RIGHT;
 
             gBattleBankFunc[2] = SetControllerToLinkOpponent;
-            gBanksByIdentity[2] = IDENTITY_OPPONENT_MON2;
+            gBankPositions[2] = B_POSITION_OPPONENT_RIGHT;
 
             gNoOfAllBanks = 4;
         }
@@ -487,32 +487,32 @@ static void SetControllersVariablesInLinkBattle(void)
             gBattleMainFunc = BeginBattleIntro;
 
             gBattleBankFunc[0] = SetControllerToPlayer;
-            gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
             gBattleBankFunc[1] = SetControllerToOpponent;
-            gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
             gBattleBankFunc[2] = SetControllerToLinkPartner;
-            gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+            gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
 
             gBattleBankFunc[3] = SetControllerToOpponent;
-            gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+            gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
             gNoOfAllBanks = 4;
         }
         else
         {
             gBattleBankFunc[0] = SetControllerToLinkPartner;
-            gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
 
             gBattleBankFunc[1] = SetControllerToLinkOpponent;
-            gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
             gBattleBankFunc[2] = SetControllerToPlayer;
-            gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+            gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
 
             gBattleBankFunc[3] = SetControllerToLinkOpponent;
-            gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+            gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
             gNoOfAllBanks = 4;
         }
@@ -554,12 +554,12 @@ static void SetControllersVariablesInLinkBattle(void)
                 {
                 case 0:
                 case 3:
-                    gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 0;
+                    gBankPositions[gLinkPlayers[i].lp_field_18] = 0;
                     gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                     break;
                 case 1:
                 case 2:
-                    gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 2;
+                    gBankPositions[gLinkPlayers[i].lp_field_18] = 2;
                     gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                     break;
                 }
@@ -574,12 +574,12 @@ static void SetControllersVariablesInLinkBattle(void)
                     {
                     case 0:
                     case 3:
-                        gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 0;
+                        gBankPositions[gLinkPlayers[i].lp_field_18] = 0;
                         gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                         break;
                     case 1:
                     case 2:
-                        gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 2;
+                        gBankPositions[gLinkPlayers[i].lp_field_18] = 2;
                         gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                         break;
                     }
@@ -591,12 +591,12 @@ static void SetControllersVariablesInLinkBattle(void)
                     {
                     case 0:
                     case 3:
-                        gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 1;
+                        gBankPositions[gLinkPlayers[i].lp_field_18] = 1;
                         gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                         break;
                     case 1:
                     case 2:
-                        gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 3;
+                        gBankPositions[gLinkPlayers[i].lp_field_18] = 3;
                         gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                         break;
                     }
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 775578ca2..5ded24863 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -29,7 +29,7 @@ extern u8 gNoOfAllBanks;
 extern u16 gUnknown_020243FC;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u8 gBanksByIdentity[BATTLE_BANKS_COUNT];
+extern u8 gBankPositions[BATTLE_BANKS_COUNT];
 extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
@@ -262,7 +262,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
     else if (var1 == MOVE_TARGET_SELECTED)
         chosenMoveId |= (BattlePalaceGetTargetRetValue());
     else
-        chosenMoveId |= (GetBankByIdentity((GetBankIdentity(gActiveBank) & BIT_SIDE) ^ BIT_SIDE) << 8);
+        chosenMoveId |= (GetBankByIdentity((GetBankPosition(gActiveBank) & BIT_SIDE) ^ BIT_SIDE) << 8);
 
     return chosenMoveId;
 }
@@ -299,13 +299,13 @@ static u16 BattlePalaceGetTargetRetValue(void)
 
         if (GetBankSide(gActiveBank) == SIDE_PLAYER)
         {
-            opposing1 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
-            opposing2 = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+            opposing1 = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+            opposing2 = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
         }
         else
         {
-            opposing1 = GetBankByIdentity(IDENTITY_PLAYER_MON1);
-            opposing2 = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+            opposing1 = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+            opposing2 = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
         }
 
         if (gBattleMons[opposing1].hp == gBattleMons[opposing2].hp)
@@ -561,7 +561,7 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
-    identity = GetBankIdentity(bank);
+    identity = GetBankPosition(bank);
     HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
                                               gMonSpritesGfxPtr->sprites[identity],
                                               species, currentPersonality);
@@ -614,7 +614,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
-    identity = GetBankIdentity(bank);
+    identity = GetBankPosition(bank);
 
     if (sub_80688F8(1, bank) == 1 || gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
     {
@@ -665,7 +665,7 @@ void nullsub_24(u16 species)
 
 void DecompressTrainerFrontPic(u16 frontPicId, u8 bank)
 {
-    u8 identity = GetBankIdentity(bank);
+    u8 identity = GetBankPosition(bank);
     DecompressPicFromTable_2(&gTrainerFrontPicTable[frontPicId],
                              gMonSpritesGfxPtr->sprites[identity],
                              SPECIES_NONE);
@@ -674,7 +674,7 @@ void DecompressTrainerFrontPic(u16 frontPicId, u8 bank)
 
 void DecompressTrainerBackPic(u16 backPicId, u8 bank)
 {
-    u8 identity = GetBankIdentity(bank);
+    u8 identity = GetBankPosition(bank);
     DecompressPicFromTable_2(&gTrainerBackPicTable[backPicId],
                              gMonSpritesGfxPtr->sprites[identity],
                              SPECIES_NONE);
@@ -713,7 +713,7 @@ void sub_805DFFC(void)
         numberOfBanks = 4;
     }
     for (i = 0; i < numberOfBanks; i++)
-        LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[i]]);
+        LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[i]]);
 }
 
 bool8 BattleLoadAllHealthBoxesGfx(u8 state)
@@ -739,9 +739,9 @@ bool8 BattleLoadAllHealthBoxesGfx(u8 state)
             else if (state == 3)
                 LoadCompressedObjectPic(&gUnknown_0832C0D8);
             else if (state == 4)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[0]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[0]]);
             else if (state == 5)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[1]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[1]]);
             else
                 retVal = TRUE;
         }
@@ -756,13 +756,13 @@ bool8 BattleLoadAllHealthBoxesGfx(u8 state)
             else if (state == 5)
                 LoadCompressedObjectPic(&gUnknown_0832C0F0[1]);
             else if (state == 6)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[0]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[0]]);
             else if (state == 7)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[1]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[1]]);
             else if (state == 8)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[2]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[2]]);
             else if (state == 9)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBanksByIdentity[3]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[3]]);
             else
                 retVal = TRUE;
         }
@@ -815,7 +815,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
         break;
     case 4:
         SetBankHealthboxSpritePos(*bank);
-        if (gBanksByIdentity[*bank] <= 1)
+        if (gBankPositions[*bank] <= 1)
             DummyBattleInterfaceFunc(gHealthBoxesIds[*bank], FALSE);
         else
             DummyBattleInterfaceFunc(gHealthBoxesIds[*bank], TRUE);
@@ -921,7 +921,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
         }
         else
         {
-            identity = GetBankIdentity(bankAtk);
+            identity = GetBankPosition(bankAtk);
 
             if (GetBankSide(bankDef) == SIDE_OPPONENT)
                 targetSpecies = GetMonData(&gEnemyParty[gBattlePartyID[bankDef]], MON_DATA_SPECIES);
@@ -991,7 +991,7 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
         if (IsContest())
             identity = 0;
         else
-            identity = GetBankIdentity(bank);
+            identity = GetBankPosition(bank);
 
         if (IsContest())
             LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[identity]);
@@ -1080,7 +1080,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank)
 
 void BattleStopLowHpSound(void)
 {
-    u8 playerBank = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+    u8 playerBank = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
 
     gBattleSpritesDataPtr->bankData[playerBank].lowHpSong = 0;
     if (IsDoubleBattle())
@@ -1101,8 +1101,8 @@ void sub_805EAE8(void)
 {
     if (gMain.inBattle)
     {
-        u8 playerBank1 = GetBankByIdentity(IDENTITY_PLAYER_MON1);
-        u8 playerBank2 = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+        u8 playerBank1 = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+        u8 playerBank2 = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
         u8 bank1PartyId = pokemon_order_func(gBattlePartyID[playerBank1]);
         u8 bank2PartyId = pokemon_order_func(gBattlePartyID[playerBank2]);
 
@@ -1143,14 +1143,14 @@ void LoadAndCreateEnemyShadowSprites(void)
 
     LoadCompressedObjectPic(&gSpriteSheet_EnemyShadow);
 
-    bank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
-    gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankPosition(bank, 0), GetBankPosition(bank, 1) + 29, 0xC8);
+    bank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+    gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankCoord(bank, 0), GetBankCoord(bank, 1) + 29, 0xC8);
     gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
 
     if (IsDoubleBattle())
     {
-        bank = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
-        gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankPosition(bank, 0), GetBankPosition(bank, 1) + 29, 0xC8);
+        bank = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+        gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankCoord(bank, 0), GetBankCoord(bank, 1) + 29, 0xC8);
         gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
     }
 }
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 6a6bf00a2..05f500860 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -152,7 +152,7 @@ enum
     HEALTHBOX_GFX_117,
 };
 
-extern u8 gBanksByIdentity[BATTLE_BANKS_COUNT];
+extern u8 gBankPositions[BATTLE_BANKS_COUNT];
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern u8 gNoOfAllBanks;
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
@@ -933,8 +933,8 @@ u8 CreateBankHealthboxSprites(u8 bank)
     {
         if (GetBankSide(bank) == SIDE_PLAYER)
         {
-            healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBankIdentity(bank) / 2], 240, 160, 1);
-            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBankIdentity(bank) / 2], 240, 160, 1);
+            healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBankPosition(bank) / 2], 240, 160, 1);
+            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBankPosition(bank) / 2], 240, 160, 1);
 
             gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2;
 
@@ -946,8 +946,8 @@ u8 CreateBankHealthboxSprites(u8 bank)
         }
         else
         {
-            healthboxSpriteId_1 = CreateSprite(&sHealthboxOpponentSpriteTemplates[GetBankIdentity(bank) / 2], 240, 160, 1);
-            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[GetBankIdentity(bank) / 2], 240, 160, 1);
+            healthboxSpriteId_1 = CreateSprite(&sHealthboxOpponentSpriteTemplates[GetBankPosition(bank) / 2], 240, 160, 1);
+            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[GetBankPosition(bank) / 2], 240, 160, 1);
 
             gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2;
 
@@ -959,7 +959,7 @@ u8 CreateBankHealthboxSprites(u8 bank)
         }
     }
 
-    unkSpriteId = CreateSpriteAtEnd(&sUnknown_0832C1C0[gBanksByIdentity[bank]], 140, 60, 0);
+    unkSpriteId = CreateSpriteAtEnd(&sUnknown_0832C1C0[gBankPositions[bank]], 140, 60, 0);
     unkSpritePtr = &gSprites[unkSpriteId];
     SetSubspriteTables(unkSpritePtr, &sUnknown_0832C28C[GetBankSide(bank)]);
     unkSpritePtr->subspriteMode = 2;
@@ -1111,18 +1111,18 @@ void SetBankHealthboxSpritePos(u8 bank)
     }
     else
     {
-        switch (GetBankIdentity(bank))
+        switch (GetBankPosition(bank))
         {
-        case IDENTITY_PLAYER_MON1:
+        case B_POSITION_PLAYER_LEFT:
             x = 159, y = 76;
             break;
-        case IDENTITY_PLAYER_MON2:
+        case B_POSITION_PLAYER_RIGHT:
             x = 171, y = 101;
             break;
-        case IDENTITY_OPPONENT_MON1:
+        case B_POSITION_OPPONENT_LEFT:
             x = 44, y = 19;
             break;
-        case IDENTITY_OPPONENT_MON2:
+        case B_POSITION_OPPONENT_RIGHT:
             x = 32, y = 44;
             break;
         }
@@ -1353,7 +1353,7 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon)
     u8 i, var, nature, healthboxSpriteId_2;
 
     memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4));
-    barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBankIdentity(gSprites[healthboxSpriteId].data[6]) * 384)];
+    barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBankPosition(gSprites[healthboxSpriteId].data[6]) * 384)];
     var = 5;
     nature = GetNature(mon);
     StringCopy(text + 6, gNatureNamePointers[nature]);
@@ -1485,7 +1485,7 @@ u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 ar
     u8 ballIconSpritesIds[6];
     u8 taskId;
 
-    if (!arg2 || GetBankIdentity(bank) != IDENTITY_OPPONENT_MON2)
+    if (!arg2 || GetBankPosition(bank) != B_POSITION_OPPONENT_RIGHT)
     {
         if (GetBankSide(bank) == SIDE_PLAYER)
         {
diff --git a/src/battle_message.c b/src/battle_message.c
index e37a4c30c..80aa5e3f9 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1834,25 +1834,25 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gStringVar3;
                 break;
             case B_TXT_PLAYER_MON1_NAME: // first player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(IDENTITY_PLAYER_MON1)]],
+                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(B_POSITION_PLAYER_LEFT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_OPPONENT_MON1_NAME: // first enemy poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(IDENTITY_OPPONENT_MON1)]],
+                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(B_POSITION_OPPONENT_LEFT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_PLAYER_MON2_NAME: // second player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(IDENTITY_PLAYER_MON2)]],
+                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(B_POSITION_PLAYER_RIGHT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_OPPONENT_MON2_NAME: // second enemy poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(IDENTITY_OPPONENT_MON2)]],
+                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(B_POSITION_OPPONENT_RIGHT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c7976fc2a..18c094571 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -4661,7 +4661,7 @@ _0804BA58:\n\
 	ldr r6, =gActiveBank\n\
 	ldrb r0, [r6]\n\
 	str r3, [sp]\n\
-	bl GetBankIdentity\n\
+	bl GetBankPosition\n\
 	mov r1, r10\n\
 	ands r1, r0\n\
 	lsls r0, r1, 1\n\
@@ -5103,7 +5103,7 @@ static void atk49_moveend(void)
                 && !gProtectStructs[gBankAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
                 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
             {
-                u8 bank = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON);
+                u8 bank = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
                 if (gBattleMons[bank].hp != 0)
                 {
                     gBankTarget = bank;
@@ -5454,10 +5454,10 @@ static void atk4F_jumpifcantswitch(void)
     {
         if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
         {
-            r7 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+            r7 = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
 
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                compareVar = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+                compareVar = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
             else
                 compareVar = r7;
 
@@ -5465,10 +5465,10 @@ static void atk4F_jumpifcantswitch(void)
         }
         else
         {
-            r7 = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+            r7 = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
 
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                compareVar = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+                compareVar = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
             else
                 compareVar = r7;
 
@@ -5763,7 +5763,7 @@ static void atk50_openpartyscreen(void)
 
             gBattlescriptCurrInstr += 6;
 
-            if (GetBankIdentity(gActiveBank) == 0 && gBattleResults.playerSwitchesCounter < 0xFF)
+            if (GetBankPosition(gActiveBank) == 0 && gBattleResults.playerSwitchesCounter < 0xFF)
                 gBattleResults.playerSwitchesCounter++;
 
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
@@ -5779,7 +5779,7 @@ static void atk50_openpartyscreen(void)
             }
             else
             {
-                gActiveBank = GetBankByIdentity(GetBankIdentity(bank) ^ BIT_SIDE);
+                gActiveBank = GetBankByIdentity(GetBankPosition(bank) ^ BIT_SIDE);
                 if (gAbsentBankFlags & gBitTable[gActiveBank])
                     gActiveBank ^= BIT_MON;
 
@@ -5976,7 +5976,7 @@ static void atk56_playfaintcry(void)
 
 static void atk57(void)
 {
-    gActiveBank = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+    gActiveBank = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
     EmitCmd55(0, gBattleOutcome);
     MarkBufferBankForExecution(gActiveBank);
 
@@ -6011,7 +6011,7 @@ static void atk59_handlelearnnewmove(void)
     }
     else
     {
-        gActiveBank = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+        gActiveBank = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
 
         if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterId
             && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
@@ -6020,7 +6020,7 @@ static void atk59_handlelearnnewmove(void)
         }
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
-            gActiveBank = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+            gActiveBank = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
             if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterId
                 && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
             {
@@ -6851,7 +6851,7 @@ static void atk6D_resetsentmonsvalue(void)
 
 static void atk6E_setatktoplayer0(void)
 {
-    gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+    gBankAttacker = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
     gBattlescriptCurrInstr++;
 }
 
@@ -8309,7 +8309,7 @@ static void atk98_updatestatusicon(void)
         }
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         {
-            gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_MON);
+            gActiveBank = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_MON);
             if (!(gAbsentBankFlags & gBitTable[gActiveBank]))
             {
                 EmitStatusIconUpdate(0, gBattleMons[gActiveBank].status1, gBattleMons[gActiveBank].status2);
@@ -8978,7 +8978,7 @@ static void atkAE_healpartystatus(void)
             gBattleCommunication[MULTISTRING_CHOOSER] |= 1;
         }
 
-        gActiveBank = gBattleScripting.bank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_MON);
+        gActiveBank = gBattleScripting.bank = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_MON);
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
             && !(gAbsentBankFlags & gBitTable[gActiveBank]))
@@ -9026,7 +9026,7 @@ static void atkAE_healpartystatus(void)
         gBattleMons[gBankAttacker].status1 = 0;
         gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
 
-        gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_MON);
+        gActiveBank = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_MON);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
             && !(gAbsentBankFlags & gBitTable[gActiveBank]))
         {
@@ -9296,16 +9296,16 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
     if (gMultiHitCounter == 1)
     {
         if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-            gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+            gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
         else
-            gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+            gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
     }
     else
     {
         if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-            gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+            gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
         else
-            gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+            gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
     }
 
     if (gActionForBanks[gBankTarget] == ACTION_USE_MOVE
@@ -9875,7 +9875,7 @@ static void atkD0_settaunt(void)
 
 static void atkD1_trysethelpinghand(void)
 {
-    gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_MON);
+    gBankTarget = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_MON);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
         && !(gAbsentBankFlags & gBitTable[gBankTarget])
@@ -10544,7 +10544,7 @@ static void atkEB_settypetoterrain(void)
 
 static void atkEC_pursuitrelated(void)
 {
-    gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_MON);
+    gActiveBank = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_MON);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
         && !(gAbsentBankFlags & gBitTable[gActiveBank])
diff --git a/src/battle_util.c b/src/battle_util.c
index 2ce37cfbd..2a1b421f5 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -104,16 +104,16 @@ u8 GetBattleBank(u8 caseId)
     case 8:
     case 9:
     case BS_GET_PLAYER1:
-        ret = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+        ret = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
         break;
     case BS_GET_OPPONENT1:
-        ret = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        ret = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
         break;
     case BS_GET_PLAYER2:
-        ret = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+        ret = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
         break;
     case BS_GET_OPPONENT2:
-        ret = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+        ret = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
         break;
     }
     return ret;
@@ -1667,14 +1667,14 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
     {
         if (GetBankSide(bank) == SIDE_OPPONENT)
         {
-            r7 = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
-            r6 = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+            r7 = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+            r6 = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
             party = gEnemyParty;
         }
         else
         {
-            r7 = GetBankByIdentity(IDENTITY_PLAYER_MON1);
-            r6 = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+            r7 = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+            r6 = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
             party = gPlayerParty;
         }
         if (r1 == 6)
@@ -2335,7 +2335,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 if (gBattleMons[i].ability == ABILITY_TRACE && (gStatuses3[i] & STATUS3_TRACE))
                 {
                     u8 target2;
-                    side = (GetBankIdentity(i) ^ BIT_SIDE) & BIT_SIDE; // side of the opposing pokemon
+                    side = (GetBankPosition(i) ^ BIT_SIDE) & BIT_SIDE; // side of the opposing pokemon
                     target1 = GetBankByIdentity(side);
                     target2 = GetBankByIdentity(side + BIT_MON);
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -3268,7 +3268,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     case MOVE_TARGET_BOTH:
     case MOVE_TARGET_FOES_AND_ALLY:
     case MOVE_TARGET_OPPONENTS_FIELD:
-        targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
+        targetBank = GetBankByIdentity((GetBankPosition(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
         if (gAbsentBankFlags & gBitTable[targetBank])
             targetBank ^= BIT_MON;
         break;
@@ -3281,22 +3281,22 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
             if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
             {
                 if (Random() & 1)
-                    targetBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+                    targetBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
                 else
-                    targetBank = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+                    targetBank = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
             }
             else
             {
                 if (Random() & 1)
-                    targetBank = GetBankByIdentity(IDENTITY_PLAYER_MON1);
+                    targetBank = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
                 else
-                    targetBank = GetBankByIdentity(IDENTITY_PLAYER_MON2);
+                    targetBank = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
             }
             if (gAbsentBankFlags & gBitTable[targetBank])
                 targetBank ^= BIT_MON;
         }
         else
-            targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
+            targetBank = GetBankByIdentity((GetBankPosition(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
         break;
     case MOVE_TARGET_USER:
     case MOVE_TARGET_x10:
@@ -3332,7 +3332,7 @@ u8 IsMonDisobedient(void)
 
     if (HasObedientBitSet(gBankAttacker)) // only if species is Mew or Deoxys
     {
-        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBankIdentity(gBankAttacker) == 2)
+        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBankPosition(gBankAttacker) == 2)
             return 0;
         if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
             return 0;
diff --git a/src/battle_util2.c b/src/battle_util2.c
index 538c1c641..d242ab6c9 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -87,15 +87,15 @@ void AdjustFriendshipOnBattleFaint(u8 bank)
     {
         u8 opposingBank2;
 
-        opposingBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
-        opposingBank2 = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+        opposingBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+        opposingBank2 = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
 
         if (gBattleMons[opposingBank2].level > gBattleMons[opposingBank].level)
             opposingBank = opposingBank2;
     }
     else
     {
-        opposingBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        opposingBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
     }
 
     if (gBattleMons[opposingBank].level > gBattleMons[bank].level)
diff --git a/src/pokeball.c b/src/pokeball.c
index b48e55135..86ab85b6a 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -384,14 +384,14 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
         gSprites[ballSpriteId].callback = SpriteCB_PlayerMonSendOut_1;
         break;
     case POKEBALL_OPPONENT_SENDOUT:
-        gSprites[ballSpriteId].pos1.x = GetBankPosition(bank, BANK_X_POS);
-        gSprites[ballSpriteId].pos1.y = GetBankPosition(bank, BANK_Y_POS) + 24;
+        gSprites[ballSpriteId].pos1.x = GetBankCoord(bank, BANK_X_POS);
+        gSprites[ballSpriteId].pos1.y = GetBankCoord(bank, BANK_Y_POS) + 24;
         gBankTarget = bank;
         gSprites[ballSpriteId].data[0] = 0;
         gSprites[ballSpriteId].callback = SpriteCB_OpponentMonSendOut;
         break;
     default:
-        gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+        gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
         notSendOut = TRUE;
         break;
     }
@@ -405,8 +405,8 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
 
     // this will perform an unused ball throw animation
     gSprites[ballSpriteId].data[0] = 0x22;
-    gSprites[ballSpriteId].data[2] = GetBankPosition(gBankTarget, BANK_X_POS);
-    gSprites[ballSpriteId].data[4] = GetBankPosition(gBankTarget, BANK_Y_POS) - 16;
+    gSprites[ballSpriteId].data[2] = GetBankCoord(gBankTarget, BANK_X_POS);
+    gSprites[ballSpriteId].data[4] = GetBankCoord(gBankTarget, BANK_Y_POS) - 16;
     gSprites[ballSpriteId].data[5] = -40;
     sub_80A68D4(&gSprites[ballSpriteId]);
     gSprites[ballSpriteId].oam.affineParam = taskId;
@@ -767,7 +767,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
         }
 
         species = GetMonData(mon, MON_DATA_SPECIES);
-        if ((bank == GetBankByIdentity(IDENTITY_PLAYER_MON1) || bank == GetBankByIdentity(IDENTITY_OPPONENT_MON1))
+        if ((bank == GetBankByIdentity(B_POSITION_PLAYER_LEFT) || bank == GetBankByIdentity(B_POSITION_OPPONENT_LEFT))
          && IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
@@ -783,7 +783,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
 
         if (!IsDoubleBattle() || !gBattleSpritesDataPtr->animationData->field_9_x1)
             wantedCryCase = 0;
-        else if (bank == GetBankByIdentity(IDENTITY_PLAYER_MON1) || bank == GetBankByIdentity(IDENTITY_OPPONENT_MON1))
+        else if (bank == GetBankByIdentity(B_POSITION_PLAYER_LEFT) || bank == GetBankByIdentity(B_POSITION_OPPONENT_LEFT))
             wantedCryCase = 1;
         else
             wantedCryCase = 2;
@@ -900,8 +900,8 @@ static void sub_80760F8(struct Sprite *sprite)
 static void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite)
 {
     sprite->data[0] = 25;
-    sprite->data[2] = GetBankPosition(sprite->sBank, 2);
-    sprite->data[4] = GetBankPosition(sprite->sBank, 3) + 24;
+    sprite->data[2] = GetBankCoord(sprite->sBank, 2);
+    sprite->data[4] = GetBankCoord(sprite->sBank, 3) + 24;
     sprite->data[5] = -30;
     sprite->oam.affineParam = sprite->sBank;
     sub_80A68D4(sprite);
@@ -956,7 +956,7 @@ static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite)
             sprite->data[0] = 0;
 
             if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1
-             && sprite->sBank == GetBankByIdentity(IDENTITY_PLAYER_MON2))
+             && sprite->sBank == GetBankByIdentity(B_POSITION_PLAYER_RIGHT))
                 sprite->callback = SpriteCB_ReleaseMon2FromBall;
             else
                 sprite->callback = SpriteCB_ReleaseMonFromBall;
@@ -982,7 +982,7 @@ static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite)
     {
         sprite->data[0] = 0;
         if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1
-         && sprite->sBank == GetBankByIdentity(IDENTITY_OPPONENT_MON2))
+         && sprite->sBank == GetBankByIdentity(B_POSITION_OPPONENT_RIGHT))
             sprite->callback = SpriteCB_ReleaseMon2FromBall;
         else
             sprite->callback = SpriteCB_ReleaseMonFromBall;
@@ -1198,7 +1198,7 @@ void sub_8076918(u8 bank)
         healthboxSprite->pos2.y = -healthboxSprite->pos2.y;
     }
     gSprites[healthboxSprite->data[5]].callback(&gSprites[healthboxSprite->data[5]]);
-    if (GetBankIdentity(bank) == IDENTITY_PLAYER_MON2)
+    if (GetBankPosition(bank) == B_POSITION_PLAYER_RIGHT)
         healthboxSprite->callback = sub_80769A8;
 }
 
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index db176e025..8640eacde 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -36,7 +36,7 @@ extern const u8 gText_EggNickname[];
 
 extern u8 GetBankSide(u8 bank);
 extern u8 GetBankByIdentity(u8 bank);
-extern u8 GetBankIdentity(u8 bank);
+extern u8 GetBankPosition(u8 bank);
 
 u8 CountAliveMonsInBattle(u8 caseId)
 {
@@ -86,7 +86,7 @@ bool8 ShouldGetStatBadgeBoost(u16 badgeFlag, u8 bank)
 
 u8 GetDefaultMoveTarget(u8 bank)
 {
-    u8 status = GetBankIdentity(bank) & 1;
+    u8 status = GetBankPosition(bank) & 1;
 
     status ^= 1;
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 3df2ff151..16d902aaa 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -42,7 +42,7 @@ extern u8 GetBankSpriteDefault_Y(u8 bank);
 extern u8 sub_80A82E4(u8 bank);
 extern void sub_806A068(u16 species, u8 bankIdentity);
 extern void sub_806A12C(u16 backPicId, u8 bankIdentity);
-extern u8 GetBankPosition(u8 bank, u8 caseId);
+extern u8 GetBankCoord(u8 bank, u8 caseId);
 
 // this file's functions
 static void CB2_ReshowBattleScreenAfterMenu(void);
@@ -164,13 +164,13 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
 
             LoadAndCreateEnemyShadowSprites();
 
-            opponentBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
+            opponentBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
             species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
             SetBankEnemyShadowSpriteCallback(opponentBank, species);
 
             if (IsDoubleBattle())
             {
-                opponentBank = GetBankByIdentity(IDENTITY_OPPONENT_MON2);
+                opponentBank = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
                 species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
                 SetBankEnemyShadowSpriteCallback(opponentBank, species);
             }
@@ -259,8 +259,8 @@ static void CreateBankSprite(u8 bank)
             if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
                 return;
 
-            sub_806A068(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankPosition(bank, 2), posY, sub_80A82E4(bank));
+            sub_806A068(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankPosition(bank));
+            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankCoord(bank, 2), posY, sub_80A82E4(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
             gSprites[gBankSpriteIds[bank]].data[0] = bank;
@@ -272,7 +272,7 @@ static void CreateBankSprite(u8 bank)
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
         {
-            sub_806A12C(gSaveBlock2Ptr->playerGender, GetBankIdentity(IDENTITY_PLAYER_MON1));
+            sub_806A12C(gSaveBlock2Ptr->playerGender, GetBankPosition(B_POSITION_PLAYER_LEFT));
             gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, 0x50,
                                                 (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80,
                                                  sub_80A82E4(0));
@@ -282,7 +282,7 @@ static void CreateBankSprite(u8 bank)
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
         {
-            sub_806A12C(BACK_PIC_WALLY, GetBankIdentity(0));
+            sub_806A12C(BACK_PIC_WALLY, GetBankPosition(0));
             gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, 0x50,
                                                 (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords) * 4 + 80,
                                                  sub_80A82E4(0));
@@ -295,8 +295,8 @@ static void CreateBankSprite(u8 bank)
             if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
                 return;
 
-            sub_806A068(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankPosition(bank, 2), posY, sub_80A82E4(bank));
+            sub_806A068(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankPosition(bank));
+            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankCoord(bank, 2), posY, sub_80A82E4(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
             gSprites[gBankSpriteIds[bank]].data[0] = bank;
@@ -335,7 +335,7 @@ static void CreateHealthboxSprite(u8 bank)
         else
             UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gPlayerParty[gBattlePartyID[bank]], HEALTHBOX_ALL);
 
-        if (GetBankIdentity(bank) == IDENTITY_OPPONENT_MON2 || GetBankIdentity(bank) == IDENTITY_PLAYER_MON2)
+        if (GetBankPosition(bank) == B_POSITION_OPPONENT_RIGHT || GetBankPosition(bank) == B_POSITION_PLAYER_RIGHT)
             DummyBattleInterfaceFunc(gHealthBoxesIds[bank], TRUE);
         else
             DummyBattleInterfaceFunc(gHealthBoxesIds[bank], FALSE);
-- 
cgit v1.2.3


From 50f9615dc9021bc811869a27b5fa400aac25aaf0 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 16 Jan 2018 21:37:46 +0100
Subject: battle transition review changes

---
 src/battle_transition.c | 60 ++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/battle_transition.c b/src/battle_transition.c
index af156da12..ca2134837 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -23,21 +23,21 @@
 
 struct TransitionData
 {
-    vs8 VBlank_DMA;
+    vu8 VBlank_DMA;
     u16 WININ;
     u16 WINOUT;
-    u16 field_6;
+    u16 WIN0H;
     u16 WIN0V;
-    u16 field_A;
-    u16 field_C;
+    u16 field_A; // unused
+    u16 field_C; // unused
     u16 BLDCNT;
     u16 BLDALPHA;
     u16 BLDY;
     s16 field_14;
     s16 field_16;
-    s16 field_18;
-    s16 field_1A;
-    s16 field_1C;
+    s16 BG0HOFS_1;
+    s16 BG0HOFS_2;
+    s16 BG0VOFS; // used but not set
     s16 field_1E; // unused
     s16 field_20;
     s16 field_22; // unused
@@ -1265,7 +1265,7 @@ static void sub_814669C(struct Task *task)
     task->tData5 = 0x4000;
     sTransitionStructPtr->WININ = 63;
     sTransitionStructPtr->WINOUT = 0;
-    sTransitionStructPtr->field_6 = 240;
+    sTransitionStructPtr->WIN0H = 240;
     sTransitionStructPtr->WIN0V = 160;
     sTransitionStructPtr->BLDCNT = 0x3F41;
     sTransitionStructPtr->BLDALPHA = (task->tData1 << 8) | (task->tData2);
@@ -1745,7 +1745,7 @@ static bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task)
 
     sTransitionStructPtr->WININ = 0;
     sTransitionStructPtr->WINOUT = 63;
-    sTransitionStructPtr->field_6 = -3855;
+    sTransitionStructPtr->WIN0H = -3855;
     sTransitionStructPtr->WIN0V = 160;
 
     for (i = 0; i < 160; i++)
@@ -2016,7 +2016,7 @@ static bool8 Phase2_Wave_Func1(struct Task *task)
 
     sTransitionStructPtr->WININ = 63;
     sTransitionStructPtr->WINOUT = 0;
-    sTransitionStructPtr->field_6 = 240;
+    sTransitionStructPtr->WIN0H = 240;
     sTransitionStructPtr->WIN0V = 160;
 
     for (i = 0; i < 160; i++)
@@ -2210,8 +2210,8 @@ static bool8 Phase2_Mugshot_Func3(struct Task *task)
     if (mergedValue == 0xF0)
         task->tState++;
 
-    sTransitionStructPtr->field_18 -= 8;
-    sTransitionStructPtr->field_1A += 8;
+    sTransitionStructPtr->BG0HOFS_1 -= 8;
+    sTransitionStructPtr->BG0HOFS_2 += 8;
     sTransitionStructPtr->VBlank_DMA++;
     return FALSE;
 }
@@ -2232,8 +2232,8 @@ static bool8 Phase2_Mugshot_Func4(struct Task *task)
     task->tData1 = 0;
     task->tData2 = 0;
     task->tData3 = 0;
-    sTransitionStructPtr->field_18 -= 8;
-    sTransitionStructPtr->field_1A += 8;
+    sTransitionStructPtr->BG0HOFS_1 -= 8;
+    sTransitionStructPtr->BG0HOFS_2 += 8;
 
     sub_8148484(task->tOpponentSpriteId, 0);
     sub_8148484(task->tPlayerSpriteId, 1);
@@ -2247,8 +2247,8 @@ static bool8 Phase2_Mugshot_Func4(struct Task *task)
 
 static bool8 Phase2_Mugshot_Func5(struct Task *task)
 {
-    sTransitionStructPtr->field_18 -= 8;
-    sTransitionStructPtr->field_1A += 8;
+    sTransitionStructPtr->BG0HOFS_1 -= 8;
+    sTransitionStructPtr->BG0HOFS_2 += 8;
     if (sub_81484B8(task->tOpponentSpriteId))
     {
         task->tState++;
@@ -2259,8 +2259,8 @@ static bool8 Phase2_Mugshot_Func5(struct Task *task)
 
 static bool8 Phase2_Mugshot_Func6(struct Task *task)
 {
-    sTransitionStructPtr->field_18 -= 8;
-    sTransitionStructPtr->field_1A += 8;
+    sTransitionStructPtr->BG0HOFS_1 -= 8;
+    sTransitionStructPtr->BG0HOFS_2 += 8;
     if (sub_81484B8(task->tPlayerSpriteId))
     {
         sTransitionStructPtr->VBlank_DMA = FALSE;
@@ -2285,8 +2285,8 @@ static bool8 Phase2_Mugshot_Func7(struct Task *task)
 
     sTransitionStructPtr->VBlank_DMA = FALSE;
     r6 = TRUE;
-    sTransitionStructPtr->field_18 -= 8;
-    sTransitionStructPtr->field_1A += 8;
+    sTransitionStructPtr->BG0HOFS_1 -= 8;
+    sTransitionStructPtr->BG0HOFS_2 += 8;
 
     if (task->tData4 < 0x50)
         task->tData4 += 2;
@@ -2358,7 +2358,7 @@ static void VBlankCB0_Phase2_Mugshots(void)
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA != 0)
         DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
-    REG_BG0VOFS = sTransitionStructPtr->field_1C;
+    REG_BG0VOFS = sTransitionStructPtr->BG0VOFS;
     REG_WININ = sTransitionStructPtr->WININ;
     REG_WINOUT = sTransitionStructPtr->WINOUT;
     REG_WIN0V = sTransitionStructPtr->WIN0V;
@@ -2378,9 +2378,9 @@ static void VBlankCB1_Phase2_Mugshots(void)
 static void HBlankCB_Phase2_Mugshots(void)
 {
     if (REG_VCOUNT < 80)
-        REG_BG0HOFS = sTransitionStructPtr->field_18;
+        REG_BG0HOFS = sTransitionStructPtr->BG0HOFS_1;
     else
-        REG_BG0HOFS = sTransitionStructPtr->field_1A;
+        REG_BG0HOFS = sTransitionStructPtr->BG0HOFS_2;
 }
 
 static void Mugshots_CreateOpponentPlayerSprites(struct Task *task)
@@ -2541,9 +2541,9 @@ static bool8 Phase2_Slice_Func2(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        u16* storeLoc1 = &gUnknown_02038C28[0][i];
-        u16* storeLoc2 = &gUnknown_02038C28[0][i + 160];
-        if (1 & i)
+        u16 *storeLoc1 = &gUnknown_02038C28[0][i];
+        u16 *storeLoc2 = &gUnknown_02038C28[0][i + 160];
+        if (i & 1)
         {
             *storeLoc1 = sTransitionStructPtr->field_14 + task->tData1;
             *storeLoc2 = 0xF0 - task->tData1;
@@ -2775,7 +2775,7 @@ static bool8 Phase2_Blackhole_Func1(struct Task *task)
 
     sTransitionStructPtr->WININ = 0;
     sTransitionStructPtr->WINOUT = 63;
-    sTransitionStructPtr->field_6 = 240;
+    sTransitionStructPtr->WIN0H = 240;
     sTransitionStructPtr->WIN0V = 160;
 
     for (i = 0; i < 0xA0; i++)
@@ -3203,7 +3203,7 @@ static bool8 Phase2_Rayquaza_Func9(struct Task *task)
 
         sTransitionStructPtr->WININ = 0;
         sTransitionStructPtr->WINOUT = 63;
-        sTransitionStructPtr->field_6 = 240;
+        sTransitionStructPtr->WIN0H = 240;
         sTransitionStructPtr->WIN0V = 160;
 
         for (i = 0; i < 160; i++)
@@ -3309,7 +3309,7 @@ static bool8 Phase2_WhiteFade_Func4(struct Task *task)
     SetVBlankCallback(0);
     SetHBlankCallback(0);
 
-    sTransitionStructPtr->field_6 = 0xF0;
+    sTransitionStructPtr->WIN0H = 0xF0;
     sTransitionStructPtr->BLDY = 0;
     sTransitionStructPtr->BLDCNT = 0xFF;
     sTransitionStructPtr->WININ = 0x3F;
@@ -3350,7 +3350,7 @@ static void VBlankCB1_Phase2_WhiteFade(void)
     REG_BLDCNT = sTransitionStructPtr->BLDCNT;
     REG_WININ = sTransitionStructPtr->WININ;
     REG_WINOUT = sTransitionStructPtr->WINOUT;
-    REG_WIN0H = sTransitionStructPtr->field_6;
+    REG_WIN0H = sTransitionStructPtr->WIN0H;
     REG_WIN0V = sTransitionStructPtr->WIN0V;
 }
 
-- 
cgit v1.2.3


From c3c13d0acfa46a54bd05d1c7dcea2955103ac3ad Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 16 Jan 2018 15:12:38 -0600
Subject: more renaming

---
 src/battle_2.c                            |  286 +++---
 src/battle_ai_script_commands.c           |  158 ++--
 src/battle_ai_switch_items.c              |   78 +-
 src/battle_anim.c                         |    4 +-
 src/battle_bg.c                           |    6 +-
 src/battle_controller_link_opponent.c     |    8 +-
 src/battle_controller_link_partner.c      |    4 +-
 src/battle_controller_opponent.c          |   24 +-
 src/battle_controller_player.c            |   32 +-
 src/battle_controller_player_partner.c    |   18 +-
 src/battle_controller_recorded_opponent.c |    8 +-
 src/battle_controller_recorded_player.c   |    6 +-
 src/battle_controller_safari.c            |    6 +-
 src/battle_controller_wally.c             |    6 +-
 src/battle_controllers.c                  |   38 +-
 src/battle_gfx_sfx_util.c                 |   44 +-
 src/battle_interface.c                    |   16 +-
 src/battle_message.c                      |   58 +-
 src/battle_script_commands.c              | 1414 ++++++++++++++---------------
 src/battle_setup.c                        |   14 +-
 src/battle_util.c                         |  378 ++++----
 src/battle_util2.c                        |   20 +-
 src/calculate_base_damage.c               |    2 +-
 src/field_poison.c                        |    2 +-
 src/pokeball.c                            |   24 +-
 src/pokemon_2.c                           |   14 +-
 src/pokemon_3.c                           |    4 +-
 src/recorded_battle.c                     |    6 +-
 src/reshow_battle_screen.c                |   12 +-
 src/safari_zone.c                         |    6 +-
 src/tv.c                                  |   20 +-
 31 files changed, 1355 insertions(+), 1361 deletions(-)

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 78f577fda..b19dcace1 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -111,14 +111,14 @@ extern u16 gBattleWeather;
 extern u16 gPauseCounterBattle;
 extern u16 gRandomTurnNumber;
 extern u8 gActiveBank;
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern u8 gBankAttacker;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gLeveledUpInBattle;
 extern u8 gAbsentBankFlags;
 extern u32 gBattleExecBuffer;
 extern u8 gMultiHitCounter;
-extern u8 gBattleMoveFlags;
+extern u8 gMoveResultFlags;
 extern s32 gBattleMoveDamage;
 extern const u8* gPalaceSelectionBattleScripts[BATTLE_BANKS_COUNT];
 extern u16 gLastPrintedMoves[BATTLE_BANKS_COUNT];
@@ -130,7 +130,7 @@ extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
 extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
 extern u8 gUnknown_02024284[BATTLE_BANKS_COUNT];
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
-extern u16 gSideAffecting[2];
+extern u16 gSideStatuses[2];
 extern u16 gCurrentMove;
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
 extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
@@ -291,16 +291,16 @@ static void (* const sTurnActionsFuncsTable[])(void) =
 static void (* const sEndTurnFuncsTable[])(void) =
 {
     HandleEndTurn_ContinueBattle,       // battle outcome 0
-    HandleEndTurn_BattleWon,            // BATTLE_WON
-    HandleEndTurn_BattleLost,           // BATTLE_LOST
-    HandleEndTurn_BattleLost,           // BATTLE_DREW
-    HandleEndTurn_RanFromBattle,        // BATTLE_RAN
-    HandleEndTurn_FinishBattle,         // BATTLE_PLAYER_TELEPORTED
-    HandleEndTurn_MonFled,              // BATTLE_POKE_FLED
-    HandleEndTurn_FinishBattle,         // BATTLE_CAUGHT
+    HandleEndTurn_BattleWon,            // B_OUTCOME_WON
+    HandleEndTurn_BattleLost,           // B_OUTCOME_LOST
+    HandleEndTurn_BattleLost,           // B_OUTCOME_DREW
+    HandleEndTurn_RanFromBattle,        // B_OUTCOME_RAN
+    HandleEndTurn_FinishBattle,         // B_OUTCOME_PLAYER_TELEPORTED
+    HandleEndTurn_MonFled,              // B_OUTCOME_POKE_FLED
+    HandleEndTurn_FinishBattle,         // B_OUTCOME_CAUGHT_POKE
     HandleEndTurn_FinishBattle,         // battle outcome 8
-    HandleEndTurn_FinishBattle,         // BATTLE_FORFEITED
-    HandleEndTurn_FinishBattle,         // BATTLE_OPPONENT_TELEPORTED
+    HandleEndTurn_FinishBattle,         // B_OUTCOME_FORFEITED
+    HandleEndTurn_FinishBattle,         // B_OUTCOME_POKE_TELEPORTED
 };
 
 const u8 gStatusConditionString_PoisonJpn[8] = _("どく$$$$$");
@@ -1586,7 +1586,7 @@ void BattleMainCB2(void)
 
     if (gMain.heldKeys & B_BUTTON && gBattleTypeFlags & BATTLE_TYPE_RECORDED && sub_8186450())
     {
-        gSpecialVar_Result = gBattleOutcome = BATTLE_PLAYER_TELEPORTED;
+        gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED;
         ResetPaletteFadeControl();
         BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
         SetMainCallback2(CB2_QuitRecordedBattle);
@@ -2720,7 +2720,7 @@ static void BattleMainCB1(void)
 {
     gBattleMainFunc();
 
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
         gBattleBankFunc[gActiveBank]();
 }
 
@@ -2756,7 +2756,7 @@ static void BattleStartClearSetData(void)
 
     for (i = 0; i < 2; i++)
     {
-        gSideAffecting[i] = 0;
+        gSideStatuses[i] = 0;
 
         dataPtr = (u8 *)&gSideTimers[i];
         for (j = 0; j < sizeof(struct SideTimer); j++)
@@ -2764,7 +2764,7 @@ static void BattleStartClearSetData(void)
     }
 
     gBankAttacker = 0;
-    gBankTarget = 0;
+    gBankDefender = 0;
     gBattleWeather = 0;
 
     dataPtr = (u8 *)&gWishFutureKnock;
@@ -2850,7 +2850,7 @@ void SwitchInClearSetData(void)
     {
         for (i = 0; i < BATTLE_STATS_NO; i++)
             gBattleMons[gActiveBank].statStages[i] = 6;
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattleBanksCount; i++)
         {
             if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBank)
                 gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
@@ -2866,7 +2866,7 @@ void SwitchInClearSetData(void)
         gBattleMons[gActiveBank].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED);
         gStatuses3[gActiveBank] &= (STATUS3_LEECHSEED_BANK | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT);
 
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattleBanksCount; i++)
         {
             if (GetBankSide(gActiveBank) != GetBankSide(i)
              && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
@@ -2883,7 +2883,7 @@ void SwitchInClearSetData(void)
         gStatuses3[gActiveBank] = 0;
     }
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBank))
             gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBank));
@@ -2907,7 +2907,7 @@ void SwitchInClearSetData(void)
         gDisableStructs[gActiveBank].bankPreventingEscape = disableStructCopy.bankPreventingEscape;
     }
 
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
     gDisableStructs[gActiveBank].isFirstTurn = 2;
     gDisableStructs[gActiveBank].truantUnknownBit = disableStructCopy.truantUnknownBit;
     gLastMoves[gActiveBank] = 0;
@@ -2930,7 +2930,7 @@ void SwitchInClearSetData(void)
 
     gBattleStruct->field_92 &= ~(gBitTable[gActiveBank]);
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (i != gActiveBank && GetBankSide(i) != GetBankSide(gActiveBank))
         {
@@ -2963,7 +2963,7 @@ void FaintClearSetData(void)
     gBattleMons[gActiveBank].status2 = 0;
     gStatuses3[gActiveBank] = 0;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBank)
             gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
@@ -3025,7 +3025,7 @@ void FaintClearSetData(void)
 
     gBattleStruct->field_92 &= ~(gBitTable[gActiveBank]);
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (i != gActiveBank && GetBankSide(i) != GetBankSide(gActiveBank))
         {
@@ -3059,7 +3059,7 @@ static void BattleIntroGetMonsData(void)
         if (gBattleExecBuffer == 0)
         {
             gBattleCommunication[1]++;
-            if (gBattleCommunication[1] == gNoOfAllBanks)
+            if (gBattleCommunication[1] == gBattleBanksCount)
                 gBattleMainFunc = BattleIntroPrepareBackgroundSlide;
             else
                 gBattleCommunication[MULTIUSE_STATE] = 0;
@@ -3072,7 +3072,7 @@ static void BattleIntroPrepareBackgroundSlide(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBankByIdentity(0);
+        gActiveBank = GetBankByPosition(0);
         EmitIntroSlide(0, gBattleTerrain);
         MarkBufferBankForExecution(gActiveBank);
         gBattleMainFunc = BattleIntroDrawTrainersOrMonsSprites;
@@ -3089,7 +3089,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
     if (gBattleExecBuffer)
         return;
 
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI)
          && GetBankSide(gActiveBank) == SIDE_PLAYER)
@@ -3203,7 +3203,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
                 hpStatus[i].status = GetMonData(&gEnemyParty[i], MON_DATA_STATUS);
             }
         }
-        gActiveBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+        gActiveBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
         EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
         MarkBufferBankForExecution(gActiveBank);
 
@@ -3221,7 +3221,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
                 hpStatus[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
             }
         }
-        gActiveBank = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+        gActiveBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
         EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
         MarkBufferBankForExecution(gActiveBank);
 
@@ -3257,7 +3257,7 @@ static void BattleIntroPrintTrainerWantsToBattle(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+        gActiveBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
         PrepareStringBattle(STRINGID_INTROMSG, gActiveBank);
         gBattleMainFunc = BattleIntroPrintOpponentSendsOut;
     }
@@ -3291,7 +3291,7 @@ static void BattleIntroPrintOpponentSendsOut(void)
     else
         identity = B_POSITION_OPPONENT_LEFT;
 
-    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByIdentity(identity));
+    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(identity));
     gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
 }
 
@@ -3311,7 +3311,7 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void)
     else
         identity = B_POSITION_OPPONENT_RIGHT;
 
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
         if (GetBankPosition(gActiveBank) == identity)
         {
@@ -3343,7 +3343,7 @@ static void BattleIntroOpponent1SendsOutMonAnimation(void)
     if (gBattleExecBuffer)
         return;
 
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
         if (GetBankPosition(gActiveBank) == identity)
         {
@@ -3400,7 +3400,7 @@ _0803B29A:\n\
 	bne _0803B2F2\n\
 	ldr r0, =gActiveBank\n\
 	strb r2, [r0]\n\
-	ldr r1, =gNoOfAllBanks\n\
+	ldr r1, =gBattleBanksCount\n\
 	adds r4, r0, 0\n\
 	ldrb r1, [r1]\n\
 	cmp r2, r1\n\
@@ -3427,7 +3427,7 @@ _0803B2D8:\n\
 	ldrb r0, [r6]\n\
 	adds r0, 0x1\n\
 	strb r0, [r6]\n\
-	ldr r1, =gNoOfAllBanks\n\
+	ldr r1, =gBattleBanksCount\n\
 	lsls r0, 24\n\
 	lsrs r0, 24\n\
 	ldr r4, =gActiveBank\n\
@@ -3453,7 +3453,7 @@ static void BattleIntroRecordMonsToDex(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
         {
             if (GetBankSide(gActiveBank) == SIDE_OPPONENT
              && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
@@ -3494,7 +3494,7 @@ static void BattleIntroPrintPlayerSendsOut(void)
             identity = B_POSITION_PLAYER_LEFT;
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
-            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByIdentity(identity));
+            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(identity));
 
         gBattleMainFunc = BattleIntroPlayer1SendsOutMonAnimation;
     }
@@ -3516,7 +3516,7 @@ static void BattleIntroPlayer2SendsOutMonAnimation(void)
     else
         identity = B_POSITION_PLAYER_RIGHT;
 
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
         if (GetBankPosition(gActiveBank) == identity)
         {
@@ -3551,7 +3551,7 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void)
     if (gBattleExecBuffer)
         return;
 
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
         if (GetBankPosition(gActiveBank) == identity)
         {
@@ -3576,7 +3576,7 @@ void sub_803B598(void) // unused
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
         {
             if (GetBankSide(gActiveBank) == SIDE_PLAYER)
             {
@@ -3604,11 +3604,11 @@ static void TryDoEventsBeforeFirstTurn(void)
 
     if (gBattleStruct->switchInAbilitiesCounter == 0)
     {
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattleBanksCount; i++)
             gBanksByTurnOrder[i] = i;
-        for (i = 0; i < gNoOfAllBanks - 1; i++)
+        for (i = 0; i < gBattleBanksCount - 1; i++)
         {
-            for (j = i + 1; j < gNoOfAllBanks; j++)
+            for (j = i + 1; j < gBattleBanksCount; j++)
             {
                 if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], TRUE) != 0)
                     SwapTurnOrder(i, j);
@@ -3622,7 +3622,7 @@ static void TryDoEventsBeforeFirstTurn(void)
         return;
     }
     // check all switch in abilities happening from the fastest mon to slowest
-    while (gBattleStruct->switchInAbilitiesCounter < gNoOfAllBanks)
+    while (gBattleStruct->switchInAbilitiesCounter < gBattleBanksCount)
     {
         if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gBanksByTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0)
             effect++;
@@ -3637,7 +3637,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     if (AbilityBattleEffects(ABILITYEFFECT_TRACE, 0, 0, 0, 0) != 0)
         return;
     // check all switch in items having effect from the fastest mon to slowest
-    while (gBattleStruct->switchInItemsCounter < gNoOfAllBanks)
+    while (gBattleStruct->switchInItemsCounter < gBattleBanksCount)
     {
         if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBanksByTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0)
             effect++;
@@ -3663,7 +3663,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
         gBattleCommunication[i] = 0;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
         gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
 
     *(&gBattleStruct->turnEffectsTracker) = 0;
@@ -3673,7 +3673,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     gBattleScripting.atk49_state = 0;
     gBattleStruct->faintedActionsState = 0;
     gBattleStruct->turncountersTracker = 0;
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
 
     gRandomTurnNumber = Random();
 
@@ -3693,10 +3693,10 @@ static void HandleEndTurn_ContinueBattle(void)
         gBattleMainFunc = BattleTurnPassed;
         for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
             gBattleCommunication[i] = 0;
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattleBanksCount; i++)
         {
             gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
-            if ((gBattleMons[i].status1 & STATUS_SLEEP) && (gBattleMons[i].status2 & STATUS2_MULTIPLETURNS))
+            if ((gBattleMons[i].status1 & STATUS1_SLEEP) && (gBattleMons[i].status2 & STATUS2_MULTIPLETURNS))
                 CancelMultiTurnMoves(i);
         }
         gBattleStruct->turnEffectsTracker = 0;
@@ -3704,7 +3704,7 @@ static void HandleEndTurn_ContinueBattle(void)
         gBattleStruct->wishPerishSongState = 0;
         gBattleStruct->wishPerishSongBank = 0;
         gBattleStruct->turncountersTracker = 0;
-        gBattleMoveFlags = 0;
+        gMoveResultFlags = 0;
     }
 }
 
@@ -3735,7 +3735,7 @@ void BattleTurnPassed(void)
     gBattleScripting.animTargetsHit = 0;
     gBattleScripting.atk49_state = 0;
     gBattleMoveDamage = 0;
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
 
     for (i = 0; i < 5; i++)
         gBattleCommunication[i] = 0;
@@ -3753,7 +3753,7 @@ void BattleTurnPassed(void)
         gBattleStruct->field_DA++;
     }
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         gActionForBanks[i] = ACTION_INIT_VALUE;
         gChosenMovesByBanks[i] = MOVE_NONE;
@@ -3795,7 +3795,7 @@ u8 IsRunningFromBattleImpossible(void)
 
     side = GetBankSide(gActiveBank);
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (side != GetBankSide(i)
          && gBattleMons[i].ability == ABILITY_SHADOW_TAG)
@@ -3889,7 +3889,7 @@ static void HandleTurnActionSelectionState(void)
     s32 i;
 
     gBattleCommunication[ACTIONS_CONFIRMED_COUNT] = 0;
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
         u8 identity = GetBankPosition(gActiveBank);
         switch (gBattleCommunication[gActiveBank])
@@ -3902,8 +3902,8 @@ static void HandleTurnActionSelectionState(void)
             *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI
                 || !(identity & BIT_MON)
-                || gBattleStruct->field_91 & gBitTable[GetBankByIdentity(identity ^ BIT_MON)]
-                || gBattleCommunication[GetBankByIdentity(identity ^ BIT_MON)] == 5)
+                || gBattleStruct->field_91 & gBitTable[GetBankByPosition(identity ^ BIT_MON)]
+                || gBattleCommunication[GetBankByPosition(identity ^ BIT_MON)] == 5)
             {
                 if (gBattleStruct->field_91 & gBitTable[gActiveBank])
                 {
@@ -4041,38 +4041,38 @@ static void HandleTurnActionSelectionState(void)
                     break;
                 case ACTION_CANCEL_PARTNER:
                     gBattleCommunication[gActiveBank] = 7;
-                    gBattleCommunication[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)] = 1;
+                    gBattleCommunication[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] = 1;
                     RecordedBattle_ClearBankAction(gActiveBank, 1);
-                    if (gBattleMons[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_MULTIPLETURNS
-                        || gBattleMons[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_RECHARGE)
+                    if (gBattleMons[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_MULTIPLETURNS
+                        || gBattleMons[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_RECHARGE)
                     {
                         EmitCmd50(0);
                         MarkBufferBankForExecution(gActiveBank);
                         return;
                     }
-                    else if (gActionForBanks[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_SWITCH)
+                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_SWITCH)
                     {
-                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON), 2);
+                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 2);
                     }
-                    else if (gActionForBanks[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_RUN)
+                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_RUN)
                     {
-                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
+                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
                     }
-                    else if (gActionForBanks[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE
-                             && (gProtectStructs[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)].onlyStruggle
-                                || gDisableStructs[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)].encoredMove))
+                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE
+                             && (gProtectStructs[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].onlyStruggle
+                                || gDisableStructs[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].encoredMove))
                     {
-                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
+                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
                     }
                     else if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-                             && gActionForBanks[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE)
+                             && gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE)
                     {
                         gRngValue = gBattlePalaceMoveSelectionRngValue;
-                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
+                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
                     }
                     else
                     {
-                        RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON), 3);
+                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 3);
                     }
                     EmitCmd50(0);
                     MarkBufferBankForExecution(gActiveBank);
@@ -4226,7 +4226,7 @@ static void HandleTurnActionSelectionState(void)
 
                 if (((gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_DOUBLE)) != BATTLE_TYPE_DOUBLE)
                     || (identity & BIT_MON)
-                    || (*(&gBattleStruct->field_91) & gBitTable[GetBankByIdentity(identity ^ BIT_MON)]))
+                    || (*(&gBattleStruct->field_91) & gBitTable[GetBankByPosition(identity ^ BIT_MON)]))
                 {
                     EmitLinkStandbyMsg(0, 0, i);
                 }
@@ -4296,14 +4296,14 @@ static void HandleTurnActionSelectionState(void)
     }
 
     // check if everyone chose actions
-    if (gBattleCommunication[ACTIONS_CONFIRMED_COUNT] == gNoOfAllBanks)
+    if (gBattleCommunication[ACTIONS_CONFIRMED_COUNT] == gBattleBanksCount)
     {
         sub_818603C(1);
         gBattleMainFunc = SetActionsAndBanksTurnOrder;
 
         if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
         {
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gActionForBanks[i] == ACTION_SWITCH)
                     sub_80571DC(i, *(gBattleStruct->monToSwitchIntoId + i));
@@ -4316,13 +4316,13 @@ static bool8 sub_803CDB8(void)
 {
     s32 i, var;
 
-    for (var = 0, i = 0; i < gNoOfAllBanks; i++)
+    for (var = 0, i = 0; i < gBattleBanksCount; i++)
     {
         if (gBattleCommunication[i] == 5)
             var++;
     }
 
-    if (var + 1 == gNoOfAllBanks)
+    if (var + 1 == gBattleBanksCount)
         return TRUE;
     else
         return FALSE;
@@ -4411,7 +4411,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
     if (holdEffect == HOLD_EFFECT_MACHO_BRACE)
         speedBank1 /= 2;
 
-    if (gBattleMons[bank1].status1 & STATUS_PARALYSIS)
+    if (gBattleMons[bank1].status1 & STATUS1_PARALYSIS)
         speedBank1 /= 4;
 
     if (holdEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (0xFFFF * holdEffectParam) / 100)
@@ -4445,7 +4445,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
     if (holdEffect == HOLD_EFFECT_MACHO_BRACE)
         speedBank2 /= 2;
 
-    if (gBattleMons[bank2].status1 & STATUS_PARALYSIS)
+    if (gBattleMons[bank2].status1 & STATUS1_PARALYSIS)
         speedBank2 /= 4;
 
     if (holdEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (0xFFFF * holdEffectParam) / 100)
@@ -4518,7 +4518,7 @@ static void SetActionsAndBanksTurnOrder(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
     {
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
         {
             gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
             gBanksByTurnOrder[var] = gActiveBank;
@@ -4529,7 +4529,7 @@ static void SetActionsAndBanksTurnOrder(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
-            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
             {
                 if (gActionForBanks[gActiveBank] == ACTION_RUN)
                 {
@@ -4557,7 +4557,7 @@ static void SetActionsAndBanksTurnOrder(void)
             gActionsByTurnOrder[0] = gActionForBanks[gActiveBank];
             gBanksByTurnOrder[0] = gActiveBank;
             var = 1;
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (i != gActiveBank)
                 {
@@ -4572,7 +4572,7 @@ static void SetActionsAndBanksTurnOrder(void)
         }
         else
         {
-            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
             {
                 if (gActionForBanks[gActiveBank] == ACTION_USE_ITEM || gActionForBanks[gActiveBank] == ACTION_SWITCH)
                 {
@@ -4581,7 +4581,7 @@ static void SetActionsAndBanksTurnOrder(void)
                     var++;
                 }
             }
-            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
             {
                 if (gActionForBanks[gActiveBank] != ACTION_USE_ITEM && gActionForBanks[gActiveBank] != ACTION_SWITCH)
                 {
@@ -4590,9 +4590,9 @@ static void SetActionsAndBanksTurnOrder(void)
                     var++;
                 }
             }
-            for (i = 0; i < gNoOfAllBanks - 1; i++)
+            for (i = 0; i < gBattleBanksCount - 1; i++)
             {
-                for (j = i + 1; j < gNoOfAllBanks; j++)
+                for (j = i + 1; j < gBattleBanksCount; j++)
                 {
                     u8 bank1 = gBanksByTurnOrder[i];
                     u8 bank2 = gBanksByTurnOrder[j];
@@ -4617,7 +4617,7 @@ static void TurnValuesCleanUp(bool8 var0)
     s32 i;
     u8 *dataPtr;
 
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
         if (var0)
         {
@@ -4651,7 +4651,7 @@ static void TurnValuesCleanUp(bool8 var0)
 
 static void SpecialStatusesClear(void)
 {
-    for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
         s32 i;
         u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBank]);
@@ -4665,12 +4665,12 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
 {
     if (!(gHitMarker & HITMARKER_RUN))
     {
-        while (gBattleStruct->focusPunchBank < gNoOfAllBanks)
+        while (gBattleStruct->focusPunchBank < gBattleBanksCount)
         {
             gActiveBank = gBankAttacker = gBattleStruct->focusPunchBank;
             gBattleStruct->focusPunchBank++;
             if (gChosenMovesByBanks[gActiveBank] == MOVE_FOCUS_PUNCH
-                && !(gBattleMons[gActiveBank].status1 & STATUS_SLEEP)
+                && !(gBattleMons[gActiveBank].status1 & STATUS1_SLEEP)
                 && !(gDisableStructs[gBankAttacker].truantCounter)
                 && !(gProtectStructs[gActiveBank].onlyStruggle))
             {
@@ -4704,7 +4704,7 @@ static void RunTurnActionsFunctions(void)
     *(&gBattleStruct->savedTurnActionNumber) = gCurrentTurnActionNumber;
     sTurnActionsFuncsTable[gCurrentActionFuncId]();
 
-    if (gCurrentTurnActionNumber >= gNoOfAllBanks) // everyone did their actions, turn finished
+    if (gCurrentTurnActionNumber >= gBattleBanksCount) // everyone did their actions, turn finished
     {
         gHitMarker &= ~(HITMARKER_x100000);
         gBattleMainFunc = sEndTurnFuncsTable[gBattleOutcome & 0x7F];
@@ -4727,9 +4727,9 @@ static void HandleEndTurn_BattleWon(void)
     {
         gSpecialVar_Result = gBattleOutcome;
         gBattleTextBuff1[0] = gBattleOutcome;
-        gBankAttacker = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+        gBankAttacker = GetBankByPosition(B_POSITION_PLAYER_LEFT);
         gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
-        gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
+        gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
             && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER))
@@ -4785,24 +4785,24 @@ static void HandleEndTurn_BattleLost(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
         {
-            if (gBattleOutcome & OUTCOME_LINK_BATTLE_RUN)
+            if (gBattleOutcome & B_OUTCOME_LINK_BATTLE_RAN)
             {
                 gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle;
-                gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
+                gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
                 gSaveBlock2Ptr->field_CA9_b = 1;
             }
             else
             {
                 gBattlescriptCurrInstr = BattleScript_82DAA0B;
-                gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
+                gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
             }
         }
         else
         {
             gBattleTextBuff1[0] = gBattleOutcome;
-            gBankAttacker = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+            gBankAttacker = GetBankByPosition(B_POSITION_PLAYER_LEFT);
             gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
-            gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN);
+            gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
         }
     }
     else
@@ -4820,13 +4820,13 @@ static void HandleEndTurn_RanFromBattle(void)
     if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
         gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
-        gBattleOutcome = BATTLE_FORFEITED;
+        gBattleOutcome = B_OUTCOME_FORFEITED;
         gSaveBlock2Ptr->field_CA9_b = 1;
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
     {
         gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
-        gBattleOutcome = BATTLE_FORFEITED;
+        gBattleOutcome = B_OUTCOME_FORFEITED;
     }
     else
     {
@@ -4869,7 +4869,7 @@ static void HandleEndTurn_FinishBattle(void)
                                   | BATTLE_TYPE_WALLY_TUTORIAL
                                   | BATTLE_TYPE_FRONTIER)))
         {
-            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
             {
                 if (GetBankSide(gActiveBank) == SIDE_PLAYER)
                 {
@@ -4919,7 +4919,7 @@ static void FreeResetData_ReturnToOvOrDoEvolutions(void)
     if (!gPaletteFade.active)
     {
         ResetSpriteData();
-        if (gLeveledUpInBattle == 0 || gBattleOutcome != BATTLE_WON)
+        if (gLeveledUpInBattle == 0 || gBattleOutcome != B_OUTCOME_WON)
         {
             gBattleMainFunc = ReturnFromBattleToOverworld;
             return;
@@ -4994,7 +4994,7 @@ static void ReturnFromBattleToOverworld(void)
     if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
     {
         UpdateRoamerHPStatus(&gEnemyParty[0]);
-        if ((gBattleOutcome & BATTLE_WON) || gBattleOutcome == BATTLE_CAUGHT)
+        if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
             SetRoamerInactive();
     }
 
@@ -5039,7 +5039,7 @@ static void HandleAction_UseMove(void)
     gCritMultiplier = 1;
     gBattleScripting.dmgMultiplier = 1;
     gBattleStruct->atkCancellerTracker = 0;
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
     gMultiHitCounter = 0;
     gBattleCommunication[6] = 0;
     gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBankAttacker);
@@ -5100,7 +5100,7 @@ static void HandleAction_UseMove(void)
         && GetBankSide(gBankAttacker) != GetBankSide(gSideTimers[side].followmeTarget)
         && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
     {
-        gBankTarget = gSideTimers[side].followmeTarget;
+        gBankDefender = gSideTimers[side].followmeTarget;
     }
     else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
              && gSideTimers[side].followmeTimer == 0
@@ -5110,7 +5110,7 @@ static void HandleAction_UseMove(void)
              && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
     {
         side = GetBankSide(gBankAttacker);
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
         {
             if (side != GetBankSide(gActiveBank)
                 && *(gBattleStruct->moveTarget + gBankAttacker) != gActiveBank
@@ -5127,34 +5127,34 @@ static void HandleAction_UseMove(void)
                 if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
                 {
                     if (Random() & 1)
-                        gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+                        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
                     else
-                        gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+                        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
                 }
                 else
                 {
                     if (Random() & 1)
-                        gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+                        gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
                     else
-                        gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+                        gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
                 }
             }
             else
             {
-                gBankTarget = *(gBattleStruct->moveTarget + gBankAttacker);
+                gBankDefender = *(gBattleStruct->moveTarget + gBankAttacker);
             }
 
-            if (gAbsentBankFlags & gBitTable[gBankTarget])
+            if (gAbsentBankFlags & gBitTable[gBankDefender])
             {
-                if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+                if (GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
                 {
-                    gBankTarget = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
+                    gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
                 }
                 else
                 {
-                    gBankTarget = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
-                    if (gAbsentBankFlags & gBitTable[gBankTarget])
-                        gBankTarget = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
+                    gBankDefender = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
+                    if (gAbsentBankFlags & gBitTable[gBankDefender])
+                        gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
                 }
             }
         }
@@ -5163,7 +5163,7 @@ static void HandleAction_UseMove(void)
             gActiveBank = gBanksByTurnOrder[var];
             RecordAbilityBattle(gActiveBank, gBattleMons[gActiveBank].ability);
             gSpecialStatuses[gActiveBank].lightningRodRedirected = 1;
-            gBankTarget = gActiveBank;
+            gBankDefender = gActiveBank;
         }
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
@@ -5172,38 +5172,38 @@ static void HandleAction_UseMove(void)
         if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
         {
             if (Random() & 1)
-                gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+                gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
             else
-                gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+                gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
         }
         else
         {
             if (Random() & 1)
-                gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+                gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
             else
-                gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+                gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
         }
 
-        if (gAbsentBankFlags & gBitTable[gBankTarget]
-            && GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+        if (gAbsentBankFlags & gBitTable[gBankDefender]
+            && GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
         {
-            gBankTarget = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
+            gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
         }
     }
     else
     {
-        gBankTarget = *(gBattleStruct->moveTarget + gBankAttacker);
-        if (gAbsentBankFlags & gBitTable[gBankTarget])
+        gBankDefender = *(gBattleStruct->moveTarget + gBankAttacker);
+        if (gAbsentBankFlags & gBitTable[gBankDefender])
         {
-            if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+            if (GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
             {
-                gBankTarget = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
+                gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
             }
             else
             {
-                gBankTarget = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
-                if (gAbsentBankFlags & gBitTable[gBankTarget])
-                    gBankTarget = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
+                gBankDefender = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
+                if (gAbsentBankFlags & gBitTable[gBankDefender])
+                    gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
             }
         }
     }
@@ -5260,7 +5260,7 @@ static void HandleAction_Switch(void)
 
 static void HandleAction_UseItem(void)
 {
-    gBankAttacker = gBankTarget = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBankAttacker = gBankDefender = gBanksByTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
     ClearFuryCutterDestinyBondGrudge(gBankAttacker);
@@ -5410,8 +5410,8 @@ bool8 TryRunFromBattle(u8 bank)
 
     if (effect)
     {
-        gCurrentTurnActionNumber = gNoOfAllBanks;
-        gBattleOutcome = BATTLE_RAN;
+        gCurrentTurnActionNumber = gBattleBanksCount;
+        gBattleOutcome = B_OUTCOME_RAN;
     }
 
     return effect;
@@ -5423,23 +5423,23 @@ static void HandleAction_Run(void)
 
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
     {
-        gCurrentTurnActionNumber = gNoOfAllBanks;
+        gCurrentTurnActionNumber = gBattleBanksCount;
 
-        for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
         {
             if (GetBankSide(gActiveBank) == SIDE_PLAYER)
             {
                 if (gActionForBanks[gActiveBank] == ACTION_RUN)
-                    gBattleOutcome |= BATTLE_LOST;
+                    gBattleOutcome |= B_OUTCOME_LOST;
             }
             else
             {
                 if (gActionForBanks[gActiveBank] == ACTION_RUN)
-                    gBattleOutcome |= BATTLE_WON;
+                    gBattleOutcome |= B_OUTCOME_WON;
             }
         }
 
-        gBattleOutcome |= OUTCOME_LINK_BATTLE_RUN;
+        gBattleOutcome |= B_OUTCOME_LINK_BATTLE_RAN;
         gSaveBlock2Ptr->field_CA9_b = 1;
     }
     else
@@ -5464,8 +5464,8 @@ static void HandleAction_Run(void)
             }
             else
             {
-                gCurrentTurnActionNumber = gNoOfAllBanks;
-                gBattleOutcome = BATTLE_POKE_FLED;
+                gCurrentTurnActionNumber = gBattleBanksCount;
+                gBattleOutcome = B_OUTCOME_POKE_FLED;
             }
         }
     }
@@ -5546,8 +5546,8 @@ static void HandleAction_SafriZoneRun(void)
 {
     gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
     PlaySE(SE_NIGERU);
-    gCurrentTurnActionNumber = gNoOfAllBanks;
-    gBattleOutcome = BATTLE_RAN;
+    gCurrentTurnActionNumber = gBattleBanksCount;
+    gBattleOutcome = B_OUTCOME_RAN;
 }
 
 static void HandleAction_Action9(void)
@@ -5597,7 +5597,7 @@ static void HandleAction_ActionFinished(void)
 
     gCurrentMove = 0;
     gBattleMoveDamage = 0;
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
     gLastLandedMoves[gBankAttacker] = 0;
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index a10dab976..07bedb113 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -48,16 +48,16 @@ extern u32 gBattleTypeFlags;
 extern u8 gActiveBank;
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gCurrentMove;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gAbsentBankFlags;
 extern u16 gLastMoves[BATTLE_BANKS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
-extern u16 gSideAffecting[2];
+extern u16 gSideStatuses[2];
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern u16 gDynamicBasePower;
-extern u8 gBattleMoveFlags;
+extern u8 gMoveResultFlags;
 extern s32 gBattleMoveDamage;
 extern u8 gCritMultiplier;
 extern u16 gBattleWeather;
@@ -367,14 +367,14 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves)
     // decide a random target bank in doubles
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        gBankTarget = (Random() & BIT_MON) + (GetBankSide(gActiveBank) ^ BIT_SIDE);
-        if (gAbsentBankFlags & gBitTable[gBankTarget])
-            gBankTarget ^= BIT_MON;
+        gBankDefender = (Random() & BIT_MON) + (GetBankSide(gActiveBank) ^ BIT_SIDE);
+        if (gAbsentBankFlags & gBitTable[gBankDefender])
+            gBankDefender ^= BIT_MON;
     }
     // in singles there's only one choice
     else
     {
-        gBankTarget = sBank_AI ^ BIT_SIDE;
+        gBankDefender = sBank_AI ^ BIT_SIDE;
     }
 
     if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
@@ -491,7 +491,7 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
             else
                 BattleAI_SetupAIData(0xF);
 
-            gBankTarget = i;
+            gBankDefender = i;
 
             if ((i & BIT_SIDE) != (sBank_AI & BIT_SIDE))
                 RecordLastUsedMoveByTarget();
@@ -573,8 +573,8 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
         }
     }
 
-    gBankTarget = mostViableTargetsArray[Random() % mostViableTargetsNo];
-    return actionOrMoveIndex[gBankTarget];
+    gBankDefender = mostViableTargetsArray[Random() % mostViableTargetsNo];
+    return actionOrMoveIndex[gBankDefender];
 }
 
 static void BattleAI_DoAIProcessing(void)
@@ -627,12 +627,12 @@ static void RecordLastUsedMoveByTarget(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == gLastMoves[gBankTarget])
+        if (gBattleResources->battleHistory->usedMoves[gBankDefender].moves[i] == gLastMoves[gBankDefender])
             break;
-        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] != gLastMoves[gBankTarget]  // HACK: This redundant condition is a hack to make the asm match.
-         && gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == 0)
+        if (gBattleResources->battleHistory->usedMoves[gBankDefender].moves[i] != gLastMoves[gBankDefender]  // HACK: This redundant condition is a hack to make the asm match.
+         && gBattleResources->battleHistory->usedMoves[gBankDefender].moves[i] == 0)
         {
-            gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] = gLastMoves[gBankTarget];
+            gBattleResources->battleHistory->usedMoves[gBankDefender].moves[i] = gLastMoves[gBankDefender];
             break;
         }
     }
@@ -723,7 +723,7 @@ static void BattleAICmd_if_hp_less_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) < gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -738,7 +738,7 @@ static void BattleAICmd_if_hp_more_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) > gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -753,7 +753,7 @@ static void BattleAICmd_if_hp_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) == gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -768,7 +768,7 @@ static void BattleAICmd_if_hp_not_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) != gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -784,7 +784,7 @@ static void BattleAICmd_if_status(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -802,7 +802,7 @@ static void BattleAICmd_if_not_status(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -820,7 +820,7 @@ static void BattleAICmd_if_status2(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -838,7 +838,7 @@ static void BattleAICmd_if_not_status2(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -856,7 +856,7 @@ static void BattleAICmd_if_status3(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -874,7 +874,7 @@ static void BattleAICmd_if_not_status3(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -892,12 +892,12 @@ static void BattleAICmd_if_side_affecting(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     side = GET_BANK_SIDE(bank);
     status = AIScriptRead32(gAIScriptPtr + 2);
 
-    if ((gSideAffecting[side] & status) != 0)
+    if ((gSideStatuses[side] & status) != 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -911,12 +911,12 @@ static void BattleAICmd_if_not_side_affecting(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     side = GET_BANK_SIDE(bank);
     status = AIScriptRead32(gAIScriptPtr + 2);
 
-    if ((gSideAffecting[side] & status) == 0)
+    if ((gSideStatuses[side] & status) == 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6);
     else
         gAIScriptPtr += 10;
@@ -1126,13 +1126,13 @@ static void BattleAICmd_get_type(void)
         AI_THINKING_STRUCT->funcResult = gBattleMons[sBank_AI].type1;
         break;
     case AI_TYPE1_TARGET: // target primary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[gBankTarget].type1;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[gBankDefender].type1;
         break;
     case AI_TYPE2_USER: // AI user secondary type
         AI_THINKING_STRUCT->funcResult = gBattleMons[sBank_AI].type2;
         break;
     case AI_TYPE2_TARGET: // target secondary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[gBankTarget].type2;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[gBankDefender].type2;
         break;
     case AI_TYPE_MOVE: // type of move being pointed to
         AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].type;
@@ -1149,11 +1149,11 @@ static u8 BattleAI_GetWantedBank(u8 bank)
             return sBank_AI;
         case AI_TARGET:
         default:
-            return gBankTarget;
+            return gBankDefender;
         case AI_USER_PARTNER:
             return sBank_AI ^ BIT_MON;
         case AI_TARGET_PARTNER:
-            return gBankTarget ^ BIT_MON;
+            return gBankDefender ^ BIT_MON;
     }
 }
 
@@ -1196,7 +1196,7 @@ static void BattleAICmd_get_how_powerful_move_is(void)
         gDynamicBasePower = 0;
         *(&gBattleStruct->dynamicMoveType) = 0;
         gBattleScripting.dmgMultiplier = 1;
-        gBattleMoveFlags = 0;
+        gMoveResultFlags = 0;
         gCritMultiplier = 1;
 
         for (checkedMove = 0; checkedMove < 4; checkedMove++)
@@ -1212,8 +1212,8 @@ static void BattleAICmd_get_how_powerful_move_is(void)
                 && gBattleMoves[gBattleMons[sBank_AI].moves[checkedMove]].power > 1)
             {
                 gCurrentMove = gBattleMons[sBank_AI].moves[checkedMove];
-                AI_CalcDmg(sBank_AI, gBankTarget);
-                TypeCalc(gCurrentMove, sBank_AI, gBankTarget);
+                AI_CalcDmg(sBank_AI, gBankDefender);
+                TypeCalc(gCurrentMove, sBank_AI, gBankDefender);
                 moveDmgs[checkedMove] = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[checkedMove] / 100;
                 if (moveDmgs[checkedMove] == 0)
                     moveDmgs[checkedMove] = 1;
@@ -1248,7 +1248,7 @@ static void BattleAICmd_get_last_used_bank_move(void)
     if (gAIScriptPtr[1] == AI_USER)
         AI_THINKING_STRUCT->funcResult = gLastMoves[sBank_AI];
     else
-        AI_THINKING_STRUCT->funcResult = gLastMoves[gBankTarget];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[gBankDefender];
 
     gAIScriptPtr += 2;
 }
@@ -1271,7 +1271,7 @@ static void BattleAICmd_if_not_equal_(void) // same as if_not_equal
 
 static void BattleAICmd_if_user_goes(void)
 {
-    if (GetWhoStrikesFirst(sBank_AI, gBankTarget, TRUE) == gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(sBank_AI, gBankDefender, TRUE) == gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1279,7 +1279,7 @@ static void BattleAICmd_if_user_goes(void)
 
 static void BattleAICmd_if_user_doesnt_go(void)
 {
-    if (GetWhoStrikesFirst(sBank_AI, gBankTarget, TRUE) != gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(sBank_AI, gBankDefender, TRUE) != gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1305,7 +1305,7 @@ static void BattleAICmd_count_usable_party_mons(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if (GetBankSide(bank) == SIDE_PLAYER)
         party = gPlayerParty;
@@ -1317,7 +1317,7 @@ static void BattleAICmd_count_usable_party_mons(void)
         u32 identity;
         bankOnField1 = gBattlePartyID[bank];
         identity = GetBankPosition(bank) ^ BIT_MON;
-        bankOnField2 = gBattlePartyID[GetBankByIdentity(identity)];
+        bankOnField2 = gBattlePartyID[GetBankByPosition(identity)];
     }
     else // in singles there's only one bank by side
     {
@@ -1358,7 +1358,7 @@ static void BattleAICmd_get_ability(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if (gActiveBank != bank)
     {
@@ -1482,7 +1482,7 @@ static void BattleAICmd_get_highest_type_effectiveness(void)
     dynamicMoveType = &gBattleStruct->dynamicMoveType;
     *dynamicMoveType = 0;
     gBattleScripting.dmgMultiplier = 1;
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
     gCritMultiplier = 1;
     AI_THINKING_STRUCT->funcResult = 0;
 
@@ -1493,7 +1493,7 @@ static void BattleAICmd_get_highest_type_effectiveness(void)
 
         if (gCurrentMove)
         {
-            TypeCalc(gCurrentMove, sBank_AI, gBankTarget);
+            TypeCalc(gCurrentMove, sBank_AI, gBankDefender);
 
             // reduce by 1/3.
             if (gBattleMoveDamage == 120)
@@ -1505,7 +1505,7 @@ static void BattleAICmd_get_highest_type_effectiveness(void)
             if (gBattleMoveDamage == 15)
                 gBattleMoveDamage = AI_EFFECTIVENESS_x0_25;
 
-            if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
+            if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
                 gBattleMoveDamage = AI_EFFECTIVENESS_x0;
 
             if (AI_THINKING_STRUCT->funcResult < gBattleMoveDamage)
@@ -1522,13 +1522,13 @@ static void BattleAICmd_if_type_effectiveness(void)
     gDynamicBasePower = 0;
     gBattleStruct->dynamicMoveType = 0;
     gBattleScripting.dmgMultiplier = 1;
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
     gCritMultiplier = 1;
 
     gBattleMoveDamage = AI_EFFECTIVENESS_x1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
 
-    TypeCalc(gCurrentMove, sBank_AI, gBankTarget);
+    TypeCalc(gCurrentMove, sBank_AI, gBankDefender);
 
     if (gBattleMoveDamage == 120)
         gBattleMoveDamage = AI_EFFECTIVENESS_x2;
@@ -1539,7 +1539,7 @@ static void BattleAICmd_if_type_effectiveness(void)
     if (gBattleMoveDamage == 15)
         gBattleMoveDamage = AI_EFFECTIVENESS_x0_25;
 
-    if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
+    if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
         gBattleMoveDamage = AI_EFFECTIVENESS_x0;
 
     // store gBattleMoveDamage in a u8 variable because gAIScriptPtr[1] is a u8.
@@ -1572,7 +1572,7 @@ static void BattleAICmd_if_status_in_party(void)
             bank = sBank_AI;
             break;
         default:
-            bank = gBankTarget;
+            bank = gBankDefender;
             break;
     }
 
@@ -1609,7 +1609,7 @@ static void BattleAICmd_if_status_not_in_party(void)
             bank = sBank_AI;
             break;
         default:
-            bank = gBankTarget;
+            bank = gBankDefender;
             break;
     }
 
@@ -1669,7 +1669,7 @@ static void BattleAICmd_if_stat_level_less_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] < gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1684,7 +1684,7 @@ static void BattleAICmd_if_stat_level_more_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] > gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1699,7 +1699,7 @@ static void BattleAICmd_if_stat_level_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] == gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1714,7 +1714,7 @@ static void BattleAICmd_if_stat_level_not_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] != gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1733,11 +1733,11 @@ static void BattleAICmd_if_can_faint(void)
     gDynamicBasePower = 0;
     gBattleStruct->dynamicMoveType = 0;
     gBattleScripting.dmgMultiplier = 1;
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    AI_CalcDmg(sBank_AI, gBankTarget);
-    TypeCalc(gCurrentMove, sBank_AI, gBankTarget);
+    AI_CalcDmg(sBank_AI, gBankDefender);
+    TypeCalc(gCurrentMove, sBank_AI, gBankDefender);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
@@ -1745,7 +1745,7 @@ static void BattleAICmd_if_can_faint(void)
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
 
-    if (gBattleMons[gBankTarget].hp <= gBattleMoveDamage)
+    if (gBattleMons[gBankDefender].hp <= gBattleMoveDamage)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -1762,17 +1762,17 @@ static void BattleAICmd_if_cant_faint(void)
     gDynamicBasePower = 0;
     gBattleStruct->dynamicMoveType = 0;
     gBattleScripting.dmgMultiplier = 1;
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    AI_CalcDmg(sBank_AI, gBankTarget);
-    TypeCalc(gCurrentMove, sBank_AI, gBankTarget);
+    AI_CalcDmg(sBank_AI, gBankDefender);
+    TypeCalc(gCurrentMove, sBank_AI, gBankDefender);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
     // this macro is missing the damage 0 = 1 assumption.
 
-    if (gBattleMons[gBankTarget].hp > gBattleMoveDamage)
+    if (gBattleMons[gBankDefender].hp > gBattleMoveDamage)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -1829,7 +1829,7 @@ static void BattleAICmd_if_has_move(void)
         case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
-                if (BATTLE_HISTORY->usedMoves[gBankTarget].moves[i] == *movePtr)
+                if (BATTLE_HISTORY->usedMoves[gBankDefender].moves[i] == *movePtr)
                     break;
             }
             if (i == 4)
@@ -1873,7 +1873,7 @@ static void BattleAICmd_if_doesnt_have_move(void)
         case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
-                if (BATTLE_HISTORY->usedMoves[gBankTarget].moves[i] == *movePtr)
+                if (BATTLE_HISTORY->usedMoves[gBankDefender].moves[i] == *movePtr)
                     break;
             }
             if (i != 4)
@@ -1911,8 +1911,8 @@ static void BattleAICmd_if_has_move_with_effect(void)
     case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            // UB: checks sBank_AI instead of gBankTarget
-            if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBankTarget].moves[i]].effect == gAIScriptPtr[2])
+            // UB: checks sBank_AI instead of gBankDefender
+            if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBankDefender].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i == 4)
@@ -1945,7 +1945,7 @@ static void BattleAICmd_if_doesnt_have_move_with_effect(void)
     case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            if (BATTLE_HISTORY->usedMoves[gBankTarget].moves[i] && gBattleMoves[BATTLE_HISTORY->usedMoves[gBankTarget].moves[i]].effect == gAIScriptPtr[2])
+            if (BATTLE_HISTORY->usedMoves[gBankDefender].moves[i] && gBattleMoves[BATTLE_HISTORY->usedMoves[gBankDefender].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i != 4)
@@ -1963,7 +1963,7 @@ static void BattleAICmd_if_any_move_disabled_or_encored(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if (gAIScriptPtr[2] == 0)
     {
@@ -2041,7 +2041,7 @@ static void BattleAICmd_get_hold_effect(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     if (gActiveBank != bank)
         AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(BATTLE_HISTORY->itemEffects[bank]);
@@ -2079,7 +2079,7 @@ static void BattleAICmd_get_gender(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     AI_THINKING_STRUCT->funcResult = GetGenderFromSpeciesAndPersonality(gBattleMons[bank].species, gBattleMons[bank].personality);
 
@@ -2093,7 +2093,7 @@ static void BattleAICmd_is_first_turn_for(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].isFirstTurn;
 
@@ -2107,7 +2107,7 @@ static void BattleAICmd_get_stockpile_count(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].stockpileCounter;
 
@@ -2128,7 +2128,7 @@ static void BattleAICmd_get_used_held_item(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     // This is likely a leftover from Ruby's code and its ugly ewram access
     #ifdef NONMATCHING
@@ -2168,7 +2168,7 @@ static void BattleAICmd_get_protect_count(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankTarget;
+        bank = gBankDefender;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].protectUses;
 
@@ -2221,7 +2221,7 @@ static void BattleAICmd_if_level_cond(void)
     switch (gAIScriptPtr[1])
     {
     case 0: // greater than
-        if (gBattleMons[sBank_AI].level > gBattleMons[gBankTarget].level)
+        if (gBattleMons[sBank_AI].level > gBattleMons[gBankDefender].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2229,7 +2229,7 @@ static void BattleAICmd_if_level_cond(void)
         gAIScriptPtr += 6;
         return;
     case 1: // less than
-        if (gBattleMons[sBank_AI].level < gBattleMons[gBankTarget].level)
+        if (gBattleMons[sBank_AI].level < gBattleMons[gBankDefender].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2237,7 +2237,7 @@ static void BattleAICmd_if_level_cond(void)
         gAIScriptPtr += 6;
         return;
     case 2: // equal
-        if (gBattleMons[sBank_AI].level == gBattleMons[gBankTarget].level)
+        if (gBattleMons[sBank_AI].level == gBattleMons[gBankDefender].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2249,7 +2249,7 @@ static void BattleAICmd_if_level_cond(void)
 
 static void BattleAICmd_if_target_taunted(void)
 {
-    if (gDisableStructs[gBankTarget].tauntTimer1 != 0)
+    if (gDisableStructs[gBankDefender].tauntTimer1 != 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -2257,7 +2257,7 @@ static void BattleAICmd_if_target_taunted(void)
 
 static void BattleAICmd_if_target_not_taunted(void)
 {
-    if (gDisableStructs[gBankTarget].tauntTimer1 == 0)
+    if (gDisableStructs[gBankDefender].tauntTimer1 == 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -2265,7 +2265,7 @@ static void BattleAICmd_if_target_not_taunted(void)
 
 static void BattleAICmd_if_target_is_ally(void)
 {
-    if ((sBank_AI & BIT_SIDE) == (gBankTarget & BIT_SIDE))
+    if ((sBank_AI & BIT_SIDE) == (gBankDefender & BIT_SIDE))
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 092d4a7c7..60212f849 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -19,7 +19,7 @@ extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
 extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
 extern u16 gDynamicBasePower;
-extern u8 gBattleMoveFlags;
+extern u8 gMoveResultFlags;
 extern u8 gCritMultiplier;
 extern s32 gBattleMoveDamage;
 
@@ -48,7 +48,7 @@ static bool8 ShouldSwitchIfPerishSong(void)
 
 static bool8 ShouldSwitchIfWonderGuard(void)
 {
-    u8 opposingIdentity;
+    u8 opposingPosition;
     u8 opposingBank;
     u8 moveFlags;
     s32 i, j;
@@ -60,20 +60,20 @@ static bool8 ShouldSwitchIfWonderGuard(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         return FALSE;
 
-    opposingIdentity = GetBankPosition(gActiveBank) ^ BIT_SIDE;
+    opposingPosition = B_POSITION_OPPOSITE(GetBankPosition(gActiveBank));
 
-    if (gBattleMons[GetBankByIdentity(opposingIdentity)].ability != ABILITY_WONDER_GUARD)
+    if (gBattleMons[GetBankByPosition(opposingPosition)].ability != ABILITY_WONDER_GUARD)
         return FALSE;
 
     // check if pokemon has a super effective move
-    for (opposingBank = GetBankByIdentity(opposingIdentity), i = 0; i < 4; i++)
+    for (opposingBank = GetBankByPosition(opposingPosition), i = 0; i < 4; i++)
     {
         move = gBattleMons[gActiveBank].moves[i];
         if (move == MOVE_NONE)
             continue;
 
         moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
-        if (moveFlags & MOVESTATUS_SUPEREFFECTIVE)
+        if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             return FALSE;
     }
 
@@ -110,14 +110,14 @@ static bool8 ShouldSwitchIfWonderGuard(void)
         GetMonData(&party[i], MON_DATA_SPECIES); // unused return value
         GetMonData(&party[i], MON_DATA_ALT_ABILITY); // unused return value
 
-        for (opposingBank = GetBankByIdentity(opposingIdentity), j = 0; j < 4; j++)
+        for (opposingBank = GetBankByPosition(opposingPosition), j = 0; j < 4; j++)
         {
             move = GetMonData(&party[i], MON_DATA_MOVE1 + j);
             if (move == MOVE_NONE)
                 continue;
 
             moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
-            if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % 3 < 2)
+            if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % 3 < 2)
             {
                 // we found a mon
                 *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
@@ -151,10 +151,10 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = gActiveBank;
-        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)])
+        if (gAbsentBankFlags & gBitTable[GetBankByPosition(B_POSITION_PARTNER(GetBankPosition(gActiveBank)))])
             bankIn2 = gActiveBank;
         else
-            bankIn2 = GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON);
+            bankIn2 = GetBankByPosition(B_POSITION_PARTNER(GetBankPosition(gActiveBank)));
     }
     else
     {
@@ -231,7 +231,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
 
 static bool8 ShouldSwitchIfNaturalCure(void)
 {
-    if (!(gBattleMons[gActiveBank].status1 & STATUS_SLEEP))
+    if (!(gBattleMons[gActiveBank].status1 & STATUS1_SLEEP))
         return FALSE;
     if (gBattleMons[gActiveBank].ability != ABILITY_NATURAL_CURE)
         return FALSE;
@@ -251,9 +251,9 @@ static bool8 ShouldSwitchIfNaturalCure(void)
         return TRUE;
     }
 
-    if (FindMonWithFlagsAndSuperEffective(MOVESTATUS_NOTAFFECTED, 1))
+    if (FindMonWithFlagsAndSuperEffective(MOVE_RESULT_DOESNT_AFFECT_FOE, 1))
         return TRUE;
-    if (FindMonWithFlagsAndSuperEffective(MOVESTATUS_NOTVERYEFFECTIVE, 1))
+    if (FindMonWithFlagsAndSuperEffective(MOVE_RESULT_NOT_VERY_EFFECTIVE, 1))
         return TRUE;
     if (Random() & 1)
     {
@@ -267,14 +267,14 @@ static bool8 ShouldSwitchIfNaturalCure(void)
 
 static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
 {
-    u8 opposingIdentity;
+    u8 opposingPosition;
     u8 opposingBank;
     s32 i;
     u8 moveFlags;
     u16 move;
 
-    opposingIdentity = GetBankPosition(gActiveBank) ^ BIT_SIDE;
-    opposingBank = GetBankByIdentity(opposingIdentity);
+    opposingPosition = B_POSITION_OPPOSITE(GetBankPosition(gActiveBank));
+    opposingBank = GetBankByPosition(opposingPosition);
 
     if (!(gAbsentBankFlags & gBitTable[opposingBank]))
     {
@@ -285,7 +285,7 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
                 continue;
 
             moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
-            if (moveFlags & MOVESTATUS_SUPEREFFECTIVE)
+            if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             {
                 if (noRng)
                     return TRUE;
@@ -297,7 +297,7 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         return FALSE;
 
-    opposingBank = GetBankByIdentity(opposingIdentity ^ BIT_MON);
+    opposingBank = GetBankByPosition(B_POSITION_PARTNER(opposingPosition));
 
     if (!(gAbsentBankFlags & gBitTable[opposingBank]))
     {
@@ -308,7 +308,7 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
                 continue;
 
             moveFlags = AI_TypeCalc(move, gBattleMons[opposingBank].species, gBattleMons[opposingBank].ability);
-            if (moveFlags & MOVESTATUS_SUPEREFFECTIVE)
+            if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             {
                 if (noRng)
                     return TRUE;
@@ -357,10 +357,10 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = gActiveBank;
-        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)])
+        if (gAbsentBankFlags & gBitTable[GetBankByPosition(B_POSITION_PARTNER(GetBankPosition(gActiveBank)))])
             bankIn2 = gActiveBank;
         else
-            bankIn2 = GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON);
+            bankIn2 = GetBankByPosition(B_POSITION_PARTNER(GetBankPosition(gActiveBank)));
     }
     else
     {
@@ -423,7 +423,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
                     continue;
 
                 moveFlags = AI_TypeCalc(move, gBattleMons[bankIn1].species, gBattleMons[bankIn1].ability);
-                if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % moduloPercent == 0)
+                if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % moduloPercent == 0)
                 {
                     *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
                     EmitTwoReturnValues(1, ACTION_SWITCH, 0);
@@ -468,10 +468,10 @@ static bool8 ShouldSwitch(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = *activeBankPtr;
-        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankPosition(*activeBankPtr) ^ BIT_MON)])
+        if (gAbsentBankFlags & gBitTable[GetBankByPosition(GetBankPosition(*activeBankPtr) ^ BIT_MON)])
             bankIn2 = *activeBankPtr;
         else
-            bankIn2 = GetBankByIdentity(GetBankPosition(*activeBankPtr) ^ BIT_MON);
+            bankIn2 = GetBankByPosition(GetBankPosition(*activeBankPtr) ^ BIT_MON);
     }
     else
     {
@@ -530,8 +530,8 @@ static bool8 ShouldSwitch(void)
         return FALSE;
     if (AreStatsRaised())
         return FALSE;
-    if (FindMonWithFlagsAndSuperEffective(MOVESTATUS_NOTAFFECTED, 2)
-        || FindMonWithFlagsAndSuperEffective(MOVESTATUS_NOTVERYEFFECTIVE, 3))
+    if (FindMonWithFlagsAndSuperEffective(MOVE_RESULT_DOESNT_AFFECT_FOE, 2)
+        || FindMonWithFlagsAndSuperEffective(MOVE_RESULT_NOT_VERY_EFFECTIVE, 3))
         return TRUE;
 
     return FALSE;
@@ -561,13 +561,13 @@ void AI_TrySwitchOrUseItem(void)
                 {
                     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
                     {
-                        bankIn1 = GetBankByIdentity(bankIdentity);
+                        bankIn1 = GetBankByPosition(bankIdentity);
                         bankIn2 = bankIn1;
                     }
                     else
                     {
-                        bankIn1 = GetBankByIdentity(bankIdentity);
-                        bankIn2 = GetBankByIdentity(bankIdentity ^ BIT_MON);
+                        bankIn1 = GetBankByPosition(bankIdentity);
+                        bankIn2 = GetBankByPosition(bankIdentity ^ BIT_MON);
                     }
 
                     if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
@@ -659,10 +659,10 @@ u8 GetMostSuitableMonToSwitchInto(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = gActiveBank;
-        if (gAbsentBankFlags & gBitTable[GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON)])
+        if (gAbsentBankFlags & gBitTable[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)])
             bankIn2 = gActiveBank;
         else
-            bankIn2 = GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_MON);
+            bankIn2 = GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON);
 
         // UB: It considers the opponent only player's side even though it can battle alongside player;
         opposingBank = Random() & BIT_MON;
@@ -671,7 +671,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
     }
     else
     {
-        opposingBank = GetBankByIdentity(GetBankPosition(gActiveBank) ^ BIT_SIDE);
+        opposingBank = GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_SIDE);
         bankIn1 = gActiveBank;
         bankIn2 = gActiveBank;
     }
@@ -734,7 +734,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
             for (i = 0; i < 4; i++)
             {
                 move = GetMonData(&party[bestMonId], MON_DATA_MOVE1 + i);
-                if (move != MOVE_NONE && TypeCalc(move, gActiveBank, opposingBank) & MOVESTATUS_SUPEREFFECTIVE)
+                if (move != MOVE_NONE && TypeCalc(move, gActiveBank, opposingBank) & MOVE_RESULT_SUPER_EFFECTIVE)
                     break;
             }
 
@@ -752,7 +752,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
     gDynamicBasePower = 0;
     gBattleStruct->dynamicMoveType = 0;
     gBattleScripting.dmgMultiplier = 1;
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
     gCritMultiplier = 1;
     bestDmg = 0;
     bestMonId = 6;
@@ -877,27 +877,27 @@ static bool8 ShouldUseItem(void)
             break;
         case AI_ITEM_CURE_CONDITION:
             *(gBattleStruct->AI_itemFlags + gActiveBank / 2) = 0;
-            if (itemEffects[3] & 0x20 && gBattleMons[gActiveBank].status1 & STATUS_SLEEP)
+            if (itemEffects[3] & 0x20 && gBattleMons[gActiveBank].status1 & STATUS1_SLEEP)
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x20;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x10 && (gBattleMons[gActiveBank].status1 & STATUS_POISON || gBattleMons[gActiveBank].status1 & STATUS_TOXIC_POISON))
+            if (itemEffects[3] & 0x10 && (gBattleMons[gActiveBank].status1 & STATUS1_POISON || gBattleMons[gActiveBank].status1 & STATUS1_TOXIC_POISON))
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x10;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x8 && gBattleMons[gActiveBank].status1 & STATUS_BURN)
+            if (itemEffects[3] & 0x8 && gBattleMons[gActiveBank].status1 & STATUS1_BURN)
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x8;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x4 && gBattleMons[gActiveBank].status1 & STATUS_FREEZE)
+            if (itemEffects[3] & 0x4 && gBattleMons[gActiveBank].status1 & STATUS1_FREEZE)
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x4;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x2 && gBattleMons[gActiveBank].status1 & STATUS_PARALYSIS)
+            if (itemEffects[3] & 0x2 && gBattleMons[gActiveBank].status1 & STATUS1_PARALYSIS)
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x2;
                 shouldUse = TRUE;
diff --git a/src/battle_anim.c b/src/battle_anim.c
index ecaff67a8..76da24383 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -26,7 +26,7 @@
 #define ANIM_SPRITE_INDEX_COUNT 8
 
 extern u8 gBankAttacker;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u16 gBattle_WIN0H;
 extern u16 gBattle_WIN0V;
 extern u16 gBattle_WIN1H;
@@ -222,7 +222,7 @@ void ClearBattleAnimationVars(void)
 void DoMoveAnim(u16 move)
 {
     gAnimBankAttacker = gBankAttacker;
-    gAnimBankTarget = gBankTarget;
+    gAnimBankTarget = gBankDefender;
     LaunchBattleAnimation(gBattleAnims_Moves, move, TRUE);
 }
 
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 5d5bbf0e9..4bb1e65a9 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -273,13 +273,13 @@ static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY)
 
 static void sub_8035C4C(void)
 {
-    if (gBattleOutcome == BATTLE_DREW)
+    if (gBattleOutcome == B_OUTCOME_DREW)
     {
         BattleHandleAddTextPrinter(gText_Draw, 0x15);
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if (gBattleOutcome == BATTLE_WON)
+        if (gBattleOutcome == B_OUTCOME_WON)
         {
             switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18)
             {
@@ -324,7 +324,7 @@ static void sub_8035C4C(void)
             }
         }
     }
-    else if (gBattleOutcome == BATTLE_WON)
+    else if (gBattleOutcome == B_OUTCOME_WON)
     {
         if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0)
         {
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index a72650537..1733ee966 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -28,7 +28,7 @@ extern u32 gBattleExecBuffer;
 extern u8 gActiveBank;
 extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern bool8 gDoingBattleAnim;
 extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
@@ -47,7 +47,7 @@ extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gAbsentBankFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
@@ -1875,10 +1875,10 @@ static void LinkOpponentHandleCmd55(void)
 {
     sub_81851A8(&gBattleBufferA[gActiveBank][4]);
 
-    if (gBattleBufferA[gActiveBank][1] == BATTLE_DREW)
+    if (gBattleBufferA[gActiveBank][1] == B_OUTCOME_DREW)
         gBattleOutcome = gBattleBufferA[gActiveBank][1];
     else
-        gBattleOutcome = gBattleBufferA[gActiveBank][1] ^ BATTLE_DREW;
+        gBattleOutcome = gBattleBufferA[gActiveBank][1] ^ B_OUTCOME_DREW;
 
     gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBank][2];
     FadeOutMapMusic(5);
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 14061b3a9..9835f6cb2 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -28,7 +28,7 @@ extern u32 gBattleExecBuffer;
 extern u8 gActiveBank;
 extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern bool8 gDoingBattleAnim;
 extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
@@ -47,7 +47,7 @@ extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gAbsentBankFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index d3e72c0ad..6940fdc73 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -30,7 +30,7 @@
 
 extern u32 gBattleExecBuffer;
 extern u8 gActiveBank;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gAbsentBankFlags;
 extern bool8 gDoingBattleAnim;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
@@ -1581,18 +1581,18 @@ static void OpponentHandleChooseMove(void)
                 EmitTwoReturnValues(1, ACTION_RUN, 0);
                 break;
             case 6:
-                EmitTwoReturnValues(1, 15, gBankTarget);
+                EmitTwoReturnValues(1, 15, gBankDefender);
                 break;
             default:
                 if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_USER | MOVE_TARGET_x10))
-                    gBankTarget = gActiveBank;
+                    gBankDefender = gActiveBank;
                 if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH)
                 {
-                    gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
-                    if (gAbsentBankFlags & gBitTable[gBankTarget])
-                        gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+                    gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+                    if (gAbsentBankFlags & gBitTable[gBankDefender])
+                        gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
                 }
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (gBankTarget << 8));
+                EmitTwoReturnValues(1, 10, (chosenMoveId) | (gBankDefender << 8));
                 break;
             }
             OpponentBufferExecCompleted();
@@ -1609,9 +1609,9 @@ static void OpponentHandleChooseMove(void)
             if (gBattleMoves[move].target & (MOVE_TARGET_USER | MOVE_TARGET_x10))
                 EmitTwoReturnValues(1, 10, (chosenMoveId) | (gActiveBank << 8));
             else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBankByIdentity(Random() & 2) << 8));
+                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBankByPosition(Random() & 2) << 8));
             else
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBankByIdentity(B_POSITION_PLAYER_LEFT) << 8));
+                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBankByPosition(B_POSITION_PLAYER_LEFT) << 8));
 
             OpponentBufferExecCompleted();
         }
@@ -1638,12 +1638,12 @@ static void OpponentHandleChoosePokemon(void)
 
             if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
             {
-                bank2 = bank1 = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+                bank2 = bank1 = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
             }
             else
             {
-                bank1 = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
-                bank2 = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+                bank1 = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+                bank2 = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
             }
 
             if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index dfbf9df94..e8a6898f8 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -33,7 +33,7 @@ extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
 extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
 extern u8 gAbsentBankFlags;
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern bool8 gDoingBattleAnim;
 extern u8 gPlayerDpadHoldFrames;
 extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
@@ -358,7 +358,7 @@ static void HandleInputChooseAction(void)
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
          && GetBankPosition(gActiveBank) == B_POSITION_PLAYER_RIGHT
-         && !(gAbsentBankFlags & gBitTable[GetBankByIdentity(B_POSITION_PLAYER_LEFT)])
+         && !(gAbsentBankFlags & gBitTable[GetBankByPosition(B_POSITION_PLAYER_LEFT)])
          && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
             if (gBattleBufferA[gActiveBank][1] == ACTION_USE_ITEM)
@@ -397,14 +397,14 @@ static void HandleInputChooseTarget(void)
 
     // what a weird loop
     i = 0;
-    if (gNoOfAllBanks != 0)
+    if (gBattleBanksCount != 0)
     {
         do
         {
             if (i != gMultiUsePlayerCursor)
                 dp11b_obj_free(i, 1);
             i++;
-        } while (i < gNoOfAllBanks);
+        } while (i < gBattleBanksCount);
     }
 
     if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2)
@@ -447,8 +447,8 @@ static void HandleInputChooseTarget(void)
             {
                 if (--i < 0)
                     i = 4; // UB: array out of range
-                gMultiUsePlayerCursor = GetBankByIdentity(identities[i]);
-            } while (gMultiUsePlayerCursor == gNoOfAllBanks);
+                gMultiUsePlayerCursor = GetBankByPosition(identities[i]);
+            } while (gMultiUsePlayerCursor == gBattleBanksCount);
 
             i = 0;
             switch (GetBankPosition(gMultiUsePlayerCursor))
@@ -489,8 +489,8 @@ static void HandleInputChooseTarget(void)
             {
                 if (++i > 3)
                     i = 0;
-                gMultiUsePlayerCursor = GetBankByIdentity(identities[i]);
-            } while (gMultiUsePlayerCursor == gNoOfAllBanks);
+                gMultiUsePlayerCursor = GetBankByPosition(identities[i]);
+            } while (gMultiUsePlayerCursor == gBattleBanksCount);
 
             i = 0;
             switch (GetBankPosition(gMultiUsePlayerCursor))
@@ -545,7 +545,7 @@ static void HandleInputChooseMove(void)
         if (moveTarget & MOVE_TARGET_x10)
             gMultiUsePlayerCursor = gActiveBank;
         else
-            gMultiUsePlayerCursor = GetBankByIdentity((GetBankPosition(gActiveBank) & BIT_SIDE) ^ BIT_SIDE);
+            gMultiUsePlayerCursor = GetBankByPosition((GetBankPosition(gActiveBank) & BIT_SIDE) ^ BIT_SIDE);
 
         if (!gBattleBufferA[gActiveBank][1]) // not a double battle
         {
@@ -579,10 +579,10 @@ static void HandleInputChooseMove(void)
 
             if (moveTarget & (MOVE_TARGET_x10 | MOVE_TARGET_USER))
                 gMultiUsePlayerCursor = gActiveBank;
-            else if (gAbsentBankFlags & gBitTable[GetBankByIdentity(B_POSITION_OPPONENT_LEFT)])
-                gMultiUsePlayerCursor = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+            else if (gAbsentBankFlags & gBitTable[GetBankByPosition(B_POSITION_OPPONENT_LEFT)])
+                gMultiUsePlayerCursor = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
             else
-                gMultiUsePlayerCursor = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+                gMultiUsePlayerCursor = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
 
             gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
         }
@@ -905,7 +905,7 @@ static void sub_80586F8(void)
             gMain.inBattle = 0;
             gMain.callback1 = gPreBattleCallback1;
             SetMainCallback2(sub_8038D64);
-            if (gBattleOutcome == BATTLE_WON)
+            if (gBattleOutcome == B_OUTCOME_WON)
                 sub_817E3F4();
             FreeAllWindowBuffers();
         }
@@ -918,7 +918,7 @@ static void sub_80586F8(void)
             gMain.inBattle = 0;
             gMain.callback1 = gPreBattleCallback1;
             SetMainCallback2(sub_8038D64);
-            if (gBattleOutcome == BATTLE_WON)
+            if (gBattleOutcome == B_OUTCOME_WON)
                 sub_817E3F4();
             FreeAllWindowBuffers();
         }
@@ -2463,7 +2463,7 @@ static void PlayerHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
@@ -2473,7 +2473,7 @@ static void PlayerHandleBallThrowAnim(void)
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 5d6f07a48..1da8ee04c 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -27,7 +27,7 @@ extern u32 gBattleExecBuffer;
 extern u8 gActiveBank;
 extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern bool8 gDoingBattleAnim;
 extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
@@ -47,7 +47,7 @@ extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gAbsentBankFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
@@ -1545,15 +1545,15 @@ static void PlayerPartnerHandleChooseMove(void)
     chosenMoveId = BattleAI_ChooseMoveOrAction();
 
     if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_x10 | MOVE_TARGET_USER))
-        gBankTarget = gActiveBank;
+        gBankDefender = gActiveBank;
     if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH)
     {
-        gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
-        if (gAbsentBankFlags & gBitTable[gBankTarget])
-            gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+        if (gAbsentBankFlags & gBitTable[gBankDefender])
+            gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
     }
 
-    EmitTwoReturnValues(1, 10, chosenMoveId | (gBankTarget << 8));
+    EmitTwoReturnValues(1, 10, chosenMoveId | (gBankDefender << 8));
     PlayerPartnerBufferExecCompleted();
 }
 
@@ -1568,8 +1568,8 @@ static void PlayerPartnerHandleChoosePokemon(void)
 
     if (chosenMonId == 6) // just switch to the next mon
     {
-        u8 playerMonIdentity = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
-        u8 selfIdentity = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+        u8 playerMonIdentity = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+        u8 selfIdentity = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
 
         for (chosenMonId = 3; chosenMonId < 6; chosenMonId++)
         {
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index e5e0bef84..e970c5f58 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -29,7 +29,7 @@ extern u32 gBattleExecBuffer;
 extern u8 gActiveBank;
 extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern bool8 gDoingBattleAnim;
 extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
@@ -48,7 +48,7 @@ extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gAbsentBankFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
@@ -1814,10 +1814,10 @@ static void RecordedOpponentHandleResetActionMoveSelection(void)
 
 static void RecordedOpponentHandleCmd55(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == BATTLE_DREW)
+    if (gBattleBufferA[gActiveBank][1] == B_OUTCOME_DREW)
         gBattleOutcome = gBattleBufferA[gActiveBank][1];
     else
-        gBattleOutcome = gBattleBufferA[gActiveBank][1] ^ BATTLE_DREW;
+        gBattleOutcome = gBattleBufferA[gActiveBank][1] ^ B_OUTCOME_DREW;
 
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 183da6bfd..775ea3e7c 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -28,7 +28,7 @@ extern u32 gBattleExecBuffer;
 extern u8 gActiveBank;
 extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern bool8 gDoingBattleAnim;
 extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
@@ -48,7 +48,7 @@ extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gAbsentBankFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
@@ -1445,7 +1445,7 @@ static void RecordedPlayerHandlePrintSelectionString(void)
 
 static void ChooseActionInBattlePalace(void)
 {
-    if (gBattleCommunication[4] >= gNoOfAllBanks / 2)
+    if (gBattleCommunication[4] >= gBattleBanksCount / 2)
     {
         EmitTwoReturnValues(1, RecordedBattle_ReadBankAction(gActiveBank), 0);
         RecordedPlayerBufferExecCompleted();
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index a04f06d8c..a605e4cb8 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -26,7 +26,7 @@ extern u32 gBattleExecBuffer;
 extern u8 gActiveBank;
 extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern bool8 gDoingBattleAnim;
 extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
@@ -415,7 +415,7 @@ static void SafariHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
@@ -425,7 +425,7 @@ static void SafariHandleBallThrowAnim(void)
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
 }
 
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 8a34763f6..11fb0074f 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -34,7 +34,7 @@ extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
 extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
 extern u8 gAbsentBankFlags;
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern bool8 gDoingBattleAnim;
 extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
@@ -1113,7 +1113,7 @@ static void WallyHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnFinishedAnimation;
 }
 
@@ -1123,7 +1123,7 @@ static void WallyHandleBallThrowAnim(void)
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
+    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
     gBattleBankFunc[gActiveBank] = CompleteOnFinishedAnimation;
 }
 
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 467ce3640..91f014876 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -19,7 +19,7 @@ extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
 extern u8 gBankPositions[BATTLE_BANKS_COUNT];
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
 extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern u8 gActiveBank;
 extern u8 gUnknown_0202428C;
 extern u32 gUnknown_02022FF4;
@@ -32,7 +32,7 @@ extern u8 gUnknown_02022D08;
 extern u8 gUnknown_02022D09;
 extern u8 gUnknown_02022D0A;
 extern u8 gBankAttacker;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gAbsentBankFlags;
 extern u8 gEffectBank;
 extern u16 gBattleWeather;
@@ -124,7 +124,7 @@ void sub_8032768(void)
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattleBanksCount; i++)
             sub_81B8D64(i, 0);
     }
 
@@ -172,7 +172,7 @@ static void SetControllersVariables(void)
             gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
         }
 
-        gNoOfAllBanks = 4;
+        gBattleBanksCount = 4;
 
         sub_81B8D64(0, 0);
         sub_81B8D64(1, 0);
@@ -200,7 +200,7 @@ static void SetControllersVariables(void)
         gBattleBankFunc[1] = SetControllerToOpponent;
         gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-        gNoOfAllBanks = 2;
+        gBattleBanksCount = 2;
 
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         {
@@ -216,7 +216,7 @@ static void SetControllersVariables(void)
                     gBattleBankFunc[1] = SetControllerToRecordedOpponent;
                     gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-                    gNoOfAllBanks = 2;
+                    gBattleBanksCount = 2;
                 }
                 else // see how the banks are switched
                 {
@@ -226,7 +226,7 @@ static void SetControllersVariables(void)
                     gBattleBankFunc[0] = SetControllerToRecordedOpponent;
                     gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
 
-                    gNoOfAllBanks = 2;
+                    gBattleBanksCount = 2;
                 }
             }
             else
@@ -255,7 +255,7 @@ static void SetControllersVariables(void)
         gBattleBankFunc[3] = SetControllerToOpponent;
         gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-        gNoOfAllBanks = 4;
+        gBattleBanksCount = 4;
 
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         {
@@ -275,7 +275,7 @@ static void SetControllersVariables(void)
                 gBattleBankFunc[3] = SetControllerToOpponent;
                 gBankPositions[3] = 3;
 
-                gNoOfAllBanks = 4;
+                gBattleBanksCount = 4;
 
                 sub_81B8D64(0, 0);
                 sub_81B8D64(1, 0);
@@ -430,7 +430,7 @@ static void SetControllersVariablesInLinkBattle(void)
             gBattleBankFunc[1] = SetControllerToLinkOpponent;
             gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gNoOfAllBanks = 2;
+            gBattleBanksCount = 2;
         }
         else
         {
@@ -440,7 +440,7 @@ static void SetControllersVariablesInLinkBattle(void)
             gBattleBankFunc[0] = SetControllerToLinkOpponent;
             gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
 
-            gNoOfAllBanks = 2;
+            gBattleBanksCount = 2;
         }
     }
     else if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -461,7 +461,7 @@ static void SetControllersVariablesInLinkBattle(void)
             gBattleBankFunc[3] = SetControllerToLinkOpponent;
             gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-            gNoOfAllBanks = 4;
+            gBattleBanksCount = 4;
         }
         else
         {
@@ -477,7 +477,7 @@ static void SetControllersVariablesInLinkBattle(void)
             gBattleBankFunc[2] = SetControllerToLinkOpponent;
             gBankPositions[2] = B_POSITION_OPPONENT_RIGHT;
 
-            gNoOfAllBanks = 4;
+            gBattleBanksCount = 4;
         }
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
@@ -498,7 +498,7 @@ static void SetControllersVariablesInLinkBattle(void)
             gBattleBankFunc[3] = SetControllerToOpponent;
             gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-            gNoOfAllBanks = 4;
+            gBattleBanksCount = 4;
         }
         else
         {
@@ -514,7 +514,7 @@ static void SetControllersVariablesInLinkBattle(void)
             gBattleBankFunc[3] = SetControllerToLinkOpponent;
             gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-            gNoOfAllBanks = 4;
+            gBattleBanksCount = 4;
         }
 
         sub_81B8D64(0, 0);
@@ -604,7 +604,7 @@ static void SetControllersVariablesInLinkBattle(void)
             }
         }
 
-        gNoOfAllBanks = 4;
+        gBattleBanksCount = 4;
     }
 }
 
@@ -614,7 +614,7 @@ static void SetBattlePartyIds(void)
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattleBanksCount; i++)
         {
             for (j = 0; j < 6; j++)
             {
@@ -753,7 +753,7 @@ void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data)
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_BUFFER_ID] = bufferId;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BANK] = gActiveBank;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBankAttacker;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBankTarget;
+    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBankDefender;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_LO] = alignedSize;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BANK_FLAGS] = gAbsentBankFlags;
@@ -921,7 +921,7 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
             if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
             {
                 gBankAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 2];
-                gBankTarget = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
+                gBankDefender = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
                 gAbsentBankFlags = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 6];
                 gEffectBank = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 7];
             }
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 5ded24863..d6a52b898 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -25,7 +25,7 @@
 
 extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
 extern u8 gActiveBank;
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern u16 gUnknown_020243FC;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
@@ -262,7 +262,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
     else if (var1 == MOVE_TARGET_SELECTED)
         chosenMoveId |= (BattlePalaceGetTargetRetValue());
     else
-        chosenMoveId |= (GetBankByIdentity((GetBankPosition(gActiveBank) & BIT_SIDE) ^ BIT_SIDE) << 8);
+        chosenMoveId |= (GetBankByPosition((GetBankPosition(gActiveBank) & BIT_SIDE) ^ BIT_SIDE) << 8);
 
     return chosenMoveId;
 }
@@ -299,13 +299,13 @@ static u16 BattlePalaceGetTargetRetValue(void)
 
         if (GetBankSide(gActiveBank) == SIDE_PLAYER)
         {
-            opposing1 = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
-            opposing2 = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+            opposing1 = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+            opposing2 = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
         }
         else
         {
-            opposing1 = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
-            opposing2 = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+            opposing1 = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+            opposing2 = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
         }
 
         if (gBattleMons[opposing1].hp == gBattleMons[opposing2].hp)
@@ -391,15 +391,15 @@ void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status)
     gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive = 1;
     if (!isStatus2)
     {
-        if (status == STATUS_FREEZE)
+        if (status == STATUS1_FREEZE)
             LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_FRZ);
-        else if (status == STATUS_POISON || status & STATUS_TOXIC_POISON)
+        else if (status == STATUS1_POISON || status & STATUS1_TOXIC_POISON)
             LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_PSN);
-        else if (status == STATUS_BURN)
+        else if (status == STATUS1_BURN)
             LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_BRN);
-        else if (status & STATUS_SLEEP)
+        else if (status & STATUS1_SLEEP)
             LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_SLP);
-        else if (status == STATUS_PARALYSIS)
+        else if (status == STATUS1_PARALYSIS)
             LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_PRZ);
         else // no animation
             gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive = 0;
@@ -807,7 +807,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
             gHealthBoxesIds[*bank] = CreateBankHealthboxSprites(*bank);
 
         (*bank)++;
-        if (*bank == gNoOfAllBanks)
+        if (*bank == gBattleBanksCount)
         {
             *bank = 0;
             (*state1)++;
@@ -821,7 +821,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
             DummyBattleInterfaceFunc(gHealthBoxesIds[*bank], TRUE);
 
         (*bank)++;
-        if (*bank == gNoOfAllBanks)
+        if (*bank == gBattleBanksCount)
         {
             *bank = 0;
             (*state1)++;
@@ -839,7 +839,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
         }
         SetHealthboxSpriteInvisible(gHealthBoxesIds[*bank]);
         (*bank)++;
-        if (*bank == gNoOfAllBanks)
+        if (*bank == gBattleBanksCount)
         {
             *bank = 0;
             (*state1)++;
@@ -871,7 +871,7 @@ void CopyAllBattleSpritesInvisibilities(void)
 {
     s32 i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
         gBattleSpritesDataPtr->bankData[i].invisible = gSprites[gBankSpriteIds[i]].invisible;
 }
 
@@ -1080,7 +1080,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank)
 
 void BattleStopLowHpSound(void)
 {
-    u8 playerBank = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+    u8 playerBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
 
     gBattleSpritesDataPtr->bankData[playerBank].lowHpSong = 0;
     if (IsDoubleBattle())
@@ -1101,8 +1101,8 @@ void sub_805EAE8(void)
 {
     if (gMain.inBattle)
     {
-        u8 playerBank1 = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
-        u8 playerBank2 = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+        u8 playerBank1 = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+        u8 playerBank2 = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
         u8 bank1PartyId = pokemon_order_func(gBattlePartyID[playerBank1]);
         u8 bank2PartyId = pokemon_order_func(gBattlePartyID[playerBank2]);
 
@@ -1117,7 +1117,7 @@ void sub_805EB9C(u8 affineMode)
 {
     s32 i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (IsBankSpritePresent(i))
         {
@@ -1143,13 +1143,13 @@ void LoadAndCreateEnemyShadowSprites(void)
 
     LoadCompressedObjectPic(&gSpriteSheet_EnemyShadow);
 
-    bank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+    bank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
     gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankCoord(bank, 0), GetBankCoord(bank, 1) + 29, 0xC8);
     gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
 
     if (IsDoubleBattle())
     {
-        bank = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+        bank = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
         gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankCoord(bank, 0), GetBankCoord(bank, 1) + 29, 0xC8);
         gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
     }
@@ -1286,7 +1286,7 @@ bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon)
     s16 hp, maxHP;
     s32 barLevel;
 
-    if (GetMonData(mon, MON_DATA_STATUS) & (STATUS_ANY | STATUS_TOXIC_COUNTER))
+    if (GetMonData(mon, MON_DATA_STATUS) & (STATUS1_ANY | STATUS1_TOXIC_COUNTER))
         return FALSE;
 
     hp = GetMonData(mon, MON_DATA_HP);
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 05f500860..da44d3a02 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -154,7 +154,7 @@ enum
 
 extern u8 gBankPositions[BATTLE_BANKS_COUNT];
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
 
 extern const u8 * const gNatureNamePointers[];
@@ -1086,7 +1086,7 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority)
 {
     s32 i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         u8 healthboxSpriteId_1 = gHealthBoxesIds[i];
         u8 healthboxSpriteId_2 = gSprites[gHealthBoxesIds[i]].oam.affineParam;
@@ -1414,7 +1414,7 @@ void SwapHpBarsWithHpText(void)
     s32 i;
     u8 spriteId;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (gSprites[gHealthBoxesIds[i]].callback == SpriteCallbackDummy
          && GetBankSide(i) != SIDE_OPPONENT
@@ -2029,27 +2029,27 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
         tileNumAdder = 0x11;
     }
 
-    if (status & STATUS_SLEEP)
+    if (status & STATUS1_SLEEP)
     {
         statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_SLP_BANK0, bank));
         statusPalId = PAL_STATUS_SLP;
     }
-    else if (status & STATUS_PSN_ANY)
+    else if (status & STATUS1_PSN_ANY)
     {
         statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_PSN_BANK0, bank));
         statusPalId = PAL_STATUS_PSN;
     }
-    else if (status & STATUS_BURN)
+    else if (status & STATUS1_BURN)
     {
         statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_BRN_BANK0, bank));
         statusPalId = PAL_STATUS_BRN;
     }
-    else if (status & STATUS_FREEZE)
+    else if (status & STATUS1_FREEZE)
     {
         statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_FRZ_BANK0, bank));
         statusPalId = PAL_STATUS_FRZ;
     }
-    else if (status & STATUS_PARALYSIS)
+    else if (status & STATUS1_PARALYSIS)
     {
         statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBankId(HEALTHBOX_GFX_STATUS_PRZ_BANK0, bank));
         statusPalId = PAL_STATUS_PAR;
diff --git a/src/battle_message.c b/src/battle_message.c
index 80aa5e3f9..a08378058 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -18,7 +18,7 @@ extern u16 gLastUsedItem;
 extern u8 gLastUsedAbility;
 extern u8 gActiveBank;
 extern u8 gBankAttacker;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gStringBank;
 extern u8 gEffectBank;
 extern u8 gAbilitiesPerBank[BATTLE_BANKS_COUNT];
@@ -1631,13 +1631,13 @@ void BufferStringBattle(u16 stringID)
         stringPtr = gText_AttackerUsedX;
         break;
     case STRINGID_BATTLEEND: // battle end
-        if (gBattleTextBuff1[0] & OUTCOME_LINK_BATTLE_RUN)
+        if (gBattleTextBuff1[0] & B_OUTCOME_LINK_BATTLE_RAN)
         {
-            gBattleTextBuff1[0] &= ~(OUTCOME_LINK_BATTLE_RUN);
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT && gBattleTextBuff1[0] != BATTLE_DREW)
-                gBattleTextBuff1[0] ^= (BATTLE_LOST | BATTLE_WON);
+            gBattleTextBuff1[0] &= ~(B_OUTCOME_LINK_BATTLE_RAN);
+            if (GetBankSide(gActiveBank) == SIDE_OPPONENT && gBattleTextBuff1[0] != B_OUTCOME_DREW)
+                gBattleTextBuff1[0] ^= (B_OUTCOME_LOST | B_OUTCOME_WON);
 
-            if (gBattleTextBuff1[0] == BATTLE_LOST || gBattleTextBuff1[0] == BATTLE_DREW)
+            if (gBattleTextBuff1[0] == B_OUTCOME_LOST || gBattleTextBuff1[0] == B_OUTCOME_DREW)
                 stringPtr = gText_GotAwaySafely;
             else if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
                 stringPtr = gText_TwoWildFled;
@@ -1646,23 +1646,23 @@ void BufferStringBattle(u16 stringID)
         }
         else
         {
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT && gBattleTextBuff1[0] != BATTLE_DREW)
-                gBattleTextBuff1[0] ^= (BATTLE_LOST | BATTLE_WON);
+            if (GetBankSide(gActiveBank) == SIDE_OPPONENT && gBattleTextBuff1[0] != B_OUTCOME_DREW)
+                gBattleTextBuff1[0] ^= (B_OUTCOME_LOST | B_OUTCOME_WON);
 
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             {
                 switch (gBattleTextBuff1[0])
                 {
-                case BATTLE_WON:
+                case B_OUTCOME_WON:
                     if (gBattleTypeFlags & BATTLE_TYPE_x800000)
                         stringPtr = gText_TwoInGameTrainersDefeated;
                     else
                         stringPtr = gText_TwoLinkTrainersDefeated;
                     break;
-                case BATTLE_LOST:
+                case B_OUTCOME_LOST:
                     stringPtr = gText_PlayerLostToTwo;
                     break;
-                case BATTLE_DREW:
+                case B_OUTCOME_DREW:
                     stringPtr = gText_PlayerBattledToDrawVsTwo;
                     break;
                 }
@@ -1671,13 +1671,13 @@ void BufferStringBattle(u16 stringID)
             {
                 switch (gBattleTextBuff1[0])
                 {
-                case BATTLE_WON:
+                case B_OUTCOME_WON:
                     stringPtr = gText_PlayerDefeatedLinkTrainerTrainer1;
                     break;
-                case BATTLE_LOST:
+                case B_OUTCOME_LOST:
                     stringPtr = gText_PlayerLostAgainstTrainer1;
                     break;
-                case BATTLE_DREW:
+                case B_OUTCOME_DREW:
                     stringPtr = gText_PlayerBattledToDrawTrainer1;
                     break;
                 }
@@ -1686,13 +1686,13 @@ void BufferStringBattle(u16 stringID)
             {
                 switch (gBattleTextBuff1[0])
                 {
-                case BATTLE_WON:
+                case B_OUTCOME_WON:
                     stringPtr = gText_PlayerDefeatedLinkTrainer;
                     break;
-                case BATTLE_LOST:
+                case B_OUTCOME_LOST:
                     stringPtr = gText_PlayerLostAgainstLinkTrainer;
                     break;
-                case BATTLE_DREW:
+                case B_OUTCOME_DREW:
                     stringPtr = gText_PlayerBattledToDrawLinkTrainer;
                     break;
                 }
@@ -1834,25 +1834,25 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gStringVar3;
                 break;
             case B_TXT_PLAYER_MON1_NAME: // first player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(B_POSITION_PLAYER_LEFT)]],
+                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPosition(B_POSITION_PLAYER_LEFT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_OPPONENT_MON1_NAME: // first enemy poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(B_POSITION_OPPONENT_LEFT)]],
+                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPosition(B_POSITION_OPPONENT_LEFT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_PLAYER_MON2_NAME: // second player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(B_POSITION_PLAYER_RIGHT)]],
+                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPosition(B_POSITION_PLAYER_RIGHT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_OPPONENT_MON2_NAME: // second enemy poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(B_POSITION_OPPONENT_RIGHT)]],
+                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPosition(B_POSITION_OPPONENT_RIGHT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
@@ -1883,13 +1883,13 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 break;
             case B_TXT_ATK_NAME_WITH_PREFIX_MON1: // attacker name with prefix, only bank 0/1
                 HANDLE_NICKNAME_STRING_CASE(gBankAttacker,
-                                            gBattlePartyID[GetBankByIdentity(GET_BANK_SIDE(gBankAttacker))])
+                                            gBattlePartyID[GetBankByPosition(GET_BANK_SIDE(gBankAttacker))])
                 break;
             case B_TXT_ATK_PARTNER_NAME: // attacker partner name
                 if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-                    GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(GET_BANK_SIDE(gBankAttacker)) + 2]], MON_DATA_NICKNAME, text);
+                    GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPosition(GET_BANK_SIDE(gBankAttacker)) + 2]], MON_DATA_NICKNAME, text);
                 else
-                    GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(GET_BANK_SIDE(gBankAttacker)) + 2]], MON_DATA_NICKNAME, text);
+                    GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPosition(GET_BANK_SIDE(gBankAttacker)) + 2]], MON_DATA_NICKNAME, text);
 
                 StringGetEnd10(text);
                 toCpy = text;
@@ -1898,7 +1898,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 HANDLE_NICKNAME_STRING_CASE(gBankAttacker, gBattlePartyID[gBankAttacker])
                 break;
             case B_TXT_DEF_NAME_WITH_PREFIX: // target name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gBankTarget, gBattlePartyID[gBankTarget])
+                HANDLE_NICKNAME_STRING_CASE(gBankDefender, gBattlePartyID[gBankDefender])
                 break;
             case B_TXT_EFF_NAME_WITH_PREFIX: // effect bank name with prefix
                 HANDLE_NICKNAME_STRING_CASE(gEffectBank, gBattlePartyID[gEffectBank])
@@ -1971,7 +1971,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gAbilityNames[gAbilitiesPerBank[gBankAttacker]];
                 break;
             case B_TXT_DEF_ABILITY: // target ability
-                toCpy = gAbilityNames[gAbilitiesPerBank[gBankTarget]];
+                toCpy = gAbilityNames[gAbilitiesPerBank[gBankDefender]];
                 break;
             case B_TXT_SCR_ACTIVE_ABILITY: // scripting active ability
                 toCpy = gAbilityNames[gAbilitiesPerBank[gBattleScripting.bank]];
@@ -2098,7 +2098,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                     toCpy = gText_FoePkmnPrefix3;
                 break;
             case B_TXT_DEF_PREFIX2:
-                if (GetBankSide(gBankTarget) == SIDE_PLAYER)
+                if (GetBankSide(gBankDefender) == SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix2;
                 else
                     toCpy = gText_FoePkmnPrefix3;
@@ -2110,7 +2110,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                     toCpy = gText_FoePkmnPrefix2;
                 break;
             case B_TXT_DEF_PREFIX1:
-                if (GetBankSide(gBankTarget) == SIDE_PLAYER)
+                if (GetBankSide(gBankDefender) == SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix;
                 else
                     toCpy = gText_FoePkmnPrefix2;
@@ -2122,7 +2122,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                     toCpy = gText_FoePkmnPrefix4;
                 break;
             case B_TXT_DEF_PREFIX3:
-                if (GetBankSide(gBankTarget) == SIDE_PLAYER)
+                if (GetBankSide(gBankDefender) == SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix3;
                 else
                     toCpy = gText_FoePkmnPrefix4;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 18c094571..be20305fa 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -44,37 +44,30 @@
 
 extern u8 gCritMultiplier;
 extern s32 gBattleMoveDamage;
-extern u32 gStatuses3[BATTLE_BANKS_COUNT];
-extern u32 gBattleTypeFlags;
 extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u8 gActiveBank;
 extern u32 gBattleExecBuffer;
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
 extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
 extern u16 gCurrentMove;
 extern u8 gLastUsedAbility;
-extern u16 gBattleWeather;
 extern u8 gStringBank;
 extern u8 gEffectBank;
 extern u8 gAbsentBankFlags;
 extern u8 gMultiHitCounter;
 extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
-extern u16 gSideAffecting[2];
 extern u16 gPauseCounterBattle;
 extern u16 gPaydayMoney;
 extern u16 gRandomTurnNumber;
-extern u8 gBattleOutcome;
-extern u8 gBattleTerrain;
 extern u8 gBankAttacker;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern const u8* gBattlescriptCurrInstr;
 extern u8 gCurrMovePos;
 extern u8 gCurrentActionFuncId;
-extern u32 gHitMarker;
-extern u8 gBattleMoveFlags;
+extern u8 gMoveResultFlags;
 extern u8 gBattleCommunication[];
 extern u16 gLastLandedMoves[4];
 extern u16 gLastHitByType[4];
@@ -162,9 +155,10 @@ extern const u8 gText_BattleYesNoChoice[];
 #define BS2ScriptRead16(ptr) ((ptr)[0] + ((ptr)[1] << 8))
 #define BS2ScriptReadPtr(ptr) ((void *)BS2ScriptRead32(ptr))
 
-#define TARGET_PROTECT_AFFECTED ((gProtectStructs[gBankTarget].protected && gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
+#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBankDefender].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
 
-#define TARGET_TURN_DAMAGED (((gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special)))
+#define TARGET_TURN_DAMAGED (gSpecialStatuses[gBankDefender].moveturnLostHP_physical != 0 \
+                          || gSpecialStatuses[gBankDefender].moveturnLostHP_special != 0)
 
 // this file's functions
 static bool8 IsTwoTurnsMove(u16 move);
@@ -715,12 +709,12 @@ static const u16 sCriticalHitChance[] = {16, 8, 4, 3, 2};
 static const u32 sStatusFlagsForMoveEffects[] =
 {
     0x00000000,
-    STATUS_SLEEP,
-    STATUS_POISON,
-    STATUS_BURN,
-    STATUS_FREEZE,
-    STATUS_PARALYSIS,
-    STATUS_TOXIC_POISON,
+    STATUS1_SLEEP,
+    STATUS1_POISON,
+    STATUS1_BURN,
+    STATUS1_FREEZE,
+    STATUS1_PARALYSIS,
+    STATUS1_TOXIC_POISON,
     STATUS2_CONFUSION,
     STATUS2_FLINCHED,
     0x00000000,
@@ -1041,13 +1035,13 @@ static void atk00_attackcanceler(void)
     }
     if (AtkCanceller_UnableToUseMove())
         return;
-    if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBankTarget, 0, 0, 0))
+    if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBankDefender, 0, 0, 0))
         return;
     if (!gBattleMons[gBankAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200)
      && !(gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
         gBattlescriptCurrInstr = BattleScript_NoPPForMove;
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         return;
     }
 
@@ -1064,23 +1058,23 @@ static void atk00_attackcanceler(void)
             gHitMarker |= HITMARKER_OBEYS;
             return;
         default:
-            gBattleMoveFlags |= MOVESTATUS_MISSED;
+            gMoveResultFlags |= MOVE_RESULT_MISSED;
             return;
         }
     }
 
     gHitMarker |= HITMARKER_OBEYS;
 
-    if (gProtectStructs[gBankTarget].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED)
+    if (gProtectStructs[gBankDefender].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED)
     {
-        PressurePPLose(gBankAttacker, gBankTarget, MOVE_MAGIC_COAT);
-        gProtectStructs[gBankTarget].bounceMove = 0;
+        PressurePPLose(gBankAttacker, gBankDefender, MOVE_MAGIC_COAT);
+        gProtectStructs[gBankDefender].bounceMove = 0;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_MagicCoatBounce;
         return;
     }
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
         {
@@ -1093,22 +1087,22 @@ static void atk00_attackcanceler(void)
         }
     }
 
-    if (gSpecialStatuses[gBankTarget].lightningRodRedirected)
+    if (gSpecialStatuses[gBankDefender].lightningRodRedirected)
     {
-        gSpecialStatuses[gBankTarget].lightningRodRedirected = 0;
+        gSpecialStatuses[gBankDefender].lightningRodRedirected = 0;
         gLastUsedAbility = ABILITY_LIGHTNING_ROD;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_TookAttack;
-        RecordAbilityBattle(gBankTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
     }
-    else if (TARGET_PROTECT_AFFECTED
+    else if (DEFENDER_IS_PROTECTED
      && (gCurrentMove != MOVE_CURSE || (gBattleMons[gBankAttacker].type1 == TYPE_GHOST || gBattleMons[gBankAttacker].type2 == TYPE_GHOST))
      && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS))))
     {
         CancelMultiTurnMoves(gBankAttacker);
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
-        gLastLandedMoves[gBankTarget] = 0;
-        gLastHitByType[gBankTarget] = 0;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
+        gLastLandedMoves[gBankDefender] = 0;
+        gLastHitByType[gBankDefender] = 0;
         gBattleCommunication[6] = 1;
         gBattlescriptCurrInstr++;
     }
@@ -1121,16 +1115,16 @@ static void atk00_attackcanceler(void)
 static void JumpIfMoveFailed(u8 adder, u16 move)
 {
     const u8 *BS_ptr = gBattlescriptCurrInstr + adder;
-    if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
-        gLastLandedMoves[gBankTarget] = 0;
-        gLastHitByType[gBankTarget] = 0;
+        gLastLandedMoves[gBankDefender] = 0;
+        gLastHitByType[gBankDefender] = 0;
         BS_ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
         TrySetDestinyBondToHappen();
-        if (AbilityBattleEffects(ABILITYEFFECT_ABSORBING, gBankTarget, 0, 0, move))
+        if (AbilityBattleEffects(ABILITYEFFECT_ABSORBING, gBankDefender, 0, 0, move))
             return;
     }
     gBattlescriptCurrInstr = BS_ptr;
@@ -1138,9 +1132,9 @@ static void JumpIfMoveFailed(u8 adder, u16 move)
 
 static void atk40_jumpifaffectedbyprotect(void)
 {
-    if (TARGET_PROTECT_AFFECTED)
+    if (DEFENDER_IS_PROTECTED)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(5, 0);
         gBattleCommunication[6] = 1;
     }
@@ -1153,9 +1147,9 @@ static void atk40_jumpifaffectedbyprotect(void)
 bool8 JumpIfMoveAffectedByProtect(u16 move)
 {
     bool8 affected = FALSE;
-    if (TARGET_PROTECT_AFFECTED)
+    if (DEFENDER_IS_PROTECTED)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
         gBattleCommunication[6] = 1;
         affected = TRUE;
@@ -1165,33 +1159,33 @@ bool8 JumpIfMoveAffectedByProtect(u16 move)
 
 static bool8 AccuracyCalcHelper(u16 move)
 {
-    if (gStatuses3[gBankTarget] & STATUS3_ALWAYS_HITS && gDisableStructs[gBankTarget].bankWithSureHit == gBankAttacker)
+    if (gStatuses3[gBankDefender] & STATUS3_ALWAYS_HITS && gDisableStructs[gBankDefender].bankWithSureHit == gBankAttacker)
     {
         JumpIfMoveFailed(7, move);
         return TRUE;
     }
 
-    if (!(gHitMarker & HITMARKER_IGNORE_ON_AIR) && gStatuses3[gBankTarget] & STATUS3_ON_AIR)
+    if (!(gHitMarker & HITMARKER_IGNORE_ON_AIR) && gStatuses3[gBankDefender] & STATUS3_ON_AIR)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
         return TRUE;
     }
 
     gHitMarker &= ~HITMARKER_IGNORE_ON_AIR;
 
-    if (!(gHitMarker & HITMARKER_IGNORE_UNDERGROUND) && gStatuses3[gBankTarget] & STATUS3_UNDERGROUND)
+    if (!(gHitMarker & HITMARKER_IGNORE_UNDERGROUND) && gStatuses3[gBankDefender] & STATUS3_UNDERGROUND)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
         return TRUE;
     }
 
     gHitMarker &= ~HITMARKER_IGNORE_UNDERGROUND;
 
-    if (!(gHitMarker & HITMARKER_IGNORE_UNDERWATER) && gStatuses3[gBankTarget] & STATUS3_UNDERWATER)
+    if (!(gHitMarker & HITMARKER_IGNORE_UNDERWATER) && gStatuses3[gBankDefender] & STATUS3_UNDERWATER)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
         return TRUE;
     }
@@ -1214,9 +1208,9 @@ static void atk01_accuracycheck(void)
 
     if (move == 0xFFFE || move == 0xFFFF)
     {
-        if (gStatuses3[gBankTarget] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBankTarget].bankWithSureHit == gBankAttacker)
+        if (gStatuses3[gBankDefender] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBankDefender].bankWithSureHit == gBankAttacker)
             gBattlescriptCurrInstr += 7;
-        else if (gStatuses3[gBankTarget] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
+        else if (gStatuses3[gBankDefender] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         else if (!JumpIfMoveAffectedByProtect(0))
             gBattlescriptCurrInstr += 7;
@@ -1237,7 +1231,7 @@ static void atk01_accuracycheck(void)
         if (AccuracyCalcHelper(move))
             return;
 
-        if (gBattleMons[gBankTarget].status2 & STATUS2_FORESIGHT)
+        if (gBattleMons[gBankDefender].status2 & STATUS2_FORESIGHT)
         {
             u8 acc = gBattleMons[gBankAttacker].statStages[STAT_STAGE_ACC];
             buff = acc;
@@ -1245,7 +1239,7 @@ static void atk01_accuracycheck(void)
         else
         {
             u8 acc = gBattleMons[gBankAttacker].statStages[STAT_STAGE_ACC];
-            buff = acc + 6 - gBattleMons[gBankTarget].statStages[STAT_STAGE_EVASION];
+            buff = acc + 6 - gBattleMons[gBankDefender].statStages[STAT_STAGE_EVASION];
         }
 
         if (buff < 0)
@@ -1263,23 +1257,23 @@ static void atk01_accuracycheck(void)
 
         if (gBattleMons[gBankAttacker].ability == ABILITY_COMPOUND_EYES)
             calc = (calc * 130) / 100; // 1.3 compound eyes boost
-        if (WEATHER_HAS_EFFECT && gBattleMons[gBankTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY)
+        if (WEATHER_HAS_EFFECT && gBattleMons[gBankDefender].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY)
             calc = (calc * 80) / 100; // 1.2 sand veil loss
         if (gBattleMons[gBankAttacker].ability == ABILITY_HUSTLE && type < 9)
             calc = (calc * 80) / 100; // 1.2 hustle loss
 
-        if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY)
+        if (gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY)
         {
-            holdEffect = gEnigmaBerries[gBankTarget].holdEffect;
-            quality = gEnigmaBerries[gBankTarget].holdEffectParam;
+            holdEffect = gEnigmaBerries[gBankDefender].holdEffect;
+            quality = gEnigmaBerries[gBankDefender].holdEffectParam;
         }
         else
         {
-            holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item);
-            quality = ItemId_GetHoldEffectParam(gBattleMons[gBankTarget].item);
+            holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankDefender].item);
+            quality = ItemId_GetHoldEffectParam(gBattleMons[gBankDefender].item);
         }
 
-        gStringBank = gBankTarget;
+        gStringBank = gBankDefender;
 
         if (holdEffect == HOLD_EFFECT_EVASION_UP)
             calc = (calc * (100 - quality)) / 100;
@@ -1287,7 +1281,7 @@ static void atk01_accuracycheck(void)
         // final calculation
         if ((Random() % 100 + 1) > calc)
         {
-            gBattleMoveFlags |= MOVESTATUS_MISSED;
+            gMoveResultFlags |= MOVE_RESULT_MISSED;
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE &&
                 (gBattleMoves[move].target == MOVE_TARGET_BOTH || gBattleMoves[move].target == MOVE_TARGET_FOES_AND_ALLY))
                 gBattleCommunication[6] = 2;
@@ -1332,7 +1326,7 @@ static void atk03_ppreduce(void)
             ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBankAttacker, ABILITY_PRESSURE, 0, 0);
             break;
         default:
-            if (gBankAttacker != gBankTarget && gBattleMons[gBankTarget].ability == ABILITY_PRESSURE)
+            if (gBankAttacker != gBankDefender && gBattleMons[gBankDefender].ability == ABILITY_PRESSURE)
                 ppToDeduct++;
             break;
         }
@@ -1386,7 +1380,7 @@ static void atk04_critcalc(void)
     if (critChance > 4)
         critChance = 4;
 
-    if ((gBattleMons[gBankTarget].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBankTarget].ability != ABILITY_SHELL_ARMOR)
+    if ((gBattleMons[gBankDefender].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBankDefender].ability != ABILITY_SHELL_ARMOR)
      && !(gStatuses3[gBankAttacker] & STATUS3_CANT_SCORE_A_CRIT)
      && !(gBattleTypeFlags & (BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_FIRST_BATTLE))
      && !(Random() % sCriticalHitChance[critChance]))
@@ -1399,10 +1393,10 @@ static void atk04_critcalc(void)
 
 static void atk05_damagecalc(void)
 {
-    u16 sideStatus = gSideAffecting[GET_BANK_SIDE(gBankTarget)];
-    gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankTarget], gCurrentMove,
+    u16 sideStatus = gSideStatuses[GET_BANK_SIDE(gBankDefender)];
+    gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankDefender], gCurrentMove,
                                             sideStatus, gDynamicBasePower,
-                                            gBattleStruct->dynamicMoveType, gBankAttacker, gBankTarget);
+                                            gBattleStruct->dynamicMoveType, gBankAttacker, gBankDefender);
     gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleScripting.dmgMultiplier;
 
     if (gStatuses3[gBankAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
@@ -1415,7 +1409,7 @@ static void atk05_damagecalc(void)
 
 void AI_CalcDmg(u8 bankAtk, u8 bankDef)
 {
-    u16 sideStatus = gSideAffecting[GET_BANK_SIDE(bankDef)];
+    u16 sideStatus = gSideStatuses[GET_BANK_SIDE(bankDef)];
     gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[bankAtk], &gBattleMons[bankDef], gCurrentMove,
                                             sideStatus, gDynamicBasePower,
                                             gBattleStruct->dynamicMoveType, bankAtk, bankDef);
@@ -1437,26 +1431,26 @@ static void ModulateDmgByType(u8 multiplier)
     switch (multiplier)
     {
     case TYPE_MUL_NO_EFFECT:
-        gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
-        gBattleMoveFlags &= ~MOVESTATUS_NOTVERYEFFECTIVE;
-        gBattleMoveFlags &= ~MOVESTATUS_SUPEREFFECTIVE;
+        gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
+        gMoveResultFlags &= ~MOVE_RESULT_NOT_VERY_EFFECTIVE;
+        gMoveResultFlags &= ~MOVE_RESULT_SUPER_EFFECTIVE;
         break;
     case TYPE_MUL_NOT_EFFECTIVE:
-        if (gBattleMoves[gCurrentMove].power && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
+        if (gBattleMoves[gCurrentMove].power && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
         {
-            if (gBattleMoveFlags & MOVESTATUS_SUPEREFFECTIVE)
-                gBattleMoveFlags &= ~MOVESTATUS_SUPEREFFECTIVE;
+            if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE)
+                gMoveResultFlags &= ~MOVE_RESULT_SUPER_EFFECTIVE;
             else
-                gBattleMoveFlags |= MOVESTATUS_NOTVERYEFFECTIVE;
+                gMoveResultFlags |= MOVE_RESULT_NOT_VERY_EFFECTIVE;
         }
         break;
     case TYPE_MUL_SUPER_EFFECTIVE:
-        if (gBattleMoves[gCurrentMove].power && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
+        if (gBattleMoves[gCurrentMove].power && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
         {
-            if (gBattleMoveFlags & MOVESTATUS_NOTVERYEFFECTIVE)
-                gBattleMoveFlags &= ~MOVESTATUS_NOTVERYEFFECTIVE;
+            if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE)
+                gMoveResultFlags &= ~MOVE_RESULT_NOT_VERY_EFFECTIVE;
             else
-                gBattleMoveFlags |= MOVESTATUS_SUPEREFFECTIVE;
+                gMoveResultFlags |= MOVE_RESULT_SUPER_EFFECTIVE;
         }
         break;
     }
@@ -1482,14 +1476,14 @@ static void atk06_typecalc(void)
         gBattleMoveDamage = gBattleMoveDamage / 10;
     }
 
-    if (gBattleMons[gBankTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBankDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
-        gLastUsedAbility = gBattleMons[gBankTarget].ability;
-        gBattleMoveFlags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED);
-        gLastLandedMoves[gBankTarget] = 0;
-        gLastHitByType[gBankTarget] = 0;
+        gLastUsedAbility = gBattleMons[gBankDefender].ability;
+        gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
+        gLastLandedMoves[gBankDefender] = 0;
+        gLastHitByType[gBankDefender] = 0;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBankTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
     }
     else
     {
@@ -1497,7 +1491,7 @@ static void atk06_typecalc(void)
         {
             if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
-                if (gBattleMons[gBankTarget].status2 & STATUS2_FORESIGHT)
+                if (gBattleMons[gBankDefender].status2 & STATUS2_FORESIGHT)
                     break;
                 i += 3;
                 continue;
@@ -1505,29 +1499,29 @@ static void atk06_typecalc(void)
             else if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type1)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type1)
                     ModulateDmgByType(TYPE_EFFECT_MULTIPLIER(i));
                 // check type2
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2 &&
-                    gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2 &&
+                    gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2)
                     ModulateDmgByType(TYPE_EFFECT_MULTIPLIER(i));
             }
             i += 3;
         }
     }
 
-    if (gBattleMons[gBankTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBankAttacker, gCurrentMove) == 2
-     && (!(gBattleMoveFlags & MOVESTATUS_SUPEREFFECTIVE) || ((gBattleMoveFlags & (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)) == (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)))
+    if (gBattleMons[gBankDefender].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBankAttacker, gCurrentMove) == 2
+     && (!(gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) || ((gMoveResultFlags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
      && gBattleMoves[gCurrentMove].power)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
-        gLastLandedMoves[gBankTarget] = 0;
-        gLastHitByType[gBankTarget] = 0;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
+        gLastLandedMoves[gBankDefender] = 0;
+        gLastHitByType[gBankDefender] = 0;
         gBattleCommunication[6] = 3;
-        RecordAbilityBattle(gBankTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
     }
-    if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
+    if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
         gProtectStructs[gBankAttacker].targetNotAffected = 1;
 
     gBattlescriptCurrInstr++;
@@ -1544,11 +1538,11 @@ static void CheckWonderGuardAndLevitate(void)
 
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
-    if (gBattleMons[gBankTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBankDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
         gLastUsedAbility = ABILITY_LEVITATE;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBankTarget, ABILITY_LEVITATE);
+        RecordAbilityBattle(gBankDefender, ABILITY_LEVITATE);
         return;
     }
 
@@ -1556,7 +1550,7 @@ static void CheckWonderGuardAndLevitate(void)
     {
         if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
         {
-            if (gBattleMons[gBankTarget].status2 & STATUS2_FORESIGHT)
+            if (gBattleMons[gBankDefender].status2 & STATUS2_FORESIGHT)
                 break;
             i += 3;
             continue;
@@ -1564,46 +1558,46 @@ static void CheckWonderGuardAndLevitate(void)
         if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
         {
             // check no effect
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type1
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type1
                 && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
             {
-                gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
+                gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
                 gProtectStructs[gBankAttacker].targetNotAffected = 1;
             }
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2 &&
-                gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2 &&
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2 &&
+                gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2 &&
                 TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
             {
-                gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
+                gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
                 gProtectStructs[gBankAttacker].targetNotAffected = 1;
             }
 
             // check super effective
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 20)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type1 && TYPE_EFFECT_MULTIPLIER(i) == 20)
                 flags |= 1;
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2
-             && gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2
+             && gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2
              && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                 flags |= 1;
 
             // check not very effective
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 5)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type1 && TYPE_EFFECT_MULTIPLIER(i) == 5)
                 flags |= 2;
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2
-             && gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2
+             && gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2
              && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                 flags |= 2;
         }
         i += 3;
     }
 
-    if (gBattleMons[gBankTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBankAttacker, gCurrentMove) == 2)
+    if (gBattleMons[gBankDefender].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBankAttacker, gCurrentMove) == 2)
     {
         if (((flags & 2) || !(flags & 1)) && gBattleMoves[gCurrentMove].power)
         {
             gLastUsedAbility = ABILITY_WONDER_GUARD;
             gBattleCommunication[6] = 3;
-            RecordAbilityBattle(gBankTarget, ABILITY_WONDER_GUARD);
+            RecordAbilityBattle(gBankDefender, ABILITY_WONDER_GUARD);
         }
     }
 }
@@ -1617,26 +1611,26 @@ static void ModulateDmgByType2(u8 multiplier, u16 move, u8* flags) // same as Mo
     switch (multiplier)
     {
     case TYPE_MUL_NO_EFFECT:
-        *flags |= MOVESTATUS_NOTAFFECTED;
-        *flags &= ~MOVESTATUS_NOTVERYEFFECTIVE;
-        *flags &= ~MOVESTATUS_SUPEREFFECTIVE;
+        *flags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
+        *flags &= ~MOVE_RESULT_NOT_VERY_EFFECTIVE;
+        *flags &= ~MOVE_RESULT_SUPER_EFFECTIVE;
         break;
     case TYPE_MUL_NOT_EFFECTIVE:
-        if (gBattleMoves[move].power && !(*flags & MOVESTATUS_NOEFFECT))
+        if (gBattleMoves[move].power && !(*flags & MOVE_RESULT_NO_EFFECT))
         {
-            if (*flags & MOVESTATUS_SUPEREFFECTIVE)
-                *flags &= ~MOVESTATUS_SUPEREFFECTIVE;
+            if (*flags & MOVE_RESULT_SUPER_EFFECTIVE)
+                *flags &= ~MOVE_RESULT_SUPER_EFFECTIVE;
             else
-                *flags |= MOVESTATUS_NOTVERYEFFECTIVE;
+                *flags |= MOVE_RESULT_NOT_VERY_EFFECTIVE;
         }
         break;
     case TYPE_MUL_SUPER_EFFECTIVE:
-        if (gBattleMoves[move].power && !(*flags & MOVESTATUS_NOEFFECT))
+        if (gBattleMoves[move].power && !(*flags & MOVE_RESULT_NO_EFFECT))
         {
-            if (*flags & MOVESTATUS_NOTVERYEFFECTIVE)
-                *flags &= ~MOVESTATUS_NOTVERYEFFECTIVE;
+            if (*flags & MOVE_RESULT_NOT_VERY_EFFECTIVE)
+                *flags &= ~MOVE_RESULT_NOT_VERY_EFFECTIVE;
             else
-                *flags |= MOVESTATUS_SUPEREFFECTIVE;
+                *flags |= MOVE_RESULT_SUPER_EFFECTIVE;
         }
         break;
     }
@@ -1662,7 +1656,7 @@ u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef)
 
     if (gBattleMons[bankDef].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
-        flags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED);
+        flags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
     }
     else
     {
@@ -1690,12 +1684,12 @@ u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef)
         }
     }
 
-    if (gBattleMons[bankDef].ability == ABILITY_WONDER_GUARD && !(flags & MOVESTATUS_MISSED)
+    if (gBattleMons[bankDef].ability == ABILITY_WONDER_GUARD && !(flags & MOVE_RESULT_MISSED)
         && AttacksThisTurn(bankAtk, move) == 2
-        && (!(flags & MOVESTATUS_SUPEREFFECTIVE) || ((flags & (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)) == (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)))
+        && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
         && gBattleMoves[move].power)
     {
-        flags |= MOVESTATUS_MISSED;
+        flags |= MOVE_RESULT_MISSED;
     }
     return flags;
 }
@@ -1714,7 +1708,7 @@ u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility)
 
     if (targetAbility == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
-        flags = MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED;
+        flags = MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE;
     }
     else
     {
@@ -1738,9 +1732,9 @@ u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility)
         }
     }
     if (targetAbility == ABILITY_WONDER_GUARD
-     && (!(flags & MOVESTATUS_SUPEREFFECTIVE) || ((flags & (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)) == (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)))
+     && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
      && gBattleMoves[move].power)
-        flags |= MOVESTATUS_NOTAFFECTED;
+        flags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
     return flags;
 }
 
@@ -1770,42 +1764,42 @@ static void atk07_adjustnormaldamage(void)
 
     ApplyRandomDmgMultiplier();
 
-    if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBankTarget].holdEffect, quality = gEnigmaBerries[gBankTarget].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBankDefender].holdEffect, quality = gEnigmaBerries[gBankDefender].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBankTarget].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankDefender].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBankDefender].item);
     }
 
-    gStringBank = gBankTarget;
+    gStringBank = gBankDefender;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBankTarget, holdEffect);
-        gSpecialStatuses[gBankTarget].focusBanded = 1;
+        RecordItemEffectBattle(gBankDefender, holdEffect);
+        gSpecialStatuses[gBankDefender].focusBanded = 1;
     }
-    if (gBattleMons[gBankTarget].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBankDefender].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBankTarget].endured
-     && !gSpecialStatuses[gBankTarget].focusBanded)
+    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBankDefender].endured
+     && !gSpecialStatuses[gBankDefender].focusBanded)
         goto END;
 
-    if (gBattleMons[gBankTarget].hp > gBattleMoveDamage)
+    if (gBattleMons[gBankDefender].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBankTarget].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBankDefender].hp - 1;
 
-    if (gProtectStructs[gBankTarget].endured)
+    if (gProtectStructs[gBankDefender].endured)
     {
-        gBattleMoveFlags |= MOVESTATUS_ENDURED;
+        gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBankTarget].focusBanded)
+    else if (gSpecialStatuses[gBankDefender].focusBanded)
     {
-        gBattleMoveFlags |= MOVESTATUS_HUNGON;
-        gLastUsedItem = gBattleMons[gBankTarget].item;
+        gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
+        gLastUsedItem = gBattleMons[gBankDefender].item;
     }
 
     END:
@@ -1818,40 +1812,40 @@ static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't
 
     ApplyRandomDmgMultiplier();
 
-    if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBankTarget].holdEffect, quality = gEnigmaBerries[gBankTarget].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBankDefender].holdEffect, quality = gEnigmaBerries[gBankDefender].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBankTarget].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankDefender].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBankDefender].item);
     }
 
-    gStringBank = gBankTarget;
+    gStringBank = gBankDefender;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBankTarget, holdEffect);
-        gSpecialStatuses[gBankTarget].focusBanded = 1;
+        RecordItemEffectBattle(gBankDefender, holdEffect);
+        gSpecialStatuses[gBankDefender].focusBanded = 1;
     }
-    if (gBattleMons[gBankTarget].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBankDefender].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (!gProtectStructs[gBankTarget].endured && !gSpecialStatuses[gBankTarget].focusBanded)
+    if (!gProtectStructs[gBankDefender].endured && !gSpecialStatuses[gBankDefender].focusBanded)
         goto END;
-    if (gBattleMons[gBankTarget].hp > gBattleMoveDamage)
+    if (gBattleMons[gBankDefender].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBankTarget].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBankDefender].hp - 1;
 
-    if (gProtectStructs[gBankTarget].endured)
+    if (gProtectStructs[gBankDefender].endured)
     {
-        gBattleMoveFlags |= MOVESTATUS_ENDURED;
+        gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBankTarget].focusBanded)
+    else if (gSpecialStatuses[gBankDefender].focusBanded)
     {
-        gBattleMoveFlags |= MOVESTATUS_HUNGON;
-        gLastUsedItem = gBattleMons[gBankTarget].item;
+        gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
+        gLastUsedItem = gBattleMons[gBankDefender].item;
     }
 
     END:
@@ -1880,17 +1874,17 @@ static void atk09_attackanimation(void)
             gBattlescriptCurrInstr++;
             return;
         }
-        if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
+        if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
         {
             u8 multihit;
 
             gActiveBank = gBankAttacker;
 
-            if (gBattleMons[gBankTarget].status2 & STATUS2_SUBSTITUTE)
+            if (gBattleMons[gBankDefender].status2 & STATUS2_SUBSTITUTE)
                 multihit = gMultiHitCounter;
             else if (gMultiHitCounter != 0 && gMultiHitCounter != 1)
             {
-                if (gBattleMons[gBankTarget].hp <= gBattleMoveDamage)
+                if (gBattleMons[gBankDefender].hp <= gBattleMoveDamage)
                     multihit = 1;
                 else
                     multihit = gMultiHitCounter;
@@ -1923,7 +1917,7 @@ static void atk0B_healthbarupdate(void)
     if (gBattleExecBuffer)
         return;
 
-    if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
+    if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
     {
         gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
 
@@ -1968,7 +1962,7 @@ static void atk0C_datahpupdate(void)
     else
         moveType = gBattleMoves[gCurrentMove].type;
 
-    if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
+    if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
     {
         gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
         if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
@@ -2018,7 +2012,7 @@ static void atk0C_datahpupdate(void)
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                         gTakenDmgBanks[gActiveBank] = gBankAttacker;
                     else
-                        gTakenDmgBanks[gActiveBank] = gBankTarget;
+                        gTakenDmgBanks[gActiveBank] = gBankDefender;
                 }
 
                 if (gBattleMons[gActiveBank].hp > gBattleMoveDamage)
@@ -2046,8 +2040,8 @@ static void atk0C_datahpupdate(void)
                     }
                     else
                     {
-                        gProtectStructs[gActiveBank].physicalBank = gBankTarget;
-                        gSpecialStatuses[gActiveBank].moveturnPhysicalBank = gBankTarget;
+                        gProtectStructs[gActiveBank].physicalBank = gBankDefender;
+                        gSpecialStatuses[gActiveBank].moveturnPhysicalBank = gBankDefender;
                     }
                 }
                 else if (moveType > 8 && !(gHitMarker & HITMARKER_x100000))
@@ -2061,8 +2055,8 @@ static void atk0C_datahpupdate(void)
                     }
                     else
                     {
-                        gProtectStructs[gActiveBank].specialBank = gBankTarget;
-                        gSpecialStatuses[gActiveBank].moveturnSpecialBank = gBankTarget;
+                        gProtectStructs[gActiveBank].specialBank = gBankDefender;
+                        gSpecialStatuses[gActiveBank].moveturnSpecialBank = gBankDefender;
                     }
                 }
             }
@@ -2084,7 +2078,7 @@ static void atk0D_critmessage(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        if (gCritMultiplier == 2 && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
+        if (gCritMultiplier == 2 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
         {
             PrepareStringBattle(STRINGID_CRITICALHIT, gBankAttacker);
             gBattleCommunication[MSG_DISPLAY] = 1;
@@ -2098,38 +2092,38 @@ static void atk0E_effectivenesssound(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = gBankTarget;
-    if (!(gBattleMoveFlags & MOVESTATUS_MISSED))
+    gActiveBank = gBankDefender;
+    if (!(gMoveResultFlags & MOVE_RESULT_MISSED))
     {
-        switch (gBattleMoveFlags & (u8)(~(MOVESTATUS_MISSED)))
+        switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED)))
         {
-        case MOVESTATUS_SUPEREFFECTIVE:
+        case MOVE_RESULT_SUPER_EFFECTIVE:
             EmitPlaySE(0, SE_KOUKA_H);
             MarkBufferBankForExecution(gActiveBank);
             break;
-        case MOVESTATUS_NOTVERYEFFECTIVE:
+        case MOVE_RESULT_NOT_VERY_EFFECTIVE:
             EmitPlaySE(0, SE_KOUKA_L);
             MarkBufferBankForExecution(gActiveBank);
             break;
-        case MOVESTATUS_NOTAFFECTED:
-        case MOVESTATUS_FAILED:
+        case MOVE_RESULT_DOESNT_AFFECT_FOE:
+        case MOVE_RESULT_FAILED:
             // no sound
             break;
-        case MOVESTATUS_ENDURED:
-        case MOVESTATUS_ONEHITKO:
-        case MOVESTATUS_HUNGON:
+        case MOVE_RESULT_FOE_ENDURED:
+        case MOVE_RESULT_ONE_HIT_KO:
+        case MOVE_RESULT_FOE_HUNG_ON:
         default:
-            if (gBattleMoveFlags & MOVESTATUS_SUPEREFFECTIVE)
+            if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             {
                 EmitPlaySE(0, SE_KOUKA_H);
                 MarkBufferBankForExecution(gActiveBank);
             }
-            else if (gBattleMoveFlags & MOVESTATUS_NOTVERYEFFECTIVE)
+            else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE)
             {
                 EmitPlaySE(0, SE_KOUKA_L);
                 MarkBufferBankForExecution(gActiveBank);
             }
-            else if (!(gBattleMoveFlags & (MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED)))
+            else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)))
             {
                 EmitPlaySE(0, SE_KOUKA_M);
                 MarkBufferBankForExecution(gActiveBank);
@@ -2147,7 +2141,7 @@ static void atk0F_resultmessage(void)
     if (gBattleExecBuffer)
         return;
 
-    if (gBattleMoveFlags & MOVESTATUS_MISSED && (!(gBattleMoveFlags & MOVESTATUS_NOTAFFECTED) || gBattleCommunication[6] > 2))
+    if (gMoveResultFlags & MOVE_RESULT_MISSED && (!(gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) || gBattleCommunication[6] > 2))
     {
         stringId = gMissStringIds[gBattleCommunication[6]];
         gBattleCommunication[MSG_DISPLAY] = 1;
@@ -2155,64 +2149,64 @@ static void atk0F_resultmessage(void)
     else
     {
         gBattleCommunication[MSG_DISPLAY] = 1;
-        switch (gBattleMoveFlags & (u8)(~(MOVESTATUS_MISSED)))
+        switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED)))
         {
-        case MOVESTATUS_SUPEREFFECTIVE:
+        case MOVE_RESULT_SUPER_EFFECTIVE:
             stringId = STRINGID_SUPEREFFECTIVE;
             break;
-        case MOVESTATUS_NOTVERYEFFECTIVE:
+        case MOVE_RESULT_NOT_VERY_EFFECTIVE:
             stringId = STRINGID_NOTVERYEFFECTIVE;
             break;
-        case MOVESTATUS_ONEHITKO:
+        case MOVE_RESULT_ONE_HIT_KO:
             stringId = STRINGID_ONEHITKO;
             break;
-        case MOVESTATUS_ENDURED:
+        case MOVE_RESULT_FOE_ENDURED:
             stringId = STRINGID_PKMNENDUREDHIT;
             break;
-        case MOVESTATUS_FAILED:
+        case MOVE_RESULT_FAILED:
             stringId = STRINGID_BUTITFAILED;
             break;
-        case MOVESTATUS_NOTAFFECTED:
+        case MOVE_RESULT_DOESNT_AFFECT_FOE:
             stringId = STRINGID_ITDOESNTAFFECT;
             break;
-        case MOVESTATUS_HUNGON:
-            gLastUsedItem = gBattleMons[gBankTarget].item;
-            gStringBank = gBankTarget;
-            gBattleMoveFlags &= ~(MOVESTATUS_ENDURED | MOVESTATUS_HUNGON);
+        case MOVE_RESULT_FOE_HUNG_ON:
+            gLastUsedItem = gBattleMons[gBankDefender].item;
+            gStringBank = gBankDefender;
+            gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
             BattleScriptPushCursor();
             gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
             return;
         default:
-            if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
+            if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
             {
                 stringId = STRINGID_ITDOESNTAFFECT;
             }
-            else if (gBattleMoveFlags & MOVESTATUS_ONEHITKO)
+            else if (gMoveResultFlags & MOVE_RESULT_ONE_HIT_KO)
             {
-                gBattleMoveFlags &= ~(MOVESTATUS_ONEHITKO);
-                gBattleMoveFlags &= ~(MOVESTATUS_SUPEREFFECTIVE);
-                gBattleMoveFlags &= ~(MOVESTATUS_NOTVERYEFFECTIVE);
+                gMoveResultFlags &= ~(MOVE_RESULT_ONE_HIT_KO);
+                gMoveResultFlags &= ~(MOVE_RESULT_SUPER_EFFECTIVE);
+                gMoveResultFlags &= ~(MOVE_RESULT_NOT_VERY_EFFECTIVE);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_OneHitKOMsg;
                 return;
             }
-            else if (gBattleMoveFlags & MOVESTATUS_ENDURED)
+            else if (gMoveResultFlags & MOVE_RESULT_FOE_ENDURED)
             {
-                gBattleMoveFlags &= ~(MOVESTATUS_ENDURED | MOVESTATUS_HUNGON);
+                gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_EnduredMsg;
                 return;
             }
-            else if (gBattleMoveFlags & MOVESTATUS_HUNGON)
+            else if (gMoveResultFlags & MOVE_RESULT_FOE_HUNG_ON)
             {
-                gLastUsedItem = gBattleMons[gBankTarget].item;
-                gStringBank = gBankTarget;
-                gBattleMoveFlags &= ~(MOVESTATUS_ENDURED | MOVESTATUS_HUNGON);
+                gLastUsedItem = gBattleMons[gBankDefender].item;
+                gStringBank = gBankDefender;
+                gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
                 return;
             }
-            else if (gBattleMoveFlags & MOVESTATUS_FAILED)
+            else if (gMoveResultFlags & MOVE_RESULT_FAILED)
             {
                 stringId = STRINGID_BUTITFAILED;
             }
@@ -2305,7 +2299,7 @@ static void atk14_printselectionstringfromtable(void)
 u8 BankGetTurnOrder(u8 bank)
 {
     s32 i;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (gBanksByTurnOrder[i] == bank)
             break;
@@ -2337,11 +2331,11 @@ void SetMoveEffect(bool8 primary, u8 certain)
         gEffectBank = gBankAttacker; // bank that effects get applied on
         gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_AFFECTS_USER);
         affectsUser = MOVE_EFFECT_AFFECTS_USER;
-        gBattleScripting.bank = gBankTarget; // theoretically the attacker
+        gBattleScripting.bank = gBankDefender; // theoretically the attacker
     }
     else
     {
-        gEffectBank = gBankTarget;
+        gEffectBank = gBankDefender;
         gBattleScripting.bank = gBankAttacker;
     }
 
@@ -2349,7 +2343,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
         && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 9)
         INCREMENT_RESET_RETURN
 
-    if (gSideAffecting[GET_BANK_SIDE(gEffectBank)] & SIDE_STATUS_SAFEGUARD && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
+    if (gSideStatuses[GET_BANK_SIDE(gEffectBank)] & SIDE_STATUS_SAFEGUARD && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
         && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 7)
         INCREMENT_RESET_RETURN
 
@@ -2365,21 +2359,21 @@ void SetMoveEffect(bool8 primary, u8 certain)
     {
         switch (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]])
         {
-        case STATUS_SLEEP:
+        case STATUS1_SLEEP:
             // check active uproar
             if (gBattleMons[gEffectBank].ability != ABILITY_SOUNDPROOF)
             {
                 for (gActiveBank = 0;
-                    gActiveBank < gNoOfAllBanks && !(gBattleMons[gActiveBank].status2 & STATUS2_UPROAR);
+                    gActiveBank < gBattleBanksCount && !(gBattleMons[gActiveBank].status2 & STATUS2_UPROAR);
                     gActiveBank++)
                 {}
             }
             else
-                gActiveBank = gNoOfAllBanks;
+                gActiveBank = gBattleBanksCount;
 
             if (gBattleMons[gEffectBank].status1)
                 break;
-            if (gActiveBank != gNoOfAllBanks)
+            if (gActiveBank != gBattleBanksCount)
                 break;
             if (gBattleMons[gEffectBank].ability == ABILITY_VITAL_SPIRIT)
                 break;
@@ -2389,7 +2383,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
             CancelMultiTurnMoves(gEffectBank);
             statusChanged = TRUE;
             break;
-        case STATUS_POISON:
+        case STATUS1_POISON:
             if (gBattleMons[gEffectBank].ability == ABILITY_IMMUNITY
                 && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN))
             {
@@ -2436,7 +2430,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
             statusChanged = TRUE;
             break;
-        case STATUS_BURN:
+        case STATUS1_BURN:
             if (gBattleMons[gEffectBank].ability == ABILITY_WATER_VEIL
                 && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN))
             {
@@ -2478,7 +2472,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
             statusChanged = TRUE;
             break;
-        case STATUS_FREEZE:
+        case STATUS1_FREEZE:
             if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY)
                 noSunCanFreeze = FALSE;
             if (gBattleMons[gEffectBank].type1 == TYPE_ICE)
@@ -2495,7 +2489,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
             CancelMultiTurnMoves(gEffectBank);
             statusChanged = TRUE;
             break;
-        case STATUS_PARALYSIS:
+        case STATUS1_PARALYSIS:
             if (gBattleMons[gEffectBank].ability == ABILITY_LIMBER)
             {
                 if (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)
@@ -2525,7 +2519,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
             statusChanged = TRUE;
             break;
-        case STATUS_TOXIC_POISON:
+        case STATUS1_TOXIC_POISON:
             if (gBattleMons[gEffectBank].ability == ABILITY_IMMUNITY && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN))
             {
                 gLastUsedAbility = ABILITY_IMMUNITY;
@@ -2567,14 +2561,14 @@ void SetMoveEffect(bool8 primary, u8 certain)
                     break;
 
                 // It's redundant, because at this point we know the status1 value is 0.
-                gBattleMons[gEffectBank].status1 &= ~(STATUS_TOXIC_POISON);
-                gBattleMons[gEffectBank].status1 &= ~(STATUS_POISON);
+                gBattleMons[gEffectBank].status1 &= ~(STATUS1_TOXIC_POISON);
+                gBattleMons[gEffectBank].status1 &= ~(STATUS1_POISON);
                 statusChanged = TRUE;
                 break;
             }
             else
             {
-                gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
+                gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
             }
             break;
         }
@@ -2582,7 +2576,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
         {
             BattleScriptPush(gBattlescriptCurrInstr + 1);
 
-            if (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS_SLEEP)
+            if (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS1_SLEEP)
                 gBattleMons[gEffectBank].status1 |= ((Random() & 3) + 2);
             else
                 gBattleMons[gEffectBank].status1 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
@@ -2870,52 +2864,52 @@ void SetMoveEffect(bool8 primary, u8 certain)
                     {
                         gBattlescriptCurrInstr++;
                     }
-                    else if (gBattleMons[gBankTarget].item
-                        && gBattleMons[gBankTarget].ability == ABILITY_STICKY_HOLD)
+                    else if (gBattleMons[gBankDefender].item
+                        && gBattleMons[gBankDefender].ability == ABILITY_STICKY_HOLD)
                     {
                         BattleScriptPushCursor();
                         gBattlescriptCurrInstr = BattleScript_NoItemSteal;
 
-                        gLastUsedAbility = gBattleMons[gBankTarget].ability;
-                        RecordAbilityBattle(gBankTarget, gLastUsedAbility);
+                        gLastUsedAbility = gBattleMons[gBankDefender].ability;
+                        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
                     }
                     else if (gBattleMons[gBankAttacker].item != 0
-                        || gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY
-                        || IS_ITEM_MAIL(gBattleMons[gBankTarget].item)
-                        || gBattleMons[gBankTarget].item == 0)
+                        || gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY
+                        || IS_ITEM_MAIL(gBattleMons[gBankDefender].item)
+                        || gBattleMons[gBankDefender].item == 0)
                     {
                         gBattlescriptCurrInstr++;
                     }
                     else
                     {
                         u16* changedItem = &gBattleStruct->changedItems[gBankAttacker];
-                        gLastUsedItem = *changedItem = gBattleMons[gBankTarget].item;
-                        gBattleMons[gBankTarget].item = 0;
+                        gLastUsedItem = *changedItem = gBattleMons[gBankDefender].item;
+                        gBattleMons[gBankDefender].item = 0;
 
                         gActiveBank = gBankAttacker;
                         EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem);
                         MarkBufferBankForExecution(gBankAttacker);
 
-                        gActiveBank = gBankTarget;
-                        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankTarget].item);
-                        MarkBufferBankForExecution(gBankTarget);
+                        gActiveBank = gBankDefender;
+                        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankDefender].item);
+                        MarkBufferBankForExecution(gBankDefender);
 
                         BattleScriptPush(gBattlescriptCurrInstr + 1);
                         gBattlescriptCurrInstr = BattleScript_ItemSteal;
 
-                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankTarget]) + 0) = 0;
-                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankTarget]) + 1) = 0;
+                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankDefender]) + 0) = 0;
+                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankDefender]) + 1) = 0;
                     }
 
                 }
                 break;
             case MOVE_EFFECT_PREVENT_ESCAPE:
-                gBattleMons[gBankTarget].status2 |= STATUS2_ESCAPE_PREVENTION;
-                gDisableStructs[gBankTarget].bankPreventingEscape = gBankAttacker;
+                gBattleMons[gBankDefender].status2 |= STATUS2_ESCAPE_PREVENTION;
+                gDisableStructs[gBankDefender].bankPreventingEscape = gBankAttacker;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_NIGHTMARE:
-                gBattleMons[gBankTarget].status2 |= STATUS2_NIGHTMARE;
+                gBattleMons[gBankDefender].status2 |= STATUS2_NIGHTMARE;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_ALL_STATS_UP:
@@ -2927,15 +2921,15 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattlescriptCurrInstr = BattleScript_RapidSpinAway;
                 break;
             case MOVE_EFFECT_REMOVE_PARALYSIS: // Smelling salts
-                if (!(gBattleMons[gBankTarget].status1 & STATUS_PARALYSIS))
+                if (!(gBattleMons[gBankDefender].status1 & STATUS1_PARALYSIS))
                 {
                     gBattlescriptCurrInstr++;
                 }
                 else
                 {
-                    gBattleMons[gBankTarget].status1 &= ~(STATUS_PARALYSIS);
+                    gBattleMons[gBankDefender].status1 &= ~(STATUS1_PARALYSIS);
 
-                    gActiveBank = gBankTarget;
+                    gActiveBank = gBankDefender;
                     EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
                     MarkBufferBankForExecution(gActiveBank);
 
@@ -3022,14 +3016,14 @@ static void atk15_seteffectwithchance(void)
         percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance;
 
     if (gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_CERTAIN
-        && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
+        && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
     {
         gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_CERTAIN);
         SetMoveEffect(0, MOVE_EFFECT_CERTAIN);
     }
     else if (Random() % 100 < percentChance
              && gBattleCommunication[MOVE_EFFECT_BYTE]
-             && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
+             && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
     {
         if (percentChance >= 100)
             SetMoveEffect(0, MOVE_EFFECT_CERTAIN);
@@ -3082,7 +3076,7 @@ static void atk19_tryfaintmon(void)
 
             BattleScriptPop();
             gBattlescriptCurrInstr = BS_ptr;
-            gSideAffecting[GetBankSide(gActiveBank)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
+            gSideStatuses[GetBankSide(gActiveBank)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
         }
         else
         {
@@ -3096,12 +3090,12 @@ static void atk19_tryfaintmon(void)
         if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
         {
             gActiveBank = gBankAttacker;
-            bank = gBankTarget;
+            bank = gBankDefender;
             BS_ptr = BattleScript_FaintAttacker;
         }
         else
         {
-            gActiveBank = gBankTarget;
+            gActiveBank = gBankDefender;
             bank = gBankAttacker;
             BS_ptr = BattleScript_FaintTarget;
         }
@@ -3131,9 +3125,9 @@ static void atk19_tryfaintmon(void)
                 gBattleMoveDamage = gBattleMons[bank].hp;
                 gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife;
             }
-            if ((gStatuses3[gBankTarget] & STATUS3_GRUDGE)
+            if ((gStatuses3[gBankDefender] & STATUS3_GRUDGE)
              && !(gHitMarker & HITMARKER_GRUDGE)
-             && GetBankSide(gBankAttacker) != GetBankSide(gBankTarget)
+             && GetBankSide(gBankAttacker) != GetBankSide(gBankDefender)
              && gBattleMons[gBankAttacker].hp != 0
              && gCurrentMove != MOVE_STRUGGLE)
             {
@@ -3265,12 +3259,12 @@ static void atk1F_jumpifsideaffecting(void)
     if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
         side = GET_BANK_SIDE(gBankAttacker);
     else
-        side = GET_BANK_SIDE(gBankTarget);
+        side = GET_BANK_SIDE(gBankDefender);
 
     flags = BS2ScriptRead16(gBattlescriptCurrInstr + 2);
     jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 4);
 
-    if (gSideAffecting[side] & flags)
+    if (gSideStatuses[side] & flags)
         gBattlescriptCurrInstr = jumpPtr;
     else
         gBattlescriptCurrInstr += 8;
@@ -3660,7 +3654,7 @@ static void atk24(void)
     }
 
     if (HP_count == 0)
-        gBattleOutcome |= BATTLE_LOST;
+        gBattleOutcome |= B_OUTCOME_LOST;
 
     for (HP_count = 0, i = 0; i < 6; i++)
     {
@@ -3672,7 +3666,7 @@ static void atk24(void)
     }
 
     if (HP_count == 0)
-        gBattleOutcome |= BATTLE_WON;
+        gBattleOutcome |= B_OUTCOME_WON;
 
     if (gBattleOutcome == 0 && (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)))
     {
@@ -3680,13 +3674,13 @@ static void atk24(void)
         s32 foundOpponent;
 
         // Impossible to decompile loops.
-        for (foundPlayer = 0, i = 0; i < gNoOfAllBanks; i += 2)
+        for (foundPlayer = 0, i = 0; i < gBattleBanksCount; i += 2)
         {
             if (HITMARKER_UNK(i) & gHitMarker && !gSpecialStatuses[i].flag40)
                 foundPlayer++;
         }
 
-        for (foundOpponent = 0, i = 1; i < gNoOfAllBanks; i += 2)
+        for (foundOpponent = 0, i = 1; i < gBattleBanksCount; i += 2)
         {
             if (HITMARKER_UNK(i) & gHitMarker && !gSpecialStatuses[i].flag40)
                 foundOpponent++;
@@ -3895,7 +3889,7 @@ static void atk24(void)
         beq _0804AF1A\n\
         movs r3, 0\n\
         movs r5, 0\n\
-        ldr r0, =gNoOfAllBanks\n\
+        ldr r0, =gBattleBanksCount\n\
         ldrb r1, [r0]\n\
         mov r12, r0\n\
         ldr r7, =gBattlescriptCurrInstr\n\
@@ -4010,7 +4004,7 @@ static void atk24(void)
 
 static void MoveValuesCleanUp(void)
 {
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
     gBattleScripting.dmgMultiplier = 1;
     gCritMultiplier = 1;
     gBattleCommunication[MOVE_EFFECT_BYTE] = 0;
@@ -4329,7 +4323,7 @@ static void atk3A_waitstate(void)
 static void atk3B_healthbar_update(void)
 {
     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
-        gActiveBank = gBankTarget;
+        gActiveBank = gBankDefender;
     else
         gActiveBank = gBankAttacker;
 
@@ -4348,7 +4342,7 @@ static void atk3D_end(void)
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
         sub_81A5718(gBankAttacker);
 
-    gBattleMoveFlags = 0;
+    gMoveResultFlags = 0;
     gActiveBank = 0;
     gCurrentActionFuncId = 0xB;
 }
@@ -4884,13 +4878,13 @@ static void atk49_moveend(void)
         switch (gBattleScripting.atk49_state)
         {
         case 0: // rage check
-            if (gBattleMons[gBankTarget].status2 & STATUS2_RAGE
-                && gBattleMons[gBankTarget].hp != 0 && gBankAttacker != gBankTarget
-                && GetBankSide(gBankAttacker) != GetBankSide(gBankTarget)
-                && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT) && TARGET_TURN_DAMAGED
-                && gBattleMoves[gCurrentMove].power && gBattleMons[gBankTarget].statStages[STAT_STAGE_ATK] <= 0xB)
+            if (gBattleMons[gBankDefender].status2 & STATUS2_RAGE
+                && gBattleMons[gBankDefender].hp != 0 && gBankAttacker != gBankDefender
+                && GetBankSide(gBankAttacker) != GetBankSide(gBankDefender)
+                && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED
+                && gBattleMoves[gCurrentMove].power && gBattleMons[gBankDefender].statStages[STAT_STAGE_ATK] <= 0xB)
             {
-                gBattleMons[gBankTarget].statStages[STAT_STAGE_ATK]++;
+                gBattleMons[gBankDefender].statStages[STAT_STAGE_ATK]++;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_RageIsBuilding;
                 effect = TRUE;
@@ -4898,14 +4892,14 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 1: // defrosting check
-            if (gBattleMons[gBankTarget].status1 & STATUS_FREEZE
-                && gBattleMons[gBankTarget].hp != 0 && gBankAttacker != gBankTarget
-                && gSpecialStatuses[gBankTarget].moveturnLostHP_special
-                && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT) && moveType == TYPE_FIRE)
-            {
-                gBattleMons[gBankTarget].status1 &= ~(STATUS_FREEZE);
-                gActiveBank = gBankTarget;
-                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1);
+            if (gBattleMons[gBankDefender].status1 & STATUS1_FREEZE
+                && gBattleMons[gBankDefender].hp != 0 && gBankAttacker != gBankDefender
+                && gSpecialStatuses[gBankDefender].moveturnLostHP_special
+                && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && moveType == TYPE_FIRE)
+            {
+                gBattleMons[gBankDefender].status1 &= ~(STATUS1_FREEZE);
+                gActiveBank = gBankDefender;
+                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankDefender].status1);
                 MarkBufferBankForExecution(gActiveBank);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove;
@@ -4914,12 +4908,12 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 2: // target synchronize
-            if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBankTarget, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBankDefender, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
         case 3: // contact abilities
-            if (AbilityBattleEffects(ABILITYEFFECT_CONTACT, gBankTarget, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_CONTACT, gBankDefender, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
@@ -4938,7 +4932,7 @@ static void atk49_moveend(void)
             if (!(gHitMarker & HITMARKER_OBEYS) || holdEffectAtk != HOLD_EFFECT_CHOICE_BAND
                 || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF))
                     goto LOOP;
-            if (gChosenMove == MOVE_BATON_PASS && !(gBattleMoveFlags & MOVESTATUS_FAILED))
+            if (gChosenMove == MOVE_BATON_PASS && !(gMoveResultFlags & MOVE_RESULT_FAILED))
             {
                 gBattleScripting.atk49_state++;
                 break;
@@ -4958,7 +4952,7 @@ static void atk49_moveend(void)
             }
             break;
         case 7: // changed held items
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 u16* changedItem = &gBattleStruct->changedItems[i];
                 if (*changedItem != 0)
@@ -4993,7 +4987,7 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 9: // make attacker sprite visible
-            if (gBattleMoveFlags & MOVESTATUS_NOEFFECT
+            if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT
                 || !(gStatuses3[gBankAttacker] & (STATUS3_SEMI_INVULNERABLE))
                 || WasUnableToUseMove(gBankAttacker))
             {
@@ -5008,20 +5002,20 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 10: // make target sprite visible
-            if (!gSpecialStatuses[gBankTarget].restoredBankSprite && gBankTarget < gNoOfAllBanks
-                && !(gStatuses3[gBankTarget] & STATUS3_SEMI_INVULNERABLE))
+            if (!gSpecialStatuses[gBankDefender].restoredBankSprite && gBankDefender < gBattleBanksCount
+                && !(gStatuses3[gBankDefender] & STATUS3_SEMI_INVULNERABLE))
             {
-                gActiveBank = gBankTarget;
+                gActiveBank = gBankDefender;
                 EmitSpriteInvisibility(0, FALSE);
                 MarkBufferBankForExecution(gActiveBank);
-                gStatuses3[gBankTarget] &= ~(STATUS3_SEMI_INVULNERABLE);
+                gStatuses3[gBankDefender] &= ~(STATUS3_SEMI_INVULNERABLE);
                 gBattleScripting.atk49_state++;
                 return;
             }
             gBattleScripting.atk49_state++;
             break;
         case 13: // update substitute
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gDisableStructs[i].substituteHP == 0)
                     gBattleMons[i].status2 &= ~(STATUS2_SUBSTITUTE);
@@ -5032,8 +5026,8 @@ static void atk49_moveend(void)
             if (gHitMarker & HITMARKER_PURSUIT_TRAP)
             {
                 gActiveBank = gBankAttacker;
-                gBankAttacker = gBankTarget;
-                gBankTarget = gActiveBank;
+                gBankAttacker = gBankDefender;
+                gBankDefender = gActiveBank;
                 gHitMarker &= ~(HITMARKER_PURSUIT_TRAP);
             }
             if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED)
@@ -5055,24 +5049,24 @@ static void atk49_moveend(void)
                     gLastResultingMoves[gBankAttacker] = 0xFFFF;
                 }
 
-                if (!(gHitMarker & HITMARKER_FAINTED(gBankTarget)))
-                    gLastHitBy[gBankTarget] = gBankAttacker;
+                if (!(gHitMarker & HITMARKER_FAINTED(gBankDefender)))
+                    gLastHitBy[gBankDefender] = gBankAttacker;
 
-                if (gHitMarker & HITMARKER_OBEYS && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
+                if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
                 {
                     if (gChosenMove == 0xFFFF)
                     {
-                        gLastLandedMoves[gBankTarget] = gChosenMove;
+                        gLastLandedMoves[gBankDefender] = gChosenMove;
                     }
                     else
                     {
-                        gLastLandedMoves[gBankTarget] = gCurrentMove;
-                        GET_MOVE_TYPE(gCurrentMove, gLastHitByType[gBankTarget]);
+                        gLastLandedMoves[gBankDefender] = gCurrentMove;
+                        GET_MOVE_TYPE(gCurrentMove, gLastHitByType[gBankDefender]);
                     }
                 }
                 else
                 {
-                    gLastLandedMoves[gBankTarget] = 0xFFFF;
+                    gLastLandedMoves[gBankDefender] = 0xFFFF;
                 }
             }
             gBattleScripting.atk49_state++;
@@ -5080,19 +5074,19 @@ static void atk49_moveend(void)
         case 15: // mirror move
             if (!(gAbsentBankFlags & gBitTable[gBankAttacker]) && !(gBattleStruct->field_91 & gBitTable[gBankAttacker])
                 && gBattleMoves[originallyUsedMove].flags & FLAG_MIRROR_MOVE_AFFECTED && gHitMarker & HITMARKER_OBEYS
-                && gBankAttacker != gBankTarget && !(gHitMarker & HITMARKER_FAINTED(gBankTarget))
-                && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
+                && gBankAttacker != gBankDefender && !(gHitMarker & HITMARKER_FAINTED(gBankDefender))
+                && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
             {
                 u8 target, attacker;
 
-                *(gBattleStruct->mirrorMoves + gBankTarget * 2 + 0) = gChosenMove;
-                *(gBattleStruct->mirrorMoves + gBankTarget * 2 + 1) = gChosenMove >> 8;
+                *(gBattleStruct->mirrorMoves + gBankDefender * 2 + 0) = gChosenMove;
+                *(gBattleStruct->mirrorMoves + gBankDefender * 2 + 1) = gChosenMove >> 8;
 
-                target = gBankTarget;
+                target = gBankDefender;
                 attacker = gBankAttacker;
                 *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = gChosenMove;
 
-                target = gBankTarget;
+                target = gBankDefender;
                 attacker = gBankAttacker;
                 *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = gChosenMove >> 8;
             }
@@ -5103,10 +5097,10 @@ static void atk49_moveend(void)
                 && !gProtectStructs[gBankAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
                 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
             {
-                u8 bank = GetBankByIdentity(GetBankPosition(gBankTarget) ^ BIT_MON);
+                u8 bank = GetBankByPosition(B_POSITION_PARTNER(GetBankPosition(gBankDefender)));
                 if (gBattleMons[bank].hp != 0)
                 {
-                    gBankTarget = bank;
+                    gBankDefender = bank;
                     gHitMarker |= HITMARKER_NO_ATTACKSTRING;
                     gBattleScripting.atk49_state = 0;
                     MoveValuesCleanUp();
@@ -5142,13 +5136,13 @@ static void atk4A_typecalc2(void)
     s32 i = 0;
     u8 moveType = gBattleMoves[gCurrentMove].type;
 
-    if (gBattleMons[gBankTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBankDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
-        gLastUsedAbility = gBattleMons[gBankTarget].ability;
-        gBattleMoveFlags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED);
-        gLastLandedMoves[gBankTarget] = 0;
+        gLastUsedAbility = gBattleMons[gBankDefender].ability;
+        gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
+        gLastLandedMoves[gBankDefender] = 0;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBankTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
     }
     else
     {
@@ -5156,7 +5150,7 @@ static void atk4A_typecalc2(void)
         {
             if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
-                if (gBattleMons[gBankTarget].status2 & STATUS2_FORESIGHT)
+                if (gBattleMons[gBankDefender].status2 & STATUS2_FORESIGHT)
                 {
                     break;
                 }
@@ -5170,42 +5164,42 @@ static void atk4A_typecalc2(void)
             if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type1)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type1)
                 {
                     if (TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
                     {
-                        gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
+                        gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
                         break;
                     }
                     if (TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                     {
-                        flags |= MOVESTATUS_NOTVERYEFFECTIVE;
+                        flags |= MOVE_RESULT_NOT_VERY_EFFECTIVE;
                     }
                     if (TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                     {
-                        flags |= MOVESTATUS_SUPEREFFECTIVE;
+                        flags |= MOVE_RESULT_SUPER_EFFECTIVE;
                     }
                 }
                 // check type2
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2)
                 {
-                    if (gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
+                    if (gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
                     {
-                        gBattleMoveFlags |= MOVESTATUS_NOTAFFECTED;
+                        gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
                         break;
                     }
-                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2
-                        && gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
+                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2
+                        && gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                     {
-                        flags |= MOVESTATUS_NOTVERYEFFECTIVE;
+                        flags |= MOVE_RESULT_NOT_VERY_EFFECTIVE;
                     }
-                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankTarget].type2
-                        && gBattleMons[gBankTarget].type1 != gBattleMons[gBankTarget].type2
+                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2
+                        && gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                     {
-                        flags |= MOVESTATUS_SUPEREFFECTIVE;
+                        flags |= MOVE_RESULT_SUPER_EFFECTIVE;
                     }
                 }
             }
@@ -5213,19 +5207,19 @@ static void atk4A_typecalc2(void)
         }
     }
 
-    if (gBattleMons[gBankTarget].ability == ABILITY_WONDER_GUARD
-        && !(flags & MOVESTATUS_NOEFFECT)
+    if (gBattleMons[gBankDefender].ability == ABILITY_WONDER_GUARD
+        && !(flags & MOVE_RESULT_NO_EFFECT)
         && AttacksThisTurn(gBankAttacker, gCurrentMove) == 2
-        && (!(flags & MOVESTATUS_SUPEREFFECTIVE) || ((flags & (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)) == (MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE)))
+        && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
         && gBattleMoves[gCurrentMove].power)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
-        gLastLandedMoves[gBankTarget] = 0;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
+        gLastLandedMoves[gBankDefender] = 0;
         gBattleCommunication[6] = 3;
-        RecordAbilityBattle(gBankTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
     }
-    if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
+    if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
         gProtectStructs[gBankAttacker].targetNotAffected = 1;
 
     gBattlescriptCurrInstr++;
@@ -5298,7 +5292,7 @@ static void atk4D_switchindataupdate(void)
     SwitchInClearSetData();
 
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE && gBattleMons[gActiveBank].maxHP / 2 >= gBattleMons[gActiveBank].hp
-        && gBattleMons[gActiveBank].hp != 0 && !(gBattleMons[gActiveBank].status1 & STATUS_SLEEP))
+        && gBattleMons[gActiveBank].hp != 0 && !(gBattleMons[gActiveBank].status1 & STATUS1_SLEEP))
     {
         gBattleStruct->field_92 |= gBitTable[gActiveBank];
     }
@@ -5454,10 +5448,10 @@ static void atk4F_jumpifcantswitch(void)
     {
         if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
         {
-            r7 = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+            r7 = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
 
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                compareVar = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+                compareVar = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
             else
                 compareVar = r7;
 
@@ -5465,10 +5459,10 @@ static void atk4F_jumpifcantswitch(void)
         }
         else
         {
-            r7 = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+            r7 = GetBankByPosition(B_POSITION_PLAYER_LEFT);
 
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                compareVar = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+                compareVar = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
             else
                 compareVar = r7;
 
@@ -5515,7 +5509,7 @@ static void atk50_openpartyscreen(void)
     {
         if ((gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_MULTI)) != BATTLE_TYPE_DOUBLE)
         {
-            for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
             {
                 if (gHitMarker & HITMARKER_FAINTED(gActiveBank))
                 {
@@ -5724,12 +5718,12 @@ static void atk50_openpartyscreen(void)
         {
             if (gBitTable[gBank1] & hitmarkerFaintBits)
                 break;
-            if (gBank1 >= gNoOfAllBanks)
+            if (gBank1 >= gBattleBanksCount)
                 break;
             gBank1++;
         }
 
-        if (gBank1 == gNoOfAllBanks)
+        if (gBank1 == gBattleBanksCount)
             gBattlescriptCurrInstr = jumpPtr;
     }
     else
@@ -5768,7 +5762,7 @@ static void atk50_openpartyscreen(void)
 
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             {
-                for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++)
+                for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
                 {
                     if (gActiveBank != bank)
                     {
@@ -5779,7 +5773,7 @@ static void atk50_openpartyscreen(void)
             }
             else
             {
-                gActiveBank = GetBankByIdentity(GetBankPosition(bank) ^ BIT_SIDE);
+                gActiveBank = GetBankByPosition(GetBankPosition(bank) ^ BIT_SIDE);
                 if (gAbsentBankFlags & gBitTable[gActiveBank])
                     gActiveBank ^= BIT_MON;
 
@@ -5801,7 +5795,7 @@ static void atk51_switchhandleorder(void)
     switch (gBattlescriptCurrInstr[2])
     {
     case 0:
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattleBanksCount; i++)
         {
             if (gBattleBufferB[i][0] == 0x22)
             {
@@ -5867,15 +5861,15 @@ static void atk52_switchineffects(void)
     gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
     gSpecialStatuses[gActiveBank].flag40 = 0;
 
-    if (!(gSideAffecting[GetBankSide(gActiveBank)] & SIDE_STATUS_SPIKES_DAMAGED)
-        && (gSideAffecting[GetBankSide(gActiveBank)] & SIDE_STATUS_SPIKES)
+    if (!(gSideStatuses[GetBankSide(gActiveBank)] & SIDE_STATUS_SPIKES_DAMAGED)
+        && (gSideStatuses[GetBankSide(gActiveBank)] & SIDE_STATUS_SPIKES)
         && gBattleMons[gActiveBank].type1 != TYPE_FLYING
         && gBattleMons[gActiveBank].type2 != TYPE_FLYING
         && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE)
     {
         u8 spikesDmg;
 
-        gSideAffecting[GetBankSide(gActiveBank)] |= SIDE_STATUS_SPIKES_DAMAGED;
+        gSideStatuses[GetBankSide(gActiveBank)] |= SIDE_STATUS_SPIKES_DAMAGED;
 
         gBattleMons[gActiveBank].status2 &= ~(STATUS2_DESTINY_BOND);
         gHitMarker &= ~(HITMARKER_DESTINYBOND);
@@ -5905,15 +5899,15 @@ static void atk52_switchineffects(void)
         if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBank, 0, 0, 0) == 0 &&
             ItemBattleEffects(0, gActiveBank, 0) == 0)
         {
-            gSideAffecting[GetBankSide(gActiveBank)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
+            gSideStatuses[GetBankSide(gActiveBank)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
 
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gBanksByTurnOrder[i] == gActiveBank)
                     gActionsByTurnOrder[i] = ACTION_CANCEL_PARTNER;
             }
 
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 u16* hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBankSide(i)];
                 *hpOnSwitchout = gBattleMons[i].hp;
@@ -5928,7 +5922,7 @@ static void atk52_switchineffects(void)
                 {
                     if (hitmarkerFaintBits & gBitTable[gBank1] && !(gAbsentBankFlags & gBitTable[gBank1]))
                         break;
-                    if (gBank1 >= gNoOfAllBanks)
+                    if (gBank1 >= gBattleBanksCount)
                         break;
                     gBank1++;
                 }
@@ -5940,7 +5934,7 @@ static void atk52_switchineffects(void)
 
 static void atk53_trainerslidein(void)
 {
-    gActiveBank = GetBankByIdentity(gBattlescriptCurrInstr[1]);
+    gActiveBank = GetBankByPosition(gBattlescriptCurrInstr[1]);
     EmitTrainerSlide(0);
     MarkBufferBankForExecution(gActiveBank);
 
@@ -5976,7 +5970,7 @@ static void atk56_playfaintcry(void)
 
 static void atk57(void)
 {
-    gActiveBank = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+    gActiveBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
     EmitCmd55(0, gBattleOutcome);
     MarkBufferBankForExecution(gActiveBank);
 
@@ -6011,7 +6005,7 @@ static void atk59_handlelearnnewmove(void)
     }
     else
     {
-        gActiveBank = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+        gActiveBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
 
         if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterId
             && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
@@ -6020,7 +6014,7 @@ static void atk59_handlelearnnewmove(void)
         }
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
-            gActiveBank = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+            gActiveBank = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
             if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterId
                 && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
             {
@@ -6202,7 +6196,7 @@ static void atk5C_hitanimation(void)
 {
     gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-    if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
         gBattlescriptCurrInstr += 2;
     }
@@ -6318,8 +6312,8 @@ static void atk5E(void)
 static void atk5F(void)
 {
     gActiveBank = gBankAttacker;
-    gBankAttacker = gBankTarget;
-    gBankTarget = gActiveBank;
+    gBankAttacker = gBankDefender;
+    gBankDefender = gActiveBank;
 
     if (gHitMarker & HITMARKER_PURSUIT_TRAP)
         gHitMarker &= ~(HITMARKER_PURSUIT_TRAP);
@@ -6494,7 +6488,7 @@ static void atk68_cancelallactions(void)
 {
     s32 i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
         gActionsByTurnOrder[i] = ACTION_CANCEL_PARTNER;
 
     gBattlescriptCurrInstr++;
@@ -6504,42 +6498,42 @@ static void atk69_adjustsetdamage(void) // The same as 0x7, except there's no ra
 {
     u8 holdEffect, quality;
 
-    if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBankTarget].holdEffect, quality = gEnigmaBerries[gBankTarget].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBankDefender].holdEffect, quality = gEnigmaBerries[gBankDefender].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBankTarget].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankDefender].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBankDefender].item);
     }
 
-    gStringBank = gBankTarget;
+    gStringBank = gBankDefender;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBankTarget, holdEffect);
-        gSpecialStatuses[gBankTarget].focusBanded = 1;
+        RecordItemEffectBattle(gBankDefender, holdEffect);
+        gSpecialStatuses[gBankDefender].focusBanded = 1;
     }
-    if (gBattleMons[gBankTarget].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBankDefender].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBankTarget].endured
-     && !gSpecialStatuses[gBankTarget].focusBanded)
+    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBankDefender].endured
+     && !gSpecialStatuses[gBankDefender].focusBanded)
         goto END;
 
-    if (gBattleMons[gBankTarget].hp > gBattleMoveDamage)
+    if (gBattleMons[gBankDefender].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBankTarget].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBankDefender].hp - 1;
 
-    if (gProtectStructs[gBankTarget].endured)
+    if (gProtectStructs[gBankDefender].endured)
     {
-        gBattleMoveFlags |= MOVESTATUS_ENDURED;
+        gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBankTarget].focusBanded)
+    else if (gSpecialStatuses[gBankDefender].focusBanded)
     {
-        gBattleMoveFlags |= MOVESTATUS_HUNGON;
-        gLastUsedItem = gBattleMons[gBankTarget].item;
+        gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
+        gLastUsedItem = gBattleMons[gBankDefender].item;
     }
 
     END:
@@ -6851,7 +6845,7 @@ static void atk6D_resetsentmonsvalue(void)
 
 static void atk6E_setatktoplayer0(void)
 {
-    gBankAttacker = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+    gBankAttacker = GetBankByPosition(B_POSITION_PLAYER_LEFT);
     gBattlescriptCurrInstr++;
 }
 
@@ -6964,18 +6958,18 @@ static void atk76_various(void)
         CancelMultiTurnMoves(gActiveBank);
         break;
     case VARIOUS_SET_MAGIC_COAT_TARGET:
-        gBankAttacker = gBankTarget;
+        gBankAttacker = gBankDefender;
         side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer != 0 && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
-            gBankTarget = gSideTimers[side].followmeTarget;
+            gBankDefender = gSideTimers[side].followmeTarget;
         else
-            gBankTarget = gActiveBank;
+            gBankDefender = gActiveBank;
         break;
     case VARIOUS_IS_RUNNING_IMPOSSIBLE:
         gBattleCommunication[0] = IsRunningFromBattleImpossible();
         break;
     case VARIOUS_GET_MOVE_TARGET:
-        gBankTarget = GetMoveTarget(gCurrentMove, 0);
+        gBankDefender = GetMoveTarget(gCurrentMove, 0);
         break;
     case 4:
         if (gHitMarker & HITMARKER_FAINTED(gActiveBank))
@@ -7023,7 +7017,7 @@ static void atk76_various(void)
         if (!(gBattleStruct->field_92 & gBitTable[gActiveBank])
             && gBattleMons[gActiveBank].maxHP / 2 >= gBattleMons[gActiveBank].hp
             && gBattleMons[gActiveBank].hp != 0
-            && !(gBattleMons[gActiveBank].status1 & STATUS_SLEEP))
+            && !(gBattleMons[gActiveBank].status1 & STATUS1_SLEEP))
         {
             gBattleStruct->field_92 |= gBitTable[gActiveBank];
             gBattleCommunication[0] = 1;
@@ -7092,7 +7086,7 @@ static void atk76_various(void)
         }
         break;
     case VARIOUS_RETURN_OPPONENT_MON2:
-        if (gNoOfAllBanks > 3)
+        if (gBattleBanksCount > 3)
         {
             gActiveBank = 3;
             if (gBattleMons[gActiveBank].hp != 0)
@@ -7117,9 +7111,9 @@ static void atk76_various(void)
         break;
     case VARIOUS_SET_TELEPORT_OUTCOME:
         if (GetBankSide(gActiveBank) == SIDE_PLAYER)
-            gBattleOutcome = BATTLE_PLAYER_TELEPORTED;
+            gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED;
         else
-            gBattleOutcome = BATTLE_OPPONENT_TELEPORTED;
+            gBattleOutcome = B_OUTCOME_POKE_TELEPORTED;
         break;
     case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC:
         EmitPlayFanfareOrBGM(0, MUS_KACHI1, TRUE);
@@ -7138,7 +7132,7 @@ static void atk77_setprotectlike(void) // protect and endure
     if (lastMove != MOVE_PROTECT && lastMove != MOVE_DETECT && lastMove != MOVE_ENDURE)
         gDisableStructs[gBankAttacker].protectUses = 0;
 
-    if (gCurrentTurnActionNumber == (gNoOfAllBanks - 1))
+    if (gCurrentTurnActionNumber == (gBattleBanksCount - 1))
         notLastTurn = FALSE;
 
     if (sProtectSuccessRates[gDisableStructs[gBankAttacker].protectUses] >= Random() && notLastTurn)
@@ -7159,7 +7153,7 @@ static void atk77_setprotectlike(void) // protect and endure
     {
         gDisableStructs[gBankAttacker].protectUses = 0;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
     }
 
     gBattlescriptCurrInstr++;
@@ -7170,13 +7164,13 @@ static void atk78_faintifabilitynotdamp(void)
     if (gBattleExecBuffer)
         return;
 
-    for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
+    for (gBankDefender = 0; gBankDefender < gBattleBanksCount; gBankDefender++)
     {
-        if (gBattleMons[gBankTarget].ability == ABILITY_DAMP)
+        if (gBattleMons[gBankDefender].ability == ABILITY_DAMP)
             break;
     }
 
-    if (gBankTarget == gNoOfAllBanks)
+    if (gBankDefender == gBattleBanksCount)
     {
         gActiveBank = gBankAttacker;
         gBattleMoveDamage = gBattleMons[gActiveBank].hp;
@@ -7184,18 +7178,18 @@ static void atk78_faintifabilitynotdamp(void)
         MarkBufferBankForExecution(gActiveBank);
         gBattlescriptCurrInstr++;
 
-        for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
+        for (gBankDefender = 0; gBankDefender < gBattleBanksCount; gBankDefender++)
         {
-            if (gBankTarget == gBankAttacker)
+            if (gBankDefender == gBankAttacker)
                 continue;
-            if (!(gAbsentBankFlags & gBitTable[gBankTarget]))
+            if (!(gAbsentBankFlags & gBitTable[gBankDefender]))
                 break;
         }
     }
     else
     {
         gLastUsedAbility = ABILITY_DAMP;
-        RecordAbilityBattle(gBankTarget, gBattleMons[gBankTarget].ability);
+        RecordAbilityBattle(gBankDefender, gBattleMons[gBankDefender].ability);
         gBattlescriptCurrInstr = BattleScript_DampStopsExplosion;
     }
 }
@@ -7219,15 +7213,15 @@ static void atk7A_jumpifnexttargetvalid(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        for (gBankTarget++; ; gBankTarget++)
+        for (gBankDefender++; ; gBankDefender++)
         {
-            if (gBankTarget == gBankAttacker)
+            if (gBankDefender == gBankAttacker)
                 continue;
-            if (!(gAbsentBankFlags & gBitTable[gBankTarget]))
+            if (!(gAbsentBankFlags & gBitTable[gBankDefender]))
                 break;
         }
 
-        if (gBankTarget >= gNoOfAllBanks)
+        if (gBankDefender >= gBattleBanksCount)
             gBattlescriptCurrInstr += 5;
         else
             gBattlescriptCurrInstr = jumpPtr;
@@ -7243,14 +7237,14 @@ static void atk7B_tryhealhalfhealth(void)
     const u8* failPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
     if (gBattlescriptCurrInstr[5] == BS_GET_ATTACKER)
-        gBankTarget = gBankAttacker;
+        gBankDefender = gBankAttacker;
 
-    gBattleMoveDamage = gBattleMons[gBankTarget].maxHP / 2;
+    gBattleMoveDamage = gBattleMons[gBankDefender].maxHP / 2;
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
     gBattleMoveDamage *= -1;
 
-    if (gBattleMons[gBankTarget].hp == gBattleMons[gBankTarget].maxHP)
+    if (gBattleMons[gBankDefender].hp == gBattleMons[gBankDefender].maxHP)
         gBattlescriptCurrInstr = failPtr;
     else
         gBattlescriptCurrInstr += 6;
@@ -7266,7 +7260,7 @@ static void atk7C_trymirrormove(void)
     for (i = 0; i < 3; i++)
         movesArray[i] = 0;
 
-    for (validMovesCount = 0, i = 0; i < gNoOfAllBanks; i++)
+    for (validMovesCount = 0, i = 0; i < gBattleBanksCount; i++)
     {
         if (i != gBankAttacker)
         {
@@ -7288,7 +7282,7 @@ static void atk7C_trymirrormove(void)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gCurrentMove = move;
-        gBankTarget = GetMoveTarget(gCurrentMove, 0);
+        gBankDefender = GetMoveTarget(gCurrentMove, 0);
         gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
     }
     else if (validMovesCount)
@@ -7296,7 +7290,7 @@ static void atk7C_trymirrormove(void)
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         i = Random() % validMovesCount;
         gCurrentMove = movesArray[i];
-        gBankTarget = GetMoveTarget(gCurrentMove, 0);
+        gBankDefender = GetMoveTarget(gCurrentMove, 0);
         gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
     }
     else
@@ -7310,7 +7304,7 @@ static void atk7D_setrain(void)
 {
     if (gBattleWeather & WEATHER_RAIN_ANY)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
     }
     else
@@ -7324,14 +7318,14 @@ static void atk7D_setrain(void)
 
 static void atk7E_setreflect(void)
 {
-    if (gSideAffecting[GET_BANK_SIDE(gBankAttacker)] & SIDE_STATUS_REFLECT)
+    if (gSideStatuses[GET_BANK_SIDE(gBankAttacker)] & SIDE_STATUS_REFLECT)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideAffecting[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_REFLECT;
+        gSideStatuses[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_REFLECT;
         gSideTimers[GET_BANK_SIDE(gBankAttacker)].reflectTimer = 5;
         gSideTimers[GET_BANK_SIDE(gBankAttacker)].reflectBank = gBankAttacker;
 
@@ -7345,20 +7339,20 @@ static void atk7E_setreflect(void)
 
 static void atk7F_setseeded(void)
 {
-    if (gBattleMoveFlags & MOVESTATUS_NOEFFECT || gStatuses3[gBankTarget] & STATUS3_LEECHSEED)
+    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBankDefender] & STATUS3_LEECHSEED)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
-    else if (gBattleMons[gBankTarget].type1 == TYPE_GRASS || gBattleMons[gBankTarget].type2 == TYPE_GRASS)
+    else if (gBattleMons[gBankDefender].type1 == TYPE_GRASS || gBattleMons[gBankDefender].type2 == TYPE_GRASS)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
     }
     else
     {
-        gStatuses3[gBankTarget] |= gBankAttacker;
-        gStatuses3[gBankTarget] |= STATUS3_LEECHSEED;
+        gStatuses3[gBankDefender] |= gBankAttacker;
+        gStatuses3[gBankDefender] |= STATUS3_LEECHSEED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
 
@@ -7376,8 +7370,8 @@ static void atk80_manipulatedamage(void)
         gBattleMoveDamage /= 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
-        if ((gBattleMons[gBankTarget].maxHP / 2) < gBattleMoveDamage)
-            gBattleMoveDamage = gBattleMons[gBankTarget].maxHP / 2;
+        if ((gBattleMons[gBankDefender].maxHP / 2) < gBattleMoveDamage)
+            gBattleMoveDamage = gBattleMons[gBankDefender].maxHP / 2;
         break;
     case ATK80_DMG_DOUBLED:
         gBattleMoveDamage *= 2;
@@ -7390,21 +7384,21 @@ static void atk80_manipulatedamage(void)
 static void atk81_trysetrest(void)
 {
     const u8 *failJump = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
-    gActiveBank = gBankTarget = gBankAttacker;
-    gBattleMoveDamage = gBattleMons[gBankTarget].maxHP * (-1);
+    gActiveBank = gBankDefender = gBankAttacker;
+    gBattleMoveDamage = gBattleMons[gBankDefender].maxHP * (-1);
 
-    if (gBattleMons[gBankTarget].hp == gBattleMons[gBankTarget].maxHP)
+    if (gBattleMons[gBankDefender].hp == gBattleMons[gBankDefender].maxHP)
     {
         gBattlescriptCurrInstr = failJump;
     }
     else
     {
-        if (gBattleMons[gBankTarget].status1 & ((u8)(~STATUS_SLEEP)))
+        if (gBattleMons[gBankDefender].status1 & ((u8)(~STATUS1_SLEEP)))
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
         else
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
 
-        gBattleMons[gBankTarget].status1 = 3;
+        gBattleMons[gBankDefender].status1 = 3;
         EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
         MarkBufferBankForExecution(gActiveBank);
         gBattlescriptCurrInstr += 5;
@@ -7430,16 +7424,16 @@ bool8 UproarWakeUpCheck(u8 bank)
 {
     s32 i;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (!(gBattleMons[i].status2 & STATUS2_UPROAR) || gBattleMons[bank].ability == ABILITY_SOUNDPROOF)
             continue;
 
         gBattleScripting.bank = i;
 
-        if (gBankTarget == 0xFF)
-            gBankTarget = i;
-        else if (gBankTarget == i)
+        if (gBankDefender == 0xFF)
+            gBankDefender = i;
+        else if (gBankDefender == i)
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         else
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -7447,7 +7441,7 @@ bool8 UproarWakeUpCheck(u8 bank)
         break;
     }
 
-    if (i == gNoOfAllBanks)
+    if (i == gBattleBanksCount)
         return FALSE;
     else
         return TRUE;
@@ -7457,17 +7451,17 @@ static void atk84_jumpifcantmakeasleep(void)
 {
     const u8 *jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (UproarWakeUpCheck(gBankTarget))
+    if (UproarWakeUpCheck(gBankDefender))
     {
         gBattlescriptCurrInstr = jumpPtr;
     }
-    else if (gBattleMons[gBankTarget].ability == ABILITY_INSOMNIA
-            || gBattleMons[gBankTarget].ability == ABILITY_VITAL_SPIRIT)
+    else if (gBattleMons[gBankDefender].ability == ABILITY_INSOMNIA
+            || gBattleMons[gBankDefender].ability == ABILITY_VITAL_SPIRIT)
     {
-        gLastUsedAbility = gBattleMons[gBankTarget].ability;
+        gLastUsedAbility = gBattleMons[gBankDefender].ability;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         gBattlescriptCurrInstr = jumpPtr;
-        RecordAbilityBattle(gBankTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
     }
     else
     {
@@ -7479,7 +7473,7 @@ static void atk85_stockpile(void)
 {
     if (gDisableStructs[gBankAttacker].stockpileCounter == 3)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
@@ -7504,9 +7498,9 @@ static void atk86_stockpiletobasedamage(void)
     {
         if (gBattleCommunication[6] != 1)
         {
-            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankTarget], gCurrentMove,
-                                                    gSideAffecting[GET_BANK_SIDE(gBankTarget)], 0,
-                                                    0, gBankAttacker, gBankTarget)
+            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankDefender], gCurrentMove,
+                                                    gSideStatuses[GET_BANK_SIDE(gBankDefender)], 0,
+                                                    0, gBankAttacker, gBankDefender)
                                 * gDisableStructs[gBankAttacker].stockpileCounter;
             gBattleScripting.animTurn = gDisableStructs[gBankAttacker].stockpileCounter;
 
@@ -7532,7 +7526,7 @@ static void atk87_stockpiletohpheal(void)
     {
         gDisableStructs[gBankAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr = jumpPtr;
-        gBankTarget = gBankAttacker;
+        gBankDefender = gBankAttacker;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
@@ -7546,7 +7540,7 @@ static void atk87_stockpiletohpheal(void)
         gBattleScripting.animTurn = gDisableStructs[gBankAttacker].stockpileCounter;
         gDisableStructs[gBankAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr += 5;
-        gBankTarget = gBankAttacker;
+        gBankDefender = gBankAttacker;
     }
 }
 
@@ -7568,7 +7562,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
     if (flags & MOVE_EFFECT_AFFECTS_USER)
         gActiveBank = gBankAttacker;
     else
-        gActiveBank = gBankTarget;
+        gActiveBank = gBankDefender;
 
     flags &= ~(MOVE_EFFECT_AFFECTS_USER);
 
@@ -7684,7 +7678,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
             if (gBattleMons[gActiveBank].statStages[statId] == 0)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
             else
-                gBattleCommunication[MULTISTRING_CHOOSER] = (gBankTarget == gActiveBank);
+                gBattleCommunication[MULTISTRING_CHOOSER] = (gBankDefender == gActiveBank);
 
         }
     }
@@ -7711,7 +7705,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
         if (gBattleMons[gActiveBank].statStages[statId] == 0xC)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         else
-            gBattleCommunication[MULTISTRING_CHOOSER] = (gBankTarget == gActiveBank);
+            gBattleCommunication[MULTISTRING_CHOOSER] = (gBankDefender == gActiveBank);
     }
 
     gBattleMons[gActiveBank].statStages[statId] += statValue;
@@ -7721,7 +7715,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
         gBattleMons[gActiveBank].statStages[statId] = 0xC;
 
     if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_CHANGE_BS_PTR)
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
 
     if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && !(flags & STAT_CHANGE_BS_PTR))
         return STAT_CHANGE_DIDNT_WORK;
@@ -7740,7 +7734,7 @@ static void atk8A_normalisebuffs(void) // haze
 {
     s32 i, j;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         for (j = 0; j < BATTLE_STATS_NO; j++)
             gBattleMons[i].statStages[j] = 6;
@@ -7794,19 +7788,19 @@ static void atk8E_initmultihitstring(void)
 
 static bool8 TryDoForceSwitchOut(void)
 {
-    if (gBattleMons[gBankAttacker].level >= gBattleMons[gBankTarget].level)
+    if (gBattleMons[gBankAttacker].level >= gBattleMons[gBankDefender].level)
     {
-        *(gBattleStruct->field_58 + gBankTarget) = gBattlePartyID[gBankTarget];
+        *(gBattleStruct->field_58 + gBankDefender) = gBattlePartyID[gBankDefender];
     }
     else
     {
         u16 random = Random() & 0xFF;
-        if ((u32)((random * (gBattleMons[gBankAttacker].level + gBattleMons[gBankTarget].level) >> 8) + 1) <= (gBattleMons[gBankTarget].level / 4))
+        if ((u32)((random * (gBattleMons[gBankAttacker].level + gBattleMons[gBankDefender].level) >> 8) + 1) <= (gBattleMons[gBankDefender].level / 4))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
             return FALSE;
         }
-        *(gBattleStruct->field_58 + gBankTarget) = gBattlePartyID[gBankTarget];
+        *(gBattleStruct->field_58 + gBankDefender) = gBattlePartyID[gBankDefender];
     }
 
     gBattlescriptCurrInstr = BattleScript_SuccessForceOut;
@@ -7833,7 +7827,7 @@ static void atk8F_forcerandomswitch(void)
 
     if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER))
     {
-        if (GetBankSide(gBankTarget) == SIDE_PLAYER)
+        if (GetBankSide(gBankDefender) == SIDE_PLAYER)
             party = gPlayerParty;
         else
             party = gEnemyParty;
@@ -7842,7 +7836,7 @@ static void atk8F_forcerandomswitch(void)
             || (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER && gBattleTypeFlags & BATTLE_TYPE_x2000000)
             || (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER))
         {
-            if ((gBankTarget & BIT_MON) != 0)
+            if ((gBankDefender & BIT_MON) != 0)
             {
                 firstMonId = 3;
                 lastMonId = 6;
@@ -7854,13 +7848,13 @@ static void atk8F_forcerandomswitch(void)
             }
             monsCount = 3;
             minNeeded = 1;
-            bank2PartyId = gBattlePartyID[gBankTarget];
-            bank1PartyId = gBattlePartyID[gBankTarget ^ BIT_MON];
+            bank2PartyId = gBattlePartyID[gBankDefender];
+            bank1PartyId = gBattlePartyID[gBankDefender ^ BIT_MON];
         }
         else if ((gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
                  || (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_x2000000))
         {
-            if (sub_806D82C(GetBankMultiplayerId(gBankTarget)) == 1)
+            if (sub_806D82C(GetBankMultiplayerId(gBankDefender)) == 1)
             {
                 firstMonId = 3;
                 lastMonId = 6;
@@ -7872,12 +7866,12 @@ static void atk8F_forcerandomswitch(void)
             }
             monsCount = 3;
             minNeeded = 1;
-            bank2PartyId = gBattlePartyID[gBankTarget];
-            bank1PartyId = gBattlePartyID[gBankTarget ^ BIT_MON];
+            bank2PartyId = gBattlePartyID[gBankDefender];
+            bank1PartyId = gBattlePartyID[gBankDefender ^ BIT_MON];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
         {
-            if (GetBankSide(gBankTarget) == SIDE_PLAYER)
+            if (GetBankSide(gBankDefender) == SIDE_PLAYER)
             {
                 firstMonId = 0;
                 lastMonId = 6;
@@ -7886,7 +7880,7 @@ static void atk8F_forcerandomswitch(void)
             }
             else
             {
-                if ((gBankTarget & BIT_MON) != 0)
+                if ((gBankDefender & BIT_MON) != 0)
                 {
                     firstMonId = 3;
                     lastMonId = 6;
@@ -7899,8 +7893,8 @@ static void atk8F_forcerandomswitch(void)
                 monsCount = 3;
                 minNeeded = 1;
             }
-            bank2PartyId = gBattlePartyID[gBankTarget];
-            bank1PartyId = gBattlePartyID[gBankTarget ^ BIT_MON];
+            bank2PartyId = gBattlePartyID[gBankDefender];
+            bank1PartyId = gBattlePartyID[gBankDefender ^ BIT_MON];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
@@ -7908,8 +7902,8 @@ static void atk8F_forcerandomswitch(void)
             lastMonId = 6;
             monsCount = 6;
             minNeeded = 2;
-            bank2PartyId = gBattlePartyID[gBankTarget];
-            bank1PartyId = gBattlePartyID[gBankTarget ^ BIT_MON];
+            bank2PartyId = gBattlePartyID[gBankDefender];
+            bank1PartyId = gBattlePartyID[gBankDefender ^ BIT_MON];
         }
         else
         {
@@ -7917,8 +7911,8 @@ static void atk8F_forcerandomswitch(void)
             lastMonId = 6;
             monsCount = 6;
             minNeeded = 1;
-            bank2PartyId = gBattlePartyID[gBankTarget]; // there is only one pokemon out in single battles
-            bank1PartyId = gBattlePartyID[gBankTarget];
+            bank2PartyId = gBattlePartyID[gBankDefender]; // there is only one pokemon out in single battles
+            bank1PartyId = gBattlePartyID[gBankDefender];
         }
 
         for (i = firstMonId; i < lastMonId; i++)
@@ -7950,22 +7944,22 @@ static void atk8F_forcerandomswitch(void)
                        || GetMonData(&party[i], MON_DATA_IS_EGG) == TRUE
                        || GetMonData(&party[i], MON_DATA_HP) == 0);
             }
-            *(gBattleStruct->monToSwitchIntoId + gBankTarget) = i;
+            *(gBattleStruct->monToSwitchIntoId + gBankDefender) = i;
 
             if (!sub_81B1250())
-                sub_803BDA0(gBankTarget);
+                sub_803BDA0(gBankDefender);
 
             if ((gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                 || (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
                 || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                 || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                sub_81B8E80(gBankTarget, i, 0);
-                sub_81B8E80(gBankTarget ^ BIT_MON, i, 1);
+                sub_81B8E80(gBankDefender, i, 0);
+                sub_81B8E80(gBankDefender ^ BIT_MON, i, 1);
             }
 
             if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
-                sub_80571DC(gBankTarget, i);
+                sub_80571DC(gBankDefender, i);
         }
     }
     else
@@ -8058,14 +8052,14 @@ static void atk91_givepaydaymoney(void)
 
 static void atk92_setlightscreen(void)
 {
-    if (gSideAffecting[GET_BANK_SIDE(gBankAttacker)] & SIDE_STATUS_LIGHTSCREEN)
+    if (gSideStatuses[GET_BANK_SIDE(gBankAttacker)] & SIDE_STATUS_LIGHTSCREEN)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideAffecting[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_LIGHTSCREEN;
+        gSideStatuses[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_LIGHTSCREEN;
         gSideTimers[GET_BANK_SIDE(gBankAttacker)].lightscreenTimer = 5;
         gSideTimers[GET_BANK_SIDE(gBankAttacker)].lightscreenBank = gBankAttacker;
 
@@ -8082,80 +8076,80 @@ static void atk93_tryKO(void)
 {
     u8 holdEffect, param;
 
-    if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY)
     {
-       holdEffect = gEnigmaBerries[gBankTarget].holdEffect;
-       param = gEnigmaBerries[gBankTarget].holdEffectParam;
+       holdEffect = gEnigmaBerries[gBankDefender].holdEffect;
+       param = gEnigmaBerries[gBankDefender].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item);
-        param = ItemId_GetHoldEffectParam(gBattleMons[gBankTarget].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankDefender].item);
+        param = ItemId_GetHoldEffectParam(gBattleMons[gBankDefender].item);
     }
 
-    gStringBank = gBankTarget;
+    gStringBank = gBankDefender;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
-        RecordItemEffectBattle(gBankTarget, HOLD_EFFECT_FOCUS_BAND);
-        gSpecialStatuses[gBankTarget].focusBanded = 1;
+        RecordItemEffectBattle(gBankDefender, HOLD_EFFECT_FOCUS_BAND);
+        gSpecialStatuses[gBankDefender].focusBanded = 1;
     }
 
-    if (gBattleMons[gBankTarget].ability == ABILITY_STURDY)
+    if (gBattleMons[gBankDefender].ability == ABILITY_STURDY)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gLastUsedAbility = ABILITY_STURDY;
         gBattlescriptCurrInstr = BattleScript_SturdyPreventsOHKO;
-        RecordAbilityBattle(gBankTarget, ABILITY_STURDY);
+        RecordAbilityBattle(gBankDefender, ABILITY_STURDY);
     }
     else
     {
         u16 chance;
-        if (!(gStatuses3[gBankTarget] & STATUS3_ALWAYS_HITS))
+        if (!(gStatuses3[gBankDefender] & STATUS3_ALWAYS_HITS))
         {
-            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBankAttacker].level - gBattleMons[gBankTarget].level);
-            if (Random() % 100 + 1 < chance && gBattleMons[gBankAttacker].level >= gBattleMons[gBankTarget].level)
+            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBankAttacker].level - gBattleMons[gBankDefender].level);
+            if (Random() % 100 + 1 < chance && gBattleMons[gBankAttacker].level >= gBattleMons[gBankDefender].level)
                 chance = TRUE;
             else
                 chance = FALSE;
         }
-        else if (gDisableStructs[gBankTarget].bankWithSureHit == gBankAttacker
-                 && gBattleMons[gBankAttacker].level >= gBattleMons[gBankTarget].level)
+        else if (gDisableStructs[gBankDefender].bankWithSureHit == gBankAttacker
+                 && gBattleMons[gBankAttacker].level >= gBattleMons[gBankDefender].level)
         {
             chance = TRUE;
         }
         else
         {
-            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBankAttacker].level - gBattleMons[gBankTarget].level);
-            if (Random() % 100 + 1 < chance && gBattleMons[gBankAttacker].level >= gBattleMons[gBankTarget].level)
+            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBankAttacker].level - gBattleMons[gBankDefender].level);
+            if (Random() % 100 + 1 < chance && gBattleMons[gBankAttacker].level >= gBattleMons[gBankDefender].level)
                 chance = TRUE;
             else
                 chance = FALSE;
         }
         if (chance)
         {
-            if (gProtectStructs[gBankTarget].endured)
+            if (gProtectStructs[gBankDefender].endured)
             {
-                gBattleMoveDamage = gBattleMons[gBankTarget].hp - 1;
-                gBattleMoveFlags |= MOVESTATUS_ENDURED;
+                gBattleMoveDamage = gBattleMons[gBankDefender].hp - 1;
+                gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
             }
-            else if (gSpecialStatuses[gBankTarget].focusBanded)
+            else if (gSpecialStatuses[gBankDefender].focusBanded)
             {
-                gBattleMoveDamage = gBattleMons[gBankTarget].hp - 1;
-                gBattleMoveFlags |= MOVESTATUS_HUNGON;
-                gLastUsedItem = gBattleMons[gBankTarget].item;
+                gBattleMoveDamage = gBattleMons[gBankDefender].hp - 1;
+                gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
+                gLastUsedItem = gBattleMons[gBankDefender].item;
             }
             else
             {
-                gBattleMoveDamage = gBattleMons[gBankTarget].hp;
-                gBattleMoveFlags |= MOVESTATUS_ONEHITKO;
+                gBattleMoveDamage = gBattleMons[gBankDefender].hp;
+                gMoveResultFlags |= MOVE_RESULT_ONE_HIT_KO;
             }
             gBattlescriptCurrInstr += 5;
         }
         else
         {
-            gBattleMoveFlags |= MOVESTATUS_MISSED;
-            if (gBattleMons[gBankAttacker].level >= gBattleMons[gBankTarget].level)
+            gMoveResultFlags |= MOVE_RESULT_MISSED;
+            if (gBattleMons[gBankAttacker].level >= gBattleMons[gBankDefender].level)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             else
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -8166,7 +8160,7 @@ static void atk93_tryKO(void)
 
 static void atk94_damagetohalftargethp(void) // super fang
 {
-    gBattleMoveDamage = gBattleMons[gBankTarget].hp / 2;
+    gBattleMoveDamage = gBattleMons[gBankDefender].hp / 2;
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
 
@@ -8177,7 +8171,7 @@ static void atk95_setsandstorm(void)
 {
     if (gBattleWeather & WEATHER_SANDSTORM_ANY)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
     }
     else
@@ -8253,10 +8247,10 @@ static void atk97_tryinfatuating(void)
     else
         monAttacker = &gEnemyParty[gBattlePartyID[gBankAttacker]];
 
-    if (GetBankSide(gBankTarget) == SIDE_PLAYER)
-        monTarget = &gPlayerParty[gBattlePartyID[gBankTarget]];
+    if (GetBankSide(gBankDefender) == SIDE_PLAYER)
+        monTarget = &gPlayerParty[gBattlePartyID[gBankDefender]];
     else
-        monTarget = &gEnemyParty[gBattlePartyID[gBankTarget]];
+        monTarget = &gEnemyParty[gBattlePartyID[gBankDefender]];
 
     speciesAttacker = GetMonData(monAttacker, MON_DATA_SPECIES);
     personalityAttacker = GetMonData(monAttacker, MON_DATA_PERSONALITY);
@@ -8264,16 +8258,16 @@ static void atk97_tryinfatuating(void)
     speciesTarget = GetMonData(monTarget, MON_DATA_SPECIES);
     personalityTarget = GetMonData(monTarget, MON_DATA_PERSONALITY);
 
-    if (gBattleMons[gBankTarget].ability == ABILITY_OBLIVIOUS)
+    if (gBattleMons[gBankDefender].ability == ABILITY_OBLIVIOUS)
     {
         gBattlescriptCurrInstr = BattleScript_ObliviousPreventsAttraction;
         gLastUsedAbility = ABILITY_OBLIVIOUS;
-        RecordAbilityBattle(gBankTarget, ABILITY_OBLIVIOUS);
+        RecordAbilityBattle(gBankDefender, ABILITY_OBLIVIOUS);
     }
     else
     {
         if (GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget)
-            || gBattleMons[gBankTarget].status2 & STATUS2_INFATUATION
+            || gBattleMons[gBankDefender].status2 & STATUS2_INFATUATION
             || GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == MON_GENDERLESS
             || GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget) == MON_GENDERLESS)
         {
@@ -8281,7 +8275,7 @@ static void atk97_tryinfatuating(void)
         }
         else
         {
-            gBattleMons[gBankTarget].status2 |= STATUS2_INFATUATED_WITH(gBankAttacker);
+            gBattleMons[gBankDefender].status2 |= STATUS2_INFATUATED_WITH(gBankAttacker);
             gBattlescriptCurrInstr += 5;
         }
     }
@@ -8309,7 +8303,7 @@ static void atk98_updatestatusicon(void)
         }
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         {
-            gActiveBank = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_MON);
+            gActiveBank = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_MON);
             if (!(gAbsentBankFlags & gBitTable[gActiveBank]))
             {
                 EmitStatusIconUpdate(0, gBattleMons[gActiveBank].status1, gBattleMons[gActiveBank].status2);
@@ -8324,14 +8318,14 @@ static void atk99_setmist(void)
 {
     if (gSideTimers[GET_BANK_SIDE(gBankAttacker)].mistTimer)
     {
-        gBattleMoveFlags |= MOVESTATUS_FAILED;
+        gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
         gSideTimers[GET_BANK_SIDE(gBankAttacker)].mistTimer = 5;
         gSideTimers[GET_BANK_SIDE(gBankAttacker)].mistBank = gBankAttacker;
-        gSideAffecting[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_MIST;
+        gSideStatuses[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_MIST;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     gBattlescriptCurrInstr++;
@@ -8341,7 +8335,7 @@ static void atk9A_setfocusenergy(void)
 {
     if (gBattleMons[gBankAttacker].status2 & STATUS2_FOCUS_ENERGY)
     {
-        gBattleMoveFlags |= MOVESTATUS_FAILED;
+        gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
@@ -8356,10 +8350,10 @@ static void atk9B_transformdataexecution(void)
 {
     gChosenMove = 0xFFFF;
     gBattlescriptCurrInstr++;
-    if (gBattleMons[gBankTarget].status2 & STATUS2_TRANSFORMED
-        || gStatuses3[gBankTarget] & STATUS3_SEMI_INVULNERABLE)
+    if (gBattleMons[gBankDefender].status2 & STATUS2_TRANSFORMED
+        || gStatuses3[gBankDefender] & STATUS3_SEMI_INVULNERABLE)
     {
-        gBattleMoveFlags |= MOVESTATUS_FAILED;
+        gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
@@ -8370,13 +8364,13 @@ static void atk9B_transformdataexecution(void)
         gBattleMons[gBankAttacker].status2 |= STATUS2_TRANSFORMED;
         gDisableStructs[gBankAttacker].disabledMove = 0;
         gDisableStructs[gBankAttacker].disableTimer1 = 0;
-        gDisableStructs[gBankAttacker].transformedMonPersonality = gBattleMons[gBankTarget].personality;
+        gDisableStructs[gBankAttacker].transformedMonPersonality = gBattleMons[gBankDefender].personality;
         gDisableStructs[gBankAttacker].unk18_b = 0;
 
-        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBankTarget].species)
+        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBankDefender].species)
 
         battleMonAttacker = (u8*)(&gBattleMons[gBankAttacker]);
-        battleMonTarget = (u8*)(&gBattleMons[gBankTarget]);
+        battleMonTarget = (u8*)(&gBattleMons[gBankDefender]);
 
         for (i = 0; i < offsetof(struct BattlePokemon, pp); i++)
             battleMonAttacker[i] = battleMonTarget[i];
@@ -8436,10 +8430,10 @@ static void atk9D_mimicattackcopy(void)
 {
     gChosenMove = 0xFFFF;
 
-    if (IsMoveUncopyableByMimic(gLastMoves[gBankTarget])
+    if (IsMoveUncopyableByMimic(gLastMoves[gBankDefender])
         || gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED
-        || gLastMoves[gBankTarget] == 0
-        || gLastMoves[gBankTarget] == 0xFFFF)
+        || gLastMoves[gBankDefender] == 0
+        || gLastMoves[gBankDefender] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8449,20 +8443,20 @@ static void atk9D_mimicattackcopy(void)
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMons[gBankAttacker].moves[i] == gLastMoves[gBankTarget])
+            if (gBattleMons[gBankAttacker].moves[i] == gLastMoves[gBankDefender])
                 break;
         }
 
         if (i == 4)
         {
-            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gLastMoves[gBankTarget];
-            if (gBattleMoves[gLastMoves[gBankTarget]].pp < 5)
-                gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBankTarget]].pp;
+            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gLastMoves[gBankDefender];
+            if (gBattleMoves[gLastMoves[gBankDefender]].pp < 5)
+                gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBankDefender]].pp;
             else
                 gBattleMons[gBankAttacker].pp[gCurrMovePos] = 5;
 
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBankTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBankDefender])
 
             gDisableStructs[gBankAttacker].unk18_b |= gBitTable[gCurrMovePos];
             gBattlescriptCurrInstr += 5;
@@ -8500,7 +8494,7 @@ static void atk9E_metronome(void)
         {
             gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
             gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
-            gBankTarget = GetMoveTarget(gCurrentMove, 0);
+            gBankDefender = GetMoveTarget(gCurrentMove, 0);
             return;
         }
     }
@@ -8535,9 +8529,9 @@ static void atkA1_counterdamagecalculator(void)
         gBattleMoveDamage = gProtectStructs[gBankAttacker].physicalDmg * 2;
 
         if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp)
-            gBankTarget = gSideTimers[sideTarget].followmeTarget;
+            gBankDefender = gSideTimers[sideTarget].followmeTarget;
         else
-            gBankTarget = gProtectStructs[gBankAttacker].physicalBank;
+            gBankDefender = gProtectStructs[gBankAttacker].physicalBank;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -8558,9 +8552,9 @@ static void atkA2_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the p
         gBattleMoveDamage = gProtectStructs[gBankAttacker].specialDmg * 2;
 
         if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp)
-            gBankTarget = gSideTimers[sideTarget].followmeTarget;
+            gBankDefender = gSideTimers[sideTarget].followmeTarget;
         else
-            gBankTarget = gProtectStructs[gBankAttacker].specialBank;
+            gBankDefender = gProtectStructs[gBankAttacker].specialBank;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -8577,17 +8571,17 @@ static void atkA3_disablelastusedattack(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBankTarget].moves[i] == gLastMoves[gBankTarget])
+        if (gBattleMons[gBankDefender].moves[i] == gLastMoves[gBankDefender])
             break;
     }
-    if (gDisableStructs[gBankTarget].disabledMove == 0
-        && i != 4 && gBattleMons[gBankTarget].pp[i] != 0)
+    if (gDisableStructs[gBankDefender].disabledMove == 0
+        && i != 4 && gBattleMons[gBankDefender].pp[i] != 0)
     {
-        PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBankTarget].moves[i])
+        PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBankDefender].moves[i])
 
-        gDisableStructs[gBankTarget].disabledMove = gBattleMons[gBankTarget].moves[i];
-        gDisableStructs[gBankTarget].disableTimer1 = (Random() & 3) + 2;
-        gDisableStructs[gBankTarget].disableTimer2 = gDisableStructs[gBankTarget].disableTimer1; // used to save the random amount of turns?
+        gDisableStructs[gBankDefender].disabledMove = gBattleMons[gBankDefender].moves[i];
+        gDisableStructs[gBankDefender].disableTimer1 = (Random() & 3) + 2;
+        gDisableStructs[gBankDefender].disableTimer2 = gDisableStructs[gBankDefender].disableTimer1; // used to save the random amount of turns?
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -8602,24 +8596,24 @@ static void atkA4_trysetencore(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBankTarget].moves[i] == gLastMoves[gBankTarget])
+        if (gBattleMons[gBankDefender].moves[i] == gLastMoves[gBankDefender])
             break;
     }
 
-    if (gLastMoves[gBankTarget] == MOVE_STRUGGLE
-        || gLastMoves[gBankTarget] == MOVE_ENCORE
-        || gLastMoves[gBankTarget] == MOVE_MIRROR_MOVE)
+    if (gLastMoves[gBankDefender] == MOVE_STRUGGLE
+        || gLastMoves[gBankDefender] == MOVE_ENCORE
+        || gLastMoves[gBankDefender] == MOVE_MIRROR_MOVE)
     {
         i = 4;
     }
 
-    if (gDisableStructs[gBankTarget].encoredMove == 0
-        && i != 4 && gBattleMons[gBankTarget].pp[i] != 0)
+    if (gDisableStructs[gBankDefender].encoredMove == 0
+        && i != 4 && gBattleMons[gBankDefender].pp[i] != 0)
     {
-        gDisableStructs[gBankTarget].encoredMove = gBattleMons[gBankTarget].moves[i];
-        gDisableStructs[gBankTarget].encoredMovePos = i;
-        gDisableStructs[gBankTarget].encoreTimer1 = (Random() & 3) + 3;
-        gDisableStructs[gBankTarget].encoreTimer2 = gDisableStructs[gBankTarget].encoreTimer1;
+        gDisableStructs[gBankDefender].encoredMove = gBattleMons[gBankDefender].moves[i];
+        gDisableStructs[gBankDefender].encoredMovePos = i;
+        gDisableStructs[gBankDefender].encoreTimer1 = (Random() & 3) + 3;
+        gDisableStructs[gBankDefender].encoreTimer2 = gDisableStructs[gBankDefender].encoreTimer1;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -8630,10 +8624,10 @@ static void atkA4_trysetencore(void)
 
 static void atkA5_painsplitdmgcalc(void)
 {
-    if (!(gBattleMons[gBankTarget].status2 & STATUS2_SUBSTITUTE))
+    if (!(gBattleMons[gBankDefender].status2 & STATUS2_SUBSTITUTE))
     {
-        s32 hpDiff = (gBattleMons[gBankAttacker].hp + gBattleMons[gBankTarget].hp) / 2;
-        s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBankTarget].hp - hpDiff;
+        s32 hpDiff = (gBattleMons[gBankAttacker].hp + gBattleMons[gBankDefender].hp) / 2;
+        s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBankDefender].hp - hpDiff;
         u8* storeLoc = (void*)(&gBattleScripting.painSplitHp);
 
         storeLoc[0] = (painSplitHp);
@@ -8642,7 +8636,7 @@ static void atkA5_painsplitdmgcalc(void)
         storeLoc[3] = (painSplitHp & 0xFF000000) >> 24;
 
         gBattleMoveDamage = gBattleMons[gBankAttacker].hp - hpDiff;
-        gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF;
+        gSpecialStatuses[gBankDefender].moveturnLostHP = 0xFFFF;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -8720,9 +8714,9 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
 
 static void atkA7_setalwayshitflag(void)
 {
-    gStatuses3[gBankTarget] &= ~(STATUS3_ALWAYS_HITS);
-    gStatuses3[gBankTarget] |= 0x10;
-    gDisableStructs[gBankTarget].bankWithSureHit = gBankAttacker;
+    gStatuses3[gBankDefender] &= ~(STATUS3_ALWAYS_HITS);
+    gStatuses3[gBankDefender] |= 0x10;
+    gDisableStructs[gBankDefender].bankWithSureHit = gBankAttacker;
     gBattlescriptCurrInstr++;
 }
 
@@ -8731,10 +8725,10 @@ static void atkA8_copymovepermanently(void) // sketch
     gChosenMove = 0xFFFF;
 
     if (!(gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED)
-        && gLastPrintedMoves[gBankTarget] != MOVE_STRUGGLE
-        && gLastPrintedMoves[gBankTarget] != 0
-        && gLastPrintedMoves[gBankTarget] != 0xFFFF
-        && gLastPrintedMoves[gBankTarget] != MOVE_SKETCH)
+        && gLastPrintedMoves[gBankDefender] != MOVE_STRUGGLE
+        && gLastPrintedMoves[gBankDefender] != 0
+        && gLastPrintedMoves[gBankDefender] != 0xFFFF
+        && gLastPrintedMoves[gBankDefender] != MOVE_SKETCH)
     {
         s32 i;
 
@@ -8742,7 +8736,7 @@ static void atkA8_copymovepermanently(void) // sketch
         {
             if (gBattleMons[gBankAttacker].moves[i] == MOVE_SKETCH)
                 continue;
-            if (gBattleMons[gBankAttacker].moves[i] == gLastPrintedMoves[gBankTarget])
+            if (gBattleMons[gBankAttacker].moves[i] == gLastPrintedMoves[gBankDefender])
                 break;
         }
 
@@ -8754,8 +8748,8 @@ static void atkA8_copymovepermanently(void) // sketch
         {
             struct MovePpInfo movePpData;
 
-            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBankTarget];
-            gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBankTarget]].pp;
+            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBankDefender];
+            gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBankDefender]].pp;
             gActiveBank = gBankAttacker;
 
             for (i = 0; i < 4; i++)
@@ -8768,7 +8762,7 @@ static void atkA8_copymovepermanently(void) // sketch
             EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct MovePpInfo), &movePpData);
             MarkBufferBankForExecution(gActiveBank);
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBankTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBankDefender])
 
             gBattlescriptCurrInstr += 5;
         }
@@ -8855,7 +8849,7 @@ static void atkA9_trychoosesleeptalkmove(void)
         gRandomMove = gBattleMons[gBankAttacker].moves[movePosition];
         gCurrMovePos = movePosition;
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
-        gBankTarget = GetMoveTarget(gRandomMove, 0);
+        gBankDefender = GetMoveTarget(gRandomMove, 0);
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
@@ -8869,8 +8863,8 @@ static void atkAA_setdestinybond(void)
 static void TrySetDestinyBondToHappen(void)
 {
     u8 sideAttacker = GetBankSide(gBankAttacker);
-    u8 sideTarget = GetBankSide(gBankTarget);
-    if (gBattleMons[gBankTarget].status2 & STATUS2_DESTINY_BOND
+    u8 sideTarget = GetBankSide(gBankDefender);
+    if (gBattleMons[gBankDefender].status2 & STATUS2_DESTINY_BOND
         && sideAttacker != sideTarget
         && !(gHitMarker & HITMARKER_GRUDGE))
     {
@@ -8901,31 +8895,31 @@ static void atkAC_remaininghptopower(void)
 
 static void atkAD_tryspiteppreduce(void)
 {
-    if (gLastMoves[gBankTarget] != 0
-        && gLastMoves[gBankTarget] != 0xFFFF)
+    if (gLastMoves[gBankDefender] != 0
+        && gLastMoves[gBankDefender] != 0xFFFF)
     {
         s32 i;
 
         for (i = 0; i < 4; i++)
         {
-            if (gLastMoves[gBankTarget] == gBattleMons[gBankTarget].moves[i])
+            if (gLastMoves[gBankDefender] == gBattleMons[gBankDefender].moves[i])
                 break;
         }
 
-        if (i != 4 && gBattleMons[gBankTarget].pp[i] > 1)
+        if (i != 4 && gBattleMons[gBankDefender].pp[i] > 1)
         {
             s32 ppToDeduct = (Random() & 3) + 2;
-            if (gBattleMons[gBankTarget].pp[i] < ppToDeduct)
-                ppToDeduct = gBattleMons[gBankTarget].pp[i];
+            if (gBattleMons[gBankDefender].pp[i] < ppToDeduct)
+                ppToDeduct = gBattleMons[gBankDefender].pp[i];
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBankTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBankDefender])
 
             ConvertIntToDecimalStringN(gBattleTextBuff2, ppToDeduct, 0, 1);
 
             PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 1, ppToDeduct)
 
-            gBattleMons[gBankTarget].pp[i] -= ppToDeduct;
-            gActiveBank = gBankTarget;
+            gBattleMons[gBankDefender].pp[i] -= ppToDeduct;
+            gActiveBank = gBankDefender;
 
             if (!(gDisableStructs[gActiveBank].unk18_b & gBitTable[i])
                 && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
@@ -8936,8 +8930,8 @@ static void atkAD_tryspiteppreduce(void)
 
             gBattlescriptCurrInstr += 5;
 
-            if (gBattleMons[gBankTarget].pp[i] == 0)
-                CancelMultiTurnMoves(gBankTarget);
+            if (gBattleMons[gBankDefender].pp[i] == 0)
+                CancelMultiTurnMoves(gBankDefender);
         }
         else
         {
@@ -8978,7 +8972,7 @@ static void atkAE_healpartystatus(void)
             gBattleCommunication[MULTISTRING_CHOOSER] |= 1;
         }
 
-        gActiveBank = gBattleScripting.bank = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_MON);
+        gActiveBank = gBattleScripting.bank = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_MON);
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
             && !(gAbsentBankFlags & gBitTable[gActiveBank]))
@@ -9026,7 +9020,7 @@ static void atkAE_healpartystatus(void)
         gBattleMons[gBankAttacker].status1 = 0;
         gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
 
-        gActiveBank = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_MON);
+        gActiveBank = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_MON);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
             && !(gAbsentBankFlags & gBitTable[gActiveBank]))
         {
@@ -9048,13 +9042,13 @@ static void atkAE_healpartystatus(void)
 
 static void atkAF_cursetarget(void)
 {
-    if (gBattleMons[gBankTarget].status2 & STATUS2_CURSED)
+    if (gBattleMons[gBankDefender].status2 & STATUS2_CURSED)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMons[gBankTarget].status2 |= STATUS2_CURSED;
+        gBattleMons[gBankDefender].status2 |= STATUS2_CURSED;
         gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
@@ -9074,7 +9068,7 @@ static void atkB0_trysetspikes(void)
     }
     else
     {
-        gSideAffecting[targetSide] |= SIDE_STATUS_SPIKES;
+        gSideStatuses[targetSide] |= SIDE_STATUS_SPIKES;
         gSideTimers[targetSide].spikesAmount++;
         gBattlescriptCurrInstr += 5;
     }
@@ -9082,7 +9076,7 @@ static void atkB0_trysetspikes(void)
 
 static void atkB1_setforesight(void)
 {
-    gBattleMons[gBankTarget].status2 |= STATUS2_FORESIGHT;
+    gBattleMons[gBankDefender].status2 |= STATUS2_FORESIGHT;
     gBattlescriptCurrInstr++;
 }
 
@@ -9091,7 +9085,7 @@ static void atkB2_trysetperishsong(void)
     s32 i;
     s32 notAffectedCount = 0;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (gStatuses3[i] & STATUS3_PERISH_SONG
             || gBattleMons[i].ability == ABILITY_SOUNDPROOF)
@@ -9108,7 +9102,7 @@ static void atkB2_trysetperishsong(void)
 
     PressurePPLoseOnUsingPerishSong(gBankAttacker);
 
-    if (notAffectedCount == gNoOfAllBanks)
+    if (notAffectedCount == gBattleBanksCount)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -9116,7 +9110,7 @@ static void atkB2_trysetperishsong(void)
 
 static void atkB3_rolloutdamagecalculation(void)
 {
-    if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
         CancelMultiTurnMoves(gBankAttacker);
         gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
@@ -9151,8 +9145,8 @@ static void atkB3_rolloutdamagecalculation(void)
 
 static void atkB4_jumpifconfusedandstatmaxed(void)
 {
-    if (gBattleMons[gBankTarget].status2 & STATUS2_CONFUSION
-        && gBattleMons[gBankTarget].statStages[gBattlescriptCurrInstr[1]] == 0xC)
+    if (gBattleMons[gBankDefender].status2 & STATUS2_CONFUSION
+        && gBattleMons[gBankDefender].statStages[gBattlescriptCurrInstr[1]] == 0xC)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
     else
         gBattlescriptCurrInstr += 6;
@@ -9160,7 +9154,7 @@ static void atkB4_jumpifconfusedandstatmaxed(void)
 
 static void atkB5_furycuttercalc(void)
 {
-    if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
         gDisableStructs[gBankAttacker].furyCutterCounter = 0;
         gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
@@ -9203,32 +9197,32 @@ static void atkB7_presentdamagecalculation(void)
         gDynamicBasePower = 120;
     else
     {
-        gBattleMoveDamage = gBattleMons[gBankTarget].maxHP / 4;
+        gBattleMoveDamage = gBattleMons[gBankDefender].maxHP / 4;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
     }
     if (rand < 204)
         gBattlescriptCurrInstr = BattleScript_HitFromCritCalc;
-    else if (gBattleMons[gBankTarget].maxHP == gBattleMons[gBankTarget].hp)
+    else if (gBattleMons[gBankDefender].maxHP == gBattleMons[gBankDefender].hp)
         gBattlescriptCurrInstr = BattleScript_AlreadyAtFullHp;
     else
     {
-        gBattleMoveFlags &= ~(MOVESTATUS_NOTAFFECTED);
+        gMoveResultFlags &= ~(MOVE_RESULT_DOESNT_AFFECT_FOE);
         gBattlescriptCurrInstr = BattleScript_PresentHealTarget;
     }
 }
 
 static void atkB8_setsafeguard(void)
 {
-    if (gSideAffecting[GET_BANK_SIDE(gBankAttacker)] & SIDE_STATUS_SAFEGUARD)
+    if (gSideStatuses[GET_BANK_SIDE(gBankAttacker)] & SIDE_STATUS_SAFEGUARD)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideAffecting[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_SAFEGUARD;
+        gSideStatuses[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_SAFEGUARD;
         gSideTimers[GET_BANK_SIDE(gBankAttacker)].safeguardTimer = 5;
         gSideTimers[GET_BANK_SIDE(gBankAttacker)].safeguardBank = gBankAttacker;
         gBattleCommunication[MULTISTRING_CHOOSER] = 5;
@@ -9280,11 +9274,11 @@ static void atkB9_magnitudedamagecalculation(void)
 
     PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 2, magnitude)
 
-    for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
+    for (gBankDefender = 0; gBankDefender < gBattleBanksCount; gBankDefender++)
     {
-        if (gBankTarget == gBankAttacker)
+        if (gBankDefender == gBankAttacker)
             continue;
-        if (!(gAbsentBankFlags & gBitTable[gBankTarget])) // a valid target was found
+        if (!(gAbsentBankFlags & gBitTable[gBankDefender])) // a valid target was found
             break;
     }
 
@@ -9296,35 +9290,35 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
     if (gMultiHitCounter == 1)
     {
         if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-            gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+            gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
         else
-            gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+            gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
     }
     else
     {
         if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-            gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+            gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
         else
-            gBankTarget = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+            gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
     }
 
-    if (gActionForBanks[gBankTarget] == ACTION_USE_MOVE
-        && gBankAttacker == *(gBattleStruct->moveTarget + gBankTarget)
-        && !(gBattleMons[gBankTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE))
+    if (gActionForBanks[gBankDefender] == ACTION_USE_MOVE
+        && gBankAttacker == *(gBattleStruct->moveTarget + gBankDefender)
+        && !(gBattleMons[gBankDefender].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
         && gBattleMons[gBankAttacker].hp
-        && !gDisableStructs[gBankTarget].truantCounter
-        && gChosenMovesByBanks[gBankTarget] == MOVE_PURSUIT)
+        && !gDisableStructs[gBankDefender].truantCounter
+        && gChosenMovesByBanks[gBankDefender] == MOVE_PURSUIT)
     {
         s32 i;
 
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattleBanksCount; i++)
         {
-            if (gBanksByTurnOrder[i] == gBankTarget)
+            if (gBanksByTurnOrder[i] == gBankDefender)
                 gActionsByTurnOrder[i] = 11;
         }
 
         gCurrentMove = MOVE_PURSUIT;
-        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBankTarget);
+        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBankDefender);
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
@@ -9339,7 +9333,7 @@ static void atkBB_setsunny(void)
 {
     if (gBattleWeather & WEATHER_SUN_ANY)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
     }
     else
@@ -9381,7 +9375,7 @@ static void atkBD_copyfoestats(void) // psych up
 
     for (i = 0; i < BATTLE_STATS_NO; i++)
     {
-        gBattleMons[gBankAttacker].statStages[i] = gBattleMons[gBankTarget].statStages[i];
+        gBattleMons[gBankAttacker].statStages[i] = gBattleMons[gBankDefender].statStages[i];
     }
 
     gBattlescriptCurrInstr += 5; // Has an unused jump ptr(possibly for a failed attempt) parameter.
@@ -9391,9 +9385,9 @@ static void atkBE_rapidspinfree(void)
 {
     if (gBattleMons[gBankAttacker].status2 & STATUS2_WRAPPED)
     {
-        gBattleScripting.bank = gBankTarget;
+        gBattleScripting.bank = gBankDefender;
         gBattleMons[gBankAttacker].status2 &= ~(STATUS2_WRAPPED);
-        gBankTarget = *(gBattleStruct->wrappedBy + gBankAttacker);
+        gBankDefender = *(gBattleStruct->wrappedBy + gBankAttacker);
 
         gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN;
         gBattleTextBuff1[1] = B_BUFF_MOVE;
@@ -9411,9 +9405,9 @@ static void atkBE_rapidspinfree(void)
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_LeechSeedFree;
     }
-    else if (gSideAffecting[GetBankSide(gBankAttacker)] & SIDE_STATUS_SPIKES)
+    else if (gSideStatuses[GetBankSide(gBankAttacker)] & SIDE_STATUS_SPIKES)
     {
-        gSideAffecting[GetBankSide(gBankAttacker)] &= ~(SIDE_STATUS_SPIKES);
+        gSideStatuses[GetBankSide(gBankAttacker)] &= ~(SIDE_STATUS_SPIKES);
         gSideTimers[GetBankSide(gBankAttacker)].spikesAmount = 0;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_SpikesFree;
@@ -9432,7 +9426,7 @@ static void atkBF_setdefensecurlbit(void)
 
 static void atkC0_recoverbasedonsunlight(void)
 {
-    gBankTarget = gBankAttacker;
+    gBankDefender = gBankAttacker;
 
     if (gBattleMons[gBankAttacker].hp != gBattleMons[gBankAttacker].maxHP)
     {
@@ -9632,11 +9626,11 @@ _080544F0:\n\
 
 static void atkC2_selectfirstvalidtarget(void)
 {
-    for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
+    for (gBankDefender = 0; gBankDefender < gBattleBanksCount; gBankDefender++)
     {
-        if (gBankTarget == gBankAttacker)
+        if (gBankDefender == gBankAttacker)
             continue;
-        if (!(gAbsentBankFlags & gBitTable[gBankTarget]))
+        if (!(gAbsentBankFlags & gBitTable[gBankDefender]))
             break;
     }
     gBattlescriptCurrInstr++;
@@ -9644,22 +9638,22 @@ static void atkC2_selectfirstvalidtarget(void)
 
 static void atkC3_trysetfutureattack(void)
 {
-    if (gWishFutureKnock.futureSightCounter[gBankTarget] != 0)
+    if (gWishFutureKnock.futureSightCounter[gBankDefender] != 0)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gSideAffecting[GET_BANK_SIDE(gBankTarget)] |= SIDE_STATUS_FUTUREATTACK;
-        gWishFutureKnock.futureSightMove[gBankTarget] = gCurrentMove;
-        gWishFutureKnock.futureSightAttacker[gBankTarget] = gBankAttacker;
-        gWishFutureKnock.futureSightCounter[gBankTarget] = 3;
-        gWishFutureKnock.futureSightDmg[gBankTarget] = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankTarget], gCurrentMove,
-                                                    gSideAffecting[GET_BANK_SIDE(gBankTarget)], 0,
-                                                    0, gBankAttacker, gBankTarget);
+        gSideStatuses[GET_BANK_SIDE(gBankDefender)] |= SIDE_STATUS_FUTUREATTACK;
+        gWishFutureKnock.futureSightMove[gBankDefender] = gCurrentMove;
+        gWishFutureKnock.futureSightAttacker[gBankDefender] = gBankAttacker;
+        gWishFutureKnock.futureSightCounter[gBankDefender] = 3;
+        gWishFutureKnock.futureSightDmg[gBankDefender] = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankDefender], gCurrentMove,
+                                                    gSideStatuses[GET_BANK_SIDE(gBankDefender)], 0,
+                                                    0, gBankAttacker, gBankDefender);
 
         if (gProtectStructs[gBankAttacker].helpingHand)
-            gWishFutureKnock.futureSightDmg[gBankTarget] = gWishFutureKnock.futureSightDmg[gBankTarget] * 15 / 10;
+            gWishFutureKnock.futureSightDmg[gBankDefender] = gWishFutureKnock.futureSightDmg[gBankDefender] * 15 / 10;
 
         if (gCurrentMove == MOVE_DOOM_DESIRE)
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -9679,7 +9673,7 @@ static void atkC4_trydobeatup(void)
     else
         party = gEnemyParty;
 
-    if (gBattleMons[gBankTarget].hp == 0)
+    if (gBattleMons[gBankDefender].hp == 0)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -9703,7 +9697,7 @@ static void atkC4_trydobeatup(void)
             gBattleMoveDamage = gBaseStats[GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES)].baseAttack;
             gBattleMoveDamage *= gBattleMoves[gCurrentMove].power;
             gBattleMoveDamage *= (GetMonData(&party[gBattleCommunication[0]], MON_DATA_LEVEL) * 2 / 5 + 2);
-            gBattleMoveDamage /= gBaseStats[gBattleMons[gBankTarget].species].baseDefense;
+            gBattleMoveDamage /= gBaseStats[gBattleMons[gBankDefender].species].baseDefense;
             gBattleMoveDamage = (gBattleMoveDamage / 50) + 2;
             if (gProtectStructs[gBankAttacker].helpingHand)
                 gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
@@ -9767,7 +9761,7 @@ static void atkC8_sethail(void)
 {
     if (gBattleWeather & WEATHER_HAIL_ANY)
     {
-        gBattleMoveFlags |= MOVESTATUS_MISSED;
+        gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
     }
     else
@@ -9782,8 +9776,8 @@ static void atkC8_sethail(void)
 
 static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento
 {
-    if (gBattleMons[gBankTarget].statStages[STAT_STAGE_ATK] == 0
-        && gBattleMons[gBankTarget].statStages[STAT_STAGE_SPATK] == 0
+    if (gBattleMons[gBankDefender].statStages[STAT_STAGE_ATK] == 0
+        && gBattleMons[gBankDefender].statStages[STAT_STAGE_SPATK] == 0
         && gBattleCommunication[6] != 1)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
@@ -9817,14 +9811,14 @@ static void atkCC_callterrainattack(void) // nature power
 {
     gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
     gCurrentMove = sNaturePowerMoves[gBattleTerrain];
-    gBankTarget = GetMoveTarget(gCurrentMove, 0);
+    gBankDefender = GetMoveTarget(gCurrentMove, 0);
     BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
     gBattlescriptCurrInstr++;
 }
 
 static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
 {
-    if (gBattleMons[gBankAttacker].status1 & (STATUS_POISON | STATUS_BURN | STATUS_PARALYSIS | STATUS_TOXIC_POISON))
+    if (gBattleMons[gBankAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
     {
         gBattleMons[gBankAttacker].status1 = 0;
         gBattlescriptCurrInstr += 5;
@@ -9840,13 +9834,13 @@ static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
 
 static void atkCE_settorment(void)
 {
-    if (gBattleMons[gBankTarget].status2 & STATUS2_TORMENT)
+    if (gBattleMons[gBankDefender].status2 & STATUS2_TORMENT)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMons[gBankTarget].status2 |= STATUS2_TORMENT;
+        gBattleMons[gBankDefender].status2 |= STATUS2_TORMENT;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -9861,10 +9855,10 @@ static void atkCF_jumpifnodamage(void)
 
 static void atkD0_settaunt(void)
 {
-    if (gDisableStructs[gBankTarget].tauntTimer1 == 0)
+    if (gDisableStructs[gBankDefender].tauntTimer1 == 0)
     {
-        gDisableStructs[gBankTarget].tauntTimer1 = 2;
-        gDisableStructs[gBankTarget].tauntTimer2 = 2;
+        gDisableStructs[gBankDefender].tauntTimer1 = 2;
+        gDisableStructs[gBankDefender].tauntTimer2 = 2;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9875,14 +9869,14 @@ static void atkD0_settaunt(void)
 
 static void atkD1_trysethelpinghand(void)
 {
-    gBankTarget = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_MON);
+    gBankDefender = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_MON);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-        && !(gAbsentBankFlags & gBitTable[gBankTarget])
+        && !(gAbsentBankFlags & gBitTable[gBankDefender])
         && !gProtectStructs[gBankAttacker].helpingHand
-        && !gProtectStructs[gBankTarget].helpingHand)
+        && !gProtectStructs[gBankDefender].helpingHand)
     {
-        gProtectStructs[gBankTarget].helpingHand = 1;
+        gProtectStructs[gBankDefender].helpingHand = 1;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9907,7 +9901,7 @@ static void atkD2_tryswapitems(void) // trick
     else
     {
         u8 sideAttacker = GetBankSide(gBankAttacker);
-        u8 sideTarget = GetBankSide(gBankTarget);
+        u8 sideTarget = GetBankSide(gBankDefender);
 
         // you can't swap items if they were knocked off in regular battles
         if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
@@ -9916,26 +9910,26 @@ static void atkD2_tryswapitems(void) // trick
                              | BATTLE_TYPE_SECRET_BASE
                              | BATTLE_TYPE_x2000000))
             && (gWishFutureKnock.knockedOffPokes[sideAttacker] & gBitTable[gBattlePartyID[gBankAttacker]]
-                || gWishFutureKnock.knockedOffPokes[sideTarget] & gBitTable[gBattlePartyID[gBankTarget]]))
+                || gWishFutureKnock.knockedOffPokes[sideTarget] & gBitTable[gBattlePartyID[gBankDefender]]))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         // can't swap if two pokemon don't have an item
         // or if either of them is an enigma berry or a mail
-        else if ((gBattleMons[gBankAttacker].item == 0 && gBattleMons[gBankTarget].item == 0)
+        else if ((gBattleMons[gBankAttacker].item == 0 && gBattleMons[gBankDefender].item == 0)
                  || gBattleMons[gBankAttacker].item == ITEM_ENIGMA_BERRY
-                 || gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY
+                 || gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY
                  || IS_ITEM_MAIL(gBattleMons[gBankAttacker].item)
-                 || IS_ITEM_MAIL(gBattleMons[gBankTarget].item))
+                 || IS_ITEM_MAIL(gBattleMons[gBankDefender].item))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         // check if ability prevents swapping
-        else if (gBattleMons[gBankTarget].ability == ABILITY_STICKY_HOLD)
+        else if (gBattleMons[gBankDefender].ability == ABILITY_STICKY_HOLD)
         {
             gBattlescriptCurrInstr = BattleScript_StickyHoldActivates;
-            gLastUsedAbility = gBattleMons[gBankTarget].ability;
-            RecordAbilityBattle(gBankTarget, gLastUsedAbility);
+            gLastUsedAbility = gBattleMons[gBankDefender].ability;
+            RecordAbilityBattle(gBankDefender, gLastUsedAbility);
         }
         // took a while, but all checks passed and items can be safely swapped
         else
@@ -9944,21 +9938,21 @@ static void atkD2_tryswapitems(void) // trick
 
             newItemAtk = &gBattleStruct->changedItems[gBankAttacker];
             oldItemAtk = gBattleMons[gBankAttacker].item;
-            *newItemAtk = gBattleMons[gBankTarget].item;
+            *newItemAtk = gBattleMons[gBankDefender].item;
 
             gBattleMons[gBankAttacker].item = 0;
-            gBattleMons[gBankTarget].item = oldItemAtk;
+            gBattleMons[gBankDefender].item = oldItemAtk;
 
             gActiveBank = gBankAttacker;
             EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, newItemAtk);
             MarkBufferBankForExecution(gBankAttacker);
 
-            gActiveBank = gBankTarget;
-            EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankTarget].item);
-            MarkBufferBankForExecution(gBankTarget);
+            gActiveBank = gBankDefender;
+            EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankDefender].item);
+            MarkBufferBankForExecution(gBankDefender);
 
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankTarget]) + 0) = 0;
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankTarget]) + 1) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankDefender]) + 0) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankDefender]) + 1) = 0;
 
             *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankAttacker]) + 0) = 0;
             *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankAttacker]) + 1) = 0;
@@ -9980,11 +9974,11 @@ static void atkD2_tryswapitems(void) // trick
 
 static void atkD3_trycopyability(void) // role play
 {
-    if (gBattleMons[gBankTarget].ability != 0
-        && gBattleMons[gBankTarget].ability != ABILITY_WONDER_GUARD)
+    if (gBattleMons[gBankDefender].ability != 0
+        && gBattleMons[gBankDefender].ability != ABILITY_WONDER_GUARD)
     {
-        gBattleMons[gBankAttacker].ability = gBattleMons[gBankTarget].ability;
-        gLastUsedAbility = gBattleMons[gBankTarget].ability;
+        gBattleMons[gBankAttacker].ability = gBattleMons[gBankDefender].ability;
+        gLastUsedAbility = gBattleMons[gBankDefender].ability;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -10010,14 +10004,14 @@ static void atkD4_trywish(void)
         }
         break;
     case 1: // heal effect
-        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBankTarget, gWishFutureKnock.wishUserID[gBankTarget])
+        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBankDefender, gWishFutureKnock.wishUserID[gBankDefender])
 
-        gBattleMoveDamage = gBattleMons[gBankTarget].maxHP / 2;
+        gBattleMoveDamage = gBattleMons[gBankDefender].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
 
-        if (gBattleMons[gBankTarget].hp == gBattleMons[gBankTarget].maxHP)
+        if (gBattleMons[gBankDefender].hp == gBattleMons[gBankDefender].maxHP)
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
         else
             gBattlescriptCurrInstr += 6;
@@ -10042,9 +10036,9 @@ static void atkD5_trysetroots(void) // ingrain
 static void atkD6_doubledamagedealtifdamaged(void)
 {
     if ((gProtectStructs[gBankAttacker].physicalDmg
-         && gProtectStructs[gBankAttacker].physicalBank == gBankTarget)
+         && gProtectStructs[gBankAttacker].physicalBank == gBankDefender)
         || (gProtectStructs[gBankAttacker].specialDmg
-            && gProtectStructs[gBankAttacker].specialBank == gBankTarget))
+            && gProtectStructs[gBankAttacker].specialBank == gBankDefender))
     {
         gBattleScripting.dmgMultiplier = 2;
     }
@@ -10054,27 +10048,27 @@ static void atkD6_doubledamagedealtifdamaged(void)
 
 static void atkD7_setyawn(void)
 {
-    if (gStatuses3[gBankTarget] & STATUS3_YAWN
-        || gBattleMons[gBankTarget].status1 & STATUS_ANY)
+    if (gStatuses3[gBankDefender] & STATUS3_YAWN
+        || gBattleMons[gBankDefender].status1 & STATUS1_ANY)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gStatuses3[gBankTarget] |= 0x1000;
+        gStatuses3[gBankDefender] |= 0x1000;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkD8_setdamagetohealthdifference(void)
 {
-    if (gBattleMons[gBankTarget].hp <= gBattleMons[gBankAttacker].hp)
+    if (gBattleMons[gBankDefender].hp <= gBattleMons[gBankAttacker].hp)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMoveDamage = gBattleMons[gBankTarget].hp - gBattleMons[gBankAttacker].hp;
+        gBattleMoveDamage = gBattleMons[gBankDefender].hp - gBattleMons[gBankAttacker].hp;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -10094,18 +10088,18 @@ static void atkD9_scaledamagebyhealthratio(void)
 static void atkDA_tryswapabilities(void) // skill swap
 {
     if ((gBattleMons[gBankAttacker].ability == 0
-         && gBattleMons[gBankTarget].ability == 0)
+         && gBattleMons[gBankDefender].ability == 0)
      || gBattleMons[gBankAttacker].ability == ABILITY_WONDER_GUARD
-     || gBattleMons[gBankTarget].ability == ABILITY_WONDER_GUARD
-     || gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+     || gBattleMons[gBankDefender].ability == ABILITY_WONDER_GUARD
+     || gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
      {
          gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
      }
     else
     {
         u8 abilityAtk = gBattleMons[gBankAttacker].ability;
-        gBattleMons[gBankAttacker].ability = gBattleMons[gBankTarget].ability;
-        gBattleMons[gBankTarget].ability = abilityAtk;
+        gBattleMons[gBankAttacker].ability = gBattleMons[gBankDefender].ability;
+        gBattleMons[gBankDefender].ability = abilityAtk;
 
             gBattlescriptCurrInstr += 5;
     }
@@ -10123,7 +10117,7 @@ static void atkDB_tryimprision(void)
 
         sideAttacker = GetBankSide(gBankAttacker);
         PressurePPLoseOnUsingImprision(gBankAttacker);
-        for (bank = 0; bank < gNoOfAllBanks; bank++)
+        for (bank = 0; bank < gBattleBanksCount; bank++)
         {
             if (sideAttacker != GetBankSide(bank))
             {
@@ -10148,7 +10142,7 @@ static void atkDB_tryimprision(void)
                 }
             }
         }
-        if (bank == gNoOfAllBanks) // In Generation 3 games, Imprison fails if the user doesn't share any moves with any of the foes
+        if (bank == gBattleBanksCount) // In Generation 3 games, Imprison fails if the user doesn't share any moves with any of the foes
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
@@ -10171,7 +10165,7 @@ static void atkDD_weightdamagecalculation(void)
     s32 i;
     for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2)
     {
-        if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBankTarget].species), 1))
+        if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBankDefender].species), 1))
             break;
     }
 
@@ -10227,7 +10221,7 @@ static void atkDE_asistattackselect(void)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gRandomMove = movesArray[((Random() & 0xFF) * chooseableMovesNo) >> 8];
-        gBankTarget = GetMoveTarget(gRandomMove, 0);
+        gBankDefender = GetMoveTarget(gRandomMove, 0);
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -10238,9 +10232,9 @@ static void atkDE_asistattackselect(void)
 
 static void atkDF_trysetmagiccoat(void)
 {
-    gBankTarget = gBankAttacker;
+    gBankDefender = gBankAttacker;
     gSpecialStatuses[gBankAttacker].flag20 = 1;
-    if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) // moves last turn
+    if (gCurrentTurnActionNumber == gBattleBanksCount - 1) // moves last turn
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -10254,7 +10248,7 @@ static void atkDF_trysetmagiccoat(void)
 static void atkE0_trysetsnatch(void) // snatch
 {
     gSpecialStatuses[gBankAttacker].flag20 = 1;
-    if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) // moves last turn
+    if (gCurrentTurnActionNumber == gBattleBanksCount - 1) // moves last turn
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -10274,15 +10268,15 @@ static void atkE1_trygetintimidatetarget(void)
 
     PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gBattleMons[gBattleScripting.bank].ability)
 
-    for (;gBankTarget < gNoOfAllBanks; gBankTarget++)
+    for (;gBankDefender < gBattleBanksCount; gBankDefender++)
     {
-        if (GetBankSide(gBankTarget) == side)
+        if (GetBankSide(gBankDefender) == side)
             continue;
-        if (!(gAbsentBankFlags & gBitTable[gBankTarget]))
+        if (!(gAbsentBankFlags & gBitTable[gBankDefender]))
             break;
     }
 
-    if (gBankTarget >= gNoOfAllBanks)
+    if (gBankDefender >= gBattleBanksCount)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -10544,7 +10538,7 @@ static void atkEB_settypetoterrain(void)
 
 static void atkEC_pursuitrelated(void)
 {
-    gActiveBank = GetBankByIdentity(GetBankPosition(gBankAttacker) ^ BIT_MON);
+    gActiveBank = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_MON);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
         && !(gAbsentBankFlags & gBitTable[gActiveBank])
@@ -10568,10 +10562,10 @@ static void atkEF_snatchsetbanks(void)
 {
     gEffectBank = gBankAttacker;
 
-    if (gBankAttacker == gBankTarget)
-        gBankAttacker = gBankTarget = gBattleScripting.bank;
+    if (gBankAttacker == gBankDefender)
+        gBankAttacker = gBankDefender = gBattleScripting.bank;
     else
-        gBankTarget = gBattleScripting.bank;
+        gBankDefender = gBattleScripting.bank;
 
     gBattleScripting.bank = gEffectBank;
     gBattlescriptCurrInstr++;
@@ -10583,8 +10577,8 @@ static void atkEE_removelightscreenreflect(void) // brick break
 
     if (gSideTimers[opposingSide].reflectTimer || gSideTimers[opposingSide].lightscreenTimer)
     {
-        gSideAffecting[opposingSide] &= ~(SIDE_STATUS_REFLECT);
-        gSideAffecting[opposingSide] &= ~(SIDE_STATUS_LIGHTSCREEN);
+        gSideStatuses[opposingSide] &= ~(SIDE_STATUS_REFLECT);
+        gSideStatuses[opposingSide] &= ~(SIDE_STATUS_LIGHTSCREEN);
         gSideTimers[opposingSide].reflectTimer = 0;
         gSideTimers[opposingSide].lightscreenTimer = 0;
         gBattleScripting.animTurn = 1;
@@ -10607,7 +10601,7 @@ static void atkEF_handleballthrow(void)
         return;
 
     gActiveBank = gBankAttacker;
-    gBankTarget = gBankAttacker ^ BIT_SIDE;
+    gBankDefender = gBankAttacker ^ BIT_SIDE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
@@ -10629,17 +10623,17 @@ static void atkEF_handleballthrow(void)
         if (gLastUsedItem == ITEM_SAFARI_BALL)
             catchRate = gBattleStruct->field_7C * 1275 / 100;
         else
-            catchRate = gBaseStats[gBattleMons[gBankTarget].species].catchRate;
+            catchRate = gBaseStats[gBattleMons[gBankDefender].species].catchRate;
 
         if (gLastUsedItem > ITEM_SAFARI_BALL)
         {
             switch (gLastUsedItem)
             {
             case ITEM_NET_BALL:
-                if (gBattleMons[gBankTarget].type1 == TYPE_WATER
-                    || gBattleMons[gBankTarget].type2 == TYPE_WATER
-                    || gBattleMons[gBankTarget].type1 == TYPE_BUG
-                    || gBattleMons[gBankTarget].type2 == TYPE_BUG)
+                if (gBattleMons[gBankDefender].type1 == TYPE_WATER
+                    || gBattleMons[gBankDefender].type2 == TYPE_WATER
+                    || gBattleMons[gBankDefender].type1 == TYPE_BUG
+                    || gBattleMons[gBankDefender].type2 == TYPE_BUG)
                     ballMultiplier = 30;
                 else
                     ballMultiplier = 10;
@@ -10651,9 +10645,9 @@ static void atkEF_handleballthrow(void)
                     ballMultiplier = 10;
                 break;
             case ITEM_NEST_BALL:
-                if (gBattleMons[gBankTarget].level < 40)
+                if (gBattleMons[gBankDefender].level < 40)
                 {
-                    ballMultiplier = 40 - gBattleMons[gBankTarget].level;
+                    ballMultiplier = 40 - gBattleMons[gBankDefender].level;
                     if (ballMultiplier <= 9)
                         ballMultiplier = 10;
                 }
@@ -10663,7 +10657,7 @@ static void atkEF_handleballthrow(void)
                 }
                 break;
             case ITEM_REPEAT_BALL:
-                if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBankTarget].species), FLAG_GET_CAUGHT))
+                if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBankDefender].species), FLAG_GET_CAUGHT))
                     ballMultiplier = 30;
                 else
                     ballMultiplier = 10;
@@ -10683,12 +10677,12 @@ static void atkEF_handleballthrow(void)
             ballMultiplier = sBallCatchBonuses[gLastUsedItem - 2];
 
         odds = (catchRate * ballMultiplier / 10)
-            * (gBattleMons[gBankTarget].maxHP * 3 - gBattleMons[gBankTarget].hp * 2)
-            / (3 * gBattleMons[gBankTarget].maxHP);
+            * (gBattleMons[gBankDefender].maxHP * 3 - gBattleMons[gBankDefender].hp * 2)
+            / (3 * gBattleMons[gBankDefender].maxHP);
 
-        if (gBattleMons[gBankTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE))
+        if (gBattleMons[gBankDefender].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
             odds *= 2;
-        if (gBattleMons[gBankTarget].status1 & (STATUS_POISON | STATUS_BURN | STATUS_PARALYSIS | STATUS_TOXIC_POISON))
+        if (gBattleMons[gBankDefender].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
             odds = (odds * 15) / 10;
 
         if (gLastUsedItem != ITEM_SAFARI_BALL)
@@ -10709,7 +10703,7 @@ static void atkEF_handleballthrow(void)
             EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS);
             MarkBufferBankForExecution(gActiveBank);
             gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
-            SetMonData(&gEnemyParty[gBattlePartyID[gBankTarget]], MON_DATA_POKEBALL, &gLastUsedItem);
+            SetMonData(&gEnemyParty[gBattlePartyID[gBankDefender]], MON_DATA_POKEBALL, &gLastUsedItem);
 
             if (CalculatePlayerPartyCount() == 6)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -10734,7 +10728,7 @@ static void atkEF_handleballthrow(void)
             if (shakes == BALL_3_SHAKES_SUCCESS) // mon caught, copy of the code above
             {
                 gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
-                SetMonData(&gEnemyParty[gBattlePartyID[gBankTarget]], MON_DATA_POKEBALL, &gLastUsedItem);
+                SetMonData(&gEnemyParty[gBattlePartyID[gBankDefender]], MON_DATA_POKEBALL, &gLastUsedItem);
 
                 if (CalculatePlayerPartyCount() == 6)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -10810,8 +10804,8 @@ static void atkF2_displaydexinfo(void)
         {
             FreeAllWindowBuffers();
             gBattleCommunication[TASK_ID] = CreateDexDisplayMonDataTask(SpeciesToNationalPokedexNum(species),
-                                                                        gBattleMons[gBankTarget].otId,
-                                                                        gBattleMons[gBankTarget].personality);
+                                                                        gBattleMons[gBankDefender].otId,
+                                                                        gBattleMons[gBankDefender].personality);
             gBattleCommunication[0]++;
         }
         break;
@@ -11010,12 +11004,12 @@ static void atkF6_finishaction(void)
 static void atkF7_finishturn(void)
 {
     gCurrentActionFuncId = ACTION_FINISHED;
-    gCurrentTurnActionNumber = gNoOfAllBanks;
+    gCurrentTurnActionNumber = gBattleBanksCount;
 }
 
 static void atkF8_trainerslideout(void)
 {
-    gActiveBank = GetBankByIdentity(gBattlescriptCurrInstr[1]);
+    gActiveBank = GetBankByPosition(gBattlescriptCurrInstr[1]);
     EmitTrainerSlideBack(0);
     MarkBufferBankForExecution(gActiveBank);
 
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 6d7a97844..96af536fe 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -990,14 +990,14 @@ static bool32 IsPlayerDefeated(u32 battleOutcome)
 {
     switch (battleOutcome)
     {
-    case BATTLE_LOST:
-    case BATTLE_DREW:
+    case B_OUTCOME_LOST:
+    case B_OUTCOME_DREW:
         return TRUE;
-    case BATTLE_WON:
-    case BATTLE_RAN:
-    case BATTLE_PLAYER_TELEPORTED:
-    case BATTLE_POKE_FLED:
-    case BATTLE_CAUGHT:
+    case B_OUTCOME_WON:
+    case B_OUTCOME_RAN:
+    case B_OUTCOME_PLAYER_TELEPORTED:
+    case B_OUTCOME_POKE_FLED:
+    case B_OUTCOME_CAUGHT_POKE:
         return FALSE;
     default:
         return FALSE;
diff --git a/src/battle_util.c b/src/battle_util.c
index 2a1b421f5..250976347 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -31,14 +31,14 @@ extern u8 gActiveBank;
 extern u8 gStringBank;
 extern u16 gCurrentMove;
 extern u16 gLastUsedItem;
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
 extern u8 gBankAttacker;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gAbsentBankFlags;
 extern u16 gBattleWeather;
 extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
-extern u16 gSideAffecting[2];
+extern u16 gSideStatuses[2];
 extern u8 gBattleCommunication[];
 extern void (*gBattleMainFunc)(void);
 extern s32 gBattleMoveDamage;
@@ -51,7 +51,7 @@ extern u8 gEffectBank;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern u8 gBank1;
 extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
-extern u8 gBattleMoveFlags;
+extern u8 gMoveResultFlags;
 extern s32 gTakenDmg[BATTLE_BANKS_COUNT];
 extern u8 gTakenDmgBanks[BATTLE_BANKS_COUNT];
 extern u8 gLastUsedAbility;
@@ -79,7 +79,7 @@ u8 GetBattleBank(u8 caseId)
     switch (caseId)
     {
     case BS_GET_TARGET:
-        ret = gBankTarget;
+        ret = gBankDefender;
         break;
     case BS_GET_ATTACKER:
         ret = gBankAttacker;
@@ -104,16 +104,16 @@ u8 GetBattleBank(u8 caseId)
     case 8:
     case 9:
     case BS_GET_PLAYER1:
-        ret = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+        ret = GetBankByPosition(B_POSITION_PLAYER_LEFT);
         break;
     case BS_GET_OPPONENT1:
-        ret = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+        ret = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
         break;
     case BS_GET_PLAYER2:
-        ret = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+        ret = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
         break;
     case BS_GET_OPPONENT2:
-        ret = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+        ret = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
         break;
     }
     return ret;
@@ -153,7 +153,7 @@ void PressurePPLoseOnUsingImprision(u8 bankAtk)
     s32 imprisionPos = 4;
     u8 atkSide = GetBankSide(bankAtk);
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (atkSide != GetBankSide(i) && gBattleMons[i].ability == ABILITY_PRESSURE)
         {
@@ -186,7 +186,7 @@ void PressurePPLoseOnUsingPerishSong(u8 bankAtk)
     s32 i, j;
     s32 perishSongPos = 4;
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (gBattleMons[i].ability == ABILITY_PRESSURE && i != bankAtk)
         {
@@ -220,12 +220,12 @@ void MarkAllBufferBanksForExecution(void) // unused
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattleBanksCount; i++)
             gBattleExecBuffer |= gBitTable[i] << 0x1C;
     }
     else
     {
-        for (i = 0; i < gNoOfAllBanks; i++)
+        for (i = 0; i < gBattleBanksCount; i++)
             gBattleExecBuffer |= gBitTable[i];
     }
 }
@@ -296,10 +296,10 @@ void ResetSentPokesToOpponentValue(void)
     gSentPokesToOpponent[0] = 0;
     gSentPokesToOpponent[1] = 0;
 
-    for (i = 0; i < gNoOfAllBanks; i += 2)
+    for (i = 0; i < gBattleBanksCount; i += 2)
         bits |= gBitTable[gBattlePartyID[i]];
 
-    for (i = 1; i < gNoOfAllBanks; i += 2)
+    for (i = 1; i < gBattleBanksCount; i += 2)
         gSentPokesToOpponent[(i & BIT_MON) >> 1] = bits;
 }
 
@@ -313,7 +313,7 @@ void sub_803F9EC(u8 bank)
         u8 id = ((bank & BIT_MON) >> 1);
         gSentPokesToOpponent[id] = 0;
 
-        for (i = 0; i < gNoOfAllBanks; i += 2)
+        for (i = 0; i < gBattleBanksCount; i += 2)
         {
             if (!(gAbsentBankFlags & gBitTable[i]))
                 bits |= gBitTable[gBattlePartyID[i]];
@@ -332,7 +332,7 @@ void sub_803FA70(u8 bank)
     else
     {
         s32 i;
-        for (i = 1; i < gNoOfAllBanks; i++)
+        for (i = 1; i < gBattleBanksCount; i++)
             gSentPokesToOpponent[(i & BIT_MON) >> 1] |= gBitTable[gBattlePartyID[bank]];
     }
 }
@@ -517,7 +517,7 @@ u8 GetImprisonedMovesCount(u8 bank, u16 move)
     u8 imprisionedMoves = 0;
     u8 bankSide = GetBankSide(bank);
 
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if (bankSide != GetBankSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS)
         {
@@ -540,10 +540,10 @@ u8 UpdateTurnCounters(void)
     u8 effect = 0;
     s32 i;
 
-    for (gBankAttacker = 0; gBankAttacker < gNoOfAllBanks && gAbsentBankFlags & gBitTable[gBankAttacker]; gBankAttacker++)
+    for (gBankAttacker = 0; gBankAttacker < gBattleBanksCount && gAbsentBankFlags & gBitTable[gBankAttacker]; gBankAttacker++)
     {
     }
-    for (gBankTarget = 0; gBankTarget < gNoOfAllBanks && gAbsentBankFlags & gBitTable[gBankTarget]; gBankTarget++)
+    for (gBankDefender = 0; gBankDefender < gBattleBanksCount && gAbsentBankFlags & gBitTable[gBankDefender]; gBankDefender++)
     {
     }
 
@@ -554,14 +554,14 @@ u8 UpdateTurnCounters(void)
         switch (gBattleStruct->turncountersTracker)
         {
         case 0:
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 gBanksByTurnOrder[i] = i;
             }
-            for (i = 0; i < gNoOfAllBanks - 1; i++)
+            for (i = 0; i < gBattleBanksCount - 1; i++)
             {
                 s32 j;
-                for (j = i + 1; j < gNoOfAllBanks; j++)
+                for (j = i + 1; j < gBattleBanksCount; j++)
                 {
                     if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 0))
                         SwapTurnOrder(i, j);
@@ -580,11 +580,11 @@ u8 UpdateTurnCounters(void)
             {
                 sideBank = gBattleStruct->turnSideTracker;
                 gActiveBank = gBankAttacker = gSideTimers[sideBank].reflectBank;
-                if (gSideAffecting[sideBank] & SIDE_STATUS_REFLECT)
+                if (gSideStatuses[sideBank] & SIDE_STATUS_REFLECT)
                 {
                     if (--gSideTimers[sideBank].reflectTimer == 0)
                     {
-                        gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT;
+                        gSideStatuses[sideBank] &= ~SIDE_STATUS_REFLECT;
                         BattleScriptExecute(BattleScript_SideStatusWoreOff);
                         PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_REFLECT);
                         effect++;
@@ -605,11 +605,11 @@ u8 UpdateTurnCounters(void)
             {
                 sideBank = gBattleStruct->turnSideTracker;
                 gActiveBank = gBankAttacker = gSideTimers[sideBank].lightscreenBank;
-                if (gSideAffecting[sideBank] & SIDE_STATUS_LIGHTSCREEN)
+                if (gSideStatuses[sideBank] & SIDE_STATUS_LIGHTSCREEN)
                 {
                     if (--gSideTimers[sideBank].lightscreenTimer == 0)
                     {
-                        gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN;
+                        gSideStatuses[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN;
                         BattleScriptExecute(BattleScript_SideStatusWoreOff);
                         gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
                         PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_LIGHT_SCREEN);
@@ -634,7 +634,7 @@ u8 UpdateTurnCounters(void)
                 if (gSideTimers[sideBank].mistTimer != 0
                  && --gSideTimers[sideBank].mistTimer == 0)
                 {
-                    gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST;
+                    gSideStatuses[sideBank] &= ~SIDE_STATUS_MIST;
                     BattleScriptExecute(BattleScript_SideStatusWoreOff);
                     gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
                     PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_MIST);
@@ -655,11 +655,11 @@ u8 UpdateTurnCounters(void)
             {
                 sideBank = gBattleStruct->turnSideTracker;
                 gActiveBank = gBankAttacker = gSideTimers[sideBank].safeguardBank;
-                if (gSideAffecting[sideBank] & SIDE_STATUS_SAFEGUARD)
+                if (gSideStatuses[sideBank] & SIDE_STATUS_SAFEGUARD)
                 {
                     if (--gSideTimers[sideBank].safeguardTimer == 0)
                     {
-                        gSideAffecting[sideBank] &= ~SIDE_STATUS_SAFEGUARD;
+                        gSideStatuses[sideBank] &= ~SIDE_STATUS_SAFEGUARD;
                         BattleScriptExecute(BattleScript_SafeguardEnds);
                         effect++;
                     }
@@ -675,14 +675,14 @@ u8 UpdateTurnCounters(void)
             }
             break;
         case 5:
-            while (gBattleStruct->turnSideTracker < gNoOfAllBanks)
+            while (gBattleStruct->turnSideTracker < gBattleBanksCount)
             {
                 gActiveBank = gBanksByTurnOrder[gBattleStruct->turnSideTracker];
                 if (gWishFutureKnock.wishCounter[gActiveBank] != 0
                  && --gWishFutureKnock.wishCounter[gActiveBank] == 0
                  && gBattleMons[gActiveBank].hp != 0)
                 {
-                    gBankTarget = gActiveBank;
+                    gBankDefender = gActiveBank;
                     BattleScriptExecute(BattleScript_WishComesTrue);
                     effect++;
                 }
@@ -798,7 +798,7 @@ u8 TurnBasedEffects(void)
     u8 effect = 0;
 
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
-    while (gBattleStruct->turnEffectsBank < gNoOfAllBanks && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
+    while (gBattleStruct->turnEffectsBank < gBattleBanksCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
     {
         gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->turnEffectsBank];
         if (gAbsentBankFlags & gBitTable[gActiveBank])
@@ -843,11 +843,11 @@ u8 TurnBasedEffects(void)
                  && gBattleMons[gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK].hp != 0
                  && gBattleMons[gActiveBank].hp != 0)
                 {
-                    gBankTarget = gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
+                    gBankDefender = gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
                     gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    gBattleScripting.animArg1 = gBankTarget;
+                    gBattleScripting.animArg1 = gBankDefender;
                     gBattleScripting.animArg2 = gBankAttacker;
                     BattleScriptExecute(BattleScript_LeechSeedTurnDrain);
                     effect++;
@@ -855,7 +855,7 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 4:  // poison
-                if ((gBattleMons[gActiveBank].status1 & STATUS_POISON) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBank].status1 & STATUS1_POISON) && gBattleMons[gActiveBank].hp != 0)
                 {
                     gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
                     if (gBattleMoveDamage == 0)
@@ -866,7 +866,7 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 5:  // toxic poison
-                if ((gBattleMons[gActiveBank].status1 & STATUS_TOXIC_POISON) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBank].status1 & STATUS1_TOXIC_POISON) && gBattleMons[gActiveBank].hp != 0)
                 {
                     gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16;
                     if (gBattleMoveDamage == 0)
@@ -880,7 +880,7 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 6:  // burn
-                if ((gBattleMons[gActiveBank].status1 & STATUS_BURN) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBank].status1 & STATUS1_BURN) && gBattleMons[gActiveBank].hp != 0)
                 {
                     gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
                     if (gBattleMoveDamage == 0)
@@ -895,7 +895,7 @@ u8 TurnBasedEffects(void)
                 {
                     // R/S does not perform this sleep check, which causes the nighmare effect to
                     // persist even after the affected Pokemon has been awakened by Shed Skin
-                    if (gBattleMons[gActiveBank].status1 & STATUS_SLEEP)
+                    if (gBattleMons[gActiveBank].status1 & STATUS1_SLEEP)
                     {
                         gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4;
                         if (gBattleMoveDamage == 0)
@@ -957,12 +957,12 @@ u8 TurnBasedEffects(void)
             case 10:  // uproar
                 if (gBattleMons[gActiveBank].status2 & STATUS2_UPROAR)
                 {
-                    for (gBankAttacker = 0; gBankAttacker < gNoOfAllBanks; gBankAttacker++)
+                    for (gBankAttacker = 0; gBankAttacker < gBattleBanksCount; gBankAttacker++)
                     {
-                        if ((gBattleMons[gBankAttacker].status1 & STATUS_SLEEP)
+                        if ((gBattleMons[gBankAttacker].status1 & STATUS1_SLEEP)
                          && gBattleMons[gBankAttacker].ability != ABILITY_SOUNDPROOF)
                         {
-                            gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP);
+                            gBattleMons[gBankAttacker].status1 &= ~(STATUS1_SLEEP);
                             gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                             BattleScriptExecute(BattleScript_MonWokeUpInUproar);
@@ -972,7 +972,7 @@ u8 TurnBasedEffects(void)
                             break;
                         }
                     }
-                    if (gBankAttacker != gNoOfAllBanks)
+                    if (gBankAttacker != gBattleBanksCount)
                     {
                         effect = 2;  // a pokemon was awaken
                         break;
@@ -1086,7 +1086,7 @@ u8 TurnBasedEffects(void)
                 if (gStatuses3[gActiveBank] & STATUS3_YAWN)
                 {
                     gStatuses3[gActiveBank] -= 0x800;
-                    if (!(gStatuses3[gActiveBank] & STATUS3_YAWN) && !(gBattleMons[gActiveBank].status1 & STATUS_ANY)
+                    if (!(gStatuses3[gActiveBank] & STATUS3_YAWN) && !(gBattleMons[gActiveBank].status1 & STATUS1_ANY)
                      && gBattleMons[gActiveBank].ability != ABILITY_VITAL_SPIRIT
                      && gBattleMons[gActiveBank].ability != ABILITY_INSOMNIA && !UproarWakeUpCheck(gActiveBank))
                     {
@@ -1121,7 +1121,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
     switch (gBattleStruct->wishPerishSongState)
     {
     case 0:
-        while (gBattleStruct->wishPerishSongBank < gNoOfAllBanks)
+        while (gBattleStruct->wishPerishSongBank < gBattleBanksCount)
         {
             gActiveBank = gBattleStruct->wishPerishSongBank;
             if (gAbsentBankFlags & gBitTable[gActiveBank])
@@ -1142,16 +1142,16 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
 
                 PREPARE_MOVE_BUFFER(gBattleTextBuff1, gWishFutureKnock.futureSightMove[gActiveBank]);
 
-                gBankTarget = gActiveBank;
+                gBankDefender = gActiveBank;
                 gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank];
                 gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank];
-                gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF;
+                gSpecialStatuses[gBankDefender].moveturnLostHP = 0xFFFF;
                 BattleScriptExecute(BattleScript_MonTookFutureAttack);
 
                 if (gWishFutureKnock.futureSightCounter[gActiveBank] == 0
                  && gWishFutureKnock.futureSightCounter[gActiveBank ^ BIT_MON] == 0)
                 {
-                    gSideAffecting[GET_BANK_SIDE(gBankTarget)] &= ~(SIDE_STATUS_FUTUREATTACK);
+                    gSideStatuses[GET_BANK_SIDE(gBankDefender)] &= ~(SIDE_STATUS_FUTUREATTACK);
                 }
                 return TRUE;
             }
@@ -1164,7 +1164,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
         }
         // fall through
     case 1:
-        while (gBattleStruct->wishPerishSongBank < gNoOfAllBanks)
+        while (gBattleStruct->wishPerishSongBank < gBattleBanksCount)
         {
             gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->wishPerishSongBank];
             if (gAbsentBankFlags & gBitTable[gActiveBank])
@@ -1235,7 +1235,7 @@ bool8 HandleFaintedMonActions(void)
         case 0:
             gBattleStruct->faintedActionsBank = 0;
             gBattleStruct->faintedActionsState++;
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gAbsentBankFlags & gBitTable[i] && !sub_80423F4(i, 6, 6))
                     gAbsentBankFlags &= ~(gBitTable[i]);
@@ -1244,7 +1244,7 @@ bool8 HandleFaintedMonActions(void)
         case 1:
             do
             {
-                gBank1 = gBankTarget = gBattleStruct->faintedActionsBank;
+                gBank1 = gBankDefender = gBattleStruct->faintedActionsBank;
                 if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
                  && !(gBattleStruct->field_DF & gBitTable[gBattlePartyID[gBattleStruct->faintedActionsBank]])
                  && !(gAbsentBankFlags & gBitTable[gBattleStruct->faintedActionsBank]))
@@ -1253,12 +1253,12 @@ bool8 HandleFaintedMonActions(void)
                     gBattleStruct->faintedActionsState = 2;
                     return TRUE;
                 }
-            } while (++gBattleStruct->faintedActionsBank != gNoOfAllBanks);
+            } while (++gBattleStruct->faintedActionsBank != gBattleBanksCount);
             gBattleStruct->faintedActionsState = 3;
             break;
         case 2:
             sub_803F9EC(gBank1);
-            if (++gBattleStruct->faintedActionsBank == gNoOfAllBanks)
+            if (++gBattleStruct->faintedActionsBank == gBattleBanksCount)
                 gBattleStruct->faintedActionsState = 3;
             else
                 gBattleStruct->faintedActionsState = 1;
@@ -1270,7 +1270,7 @@ bool8 HandleFaintedMonActions(void)
         case 4:
             do
             {
-                gBank1 = gBankTarget = gBattleStruct->faintedActionsBank;
+                gBank1 = gBankDefender = gBattleStruct->faintedActionsBank;
                 if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
                  && !(gAbsentBankFlags & gBitTable[gBattleStruct->faintedActionsBank]))
                 {
@@ -1278,11 +1278,11 @@ bool8 HandleFaintedMonActions(void)
                     gBattleStruct->faintedActionsState = 5;
                     return TRUE;
                 }
-            } while (++gBattleStruct->faintedActionsBank != gNoOfAllBanks);
+            } while (++gBattleStruct->faintedActionsBank != gBattleBanksCount);
             gBattleStruct->faintedActionsState = 6;
             break;
         case 5:
-            if (++gBattleStruct->faintedActionsBank == gNoOfAllBanks)
+            if (++gBattleStruct->faintedActionsBank == gBattleBanksCount)
                 gBattleStruct->faintedActionsState = 6;
             else
                 gBattleStruct->faintedActionsState = 4;
@@ -1302,7 +1302,7 @@ bool8 HandleFaintedMonActions(void)
 void TryClearRageStatuses(void)
 {
     int i;
-    for (i = 0; i < gNoOfAllBanks; i++)
+    for (i = 0; i < gBattleBanksCount; i++)
     {
         if ((gBattleMons[i].status2 & STATUS2_RAGE) && gChosenMovesByBanks[i] != MOVE_RAGE)
             gBattleMons[i].status2 &= ~(STATUS2_RAGE);
@@ -1325,11 +1325,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 1: // check being asleep
-            if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP)
+            if (gBattleMons[gBankAttacker].status1 & STATUS1_SLEEP)
             {
                 if (UproarWakeUpCheck(gBankAttacker))
                 {
-                    gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP);
+                    gBattleMons[gBankAttacker].status1 &= ~(STATUS1_SLEEP);
                     gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -1343,11 +1343,11 @@ u8 AtkCanceller_UnableToUseMove(void)
                         toSub = 2;
                     else
                         toSub = 1;
-                    if ((gBattleMons[gBankAttacker].status1 & STATUS_SLEEP) < toSub)
-                        gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP);
+                    if ((gBattleMons[gBankAttacker].status1 & STATUS1_SLEEP) < toSub)
+                        gBattleMons[gBankAttacker].status1 &= ~(STATUS1_SLEEP);
                     else
                         gBattleMons[gBankAttacker].status1 -= toSub;
-                    if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP)
+                    if (gBattleMons[gBankAttacker].status1 & STATUS1_SLEEP)
                     {
                         if (gCurrentMove != MOVE_SNORE && gCurrentMove != MOVE_SLEEP_TALK)
                         {
@@ -1369,7 +1369,7 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 2: // check being frozen
-            if (gBattleMons[gBankAttacker].status1 & STATUS_FREEZE)
+            if (gBattleMons[gBankAttacker].status1 & STATUS1_FREEZE)
             {
                 if (Random() % 5)
                 {
@@ -1386,7 +1386,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                 }
                 else // unfreeze
                 {
-                    gBattleMons[gBankAttacker].status1 &= ~(STATUS_FREEZE);
+                    gBattleMons[gBankAttacker].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -1402,7 +1402,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                 gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround;
-                gBattleMoveFlags |= MOVESTATUS_MISSED;
+                gMoveResultFlags |= MOVE_RESULT_MISSED;
                 effect = 1;
             }
             gBattleStruct->atkCancellerTracker++;
@@ -1479,7 +1479,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                     else // confusion dmg
                     {
                         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                        gBankTarget = gBankAttacker;
+                        gBankDefender = gBankAttacker;
                         gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankAttacker], MOVE_POUND, 0, 40, 0, gBankAttacker, gBankAttacker);
                         gProtectStructs[gBankAttacker].confusionSelfDmg = 1;
                         gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
@@ -1496,7 +1496,7 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 10: // paralysis
-            if ((gBattleMons[gBankAttacker].status1 & STATUS_PARALYSIS) && (Random() % 4) == 0)
+            if ((gBattleMons[gBankAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0)
             {
                 gProtectStructs[gBankAttacker].prlzImmobility = 1;
                 // This is removed in Emerald for some reason
@@ -1539,9 +1539,9 @@ u8 AtkCanceller_UnableToUseMove(void)
                     {
                         gCurrentMove = MOVE_BIDE;
                         *bideDmg = gTakenDmg[gBankAttacker] * 2;
-                        gBankTarget = gTakenDmgBanks[gBankAttacker];
-                        if (gAbsentBankFlags & gBitTable[gBankTarget])
-                            gBankTarget = GetMoveTarget(MOVE_BIDE, 1);
+                        gBankDefender = gTakenDmgBanks[gBankAttacker];
+                        if (gAbsentBankFlags & gBitTable[gBankDefender])
+                            gBankDefender = GetMoveTarget(MOVE_BIDE, 1);
                         gBattlescriptCurrInstr = BattleScript_BideAttack;
                     }
                     else
@@ -1552,11 +1552,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 13: // move thawing
-            if (gBattleMons[gBankAttacker].status1 & STATUS_FREEZE)
+            if (gBattleMons[gBankAttacker].status1 & STATUS1_FREEZE)
             {
                 if (gBattleMoves[gCurrentMove].effect == EFFECT_THAW_HIT)
                 {
-                    gBattleMons[gBankAttacker].status1 &= ~(STATUS_FREEZE);
+                    gBattleMons[gBankAttacker].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -1667,14 +1667,14 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
     {
         if (GetBankSide(bank) == SIDE_OPPONENT)
         {
-            r7 = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
-            r6 = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+            r7 = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+            r6 = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
             party = gEnemyParty;
         }
         else
         {
-            r7 = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
-            r6 = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+            r7 = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+            r6 = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
             party = gPlayerParty;
         }
         if (r1 == 6)
@@ -1754,19 +1754,19 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
     u32 pidAtk;
     u32 pidDef;
 
-    if (gBankAttacker >= gNoOfAllBanks)
+    if (gBankAttacker >= gBattleBanksCount)
         gBankAttacker = bank;
     if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
         pokeAtk = &gPlayerParty[gBattlePartyID[gBankAttacker]];
     else
         pokeAtk = &gEnemyParty[gBattlePartyID[gBankAttacker]];
 
-    if (gBankTarget >= gNoOfAllBanks)
-        gBankTarget = bank;
-    if (GetBankSide(gBankTarget) == SIDE_PLAYER)
-        pokeDef = &gPlayerParty[gBattlePartyID[gBankTarget]];
+    if (gBankDefender >= gBattleBanksCount)
+        gBankDefender = bank;
+    if (GetBankSide(gBankDefender) == SIDE_PLAYER)
+        pokeDef = &gPlayerParty[gBattlePartyID[gBankDefender]];
     else
-        pokeDef = &gEnemyParty[gBattlePartyID[gBankTarget]];
+        pokeDef = &gEnemyParty[gBattlePartyID[gBankDefender]];
 
     speciesAtk = GetMonData(pokeAtk, MON_DATA_SPECIES);
     pidAtk = GetMonData(pokeAtk, MON_DATA_PERSONALITY);
@@ -1797,7 +1797,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
         switch (caseID)
         {
         case ABILITYEFFECT_ON_SWITCHIN: // 0
-            if (gBankAttacker >= gNoOfAllBanks)
+            if (gBankAttacker >= gBattleBanksCount)
                 gBankAttacker = bank;
             switch (gLastUsedAbility)
             {
@@ -1897,7 +1897,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             case ABILITY_AIR_LOCK:
                 {
                     // that's a weird choice for a variable, why not use i or bank?
-                    for (target1 = 0; target1 < gNoOfAllBanks; target1++)
+                    for (target1 = 0; target1 < gBattleBanksCount; target1++)
                     {
                         effect = CastformDataTypeChange(target1);
                         if (effect != 0)
@@ -1932,17 +1932,17 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     }
                     break;
                 case ABILITY_SHED_SKIN:
-                    if ((gBattleMons[bank].status1 & STATUS_ANY) && (Random() % 3) == 0)
+                    if ((gBattleMons[bank].status1 & STATUS1_ANY) && (Random() % 3) == 0)
                     {
-                        if (gBattleMons[bank].status1 & (STATUS_POISON | STATUS_TOXIC_POISON))
+                        if (gBattleMons[bank].status1 & (STATUS1_POISON | STATUS1_TOXIC_POISON))
                             StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
-                        if (gBattleMons[bank].status1 & STATUS_SLEEP)
+                        if (gBattleMons[bank].status1 & STATUS1_SLEEP)
                             StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
-                        if (gBattleMons[bank].status1 & STATUS_PARALYSIS)
+                        if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
                             StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
-                        if (gBattleMons[bank].status1 & STATUS_BURN)
+                        if (gBattleMons[bank].status1 & STATUS1_BURN)
                             StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
-                        if (gBattleMons[bank].status1 & STATUS_FREEZE)
+                        if (gBattleMons[bank].status1 & STATUS1_FREEZE)
                             StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
                         gBattleMons[bank].status1 = 0;
                         gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);  // fix nightmare glitch
@@ -2015,7 +2015,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     }
                     break;
                 case ABILITY_FLASH_FIRE:
-                    if (moveType == TYPE_FIRE && !(gBattleMons[bank].status1 & STATUS_FREEZE))
+                    if (moveType == TYPE_FIRE && !(gBattleMons[bank].status1 & STATUS1_FREEZE))
                     {
                         if (!(gBattleResources->flags->flags[bank] & UNKNOWN_FLAG_FLASH_FIRE))
                         {
@@ -2064,10 +2064,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             switch (gLastUsedAbility)
             {
             case ABILITY_COLOR_CHANGE:
-                if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+                if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && move != MOVE_STRUGGLE
                  && gBattleMoves[move].power != 0
-                 && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
                  && gBattleMons[bank].type1 != moveType
                  && gBattleMons[bank].type2 != moveType
                  && gBattleMons[bank].hp != 0)
@@ -2081,10 +2081,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 }
                 break;
             case ABILITY_ROUGH_SKIN:
-                if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+                if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && gBattleMons[gBankAttacker].hp != 0
                  && !gProtectStructs[gBankAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT))
                 {
                     gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 16;
@@ -2096,10 +2096,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 }
                 break;
             case ABILITY_EFFECT_SPORE:
-                if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+                if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && gBattleMons[gBankAttacker].hp != 0
                  && !gProtectStructs[gBankAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 10) == 0)
                 {
@@ -2119,10 +2119,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 }
                 break;
             case ABILITY_POISON_POINT:
-                if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+                if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && gBattleMons[gBankAttacker].hp != 0
                  && !gProtectStructs[gBankAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 3) == 0)
                 {
@@ -2134,10 +2134,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 }
                 break;
             case ABILITY_STATIC:
-                if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+                if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && gBattleMons[gBankAttacker].hp != 0
                  && !gProtectStructs[gBankAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 3) == 0)
                 {
@@ -2149,11 +2149,11 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 }
                 break;
             case ABILITY_FLAME_BODY:
-                if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+                if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && gBattleMons[gBankAttacker].hp != 0
                  && !gProtectStructs[gBankAttacker].confusionSelfDmg
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
-                 && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
                  && (Random() % 3) == 0)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_BURN;
@@ -2164,12 +2164,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 }
                 break;
             case ABILITY_CUTE_CHARM:
-                if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)
+                if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && gBattleMons[gBankAttacker].hp != 0
                  && !gProtectStructs[gBankAttacker].confusionSelfDmg
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
-                 && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special)
-                 && gBattleMons[gBankTarget].hp != 0
+                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
+                 && gBattleMons[gBankDefender].hp != 0
                  && (Random() % 3) == 0
                  && gBattleMons[gBankAttacker].ability != ABILITY_OBLIVIOUS
                  && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != GetGenderFromSpeciesAndPersonality(speciesDef, pidDef)
@@ -2177,7 +2177,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                  && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != MON_GENDERLESS
                  && GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != MON_GENDERLESS)
                 {
-                    gBattleMons[gBankAttacker].status2 |= STATUS2_INFATUATED_WITH(gBankTarget);
+                    gBattleMons[gBankAttacker].status2 |= STATUS2_INFATUATED_WITH(gBankDefender);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_CuteCharmActivates;
                     effect++;
@@ -2186,12 +2186,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_IMMUNITY: // 5
-            for (bank = 0; bank < gNoOfAllBanks; bank++)
+            for (bank = 0; bank < gBattleBanksCount; bank++)
             {
                 switch (gBattleMons[bank].ability)
                 {
                 case ABILITY_IMMUNITY:
-                    if (gBattleMons[bank].status1 & (STATUS_POISON | STATUS_TOXIC_POISON | STATUS_TOXIC_COUNTER))
+                    if (gBattleMons[bank].status1 & (STATUS1_POISON | STATUS1_TOXIC_POISON | STATUS1_TOXIC_COUNTER))
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
                         effect = 1;
@@ -2205,7 +2205,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     }
                     break;
                 case ABILITY_LIMBER:
-                    if (gBattleMons[bank].status1 & STATUS_PARALYSIS)
+                    if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
                         effect = 1;
@@ -2213,7 +2213,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     break;
                 case ABILITY_INSOMNIA:
                 case ABILITY_VITAL_SPIRIT:
-                    if (gBattleMons[bank].status1 & STATUS_SLEEP)
+                    if (gBattleMons[bank].status1 & STATUS1_SLEEP)
                     {
                         gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
                         StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
@@ -2221,14 +2221,14 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     }
                     break;
                 case ABILITY_WATER_VEIL:
-                    if (gBattleMons[bank].status1 & STATUS_BURN)
+                    if (gBattleMons[bank].status1 & STATUS1_BURN)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
                         effect = 1;
                     }
                     break;
                 case ABILITY_MAGMA_ARMOR:
-                    if (gBattleMons[bank].status1 & STATUS_FREEZE)
+                    if (gBattleMons[bank].status1 & STATUS1_FREEZE)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
                         effect = 1;
@@ -2268,7 +2268,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_FORECAST: // 6
-            for (bank = 0; bank < gNoOfAllBanks; bank++)
+            for (bank = 0; bank < gBattleBanksCount; bank++)
             {
                 if (gBattleMons[bank].ability == ABILITY_FORECAST)
                 {
@@ -2292,7 +2292,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
 
                 gBattleCommunication[MOVE_EFFECT_BYTE] = gBattleStruct->synchronizeMoveEffect + MOVE_EFFECT_AFFECTS_USER;
-                gBattleScripting.bank = gBankTarget;
+                gBattleScripting.bank = gBankDefender;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
                 gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
@@ -2316,7 +2316,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_INTIMIDATE1: // 9
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gBattleMons[i].ability == ABILITY_INTIMIDATE && gStatuses3[i] & STATUS3_INTIMIDATE_POKES)
                 {
@@ -2330,20 +2330,20 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_TRACE: // 11
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gBattleMons[i].ability == ABILITY_TRACE && (gStatuses3[i] & STATUS3_TRACE))
                 {
                     u8 target2;
                     side = (GetBankPosition(i) ^ BIT_SIDE) & BIT_SIDE; // side of the opposing pokemon
-                    target1 = GetBankByIdentity(side);
-                    target2 = GetBankByIdentity(side + BIT_MON);
+                    target1 = GetBankByPosition(side);
+                    target2 = GetBankByPosition(side + BIT_MON);
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
                     {
                         if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0
                          && gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0)
                         {
-                            gActiveBank = GetBankByIdentity(((Random() & 1) * 2) | side);
+                            gActiveBank = GetBankByPosition(((Random() & 1) * 2) | side);
                             gBattleMons[i].ability = gBattleMons[gActiveBank].ability;
                             gLastUsedAbility = gBattleMons[gActiveBank].ability;
                             effect++;
@@ -2387,7 +2387,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_INTIMIDATE2: // 10
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gBattleMons[i].ability == ABILITY_INTIMIDATE && (gStatuses3[i] & STATUS3_INTIMIDATE_POKES))
                 {
@@ -2403,7 +2403,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             break;
         case ABILITYEFFECT_CHECK_OTHER_SIDE: // 12
             side = GetBankSide(bank);
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (GetBankSide(i) != side && gBattleMons[i].ability == ability)
                 {
@@ -2414,7 +2414,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             break;
         case ABILITYEFFECT_CHECK_BANK_SIDE: // 13
             side = GetBankSide(bank);
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (GetBankSide(i) == side && gBattleMons[i].ability == ability)
                 {
@@ -2427,21 +2427,21 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             switch (gLastUsedAbility)
             {
             case 0xFD:
-                for (i = 0; i < gNoOfAllBanks; i++)
+                for (i = 0; i < gBattleBanksCount; i++)
                 {
                     if (gStatuses3[i] & STATUS3_MUDSPORT)
                         effect = i + 1;
                 }
                 break;
             case 0xFE:
-                for (i = 0; i < gNoOfAllBanks; i++)
+                for (i = 0; i < gBattleBanksCount; i++)
                 {
                     if (gStatuses3[i] & STATUS3_WATERSPORT)
                         effect = i + 1;
                 }
                 break;
             default:
-                for (i = 0; i < gNoOfAllBanks; i++)
+                for (i = 0; i < gBattleBanksCount; i++)
                 {
                     if (gBattleMons[i].ability == ability)
                     {
@@ -2453,7 +2453,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_CHECK_ON_FIELD: // 19
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gBattleMons[i].ability == ability && gBattleMons[i].hp != 0)
                 {
@@ -2463,7 +2463,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK: // 15
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gBattleMons[i].ability == ability && i != bank)
                 {
@@ -2474,7 +2474,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             break;
         case ABILITYEFFECT_COUNT_OTHER_SIDE: // 16
             side = GetBankSide(bank);
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (GetBankSide(i) != side && gBattleMons[i].ability == ability)
                 {
@@ -2485,7 +2485,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             break;
         case ABILITYEFFECT_COUNT_BANK_SIDE: // 17
             side = GetBankSide(bank);
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (GetBankSide(i) == side && gBattleMons[i].ability == ability)
                 {
@@ -2495,7 +2495,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_COUNT_ON_FIELD: // 18
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gBattleMons[i].ability == ability && i != bank)
                 {
@@ -2573,11 +2573,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     }
 
     // def variables are unused
-    defItem = gBattleMons[gBankTarget].item;
+    defItem = gBattleMons[gBankDefender].item;
     if (defItem == ITEM_ENIGMA_BERRY)
     {
-        defHoldEffect = gEnigmaBerries[gBankTarget].holdEffect;
-        defQuality = gEnigmaBerries[gBankTarget].holdEffectParam;
+        defHoldEffect = gEnigmaBerries[gBankDefender].holdEffect;
+        defQuality = gEnigmaBerries[gBankDefender].holdEffectParam;
     }
     else
     {
@@ -2898,41 +2898,41 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CURE_PAR:
-                if (gBattleMons[bank].status1 & STATUS_PARALYSIS)
+                if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_PARALYSIS);
+                    gBattleMons[bank].status1 &= ~(STATUS1_PARALYSIS);
                     BattleScriptExecute(BattleScript_BerryCurePrlzEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_PSN:
-                if (gBattleMons[bank].status1 & STATUS_PSN_ANY)
+                if (gBattleMons[bank].status1 & STATUS1_PSN_ANY)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_PSN_ANY | STATUS_TOXIC_COUNTER);
+                    gBattleMons[bank].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER);
                     BattleScriptExecute(BattleScript_BerryCurePsnEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_BRN:
-                if (gBattleMons[bank].status1 & STATUS_BURN)
+                if (gBattleMons[bank].status1 & STATUS1_BURN)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_BURN);
+                    gBattleMons[bank].status1 &= ~(STATUS1_BURN);
                     BattleScriptExecute(BattleScript_BerryCureBrnEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_FRZ:
-                if (gBattleMons[bank].status1 & STATUS_FREEZE)
+                if (gBattleMons[bank].status1 & STATUS1_FREEZE)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_FREEZE);
+                    gBattleMons[bank].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptExecute(BattleScript_BerryCureFrzEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_SLP:
-                if (gBattleMons[bank].status1 & STATUS_SLEEP)
+                if (gBattleMons[bank].status1 & STATUS1_SLEEP)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_SLEEP);
+                    gBattleMons[bank].status1 &= ~(STATUS1_SLEEP);
                     gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptExecute(BattleScript_BerryCureSlpEnd2);
                     effect = ITEM_STATUS_CHANGE;
@@ -2947,31 +2947,31 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CURE_STATUS:
-                if (gBattleMons[bank].status1 & STATUS_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION)
+                if (gBattleMons[bank].status1 & STATUS1_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION)
                 {
                     i = 0;
-                    if (gBattleMons[bank].status1 & STATUS_PSN_ANY)
+                    if (gBattleMons[bank].status1 & STATUS1_PSN_ANY)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
                         i++;
                     }
-                    if (gBattleMons[bank].status1 & STATUS_SLEEP)
+                    if (gBattleMons[bank].status1 & STATUS1_SLEEP)
                     {
                         gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
                         StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
                         i++;
                     }
-                    if (gBattleMons[bank].status1 & STATUS_PARALYSIS)
+                    if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
                         i++;
                     }
-                    if (gBattleMons[bank].status1 & STATUS_BURN)
+                    if (gBattleMons[bank].status1 & STATUS1_BURN)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
                         i++;
                     }
-                    if (gBattleMons[bank].status1 & STATUS_FREEZE)
+                    if (gBattleMons[bank].status1 & STATUS1_FREEZE)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
                         i++;
@@ -3024,7 +3024,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     case 2:
         break;
     case 3:
-        for (bank = 0; bank < gNoOfAllBanks; bank++)
+        for (bank = 0; bank < gBattleBanksCount; bank++)
         {
             gLastUsedItem = gBattleMons[bank].item;
             if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY)
@@ -3040,45 +3040,45 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             switch (bankHoldEffect)
             {
             case HOLD_EFFECT_CURE_PAR:
-                if (gBattleMons[bank].status1 & STATUS_PARALYSIS)
+                if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_PARALYSIS);
+                    gBattleMons[bank].status1 &= ~(STATUS1_PARALYSIS);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureParRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_PSN:
-                if (gBattleMons[bank].status1 & STATUS_PSN_ANY)
+                if (gBattleMons[bank].status1 & STATUS1_PSN_ANY)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_PSN_ANY | STATUS_TOXIC_COUNTER);
+                    gBattleMons[bank].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCurePsnRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_BRN:
-                if (gBattleMons[bank].status1 & STATUS_BURN)
+                if (gBattleMons[bank].status1 & STATUS1_BURN)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_BURN);
+                    gBattleMons[bank].status1 &= ~(STATUS1_BURN);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureBrnRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_FRZ:
-                if (gBattleMons[bank].status1 & STATUS_FREEZE)
+                if (gBattleMons[bank].status1 & STATUS1_FREEZE)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_FREEZE);
+                    gBattleMons[bank].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureFrzRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_SLP:
-                if (gBattleMons[bank].status1 & STATUS_SLEEP)
+                if (gBattleMons[bank].status1 & STATUS1_SLEEP)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_SLEEP);
+                    gBattleMons[bank].status1 &= ~(STATUS1_SLEEP);
                     gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureSlpRet;
@@ -3106,26 +3106,26 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CURE_STATUS:
-                if (gBattleMons[bank].status1 & STATUS_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION)
+                if (gBattleMons[bank].status1 & STATUS1_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION)
                 {
-                    if (gBattleMons[bank].status1 & STATUS_PSN_ANY)
+                    if (gBattleMons[bank].status1 & STATUS1_PSN_ANY)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
                     }
-                    if (gBattleMons[bank].status1 & STATUS_SLEEP)
+                    if (gBattleMons[bank].status1 & STATUS1_SLEEP)
                     {
                         gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
                         StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
                     }
-                    if (gBattleMons[bank].status1 & STATUS_PARALYSIS)
+                    if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
                     }
-                    if (gBattleMons[bank].status1 & STATUS_BURN)
+                    if (gBattleMons[bank].status1 & STATUS1_BURN)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
                     }
-                    if (gBattleMons[bank].status1 & STATUS_FREEZE)
+                    if (gBattleMons[bank].status1 & STATUS1_FREEZE)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
                     }
@@ -3177,11 +3177,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             switch (atkHoldEffect)
             {
             case HOLD_EFFECT_FLINCH:
-                if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)
-                    && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special)
+                if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
+                    && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
                     && (Random() % 100) < atkQuality
                     && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED
-                    && gBattleMons[gBankTarget].hp)
+                    && gBattleMons[gBankDefender].hp)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_FLINCH;
                     BattleScriptPushCursor();
@@ -3190,20 +3190,20 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_SHELL_BELL:
-                if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)
-                    && gSpecialStatuses[gBankTarget].moveturnLostHP != 0
-                    && gSpecialStatuses[gBankTarget].moveturnLostHP != 0xFFFF
-                    && gBankAttacker != gBankTarget
+                if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
+                    && gSpecialStatuses[gBankDefender].moveturnLostHP != 0
+                    && gSpecialStatuses[gBankDefender].moveturnLostHP != 0xFFFF
+                    && gBankAttacker != gBankDefender
                     && gBattleMons[gBankAttacker].hp != gBattleMons[gBankAttacker].maxHP
                     && gBattleMons[gBankAttacker].hp != 0)
                 {
                     gLastUsedItem = atkItem;
                     gStringBank = gBankAttacker;
                     gBattleScripting.bank = gBankAttacker;
-                    gBattleMoveDamage = (gSpecialStatuses[gBankTarget].moveturnLostHP / atkQuality) * -1;
+                    gBattleMoveDamage = (gSpecialStatuses[gBankDefender].moveturnLostHP / atkQuality) * -1;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = -1;
-                    gSpecialStatuses[gBankTarget].moveturnLostHP = 0;
+                    gSpecialStatuses[gBankDefender].moveturnLostHP = 0;
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ItemHealHP_Ret;
                     effect++;
@@ -3252,7 +3252,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
             side = GetBankSide(gBankAttacker);
             do
             {
-                targetBank = Random() % gNoOfAllBanks;
+                targetBank = Random() % gBattleBanksCount;
             } while (targetBank == gBankAttacker || side == GetBankSide(targetBank) || gAbsentBankFlags & gBitTable[targetBank]);
             if (gBattleMoves[move].type == TYPE_ELECTRIC
                 && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBankAttacker, ABILITY_LIGHTNING_ROD, 0, 0)
@@ -3268,7 +3268,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     case MOVE_TARGET_BOTH:
     case MOVE_TARGET_FOES_AND_ALLY:
     case MOVE_TARGET_OPPONENTS_FIELD:
-        targetBank = GetBankByIdentity((GetBankPosition(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
+        targetBank = GetBankByPosition((GetBankPosition(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
         if (gAbsentBankFlags & gBitTable[targetBank])
             targetBank ^= BIT_MON;
         break;
@@ -3281,22 +3281,22 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
             if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
             {
                 if (Random() & 1)
-                    targetBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+                    targetBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
                 else
-                    targetBank = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+                    targetBank = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
             }
             else
             {
                 if (Random() & 1)
-                    targetBank = GetBankByIdentity(B_POSITION_PLAYER_LEFT);
+                    targetBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
                 else
-                    targetBank = GetBankByIdentity(B_POSITION_PLAYER_RIGHT);
+                    targetBank = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
             }
             if (gAbsentBankFlags & gBitTable[targetBank])
                 targetBank ^= BIT_MON;
         }
         else
-            targetBank = GetBankByIdentity((GetBankPosition(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
+            targetBank = GetBankByPosition((GetBankPosition(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
         break;
     case MOVE_TARGET_USER:
     case MOVE_TARGET_x10:
@@ -3363,7 +3363,7 @@ u8 IsMonDisobedient(void)
     // is not obedient
     if (gCurrentMove == MOVE_RAGE)
         gBattleMons[gBankAttacker].status2 &= ~(STATUS2_RAGE);
-    if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK))
+    if (gBattleMons[gBankAttacker].status1 & STATUS1_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK))
     {
         gBattlescriptCurrInstr = BattleScript_82DB695;
         return 1;
@@ -3389,7 +3389,7 @@ u8 IsMonDisobedient(void)
 
             gRandomMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
             gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove;
-            gBankTarget = GetMoveTarget(gRandomMove, 0);
+            gBankDefender = GetMoveTarget(gRandomMove, 0);
             gHitMarker |= HITMARKER_x200000;
             return 2;
         }
@@ -3399,16 +3399,16 @@ u8 IsMonDisobedient(void)
         obedienceLevel = gBattleMons[gBankAttacker].level - obedienceLevel;
 
         calc = (Random() & 255);
-        if (calc < obedienceLevel && !(gBattleMons[gBankAttacker].status1 & STATUS_ANY) && gBattleMons[gBankAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBankAttacker].ability != ABILITY_INSOMNIA)
+        if (calc < obedienceLevel && !(gBattleMons[gBankAttacker].status1 & STATUS1_ANY) && gBattleMons[gBankAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBankAttacker].ability != ABILITY_INSOMNIA)
         {
             // try putting asleep
             int i;
-            for (i = 0; i < gNoOfAllBanks; i++)
+            for (i = 0; i < gBattleBanksCount; i++)
             {
                 if (gBattleMons[i].status2 & STATUS2_UPROAR)
                     break;
             }
-            if (i == gNoOfAllBanks)
+            if (i == gBattleBanksCount)
             {
                 gBattlescriptCurrInstr = BattleScript_IgnoresAndFallsAsleep;
                 return 1;
@@ -3418,7 +3418,7 @@ u8 IsMonDisobedient(void)
         if (calc < obedienceLevel)
         {
             gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankAttacker], MOVE_POUND, 0, 40, 0, gBankAttacker, gBankAttacker);
-            gBankTarget = gBankAttacker;
+            gBankDefender = gBankAttacker;
             gBattlescriptCurrInstr = BattleScript_82DB6F0;
             gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
             return 2;
diff --git a/src/battle_util2.c b/src/battle_util2.c
index d242ab6c9..fb01865a4 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -87,15 +87,15 @@ void AdjustFriendshipOnBattleFaint(u8 bank)
     {
         u8 opposingBank2;
 
-        opposingBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
-        opposingBank2 = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+        opposingBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+        opposingBank2 = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
 
         if (gBattleMons[opposingBank2].level > gBattleMons[opposingBank].level)
             opposingBank = opposingBank2;
     }
     else
     {
-        opposingBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+        opposingBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
     }
 
     if (gBattleMons[opposingBank].level > gBattleMons[bank].level)
@@ -138,11 +138,11 @@ u32 sub_805725C(u8 bank)
         switch (gBattleCommunication[MULTIUSE_STATE])
         {
         case 0:
-            if (gBattleMons[bank].status1 & STATUS_SLEEP)
+            if (gBattleMons[bank].status1 & STATUS1_SLEEP)
             {
                 if (UproarWakeUpCheck(bank))
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_SLEEP);
+                    gBattleMons[bank].status1 &= ~(STATUS1_SLEEP);
                     gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -158,12 +158,12 @@ u32 sub_805725C(u8 bank)
                     else
                         toSub = 1;
 
-                    if ((gBattleMons[bank].status1 & STATUS_SLEEP) < toSub)
-                        gBattleMons[bank].status1 &= ~(STATUS_SLEEP);
+                    if ((gBattleMons[bank].status1 & STATUS1_SLEEP) < toSub)
+                        gBattleMons[bank].status1 &= ~(STATUS1_SLEEP);
                     else
                         gBattleMons[bank].status1 -= toSub;
 
-                    if (gBattleMons[bank].status1 & STATUS_SLEEP)
+                    if (gBattleMons[bank].status1 & STATUS1_SLEEP)
                     {
                         gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep;
                         effect = 2;
@@ -181,7 +181,7 @@ u32 sub_805725C(u8 bank)
             gBattleCommunication[MULTIUSE_STATE]++;
             break;
         case 1:
-            if (gBattleMons[bank].status1 & STATUS_FREEZE)
+            if (gBattleMons[bank].status1 & STATUS1_FREEZE)
             {
                 if (Random() % 5 != 0)
                 {
@@ -189,7 +189,7 @@ u32 sub_805725C(u8 bank)
                 }
                 else
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS_FREEZE);
+                    gBattleMons[bank].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c
index d30599607..b6b83086b 100644
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@@ -177,7 +177,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
         damage = damage / damageHelper;
         damage /= 50;
 
-        if ((attacker->status1 & STATUS_BURN) && attacker->ability != ABILITY_GUTS)
+        if ((attacker->status1 & STATUS1_BURN) && attacker->ability != ABILITY_GUTS)
             damage /= 2;
 
         if ((sideStatus & SIDE_STATUS_REFLECT) && gCritMultiplier == 1)
diff --git a/src/field_poison.c b/src/field_poison.c
index b83788210..98819c450 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -42,7 +42,7 @@ static bool32 sub_80F958C(void)
 static void sub_80F95C0(u8 partyIdx)
 {
     struct Pokemon *pokemon = gPlayerParty + partyIdx;
-    unsigned int status = STATUS_NONE;
+    unsigned int status = STATUS1_NONE;
     AdjustFriendship(pokemon, 0x07);
     SetMonData(pokemon, MON_DATA_STATUS, &status);
     GetMonData(pokemon, MON_DATA_NICKNAME, gStringVar1);
diff --git a/src/pokeball.c b/src/pokeball.c
index 86ab85b6a..f16096429 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -17,7 +17,7 @@
 
 extern bool8 gDoingBattleAnim;
 extern u8 gActiveBank;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u16 gBattlePartyID[];
 extern u8 gBankSpriteIds[];
 extern u8 gHealthBoxesIds[];
@@ -378,7 +378,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     switch (throwCaseId)
     {
     case POKEBALL_PLAYER_SENDOUT:
-        gBankTarget = bank;
+        gBankDefender = bank;
         gSprites[ballSpriteId].pos1.x = 24;
         gSprites[ballSpriteId].pos1.y = 68;
         gSprites[ballSpriteId].callback = SpriteCB_PlayerMonSendOut_1;
@@ -386,17 +386,17 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     case POKEBALL_OPPONENT_SENDOUT:
         gSprites[ballSpriteId].pos1.x = GetBankCoord(bank, BANK_X_POS);
         gSprites[ballSpriteId].pos1.y = GetBankCoord(bank, BANK_Y_POS) + 24;
-        gBankTarget = bank;
+        gBankDefender = bank;
         gSprites[ballSpriteId].data[0] = 0;
         gSprites[ballSpriteId].callback = SpriteCB_OpponentMonSendOut;
         break;
     default:
-        gBankTarget = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
         notSendOut = TRUE;
         break;
     }
 
-    gSprites[ballSpriteId].sBank = gBankTarget;
+    gSprites[ballSpriteId].sBank = gBankDefender;
     if (!notSendOut)
     {
         DestroyTask(taskId);
@@ -405,12 +405,12 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
 
     // this will perform an unused ball throw animation
     gSprites[ballSpriteId].data[0] = 0x22;
-    gSprites[ballSpriteId].data[2] = GetBankCoord(gBankTarget, BANK_X_POS);
-    gSprites[ballSpriteId].data[4] = GetBankCoord(gBankTarget, BANK_Y_POS) - 16;
+    gSprites[ballSpriteId].data[2] = GetBankCoord(gBankDefender, BANK_X_POS);
+    gSprites[ballSpriteId].data[4] = GetBankCoord(gBankDefender, BANK_Y_POS) - 16;
     gSprites[ballSpriteId].data[5] = -40;
     sub_80A68D4(&gSprites[ballSpriteId]);
     gSprites[ballSpriteId].oam.affineParam = taskId;
-    gTasks[taskId].tOpponentBank = gBankTarget;
+    gTasks[taskId].tOpponentBank = gBankDefender;
     gTasks[taskId].func = TaskDummy;
     PlaySE(SE_NAGERU);
 }
@@ -767,7 +767,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
         }
 
         species = GetMonData(mon, MON_DATA_SPECIES);
-        if ((bank == GetBankByIdentity(B_POSITION_PLAYER_LEFT) || bank == GetBankByIdentity(B_POSITION_OPPONENT_LEFT))
+        if ((bank == GetBankByPosition(B_POSITION_PLAYER_LEFT) || bank == GetBankByPosition(B_POSITION_OPPONENT_LEFT))
          && IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
@@ -783,7 +783,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
 
         if (!IsDoubleBattle() || !gBattleSpritesDataPtr->animationData->field_9_x1)
             wantedCryCase = 0;
-        else if (bank == GetBankByIdentity(B_POSITION_PLAYER_LEFT) || bank == GetBankByIdentity(B_POSITION_OPPONENT_LEFT))
+        else if (bank == GetBankByPosition(B_POSITION_PLAYER_LEFT) || bank == GetBankByPosition(B_POSITION_OPPONENT_LEFT))
             wantedCryCase = 1;
         else
             wantedCryCase = 2;
@@ -956,7 +956,7 @@ static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite)
             sprite->data[0] = 0;
 
             if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1
-             && sprite->sBank == GetBankByIdentity(B_POSITION_PLAYER_RIGHT))
+             && sprite->sBank == GetBankByPosition(B_POSITION_PLAYER_RIGHT))
                 sprite->callback = SpriteCB_ReleaseMon2FromBall;
             else
                 sprite->callback = SpriteCB_ReleaseMonFromBall;
@@ -982,7 +982,7 @@ static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite)
     {
         sprite->data[0] = 0;
         if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1
-         && sprite->sBank == GetBankByIdentity(B_POSITION_OPPONENT_RIGHT))
+         && sprite->sBank == GetBankByPosition(B_POSITION_OPPONENT_RIGHT))
             sprite->callback = SpriteCB_ReleaseMon2FromBall;
         else
             sprite->callback = SpriteCB_ReleaseMonFromBall;
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 8640eacde..f05453c52 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -17,7 +17,7 @@ struct Unknown_020249B4
 extern u8 gAbsentBankFlags;
 extern u8 gActiveBank;
 extern u8 gBankAttacker;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gLastUsedAbility;
 extern u16 gTrainerBattleOpponent_A;
 extern u32 gBattleTypeFlags;
@@ -35,7 +35,7 @@ extern const u8 gText_BadEgg[];
 extern const u8 gText_EggNickname[];
 
 extern u8 GetBankSide(u8 bank);
-extern u8 GetBankByIdentity(u8 bank);
+extern u8 GetBankByPosition(u8 bank);
 extern u8 GetBankPosition(u8 bank);
 
 u8 CountAliveMonsInBattle(u8 caseId)
@@ -62,7 +62,7 @@ u8 CountAliveMonsInBattle(u8 caseId)
     case BATTLE_ALIVE_DEF_SIDE:
         for (i = 0; i < 4; i++)
         {
-            if (GetBankSide(i) == GetBankSide(gBankTarget) && !(gAbsentBankFlags & gBitTable[i]))
+            if (GetBankSide(i) == GetBankSide(gBankDefender) && !(gAbsentBankFlags & gBitTable[i]))
                 retVal++;
         }
         break;
@@ -90,7 +90,7 @@ u8 GetDefaultMoveTarget(u8 bank)
 
     status ^= 1;
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
-        return GetBankByIdentity(status);
+        return GetBankByPosition(status);
     if (CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) > 1)
     {
         u8 val;
@@ -99,14 +99,14 @@ u8 GetDefaultMoveTarget(u8 bank)
             val = status ^ 2;
         else
             val = status;
-        return GetBankByIdentity(val);
+        return GetBankByPosition(val);
     }
     else
     {
         if ((gAbsentBankFlags & gBitTable[status]))
-            return GetBankByIdentity(status ^ 2);
+            return GetBankByPosition(status ^ 2);
         else
-            return GetBankByIdentity(status);
+            return GetBankByPosition(status);
     }
 }
 
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 95ec4b6a2..a31920ca0 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -27,7 +27,7 @@ extern struct BattlePokemon gBattleMons[4];
 extern struct BattleEnigmaBerry gEnigmaBerries[4];
 extern u8 gActiveBank;
 extern u8 gBankInMenu;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
 extern u8 gBankAttacker;
 extern u8 gStringBank;
 extern u16 gTrainerBattleOpponent_A;
@@ -212,7 +212,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
 
 void sub_806CF24(s32 stat)
 {
-    gBankTarget = gBankInMenu;
+    gBankDefender = gBankInMenu;
     StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_08329EC8[stat]]);
     StringCopy(gBattleTextBuff2, gText_StatRose);
     BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2);
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index c88229c61..b785d1ea1 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -26,7 +26,7 @@ extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u16 gPartnerTrainerId;
 extern u8 gActiveBank;
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
@@ -226,7 +226,7 @@ u8 RecordedBattle_ReadBankAction(u8 bank)
     // trying to read past array or invalid action byte, battle is over
     if (sRecordedBytesNo[bank] >= BANK_RECORD_SIZE || sBattleRecords[bank][sRecordedBytesNo[bank]] == 0xFF)
     {
-        gSpecialVar_Result = gBattleOutcome = BATTLE_PLAYER_TELEPORTED; // hah
+        gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; // hah
         ResetPaletteFadeControl();
         BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
         SetMainCallback2(CB2_QuitRecordedBattle);
@@ -1523,7 +1523,7 @@ void sub_818603C(u8 arg0)
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
         return;
 
-    for (bank = 0; bank < gNoOfAllBanks; bank++)
+    for (bank = 0; bank < gBattleBanksCount; bank++)
     {
         if (GetBankSide(bank) != SIDE_OPPONENT) // player's side only
         {
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 16d902aaa..edbd24530 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -25,7 +25,7 @@ extern u8 gReservedSpritePaletteCount;
 extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
 extern u8 gBankInMenu;
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
 extern u32 gBattleTypeFlags;
 extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
 extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
@@ -164,13 +164,13 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
 
             LoadAndCreateEnemyShadowSprites();
 
-            opponentBank = GetBankByIdentity(B_POSITION_OPPONENT_LEFT);
+            opponentBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
             species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
             SetBankEnemyShadowSpriteCallback(opponentBank, species);
 
             if (IsDoubleBattle())
             {
-                opponentBank = GetBankByIdentity(B_POSITION_OPPONENT_RIGHT);
+                opponentBank = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
                 species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
                 SetBankEnemyShadowSpriteCallback(opponentBank, species);
             }
@@ -210,7 +210,7 @@ static void sub_80A95F4(void)
 
 static bool8 LoadBankSpriteGfx(u8 bank)
 {
-    if (bank < gNoOfAllBanks)
+    if (bank < gBattleBanksCount)
     {
         if (GetBankSide(bank) != SIDE_PLAYER)
         {
@@ -245,7 +245,7 @@ extern const struct MonCoords gTrainerBackPicCoords[];
 
 static void CreateBankSprite(u8 bank)
 {
-    if (bank < gNoOfAllBanks)
+    if (bank < gBattleBanksCount)
     {
         u8 posY;
 
@@ -313,7 +313,7 @@ static void CreateBankSprite(u8 bank)
 
 static void CreateHealthboxSprite(u8 bank)
 {
-    if (bank < gNoOfAllBanks)
+    if (bank < gBattleBanksCount)
     {
         u8 healthboxSpriteId;
 
diff --git a/src/safari_zone.c b/src/safari_zone.c
index ce1eb65bc..12da73090 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -108,20 +108,20 @@ void SafariZoneRetirePrompt(void)
 void CB2_EndSafariBattle(void)
 {
     sSafariZoneFleedMons += gBattleResults.field_1F;
-    if (gBattleOutcome == BATTLE_CAUGHT)
+    if (gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
         sSafariZoneCaughtMons++;
     if (gNumSafariBalls != 0)
     {
         SetMainCallback2(c2_exit_to_overworld_2_switch);
     }
-    else if (gBattleOutcome == BATTLE_SAFARI_OUT_OF_BALLS)
+    else if (gBattleOutcome == B_OUTCOME_NO_SAFARI_BALLS)
     {
         ScriptContext2_RunNewScript(EventScript_2A4B4C);
         warp_in();
         gFieldCallback = sub_80AF6F0;
         SetMainCallback2(c2_load_new_map);
     }
-    else if (gBattleOutcome == BATTLE_CAUGHT)
+    else if (gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
     {
         ScriptContext1_SetupScript(EventScript_2A4B9B);
         ScriptContext1_Stop();
diff --git a/src/tv.c b/src/tv.c
index af0c7069c..0fb2997ad 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1208,7 +1208,7 @@ void PutPokemonTodayFailedOnTheAir(void)
         {
             ct = 0xFF;
         }
-        if (ct > 2 && (gBattleOutcome == BATTLE_POKE_FLED || gBattleOutcome == BATTLE_WON))
+        if (ct > 2 && (gBattleOutcome == B_OUTCOME_POKE_FLED || gBattleOutcome == B_OUTCOME_WON))
         {
             sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
             if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE)
@@ -2402,23 +2402,23 @@ void sub_80EE184(void)
         show->breakingNews.poke1Species = gBattleResults.playerMon1Species;
         switch (gBattleOutcome)
         {
-            case BATTLE_LOST:
-            case BATTLE_DREW:
+            case B_OUTCOME_LOST:
+            case B_OUTCOME_DREW:
                 show->breakingNews.kind = TVSHOW_OFF_AIR;
                 return;
-            case BATTLE_CAUGHT:
+            case B_OUTCOME_CAUGHT_POKE:
                 show->breakingNews.outcome = 0;
                 break;
-            case BATTLE_WON:
+            case B_OUTCOME_WON:
                 show->breakingNews.outcome = 1;
                 break;
-            case BATTLE_RAN:
-            case BATTLE_PLAYER_TELEPORTED:
-            case BATTLE_SAFARI_OUT_OF_BALLS:
+            case B_OUTCOME_RAN:
+            case B_OUTCOME_PLAYER_TELEPORTED:
+            case B_OUTCOME_NO_SAFARI_BALLS:
                 show->breakingNews.outcome = 2;
                 break;
-            case BATTLE_POKE_FLED:
-            case BATTLE_OPPONENT_TELEPORTED:
+            case B_OUTCOME_POKE_FLED:
+            case B_OUTCOME_POKE_TELEPORTED:
                 show->breakingNews.outcome = 3;
                 break;
         }
-- 
cgit v1.2.3


From b4bb5623638413fe9a26904d0524cfdc5b9f30ec Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 16 Jan 2018 16:15:02 -0600
Subject: rename battle_2.c to battle_main.c

---
 src/battle_2.c    | 5612 -----------------------------------------------------
 src/battle_main.c | 5612 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 5612 insertions(+), 5612 deletions(-)
 delete mode 100644 src/battle_2.c
 create mode 100644 src/battle_main.c

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
deleted file mode 100644
index b19dcace1..000000000
--- a/src/battle_2.c
+++ /dev/null
@@ -1,5612 +0,0 @@
-#include "global.h"
-#include "battle.h"
-#include "recorded_battle.h"
-#include "main.h"
-#include "load_save.h"
-#include "gpu_regs.h"
-#include "unknown_task.h"
-#include "battle_setup.h"
-#include "battle_scripts.h"
-#include "pokemon.h"
-#include "palette.h"
-#include "task.h"
-#include "event_data.h"
-#include "constants/species.h"
-#include "berry.h"
-#include "text.h"
-#include "item.h"
-#include "constants/items.h"
-#include "constants/hold_effects.h"
-#include "constants/trainers.h"
-#include "link.h"
-#include "bg.h"
-#include "dma3.h"
-#include "string_util.h"
-#include "malloc.h"
-#include "event_data.h"
-#include "m4a.h"
-#include "window.h"
-#include "random.h"
-#include "constants/songs.h"
-#include "sound.h"
-#include "battle_message.h"
-#include "sprite.h"
-#include "util.h"
-#include "trig.h"
-#include "battle_ai_script_commands.h"
-#include "constants/battle_move_effects.h"
-#include "battle_controllers.h"
-#include "pokedex.h"
-#include "constants/abilities.h"
-#include "constants/moves.h"
-#include "evolution_scene.h"
-#include "roamer.h"
-#include "tv.h"
-#include "safari_zone.h"
-#include "battle_string_ids.h"
-#include "data2.h"
-
-struct UnknownStruct6
-{
-    u16 unk0[0xA0];
-    u8 fillerA0[0x640];
-    u16 unk780[0xA0];
-};
-
-struct UnknownPokemonStruct2
-{
-    /*0x00*/ u16 species;
-    /*0x02*/ u16 heldItem;
-    /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
-    /*0x0F*/ u8 level;
-    /*0x10*/ u16 hp;
-    /*0x12*/ u16 maxhp;
-    /*0x14*/ u32 status;
-    /*0x18*/ u32 personality;
-    /*0x1C*/ u8 gender;
-    /*0x1D*/ u8 language;
-};
-
-extern u8 gBattleCommunication[];
-extern u8 gBattleTerrain;
-extern u16 gBattle_BG0_X;
-extern u16 gBattle_BG0_Y;
-extern u16 gBattle_BG1_X;
-extern u16 gBattle_BG1_Y;
-extern u16 gBattle_BG2_X;
-extern u16 gBattle_BG2_Y;
-extern u16 gBattle_BG3_X;
-extern u16 gBattle_BG3_Y;
-extern u16 gPartnerTrainerId;
-extern u16 gBattle_WIN0H;
-extern u16 gBattle_WIN0V;
-extern u16 gBattle_WIN1H;
-extern u16 gBattle_WIN1V;
-extern u16 gTrainerBattleOpponent_A;
-extern u16 gTrainerBattleOpponent_B;
-extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
-extern void (*gPreBattleCallback1)(void);
-extern void (*gBattleMainFunc)(void);
-extern void (*gCB2_AfterEvolution)(void);
-extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for?
-extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
-extern u8 gUnknown_02039B28[]; // possibly a struct?
-extern struct UnknownStruct6 gUnknown_02038C28; // todo: identify & document
-extern struct MusicPlayerInfo gMPlayInfo_SE1;
-extern struct MusicPlayerInfo gMPlayInfo_SE2;
-extern u8 gDecompressionBuffer[];
-extern u16 gUnknown_020243FC;
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
-extern u8 gStringBank;
-extern u32 gUnknown_02022F88;
-extern u32 gHitMarker;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u16 gPaydayMoney;
-extern u16 gBattleWeather;
-extern u16 gPauseCounterBattle;
-extern u16 gRandomTurnNumber;
-extern u8 gActiveBank;
-extern u8 gBattleBanksCount;
-extern u8 gBankAttacker;
-extern u8 gBankDefender;
-extern u8 gLeveledUpInBattle;
-extern u8 gAbsentBankFlags;
-extern u32 gBattleExecBuffer;
-extern u8 gMultiHitCounter;
-extern u8 gMoveResultFlags;
-extern s32 gBattleMoveDamage;
-extern const u8* gPalaceSelectionBattleScripts[BATTLE_BANKS_COUNT];
-extern u16 gLastPrintedMoves[BATTLE_BANKS_COUNT];
-extern u16 gLastMoves[BATTLE_BANKS_COUNT];
-extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
-extern u16 gLastHitByType[BATTLE_BANKS_COUNT];
-extern u16 gLastResultingMoves[BATTLE_BANKS_COUNT];
-extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
-extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
-extern u8 gUnknown_02024284[BATTLE_BANKS_COUNT];
-extern u32 gStatuses3[BATTLE_BANKS_COUNT];
-extern u16 gSideStatuses[2];
-extern u16 gCurrentMove;
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
-extern u8 gActionForBanks[BATTLE_BANKS_COUNT];
-extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
-extern u8 gCurrentActionFuncId;
-extern u8 gLastUsedAbility;
-extern u8 gUnknown_0203CF00[];
-extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
-extern const u8* gBattlescriptCurrInstr;
-extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
-extern u8 gCurrentTurnActionNumber;
-extern u16 gDynamicBasePower;
-extern u8 gCritMultiplier;
-extern u8 gCurrMovePos;
-extern u8 gUnknown_020241E9;
-extern u16 gChosenMove;
-
-extern const struct BattleMove gBattleMoves[];
-extern const u16 gBattleTextboxPalette[]; // battle textbox palette
-extern const struct BgTemplate gUnknown_0831AA08[];
-extern const struct WindowTemplate * const gUnknown_0831ABA0[];
-extern const u8 gUnknown_0831ACE0[];
-extern const u8 gStatStageRatios[][2];
-extern const u8 * const gBattleScriptsForMoveEffects[];
-extern const u8 * const gBattlescriptsForBallThrow[];
-extern const u8 * const gBattlescriptsForRunningByItem[];
-extern const u8 * const gBattlescriptsForUsingItem[];
-extern const u8 * const gBattlescriptsForSafariActions[];
-
-// strings
-extern const u8 gText_LinkStandby3[];
-extern const u8 gText_RecordBattleToPass[];
-extern const u8 gText_BattleYesNoChoice[];
-extern const u8 gText_BattleRecordCouldntBeSaved[];
-extern const u8 gText_BattleRecordedOnPass[];
-extern const u8 gText_ShedinjaJapaneseName[];
-extern const u8 gText_EmptyString3[];
-extern const u8 gText_Poison[];
-extern const u8 gText_Sleep[];
-extern const u8 gText_Paralysis[];
-extern const u8 gText_Burn[];
-extern const u8 gText_Ice[];
-extern const u8 gText_Confusion[];
-extern const u8 gText_Love[];
-
-// functions
-extern void dp12_8087EA4(void);
-extern void sub_80356D0(void);
-extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower
-extern void sub_8166188(void); // battle tower, sets link battle mons level but why?
-extern void sub_8165B88(u8* dst, u16 trainerId); // battle tower, gets language
-extern void PadNameString(u8* dst, u8 arg2); //
-extern void sub_81B9150(void);
-extern void sub_800AC34(void);
-extern void sub_80B3AF8(u8 taskId); // cable club
-extern void sub_8076918(u8 bank);
-extern void SetHealthboxSpriteVisible(u8 healthoxSpriteId);
-extern void sub_81A56B4(void); // battle frontier 2
-extern u8 sub_81A9E28(void); // battle frontier 2
-extern void sub_81A56E8(u8 bank); // battle frontier 2
-extern void sub_81B8FB0(u8, u8); // party menu
-extern u8 pokemon_order_func(u8); // party menu
-extern bool8 InBattlePyramid(void);
-
-// this file's functions
-static void CB2_InitBattleInternal(void);
-static void CB2_PreInitMultiBattle(void);
-static void CB2_PreInitIngamePlayerPartnerBattle(void);
-static void CB2_HandleStartMultiPartnerBattle(void);
-static void CB2_HandleStartMultiBattle(void);
-static void CB2_HandleStartBattle(void);
-static void TryCorrectShedinjaLanguage(struct Pokemon *mon);
-static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 firstTrainer);
-static void BattleMainCB1(void);
-static void sub_8038538(struct Sprite *sprite);
-static void sub_8038F14(void);
-static void sub_8038F34(void);
-static void sub_80392A8(void);
-static void sub_803937C(void);
-static void sub_803939C(void);
-static void sub_803980C(struct Sprite *sprite);
-static void sub_8039838(struct Sprite *sprite);
-static void sub_8039894(struct Sprite *sprite);
-static void sub_80398D0(struct Sprite *sprite);
-static void sub_8039A48(struct Sprite *sprite);
-static void sub_8039AF4(struct Sprite *sprite);
-static void SpriteCallbackDummy_3(struct Sprite *sprite);
-static void oac_poke_ally_(struct Sprite *sprite);
-static void SpecialStatusesClear(void);
-static void TurnValuesCleanUp(bool8 var0);
-static void SpriteCB_HealthBoxBounce(struct Sprite *sprite);
-static void BattleStartClearSetData(void);
-static void BattleIntroGetMonsData(void);
-static void BattleIntroPrepareBackgroundSlide(void);
-static void BattleIntroDrawTrainersOrMonsSprites(void);
-static void BattleIntroDrawPartySummaryScreens(void);
-static void BattleIntroPrintTrainerWantsToBattle(void);
-static void BattleIntroPrintWildMonAttacked(void);
-static void BattleIntroPrintOpponentSendsOut(void);
-static void BattleIntroPrintPlayerSendsOut(void);
-static void BattleIntroOpponent1SendsOutMonAnimation(void);
-static void BattleIntroOpponent2SendsOutMonAnimation(void);
-static void BattleIntroRecordMonsToDex(void);
-static void BattleIntroPlayer1SendsOutMonAnimation(void);
-static void TryDoEventsBeforeFirstTurn(void);
-static void HandleTurnActionSelectionState(void);
-static void RunTurnActionsFunctions(void);
-static void SetActionsAndBanksTurnOrder(void);
-static void sub_803CDF8(void);
-static bool8 sub_803CDB8(void);
-static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void);
-static void FreeResetData_ReturnToOvOrDoEvolutions(void);
-static void ReturnFromBattleToOverworld(void);
-static void TryEvolvePokemon(void);
-static void WaitForEvoSceneToFinish(void);
-static void HandleEndTurn_ContinueBattle(void);
-static void HandleEndTurn_BattleWon(void);
-static void HandleEndTurn_BattleLost(void);
-static void HandleEndTurn_RanFromBattle(void);
-static void HandleEndTurn_MonFled(void);
-static void HandleEndTurn_FinishBattle(void);
-static void HandleAction_UseMove(void);
-static void HandleAction_Switch(void);
-static void HandleAction_UseItem(void);
-static void HandleAction_Run(void);
-static void HandleAction_WatchesCarefully(void);
-static void HandleAction_SafariZoneBallThrow(void);
-static void HandleAction_ThrowPokeblock(void);
-static void HandleAction_GoNear(void);
-static void HandleAction_SafriZoneRun(void);
-static void HandleAction_Action9(void);
-static void HandleAction_Action11(void);
-static void HandleAction_NothingIsFainted(void);
-static void HandleAction_ActionFinished(void);
-
-// rom const data
-static void (* const sTurnActionsFuncsTable[])(void) =
-{
-    HandleAction_UseMove,               // ACTION_USE_MOVE
-    HandleAction_UseItem,               // ACTION_USE_ITEM
-    HandleAction_Switch,                // ACTION_SWITCH
-    HandleAction_Run,                   // ACTION_RUN
-    HandleAction_WatchesCarefully,      // ACTION_WATCHES_CAREFULLY
-    HandleAction_SafariZoneBallThrow,   // ACTION_SAFARI_ZONE_BALL
-    HandleAction_ThrowPokeblock,        // ACTION_POKEBLOCK_CASE
-    HandleAction_GoNear,                // ACTION_GO_NEAR
-    HandleAction_SafriZoneRun,          // ACTION_SAFARI_ZONE_RUN
-    HandleAction_Action9,               // ACTION_9
-    HandleAction_RunBattleScript,       // ACTION_RUN_BATTLESCRIPT
-    HandleAction_Action11,              // not sure about this one
-    HandleAction_ActionFinished,        // ACTION_FINISHED
-    HandleAction_NothingIsFainted,      // ACTION_NOTHING_FAINTED
-};
-
-static void (* const sEndTurnFuncsTable[])(void) =
-{
-    HandleEndTurn_ContinueBattle,       // battle outcome 0
-    HandleEndTurn_BattleWon,            // B_OUTCOME_WON
-    HandleEndTurn_BattleLost,           // B_OUTCOME_LOST
-    HandleEndTurn_BattleLost,           // B_OUTCOME_DREW
-    HandleEndTurn_RanFromBattle,        // B_OUTCOME_RAN
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_PLAYER_TELEPORTED
-    HandleEndTurn_MonFled,              // B_OUTCOME_POKE_FLED
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_CAUGHT_POKE
-    HandleEndTurn_FinishBattle,         // battle outcome 8
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_FORFEITED
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_POKE_TELEPORTED
-};
-
-const u8 gStatusConditionString_PoisonJpn[8] = _("どく$$$$$");
-const u8 gStatusConditionString_SleepJpn[8] = _("ねむり$$$$");
-const u8 gStatusConditionString_ParalysisJpn[8] = _("まひ$$$$$");
-const u8 gStatusConditionString_BurnJpn[8] = _("やけど$$$$");
-const u8 gStatusConditionString_IceJpn[8] = _("こおり$$$$");
-const u8 gStatusConditionString_ConfusionJpn[8] = _("こんらん$$$");
-const u8 gStatusConditionString_LoveJpn[8] = _("メロメロ$$$");
-
-const u8 * const gStatusConditionStringsTable[7][2] =
-{
-    {gStatusConditionString_PoisonJpn, gText_Poison},
-    {gStatusConditionString_SleepJpn, gText_Sleep},
-    {gStatusConditionString_ParalysisJpn, gText_Paralysis},
-    {gStatusConditionString_BurnJpn, gText_Burn},
-    {gStatusConditionString_IceJpn, gText_Ice},
-    {gStatusConditionString_ConfusionJpn, gText_Confusion},
-    {gStatusConditionString_LoveJpn, gText_Love}
-};
-
-static const u8 sUnknown_0831BCE0[][3] = {{0, 0, 0}, {3, 5, 0}, {2, 3, 0}, {1, 2, 0}, {1, 1, 0}};
-static const u8 sUnknown_0831BCEF[] = {4, 3, 2, 1};
-static const u8 sUnknown_0831BCF3[] = {4, 4, 4, 4};
-
-void CB2_InitBattle(void)
-{
-    MoveSaveBlocks_ResetHeap();
-    AllocateBattleResources();
-    AllocateBattleSpritesData();
-    AllocateMonSpritesGfx();
-    sub_8185F84();
-
-    if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-    {
-        if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
-        {
-            CB2_InitBattleInternal();
-        }
-        else if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER))
-        {
-            HandleLinkBattleSetup();
-            SetMainCallback2(CB2_PreInitMultiBattle);
-        }
-        else
-        {
-            SetMainCallback2(CB2_PreInitIngamePlayerPartnerBattle);
-        }
-        gBattleCommunication[MULTIUSE_STATE] = 0;
-    }
-    else
-    {
-        CB2_InitBattleInternal();
-    }
-}
-
-static void CB2_InitBattleInternal(void)
-{
-    s32 i;
-
-    SetHBlankCallback(NULL);
-    SetVBlankCallback(NULL);
-
-    CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
-
-    SetGpuReg(REG_OFFSET_MOSAIC, 0);
-    SetGpuReg(REG_OFFSET_WIN0H, 240);
-    SetGpuReg(REG_OFFSET_WIN0V, 0x5051);
-    SetGpuReg(REG_OFFSET_WININ, 0);
-    SetGpuReg(REG_OFFSET_WINOUT, 0);
-
-    gBattle_WIN0H = 240;
-
-    if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != STEVEN_PARTNER_ID)
-    {
-        gBattle_WIN0V = 159;
-        gBattle_WIN1H = 240;
-        gBattle_WIN1V = 32;
-    }
-    else
-    {
-        gBattle_WIN0V = 0x5051;
-        dp12_8087EA4();
-
-        for (i = 0; i < 80; i++)
-        {
-            gUnknown_02038C28.unk0[i] = 0xF0;
-            gUnknown_02038C28.unk780[i] = 0xF0;
-        }
-        for (i = 80; i < 160; i++)
-        {
-            #ifndef NONMATCHING
-                asm(""::"r"(i)); // needed to match
-            #endif // NONMATCHING
-
-            gUnknown_02038C28.unk0[i] = 0xFF10;
-            gUnknown_02038C28.unk780[i] = 0xFF10;
-        }
-
-        sub_80BA038(gUnknown_0831AC70);
-    }
-
-    ResetPaletteFade();
-    gBattle_BG0_X = 0;
-    gBattle_BG0_Y = 0;
-    gBattle_BG1_X = 0;
-    gBattle_BG1_Y = 0;
-    gBattle_BG2_X = 0;
-    gBattle_BG2_Y = 0;
-    gBattle_BG3_X = 0;
-    gBattle_BG3_Y = 0;
-
-    gBattleTerrain = BattleSetup_GetTerrainId();
-    if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
-        gBattleTerrain = BATTLE_TERRAIN_BUILDING;
-
-    sub_80356D0();
-    LoadBattleTextboxAndBackground();
-    ResetSpriteData();
-    ResetTasks();
-    LoadBattleEntryBackground();
-    FreeAllSpritePalettes();
-    gReservedSpritePaletteCount = 4;
-    SetVBlankCallback(VBlankCB_Battle);
-    SetUpBattleVarsAndBirchZigzagoon();
-
-    if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
-        SetMainCallback2(CB2_HandleStartMultiPartnerBattle);
-    else if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
-        SetMainCallback2(CB2_HandleStartMultiPartnerBattle);
-    else if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-        SetMainCallback2(CB2_HandleStartMultiBattle);
-    else
-        SetMainCallback2(CB2_HandleStartBattle);
-
-    if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED)))
-    {
-        CreateNPCTrainerParty(&gEnemyParty[0], gTrainerBattleOpponent_A, TRUE);
-        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
-            CreateNPCTrainerParty(&gEnemyParty[3], gTrainerBattleOpponent_B, FALSE);
-        SetWildMonHeldItem();
-    }
-
-    gMain.inBattle = TRUE;
-    gSaveBlock2Ptr->field_CA9_b = 0;
-
-    for (i = 0; i < 6; i++)
-        AdjustFriendship(&gPlayerParty[i], 3);
-
-    gBattleCommunication[MULTIUSE_STATE] = 0;
-}
-
-static void sub_8036A5C(void)
-{
-    u16 r6 = 0;
-    u16 species = 0;
-    u16 hp = 0;
-    u32 status = 0;
-    s32 i;
-
-    for (i = 0; i < PARTY_SIZE; i++)
-    {
-        species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
-        hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
-        status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
-
-        if (species == SPECIES_NONE)
-            continue;
-        if (species != SPECIES_EGG && hp != 0 && status == 0)
-            r6 |= 1 << i * 2;
-
-        if (species == SPECIES_NONE)
-            continue;
-        if (hp != 0 && (species == SPECIES_EGG || status != 0))
-            r6 |= 2 << i * 2;
-
-        if (species == SPECIES_NONE)
-            continue;
-        if (species != SPECIES_EGG && hp == 0)
-            r6 |= 3 << i * 2;
-    }
-
-    gBattleStruct->field_182 = r6;
-    *(&gBattleStruct->field_183) = r6 >> 8;
-    gBattleStruct->field_183 |= FlagGet(FLAG_SYS_FRONTIER_PASS) << 7;
-}
-
-static void SetPlayerBerryDataInBattleStruct(void)
-{
-    s32 i;
-    struct BattleStruct *battleStruct = gBattleStruct;
-    struct BattleEnigmaBerry *battleBerry = &battleStruct->battleEnigmaBerry;
-
-    if (IsEnigmaBerryValid() == TRUE)
-    {
-        for (i = 0; i < BERRY_NAME_COUNT - 1; i++)
-            battleBerry->name[i] = gSaveBlock1Ptr->enigmaBerry.berry.name[i];
-        battleBerry->name[i] = EOS;
-
-        for (i = 0; i < BERRY_ITEM_EFFECT_COUNT; i++)
-            battleBerry->itemEffect[i] = gSaveBlock1Ptr->enigmaBerry.itemEffect[i];
-
-        battleBerry->holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
-        battleBerry->holdEffectParam = gSaveBlock1Ptr->enigmaBerry.holdEffectParam;
-    }
-    else
-    {
-        const struct Berry* berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY));
-
-        for (i = 0; i < BERRY_NAME_COUNT - 1; i++)
-            battleBerry->name[i] = berryData->name[i];
-        battleBerry->name[i] = EOS;
-
-        for (i = 0; i < BERRY_ITEM_EFFECT_COUNT; i++)
-            battleBerry->itemEffect[i] = 0;
-
-        battleBerry->holdEffect = HOLD_EFFECT_NONE;
-        battleBerry->holdEffectParam = 0;
-    }
-}
-
-static void SetAllPlayersBerryData(void)
-{
-    s32 i;
-    s32 j;
-
-    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
-    {
-        if (IsEnigmaBerryValid() == TRUE)
-        {
-            for (i = 0; i < BERRY_NAME_COUNT - 1; i++)
-            {
-                gEnigmaBerries[0].name[i] = gSaveBlock1Ptr->enigmaBerry.berry.name[i];
-                gEnigmaBerries[2].name[i] = gSaveBlock1Ptr->enigmaBerry.berry.name[i];
-            }
-            gEnigmaBerries[0].name[i] = EOS;
-            gEnigmaBerries[2].name[i] = EOS;
-
-            for (i = 0; i < BERRY_ITEM_EFFECT_COUNT; i++)
-            {
-                gEnigmaBerries[0].itemEffect[i] = gSaveBlock1Ptr->enigmaBerry.itemEffect[i];
-                gEnigmaBerries[2].itemEffect[i] = gSaveBlock1Ptr->enigmaBerry.itemEffect[i];
-            }
-
-            gEnigmaBerries[0].holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
-            gEnigmaBerries[2].holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
-            gEnigmaBerries[0].holdEffectParam = gSaveBlock1Ptr->enigmaBerry.holdEffectParam;
-            gEnigmaBerries[2].holdEffectParam = gSaveBlock1Ptr->enigmaBerry.holdEffectParam;
-        }
-        else
-        {
-            const struct Berry* berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY));
-
-            for (i = 0; i < BERRY_NAME_COUNT - 1; i++)
-            {
-                gEnigmaBerries[0].name[i] = berryData->name[i];
-                gEnigmaBerries[2].name[i] = berryData->name[i];
-            }
-            gEnigmaBerries[0].name[i] = EOS;
-            gEnigmaBerries[2].name[i] = EOS;
-
-            for (i = 0; i < BERRY_ITEM_EFFECT_COUNT; i++)
-            {
-                gEnigmaBerries[0].itemEffect[i] = 0;
-                gEnigmaBerries[2].itemEffect[i] = 0;
-            }
-
-            gEnigmaBerries[0].holdEffect = 0;
-            gEnigmaBerries[2].holdEffect = 0;
-            gEnigmaBerries[0].holdEffectParam = 0;
-            gEnigmaBerries[2].holdEffectParam = 0;
-        }
-    }
-    else
-    {
-        s32 numPlayers;
-        struct BattleEnigmaBerry *src;
-        u8 r4;
-
-        if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-        {
-            if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
-                numPlayers = 2;
-            else
-                numPlayers = 4;
-
-            for (i = 0; i < numPlayers; i++)
-            {
-                src = (struct BattleEnigmaBerry *)(gBlockRecvBuffer[i] + 2);
-                r4 = gLinkPlayers[i].lp_field_18;
-
-                for (j = 0; j < BERRY_NAME_COUNT - 1; j++)
-                    gEnigmaBerries[r4].name[j] = src->name[j];
-                gEnigmaBerries[r4].name[j] = EOS;
-
-                for (j = 0; j < BERRY_ITEM_EFFECT_COUNT; j++)
-                    gEnigmaBerries[r4].itemEffect[j] = src->itemEffect[j];
-
-                gEnigmaBerries[r4].holdEffect = src->holdEffect;
-                gEnigmaBerries[r4].holdEffectParam = src->holdEffectParam;
-            }
-        }
-        else
-        {
-            for (i = 0; i < 2; i++)
-            {
-                src = (struct BattleEnigmaBerry *)(gBlockRecvBuffer[i] + 2);
-
-                for (j = 0; j < BERRY_NAME_COUNT - 1; j++)
-                {
-                    gEnigmaBerries[i].name[j] = src->name[j];
-                    gEnigmaBerries[i + 2].name[j] = src->name[j];
-                }
-                gEnigmaBerries[i].name[j] = EOS;
-                gEnigmaBerries[i + 2].name[j] = EOS;
-
-                for (j = 0; j < BERRY_ITEM_EFFECT_COUNT; j++)
-                {
-                    gEnigmaBerries[i].itemEffect[j] = src->itemEffect[j];
-                    gEnigmaBerries[i + 2].itemEffect[j] = src->itemEffect[j];
-                }
-
-                gEnigmaBerries[i].holdEffect = src->holdEffect;
-                gEnigmaBerries[i + 2].holdEffect = src->holdEffect;
-                gEnigmaBerries[i].holdEffectParam = src->holdEffectParam;
-                gEnigmaBerries[i + 2].holdEffectParam = src->holdEffectParam;
-            }
-        }
-    }
-}
-
-static void sub_8036EB8(u8 arg0, u8 arg1)
-{
-    u8 var = 0;
-
-    if (gBlockRecvBuffer[0][0] == 256)
-    {
-        if (arg1 == 0)
-            gBattleTypeFlags |= BATTLE_TYPE_WILD | BATTLE_TYPE_TRAINER;
-        else
-            gBattleTypeFlags |= BATTLE_TYPE_TRAINER;
-        var++;
-    }
-
-    if (var == 0)
-    {
-        s32 i;
-
-        for (i = 0; i < arg0; i++)
-        {
-            if (gBlockRecvBuffer[0][0] != gBlockRecvBuffer[i][0])
-                break;
-        }
-
-        if (i == arg0)
-        {
-            if (arg1 == 0)
-                gBattleTypeFlags |= BATTLE_TYPE_WILD | BATTLE_TYPE_TRAINER;
-            else
-                gBattleTypeFlags |= BATTLE_TYPE_TRAINER;
-            var++;
-        }
-
-        if (var == 0)
-        {
-            for (i = 0; i < arg0; i++)
-            {
-                if (gBlockRecvBuffer[i][0] == 0x300)
-                {
-                    if (i != arg1 && i < arg1)
-                        break;
-                }
-                if (gBlockRecvBuffer[i][0] > 0x300 && i != arg1)
-                    break;
-            }
-
-            if (i == arg0)
-                gBattleTypeFlags |= BATTLE_TYPE_WILD | BATTLE_TYPE_TRAINER;
-            else
-                gBattleTypeFlags |= BATTLE_TYPE_TRAINER;
-        }
-    }
-}
-
-static void CB2_HandleStartBattle(void)
-{
-    u8 playerMultiplayerId;
-    u8 enemyMultiplayerId;
-
-    RunTasks();
-    AnimateSprites();
-    BuildOamBuffer();
-
-    playerMultiplayerId = GetMultiplayerId();
-    gBattleScripting.multiplayerId = playerMultiplayerId;
-    enemyMultiplayerId = playerMultiplayerId ^ BIT_SIDE;
-
-    switch (gBattleCommunication[MULTIUSE_STATE])
-    {
-    case 0:
-        if (!IsDma3ManagerBusyWithBgCopy())
-        {
-            ShowBg(0);
-            ShowBg(1);
-            ShowBg(2);
-            ShowBg(3);
-            sub_805EF14();
-            gBattleCommunication[MULTIUSE_STATE] = 1;
-        }
-        if (gLinkVSyncDisabled)
-            sub_800E0E8();
-        break;
-    case 1:
-        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        {
-            if (gReceivedRemoteLinkPlayers != 0)
-            {
-                if (sub_800A520())
-                {
-                    *(&gBattleStruct->field_180) = 0;
-                    *(&gBattleStruct->field_181) = 3;
-                    sub_8036A5C();
-                    SetPlayerBerryDataInBattleStruct();
-
-                    if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00)
-                    {
-                        gLinkPlayers[0].lp_field_18 = 0;
-                        gLinkPlayers[1].lp_field_18 = 1;
-                    }
-
-                    SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32);
-                    gBattleCommunication[MULTIUSE_STATE] = 2;
-                }
-                if (gLinkVSyncDisabled)
-                    sub_800DFB4(0, 0);
-            }
-        }
-        else
-        {
-            if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-                gBattleTypeFlags |= BATTLE_TYPE_WILD;
-            gBattleCommunication[MULTIUSE_STATE] = 15;
-            SetAllPlayersBerryData();
-        }
-        break;
-    case 2:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            u8 taskId;
-
-            ResetBlockReceivedFlags();
-            sub_8036EB8(2, playerMultiplayerId);
-            SetAllPlayersBerryData();
-            taskId = CreateTask(sub_8035D74, 0);
-            gTasks[taskId].data[1] = 0x10E;
-            gTasks[taskId].data[2] = 0x5A;
-            gTasks[taskId].data[5] = 0;
-            gTasks[taskId].data[3] = gBattleStruct->field_182 | (gBattleStruct->field_183 << 8);
-            gTasks[taskId].data[4] = gBlockRecvBuffer[enemyMultiplayerId][1];
-            sub_8185F90(gBlockRecvBuffer[playerMultiplayerId][1]);
-            sub_8185F90(gBlockRecvBuffer[enemyMultiplayerId][1]);
-            sub_8068AA4();
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 3:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 4:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            ResetBlockReceivedFlags();
-            memcpy(gEnemyParty, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 7:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon) * 2);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 8:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            ResetBlockReceivedFlags();
-            memcpy(gEnemyParty + 2, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 11:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 4, sizeof(struct Pokemon) * 2);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 12:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            ResetBlockReceivedFlags();
-            memcpy(gEnemyParty + 4, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
-            TryCorrectShedinjaLanguage(&gEnemyParty[0]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[1]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[2]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[3]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[4]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[5]);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 15:
-        sub_8032768();
-        sub_8184E58();
-        gBattleCommunication[SPRITES_INIT_STATE1] = 0;
-        gBattleCommunication[SPRITES_INIT_STATE2] = 0;
-        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        {
-            s32 i;
-
-            for (i = 0; i < 2 && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++);
-
-            if (i == 2)
-                gBattleCommunication[MULTIUSE_STATE] = 16;
-            else
-                gBattleCommunication[MULTIUSE_STATE] = 18;
-        }
-        else
-        {
-            gBattleCommunication[MULTIUSE_STATE] = 18;
-        }
-        break;
-    case 16:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), &gRecordedBattleRngSeed, sizeof(gRecordedBattleRngSeed));
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 17:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            ResetBlockReceivedFlags();
-            if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
-                memcpy(&gRecordedBattleRngSeed, gBlockRecvBuffer[enemyMultiplayerId], sizeof(gRecordedBattleRngSeed));
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 18:
-        if (BattleInitAllSprites(&gBattleCommunication[SPRITES_INIT_STATE1], &gBattleCommunication[SPRITES_INIT_STATE2]))
-        {
-            gPreBattleCallback1 = gMain.callback1;
-            gMain.callback1 = BattleMainCB1;
-            SetMainCallback2(BattleMainCB2);
-            if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-            {
-                gBattleTypeFlags |= BATTLE_TYPE_20;
-            }
-        }
-        break;
-    case 5:
-    case 9:
-    case 13:
-        gBattleCommunication[MULTIUSE_STATE]++;
-        gBattleCommunication[1] = 1;
-    case 6:
-    case 10:
-    case 14:
-        if (--gBattleCommunication[1] == 0)
-            gBattleCommunication[MULTIUSE_STATE]++;
-        break;
-    }
-}
-
-static void CB2_HandleStartMultiPartnerBattle(void)
-{
-    u8 playerMultiplayerId;
-    u8 enemyMultiplayerId;
-
-    RunTasks();
-    AnimateSprites();
-    BuildOamBuffer();
-
-    playerMultiplayerId = GetMultiplayerId();
-    gBattleScripting.multiplayerId = playerMultiplayerId;
-    enemyMultiplayerId = playerMultiplayerId ^ BIT_SIDE;
-
-    switch (gBattleCommunication[MULTIUSE_STATE])
-    {
-    case 0:
-        if (!IsDma3ManagerBusyWithBgCopy())
-        {
-            ShowBg(0);
-            ShowBg(1);
-            ShowBg(2);
-            ShowBg(3);
-            sub_805EF14();
-            gBattleCommunication[MULTIUSE_STATE] = 1;
-        }
-        if (gLinkVSyncDisabled)
-            sub_800E0E8();
-        // fall through
-    case 1:
-        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        {
-            if (gReceivedRemoteLinkPlayers != 0)
-            {
-                u8 language;
-
-                gLinkPlayers[0].lp_field_18 = 0;
-                gLinkPlayers[1].lp_field_18 = 2;
-                gLinkPlayers[2].lp_field_18 = 1;
-                gLinkPlayers[3].lp_field_18 = 3;
-                GetFrontierTrainerName(gLinkPlayers[2].name, gTrainerBattleOpponent_A);
-                GetFrontierTrainerName(gLinkPlayers[3].name, gTrainerBattleOpponent_B);
-                sub_8165B88(&language, gTrainerBattleOpponent_A);
-                gLinkPlayers[2].language = language;
-                sub_8165B88(&language, gTrainerBattleOpponent_B);
-                gLinkPlayers[3].language = language;
-
-                if (sub_800A520())
-                {
-                    *(&gBattleStruct->field_180) = 0;
-                    *(&gBattleStruct->field_181) = 3;
-                    sub_8036A5C();
-                    SetPlayerBerryDataInBattleStruct();
-                    SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32);
-                    gBattleCommunication[MULTIUSE_STATE] = 2;
-                }
-
-                if (gLinkVSyncDisabled)
-                    sub_800DFB4(0, 0);
-            }
-        }
-        else
-        {
-            if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-                gBattleTypeFlags |= BATTLE_TYPE_WILD;
-            gBattleCommunication[MULTIUSE_STATE] = 13;
-            SetAllPlayersBerryData();
-        }
-        break;
-    case 2:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            u8 taskId;
-
-            ResetBlockReceivedFlags();
-            sub_8036EB8(2, playerMultiplayerId);
-            SetAllPlayersBerryData();
-            taskId = CreateTask(sub_8035D74, 0);
-            gTasks[taskId].data[1] = 0x10E;
-            gTasks[taskId].data[2] = 0x5A;
-            gTasks[taskId].data[5] = 0;
-            gTasks[taskId].data[3] = 0x145;
-            gTasks[taskId].data[4] = 0x145;
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 3:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 4:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            ResetBlockReceivedFlags();
-            if (gLinkPlayers[playerMultiplayerId].lp_field_18 != 0)
-            {
-                memcpy(gPlayerParty, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
-                memcpy(gPlayerParty + 3, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon) * 2);
-            }
-            else
-            {
-                memcpy(gPlayerParty, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon) * 2);
-                memcpy(gPlayerParty + 3, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
-            }
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 5:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon));
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 6:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            ResetBlockReceivedFlags();
-            if (gLinkPlayers[playerMultiplayerId].lp_field_18 != 0)
-            {
-                memcpy(gPlayerParty + 2, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon));
-                memcpy(gPlayerParty + 5, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon));
-            }
-            else
-            {
-                memcpy(gPlayerParty + 2, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon));
-                memcpy(gPlayerParty + 5, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon));
-            }
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 7:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), gEnemyParty, sizeof(struct Pokemon) * 2);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 8:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            ResetBlockReceivedFlags();
-            if (GetMultiplayerId() != 0)
-            {
-                memcpy(gEnemyParty, gBlockRecvBuffer[0], sizeof(struct Pokemon) * 2);
-            }
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 9:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), gEnemyParty + 2, sizeof(struct Pokemon) * 2);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 10:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            ResetBlockReceivedFlags();
-            if (GetMultiplayerId() != 0)
-            {
-                memcpy(gEnemyParty + 2, gBlockRecvBuffer[0], sizeof(struct Pokemon) * 2);
-            }
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 11:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), gEnemyParty + 4, sizeof(struct Pokemon) * 2);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 12:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            ResetBlockReceivedFlags();
-            if (GetMultiplayerId() != 0)
-                memcpy(gEnemyParty + 4, gBlockRecvBuffer[0], sizeof(struct Pokemon) * 2);
-            TryCorrectShedinjaLanguage(&gPlayerParty[0]);
-            TryCorrectShedinjaLanguage(&gPlayerParty[1]);
-            TryCorrectShedinjaLanguage(&gPlayerParty[2]);
-            TryCorrectShedinjaLanguage(&gPlayerParty[3]);
-            TryCorrectShedinjaLanguage(&gPlayerParty[4]);
-            TryCorrectShedinjaLanguage(&gPlayerParty[5]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[0]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[1]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[2]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[3]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[4]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[5]);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 13:
-        sub_8032768();
-        sub_8184E58();
-        gBattleCommunication[SPRITES_INIT_STATE1] = 0;
-        gBattleCommunication[SPRITES_INIT_STATE2] = 0;
-        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        {
-            gBattleCommunication[MULTIUSE_STATE] = 14;
-        }
-        else
-        {
-            gBattleCommunication[MULTIUSE_STATE] = 16;
-        }
-        break;
-    case 14:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), &gRecordedBattleRngSeed, sizeof(gRecordedBattleRngSeed));
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 15:
-        if ((GetBlockReceivedStatus() & 3) == 3)
-        {
-            ResetBlockReceivedFlags();
-            if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
-                memcpy(&gRecordedBattleRngSeed, gBlockRecvBuffer[enemyMultiplayerId], sizeof(gRecordedBattleRngSeed));
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 16:
-        if (BattleInitAllSprites(&gBattleCommunication[SPRITES_INIT_STATE1], &gBattleCommunication[SPRITES_INIT_STATE2]))
-        {
-            sub_8166188();
-            gPreBattleCallback1 = gMain.callback1;
-            gMain.callback1 = BattleMainCB1;
-            SetMainCallback2(BattleMainCB2);
-            if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-            {
-                gBattleTypeFlags |= BATTLE_TYPE_20;
-            }
-        }
-        break;
-    }
-}
-
-static void sub_80379F8(u8 arrayIdPlus)
-{
-    s32 i;
-
-    for (i = 0; i < 3; i++)
-    {
-        gUnknown_02022FF8[i].species     = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_SPECIES);
-        gUnknown_02022FF8[i].heldItem    = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_HELD_ITEM);
-        GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_NICKNAME, gUnknown_02022FF8[i].nickname);
-        gUnknown_02022FF8[i].level       = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LEVEL);
-        gUnknown_02022FF8[i].hp          = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_HP);
-        gUnknown_02022FF8[i].maxhp       = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_MAX_HP);
-        gUnknown_02022FF8[i].status      = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_STATUS);
-        gUnknown_02022FF8[i].personality = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_PERSONALITY);
-        gUnknown_02022FF8[i].gender      = GetMonGender(&gPlayerParty[arrayIdPlus + i]);
-        StripExtCtrlCodes(gUnknown_02022FF8[i].nickname);
-        if (GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE)
-            PadNameString(gUnknown_02022FF8[i].nickname, CHAR_SPACE);
-    }
-    memcpy(gUnknown_02023058, gUnknown_02022FF8, sizeof(gUnknown_02022FF8));
-}
-
-static void CB2_PreInitMultiBattle(void)
-{
-    s32 i;
-    u8 playerMultiplierId;
-    s32 numPlayers = 4;
-    u8 r4 = 0xF;
-    u32* savedBattleTypeFlags;
-    void (**savedCallback)(void);
-
-    if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
-    {
-        numPlayers = 2;
-        r4 = 3;
-    }
-
-    playerMultiplierId = GetMultiplayerId();
-    gBattleScripting.multiplayerId = playerMultiplierId;
-    savedCallback = &gBattleStruct->savedCallback;
-    savedBattleTypeFlags = &gBattleStruct->savedBattleTypeFlags;
-
-    RunTasks();
-    AnimateSprites();
-    BuildOamBuffer();
-
-    switch (gBattleCommunication[MULTIUSE_STATE])
-    {
-    case 0:
-        if (gReceivedRemoteLinkPlayers != 0 && sub_800A520())
-        {
-            gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct2) * 3);
-            sub_80379F8(0);
-            SendBlock(bitmask_all_link_players_but_self(), gUnknown_02023058, sizeof(struct UnknownPokemonStruct2) * 3);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 1:
-        if ((GetBlockReceivedStatus() & r4) == r4)
-        {
-            ResetBlockReceivedFlags();
-            for (i = 0; i < numPlayers; i++)
-            {
-                if (i == playerMultiplierId)
-                    continue;
-
-                if (numPlayers == 4)
-                {
-                    if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplierId].lp_field_18 & 1))
-                        || (gLinkPlayers[i].lp_field_18 & 1 && gLinkPlayers[playerMultiplierId].lp_field_18 & 1))
-                    {
-                        memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct2) * 3);
-                    }
-                }
-                else
-                {
-                    memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct2) * 3);
-                }
-            }
-            gBattleCommunication[MULTIUSE_STATE]++;
-            *savedCallback = gMain.savedCallback;
-            *savedBattleTypeFlags = gBattleTypeFlags;
-            gMain.savedCallback = CB2_PreInitMultiBattle;
-            sub_81B9150();
-        }
-        break;
-    case 2:
-        if (sub_800A520() && !gPaletteFade.active)
-        {
-            gBattleCommunication[MULTIUSE_STATE]++;
-            if (gLinkVSyncDisabled)
-                sub_800ADF8();
-            else
-                sub_800AC34();
-        }
-        break;
-    case 3:
-        if (gLinkVSyncDisabled)
-        {
-            if (sub_8010500())
-            {
-                gBattleTypeFlags = *savedBattleTypeFlags;
-                gMain.savedCallback = *savedCallback;
-                SetMainCallback2(CB2_InitBattleInternal);
-                Free(gUnknown_02023058);
-                gUnknown_02023058 = NULL;
-            }
-        }
-        else if (gReceivedRemoteLinkPlayers == 0)
-        {
-            gBattleTypeFlags = *savedBattleTypeFlags;
-            gMain.savedCallback = *savedCallback;
-            SetMainCallback2(CB2_InitBattleInternal);
-            Free(gUnknown_02023058);
-            gUnknown_02023058 = NULL;
-        }
-        break;
-    }
-}
-
-static void CB2_PreInitIngamePlayerPartnerBattle(void)
-{
-    u32* savedBattleTypeFlags;
-    void (**savedCallback)(void);
-
-    savedCallback = &gBattleStruct->savedCallback;
-    savedBattleTypeFlags = &gBattleStruct->savedBattleTypeFlags;
-
-    RunTasks();
-    AnimateSprites();
-    BuildOamBuffer();
-
-    switch (gBattleCommunication[MULTIUSE_STATE])
-    {
-    case 0:
-        gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct2) * 3);
-        sub_80379F8(3);
-        gBattleCommunication[MULTIUSE_STATE]++;
-        *savedCallback = gMain.savedCallback;
-        *savedBattleTypeFlags = gBattleTypeFlags;
-        gMain.savedCallback = CB2_PreInitIngamePlayerPartnerBattle;
-        sub_81B9150();
-        break;
-    case 1:
-        if (!gPaletteFade.active)
-        {
-            gBattleCommunication[MULTIUSE_STATE] = 2;
-            gBattleTypeFlags = *savedBattleTypeFlags;
-            gMain.savedCallback = *savedCallback;
-            SetMainCallback2(CB2_InitBattleInternal);
-            Free(gUnknown_02023058);
-            gUnknown_02023058 = NULL;
-        }
-        break;
-    }
-}
-
-static void CB2_HandleStartMultiBattle(void)
-{
-    u8 playerMultiplayerId;
-    s32 id;
-    u8 var;
-
-    playerMultiplayerId = GetMultiplayerId();
-    gBattleScripting.multiplayerId = playerMultiplayerId;
-
-    RunTasks();
-    AnimateSprites();
-    BuildOamBuffer();
-
-    switch (gBattleCommunication[MULTIUSE_STATE])
-    {
-    case 0:
-        if (!IsDma3ManagerBusyWithBgCopy())
-        {
-            ShowBg(0);
-            ShowBg(1);
-            ShowBg(2);
-            ShowBg(3);
-            sub_805EF14();
-            gBattleCommunication[MULTIUSE_STATE] = 1;
-        }
-        if (gLinkVSyncDisabled)
-            sub_800E0E8();
-        break;
-    case 1:
-        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        {
-            if (gReceivedRemoteLinkPlayers != 0)
-            {
-                if (sub_800A520())
-                {
-                    *(&gBattleStruct->field_180) = 0;
-                    *(&gBattleStruct->field_181) = 3;
-                    sub_8036A5C();
-                    SetPlayerBerryDataInBattleStruct();
-
-                    SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32);
-                    gBattleCommunication[MULTIUSE_STATE]++;
-                }
-                if (gLinkVSyncDisabled)
-                    sub_800DFB4(0, 0);
-            }
-        }
-        else
-        {
-            if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-                gBattleTypeFlags |= BATTLE_TYPE_WILD;
-            gBattleCommunication[MULTIUSE_STATE] = 7;
-            SetAllPlayersBerryData();
-        }
-        break;
-    case 2:
-        if ((GetBlockReceivedStatus() & 0xF) == 0xF)
-        {
-            ResetBlockReceivedFlags();
-            sub_8036EB8(4, playerMultiplayerId);
-            SetAllPlayersBerryData();
-            sub_8068AA4();
-            var = CreateTask(sub_8035D74, 0);
-            gTasks[var].data[1] = 0x10E;
-            gTasks[var].data[2] = 0x5A;
-            gTasks[var].data[5] = 0;
-            gTasks[var].data[3] = 0;
-            gTasks[var].data[4] = 0;
-
-            for (id = 0; id < MAX_LINK_PLAYERS; id++)
-            {
-                sub_8185F90(gBlockRecvBuffer[id][1]);
-                switch (gLinkPlayers[id].lp_field_18)
-                {
-                case 0:
-                    gTasks[var].data[3] |= gBlockRecvBuffer[id][1] & 0x3F;
-                    break;
-                case 1:
-                    gTasks[var].data[4] |= gBlockRecvBuffer[id][1] & 0x3F;
-                    break;
-                case 2:
-                    gTasks[var].data[3] |= (gBlockRecvBuffer[id][1] & 0x3F) << 6;
-                    break;
-                case 3:
-                    gTasks[var].data[4] |= (gBlockRecvBuffer[id][1] & 0x3F) << 6;
-                    break;
-                }
-            }
-            ZeroEnemyPartyMons();
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        else
-            break;
-        // fall through
-    case 3:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 4:
-        if ((GetBlockReceivedStatus() & 0xF) == 0xF)
-        {
-            ResetBlockReceivedFlags();
-            for (id = 0; id < MAX_LINK_PLAYERS; id++)
-            {
-                if (id == playerMultiplayerId)
-                {
-                    switch (gLinkPlayers[id].lp_field_18)
-                    {
-                    case 0:
-                    case 3:
-                        memcpy(gPlayerParty, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
-                        break;
-                    case 1:
-                    case 2:
-                        memcpy(gPlayerParty + 3, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
-                        break;
-                    }
-                }
-                else
-                {
-                    if ((!(gLinkPlayers[id].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplayerId].lp_field_18 & 1))
-                     || ((gLinkPlayers[id].lp_field_18 & 1) && (gLinkPlayers[playerMultiplayerId].lp_field_18 & 1)))
-                    {
-                        switch (gLinkPlayers[id].lp_field_18)
-                        {
-                        case 0:
-                        case 3:
-                            memcpy(gPlayerParty, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
-                            break;
-                        case 1:
-                        case 2:
-                            memcpy(gPlayerParty + 3, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        switch (gLinkPlayers[id].lp_field_18)
-                        {
-                        case 0:
-                        case 3:
-                            memcpy(gEnemyParty, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
-                            break;
-                        case 1:
-                        case 2:
-                            memcpy(gEnemyParty + 3, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
-                            break;
-                        }
-                    }
-                }
-            }
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 5:
-        if (sub_800A520())
-        {
-            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon));
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 6:
-        if ((GetBlockReceivedStatus() & 0xF) == 0xF)
-        {
-            ResetBlockReceivedFlags();
-            for (id = 0; id < MAX_LINK_PLAYERS; id++)
-            {
-                if (id == playerMultiplayerId)
-                {
-                    switch (gLinkPlayers[id].lp_field_18)
-                    {
-                    case 0:
-                    case 3:
-                        memcpy(gPlayerParty + 2, gBlockRecvBuffer[id], sizeof(struct Pokemon));
-                        break;
-                    case 1:
-                    case 2:
-                        memcpy(gPlayerParty + 5, gBlockRecvBuffer[id], sizeof(struct Pokemon));
-                        break;
-                    }
-                }
-                else
-                {
-                    if ((!(gLinkPlayers[id].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplayerId].lp_field_18 & 1))
-                     || ((gLinkPlayers[id].lp_field_18 & 1) && (gLinkPlayers[playerMultiplayerId].lp_field_18 & 1)))
-                    {
-                        switch (gLinkPlayers[id].lp_field_18)
-                        {
-                        case 0:
-                        case 3:
-                            memcpy(gPlayerParty + 2, gBlockRecvBuffer[id], sizeof(struct Pokemon));
-                            break;
-                        case 1:
-                        case 2:
-                            memcpy(gPlayerParty + 5, gBlockRecvBuffer[id], sizeof(struct Pokemon));
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        switch (gLinkPlayers[id].lp_field_18)
-                        {
-                        case 0:
-                        case 3:
-                            memcpy(gEnemyParty + 2, gBlockRecvBuffer[id], sizeof(struct Pokemon));
-                            break;
-                        case 1:
-                        case 2:
-                            memcpy(gEnemyParty + 5, gBlockRecvBuffer[id], sizeof(struct Pokemon));
-                            break;
-                        }
-                    }
-                }
-            }
-            TryCorrectShedinjaLanguage(&gPlayerParty[0]);
-            TryCorrectShedinjaLanguage(&gPlayerParty[1]);
-            TryCorrectShedinjaLanguage(&gPlayerParty[2]);
-            TryCorrectShedinjaLanguage(&gPlayerParty[3]);
-            TryCorrectShedinjaLanguage(&gPlayerParty[4]);
-            TryCorrectShedinjaLanguage(&gPlayerParty[5]);
-
-            TryCorrectShedinjaLanguage(&gEnemyParty[0]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[1]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[2]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[3]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[4]);
-            TryCorrectShedinjaLanguage(&gEnemyParty[5]);
-
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 7:
-        sub_8032768();
-        sub_8184E58();
-        gBattleCommunication[SPRITES_INIT_STATE1] = 0;
-        gBattleCommunication[SPRITES_INIT_STATE2] = 0;
-        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        {
-            for (id = 0; id < 4 && (gLinkPlayers[id].version & 0xFF) == 3; id++);
-
-            if (id == 4)
-                gBattleCommunication[MULTIUSE_STATE] = 8;
-            else
-                gBattleCommunication[MULTIUSE_STATE] = 10;
-        }
-        else
-        {
-            gBattleCommunication[MULTIUSE_STATE] = 10;
-        }
-        break;
-    case 8:
-        if (sub_800A520())
-        {
-            u32* ptr = (u32*)(&gBattleStruct->field_180);
-            ptr[0] = gBattleTypeFlags;
-            ptr[1] = gRecordedBattleRngSeed; // UB: overwrites berry data
-            SendBlock(bitmask_all_link_players_but_self(), ptr, 8);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 9:
-        if ((GetBlockReceivedStatus() & 0xF) == 0xF)
-        {
-            ResetBlockReceivedFlags();
-            for (var = 0; var < 4; var++)
-            {
-                u32 blockValue = gBlockRecvBuffer[var][0];
-                if (blockValue & 4)
-                {
-                    memcpy(&gRecordedBattleRngSeed, &gBlockRecvBuffer[var][2], sizeof(gRecordedBattleRngSeed));
-                    break;
-                }
-            }
-
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 10:
-        if (BattleInitAllSprites(&gBattleCommunication[SPRITES_INIT_STATE1], &gBattleCommunication[SPRITES_INIT_STATE2]))
-        {
-            gPreBattleCallback1 = gMain.callback1;
-            gMain.callback1 = BattleMainCB1;
-            SetMainCallback2(BattleMainCB2);
-            if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-            {
-                gTrainerBattleOpponent_A = TRAINER_OPPONENT_800;
-                gBattleTypeFlags |= BATTLE_TYPE_20;
-            }
-        }
-        break;
-    }
-}
-
-void BattleMainCB2(void)
-{
-    AnimateSprites();
-    BuildOamBuffer();
-    RunTextPrinters();
-    UpdatePaletteFade();
-    RunTasks();
-
-    if (gMain.heldKeys & B_BUTTON && gBattleTypeFlags & BATTLE_TYPE_RECORDED && sub_8186450())
-    {
-        gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED;
-        ResetPaletteFadeControl();
-        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-        SetMainCallback2(CB2_QuitRecordedBattle);
-    }
-}
-
-static void FreeRestoreBattleData(void)
-{
-    gMain.callback1 = gPreBattleCallback1;
-    gUnknown_02039B28[0x15] = 3;
-    gMain.inBattle = 0;
-    ZeroEnemyPartyMons();
-    m4aSongNumStop(0x5A);
-    FreeMonSpritesGfx();
-    FreeBattleSpritesData();
-    FreeBattleResources();
-}
-
-void CB2_QuitRecordedBattle(void)
-{
-    UpdatePaletteFade();
-    if (!gPaletteFade.active)
-    {
-        m4aMPlayStop(&gMPlayInfo_SE1);
-        m4aMPlayStop(&gMPlayInfo_SE2);
-        FreeRestoreBattleData();
-        FreeAllWindowBuffers();
-        SetMainCallback2(gMain.savedCallback);
-    }
-}
-
-void sub_8038528(struct Sprite* sprite)
-{
-    sprite->data[0] = 0;
-    sprite->callback = sub_8038538;
-}
-
-static void sub_8038538(struct Sprite *sprite)
-{
-    u16 *arr = (u16*)(gDecompressionBuffer);
-
-    switch (sprite->data[0])
-    {
-    case 0:
-        sprite->data[0]++;
-        sprite->data[1] = 0;
-        sprite->data[2] = 0x281;
-        sprite->data[3] = 0;
-        sprite->data[4] = 1;
-        // fall through
-    case 1:
-        sprite->data[4]--;
-        if (sprite->data[4] == 0)
-        {
-            s32 i;
-            s32 r2;
-            s32 r0;
-
-            sprite->data[4] = 2;
-            r2 = sprite->data[1] + sprite->data[3] * 32;
-            r0 = sprite->data[2] - sprite->data[3] * 32;
-            for (i = 0; i < 29; i += 2)
-            {
-                arr[r2 + i] = 0x3D;
-                arr[r0 + i] = 0x3D;
-            }
-            sprite->data[3]++;
-            if (sprite->data[3] == 21)
-            {
-                sprite->data[0]++;
-                sprite->data[1] = 32;
-            }
-        }
-        break;
-    case 2:
-        sprite->data[1]--;
-        if (sprite->data[1] == 20)
-            SetMainCallback2(CB2_InitBattle);
-        break;
-    }
-}
-
-static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 firstTrainer)
-{
-    u32 nameHash = 0;
-    u32 personalityValue;
-    u8 fixedIV;
-    s32 i, j;
-    u8 monsCount;
-
-    if (trainerNum == SECRET_BASE_OPPONENT)
-        return 0;
-
-    if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & (BATTLE_TYPE_FRONTIER
-                                                                        | BATTLE_TYPE_EREADER_TRAINER
-                                                                        | BATTLE_TYPE_x4000000)))
-    {
-        if (firstTrainer == TRUE)
-            ZeroEnemyPartyMons();
-
-        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
-        {
-            if (gTrainers[trainerNum].partySize > 3)
-                monsCount = 3;
-            else
-                monsCount = gTrainers[trainerNum].partySize;
-        }
-        else
-        {
-            monsCount = gTrainers[trainerNum].partySize;
-        }
-
-        for (i = 0; i < monsCount; i++)
-        {
-
-            if (gTrainers[trainerNum].doubleBattle == TRUE)
-                personalityValue = 0x80;
-            else if (gTrainers[trainerNum].encounterMusic_gender & 0x80)
-                personalityValue = 0x78;
-            else
-                personalityValue = 0x88;
-
-            for (j = 0; gTrainers[trainerNum].trainerName[j] != 0xFF; j++)
-                nameHash += gTrainers[trainerNum].trainerName[j];
-
-            switch (gTrainers[trainerNum].partyFlags)
-            {
-            case 0:
-            {
-                const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerNum].party.NoItemDefaultMoves;
-
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
-                    nameHash += gSpeciesNames[partyData[i].species][j];
-
-                personalityValue += nameHash << 8;
-                fixedIV = partyData[i].iv * 31 / 255;
-                CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0);
-                break;
-            }
-            case F_TRAINER_PARTY_CUSTOM_MOVESET:
-            {
-                const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerNum].party.NoItemCustomMoves;
-
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
-                    nameHash += gSpeciesNames[partyData[i].species][j];
-
-                personalityValue += nameHash << 8;
-                fixedIV = partyData[i].iv * 31 / 255;
-                CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, 2, 0);
-
-                for (j = 0; j < 4; j++)
-                {
-                    SetMonData(&party[i], MON_DATA_MOVE1 + j, &partyData[i].moves[j]);
-                    SetMonData(&party[i], MON_DATA_PP1 + j, &gBattleMoves[partyData[i].moves[j]].pp);
-                }
-                break;
-            }
-            case F_TRAINER_PARTY_HELD_ITEM:
-            {
-                const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerNum].party.ItemDefaultMoves;
-
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
-                    nameHash += gSpeciesNames[partyData[i].species][j];
-
-                personalityValue += nameHash << 8;
-                fixedIV = partyData[i].iv * 31 / 255;
-                CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, 2, 0);
-
-                SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
-                break;
-            }
-            case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
-            {
-                const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerNum].party.ItemCustomMoves;
-
-                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
-                    nameHash += gSpeciesNames[partyData[i].species][j];
-
-                personalityValue += nameHash << 8;
-                fixedIV = partyData[i].iv * 31 / 255;
-                CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, 2, 0);
-
-                SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
-
-                for (j = 0; j < 4; j++)
-                {
-                    SetMonData(&party[i], MON_DATA_MOVE1 + j, &partyData[i].moves[j]);
-                    SetMonData(&party[i], MON_DATA_PP1 + j, &gBattleMoves[partyData[i].moves[j]].pp);
-                }
-                break;
-            }
-            }
-        }
-
-        gBattleTypeFlags |= gTrainers[trainerNum].doubleBattle;
-    }
-
-    return gTrainers[trainerNum].partySize;
-}
-
-void sub_8038A04(void) // unused
-{
-    if (REG_VCOUNT < 0xA0 && REG_VCOUNT >= 0x6F)
-        SetGpuReg(REG_OFFSET_BG0CNT, 0x9800);
-}
-
-void VBlankCB_Battle(void)
-{
-    // change gRngSeed every vblank unless the battle could be recorded
-    if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED)))
-        Random();
-
-    SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_X);
-    SetGpuReg(REG_OFFSET_BG0VOFS, gBattle_BG0_Y);
-    SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
-    SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
-    SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X);
-    SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y);
-    SetGpuReg(REG_OFFSET_BG3HOFS, gBattle_BG3_X);
-    SetGpuReg(REG_OFFSET_BG3VOFS, gBattle_BG3_Y);
-    SetGpuReg(REG_OFFSET_WIN0H, gBattle_WIN0H);
-    SetGpuReg(REG_OFFSET_WIN0V, gBattle_WIN0V);
-    SetGpuReg(REG_OFFSET_WIN1H, gBattle_WIN1H);
-    SetGpuReg(REG_OFFSET_WIN1V, gBattle_WIN1V);
-    LoadOam();
-    ProcessSpriteCopyRequests();
-    TransferPlttBuffer();
-    sub_80BA0A8();
-}
-
-void nullsub_17(void)
-{
-
-}
-
-static void sub_8038B04(struct Sprite *sprite)
-{
-    if (sprite->data[0] != 0)
-        sprite->pos1.x = sprite->data[1] + ((sprite->data[2] & 0xFF00) >> 8);
-    else
-        sprite->pos1.x = sprite->data[1] - ((sprite->data[2] & 0xFF00) >> 8);
-
-    sprite->data[2] += 0x180;
-
-    if (sprite->affineAnimEnded)
-    {
-        FreeSpriteTilesByTag(0x2710);
-        FreeSpritePaletteByTag(0x2710);
-        FreeSpriteOamMatrix(sprite);
-        DestroySprite(sprite);
-    }
-}
-
-void sub_8038B74(struct Sprite *sprite)
-{
-    StartSpriteAffineAnim(sprite, 1);
-    sprite->callback = sub_8038B04;
-    PlaySE(SE_BT_START);
-}
-
-static void sub_8038B94(u8 taskId)
-{
-    struct Pokemon *sp4 = NULL;
-    struct Pokemon *sp8 = NULL;
-    u8 r2 = gBattleScripting.multiplayerId;
-    u32 r7;
-    s32 i;
-
-    if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-    {
-        switch (gLinkPlayers[r2].lp_field_18)
-        {
-        case 0:
-        case 2:
-            sp4 = gPlayerParty;
-            sp8 = gEnemyParty;
-            break;
-        case 1:
-        case 3:
-            sp4 = gEnemyParty;
-            sp8 = gPlayerParty;
-            break;
-        }
-    }
-    else
-    {
-        sp4 = gPlayerParty;
-        sp8 = gEnemyParty;
-    }
-
-    r7 = 0;
-    for (i = 0; i < PARTY_SIZE; i++)
-    {
-        u16 species = GetMonData(&sp4[i], MON_DATA_SPECIES2);
-        u16 hp = GetMonData(&sp4[i], MON_DATA_HP);
-        u32 status = GetMonData(&sp4[i], MON_DATA_STATUS);
-
-        if (species == SPECIES_NONE)
-            continue;
-        if (species != SPECIES_EGG && hp != 0 && status == 0)
-            r7 |= 1 << i * 2;
-
-        if (species == 0)
-            continue;
-        if (hp != 0 && (species == SPECIES_EGG || status != 0))
-            r7 |= 2 << i * 2;
-
-        if (species == 0)
-            continue;
-        if (species != SPECIES_EGG && hp == 0)
-            r7 |= 3 << i * 2;
-    }
-    gTasks[taskId].data[3] = r7;
-
-    r7 = 0;
-    for (i = 0; i < PARTY_SIZE; i++)
-    {
-        u16 species = GetMonData(&sp8[i], MON_DATA_SPECIES2);
-        u16 hp = GetMonData(&sp8[i], MON_DATA_HP);
-        u32 status = GetMonData(&sp8[i], MON_DATA_STATUS);
-
-        if (species == SPECIES_NONE)
-            continue;
-        if (species != SPECIES_EGG && hp != 0 && status == 0)
-            r7 |= 1 << i * 2;
-
-        if (species == SPECIES_NONE)
-            continue;
-        if (hp != 0 && (species == SPECIES_EGG || status != 0))
-            r7 |= 2 << i * 2;
-
-        if (species == SPECIES_NONE)
-            continue;
-        if (species != SPECIES_EGG && hp == 0)
-            r7 |= 3 << i * 2;
-    }
-    gTasks[taskId].data[4] = r7;
-}
-
-void sub_8038D64(void)
-{
-    s32 i;
-    u8 taskId;
-
-    SetHBlankCallback(NULL);
-    SetVBlankCallback(NULL);
-    gBattleTypeFlags &= ~(BATTLE_TYPE_20);
-
-    if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
-    {
-        SetMainCallback2(gMain.savedCallback);
-        FreeBattleResources();
-        FreeBattleSpritesData();
-        FreeMonSpritesGfx();
-    }
-    else
-    {
-        CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
-        SetGpuReg(REG_OFFSET_MOSAIC, 0);
-        SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
-        SetGpuReg(REG_OFFSET_WIN0V, 0x5051);
-        SetGpuReg(REG_OFFSET_WININ, 0);
-        SetGpuReg(REG_OFFSET_WINOUT, 0);
-        gBattle_WIN0H = 0xF0;
-        gBattle_WIN0V = 0x5051;
-        dp12_8087EA4();
-
-        for (i = 0; i < 80; i++)
-        {
-            gUnknown_02038C28.unk0[i] = 0xF0;
-            gUnknown_02038C28.unk780[i] = 0xF0;
-        }
-        for (i = 80; i < 160; i++)
-        {
-            asm(""::"r"(i));  // Needed to stop the compiler from optimizing out the loop counter
-            gUnknown_02038C28.unk0[i] = 0xFF10;
-            gUnknown_02038C28.unk780[i] = 0xFF10;
-        }
-
-        ResetPaletteFade();
-
-        gBattle_BG0_X = 0;
-        gBattle_BG0_Y = 0;
-        gBattle_BG1_X = 0;
-        gBattle_BG1_Y = 0;
-        gBattle_BG2_X = 0;
-        gBattle_BG2_Y = 0;
-        gBattle_BG3_X = 0;
-        gBattle_BG3_Y = 0;
-
-        sub_80356D0();
-        LoadCompressedPalette(gBattleTextboxPalette, 0, 64);
-        ApplyPlayerChosenFrameToBattleMenu();
-        ResetSpriteData();
-        ResetTasks();
-        LoadBattleEntryBackground();
-        SetGpuReg(REG_OFFSET_WINOUT, 0x37);
-        FreeAllSpritePalettes();
-        gReservedSpritePaletteCount = 4;
-        SetVBlankCallback(VBlankCB_Battle);
-
-        taskId = CreateTask(sub_8035D74, 0);
-        gTasks[taskId].data[1] = 0x10E;
-        gTasks[taskId].data[2] = 0x5A;
-        gTasks[taskId].data[5] = 1;
-        sub_8038B94(taskId);
-        SetMainCallback2(sub_8038F14);
-        gBattleCommunication[MULTIUSE_STATE] = 0;
-    }
-}
-
-static void sub_8038F14(void)
-{
-    sub_8038F34();
-    AnimateSprites();
-    BuildOamBuffer();
-    RunTextPrinters();
-    UpdatePaletteFade();
-    RunTasks();
-}
-
-static void sub_8038F34(void)
-{
-    s32 i;
-
-    switch (gBattleCommunication[MULTIUSE_STATE])
-    {
-    case 0:
-        ShowBg(0);
-        ShowBg(1);
-        ShowBg(2);
-        gBattleCommunication[1] = 0xFF;
-        gBattleCommunication[MULTIUSE_STATE]++;
-        break;
-    case 1:
-        if (--gBattleCommunication[1] == 0)
-        {
-            BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 2:
-        if (!gPaletteFade.active)
-        {
-            u8 monsCount;
-
-            gMain.field_439_x4 = sub_8185FAC();
-
-            if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-                monsCount = 4;
-            else
-                monsCount = 2;
-
-            for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++);
-
-            if (!gSaveBlock2Ptr->field_CA9_b && i == monsCount)
-            {
-                if (FlagGet(FLAG_SYS_FRONTIER_PASS))
-                {
-                    FreeAllWindowBuffers();
-                    SetMainCallback2(sub_80392A8);
-                }
-                else if (!gMain.field_439_x4)
-                {
-                    SetMainCallback2(gMain.savedCallback);
-                    FreeBattleResources();
-                    FreeBattleSpritesData();
-                    FreeMonSpritesGfx();
-                }
-                else if (gReceivedRemoteLinkPlayers == 0)
-                {
-                    CreateTask(sub_80B3AF8, 5);
-                    gBattleCommunication[MULTIUSE_STATE]++;
-                }
-                else
-                {
-                    gBattleCommunication[MULTIUSE_STATE]++;
-                }
-            }
-            else
-            {
-                SetMainCallback2(gMain.savedCallback);
-                FreeBattleResources();
-                FreeBattleSpritesData();
-                FreeMonSpritesGfx();
-            }
-        }
-        break;
-    case 3:
-        CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
-
-        for (i = 0; i < 2; i++)
-            LoadChosenBattleElement(i);
-
-        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
-        gBattleCommunication[MULTIUSE_STATE]++;
-        break;
-    case 4:
-        if (!gPaletteFade.active)
-            gBattleCommunication[MULTIUSE_STATE]++;
-        break;
-    case 5:
-        if (!FuncIsActiveTask(sub_80B3AF8))
-            gBattleCommunication[MULTIUSE_STATE]++;
-        break;
-    case 6:
-        if (sub_800A520() == TRUE)
-        {
-            sub_800ADF8();
-            BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 7:
-        if (!IsTextPrinterActive(0))
-        {
-            if (sub_800A520() == TRUE)
-                gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 8:
-        if (!gLinkVSyncDisabled)
-            sub_800AC34();
-        gBattleCommunication[MULTIUSE_STATE]++;
-        break;
-    case 9:
-        if (!gMain.field_439_x4 || gLinkVSyncDisabled || gReceivedRemoteLinkPlayers != 1)
-        {
-            gMain.field_439_x4 = 0;
-            SetMainCallback2(gMain.savedCallback);
-            FreeBattleResources();
-            FreeBattleSpritesData();
-            FreeMonSpritesGfx();
-        }
-        break;
-    }
-}
-
-u32 sub_80391E0(u8 arrayId, u8 caseId)
-{
-    u32 ret = 0;
-
-    switch (caseId)
-    {
-    case 0:
-        ret = gUnknown_0831AA08[arrayId].bg;
-        break;
-    case 1:
-        ret = gUnknown_0831AA08[arrayId].charBaseIndex;
-        break;
-    case 2:
-        ret = gUnknown_0831AA08[arrayId].mapBaseIndex;
-        break;
-    case 3:
-        ret = gUnknown_0831AA08[arrayId].screenSize;
-        break;
-    case 4:
-        ret = gUnknown_0831AA08[arrayId].paletteMode;
-        break;
-    case 5:
-        ret = gUnknown_0831AA08[arrayId].priority;
-        break;
-    case 6:
-        ret = gUnknown_0831AA08[arrayId].baseTile;
-        break;
-    }
-
-    return ret;
-}
-
-static void sub_80392A8(void)
-{
-    s32 i;
-
-    SetHBlankCallback(NULL);
-    SetVBlankCallback(NULL);
-    CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
-    ResetPaletteFade();
-    gBattle_BG0_X = 0;
-    gBattle_BG0_Y = 0;
-    gBattle_BG1_X = 0;
-    gBattle_BG1_Y = 0;
-    gBattle_BG2_X = 0;
-    gBattle_BG2_Y = 0;
-    gBattle_BG3_X = 0;
-    gBattle_BG3_Y = 0;
-    sub_80356D0();
-    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
-    ApplyPlayerChosenFrameToBattleMenu();
-
-    for (i = 0; i < 2; i++)
-        LoadChosenBattleElement(i);
-
-    ResetSpriteData();
-    ResetTasks();
-    FreeAllSpritePalettes();
-    gReservedSpritePaletteCount = 4;
-    SetVBlankCallback(VBlankCB_Battle);
-    SetMainCallback2(sub_803937C);
-    BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
-    gBattleCommunication[MULTIUSE_STATE] = 0;
-}
-
-static void sub_803937C(void)
-{
-    sub_803939C();
-    AnimateSprites();
-    BuildOamBuffer();
-    RunTextPrinters();
-    UpdatePaletteFade();
-    RunTasks();
-}
-
-static void sub_803939C(void)
-{
-    switch (gBattleCommunication[MULTIUSE_STATE])
-    {
-    case 0:
-        ShowBg(0);
-        ShowBg(1);
-        ShowBg(2);
-        gBattleCommunication[MULTIUSE_STATE]++;
-        break;
-    case 1:
-        if (gMain.field_439_x4 && gReceivedRemoteLinkPlayers == 0)
-            CreateTask(sub_80B3AF8, 5);
-        gBattleCommunication[MULTIUSE_STATE]++;
-        break;
-    case 2:
-        if (!FuncIsActiveTask(sub_80B3AF8))
-            gBattleCommunication[MULTIUSE_STATE]++;
-        break;
-    case 3:
-        if (!gPaletteFade.active)
-        {
-            BattleHandleAddTextPrinter(gText_RecordBattleToPass, 0);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 4:
-        if (!IsTextPrinterActive(0))
-        {
-            HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
-            BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
-            gBattleCommunication[CURSOR_POSITION] = 1;
-            BattleCreateYesNoCursorAt(1);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 5:
-        if (gMain.newKeys & DPAD_UP)
-        {
-            if (gBattleCommunication[CURSOR_POSITION] != 0)
-            {
-                PlaySE(SE_SELECT);
-                BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
-                gBattleCommunication[CURSOR_POSITION] = 0;
-                BattleCreateYesNoCursorAt(0);
-            }
-        }
-        else if (gMain.newKeys & DPAD_DOWN)
-        {
-            if (gBattleCommunication[CURSOR_POSITION] == 0)
-            {
-                PlaySE(SE_SELECT);
-                BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
-                gBattleCommunication[CURSOR_POSITION] = 1;
-                BattleCreateYesNoCursorAt(1);
-            }
-        }
-        else if (gMain.newKeys & A_BUTTON)
-        {
-            PlaySE(SE_SELECT);
-            if (gBattleCommunication[CURSOR_POSITION] == 0)
-            {
-                HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
-                gBattleCommunication[1] = MoveRecordedBattleToSaveData();
-                gBattleCommunication[MULTIUSE_STATE] = 10;
-            }
-            else
-            {
-                gBattleCommunication[MULTIUSE_STATE]++;
-            }
-        }
-        else if (gMain.newKeys & B_BUTTON)
-        {
-            PlaySE(SE_SELECT);
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 6:
-        if (sub_800A520() == TRUE)
-        {
-            HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
-            if (gMain.field_439_x4)
-            {
-                sub_800ADF8();
-                BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
-            }
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 8:
-        if (--gBattleCommunication[1] == 0)
-        {
-            if (gMain.field_439_x4 && !gLinkVSyncDisabled)
-                sub_800AC34();
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 9:
-        if (!gMain.field_439_x4 || gLinkVSyncDisabled || gReceivedRemoteLinkPlayers != 1)
-        {
-            gMain.field_439_x4 = 0;
-            if (!gPaletteFade.active)
-            {
-                SetMainCallback2(gMain.savedCallback);
-                FreeBattleResources();
-                FreeBattleSpritesData();
-                FreeMonSpritesGfx();
-            }
-        }
-        break;
-    case 10:
-        if (gBattleCommunication[1] == 1)
-        {
-            PlaySE(SE_SAVE);
-            BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordedOnPass);
-            BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-            gBattleCommunication[1] = 0x80;
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        else
-        {
-            BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordCouldntBeSaved);
-            BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-            gBattleCommunication[1] = 0x80;
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 11:
-        if (sub_800A520() == TRUE && !IsTextPrinterActive(0) && --gBattleCommunication[1] == 0)
-        {
-            if (gMain.field_439_x4)
-            {
-                sub_800ADF8();
-                BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
-            }
-            gBattleCommunication[MULTIUSE_STATE]++;
-        }
-        break;
-    case 12:
-    case 7:
-        if (!IsTextPrinterActive(0))
-        {
-            if (gMain.field_439_x4)
-            {
-                if (sub_800A520() == TRUE)
-                {
-                    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-                    gBattleCommunication[1] = 0x20;
-                    gBattleCommunication[MULTIUSE_STATE] = 8;
-                }
-
-            }
-            else
-            {
-                BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-                gBattleCommunication[1] = 0x20;
-                gBattleCommunication[MULTIUSE_STATE] = 8;
-            }
-        }
-        break;
-    }
-}
-
-static void TryCorrectShedinjaLanguage(struct Pokemon *mon)
-{
-    u8 nickname[POKEMON_NAME_LENGTH + 1];
-    u8 language = LANGUAGE_JAPANESE;
-
-    if (GetMonData(mon, MON_DATA_SPECIES) == SPECIES_SHEDINJA
-     && GetMonData(mon, MON_DATA_LANGUAGE) != language)
-    {
-        GetMonData(mon, MON_DATA_NICKNAME, nickname);
-        if (StringCompareWithoutExtCtrlCodes(nickname, gText_ShedinjaJapaneseName) == 0)
-            SetMonData(mon, MON_DATA_LANGUAGE, &language);
-    }
-}
-
-u32 sub_80397C4(u32 setId, u32 tableId)
-{
-    return gUnknown_0831ABA0[setId][tableId].width * 8;
-}
-
-#define tBank               data[0]
-#define tSpeciesId          data[2]
-
-void oac_poke_opponent(struct Sprite *sprite)
-{
-    sprite->callback = sub_803980C;
-    StartSpriteAnimIfDifferent(sprite, 0);
-    BeginNormalPaletteFade(0x20000, 0, 10, 10, 0x2108);
-}
-
-static void sub_803980C(struct Sprite *sprite)
-{
-    if ((gUnknown_020243FC & 1) == 0)
-    {
-        sprite->pos2.x += 2;
-        if (sprite->pos2.x == 0)
-        {
-            sprite->callback = sub_8039838;
-        }
-    }
-}
-
-static void sub_8039838(struct Sprite *sprite)
-{
-    if (sprite->animEnded)
-    {
-        sub_8076918(sprite->tBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[sprite->tBank]);
-        sprite->callback = sub_8039894;
-        StartSpriteAnimIfDifferent(sprite, 0);
-        BeginNormalPaletteFade(0x20000, 0, 10, 0, 0x2108);
-    }
-}
-
-static void sub_8039894(struct Sprite *sprite)
-{
-    if (!gPaletteFade.active)
-    {
-        BattleAnimateFrontSprite(sprite, sprite->tSpeciesId, FALSE, 1);
-    }
-}
-
-void SpriteCallbackDummy_2(struct Sprite *sprite)
-{
-
-}
-
-static void sub_80398BC(struct Sprite *sprite) // unused?
-{
-    sprite->data[3] = 6;
-    sprite->data[4] = 1;
-    sprite->callback = sub_80398D0;
-}
-
-static void sub_80398D0(struct Sprite *sprite)
-{
-    sprite->data[4]--;
-    if (sprite->data[4] == 0)
-    {
-        sprite->data[4] = 8;
-        sprite->invisible ^= 1;
-        sprite->data[3]--;
-        if (sprite->data[3] == 0)
-        {
-            sprite->invisible = FALSE;
-            sprite->callback = SpriteCallbackDummy_2;
-            gUnknown_02022F88 = 0;
-        }
-    }
-}
-
-extern const struct MonCoords gMonFrontPicCoords[];
-extern const struct MonCoords gCastformFrontSpriteCoords[];
-
-void sub_8039934(struct Sprite *sprite)
-{
-    u8 bank = sprite->tBank;
-    u16 species;
-    u8 yOffset;
-
-    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != 0)
-        species = gBattleSpritesDataPtr->bankData[bank].transformSpecies;
-    else
-        species = sprite->tSpeciesId;
-
-    GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_PERSONALITY);  // Unused return value
-
-    if (species == SPECIES_UNOWN)
-    {
-        u32 personalityValue = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_PERSONALITY);
-        u16 unownForm = ((((personalityValue & 0x3000000) >> 18) | ((personalityValue & 0x30000) >> 12) | ((personalityValue & 0x300) >> 6) | (personalityValue & 3)) % 0x1C);
-        u16 unownSpecies;
-
-        if (unownForm == 0)
-            unownSpecies = SPECIES_UNOWN;  // Use the A Unown form
-        else
-            unownSpecies = NUM_SPECIES + unownForm;  // Use one of the other Unown letters
-
-        yOffset = gMonFrontPicCoords[unownSpecies].y_offset;
-    }
-    else if (species == SPECIES_CASTFORM)
-    {
-        yOffset = gCastformFrontSpriteCoords[gBattleMonForms[bank]].y_offset;
-    }
-    else if (species > NUM_SPECIES)
-    {
-        yOffset = gMonFrontPicCoords[SPECIES_NONE].y_offset;
-    }
-    else
-    {
-        yOffset = gMonFrontPicCoords[species].y_offset;
-    }
-
-    sprite->data[3] = 8 - yOffset / 8;
-    sprite->data[4] = 1;
-    sprite->callback = sub_8039A48;
-}
-
-static void sub_8039A48(struct Sprite *sprite)
-{
-    s32 i;
-
-    sprite->data[4]--;
-    if (sprite->data[4] == 0)
-    {
-        sprite->data[4] = 2;
-        sprite->pos2.y += 8;
-        sprite->data[3]--;
-        if (sprite->data[3] < 0)
-        {
-            FreeSpriteOamMatrix(sprite);
-            DestroySprite(sprite);
-        }
-        else
-        {
-            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBankPosition(sprite->tBank)] + (gBattleMonForms[sprite->tBank] << 11) + (sprite->data[3] << 8);
-
-            for (i = 0; i < 0x100; i++)
-                *(dst++) = 0;
-
-            StartSpriteAnim(sprite, gBattleMonForms[sprite->tBank]);
-        }
-    }
-}
-
-void sub_8039AD8(struct Sprite *sprite)
-{
-    sprite->data[3] = 8;
-    sprite->data[4] = sprite->invisible;
-    sprite->callback = sub_8039AF4;
-}
-
-static void sub_8039AF4(struct Sprite *sprite)
-{
-    sprite->data[3]--;
-    if (sprite->data[3] == 0)
-    {
-        sprite->invisible ^= 1;
-        sprite->data[3] = 8;
-    }
-}
-
-void sub_8039B2C(struct Sprite *sprite)
-{
-    sprite->invisible = sprite->data[4];
-    sprite->data[4] = FALSE;
-    sprite->callback = SpriteCallbackDummy_2;
-}
-
-void sub_8039B58(struct Sprite *sprite)
-{
-    if (sprite->affineAnimEnded)
-    {
-        if (!(gHitMarker & HITMARKER_NO_ANIMATIONS) || gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-        {
-            if (HasTwoFramesAnimation(sprite->tSpeciesId))
-                StartSpriteAnim(sprite, 1);
-        }
-        BattleAnimateFrontSprite(sprite, sprite->tSpeciesId, TRUE, 1);
-    }
-}
-
-void sub_8039BB4(struct Sprite *sprite)
-{
-    sprite->callback = oac_poke_ally_;
-}
-
-static void oac_poke_ally_(struct Sprite *sprite)
-{
-    if ((gUnknown_020243FC & 1) == 0)
-    {
-        sprite->pos2.x -= 2;
-        if (sprite->pos2.x == 0)
-        {
-            sprite->callback = SpriteCallbackDummy_3;
-            sprite->data[1] = 0;
-        }
-    }
-}
-
-void sub_80105DC(struct Sprite *sprite)
-{
-    sprite->callback = SpriteCallbackDummy_3;
-}
-
-static void SpriteCallbackDummy_3(struct Sprite *sprite)
-{
-}
-
-void sub_8039C00(struct Sprite *sprite)
-{
-    if (!(gUnknown_020243FC & 1))
-    {
-        sprite->pos2.x += sprite->data[1];
-        sprite->pos2.y += sprite->data[2];
-    }
-}
-
-void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d)
-{
-    u8 bounceHealthBoxSpriteId;
-    u8 spriteId2;
-
-    if (b)
-    {
-        if (gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2)
-            return;
-    }
-    else
-    {
-        if (gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4)
-            return;
-    }
-
-    bounceHealthBoxSpriteId = CreateInvisibleSpriteWithCallback(SpriteCB_HealthBoxBounce);
-    if (b == TRUE)
-    {
-        spriteId2 = gHealthBoxesIds[bank];
-        gBattleSpritesDataPtr->healthBoxesData[bank].field_2 = bounceHealthBoxSpriteId;
-        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2 = 1;
-        gSprites[bounceHealthBoxSpriteId].data[0] = 0x80;
-    }
-    else
-    {
-        spriteId2 = gBankSpriteIds[bank];
-        gBattleSpritesDataPtr->healthBoxesData[bank].field_3 = bounceHealthBoxSpriteId;
-        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4 = 1;
-        gSprites[bounceHealthBoxSpriteId].data[0] = 0xC0;
-    }
-    gSprites[bounceHealthBoxSpriteId].data[1] = c;
-    gSprites[bounceHealthBoxSpriteId].data[2] = d;
-    gSprites[bounceHealthBoxSpriteId].data[3] = spriteId2;
-    gSprites[bounceHealthBoxSpriteId].data[4] = b;
-    gSprites[spriteId2].pos2.x = 0;
-    gSprites[spriteId2].pos2.y = 0;
-}
-
-void dp11b_obj_free(u8 bank, bool8 b)
-{
-    u8 r4;
-
-    if (b == TRUE)
-    {
-        if (!gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2)
-            return;
-
-        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_2].data[3];
-        DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_2]);
-        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2 = 0;
-    }
-    else
-    {
-        if (!gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4)
-            return;
-
-        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_3].data[3];
-        DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_3]);
-        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4 = 0;
-    }
-    gSprites[r4].pos2.x = 0;
-    gSprites[r4].pos2.y = 0;
-}
-
-static void SpriteCB_HealthBoxBounce(struct Sprite *sprite)
-{
-    u8 spriteId = sprite->data[3];
-    s32 var;
-
-    if (sprite->data[4] == 1)
-        var = sprite->data[0];
-    else
-        var = sprite->data[0];
-
-    gSprites[spriteId].pos2.y = Sin(var, sprite->data[2]) + sprite->data[2];
-    sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF;
-}
-
-void sub_8039E44(struct Sprite *sprite)
-{
-    if (sprite->affineAnimEnded)
-        BattleAnimateBackSprite(sprite, sprite->tSpeciesId);
-}
-
-void sub_8039E60(struct Sprite *sprite)
-{
-    sub_8039E9C(sprite);
-    if (sprite->animEnded)
-        sprite->callback = SpriteCallbackDummy_3;
-}
-
-void sub_8039E84(struct Sprite *sprite)
-{
-    StartSpriteAnim(sprite, 1);
-    sprite->callback = sub_8039E60;
-}
-
-void sub_8039E9C(struct Sprite *sprite)
-{
-    if (sprite->animDelayCounter == 0)
-        sprite->centerToCornerVecX = gUnknown_0831ACE0[sprite->animCmdIndex];
-}
-
-void nullsub_20(void)
-{
-
-}
-
-void BeginBattleIntro(void)
-{
-    BattleStartClearSetData();
-    gBattleCommunication[1] = 0;
-    gBattleMainFunc = BattleIntroGetMonsData;
-}
-
-static void BattleMainCB1(void)
-{
-    gBattleMainFunc();
-
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-        gBattleBankFunc[gActiveBank]();
-}
-
-static void BattleStartClearSetData(void)
-{
-    s32 i;
-    u32 j;
-    u8 *dataPtr;
-
-    TurnValuesCleanUp(FALSE);
-    SpecialStatusesClear();
-
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
-    {
-        gStatuses3[i] = 0;
-
-        dataPtr = (u8 *)&gDisableStructs[i];
-        for (j = 0; j < sizeof(struct DisableStruct); j++)
-            dataPtr[j] = 0;
-
-        gDisableStructs[i].isFirstTurn = 2;
-        gUnknown_02024284[i] = 0;
-        gLastMoves[i] = 0;
-        gLastLandedMoves[i] = 0;
-        gLastHitByType[i] = 0;
-        gLastResultingMoves[i] = 0;
-        gLastHitBy[i] = 0xFF;
-        gLockedMoves[i] = 0;
-        gLastPrintedMoves[i] = 0;
-        gBattleResources->flags->flags[i] = 0;
-        gPalaceSelectionBattleScripts[i] = 0;
-    }
-
-    for (i = 0; i < 2; i++)
-    {
-        gSideStatuses[i] = 0;
-
-        dataPtr = (u8 *)&gSideTimers[i];
-        for (j = 0; j < sizeof(struct SideTimer); j++)
-            dataPtr[j] = 0;
-    }
-
-    gBankAttacker = 0;
-    gBankDefender = 0;
-    gBattleWeather = 0;
-
-    dataPtr = (u8 *)&gWishFutureKnock;
-    for (i = 0; i < sizeof(struct WishFutureKnock); i++)
-        dataPtr[i] = 0;
-
-    gHitMarker = 0;
-
-    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-    {
-        if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gSaveBlock2Ptr->optionsBattleSceneOff == TRUE)
-            gHitMarker |= HITMARKER_NO_ANIMATIONS;
-    }
-    else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && GetBattleStyleInRecordedBattle())
-        gHitMarker |= HITMARKER_NO_ANIMATIONS;
-
-    gBattleScripting.battleStyle = gSaveBlock2Ptr->optionsBattleStyle;
-
-    gMultiHitCounter = 0;
-    gBattleOutcome = 0;
-    gBattleExecBuffer = 0;
-    gPaydayMoney = 0;
-    gBattleResources->battleScriptsStack->size = 0;
-    gBattleResources->battleCallbackStack->size = 0;
-
-    for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
-        gBattleCommunication[i] = 0;
-
-    gPauseCounterBattle = 0;
-    gBattleMoveDamage = 0;
-    gUnknown_020243FC = 0;
-    gBattleScripting.animTurn = 0;
-    gBattleScripting.animTargetsHit = 0;
-    gLeveledUpInBattle = 0;
-    gAbsentBankFlags = 0;
-    gBattleStruct->runTries = 0;
-    gBattleStruct->field_79 = 0;
-    gBattleStruct->field_7A = 0;
-    *(&gBattleStruct->field_7C) = gBaseStats[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275;
-    gBattleStruct->field_7B = 3;
-    gBattleStruct->wildVictorySong = 0;
-    gBattleStruct->moneyMultiplier = 1;
-
-    for (i = 0; i < 8; i++)
-    {
-        *((u8 *)gBattleStruct->mirrorMoves + i) = 0;
-        *((u8 *)gBattleStruct->usedHeldItems + i) = 0;
-        *((u8 *)gBattleStruct->choicedMove + i) = 0;
-        *((u8 *)gBattleStruct->changedItems + i) = 0;
-        *(i + 0 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-        *(i + 1 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-        *(i + 2 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-        *(i + 3 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    }
-
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
-    {
-        *(gBattleStruct->AI_monToSwitchIntoId + i) = 6;
-    }
-
-    gBattleStruct->field_DF = 0;
-    gBattleStruct->field_92 = 0;
-
-    gRandomTurnNumber = Random();
-
-    dataPtr = (u8 *)(&gBattleResults);
-    for (i = 0; i < sizeof(struct BattleResults); i++)
-        dataPtr[i] = 0;
-
-    gBattleResults.unk5_6 = IsMonShiny(&gEnemyParty[0]);
-
-    gBattleStruct->field_2A0 = 0;
-    gBattleStruct->field_2A1 = 0;
-}
-
-void SwitchInClearSetData(void)
-{
-    struct DisableStruct disableStructCopy = gDisableStructs[gActiveBank];
-    s32 i;
-    u8 *ptr;
-
-    if (gBattleMoves[gCurrentMove].effect != EFFECT_BATON_PASS)
-    {
-        for (i = 0; i < BATTLE_STATS_NO; i++)
-            gBattleMons[gActiveBank].statStages[i] = 6;
-        for (i = 0; i < gBattleBanksCount; i++)
-        {
-            if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBank)
-                gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
-            if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].bankWithSureHit == gActiveBank)
-            {
-                gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
-                gDisableStructs[i].bankWithSureHit = 0;
-            }
-        }
-    }
-    if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
-    {
-        gBattleMons[gActiveBank].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED);
-        gStatuses3[gActiveBank] &= (STATUS3_LEECHSEED_BANK | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT);
-
-        for (i = 0; i < gBattleBanksCount; i++)
-        {
-            if (GetBankSide(gActiveBank) != GetBankSide(i)
-             && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
-             && (gDisableStructs[i].bankWithSureHit == gActiveBank))
-            {
-                gStatuses3[i] &= ~(STATUS3_ALWAYS_HITS);
-                gStatuses3[i] |= 0x10;
-            }
-        }
-    }
-    else
-    {
-        gBattleMons[gActiveBank].status2 = 0;
-        gStatuses3[gActiveBank] = 0;
-    }
-
-    for (i = 0; i < gBattleBanksCount; i++)
-    {
-        if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBank))
-            gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBank));
-        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && *(gBattleStruct->wrappedBy + i) == gActiveBank)
-            gBattleMons[i].status2 &= ~(STATUS2_WRAPPED);
-    }
-
-    gActionSelectionCursor[gActiveBank] = 0;
-    gMoveSelectionCursor[gActiveBank] = 0;
-
-    ptr = (u8 *)&gDisableStructs[gActiveBank];
-    for (i = 0; i < sizeof(struct DisableStruct); i++)
-        ptr[i] = 0;
-
-    if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
-    {
-        gDisableStructs[gActiveBank].substituteHP = disableStructCopy.substituteHP;
-        gDisableStructs[gActiveBank].bankWithSureHit = disableStructCopy.bankWithSureHit;
-        gDisableStructs[gActiveBank].perishSongTimer1 = disableStructCopy.perishSongTimer1;
-        gDisableStructs[gActiveBank].perishSongTimer2 = disableStructCopy.perishSongTimer2;
-        gDisableStructs[gActiveBank].bankPreventingEscape = disableStructCopy.bankPreventingEscape;
-    }
-
-    gMoveResultFlags = 0;
-    gDisableStructs[gActiveBank].isFirstTurn = 2;
-    gDisableStructs[gActiveBank].truantUnknownBit = disableStructCopy.truantUnknownBit;
-    gLastMoves[gActiveBank] = 0;
-    gLastLandedMoves[gActiveBank] = 0;
-    gLastHitByType[gActiveBank] = 0;
-    gLastResultingMoves[gActiveBank] = 0;
-    gLastPrintedMoves[gActiveBank] = 0;
-    gLastHitBy[gActiveBank] = 0xFF;
-
-    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 0) = 0;
-    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 1) = 0;
-    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-
-    gBattleStruct->field_92 &= ~(gBitTable[gActiveBank]);
-
-    for (i = 0; i < gBattleBanksCount; i++)
-    {
-        if (i != gActiveBank && GetBankSide(i) != GetBankSide(gActiveBank))
-        {
-            *(gBattleStruct->mirrorMoves + i * 2 + 0) = 0;
-            *(gBattleStruct->mirrorMoves + i * 2 + 1) = 0;
-        }
-        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    }
-
-    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 0) = 0;
-    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 1) = 0;
-
-    gBattleResources->flags->flags[gActiveBank] = 0;
-    gCurrentMove = 0;
-    gBattleStruct->field_DA = 0xFF;
-
-    ClearBankMoveHistory(gActiveBank);
-    ClearBankAbilityHistory(gActiveBank);
-}
-
-void FaintClearSetData(void)
-{
-    s32 i;
-    u8 *ptr;
-
-    for (i = 0; i < BATTLE_STATS_NO; i++)
-        gBattleMons[gActiveBank].statStages[i] = 6;
-
-    gBattleMons[gActiveBank].status2 = 0;
-    gStatuses3[gActiveBank] = 0;
-
-    for (i = 0; i < gBattleBanksCount; i++)
-    {
-        if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBank)
-            gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
-        if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBank))
-            gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBank));
-        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && *(gBattleStruct->wrappedBy + i) == gActiveBank)
-            gBattleMons[i].status2 &= ~(STATUS2_WRAPPED);
-    }
-
-    gActionSelectionCursor[gActiveBank] = 0;
-    gMoveSelectionCursor[gActiveBank] = 0;
-
-    ptr = (u8 *)&gDisableStructs[gActiveBank];
-    for (i = 0; i < sizeof(struct DisableStruct); i++)
-        ptr[i] = 0;
-
-    gProtectStructs[gActiveBank].protected = 0;
-    gProtectStructs[gActiveBank].endured = 0;
-    gProtectStructs[gActiveBank].onlyStruggle = 0;
-    gProtectStructs[gActiveBank].helpingHand = 0;
-    gProtectStructs[gActiveBank].bounceMove = 0;
-    gProtectStructs[gActiveBank].stealMove = 0;
-    gProtectStructs[gActiveBank].flag0Unknown = 0;
-    gProtectStructs[gActiveBank].prlzImmobility = 0;
-    gProtectStructs[gActiveBank].confusionSelfDmg = 0;
-    gProtectStructs[gActiveBank].targetNotAffected = 0;
-    gProtectStructs[gActiveBank].chargingTurn = 0;
-    gProtectStructs[gActiveBank].fleeFlag = 0;
-    gProtectStructs[gActiveBank].usedImprisionedMove = 0;
-    gProtectStructs[gActiveBank].loveImmobility = 0;
-    gProtectStructs[gActiveBank].usedDisabledMove = 0;
-    gProtectStructs[gActiveBank].usedTauntedMove = 0;
-    gProtectStructs[gActiveBank].flag2Unknown = 0;
-    gProtectStructs[gActiveBank].flinchImmobility = 0;
-    gProtectStructs[gActiveBank].notFirstStrike = 0;
-
-    gDisableStructs[gActiveBank].isFirstTurn = 2;
-
-    gLastMoves[gActiveBank] = 0;
-    gLastLandedMoves[gActiveBank] = 0;
-    gLastHitByType[gActiveBank] = 0;
-    gLastResultingMoves[gActiveBank] = 0;
-    gLastPrintedMoves[gActiveBank] = 0;
-    gLastHitBy[gActiveBank] = 0xFF;
-
-    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 0) = 0;
-    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 1) = 0;
-
-    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 0) = 0;
-    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 1) = 0;
-    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-
-    gBattleStruct->field_92 &= ~(gBitTable[gActiveBank]);
-
-    for (i = 0; i < gBattleBanksCount; i++)
-    {
-        if (i != gActiveBank && GetBankSide(i) != GetBankSide(gActiveBank))
-        {
-            *(gBattleStruct->mirrorMoves + i * 2 + 0) = 0;
-            *(gBattleStruct->mirrorMoves + i * 2 + 1) = 0;
-        }
-        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    }
-
-    gBattleResources->flags->flags[gActiveBank] = 0;
-
-    gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
-    gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
-
-    ClearBankMoveHistory(gActiveBank);
-    ClearBankAbilityHistory(gActiveBank);
-}
-
-static void BattleIntroGetMonsData(void)
-{
-    switch (gBattleCommunication[MULTIUSE_STATE])
-    {
-    case 0:
-        gActiveBank = gBattleCommunication[1];
-        EmitGetMonData(0, 0, 0);
-        MarkBufferBankForExecution(gActiveBank);
-        gBattleCommunication[MULTIUSE_STATE]++;
-        break;
-    case 1:
-        if (gBattleExecBuffer == 0)
-        {
-            gBattleCommunication[1]++;
-            if (gBattleCommunication[1] == gBattleBanksCount)
-                gBattleMainFunc = BattleIntroPrepareBackgroundSlide;
-            else
-                gBattleCommunication[MULTIUSE_STATE] = 0;
-        }
-        break;
-    }
-}
-
-static void BattleIntroPrepareBackgroundSlide(void)
-{
-    if (gBattleExecBuffer == 0)
-    {
-        gActiveBank = GetBankByPosition(0);
-        EmitIntroSlide(0, gBattleTerrain);
-        MarkBufferBankForExecution(gActiveBank);
-        gBattleMainFunc = BattleIntroDrawTrainersOrMonsSprites;
-        gBattleCommunication[0] = 0;
-        gBattleCommunication[1] = 0;
-    }
-}
-
-static void BattleIntroDrawTrainersOrMonsSprites(void)
-{
-    u8 *ptr;
-    s32 i;
-
-    if (gBattleExecBuffer)
-        return;
-
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-    {
-        if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-         && GetBankSide(gActiveBank) == SIDE_PLAYER)
-        {
-            ptr = (u8 *)&gBattleMons[gActiveBank];
-            for (i = 0; i < sizeof(struct BattlePokemon); i++)
-                ptr[i] = 0;
-        }
-        else
-        {
-            u16* hpOnSwitchout;
-
-            ptr = (u8 *)&gBattleMons[gActiveBank];
-            for (i = 0; i < sizeof(struct BattlePokemon); i++)
-                ptr[i] = gBattleBufferB[gActiveBank][4 + i];
-
-            gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
-            gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
-            gBattleMons[gActiveBank].ability = GetAbilityBySpecies(gBattleMons[gActiveBank].species, gBattleMons[gActiveBank].altAbility);
-            hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBankSide(gActiveBank)];
-            *hpOnSwitchout = gBattleMons[gActiveBank].hp;
-            for (i = 0; i < BATTLE_STATS_NO; i++)
-                gBattleMons[gActiveBank].statStages[i] = 6;
-            gBattleMons[gActiveBank].status2 = 0;
-        }
-
-        if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_LEFT)
-        {
-            EmitDrawTrainerPic(0);
-            MarkBufferBankForExecution(gActiveBank);
-        }
-
-        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
-        {
-            if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_LEFT)
-            {
-                EmitDrawTrainerPic(0);
-                MarkBufferBankForExecution(gActiveBank);
-            }
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT
-             && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
-                                      | BATTLE_TYPE_FRONTIER
-                                      | BATTLE_TYPE_LINK
-                                      | BATTLE_TYPE_x2000000
-                                      | BATTLE_TYPE_x4000000)))
-            {
-                HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), FLAG_SET_SEEN, gBattleMons[gActiveBank].personality);
-            }
-        }
-        else
-        {
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
-            {
-                if (!(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
-                                      | BATTLE_TYPE_FRONTIER
-                                      | BATTLE_TYPE_LINK
-                                      | BATTLE_TYPE_x2000000
-                                      | BATTLE_TYPE_x4000000)))
-                {
-                    HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), FLAG_SET_SEEN, gBattleMons[gActiveBank].personality);
-                }
-                EmitLoadMonSprite(0);
-                MarkBufferBankForExecution(gActiveBank);
-                gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES, NULL);
-            }
-        }
-
-        if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-        {
-            if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_RIGHT
-             || GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
-            {
-                EmitDrawTrainerPic(0);
-                MarkBufferBankForExecution(gActiveBank);
-            }
-        }
-
-        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
-        {
-            EmitDrawTrainerPic(0);
-            MarkBufferBankForExecution(gActiveBank);
-        }
-
-        if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-            sub_81A56B4();
-    }
-    gBattleMainFunc = BattleIntroDrawPartySummaryScreens;
-}
-
-static void BattleIntroDrawPartySummaryScreens(void)
-{
-    s32 i;
-    struct HpAndStatus hpStatus[6];
-
-    if (gBattleExecBuffer)
-        return;
-
-    if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
-    {
-        for (i = 0; i < PARTY_SIZE; i++)
-        {
-            if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
-             || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
-            {
-                hpStatus[i].hp = 0xFFFF;
-                hpStatus[i].status = 0;
-            }
-            else
-            {
-                hpStatus[i].hp = GetMonData(&gEnemyParty[i], MON_DATA_HP);
-                hpStatus[i].status = GetMonData(&gEnemyParty[i], MON_DATA_STATUS);
-            }
-        }
-        gActiveBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
-        EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
-        MarkBufferBankForExecution(gActiveBank);
-
-        for (i = 0; i < PARTY_SIZE; i++)
-        {
-            if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
-             || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
-            {
-                hpStatus[i].hp = 0xFFFF;
-                hpStatus[i].status = 0;
-            }
-            else
-            {
-                hpStatus[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
-                hpStatus[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
-            }
-        }
-        gActiveBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
-        EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
-        MarkBufferBankForExecution(gActiveBank);
-
-        gBattleMainFunc = BattleIntroPrintTrainerWantsToBattle;
-    }
-    else
-    {
-        // The struct gets set here, but nothing is ever done with it since
-        // wild battles don't show the party summary.
-        // Still, there's no point in having dead code.
-
-        for (i = 0; i < 6; i++)
-        {
-            if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
-             || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
-            {
-                hpStatus[i].hp = 0xFFFF;
-                hpStatus[i].status = 0;
-            }
-            else
-            {
-                hpStatus[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
-                hpStatus[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
-            }
-        }
-
-        gBattleMainFunc = BattleIntroPrintWildMonAttacked;
-    }
-
-}
-
-static void BattleIntroPrintTrainerWantsToBattle(void)
-{
-    if (gBattleExecBuffer == 0)
-    {
-        gActiveBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
-        PrepareStringBattle(STRINGID_INTROMSG, gActiveBank);
-        gBattleMainFunc = BattleIntroPrintOpponentSendsOut;
-    }
-}
-
-static void BattleIntroPrintWildMonAttacked(void)
-{
-    if (gBattleExecBuffer == 0)
-    {
-        gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
-        PrepareStringBattle(STRINGID_INTROMSG, 0);
-    }
-}
-
-static void BattleIntroPrintOpponentSendsOut(void)
-{
-    u32 identity;
-
-    if (gBattleExecBuffer)
-        return;
-
-    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_OPPONENT_LEFT;
-    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
-    {
-        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_OPPONENT_LEFT;
-        else
-            identity = B_POSITION_PLAYER_LEFT;
-    }
-    else
-        identity = B_POSITION_OPPONENT_LEFT;
-
-    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(identity));
-    gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
-}
-
-static void BattleIntroOpponent2SendsOutMonAnimation(void)
-{
-    u32 identity;
-
-    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_OPPONENT_RIGHT;
-    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
-    {
-        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_OPPONENT_RIGHT;
-        else
-            identity = B_POSITION_PLAYER_RIGHT;
-    }
-    else
-        identity = B_POSITION_OPPONENT_RIGHT;
-
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-    {
-        if (GetBankPosition(gActiveBank) == identity)
-        {
-            EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBank);
-        }
-    }
-
-    gBattleMainFunc = BattleIntroRecordMonsToDex;
-}
-
-#ifdef NONMATCHING
-static void BattleIntroOpponent1SendsOutMonAnimation(void)
-{
-    u32 identity;
-
-    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_OPPONENT_LEFT;
-    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
-    {
-        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_OPPONENT_LEFT;
-        else
-            identity = B_POSITION_PLAYER_LEFT;
-    }
-    else
-        identity = B_POSITION_OPPONENT_LEFT;
-
-    if (gBattleExecBuffer)
-        return;
-
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-    {
-        if (GetBankPosition(gActiveBank) == identity)
-        {
-            EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBank);
-            if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS))
-            {
-                gBattleMainFunc = BattleIntroOpponent2SendsOutMonAnimation;
-                return;
-            }
-        }
-    }
-
-    gBattleMainFunc = BattleIntroRecordMonsToDex;
-}
-
-#else
-__attribute__((naked))
-static void BattleIntroOpponent1SendsOutMonAnimation(void)
-{
-    asm(".syntax unified\n\
-        	push {r4-r6,lr}\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r2, [r0]\n\
-	movs r0, 0x80\n\
-	lsls r0, 17\n\
-	ands r0, r2\n\
-	cmp r0, 0\n\
-	beq _0803B298\n\
-	movs r0, 0x80\n\
-	lsls r0, 18\n\
-	ands r0, r2\n\
-	cmp r0, 0\n\
-	beq _0803B298\n\
-	movs r1, 0x80\n\
-	lsls r1, 24\n\
-	ands r1, r2\n\
-	negs r0, r1\n\
-	orrs r0, r1\n\
-	lsrs r5, r0, 31\n\
-	b _0803B29A\n\
-	.pool\n\
-_0803B288:\n\
-	ldr r1, =gBattleMainFunc\n\
-	ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\
-	b _0803B2F0\n\
-	.pool\n\
-_0803B298:\n\
-	movs r5, 0x1\n\
-_0803B29A:\n\
-	ldr r0, =gBattleExecBuffer\n\
-	ldr r2, [r0]\n\
-	cmp r2, 0\n\
-	bne _0803B2F2\n\
-	ldr r0, =gActiveBank\n\
-	strb r2, [r0]\n\
-	ldr r1, =gBattleBanksCount\n\
-	adds r4, r0, 0\n\
-	ldrb r1, [r1]\n\
-	cmp r2, r1\n\
-	bcs _0803B2EC\n\
-	adds r6, r4, 0\n\
-_0803B2B2:\n\
-	ldrb r0, [r4]\n\
-	bl GetBankPosition\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, r5\n\
-	bne _0803B2D8\n\
-	movs r0, 0\n\
-	bl EmitIntroTrainerBallThrow\n\
-	ldrb r0, [r4]\n\
-	bl MarkBufferBankForExecution\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r0, [r0]\n\
-	ldr r1, =0x00008040\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	bne _0803B288\n\
-_0803B2D8:\n\
-	ldrb r0, [r6]\n\
-	adds r0, 0x1\n\
-	strb r0, [r6]\n\
-	ldr r1, =gBattleBanksCount\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	ldr r4, =gActiveBank\n\
-	ldrb r1, [r1]\n\
-	cmp r0, r1\n\
-	bcc _0803B2B2\n\
-_0803B2EC:\n\
-	ldr r1, =gBattleMainFunc\n\
-	ldr r0, =BattleIntroRecordMonsToDex\n\
-_0803B2F0:\n\
-	str r0, [r1]\n\
-_0803B2F2:\n\
-	pop {r4-r6}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n\
-        .syntax divided");
-}
-
-#endif // NONMATCHING
-
-static void BattleIntroRecordMonsToDex(void)
-{
-    if (gBattleExecBuffer == 0)
-    {
-        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-        {
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT
-             && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
-                                      | BATTLE_TYPE_FRONTIER
-                                      | BATTLE_TYPE_LINK
-                                      | BATTLE_TYPE_x2000000
-                                      | BATTLE_TYPE_x4000000)))
-            {
-                HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), FLAG_SET_SEEN, gBattleMons[gActiveBank].personality);
-            }
-        }
-        gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
-    }
-}
-
-void sub_803B3AC(void) // unused
-{
-    if (gBattleExecBuffer == 0)
-        gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
-}
-
-static void BattleIntroPrintPlayerSendsOut(void)
-{
-    if (gBattleExecBuffer == 0)
-    {
-        u8 identity;
-
-        if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-            identity = B_POSITION_PLAYER_LEFT;
-        else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
-        {
-            if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-                identity = B_POSITION_PLAYER_LEFT;
-            else
-                identity = B_POSITION_OPPONENT_LEFT;
-        }
-        else
-            identity = B_POSITION_PLAYER_LEFT;
-
-        if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
-            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(identity));
-
-        gBattleMainFunc = BattleIntroPlayer1SendsOutMonAnimation;
-    }
-}
-
-static void BattleIntroPlayer2SendsOutMonAnimation(void)
-{
-    u32 identity;
-
-    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_PLAYER_RIGHT;
-    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
-    {
-        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_PLAYER_RIGHT;
-        else
-            identity = B_POSITION_OPPONENT_RIGHT;
-    }
-    else
-        identity = B_POSITION_PLAYER_RIGHT;
-
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-    {
-        if (GetBankPosition(gActiveBank) == identity)
-        {
-            EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBank);
-        }
-    }
-
-    gBattleStruct->switchInAbilitiesCounter = 0;
-    gBattleStruct->switchInItemsCounter = 0;
-    gBattleStruct->overworldWeatherDone = FALSE;
-
-    gBattleMainFunc = TryDoEventsBeforeFirstTurn;
-}
-
-static void BattleIntroPlayer1SendsOutMonAnimation(void)
-{
-    u32 identity;
-
-    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_PLAYER_LEFT;
-    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
-    {
-        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_PLAYER_LEFT;
-        else
-            identity = B_POSITION_OPPONENT_LEFT;
-    }
-    else
-        identity = B_POSITION_PLAYER_LEFT;
-
-    if (gBattleExecBuffer)
-        return;
-
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-    {
-        if (GetBankPosition(gActiveBank) == identity)
-        {
-            EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBank);
-            if (gBattleTypeFlags & (BATTLE_TYPE_MULTI))
-            {
-                gBattleMainFunc = BattleIntroPlayer2SendsOutMonAnimation;
-                return;
-            }
-        }
-    }
-
-    gBattleStruct->switchInAbilitiesCounter = 0;
-    gBattleStruct->switchInItemsCounter = 0;
-    gBattleStruct->overworldWeatherDone = FALSE;
-
-    gBattleMainFunc = TryDoEventsBeforeFirstTurn;
-}
-
-void sub_803B598(void) // unused
-{
-    if (gBattleExecBuffer == 0)
-    {
-        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-        {
-            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
-            {
-                EmitSwitchInAnim(0, gBattlePartyID[gActiveBank], FALSE);
-                MarkBufferBankForExecution(gActiveBank);
-            }
-        }
-
-        gBattleStruct->switchInAbilitiesCounter = 0;
-        gBattleStruct->switchInItemsCounter = 0;
-        gBattleStruct->overworldWeatherDone = FALSE;
-
-        gBattleMainFunc = TryDoEventsBeforeFirstTurn;
-    }
-}
-
-static void TryDoEventsBeforeFirstTurn(void)
-{
-    s32 i;
-    s32 j;
-    u8 effect = 0;
-
-    if (gBattleExecBuffer)
-        return;
-
-    if (gBattleStruct->switchInAbilitiesCounter == 0)
-    {
-        for (i = 0; i < gBattleBanksCount; i++)
-            gBanksByTurnOrder[i] = i;
-        for (i = 0; i < gBattleBanksCount - 1; i++)
-        {
-            for (j = i + 1; j < gBattleBanksCount; j++)
-            {
-                if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], TRUE) != 0)
-                    SwapTurnOrder(i, j);
-            }
-        }
-    }
-    if (!gBattleStruct->overworldWeatherDone
-        && AbilityBattleEffects(0, 0, 0, ABILITYEFFECT_SWITCH_IN_WEATHER, 0) != 0)
-    {
-        gBattleStruct->overworldWeatherDone = TRUE;
-        return;
-    }
-    // check all switch in abilities happening from the fastest mon to slowest
-    while (gBattleStruct->switchInAbilitiesCounter < gBattleBanksCount)
-    {
-        if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gBanksByTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0)
-            effect++;
-
-        gBattleStruct->switchInAbilitiesCounter++;
-
-        if (effect)
-            return;
-    }
-    if (AbilityBattleEffects(ABILITYEFFECT_INTIMIDATE1, 0, 0, 0, 0) != 0)
-        return;
-    if (AbilityBattleEffects(ABILITYEFFECT_TRACE, 0, 0, 0, 0) != 0)
-        return;
-    // check all switch in items having effect from the fastest mon to slowest
-    while (gBattleStruct->switchInItemsCounter < gBattleBanksCount)
-    {
-        if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBanksByTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0)
-            effect++;
-
-        gBattleStruct->switchInItemsCounter++;
-
-        if (effect)
-            return;
-    }
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
-    {
-        *(gBattleStruct->monToSwitchIntoId + i) = 6;
-        gActionForBanks[i] = ACTION_INIT_VALUE;
-        gChosenMovesByBanks[i] = MOVE_NONE;
-    }
-    TurnValuesCleanUp(FALSE);
-    SpecialStatusesClear();
-    *(&gBattleStruct->field_91) = gAbsentBankFlags;
-    BattleHandleAddTextPrinter(gText_EmptyString3, 0);
-    gBattleMainFunc = HandleTurnActionSelectionState;
-    ResetSentPokesToOpponentValue();
-
-    for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
-        gBattleCommunication[i] = 0;
-
-    for (i = 0; i < gBattleBanksCount; i++)
-        gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
-
-    *(&gBattleStruct->turnEffectsTracker) = 0;
-    *(&gBattleStruct->turnEffectsBank) = 0;
-    *(&gBattleStruct->wishPerishSongState) = 0;
-    *(&gBattleStruct->wishPerishSongBank) = 0;
-    gBattleScripting.atk49_state = 0;
-    gBattleStruct->faintedActionsState = 0;
-    gBattleStruct->turncountersTracker = 0;
-    gMoveResultFlags = 0;
-
-    gRandomTurnNumber = Random();
-
-    if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-    {
-        StopCryAndClearCrySongs();
-        BattleScriptExecute(BattleScript_82DB8BE);
-    }
-}
-
-static void HandleEndTurn_ContinueBattle(void)
-{
-    s32 i;
-
-    if (gBattleExecBuffer == 0)
-    {
-        gBattleMainFunc = BattleTurnPassed;
-        for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
-            gBattleCommunication[i] = 0;
-        for (i = 0; i < gBattleBanksCount; i++)
-        {
-            gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
-            if ((gBattleMons[i].status1 & STATUS1_SLEEP) && (gBattleMons[i].status2 & STATUS2_MULTIPLETURNS))
-                CancelMultiTurnMoves(i);
-        }
-        gBattleStruct->turnEffectsTracker = 0;
-        gBattleStruct->turnEffectsBank = 0;
-        gBattleStruct->wishPerishSongState = 0;
-        gBattleStruct->wishPerishSongBank = 0;
-        gBattleStruct->turncountersTracker = 0;
-        gMoveResultFlags = 0;
-    }
-}
-
-void BattleTurnPassed(void)
-{
-    s32 i;
-
-    TurnValuesCleanUp(TRUE);
-    if (gBattleOutcome == 0)
-    {
-        if (UpdateTurnCounters() != 0)
-            return;
-        if (TurnBasedEffects() != 0)
-            return;
-    }
-    if (HandleFaintedMonActions() != 0)
-        return;
-    gBattleStruct->faintedActionsState = 0;
-    if (HandleWishPerishSongOnTurnEnd() != 0)
-        return;
-
-    TurnValuesCleanUp(FALSE);
-    gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
-    gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
-    gHitMarker &= ~(HITMARKER_x400000);
-    gHitMarker &= ~(HITMARKER_x100000);
-    gBattleScripting.animTurn = 0;
-    gBattleScripting.animTargetsHit = 0;
-    gBattleScripting.atk49_state = 0;
-    gBattleMoveDamage = 0;
-    gMoveResultFlags = 0;
-
-    for (i = 0; i < 5; i++)
-        gBattleCommunication[i] = 0;
-
-    if (gBattleOutcome != 0)
-    {
-        gCurrentActionFuncId = 12;
-        gBattleMainFunc = RunTurnActionsFunctions;
-        return;
-    }
-
-    if (gBattleResults.battleTurnCounter < 0xFF)
-    {
-        gBattleResults.battleTurnCounter++;
-        gBattleStruct->field_DA++;
-    }
-
-    for (i = 0; i < gBattleBanksCount; i++)
-    {
-        gActionForBanks[i] = ACTION_INIT_VALUE;
-        gChosenMovesByBanks[i] = MOVE_NONE;
-    }
-
-    for (i = 0; i < 4; i++)
-        *(gBattleStruct->monToSwitchIntoId + i) = 6;
-
-    *(&gBattleStruct->field_91) = gAbsentBankFlags;
-    BattleHandleAddTextPrinter(gText_EmptyString3, 0);
-    gBattleMainFunc = HandleTurnActionSelectionState;
-    gRandomTurnNumber = Random();
-
-    if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
-        BattleScriptExecute(BattleScript_82DB881);
-    else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->field_DA == 0)
-        BattleScriptExecute(BattleScript_82DB8BE);
-}
-
-u8 IsRunningFromBattleImpossible(void)
-{
-    u8 holdEffect;
-    u8 side;
-    s32 i;
-
-    if (gBattleMons[gActiveBank].item == ITEM_ENIGMA_BERRY)
-        holdEffect = gEnigmaBerries[gActiveBank].holdEffect;
-    else
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBank].item);
-
-    gStringBank = gActiveBank;
-
-    if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
-        return 0;
-    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        return 0;
-    if (gBattleMons[gActiveBank].ability == ABILITY_RUN_AWAY)
-        return 0;
-
-    side = GetBankSide(gActiveBank);
-
-    for (i = 0; i < gBattleBanksCount; i++)
-    {
-        if (side != GetBankSide(i)
-         && gBattleMons[i].ability == ABILITY_SHADOW_TAG)
-        {
-            gBattleScripting.bank = i;
-            gLastUsedAbility = gBattleMons[i].ability;
-            gBattleCommunication[MULTISTRING_CHOOSER] = 2;
-            return 2;
-        }
-        if (side != GetBankSide(i)
-         && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE
-         && gBattleMons[gActiveBank].type1 != TYPE_FLYING
-         && gBattleMons[gActiveBank].type2 != TYPE_FLYING
-         && gBattleMons[i].ability == ABILITY_ARENA_TRAP)
-        {
-            gBattleScripting.bank = i;
-            gLastUsedAbility = gBattleMons[i].ability;
-            gBattleCommunication[MULTISTRING_CHOOSER] = 2;
-            return 2;
-        }
-    }
-    i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK, gActiveBank, ABILITY_MAGNET_PULL, 0, 0);
-    if (i != 0 && (gBattleMons[gActiveBank].type1 == TYPE_STEEL || gBattleMons[gActiveBank].type2 == TYPE_STEEL))
-    {
-        gBattleScripting.bank = i - 1;
-        gLastUsedAbility = gBattleMons[i - 1].ability;
-        gBattleCommunication[MULTISTRING_CHOOSER] = 2;
-        return 2;
-    }
-    if ((gBattleMons[gActiveBank].status2 & (STATUS2_ESCAPE_PREVENTION | STATUS2_WRAPPED))
-        || (gStatuses3[gActiveBank] & STATUS3_ROOTED))
-    {
-        gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-        return 1;
-    }
-    if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE)
-    {
-        gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-        return 1;
-    }
-    return 0;
-}
-
-void sub_803BDA0(u8 bank)
-{
-    s32 i;
-    u8 r4;
-    u8 r1;
-
-    // gBattleStruct->field_60[bank][i]
-
-    for (i = 0; i < 3; i++)
-        gUnknown_0203CF00[i] = *(bank * 3 + i + (u8*)(gBattleStruct->field_60));
-
-    r4 = pokemon_order_func(gBattlePartyID[bank]);
-    r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + bank));
-    sub_81B8FB0(r4, r1);
-
-    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-    {
-        for (i = 0; i < 3; i++)
-        {
-            *(bank * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
-            *((bank ^ BIT_MON) * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
-        }
-    }
-    else
-    {
-        for (i = 0; i < 3; i++)
-        {
-            *(bank * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
-        }
-    }
-}
-
-enum
-{
-    STATE_TURN_START_RECORD,
-    STATE_BEFORE_ACTION_CHOSEN,
-    STATE_WAIT_ACTION_CHOSEN,
-    STATE_WAIT_ACTION_CASE_CHOSEN,
-    STATE_WAIT_ACTION_CONFIRMED_STANDBY,
-    STATE_WAIT_ACTION_CONFIRMED,
-    STATE_SELECTION_SCRIPT,
-    STATE_WAIT_SET_BEFORE_ACTION,
-    STATE_SELECTION_SCRIPT_MAY_RUN
-};
-
-static void HandleTurnActionSelectionState(void)
-{
-    s32 i;
-
-    gBattleCommunication[ACTIONS_CONFIRMED_COUNT] = 0;
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-    {
-        u8 identity = GetBankPosition(gActiveBank);
-        switch (gBattleCommunication[gActiveBank])
-        {
-        case STATE_TURN_START_RECORD: // recorded battle related on start of every turn
-            RecordedBattle_CopyBankMoves();
-            gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
-            break;
-        case STATE_BEFORE_ACTION_CHOSEN: // choose an action
-            *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
-            if (gBattleTypeFlags & BATTLE_TYPE_MULTI
-                || !(identity & BIT_MON)
-                || gBattleStruct->field_91 & gBitTable[GetBankByPosition(identity ^ BIT_MON)]
-                || gBattleCommunication[GetBankByPosition(identity ^ BIT_MON)] == 5)
-            {
-                if (gBattleStruct->field_91 & gBitTable[gActiveBank])
-                {
-                    gActionForBanks[gActiveBank] = ACTION_NOTHING_FAINTED;
-                    if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
-                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED;
-                    else
-                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
-                }
-                else
-                {
-                    if (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS
-                        || gBattleMons[gActiveBank].status2 & STATUS2_RECHARGE)
-                    {
-                        gActionForBanks[gActiveBank] = ACTION_USE_MOVE;
-                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
-                    }
-                    else
-                    {
-                        EmitChooseAction(0, gActionForBanks[0], gBattleBufferB[0][1] | (gBattleBufferB[0][2] << 8));
-                        MarkBufferBankForExecution(gActiveBank);
-                        gBattleCommunication[gActiveBank]++;
-                    }
-                }
-            }
-            break;
-        case STATE_WAIT_ACTION_CHOSEN: // try to perform an action
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
-            {
-                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]);
-                gActionForBanks[gActiveBank] = gBattleBufferB[gActiveBank][1];
-
-                switch (gBattleBufferB[gActiveBank][1])
-                {
-                case ACTION_USE_MOVE:
-                    if (AreAllMovesUnusable())
-                    {
-                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
-                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
-                        *(gBattleStruct->moveTarget + gActiveBank) = gBattleBufferB[gActiveBank][3];
-                        return;
-                    }
-                    else if (gDisableStructs[gActiveBank].encoredMove != 0)
-                    {
-                        gChosenMovesByBanks[gActiveBank] = gDisableStructs[gActiveBank].encoredMove;
-                        *(gBattleStruct->chosenMovePositions + gActiveBank) = gDisableStructs[gActiveBank].encoredMovePos;
-                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
-                        return;
-                    }
-                    else
-                    {
-                        struct ChooseMoveStruct moveInfo;
-
-                        moveInfo.species = gBattleMons[gActiveBank].species;
-                        moveInfo.monType1 = gBattleMons[gActiveBank].type1;
-                        moveInfo.monType2 = gBattleMons[gActiveBank].type2;
-
-                        for (i = 0; i < 4; i++)
-                        {
-                            moveInfo.moves[i] = gBattleMons[gActiveBank].moves[i];
-                            moveInfo.currentPp[i] = gBattleMons[gActiveBank].pp[i];
-                            moveInfo.maxPp[i] = CalculatePPWithBonus(
-                                                            gBattleMons[gActiveBank].moves[i],
-                                                            gBattleMons[gActiveBank].ppBonuses,
-                                                            i);
-                        }
-
-                        EmitChooseMove(0, (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) != 0, FALSE, &moveInfo);
-                        MarkBufferBankForExecution(gActiveBank);
-                    }
-                    break;
-                case ACTION_USE_ITEM:
-                    if (gBattleTypeFlags & (BATTLE_TYPE_LINK
-                                            | BATTLE_TYPE_FRONTIER_NO_PYRAMID
-                                            | BATTLE_TYPE_EREADER_TRAINER
-                                            | BATTLE_TYPE_x2000000))
-                    {
-                        RecordedBattle_ClearBankAction(gActiveBank, 1);
-                        gSelectionBattleScripts[gActiveBank] = BattleScript_ActionSelectionItemsCantBeUsed;
-                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
-                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
-                        return;
-                    }
-                    else
-                    {
-                        EmitChooseItem(0, gBattleStruct->field_60[gActiveBank]);
-                        MarkBufferBankForExecution(gActiveBank);
-                    }
-                    break;
-                case ACTION_SWITCH:
-                    *(gBattleStruct->field_58 + gActiveBank) = gBattlePartyID[gActiveBank];
-                    if (gBattleMons[gActiveBank].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)
-                        || gBattleTypeFlags & BATTLE_TYPE_ARENA
-                        || gStatuses3[gActiveBank] & STATUS3_ROOTED)
-                    {
-                        EmitChoosePokemon(0, 2, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
-                    }
-                    else if ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBank, ABILITY_SHADOW_TAG, 0, 0))
-                             || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBank, ABILITY_ARENA_TRAP, 0, 0))
-                                 && gBattleMons[gActiveBank].type1 != TYPE_FLYING
-                                 && gBattleMons[gActiveBank].type2 != TYPE_FLYING
-                                 && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE)
-                             || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK, gActiveBank, ABILITY_MAGNET_PULL, 0, 0))
-                                 && (gBattleMons[gActiveBank].type1 == TYPE_STEEL
-                                     || gBattleMons[gActiveBank].type2 == TYPE_STEEL)))
-                    {
-                        EmitChoosePokemon(0, ((i - 1) << 4) | 4, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBank]);
-                    }
-                    else
-                    {
-                        if (gActiveBank == 2 && gActionForBanks[0] == ACTION_SWITCH)
-                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
-                        else if (gActiveBank == 3 && gActionForBanks[1] == ACTION_SWITCH)
-                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
-                        else
-                            EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
-                    }
-                    MarkBufferBankForExecution(gActiveBank);
-                    break;
-                case ACTION_SAFARI_ZONE_BALL:
-                    if (IsPlayerPartyAndPokemonStorageFull())
-                    {
-                        gSelectionBattleScripts[gActiveBank] = BattleScript_PrintFullBox;
-                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
-                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
-                        return;
-                    }
-                    break;
-                case ACTION_POKEBLOCK_CASE:
-                    EmitChooseItem(0, gBattleStruct->field_60[gActiveBank]);
-                    MarkBufferBankForExecution(gActiveBank);
-                    break;
-                case ACTION_CANCEL_PARTNER:
-                    gBattleCommunication[gActiveBank] = 7;
-                    gBattleCommunication[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] = 1;
-                    RecordedBattle_ClearBankAction(gActiveBank, 1);
-                    if (gBattleMons[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_MULTIPLETURNS
-                        || gBattleMons[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_RECHARGE)
-                    {
-                        EmitCmd50(0);
-                        MarkBufferBankForExecution(gActiveBank);
-                        return;
-                    }
-                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_SWITCH)
-                    {
-                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 2);
-                    }
-                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_RUN)
-                    {
-                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
-                    }
-                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE
-                             && (gProtectStructs[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].onlyStruggle
-                                || gDisableStructs[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].encoredMove))
-                    {
-                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
-                    }
-                    else if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-                             && gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE)
-                    {
-                        gRngValue = gBattlePalaceMoveSelectionRngValue;
-                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
-                    }
-                    else
-                    {
-                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 3);
-                    }
-                    EmitCmd50(0);
-                    MarkBufferBankForExecution(gActiveBank);
-                    return;
-                }
-
-                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
-                    && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000)
-                    && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
-                {
-                    gSelectionBattleScripts[gActiveBank] = BattleScript_AskIfWantsToForfeitMatch;
-                    gBattleCommunication[gActiveBank] = 8;
-                    *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                    *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
-                    return;
-                }
-                else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
-                         && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-                         && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
-                {
-                    BattleScriptExecute(BattleScript_PrintCantRunFromTrainer);
-                    gBattleCommunication[gActiveBank] = 1;
-                }
-                else if (IsRunningFromBattleImpossible()
-                         && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
-                {
-                    gSelectionBattleScripts[gActiveBank] = BattleScript_PrintCantEscapeFromBattle;
-                    gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
-                    *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                    *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
-                    return;
-                }
-                else
-                {
-                    gBattleCommunication[gActiveBank]++;
-                }
-            }
-            break;
-        case STATE_WAIT_ACTION_CASE_CHOSEN:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
-            {
-                switch (gActionForBanks[gActiveBank])
-                {
-                case ACTION_USE_MOVE:
-                    switch (gBattleBufferB[gActiveBank][1])
-                    {
-                    case 3:
-                    case 4:
-                    case 5:
-                    case 6:
-                    case 7:
-                    case 8:
-                    case 9:
-                        gActionForBanks[gActiveBank] = gBattleBufferB[gActiveBank][1];
-                        return;
-                    case 15:
-                        gActionForBanks[gActiveBank] = ACTION_SWITCH;
-                        sub_803CDF8();
-                        return;
-                    default:
-                        sub_818603C(2);
-                        if ((gBattleBufferB[gActiveBank][2] | (gBattleBufferB[gActiveBank][3] << 8)) == 0xFFFF)
-                        {
-                            gBattleCommunication[gActiveBank] = 1;
-                            RecordedBattle_ClearBankAction(gActiveBank, 1);
-                        }
-                        else if (TrySetCantSelectMoveBattleScript())
-                        {
-                            RecordedBattle_ClearBankAction(gActiveBank, 1);
-                            gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
-                            *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                            gBattleBufferB[gActiveBank][1] = 0;
-                            *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_WAIT_ACTION_CHOSEN;
-                            return;
-                        }
-                        else
-                        {
-                            if (!(gBattleTypeFlags & BATTLE_TYPE_PALACE))
-                            {
-                                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][2]);
-                                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][3]);
-                            }
-                            *(gBattleStruct->chosenMovePositions + gActiveBank) = gBattleBufferB[gActiveBank][2];
-                            gChosenMovesByBanks[gActiveBank] = gBattleMons[gActiveBank].moves[*(gBattleStruct->chosenMovePositions + gActiveBank)];
-                            *(gBattleStruct->moveTarget + gActiveBank) = gBattleBufferB[gActiveBank][3];
-                            gBattleCommunication[gActiveBank]++;
-                        }
-                        break;
-                    }
-                    break;
-                case ACTION_USE_ITEM:
-                    if ((gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8)) == 0)
-                    {
-                        gBattleCommunication[gActiveBank] = 1;
-                    }
-                    else
-                    {
-                        gLastUsedItem = (gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8));
-                        gBattleCommunication[gActiveBank]++;
-                    }
-                    break;
-                case ACTION_SWITCH:
-                    if (gBattleBufferB[gActiveBank][1] == 6)
-                    {
-                        gBattleCommunication[gActiveBank] = 1;
-                        RecordedBattle_ClearBankAction(gActiveBank, 1);
-                    }
-                    else
-                    {
-                        sub_803CDF8();
-                        gBattleCommunication[gActiveBank]++;
-                    }
-                    break;
-                case ACTION_RUN:
-                    gHitMarker |= HITMARKER_RUN;
-                    gBattleCommunication[gActiveBank]++;
-                    break;
-                case ACTION_WATCHES_CAREFULLY:
-                    gBattleCommunication[gActiveBank]++;
-                    break;
-                case ACTION_SAFARI_ZONE_BALL:
-                    gBattleCommunication[gActiveBank]++;
-                    break;
-                case ACTION_POKEBLOCK_CASE:
-                    if ((gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8)) != 0)
-                    {
-                        gBattleCommunication[gActiveBank]++;
-                    }
-                    else
-                    {
-                        gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
-                    }
-                    break;
-                case ACTION_GO_NEAR:
-                    gBattleCommunication[gActiveBank]++;
-                    break;
-                case ACTION_SAFARI_ZONE_RUN:
-                    gHitMarker |= HITMARKER_RUN;
-                    gBattleCommunication[gActiveBank]++;
-                    break;
-                case ACTION_9:
-                    gBattleCommunication[gActiveBank]++;
-                    break;
-                }
-            }
-            break;
-        case STATE_WAIT_ACTION_CONFIRMED_STANDBY:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
-            {
-                i = (sub_803CDB8() != 0);
-
-                if (((gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_DOUBLE)) != BATTLE_TYPE_DOUBLE)
-                    || (identity & BIT_MON)
-                    || (*(&gBattleStruct->field_91) & gBitTable[GetBankByPosition(identity ^ BIT_MON)]))
-                {
-                    EmitLinkStandbyMsg(0, 0, i);
-                }
-                else
-                {
-                    EmitLinkStandbyMsg(0, 1, i);
-                }
-                MarkBufferBankForExecution(gActiveBank);
-                gBattleCommunication[gActiveBank]++;
-            }
-            break;
-        case STATE_WAIT_ACTION_CONFIRMED:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
-            {
-                gBattleCommunication[ACTIONS_CONFIRMED_COUNT]++;
-            }
-            break;
-        case STATE_SELECTION_SCRIPT:
-            if (*(gBattleStruct->selectionScriptFinished + gActiveBank))
-            {
-                gBattleCommunication[gActiveBank] = *(gBattleStruct->stateIdAfterSelScript + gActiveBank);
-            }
-            else
-            {
-                gBankAttacker = gActiveBank;
-                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBank];
-                if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
-                {
-                    gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
-                }
-                gSelectionBattleScripts[gActiveBank] = gBattlescriptCurrInstr;
-            }
-            break;
-        case STATE_WAIT_SET_BEFORE_ACTION:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
-            {
-                gBattleCommunication[gActiveBank] = 1;
-            }
-            break;
-        case STATE_SELECTION_SCRIPT_MAY_RUN:
-            if (*(gBattleStruct->selectionScriptFinished + gActiveBank))
-            {
-                if (gBattleBufferB[gActiveBank][1] == 13)
-                {
-                    gHitMarker |= HITMARKER_RUN;
-                    gActionForBanks[gActiveBank] = ACTION_RUN;
-                    gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
-                }
-                else
-                {
-                    RecordedBattle_ClearBankAction(gActiveBank, 1);
-                    gBattleCommunication[gActiveBank] = *(gBattleStruct->stateIdAfterSelScript + gActiveBank);
-                }
-            }
-            else
-            {
-                gBankAttacker = gActiveBank;
-                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBank];
-                if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
-                {
-                    gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
-                }
-                gSelectionBattleScripts[gActiveBank] = gBattlescriptCurrInstr;
-            }
-            break;
-        }
-    }
-
-    // check if everyone chose actions
-    if (gBattleCommunication[ACTIONS_CONFIRMED_COUNT] == gBattleBanksCount)
-    {
-        sub_818603C(1);
-        gBattleMainFunc = SetActionsAndBanksTurnOrder;
-
-        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
-        {
-            for (i = 0; i < gBattleBanksCount; i++)
-            {
-                if (gActionForBanks[i] == ACTION_SWITCH)
-                    sub_80571DC(i, *(gBattleStruct->monToSwitchIntoId + i));
-            }
-        }
-    }
-}
-
-static bool8 sub_803CDB8(void)
-{
-    s32 i, var;
-
-    for (var = 0, i = 0; i < gBattleBanksCount; i++)
-    {
-        if (gBattleCommunication[i] == 5)
-            var++;
-    }
-
-    if (var + 1 == gBattleBanksCount)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-static void sub_803CDF8(void)
-{
-    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = gBattleBufferB[gActiveBank][1];
-    RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]);
-
-    if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
-    {
-        *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 0) &= 0xF;
-        *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBank][2] & 0xF0);
-        *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 1) = gBattleBufferB[gActiveBank][3];
-
-        *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 0) &= (0xF0);
-        *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBank][2] & 0xF0) >> 4;
-        *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 2) = gBattleBufferB[gActiveBank][3];
-    }
-}
-
-void SwapTurnOrder(u8 id1, u8 id2)
-{
-    u32 temp = gActionsByTurnOrder[id1];
-    gActionsByTurnOrder[id1] = gActionsByTurnOrder[id2];
-    gActionsByTurnOrder[id2] = temp;
-
-    temp = gBanksByTurnOrder[id1];
-    gBanksByTurnOrder[id1] = gBanksByTurnOrder[id2];
-    gBanksByTurnOrder[id2] = temp;
-}
-
-u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
-{
-    u8 strikesFirst = 0;
-    u8 speedMultiplierBank1 = 0, speedMultiplierBank2 = 0;
-    u32 speedBank1 = 0, speedBank2 = 0;
-    u8 holdEffect = 0;
-    u8 holdEffectParam = 0;
-    u16 moveBank1 = 0, moveBank2 = 0;
-
-    if (WEATHER_HAS_EFFECT)
-    {
-        if ((gBattleMons[bank1].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY)
-            || (gBattleMons[bank1].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY))
-            speedMultiplierBank1 = 2;
-        else
-            speedMultiplierBank1 = 1;
-
-        if ((gBattleMons[bank2].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY)
-            || (gBattleMons[bank2].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY))
-            speedMultiplierBank2 = 2;
-        else
-            speedMultiplierBank2 = 1;
-    }
-    else
-    {
-        speedMultiplierBank1 = 1;
-        speedMultiplierBank2 = 1;
-    }
-
-    speedBank1 = (gBattleMons[bank1].speed * speedMultiplierBank1)
-                * (gStatStageRatios[gBattleMons[bank1].statStages[STAT_STAGE_SPEED]][0])
-                / (gStatStageRatios[gBattleMons[bank1].statStages[STAT_STAGE_SPEED]][1]);
-
-    if (gBattleMons[bank1].item == ITEM_ENIGMA_BERRY)
-    {
-        holdEffect = gEnigmaBerries[bank1].holdEffect;
-        holdEffectParam = gEnigmaBerries[bank1].holdEffectParam;
-    }
-    else
-    {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank1].item);
-        holdEffectParam = ItemId_GetHoldEffectParam(gBattleMons[bank1].item);
-    }
-
-    // badge boost
-    if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
-        && FlagGet(FLAG_BADGE03_GET)
-        && GetBankSide(bank1) == SIDE_PLAYER)
-    {
-        speedBank1 = (speedBank1 * 110) / 100;
-    }
-
-    if (holdEffect == HOLD_EFFECT_MACHO_BRACE)
-        speedBank1 /= 2;
-
-    if (gBattleMons[bank1].status1 & STATUS1_PARALYSIS)
-        speedBank1 /= 4;
-
-    if (holdEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (0xFFFF * holdEffectParam) / 100)
-        speedBank1 = UINT_MAX;
-
-    // check second bank's speed
-
-    speedBank2 = (gBattleMons[bank2].speed * speedMultiplierBank2)
-                * (gStatStageRatios[gBattleMons[bank2].statStages[STAT_STAGE_SPEED]][0])
-                / (gStatStageRatios[gBattleMons[bank2].statStages[STAT_STAGE_SPEED]][1]);
-
-    if (gBattleMons[bank2].item == ITEM_ENIGMA_BERRY)
-    {
-        holdEffect = gEnigmaBerries[bank2].holdEffect;
-        holdEffectParam = gEnigmaBerries[bank2].holdEffectParam;
-    }
-    else
-    {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank2].item);
-        holdEffectParam = ItemId_GetHoldEffectParam(gBattleMons[bank2].item);
-    }
-
-    // badge boost
-    if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
-        && FlagGet(FLAG_BADGE03_GET)
-        && GetBankSide(bank2) == SIDE_PLAYER)
-    {
-        speedBank2 = (speedBank2 * 110) / 100;
-    }
-
-    if (holdEffect == HOLD_EFFECT_MACHO_BRACE)
-        speedBank2 /= 2;
-
-    if (gBattleMons[bank2].status1 & STATUS1_PARALYSIS)
-        speedBank2 /= 4;
-
-    if (holdEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (0xFFFF * holdEffectParam) / 100)
-        speedBank2 = UINT_MAX;
-
-    if (ignoreChosenMoves)
-    {
-        moveBank1 = MOVE_NONE;
-        moveBank2 = MOVE_NONE;
-    }
-    else
-    {
-        if (gActionForBanks[bank1] == ACTION_USE_MOVE)
-        {
-            if (gProtectStructs[bank1].onlyStruggle)
-                moveBank1 = MOVE_STRUGGLE;
-            else
-                moveBank1 = gBattleMons[bank1].moves[*(gBattleStruct->chosenMovePositions + bank1)];
-        }
-        else
-            moveBank1 = MOVE_NONE;
-
-        if (gActionForBanks[bank2] == ACTION_USE_MOVE)
-        {
-            if (gProtectStructs[bank2].onlyStruggle)
-                moveBank2 = MOVE_STRUGGLE;
-            else
-                moveBank2 = gBattleMons[bank2].moves[*(gBattleStruct->chosenMovePositions + bank2)];
-        }
-        else
-            moveBank2 = MOVE_NONE;
-    }
-
-    // both move priorities are different than 0
-    if (gBattleMoves[moveBank1].priority != 0 || gBattleMoves[moveBank2].priority != 0)
-    {
-        // both priorities are the same
-        if (gBattleMoves[moveBank1].priority == gBattleMoves[moveBank2].priority)
-        {
-            if (speedBank1 == speedBank2 && Random() & 1)
-                strikesFirst = 2; // same speeds, same priorities
-            else if (speedBank1 < speedBank2)
-                strikesFirst = 1; // bank2 has more speed
-
-            // else bank1 has more speed
-        }
-        else if (gBattleMoves[moveBank1].priority < gBattleMoves[moveBank2].priority)
-            strikesFirst = 1; // bank2's move has greater priority
-
-        // else bank1's move has greater priority
-    }
-    // both priorities are equal to 0
-    else
-    {
-        if (speedBank1 == speedBank2 && Random() & 1)
-            strikesFirst = 2; // same speeds, same priorities
-        else if (speedBank1 < speedBank2)
-            strikesFirst = 1; // bank2 has more speed
-
-        // else bank1 has more speed
-    }
-
-    return strikesFirst;
-}
-
-static void SetActionsAndBanksTurnOrder(void)
-{
-    s32 var = 0;
-    s32 i, j;
-
-    if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-    {
-        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-        {
-            gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
-            gBanksByTurnOrder[var] = gActiveBank;
-            var++;
-        }
-    }
-    else
-    {
-        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        {
-            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-            {
-                if (gActionForBanks[gActiveBank] == ACTION_RUN)
-                {
-                    var = 5;
-                    break;
-                }
-            }
-        }
-        else
-        {
-            if (gActionForBanks[0] == ACTION_RUN)
-            {
-                gActiveBank = 0;
-                var = 5;
-            }
-            if (gActionForBanks[2] == ACTION_RUN)
-            {
-                gActiveBank = 2;
-                var = 5;
-            }
-        }
-
-        if (var == 5)
-        {
-            gActionsByTurnOrder[0] = gActionForBanks[gActiveBank];
-            gBanksByTurnOrder[0] = gActiveBank;
-            var = 1;
-            for (i = 0; i < gBattleBanksCount; i++)
-            {
-                if (i != gActiveBank)
-                {
-                    gActionsByTurnOrder[var] = gActionForBanks[i];
-                    gBanksByTurnOrder[var] = i;
-                    var++;
-                }
-            }
-            gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
-            gBattleStruct->focusPunchBank = 0;
-            return;
-        }
-        else
-        {
-            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-            {
-                if (gActionForBanks[gActiveBank] == ACTION_USE_ITEM || gActionForBanks[gActiveBank] == ACTION_SWITCH)
-                {
-                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
-                    gBanksByTurnOrder[var] = gActiveBank;
-                    var++;
-                }
-            }
-            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-            {
-                if (gActionForBanks[gActiveBank] != ACTION_USE_ITEM && gActionForBanks[gActiveBank] != ACTION_SWITCH)
-                {
-                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
-                    gBanksByTurnOrder[var] = gActiveBank;
-                    var++;
-                }
-            }
-            for (i = 0; i < gBattleBanksCount - 1; i++)
-            {
-                for (j = i + 1; j < gBattleBanksCount; j++)
-                {
-                    u8 bank1 = gBanksByTurnOrder[i];
-                    u8 bank2 = gBanksByTurnOrder[j];
-                    if (gActionsByTurnOrder[i] != ACTION_USE_ITEM
-                        && gActionsByTurnOrder[j] != ACTION_USE_ITEM
-                        && gActionsByTurnOrder[i] != ACTION_SWITCH
-                        && gActionsByTurnOrder[j] != ACTION_SWITCH)
-                    {
-                        if (GetWhoStrikesFirst(bank1, bank2, FALSE))
-                            SwapTurnOrder(i, j);
-                    }
-                }
-            }
-        }
-    }
-    gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
-    gBattleStruct->focusPunchBank = 0;
-}
-
-static void TurnValuesCleanUp(bool8 var0)
-{
-    s32 i;
-    u8 *dataPtr;
-
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-    {
-        if (var0)
-        {
-            gProtectStructs[gActiveBank].protected = 0;
-            gProtectStructs[gActiveBank].endured = 0;
-        }
-        else
-        {
-            dataPtr = (u8*)(&gProtectStructs[gActiveBank]);
-            for (i = 0; i < sizeof(struct ProtectStruct); i++)
-                dataPtr[i] = 0;
-
-            if (gDisableStructs[gActiveBank].isFirstTurn)
-                gDisableStructs[gActiveBank].isFirstTurn--;
-
-            if (gDisableStructs[gActiveBank].rechargeCounter)
-            {
-                gDisableStructs[gActiveBank].rechargeCounter--;
-                if (gDisableStructs[gActiveBank].rechargeCounter == 0)
-                    gBattleMons[gActiveBank].status2 &= ~(STATUS2_RECHARGE);
-            }
-        }
-
-        if (gDisableStructs[gActiveBank].substituteHP == 0)
-                gBattleMons[gActiveBank].status2 &= ~(STATUS2_SUBSTITUTE);
-    }
-
-    gSideTimers[0].followmeTimer = 0;
-    gSideTimers[1].followmeTimer = 0;
-}
-
-static void SpecialStatusesClear(void)
-{
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-    {
-        s32 i;
-        u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBank]);
-
-        for (i = 0; i < sizeof(struct SpecialStatus); i++)
-            dataPtr[i] = 0;
-    }
-}
-
-static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
-{
-    if (!(gHitMarker & HITMARKER_RUN))
-    {
-        while (gBattleStruct->focusPunchBank < gBattleBanksCount)
-        {
-            gActiveBank = gBankAttacker = gBattleStruct->focusPunchBank;
-            gBattleStruct->focusPunchBank++;
-            if (gChosenMovesByBanks[gActiveBank] == MOVE_FOCUS_PUNCH
-                && !(gBattleMons[gActiveBank].status1 & STATUS1_SLEEP)
-                && !(gDisableStructs[gBankAttacker].truantCounter)
-                && !(gProtectStructs[gActiveBank].onlyStruggle))
-            {
-                BattleScriptExecute(BattleScript_FocusPunchSetUp);
-                return;
-            }
-        }
-    }
-
-    TryClearRageStatuses();
-    gCurrentTurnActionNumber = 0;
-{
-    // something stupid needed to match
-    u8 zero;
-    gCurrentActionFuncId = gActionsByTurnOrder[(zero = 0)];
-}
-    gDynamicBasePower = 0;
-    gBattleStruct->dynamicMoveType = 0;
-    gBattleMainFunc = RunTurnActionsFunctions;
-    gBattleCommunication[3] = 0;
-    gBattleCommunication[4] = 0;
-    gBattleScripting.multihitMoveEffect = 0;
-    gBattleResources->battleScriptsStack->size = 0;
-}
-
-static void RunTurnActionsFunctions(void)
-{
-    if (gBattleOutcome != 0)
-        gCurrentActionFuncId = 12;
-
-    *(&gBattleStruct->savedTurnActionNumber) = gCurrentTurnActionNumber;
-    sTurnActionsFuncsTable[gCurrentActionFuncId]();
-
-    if (gCurrentTurnActionNumber >= gBattleBanksCount) // everyone did their actions, turn finished
-    {
-        gHitMarker &= ~(HITMARKER_x100000);
-        gBattleMainFunc = sEndTurnFuncsTable[gBattleOutcome & 0x7F];
-    }
-    else
-    {
-        if (gBattleStruct->savedTurnActionNumber != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another bank
-        {
-            gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
-            gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
-        }
-    }
-}
-
-static void HandleEndTurn_BattleWon(void)
-{
-    gCurrentActionFuncId = 0;
-
-    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-    {
-        gSpecialVar_Result = gBattleOutcome;
-        gBattleTextBuff1[0] = gBattleOutcome;
-        gBankAttacker = GetBankByPosition(B_POSITION_PLAYER_LEFT);
-        gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
-        gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
-    }
-    else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
-            && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER))
-    {
-        BattleStopLowHpSound();
-        gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon;
-
-        if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE)
-            PlayBGM(MUS_KACHI3);
-        else
-            PlayBGM(MUS_KACHI1);
-    }
-    else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
-    {
-        BattleStopLowHpSound();
-        gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon;
-
-        switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
-        {
-        case TRAINER_CLASS_ELITE_FOUR:
-        case TRAINER_CLASS_CHAMPION:
-            PlayBGM(MUS_KACHI5);
-            break;
-        case TRAINER_CLASS_TEAM_AQUA:
-        case TRAINER_CLASS_TEAM_MAGMA:
-        case TRAINER_CLASS_AQUA_ADMIN:
-        case TRAINER_CLASS_AQUA_LEADER:
-        case TRAINER_CLASS_MAGMA_ADMIN:
-        case TRAINER_CLASS_MAGMA_LEADER:
-            PlayBGM(MUS_KACHI4);
-            break;
-        case TRAINER_CLASS_LEADER:
-            PlayBGM(MUS_KACHI3);
-            break;
-        default:
-            PlayBGM(MUS_KACHI1);
-            break;
-        }
-    }
-    else
-    {
-        gBattlescriptCurrInstr = BattleScript_PayDayMoneyAndPickUpItems;
-    }
-
-    gBattleMainFunc = HandleEndTurn_FinishBattle;
-}
-
-static void HandleEndTurn_BattleLost(void)
-{
-    gCurrentActionFuncId = 0;
-
-    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-    {
-        if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
-        {
-            if (gBattleOutcome & B_OUTCOME_LINK_BATTLE_RAN)
-            {
-                gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle;
-                gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
-                gSaveBlock2Ptr->field_CA9_b = 1;
-            }
-            else
-            {
-                gBattlescriptCurrInstr = BattleScript_82DAA0B;
-                gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
-            }
-        }
-        else
-        {
-            gBattleTextBuff1[0] = gBattleOutcome;
-            gBankAttacker = GetBankByPosition(B_POSITION_PLAYER_LEFT);
-            gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
-            gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
-        }
-    }
-    else
-    {
-        gBattlescriptCurrInstr = BattleScript_LocalBattleLost;
-    }
-
-    gBattleMainFunc = HandleEndTurn_FinishBattle;
-}
-
-static void HandleEndTurn_RanFromBattle(void)
-{
-    gCurrentActionFuncId = 0;
-
-    if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
-    {
-        gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
-        gBattleOutcome = B_OUTCOME_FORFEITED;
-        gSaveBlock2Ptr->field_CA9_b = 1;
-    }
-    else if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
-    {
-        gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
-        gBattleOutcome = B_OUTCOME_FORFEITED;
-    }
-    else
-    {
-        switch (gProtectStructs[gBankAttacker].fleeFlag)
-        {
-        default:
-            gBattlescriptCurrInstr = BattleScript_GotAwaySafely;
-            break;
-        case 1:
-            gBattlescriptCurrInstr = BattleScript_SmokeBallEscape;
-            break;
-        case 2:
-            gBattlescriptCurrInstr = BattleScript_RanAwayUsingMonAbility;
-            break;
-        }
-    }
-
-    gBattleMainFunc = HandleEndTurn_FinishBattle;
-}
-
-static void HandleEndTurn_MonFled(void)
-{
-    gCurrentActionFuncId = 0;
-
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker]);
-    gBattlescriptCurrInstr = BattleScript_WildMonFled;
-
-    gBattleMainFunc = HandleEndTurn_FinishBattle;
-}
-
-static void HandleEndTurn_FinishBattle(void)
-{
-    if (gCurrentActionFuncId == 0xB || gCurrentActionFuncId == 0xC)
-    {
-        if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
-                                  | BATTLE_TYPE_x2000000
-                                  | BATTLE_TYPE_FIRST_BATTLE
-                                  | BATTLE_TYPE_SAFARI
-                                  | BATTLE_TYPE_EREADER_TRAINER
-                                  | BATTLE_TYPE_WALLY_TUTORIAL
-                                  | BATTLE_TYPE_FRONTIER)))
-        {
-            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-            {
-                if (GetBankSide(gActiveBank) == SIDE_PLAYER)
-                {
-                    if (gBattleResults.playerMon1Species == SPECIES_NONE)
-                    {
-                        gBattleResults.playerMon1Species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES, NULL);
-                        GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_NICKNAME, gBattleResults.playerMon1Name);
-                    }
-                    else
-                    {
-                        gBattleResults.playerMon2Species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES, NULL);
-                        GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_NICKNAME, gBattleResults.playerMon2Name);
-                    }
-                }
-            }
-            PutPokemonTodayCaughtOnAir();
-        }
-
-        if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
-                                  | BATTLE_TYPE_x2000000
-                                  | BATTLE_TYPE_TRAINER
-                                  | BATTLE_TYPE_FIRST_BATTLE
-                                  | BATTLE_TYPE_SAFARI
-                                  | BATTLE_TYPE_FRONTIER
-                                  | BATTLE_TYPE_EREADER_TRAINER
-                                  | BATTLE_TYPE_WALLY_TUTORIAL))
-            && gBattleResults.unk5_6)
-        {
-            sub_80EE184();
-        }
-
-        sub_8186444();
-        BeginFastPaletteFade(3);
-        FadeOutMapMusic(5);
-        gBattleMainFunc = FreeResetData_ReturnToOvOrDoEvolutions;
-        gCB2_AfterEvolution = BattleMainCB2;
-    }
-    else
-    {
-        if (gBattleExecBuffer == 0)
-            gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
-    }
-}
-
-static void FreeResetData_ReturnToOvOrDoEvolutions(void)
-{
-    if (!gPaletteFade.active)
-    {
-        ResetSpriteData();
-        if (gLeveledUpInBattle == 0 || gBattleOutcome != B_OUTCOME_WON)
-        {
-            gBattleMainFunc = ReturnFromBattleToOverworld;
-            return;
-        }
-        else
-        {
-            gBattleMainFunc = TryEvolvePokemon;
-        }
-    }
-
-    FreeAllWindowBuffers();
-    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
-    {
-        FreeMonSpritesGfx();
-        FreeBattleResources();
-        FreeBattleSpritesData();
-    }
-}
-
-static void TryEvolvePokemon(void)
-{
-    s32 i;
-
-    while (gLeveledUpInBattle != 0)
-    {
-        for (i = 0; i < 6; i++)
-        {
-            if (gLeveledUpInBattle & gBitTable[i])
-            {
-                u16 species;
-                u8 levelUpBits = gLeveledUpInBattle;
-
-                levelUpBits &= ~(gBitTable[i]);
-                gLeveledUpInBattle = levelUpBits;
-
-                species = GetEvolutionTargetSpecies(&gPlayerParty[i], 0, levelUpBits);
-                if (species != SPECIES_NONE)
-                {
-                    FreeAllWindowBuffers();
-                    gBattleMainFunc = WaitForEvoSceneToFinish;
-                    EvolutionScene(&gPlayerParty[i], species, TRUE, i);
-                    return;
-                }
-            }
-        }
-    }
-
-    gBattleMainFunc = ReturnFromBattleToOverworld;
-}
-
-static void WaitForEvoSceneToFinish(void)
-{
-    if (gMain.callback2 == BattleMainCB2)
-        gBattleMainFunc = TryEvolvePokemon;
-}
-
-static void ReturnFromBattleToOverworld(void)
-{
-    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
-    {
-        RandomlyGivePartyPokerus(gPlayerParty);
-        PartySpreadPokerus(gPlayerParty);
-    }
-
-    if (gBattleTypeFlags & BATTLE_TYPE_LINK && gReceivedRemoteLinkPlayers != 0)
-        return;
-
-    gSpecialVar_Result = gBattleOutcome;
-    gMain.inBattle = 0;
-    gMain.callback1 = gPreBattleCallback1;
-
-    if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
-    {
-        UpdateRoamerHPStatus(&gEnemyParty[0]);
-        if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
-            SetRoamerInactive();
-    }
-
-    m4aSongNumStop(0x5A);
-    SetMainCallback2(gMain.savedCallback);
-}
-
-void RunBattleScriptCommands_PopCallbacksStack(void)
-{
-    if (gCurrentActionFuncId == 0xB || gCurrentActionFuncId == 0xC)
-    {
-        if (BATTLE_CALLBACKS_STACK->size != 0)
-            BATTLE_CALLBACKS_STACK->size--;
-        gBattleMainFunc = BATTLE_CALLBACKS_STACK->function[BATTLE_CALLBACKS_STACK->size];
-    }
-    else
-    {
-        if (gBattleExecBuffer == 0)
-            gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
-    }
-}
-
-void RunBattleScriptCommands(void)
-{
-    if (gBattleExecBuffer == 0)
-        gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
-}
-
-static void HandleAction_UseMove(void)
-{
-    u8 side;
-    u8 var = 4;
-
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
-
-    if (*(&gBattleStruct->field_91) & gBitTable[gBankAttacker])
-    {
-        gCurrentActionFuncId = ACTION_FINISHED;
-        return;
-    }
-
-    gCritMultiplier = 1;
-    gBattleScripting.dmgMultiplier = 1;
-    gBattleStruct->atkCancellerTracker = 0;
-    gMoveResultFlags = 0;
-    gMultiHitCounter = 0;
-    gBattleCommunication[6] = 0;
-    gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBankAttacker);
-
-    // choose move
-    if (gProtectStructs[gBankAttacker].onlyStruggle)
-    {
-        gProtectStructs[gBankAttacker].onlyStruggle = 0;
-        gCurrentMove = gChosenMove = MOVE_STRUGGLE;
-        gHitMarker |= HITMARKER_NO_PPDEDUCT;
-        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
-    }
-    else if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE)
-    {
-        gCurrentMove = gChosenMove = gLockedMoves[gBankAttacker];
-    }
-    // encore forces you to use the same move
-    else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
-             && gDisableStructs[gBankAttacker].encoredMove == gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
-    {
-        gCurrentMove = gChosenMove = gDisableStructs[gBankAttacker].encoredMove;
-        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
-        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
-    }
-    // check if the encored move wasn't overwritten
-    else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
-             && gDisableStructs[gBankAttacker].encoredMove != gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
-    {
-        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
-        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
-        gDisableStructs[gBankAttacker].encoredMove = MOVE_NONE;
-        gDisableStructs[gBankAttacker].encoredMovePos = 0;
-        gDisableStructs[gBankAttacker].encoreTimer1 = 0;
-        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
-    }
-    else if (gBattleMons[gBankAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBankAttacker])
-    {
-        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
-        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
-    }
-    else
-    {
-        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
-    }
-
-    if (gBattleMons[gBankAttacker].hp != 0)
-    {
-        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-            gBattleResults.lastUsedMovePlayer = gCurrentMove;
-        else
-            gBattleResults.lastUsedMoveOpponent = gCurrentMove;
-    }
-
-    // choose target
-    side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
-    if (gSideTimers[side].followmeTimer != 0
-        && gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED
-        && GetBankSide(gBankAttacker) != GetBankSide(gSideTimers[side].followmeTarget)
-        && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
-    {
-        gBankDefender = gSideTimers[side].followmeTarget;
-    }
-    else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-             && gSideTimers[side].followmeTimer == 0
-             && (gBattleMoves[gCurrentMove].power != 0
-                 || gBattleMoves[gCurrentMove].target != MOVE_TARGET_x10)
-             && gBattleMons[*(gBattleStruct->moveTarget + gBankAttacker)].ability != ABILITY_LIGHTNING_ROD
-             && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
-    {
-        side = GetBankSide(gBankAttacker);
-        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-        {
-            if (side != GetBankSide(gActiveBank)
-                && *(gBattleStruct->moveTarget + gBankAttacker) != gActiveBank
-                && gBattleMons[gActiveBank].ability == ABILITY_LIGHTNING_ROD
-                && BankGetTurnOrder(gActiveBank) < var)
-            {
-                var = BankGetTurnOrder(gActiveBank);
-            }
-        }
-        if (var == 4)
-        {
-            if (gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
-            {
-                if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-                {
-                    if (Random() & 1)
-                        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
-                    else
-                        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
-                }
-                else
-                {
-                    if (Random() & 1)
-                        gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
-                    else
-                        gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
-                }
-            }
-            else
-            {
-                gBankDefender = *(gBattleStruct->moveTarget + gBankAttacker);
-            }
-
-            if (gAbsentBankFlags & gBitTable[gBankDefender])
-            {
-                if (GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
-                {
-                    gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
-                }
-                else
-                {
-                    gBankDefender = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
-                    if (gAbsentBankFlags & gBitTable[gBankDefender])
-                        gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
-                }
-            }
-        }
-        else
-        {
-            gActiveBank = gBanksByTurnOrder[var];
-            RecordAbilityBattle(gActiveBank, gBattleMons[gActiveBank].ability);
-            gSpecialStatuses[gActiveBank].lightningRodRedirected = 1;
-            gBankDefender = gActiveBank;
-        }
-    }
-    else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-             && gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
-    {
-        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-        {
-            if (Random() & 1)
-                gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
-            else
-                gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
-        }
-        else
-        {
-            if (Random() & 1)
-                gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
-            else
-                gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
-        }
-
-        if (gAbsentBankFlags & gBitTable[gBankDefender]
-            && GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
-        {
-            gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
-        }
-    }
-    else
-    {
-        gBankDefender = *(gBattleStruct->moveTarget + gBankAttacker);
-        if (gAbsentBankFlags & gBitTable[gBankDefender])
-        {
-            if (GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
-            {
-                gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
-            }
-            else
-            {
-                gBankDefender = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
-                if (gAbsentBankFlags & gBitTable[gBankDefender])
-                    gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
-            }
-        }
-    }
-
-    // choose battlescript
-    if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-        && gProtectStructs[gBankAttacker].flag_x10)
-    {
-        if (gBattleMons[gBankAttacker].hp == 0)
-        {
-            gCurrentActionFuncId = 12;
-            return;
-        }
-        else if (gPalaceSelectionBattleScripts[gBankAttacker] != NULL)
-        {
-            gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBankAttacker];
-            gPalaceSelectionBattleScripts[gBankAttacker] = NULL;
-        }
-        else
-        {
-            gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround;
-        }
-    }
-    else
-    {
-        gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
-    }
-
-    if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-        sub_81A56E8(gBankAttacker);
-
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-}
-
-static void HandleAction_Switch(void)
-{
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
-    gBattle_BG0_X = 0;
-    gBattle_BG0_Y = 0;
-    gActionSelectionCursor[gBankAttacker] = 0;
-    gMoveSelectionCursor[gBankAttacker] = 0;
-
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, *(gBattleStruct->field_58 + gBankAttacker))
-
-    gBattleScripting.bank = gBankAttacker;
-    gBattlescriptCurrInstr = BattleScript_ActionSwitch;
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-
-    if (gBattleResults.playerSwitchesCounter < 255)
-        gBattleResults.playerSwitchesCounter++;
-}
-
-static void HandleAction_UseItem(void)
-{
-    gBankAttacker = gBankDefender = gBanksByTurnOrder[gCurrentTurnActionNumber];
-    gBattle_BG0_X = 0;
-    gBattle_BG0_Y = 0;
-    ClearFuryCutterDestinyBondGrudge(gBankAttacker);
-    gLastUsedItem = gBattleBufferB[gBankAttacker][1] | (gBattleBufferB[gBankAttacker][2] << 8);
-
-    if (gLastUsedItem <= ITEM_PREMIER_BALL) // is ball
-    {
-        gBattlescriptCurrInstr = gBattlescriptsForBallThrow[gLastUsedItem];
-    }
-    else if (gLastUsedItem == ITEM_POKE_DOLL || gLastUsedItem == ITEM_FLUFFY_TAIL)
-    {
-        gBattlescriptCurrInstr = gBattlescriptsForRunningByItem[0];
-    }
-    else if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-    {
-        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[0];
-    }
-    else
-    {
-        gBattleScripting.bank = gBankAttacker;
-
-        switch (*(gBattleStruct->AI_itemType + (gBankAttacker >> 1)))
-        {
-        case AI_ITEM_FULL_RESTORE:
-        case AI_ITEM_HEAL_HP:
-            break;
-        case AI_ITEM_CURE_CONDITION:
-            gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-            if (*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 1)
-            {
-                if (*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 0x3E)
-                    gBattleCommunication[MULTISTRING_CHOOSER] = 5;
-            }
-            else
-            {
-                while (!(*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 1))
-                {
-                    *(gBattleStruct->AI_itemFlags + gBankAttacker / 2) >>= 1;
-                    gBattleCommunication[MULTISTRING_CHOOSER]++;
-                }
-            }
-            break;
-        case AI_ITEM_X_STAT:
-            gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            if (*(gBattleStruct->AI_itemFlags + (gBankAttacker >> 1)) & 0x80)
-            {
-                gBattleCommunication[MULTISTRING_CHOOSER] = 5;
-            }
-            else
-            {
-                PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK)
-                PREPARE_STRING_BUFFER(gBattleTextBuff2, 0xD2)
-
-                while (!((*(gBattleStruct->AI_itemFlags + (gBankAttacker >> 1))) & 1))
-                {
-                    *(gBattleStruct->AI_itemFlags + gBankAttacker / 2) >>= 1;
-                    gBattleTextBuff1[2]++;
-                }
-
-                gBattleScripting.animArg1 = gBattleTextBuff1[2] + 14;
-                gBattleScripting.animArg2 = 0;
-            }
-            break;
-        case AI_ITEM_GUARD_SPECS:
-            if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                gBattleCommunication[MULTISTRING_CHOOSER] = 2;
-            else
-                gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-            break;
-        }
-
-        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[*(gBattleStruct->AI_itemType + gBankAttacker / 2)];
-    }
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-}
-
-bool8 TryRunFromBattle(u8 bank)
-{
-    bool8 effect = FALSE;
-    u8 holdEffect;
-    u8 pyramidMultiplier;
-    u8 speedVar;
-
-    if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY)
-        holdEffect = gEnigmaBerries[bank].holdEffect;
-    else
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank].item);
-
-    gStringBank = bank;
-
-    if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
-    {
-        gLastUsedItem = gBattleMons[bank].item ;
-        gProtectStructs[bank].fleeFlag = 1;
-        effect++;
-    }
-    else if (gBattleMons[bank].ability == ABILITY_RUN_AWAY)
-    {
-        if (InBattlePyramid())
-        {
-            gBattleStruct->runTries++;
-            pyramidMultiplier = sub_81A9E28();
-            speedVar = (gBattleMons[bank].speed * pyramidMultiplier) / (gBattleMons[bank ^ BIT_SIDE].speed) + (gBattleStruct->runTries * 30);
-            if (speedVar > (Random() & 0xFF))
-            {
-                gLastUsedAbility = ABILITY_RUN_AWAY;
-                gProtectStructs[bank].fleeFlag = 2;
-                effect++;
-            }
-        }
-        else
-        {
-            gLastUsedAbility = ABILITY_RUN_AWAY;
-            gProtectStructs[bank].fleeFlag = 2;
-            effect++;
-        }
-    }
-    else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000) && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
-    {
-        effect++;
-    }
-    else
-    {
-        if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
-        {
-            if (InBattlePyramid())
-            {
-                pyramidMultiplier = sub_81A9E28();
-                speedVar = (gBattleMons[bank].speed * pyramidMultiplier) / (gBattleMons[bank ^ BIT_SIDE].speed) + (gBattleStruct->runTries * 30);
-                if (speedVar > (Random() & 0xFF))
-                    effect++;
-            }
-            else if (gBattleMons[bank].speed < gBattleMons[bank ^ BIT_SIDE].speed)
-            {
-                speedVar = (gBattleMons[bank].speed * 128) / (gBattleMons[bank ^ BIT_SIDE].speed) + (gBattleStruct->runTries * 30);
-                if (speedVar > (Random() & 0xFF))
-                    effect++;
-            }
-            else // same speed or faster
-            {
-                effect++;
-            }
-        }
-
-        gBattleStruct->runTries++;
-    }
-
-    if (effect)
-    {
-        gCurrentTurnActionNumber = gBattleBanksCount;
-        gBattleOutcome = B_OUTCOME_RAN;
-    }
-
-    return effect;
-}
-
-static void HandleAction_Run(void)
-{
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
-
-    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-    {
-        gCurrentTurnActionNumber = gBattleBanksCount;
-
-        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-        {
-            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
-            {
-                if (gActionForBanks[gActiveBank] == ACTION_RUN)
-                    gBattleOutcome |= B_OUTCOME_LOST;
-            }
-            else
-            {
-                if (gActionForBanks[gActiveBank] == ACTION_RUN)
-                    gBattleOutcome |= B_OUTCOME_WON;
-            }
-        }
-
-        gBattleOutcome |= B_OUTCOME_LINK_BATTLE_RAN;
-        gSaveBlock2Ptr->field_CA9_b = 1;
-    }
-    else
-    {
-        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-        {
-            if (!TryRunFromBattle(gBankAttacker)) // failed to run away
-            {
-                ClearFuryCutterDestinyBondGrudge(gBankAttacker);
-                gBattleCommunication[MULTISTRING_CHOOSER] = 3;
-                gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
-                gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-            }
-        }
-        else
-        {
-            if (gBattleMons[gBankAttacker].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
-            {
-                gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-                gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
-                gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-            }
-            else
-            {
-                gCurrentTurnActionNumber = gBattleBanksCount;
-                gBattleOutcome = B_OUTCOME_POKE_FLED;
-            }
-        }
-    }
-}
-
-static void HandleAction_WatchesCarefully(void)
-{
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
-    gBattle_BG0_X = 0;
-    gBattle_BG0_Y = 0;
-    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0];
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-}
-
-static void HandleAction_SafariZoneBallThrow(void)
-{
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
-    gBattle_BG0_X = 0;
-    gBattle_BG0_Y = 0;
-    gNumSafariBalls--;
-    gLastUsedItem = ITEM_SAFARI_BALL;
-    gBattlescriptCurrInstr = gBattlescriptsForBallThrow[ITEM_SAFARI_BALL];
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-}
-
-static void HandleAction_ThrowPokeblock(void)
-{
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
-    gBattle_BG0_X = 0;
-    gBattle_BG0_Y = 0;
-    gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBankAttacker][1] - 1;
-    gLastUsedItem = gBattleBufferB[gBankAttacker][2];
-
-    if (gBattleResults.field_1F < 0xFF)
-        gBattleResults.field_1F++;
-    if (gBattleStruct->field_7A < 3)
-        gBattleStruct->field_7A++;
-    if (gBattleStruct->field_7B > 1)
-    {
-        if (gBattleStruct->field_7B < sUnknown_0831BCE0[gBattleStruct->field_7A][gBattleCommunication[MULTISTRING_CHOOSER]])
-            gBattleStruct->field_7B = 1;
-        else
-            gBattleStruct->field_7B -= sUnknown_0831BCE0[gBattleStruct->field_7A][gBattleCommunication[MULTISTRING_CHOOSER]];
-    }
-
-    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[2];
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-}
-
-static void HandleAction_GoNear(void)
-{
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
-    gBattle_BG0_X = 0;
-    gBattle_BG0_Y = 0;
-
-    gBattleStruct->field_7C += sUnknown_0831BCEF[gBattleStruct->field_79];
-    if (gBattleStruct->field_7C > 20)
-        gBattleStruct->field_7C = 20;
-
-    gBattleStruct->field_7B +=sUnknown_0831BCF3[gBattleStruct->field_79];
-    if (gBattleStruct->field_7B > 20)
-        gBattleStruct->field_7B = 20;
-
-    if (gBattleStruct->field_79 < 3)
-    {
-        gBattleStruct->field_79++;
-        gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-    }
-    else
-    {
-        gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-    }
-    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[1];
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-}
-
-static void HandleAction_SafriZoneRun(void)
-{
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
-    PlaySE(SE_NIGERU);
-    gCurrentTurnActionNumber = gBattleBanksCount;
-    gBattleOutcome = B_OUTCOME_RAN;
-}
-
-static void HandleAction_Action9(void)
-{
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
-    gBattle_BG0_X = 0;
-    gBattle_BG0_Y = 0;
-
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker])
-
-    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[3];
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-    gActionsByTurnOrder[1] = ACTION_FINISHED;
-}
-
-static void HandleAction_Action11(void)
-{
-    if (!HandleFaintedMonActions())
-    {
-        gBattleStruct->faintedActionsState = 0;
-        gCurrentActionFuncId = ACTION_FINISHED;
-    }
-}
-
-static void HandleAction_NothingIsFainted(void)
-{
-    gCurrentTurnActionNumber++;
-    gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
-    gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
-                    | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR
-                    | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000
-                    | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT
-                    | HITMARKER_x8000000 | HITMARKER_x4000000);
-}
-
-static void HandleAction_ActionFinished(void)
-{
-    *(gBattleStruct->monToSwitchIntoId + gBanksByTurnOrder[gCurrentTurnActionNumber]) = 6;
-    gCurrentTurnActionNumber++;
-    gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
-    SpecialStatusesClear();
-    gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
-                    | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR
-                    | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000
-                    | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT
-                    | HITMARKER_x8000000 | HITMARKER_x4000000);
-
-    gCurrentMove = 0;
-    gBattleMoveDamage = 0;
-    gMoveResultFlags = 0;
-    gBattleScripting.animTurn = 0;
-    gBattleScripting.animTargetsHit = 0;
-    gLastLandedMoves[gBankAttacker] = 0;
-    gLastHitByType[gBankAttacker] = 0;
-    gBattleStruct->dynamicMoveType = 0;
-    gDynamicBasePower = 0;
-    gBattleScripting.atk49_state = 0;
-    gBattleCommunication[3] = 0;
-    gBattleCommunication[4] = 0;
-    gBattleScripting.multihitMoveEffect = 0;
-    gBattleResources->battleScriptsStack->size = 0;
-}
diff --git a/src/battle_main.c b/src/battle_main.c
new file mode 100644
index 000000000..b19dcace1
--- /dev/null
+++ b/src/battle_main.c
@@ -0,0 +1,5612 @@
+#include "global.h"
+#include "battle.h"
+#include "recorded_battle.h"
+#include "main.h"
+#include "load_save.h"
+#include "gpu_regs.h"
+#include "unknown_task.h"
+#include "battle_setup.h"
+#include "battle_scripts.h"
+#include "pokemon.h"
+#include "palette.h"
+#include "task.h"
+#include "event_data.h"
+#include "constants/species.h"
+#include "berry.h"
+#include "text.h"
+#include "item.h"
+#include "constants/items.h"
+#include "constants/hold_effects.h"
+#include "constants/trainers.h"
+#include "link.h"
+#include "bg.h"
+#include "dma3.h"
+#include "string_util.h"
+#include "malloc.h"
+#include "event_data.h"
+#include "m4a.h"
+#include "window.h"
+#include "random.h"
+#include "constants/songs.h"
+#include "sound.h"
+#include "battle_message.h"
+#include "sprite.h"
+#include "util.h"
+#include "trig.h"
+#include "battle_ai_script_commands.h"
+#include "constants/battle_move_effects.h"
+#include "battle_controllers.h"
+#include "pokedex.h"
+#include "constants/abilities.h"
+#include "constants/moves.h"
+#include "evolution_scene.h"
+#include "roamer.h"
+#include "tv.h"
+#include "safari_zone.h"
+#include "battle_string_ids.h"
+#include "data2.h"
+
+struct UnknownStruct6
+{
+    u16 unk0[0xA0];
+    u8 fillerA0[0x640];
+    u16 unk780[0xA0];
+};
+
+struct UnknownPokemonStruct2
+{
+    /*0x00*/ u16 species;
+    /*0x02*/ u16 heldItem;
+    /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
+    /*0x0F*/ u8 level;
+    /*0x10*/ u16 hp;
+    /*0x12*/ u16 maxhp;
+    /*0x14*/ u32 status;
+    /*0x18*/ u32 personality;
+    /*0x1C*/ u8 gender;
+    /*0x1D*/ u8 language;
+};
+
+extern u8 gBattleCommunication[];
+extern u8 gBattleTerrain;
+extern u16 gBattle_BG0_X;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG2_X;
+extern u16 gBattle_BG2_Y;
+extern u16 gBattle_BG3_X;
+extern u16 gBattle_BG3_Y;
+extern u16 gPartnerTrainerId;
+extern u16 gBattle_WIN0H;
+extern u16 gBattle_WIN0V;
+extern u16 gBattle_WIN1H;
+extern u16 gBattle_WIN1V;
+extern u16 gTrainerBattleOpponent_A;
+extern u16 gTrainerBattleOpponent_B;
+extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
+extern void (*gPreBattleCallback1)(void);
+extern void (*gBattleMainFunc)(void);
+extern void (*gCB2_AfterEvolution)(void);
+extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for?
+extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
+extern u8 gUnknown_02039B28[]; // possibly a struct?
+extern struct UnknownStruct6 gUnknown_02038C28; // todo: identify & document
+extern struct MusicPlayerInfo gMPlayInfo_SE1;
+extern struct MusicPlayerInfo gMPlayInfo_SE2;
+extern u8 gDecompressionBuffer[];
+extern u16 gUnknown_020243FC;
+extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
+extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
+extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
+extern u8 gStringBank;
+extern u32 gUnknown_02022F88;
+extern u32 gHitMarker;
+extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
+extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
+extern u16 gPaydayMoney;
+extern u16 gBattleWeather;
+extern u16 gPauseCounterBattle;
+extern u16 gRandomTurnNumber;
+extern u8 gActiveBank;
+extern u8 gBattleBanksCount;
+extern u8 gBankAttacker;
+extern u8 gBankDefender;
+extern u8 gLeveledUpInBattle;
+extern u8 gAbsentBankFlags;
+extern u32 gBattleExecBuffer;
+extern u8 gMultiHitCounter;
+extern u8 gMoveResultFlags;
+extern s32 gBattleMoveDamage;
+extern const u8* gPalaceSelectionBattleScripts[BATTLE_BANKS_COUNT];
+extern u16 gLastPrintedMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastHitByType[BATTLE_BANKS_COUNT];
+extern u16 gLastResultingMoves[BATTLE_BANKS_COUNT];
+extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
+extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
+extern u8 gUnknown_02024284[BATTLE_BANKS_COUNT];
+extern u32 gStatuses3[BATTLE_BANKS_COUNT];
+extern u16 gSideStatuses[2];
+extern u16 gCurrentMove;
+extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
+extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
+extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
+extern u8 gActionForBanks[BATTLE_BANKS_COUNT];
+extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
+extern u8 gCurrentActionFuncId;
+extern u8 gLastUsedAbility;
+extern u8 gUnknown_0203CF00[];
+extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
+extern const u8* gBattlescriptCurrInstr;
+extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
+extern u8 gCurrentTurnActionNumber;
+extern u16 gDynamicBasePower;
+extern u8 gCritMultiplier;
+extern u8 gCurrMovePos;
+extern u8 gUnknown_020241E9;
+extern u16 gChosenMove;
+
+extern const struct BattleMove gBattleMoves[];
+extern const u16 gBattleTextboxPalette[]; // battle textbox palette
+extern const struct BgTemplate gUnknown_0831AA08[];
+extern const struct WindowTemplate * const gUnknown_0831ABA0[];
+extern const u8 gUnknown_0831ACE0[];
+extern const u8 gStatStageRatios[][2];
+extern const u8 * const gBattleScriptsForMoveEffects[];
+extern const u8 * const gBattlescriptsForBallThrow[];
+extern const u8 * const gBattlescriptsForRunningByItem[];
+extern const u8 * const gBattlescriptsForUsingItem[];
+extern const u8 * const gBattlescriptsForSafariActions[];
+
+// strings
+extern const u8 gText_LinkStandby3[];
+extern const u8 gText_RecordBattleToPass[];
+extern const u8 gText_BattleYesNoChoice[];
+extern const u8 gText_BattleRecordCouldntBeSaved[];
+extern const u8 gText_BattleRecordedOnPass[];
+extern const u8 gText_ShedinjaJapaneseName[];
+extern const u8 gText_EmptyString3[];
+extern const u8 gText_Poison[];
+extern const u8 gText_Sleep[];
+extern const u8 gText_Paralysis[];
+extern const u8 gText_Burn[];
+extern const u8 gText_Ice[];
+extern const u8 gText_Confusion[];
+extern const u8 gText_Love[];
+
+// functions
+extern void dp12_8087EA4(void);
+extern void sub_80356D0(void);
+extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower
+extern void sub_8166188(void); // battle tower, sets link battle mons level but why?
+extern void sub_8165B88(u8* dst, u16 trainerId); // battle tower, gets language
+extern void PadNameString(u8* dst, u8 arg2); //
+extern void sub_81B9150(void);
+extern void sub_800AC34(void);
+extern void sub_80B3AF8(u8 taskId); // cable club
+extern void sub_8076918(u8 bank);
+extern void SetHealthboxSpriteVisible(u8 healthoxSpriteId);
+extern void sub_81A56B4(void); // battle frontier 2
+extern u8 sub_81A9E28(void); // battle frontier 2
+extern void sub_81A56E8(u8 bank); // battle frontier 2
+extern void sub_81B8FB0(u8, u8); // party menu
+extern u8 pokemon_order_func(u8); // party menu
+extern bool8 InBattlePyramid(void);
+
+// this file's functions
+static void CB2_InitBattleInternal(void);
+static void CB2_PreInitMultiBattle(void);
+static void CB2_PreInitIngamePlayerPartnerBattle(void);
+static void CB2_HandleStartMultiPartnerBattle(void);
+static void CB2_HandleStartMultiBattle(void);
+static void CB2_HandleStartBattle(void);
+static void TryCorrectShedinjaLanguage(struct Pokemon *mon);
+static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 firstTrainer);
+static void BattleMainCB1(void);
+static void sub_8038538(struct Sprite *sprite);
+static void sub_8038F14(void);
+static void sub_8038F34(void);
+static void sub_80392A8(void);
+static void sub_803937C(void);
+static void sub_803939C(void);
+static void sub_803980C(struct Sprite *sprite);
+static void sub_8039838(struct Sprite *sprite);
+static void sub_8039894(struct Sprite *sprite);
+static void sub_80398D0(struct Sprite *sprite);
+static void sub_8039A48(struct Sprite *sprite);
+static void sub_8039AF4(struct Sprite *sprite);
+static void SpriteCallbackDummy_3(struct Sprite *sprite);
+static void oac_poke_ally_(struct Sprite *sprite);
+static void SpecialStatusesClear(void);
+static void TurnValuesCleanUp(bool8 var0);
+static void SpriteCB_HealthBoxBounce(struct Sprite *sprite);
+static void BattleStartClearSetData(void);
+static void BattleIntroGetMonsData(void);
+static void BattleIntroPrepareBackgroundSlide(void);
+static void BattleIntroDrawTrainersOrMonsSprites(void);
+static void BattleIntroDrawPartySummaryScreens(void);
+static void BattleIntroPrintTrainerWantsToBattle(void);
+static void BattleIntroPrintWildMonAttacked(void);
+static void BattleIntroPrintOpponentSendsOut(void);
+static void BattleIntroPrintPlayerSendsOut(void);
+static void BattleIntroOpponent1SendsOutMonAnimation(void);
+static void BattleIntroOpponent2SendsOutMonAnimation(void);
+static void BattleIntroRecordMonsToDex(void);
+static void BattleIntroPlayer1SendsOutMonAnimation(void);
+static void TryDoEventsBeforeFirstTurn(void);
+static void HandleTurnActionSelectionState(void);
+static void RunTurnActionsFunctions(void);
+static void SetActionsAndBanksTurnOrder(void);
+static void sub_803CDF8(void);
+static bool8 sub_803CDB8(void);
+static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void);
+static void FreeResetData_ReturnToOvOrDoEvolutions(void);
+static void ReturnFromBattleToOverworld(void);
+static void TryEvolvePokemon(void);
+static void WaitForEvoSceneToFinish(void);
+static void HandleEndTurn_ContinueBattle(void);
+static void HandleEndTurn_BattleWon(void);
+static void HandleEndTurn_BattleLost(void);
+static void HandleEndTurn_RanFromBattle(void);
+static void HandleEndTurn_MonFled(void);
+static void HandleEndTurn_FinishBattle(void);
+static void HandleAction_UseMove(void);
+static void HandleAction_Switch(void);
+static void HandleAction_UseItem(void);
+static void HandleAction_Run(void);
+static void HandleAction_WatchesCarefully(void);
+static void HandleAction_SafariZoneBallThrow(void);
+static void HandleAction_ThrowPokeblock(void);
+static void HandleAction_GoNear(void);
+static void HandleAction_SafriZoneRun(void);
+static void HandleAction_Action9(void);
+static void HandleAction_Action11(void);
+static void HandleAction_NothingIsFainted(void);
+static void HandleAction_ActionFinished(void);
+
+// rom const data
+static void (* const sTurnActionsFuncsTable[])(void) =
+{
+    HandleAction_UseMove,               // ACTION_USE_MOVE
+    HandleAction_UseItem,               // ACTION_USE_ITEM
+    HandleAction_Switch,                // ACTION_SWITCH
+    HandleAction_Run,                   // ACTION_RUN
+    HandleAction_WatchesCarefully,      // ACTION_WATCHES_CAREFULLY
+    HandleAction_SafariZoneBallThrow,   // ACTION_SAFARI_ZONE_BALL
+    HandleAction_ThrowPokeblock,        // ACTION_POKEBLOCK_CASE
+    HandleAction_GoNear,                // ACTION_GO_NEAR
+    HandleAction_SafriZoneRun,          // ACTION_SAFARI_ZONE_RUN
+    HandleAction_Action9,               // ACTION_9
+    HandleAction_RunBattleScript,       // ACTION_RUN_BATTLESCRIPT
+    HandleAction_Action11,              // not sure about this one
+    HandleAction_ActionFinished,        // ACTION_FINISHED
+    HandleAction_NothingIsFainted,      // ACTION_NOTHING_FAINTED
+};
+
+static void (* const sEndTurnFuncsTable[])(void) =
+{
+    HandleEndTurn_ContinueBattle,       // battle outcome 0
+    HandleEndTurn_BattleWon,            // B_OUTCOME_WON
+    HandleEndTurn_BattleLost,           // B_OUTCOME_LOST
+    HandleEndTurn_BattleLost,           // B_OUTCOME_DREW
+    HandleEndTurn_RanFromBattle,        // B_OUTCOME_RAN
+    HandleEndTurn_FinishBattle,         // B_OUTCOME_PLAYER_TELEPORTED
+    HandleEndTurn_MonFled,              // B_OUTCOME_POKE_FLED
+    HandleEndTurn_FinishBattle,         // B_OUTCOME_CAUGHT_POKE
+    HandleEndTurn_FinishBattle,         // battle outcome 8
+    HandleEndTurn_FinishBattle,         // B_OUTCOME_FORFEITED
+    HandleEndTurn_FinishBattle,         // B_OUTCOME_POKE_TELEPORTED
+};
+
+const u8 gStatusConditionString_PoisonJpn[8] = _("どく$$$$$");
+const u8 gStatusConditionString_SleepJpn[8] = _("ねむり$$$$");
+const u8 gStatusConditionString_ParalysisJpn[8] = _("まひ$$$$$");
+const u8 gStatusConditionString_BurnJpn[8] = _("やけど$$$$");
+const u8 gStatusConditionString_IceJpn[8] = _("こおり$$$$");
+const u8 gStatusConditionString_ConfusionJpn[8] = _("こんらん$$$");
+const u8 gStatusConditionString_LoveJpn[8] = _("メロメロ$$$");
+
+const u8 * const gStatusConditionStringsTable[7][2] =
+{
+    {gStatusConditionString_PoisonJpn, gText_Poison},
+    {gStatusConditionString_SleepJpn, gText_Sleep},
+    {gStatusConditionString_ParalysisJpn, gText_Paralysis},
+    {gStatusConditionString_BurnJpn, gText_Burn},
+    {gStatusConditionString_IceJpn, gText_Ice},
+    {gStatusConditionString_ConfusionJpn, gText_Confusion},
+    {gStatusConditionString_LoveJpn, gText_Love}
+};
+
+static const u8 sUnknown_0831BCE0[][3] = {{0, 0, 0}, {3, 5, 0}, {2, 3, 0}, {1, 2, 0}, {1, 1, 0}};
+static const u8 sUnknown_0831BCEF[] = {4, 3, 2, 1};
+static const u8 sUnknown_0831BCF3[] = {4, 4, 4, 4};
+
+void CB2_InitBattle(void)
+{
+    MoveSaveBlocks_ResetHeap();
+    AllocateBattleResources();
+    AllocateBattleSpritesData();
+    AllocateMonSpritesGfx();
+    sub_8185F84();
+
+    if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
+        {
+            CB2_InitBattleInternal();
+        }
+        else if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER))
+        {
+            HandleLinkBattleSetup();
+            SetMainCallback2(CB2_PreInitMultiBattle);
+        }
+        else
+        {
+            SetMainCallback2(CB2_PreInitIngamePlayerPartnerBattle);
+        }
+        gBattleCommunication[MULTIUSE_STATE] = 0;
+    }
+    else
+    {
+        CB2_InitBattleInternal();
+    }
+}
+
+static void CB2_InitBattleInternal(void)
+{
+    s32 i;
+
+    SetHBlankCallback(NULL);
+    SetVBlankCallback(NULL);
+
+    CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+
+    SetGpuReg(REG_OFFSET_MOSAIC, 0);
+    SetGpuReg(REG_OFFSET_WIN0H, 240);
+    SetGpuReg(REG_OFFSET_WIN0V, 0x5051);
+    SetGpuReg(REG_OFFSET_WININ, 0);
+    SetGpuReg(REG_OFFSET_WINOUT, 0);
+
+    gBattle_WIN0H = 240;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != STEVEN_PARTNER_ID)
+    {
+        gBattle_WIN0V = 159;
+        gBattle_WIN1H = 240;
+        gBattle_WIN1V = 32;
+    }
+    else
+    {
+        gBattle_WIN0V = 0x5051;
+        dp12_8087EA4();
+
+        for (i = 0; i < 80; i++)
+        {
+            gUnknown_02038C28.unk0[i] = 0xF0;
+            gUnknown_02038C28.unk780[i] = 0xF0;
+        }
+        for (i = 80; i < 160; i++)
+        {
+            #ifndef NONMATCHING
+                asm(""::"r"(i)); // needed to match
+            #endif // NONMATCHING
+
+            gUnknown_02038C28.unk0[i] = 0xFF10;
+            gUnknown_02038C28.unk780[i] = 0xFF10;
+        }
+
+        sub_80BA038(gUnknown_0831AC70);
+    }
+
+    ResetPaletteFade();
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
+    gBattle_BG3_X = 0;
+    gBattle_BG3_Y = 0;
+
+    gBattleTerrain = BattleSetup_GetTerrainId();
+    if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
+        gBattleTerrain = BATTLE_TERRAIN_BUILDING;
+
+    sub_80356D0();
+    LoadBattleTextboxAndBackground();
+    ResetSpriteData();
+    ResetTasks();
+    LoadBattleEntryBackground();
+    FreeAllSpritePalettes();
+    gReservedSpritePaletteCount = 4;
+    SetVBlankCallback(VBlankCB_Battle);
+    SetUpBattleVarsAndBirchZigzagoon();
+
+    if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
+        SetMainCallback2(CB2_HandleStartMultiPartnerBattle);
+    else if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
+        SetMainCallback2(CB2_HandleStartMultiPartnerBattle);
+    else if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+        SetMainCallback2(CB2_HandleStartMultiBattle);
+    else
+        SetMainCallback2(CB2_HandleStartBattle);
+
+    if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED)))
+    {
+        CreateNPCTrainerParty(&gEnemyParty[0], gTrainerBattleOpponent_A, TRUE);
+        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
+            CreateNPCTrainerParty(&gEnemyParty[3], gTrainerBattleOpponent_B, FALSE);
+        SetWildMonHeldItem();
+    }
+
+    gMain.inBattle = TRUE;
+    gSaveBlock2Ptr->field_CA9_b = 0;
+
+    for (i = 0; i < 6; i++)
+        AdjustFriendship(&gPlayerParty[i], 3);
+
+    gBattleCommunication[MULTIUSE_STATE] = 0;
+}
+
+static void sub_8036A5C(void)
+{
+    u16 r6 = 0;
+    u16 species = 0;
+    u16 hp = 0;
+    u32 status = 0;
+    s32 i;
+
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
+        hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
+        status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
+
+        if (species == SPECIES_NONE)
+            continue;
+        if (species != SPECIES_EGG && hp != 0 && status == 0)
+            r6 |= 1 << i * 2;
+
+        if (species == SPECIES_NONE)
+            continue;
+        if (hp != 0 && (species == SPECIES_EGG || status != 0))
+            r6 |= 2 << i * 2;
+
+        if (species == SPECIES_NONE)
+            continue;
+        if (species != SPECIES_EGG && hp == 0)
+            r6 |= 3 << i * 2;
+    }
+
+    gBattleStruct->field_182 = r6;
+    *(&gBattleStruct->field_183) = r6 >> 8;
+    gBattleStruct->field_183 |= FlagGet(FLAG_SYS_FRONTIER_PASS) << 7;
+}
+
+static void SetPlayerBerryDataInBattleStruct(void)
+{
+    s32 i;
+    struct BattleStruct *battleStruct = gBattleStruct;
+    struct BattleEnigmaBerry *battleBerry = &battleStruct->battleEnigmaBerry;
+
+    if (IsEnigmaBerryValid() == TRUE)
+    {
+        for (i = 0; i < BERRY_NAME_COUNT - 1; i++)
+            battleBerry->name[i] = gSaveBlock1Ptr->enigmaBerry.berry.name[i];
+        battleBerry->name[i] = EOS;
+
+        for (i = 0; i < BERRY_ITEM_EFFECT_COUNT; i++)
+            battleBerry->itemEffect[i] = gSaveBlock1Ptr->enigmaBerry.itemEffect[i];
+
+        battleBerry->holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
+        battleBerry->holdEffectParam = gSaveBlock1Ptr->enigmaBerry.holdEffectParam;
+    }
+    else
+    {
+        const struct Berry* berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY));
+
+        for (i = 0; i < BERRY_NAME_COUNT - 1; i++)
+            battleBerry->name[i] = berryData->name[i];
+        battleBerry->name[i] = EOS;
+
+        for (i = 0; i < BERRY_ITEM_EFFECT_COUNT; i++)
+            battleBerry->itemEffect[i] = 0;
+
+        battleBerry->holdEffect = HOLD_EFFECT_NONE;
+        battleBerry->holdEffectParam = 0;
+    }
+}
+
+static void SetAllPlayersBerryData(void)
+{
+    s32 i;
+    s32 j;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
+    {
+        if (IsEnigmaBerryValid() == TRUE)
+        {
+            for (i = 0; i < BERRY_NAME_COUNT - 1; i++)
+            {
+                gEnigmaBerries[0].name[i] = gSaveBlock1Ptr->enigmaBerry.berry.name[i];
+                gEnigmaBerries[2].name[i] = gSaveBlock1Ptr->enigmaBerry.berry.name[i];
+            }
+            gEnigmaBerries[0].name[i] = EOS;
+            gEnigmaBerries[2].name[i] = EOS;
+
+            for (i = 0; i < BERRY_ITEM_EFFECT_COUNT; i++)
+            {
+                gEnigmaBerries[0].itemEffect[i] = gSaveBlock1Ptr->enigmaBerry.itemEffect[i];
+                gEnigmaBerries[2].itemEffect[i] = gSaveBlock1Ptr->enigmaBerry.itemEffect[i];
+            }
+
+            gEnigmaBerries[0].holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
+            gEnigmaBerries[2].holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
+            gEnigmaBerries[0].holdEffectParam = gSaveBlock1Ptr->enigmaBerry.holdEffectParam;
+            gEnigmaBerries[2].holdEffectParam = gSaveBlock1Ptr->enigmaBerry.holdEffectParam;
+        }
+        else
+        {
+            const struct Berry* berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY));
+
+            for (i = 0; i < BERRY_NAME_COUNT - 1; i++)
+            {
+                gEnigmaBerries[0].name[i] = berryData->name[i];
+                gEnigmaBerries[2].name[i] = berryData->name[i];
+            }
+            gEnigmaBerries[0].name[i] = EOS;
+            gEnigmaBerries[2].name[i] = EOS;
+
+            for (i = 0; i < BERRY_ITEM_EFFECT_COUNT; i++)
+            {
+                gEnigmaBerries[0].itemEffect[i] = 0;
+                gEnigmaBerries[2].itemEffect[i] = 0;
+            }
+
+            gEnigmaBerries[0].holdEffect = 0;
+            gEnigmaBerries[2].holdEffect = 0;
+            gEnigmaBerries[0].holdEffectParam = 0;
+            gEnigmaBerries[2].holdEffectParam = 0;
+        }
+    }
+    else
+    {
+        s32 numPlayers;
+        struct BattleEnigmaBerry *src;
+        u8 r4;
+
+        if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+        {
+            if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
+                numPlayers = 2;
+            else
+                numPlayers = 4;
+
+            for (i = 0; i < numPlayers; i++)
+            {
+                src = (struct BattleEnigmaBerry *)(gBlockRecvBuffer[i] + 2);
+                r4 = gLinkPlayers[i].lp_field_18;
+
+                for (j = 0; j < BERRY_NAME_COUNT - 1; j++)
+                    gEnigmaBerries[r4].name[j] = src->name[j];
+                gEnigmaBerries[r4].name[j] = EOS;
+
+                for (j = 0; j < BERRY_ITEM_EFFECT_COUNT; j++)
+                    gEnigmaBerries[r4].itemEffect[j] = src->itemEffect[j];
+
+                gEnigmaBerries[r4].holdEffect = src->holdEffect;
+                gEnigmaBerries[r4].holdEffectParam = src->holdEffectParam;
+            }
+        }
+        else
+        {
+            for (i = 0; i < 2; i++)
+            {
+                src = (struct BattleEnigmaBerry *)(gBlockRecvBuffer[i] + 2);
+
+                for (j = 0; j < BERRY_NAME_COUNT - 1; j++)
+                {
+                    gEnigmaBerries[i].name[j] = src->name[j];
+                    gEnigmaBerries[i + 2].name[j] = src->name[j];
+                }
+                gEnigmaBerries[i].name[j] = EOS;
+                gEnigmaBerries[i + 2].name[j] = EOS;
+
+                for (j = 0; j < BERRY_ITEM_EFFECT_COUNT; j++)
+                {
+                    gEnigmaBerries[i].itemEffect[j] = src->itemEffect[j];
+                    gEnigmaBerries[i + 2].itemEffect[j] = src->itemEffect[j];
+                }
+
+                gEnigmaBerries[i].holdEffect = src->holdEffect;
+                gEnigmaBerries[i + 2].holdEffect = src->holdEffect;
+                gEnigmaBerries[i].holdEffectParam = src->holdEffectParam;
+                gEnigmaBerries[i + 2].holdEffectParam = src->holdEffectParam;
+            }
+        }
+    }
+}
+
+static void sub_8036EB8(u8 arg0, u8 arg1)
+{
+    u8 var = 0;
+
+    if (gBlockRecvBuffer[0][0] == 256)
+    {
+        if (arg1 == 0)
+            gBattleTypeFlags |= BATTLE_TYPE_WILD | BATTLE_TYPE_TRAINER;
+        else
+            gBattleTypeFlags |= BATTLE_TYPE_TRAINER;
+        var++;
+    }
+
+    if (var == 0)
+    {
+        s32 i;
+
+        for (i = 0; i < arg0; i++)
+        {
+            if (gBlockRecvBuffer[0][0] != gBlockRecvBuffer[i][0])
+                break;
+        }
+
+        if (i == arg0)
+        {
+            if (arg1 == 0)
+                gBattleTypeFlags |= BATTLE_TYPE_WILD | BATTLE_TYPE_TRAINER;
+            else
+                gBattleTypeFlags |= BATTLE_TYPE_TRAINER;
+            var++;
+        }
+
+        if (var == 0)
+        {
+            for (i = 0; i < arg0; i++)
+            {
+                if (gBlockRecvBuffer[i][0] == 0x300)
+                {
+                    if (i != arg1 && i < arg1)
+                        break;
+                }
+                if (gBlockRecvBuffer[i][0] > 0x300 && i != arg1)
+                    break;
+            }
+
+            if (i == arg0)
+                gBattleTypeFlags |= BATTLE_TYPE_WILD | BATTLE_TYPE_TRAINER;
+            else
+                gBattleTypeFlags |= BATTLE_TYPE_TRAINER;
+        }
+    }
+}
+
+static void CB2_HandleStartBattle(void)
+{
+    u8 playerMultiplayerId;
+    u8 enemyMultiplayerId;
+
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+
+    playerMultiplayerId = GetMultiplayerId();
+    gBattleScripting.multiplayerId = playerMultiplayerId;
+    enemyMultiplayerId = playerMultiplayerId ^ BIT_SIDE;
+
+    switch (gBattleCommunication[MULTIUSE_STATE])
+    {
+    case 0:
+        if (!IsDma3ManagerBusyWithBgCopy())
+        {
+            ShowBg(0);
+            ShowBg(1);
+            ShowBg(2);
+            ShowBg(3);
+            sub_805EF14();
+            gBattleCommunication[MULTIUSE_STATE] = 1;
+        }
+        if (gLinkVSyncDisabled)
+            sub_800E0E8();
+        break;
+    case 1:
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            if (gReceivedRemoteLinkPlayers != 0)
+            {
+                if (sub_800A520())
+                {
+                    *(&gBattleStruct->field_180) = 0;
+                    *(&gBattleStruct->field_181) = 3;
+                    sub_8036A5C();
+                    SetPlayerBerryDataInBattleStruct();
+
+                    if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00)
+                    {
+                        gLinkPlayers[0].lp_field_18 = 0;
+                        gLinkPlayers[1].lp_field_18 = 1;
+                    }
+
+                    SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32);
+                    gBattleCommunication[MULTIUSE_STATE] = 2;
+                }
+                if (gLinkVSyncDisabled)
+                    sub_800DFB4(0, 0);
+            }
+        }
+        else
+        {
+            if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+                gBattleTypeFlags |= BATTLE_TYPE_WILD;
+            gBattleCommunication[MULTIUSE_STATE] = 15;
+            SetAllPlayersBerryData();
+        }
+        break;
+    case 2:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            u8 taskId;
+
+            ResetBlockReceivedFlags();
+            sub_8036EB8(2, playerMultiplayerId);
+            SetAllPlayersBerryData();
+            taskId = CreateTask(sub_8035D74, 0);
+            gTasks[taskId].data[1] = 0x10E;
+            gTasks[taskId].data[2] = 0x5A;
+            gTasks[taskId].data[5] = 0;
+            gTasks[taskId].data[3] = gBattleStruct->field_182 | (gBattleStruct->field_183 << 8);
+            gTasks[taskId].data[4] = gBlockRecvBuffer[enemyMultiplayerId][1];
+            sub_8185F90(gBlockRecvBuffer[playerMultiplayerId][1]);
+            sub_8185F90(gBlockRecvBuffer[enemyMultiplayerId][1]);
+            sub_8068AA4();
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 3:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 4:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            ResetBlockReceivedFlags();
+            memcpy(gEnemyParty, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 7:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon) * 2);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 8:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            ResetBlockReceivedFlags();
+            memcpy(gEnemyParty + 2, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 11:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 4, sizeof(struct Pokemon) * 2);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 12:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            ResetBlockReceivedFlags();
+            memcpy(gEnemyParty + 4, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
+            TryCorrectShedinjaLanguage(&gEnemyParty[0]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[1]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[2]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[3]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[4]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[5]);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 15:
+        sub_8032768();
+        sub_8184E58();
+        gBattleCommunication[SPRITES_INIT_STATE1] = 0;
+        gBattleCommunication[SPRITES_INIT_STATE2] = 0;
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            s32 i;
+
+            for (i = 0; i < 2 && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++);
+
+            if (i == 2)
+                gBattleCommunication[MULTIUSE_STATE] = 16;
+            else
+                gBattleCommunication[MULTIUSE_STATE] = 18;
+        }
+        else
+        {
+            gBattleCommunication[MULTIUSE_STATE] = 18;
+        }
+        break;
+    case 16:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), &gRecordedBattleRngSeed, sizeof(gRecordedBattleRngSeed));
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 17:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            ResetBlockReceivedFlags();
+            if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
+                memcpy(&gRecordedBattleRngSeed, gBlockRecvBuffer[enemyMultiplayerId], sizeof(gRecordedBattleRngSeed));
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 18:
+        if (BattleInitAllSprites(&gBattleCommunication[SPRITES_INIT_STATE1], &gBattleCommunication[SPRITES_INIT_STATE2]))
+        {
+            gPreBattleCallback1 = gMain.callback1;
+            gMain.callback1 = BattleMainCB1;
+            SetMainCallback2(BattleMainCB2);
+            if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+            {
+                gBattleTypeFlags |= BATTLE_TYPE_20;
+            }
+        }
+        break;
+    case 5:
+    case 9:
+    case 13:
+        gBattleCommunication[MULTIUSE_STATE]++;
+        gBattleCommunication[1] = 1;
+    case 6:
+    case 10:
+    case 14:
+        if (--gBattleCommunication[1] == 0)
+            gBattleCommunication[MULTIUSE_STATE]++;
+        break;
+    }
+}
+
+static void CB2_HandleStartMultiPartnerBattle(void)
+{
+    u8 playerMultiplayerId;
+    u8 enemyMultiplayerId;
+
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+
+    playerMultiplayerId = GetMultiplayerId();
+    gBattleScripting.multiplayerId = playerMultiplayerId;
+    enemyMultiplayerId = playerMultiplayerId ^ BIT_SIDE;
+
+    switch (gBattleCommunication[MULTIUSE_STATE])
+    {
+    case 0:
+        if (!IsDma3ManagerBusyWithBgCopy())
+        {
+            ShowBg(0);
+            ShowBg(1);
+            ShowBg(2);
+            ShowBg(3);
+            sub_805EF14();
+            gBattleCommunication[MULTIUSE_STATE] = 1;
+        }
+        if (gLinkVSyncDisabled)
+            sub_800E0E8();
+        // fall through
+    case 1:
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            if (gReceivedRemoteLinkPlayers != 0)
+            {
+                u8 language;
+
+                gLinkPlayers[0].lp_field_18 = 0;
+                gLinkPlayers[1].lp_field_18 = 2;
+                gLinkPlayers[2].lp_field_18 = 1;
+                gLinkPlayers[3].lp_field_18 = 3;
+                GetFrontierTrainerName(gLinkPlayers[2].name, gTrainerBattleOpponent_A);
+                GetFrontierTrainerName(gLinkPlayers[3].name, gTrainerBattleOpponent_B);
+                sub_8165B88(&language, gTrainerBattleOpponent_A);
+                gLinkPlayers[2].language = language;
+                sub_8165B88(&language, gTrainerBattleOpponent_B);
+                gLinkPlayers[3].language = language;
+
+                if (sub_800A520())
+                {
+                    *(&gBattleStruct->field_180) = 0;
+                    *(&gBattleStruct->field_181) = 3;
+                    sub_8036A5C();
+                    SetPlayerBerryDataInBattleStruct();
+                    SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32);
+                    gBattleCommunication[MULTIUSE_STATE] = 2;
+                }
+
+                if (gLinkVSyncDisabled)
+                    sub_800DFB4(0, 0);
+            }
+        }
+        else
+        {
+            if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+                gBattleTypeFlags |= BATTLE_TYPE_WILD;
+            gBattleCommunication[MULTIUSE_STATE] = 13;
+            SetAllPlayersBerryData();
+        }
+        break;
+    case 2:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            u8 taskId;
+
+            ResetBlockReceivedFlags();
+            sub_8036EB8(2, playerMultiplayerId);
+            SetAllPlayersBerryData();
+            taskId = CreateTask(sub_8035D74, 0);
+            gTasks[taskId].data[1] = 0x10E;
+            gTasks[taskId].data[2] = 0x5A;
+            gTasks[taskId].data[5] = 0;
+            gTasks[taskId].data[3] = 0x145;
+            gTasks[taskId].data[4] = 0x145;
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 3:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 4:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            ResetBlockReceivedFlags();
+            if (gLinkPlayers[playerMultiplayerId].lp_field_18 != 0)
+            {
+                memcpy(gPlayerParty, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
+                memcpy(gPlayerParty + 3, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon) * 2);
+            }
+            else
+            {
+                memcpy(gPlayerParty, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon) * 2);
+                memcpy(gPlayerParty + 3, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
+            }
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 5:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon));
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 6:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            ResetBlockReceivedFlags();
+            if (gLinkPlayers[playerMultiplayerId].lp_field_18 != 0)
+            {
+                memcpy(gPlayerParty + 2, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon));
+                memcpy(gPlayerParty + 5, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon));
+            }
+            else
+            {
+                memcpy(gPlayerParty + 2, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon));
+                memcpy(gPlayerParty + 5, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon));
+            }
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 7:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gEnemyParty, sizeof(struct Pokemon) * 2);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 8:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            ResetBlockReceivedFlags();
+            if (GetMultiplayerId() != 0)
+            {
+                memcpy(gEnemyParty, gBlockRecvBuffer[0], sizeof(struct Pokemon) * 2);
+            }
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 9:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gEnemyParty + 2, sizeof(struct Pokemon) * 2);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 10:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            ResetBlockReceivedFlags();
+            if (GetMultiplayerId() != 0)
+            {
+                memcpy(gEnemyParty + 2, gBlockRecvBuffer[0], sizeof(struct Pokemon) * 2);
+            }
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 11:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gEnemyParty + 4, sizeof(struct Pokemon) * 2);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 12:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            ResetBlockReceivedFlags();
+            if (GetMultiplayerId() != 0)
+                memcpy(gEnemyParty + 4, gBlockRecvBuffer[0], sizeof(struct Pokemon) * 2);
+            TryCorrectShedinjaLanguage(&gPlayerParty[0]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[1]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[2]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[3]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[4]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[5]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[0]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[1]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[2]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[3]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[4]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[5]);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 13:
+        sub_8032768();
+        sub_8184E58();
+        gBattleCommunication[SPRITES_INIT_STATE1] = 0;
+        gBattleCommunication[SPRITES_INIT_STATE2] = 0;
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            gBattleCommunication[MULTIUSE_STATE] = 14;
+        }
+        else
+        {
+            gBattleCommunication[MULTIUSE_STATE] = 16;
+        }
+        break;
+    case 14:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), &gRecordedBattleRngSeed, sizeof(gRecordedBattleRngSeed));
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 15:
+        if ((GetBlockReceivedStatus() & 3) == 3)
+        {
+            ResetBlockReceivedFlags();
+            if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
+                memcpy(&gRecordedBattleRngSeed, gBlockRecvBuffer[enemyMultiplayerId], sizeof(gRecordedBattleRngSeed));
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 16:
+        if (BattleInitAllSprites(&gBattleCommunication[SPRITES_INIT_STATE1], &gBattleCommunication[SPRITES_INIT_STATE2]))
+        {
+            sub_8166188();
+            gPreBattleCallback1 = gMain.callback1;
+            gMain.callback1 = BattleMainCB1;
+            SetMainCallback2(BattleMainCB2);
+            if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+            {
+                gBattleTypeFlags |= BATTLE_TYPE_20;
+            }
+        }
+        break;
+    }
+}
+
+static void sub_80379F8(u8 arrayIdPlus)
+{
+    s32 i;
+
+    for (i = 0; i < 3; i++)
+    {
+        gUnknown_02022FF8[i].species     = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_SPECIES);
+        gUnknown_02022FF8[i].heldItem    = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_HELD_ITEM);
+        GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_NICKNAME, gUnknown_02022FF8[i].nickname);
+        gUnknown_02022FF8[i].level       = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LEVEL);
+        gUnknown_02022FF8[i].hp          = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_HP);
+        gUnknown_02022FF8[i].maxhp       = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_MAX_HP);
+        gUnknown_02022FF8[i].status      = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_STATUS);
+        gUnknown_02022FF8[i].personality = GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_PERSONALITY);
+        gUnknown_02022FF8[i].gender      = GetMonGender(&gPlayerParty[arrayIdPlus + i]);
+        StripExtCtrlCodes(gUnknown_02022FF8[i].nickname);
+        if (GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE)
+            PadNameString(gUnknown_02022FF8[i].nickname, CHAR_SPACE);
+    }
+    memcpy(gUnknown_02023058, gUnknown_02022FF8, sizeof(gUnknown_02022FF8));
+}
+
+static void CB2_PreInitMultiBattle(void)
+{
+    s32 i;
+    u8 playerMultiplierId;
+    s32 numPlayers = 4;
+    u8 r4 = 0xF;
+    u32* savedBattleTypeFlags;
+    void (**savedCallback)(void);
+
+    if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
+    {
+        numPlayers = 2;
+        r4 = 3;
+    }
+
+    playerMultiplierId = GetMultiplayerId();
+    gBattleScripting.multiplayerId = playerMultiplierId;
+    savedCallback = &gBattleStruct->savedCallback;
+    savedBattleTypeFlags = &gBattleStruct->savedBattleTypeFlags;
+
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+
+    switch (gBattleCommunication[MULTIUSE_STATE])
+    {
+    case 0:
+        if (gReceivedRemoteLinkPlayers != 0 && sub_800A520())
+        {
+            gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct2) * 3);
+            sub_80379F8(0);
+            SendBlock(bitmask_all_link_players_but_self(), gUnknown_02023058, sizeof(struct UnknownPokemonStruct2) * 3);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 1:
+        if ((GetBlockReceivedStatus() & r4) == r4)
+        {
+            ResetBlockReceivedFlags();
+            for (i = 0; i < numPlayers; i++)
+            {
+                if (i == playerMultiplierId)
+                    continue;
+
+                if (numPlayers == 4)
+                {
+                    if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplierId].lp_field_18 & 1))
+                        || (gLinkPlayers[i].lp_field_18 & 1 && gLinkPlayers[playerMultiplierId].lp_field_18 & 1))
+                    {
+                        memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct2) * 3);
+                    }
+                }
+                else
+                {
+                    memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct2) * 3);
+                }
+            }
+            gBattleCommunication[MULTIUSE_STATE]++;
+            *savedCallback = gMain.savedCallback;
+            *savedBattleTypeFlags = gBattleTypeFlags;
+            gMain.savedCallback = CB2_PreInitMultiBattle;
+            sub_81B9150();
+        }
+        break;
+    case 2:
+        if (sub_800A520() && !gPaletteFade.active)
+        {
+            gBattleCommunication[MULTIUSE_STATE]++;
+            if (gLinkVSyncDisabled)
+                sub_800ADF8();
+            else
+                sub_800AC34();
+        }
+        break;
+    case 3:
+        if (gLinkVSyncDisabled)
+        {
+            if (sub_8010500())
+            {
+                gBattleTypeFlags = *savedBattleTypeFlags;
+                gMain.savedCallback = *savedCallback;
+                SetMainCallback2(CB2_InitBattleInternal);
+                Free(gUnknown_02023058);
+                gUnknown_02023058 = NULL;
+            }
+        }
+        else if (gReceivedRemoteLinkPlayers == 0)
+        {
+            gBattleTypeFlags = *savedBattleTypeFlags;
+            gMain.savedCallback = *savedCallback;
+            SetMainCallback2(CB2_InitBattleInternal);
+            Free(gUnknown_02023058);
+            gUnknown_02023058 = NULL;
+        }
+        break;
+    }
+}
+
+static void CB2_PreInitIngamePlayerPartnerBattle(void)
+{
+    u32* savedBattleTypeFlags;
+    void (**savedCallback)(void);
+
+    savedCallback = &gBattleStruct->savedCallback;
+    savedBattleTypeFlags = &gBattleStruct->savedBattleTypeFlags;
+
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+
+    switch (gBattleCommunication[MULTIUSE_STATE])
+    {
+    case 0:
+        gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct2) * 3);
+        sub_80379F8(3);
+        gBattleCommunication[MULTIUSE_STATE]++;
+        *savedCallback = gMain.savedCallback;
+        *savedBattleTypeFlags = gBattleTypeFlags;
+        gMain.savedCallback = CB2_PreInitIngamePlayerPartnerBattle;
+        sub_81B9150();
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+            gBattleCommunication[MULTIUSE_STATE] = 2;
+            gBattleTypeFlags = *savedBattleTypeFlags;
+            gMain.savedCallback = *savedCallback;
+            SetMainCallback2(CB2_InitBattleInternal);
+            Free(gUnknown_02023058);
+            gUnknown_02023058 = NULL;
+        }
+        break;
+    }
+}
+
+static void CB2_HandleStartMultiBattle(void)
+{
+    u8 playerMultiplayerId;
+    s32 id;
+    u8 var;
+
+    playerMultiplayerId = GetMultiplayerId();
+    gBattleScripting.multiplayerId = playerMultiplayerId;
+
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+
+    switch (gBattleCommunication[MULTIUSE_STATE])
+    {
+    case 0:
+        if (!IsDma3ManagerBusyWithBgCopy())
+        {
+            ShowBg(0);
+            ShowBg(1);
+            ShowBg(2);
+            ShowBg(3);
+            sub_805EF14();
+            gBattleCommunication[MULTIUSE_STATE] = 1;
+        }
+        if (gLinkVSyncDisabled)
+            sub_800E0E8();
+        break;
+    case 1:
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            if (gReceivedRemoteLinkPlayers != 0)
+            {
+                if (sub_800A520())
+                {
+                    *(&gBattleStruct->field_180) = 0;
+                    *(&gBattleStruct->field_181) = 3;
+                    sub_8036A5C();
+                    SetPlayerBerryDataInBattleStruct();
+
+                    SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32);
+                    gBattleCommunication[MULTIUSE_STATE]++;
+                }
+                if (gLinkVSyncDisabled)
+                    sub_800DFB4(0, 0);
+            }
+        }
+        else
+        {
+            if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+                gBattleTypeFlags |= BATTLE_TYPE_WILD;
+            gBattleCommunication[MULTIUSE_STATE] = 7;
+            SetAllPlayersBerryData();
+        }
+        break;
+    case 2:
+        if ((GetBlockReceivedStatus() & 0xF) == 0xF)
+        {
+            ResetBlockReceivedFlags();
+            sub_8036EB8(4, playerMultiplayerId);
+            SetAllPlayersBerryData();
+            sub_8068AA4();
+            var = CreateTask(sub_8035D74, 0);
+            gTasks[var].data[1] = 0x10E;
+            gTasks[var].data[2] = 0x5A;
+            gTasks[var].data[5] = 0;
+            gTasks[var].data[3] = 0;
+            gTasks[var].data[4] = 0;
+
+            for (id = 0; id < MAX_LINK_PLAYERS; id++)
+            {
+                sub_8185F90(gBlockRecvBuffer[id][1]);
+                switch (gLinkPlayers[id].lp_field_18)
+                {
+                case 0:
+                    gTasks[var].data[3] |= gBlockRecvBuffer[id][1] & 0x3F;
+                    break;
+                case 1:
+                    gTasks[var].data[4] |= gBlockRecvBuffer[id][1] & 0x3F;
+                    break;
+                case 2:
+                    gTasks[var].data[3] |= (gBlockRecvBuffer[id][1] & 0x3F) << 6;
+                    break;
+                case 3:
+                    gTasks[var].data[4] |= (gBlockRecvBuffer[id][1] & 0x3F) << 6;
+                    break;
+                }
+            }
+            ZeroEnemyPartyMons();
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        else
+            break;
+        // fall through
+    case 3:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 4:
+        if ((GetBlockReceivedStatus() & 0xF) == 0xF)
+        {
+            ResetBlockReceivedFlags();
+            for (id = 0; id < MAX_LINK_PLAYERS; id++)
+            {
+                if (id == playerMultiplayerId)
+                {
+                    switch (gLinkPlayers[id].lp_field_18)
+                    {
+                    case 0:
+                    case 3:
+                        memcpy(gPlayerParty, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
+                        break;
+                    case 1:
+                    case 2:
+                        memcpy(gPlayerParty + 3, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
+                        break;
+                    }
+                }
+                else
+                {
+                    if ((!(gLinkPlayers[id].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplayerId].lp_field_18 & 1))
+                     || ((gLinkPlayers[id].lp_field_18 & 1) && (gLinkPlayers[playerMultiplayerId].lp_field_18 & 1)))
+                    {
+                        switch (gLinkPlayers[id].lp_field_18)
+                        {
+                        case 0:
+                        case 3:
+                            memcpy(gPlayerParty, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
+                            break;
+                        case 1:
+                        case 2:
+                            memcpy(gPlayerParty + 3, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        switch (gLinkPlayers[id].lp_field_18)
+                        {
+                        case 0:
+                        case 3:
+                            memcpy(gEnemyParty, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
+                            break;
+                        case 1:
+                        case 2:
+                            memcpy(gEnemyParty + 3, gBlockRecvBuffer[id], sizeof(struct Pokemon) * 2);
+                            break;
+                        }
+                    }
+                }
+            }
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 5:
+        if (sub_800A520())
+        {
+            SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon));
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 6:
+        if ((GetBlockReceivedStatus() & 0xF) == 0xF)
+        {
+            ResetBlockReceivedFlags();
+            for (id = 0; id < MAX_LINK_PLAYERS; id++)
+            {
+                if (id == playerMultiplayerId)
+                {
+                    switch (gLinkPlayers[id].lp_field_18)
+                    {
+                    case 0:
+                    case 3:
+                        memcpy(gPlayerParty + 2, gBlockRecvBuffer[id], sizeof(struct Pokemon));
+                        break;
+                    case 1:
+                    case 2:
+                        memcpy(gPlayerParty + 5, gBlockRecvBuffer[id], sizeof(struct Pokemon));
+                        break;
+                    }
+                }
+                else
+                {
+                    if ((!(gLinkPlayers[id].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplayerId].lp_field_18 & 1))
+                     || ((gLinkPlayers[id].lp_field_18 & 1) && (gLinkPlayers[playerMultiplayerId].lp_field_18 & 1)))
+                    {
+                        switch (gLinkPlayers[id].lp_field_18)
+                        {
+                        case 0:
+                        case 3:
+                            memcpy(gPlayerParty + 2, gBlockRecvBuffer[id], sizeof(struct Pokemon));
+                            break;
+                        case 1:
+                        case 2:
+                            memcpy(gPlayerParty + 5, gBlockRecvBuffer[id], sizeof(struct Pokemon));
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        switch (gLinkPlayers[id].lp_field_18)
+                        {
+                        case 0:
+                        case 3:
+                            memcpy(gEnemyParty + 2, gBlockRecvBuffer[id], sizeof(struct Pokemon));
+                            break;
+                        case 1:
+                        case 2:
+                            memcpy(gEnemyParty + 5, gBlockRecvBuffer[id], sizeof(struct Pokemon));
+                            break;
+                        }
+                    }
+                }
+            }
+            TryCorrectShedinjaLanguage(&gPlayerParty[0]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[1]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[2]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[3]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[4]);
+            TryCorrectShedinjaLanguage(&gPlayerParty[5]);
+
+            TryCorrectShedinjaLanguage(&gEnemyParty[0]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[1]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[2]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[3]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[4]);
+            TryCorrectShedinjaLanguage(&gEnemyParty[5]);
+
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 7:
+        sub_8032768();
+        sub_8184E58();
+        gBattleCommunication[SPRITES_INIT_STATE1] = 0;
+        gBattleCommunication[SPRITES_INIT_STATE2] = 0;
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            for (id = 0; id < 4 && (gLinkPlayers[id].version & 0xFF) == 3; id++);
+
+            if (id == 4)
+                gBattleCommunication[MULTIUSE_STATE] = 8;
+            else
+                gBattleCommunication[MULTIUSE_STATE] = 10;
+        }
+        else
+        {
+            gBattleCommunication[MULTIUSE_STATE] = 10;
+        }
+        break;
+    case 8:
+        if (sub_800A520())
+        {
+            u32* ptr = (u32*)(&gBattleStruct->field_180);
+            ptr[0] = gBattleTypeFlags;
+            ptr[1] = gRecordedBattleRngSeed; // UB: overwrites berry data
+            SendBlock(bitmask_all_link_players_but_self(), ptr, 8);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 9:
+        if ((GetBlockReceivedStatus() & 0xF) == 0xF)
+        {
+            ResetBlockReceivedFlags();
+            for (var = 0; var < 4; var++)
+            {
+                u32 blockValue = gBlockRecvBuffer[var][0];
+                if (blockValue & 4)
+                {
+                    memcpy(&gRecordedBattleRngSeed, &gBlockRecvBuffer[var][2], sizeof(gRecordedBattleRngSeed));
+                    break;
+                }
+            }
+
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 10:
+        if (BattleInitAllSprites(&gBattleCommunication[SPRITES_INIT_STATE1], &gBattleCommunication[SPRITES_INIT_STATE2]))
+        {
+            gPreBattleCallback1 = gMain.callback1;
+            gMain.callback1 = BattleMainCB1;
+            SetMainCallback2(BattleMainCB2);
+            if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+            {
+                gTrainerBattleOpponent_A = TRAINER_OPPONENT_800;
+                gBattleTypeFlags |= BATTLE_TYPE_20;
+            }
+        }
+        break;
+    }
+}
+
+void BattleMainCB2(void)
+{
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+    RunTasks();
+
+    if (gMain.heldKeys & B_BUTTON && gBattleTypeFlags & BATTLE_TYPE_RECORDED && sub_8186450())
+    {
+        gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED;
+        ResetPaletteFadeControl();
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        SetMainCallback2(CB2_QuitRecordedBattle);
+    }
+}
+
+static void FreeRestoreBattleData(void)
+{
+    gMain.callback1 = gPreBattleCallback1;
+    gUnknown_02039B28[0x15] = 3;
+    gMain.inBattle = 0;
+    ZeroEnemyPartyMons();
+    m4aSongNumStop(0x5A);
+    FreeMonSpritesGfx();
+    FreeBattleSpritesData();
+    FreeBattleResources();
+}
+
+void CB2_QuitRecordedBattle(void)
+{
+    UpdatePaletteFade();
+    if (!gPaletteFade.active)
+    {
+        m4aMPlayStop(&gMPlayInfo_SE1);
+        m4aMPlayStop(&gMPlayInfo_SE2);
+        FreeRestoreBattleData();
+        FreeAllWindowBuffers();
+        SetMainCallback2(gMain.savedCallback);
+    }
+}
+
+void sub_8038528(struct Sprite* sprite)
+{
+    sprite->data[0] = 0;
+    sprite->callback = sub_8038538;
+}
+
+static void sub_8038538(struct Sprite *sprite)
+{
+    u16 *arr = (u16*)(gDecompressionBuffer);
+
+    switch (sprite->data[0])
+    {
+    case 0:
+        sprite->data[0]++;
+        sprite->data[1] = 0;
+        sprite->data[2] = 0x281;
+        sprite->data[3] = 0;
+        sprite->data[4] = 1;
+        // fall through
+    case 1:
+        sprite->data[4]--;
+        if (sprite->data[4] == 0)
+        {
+            s32 i;
+            s32 r2;
+            s32 r0;
+
+            sprite->data[4] = 2;
+            r2 = sprite->data[1] + sprite->data[3] * 32;
+            r0 = sprite->data[2] - sprite->data[3] * 32;
+            for (i = 0; i < 29; i += 2)
+            {
+                arr[r2 + i] = 0x3D;
+                arr[r0 + i] = 0x3D;
+            }
+            sprite->data[3]++;
+            if (sprite->data[3] == 21)
+            {
+                sprite->data[0]++;
+                sprite->data[1] = 32;
+            }
+        }
+        break;
+    case 2:
+        sprite->data[1]--;
+        if (sprite->data[1] == 20)
+            SetMainCallback2(CB2_InitBattle);
+        break;
+    }
+}
+
+static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 firstTrainer)
+{
+    u32 nameHash = 0;
+    u32 personalityValue;
+    u8 fixedIV;
+    s32 i, j;
+    u8 monsCount;
+
+    if (trainerNum == SECRET_BASE_OPPONENT)
+        return 0;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & (BATTLE_TYPE_FRONTIER
+                                                                        | BATTLE_TYPE_EREADER_TRAINER
+                                                                        | BATTLE_TYPE_x4000000)))
+    {
+        if (firstTrainer == TRUE)
+            ZeroEnemyPartyMons();
+
+        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
+        {
+            if (gTrainers[trainerNum].partySize > 3)
+                monsCount = 3;
+            else
+                monsCount = gTrainers[trainerNum].partySize;
+        }
+        else
+        {
+            monsCount = gTrainers[trainerNum].partySize;
+        }
+
+        for (i = 0; i < monsCount; i++)
+        {
+
+            if (gTrainers[trainerNum].doubleBattle == TRUE)
+                personalityValue = 0x80;
+            else if (gTrainers[trainerNum].encounterMusic_gender & 0x80)
+                personalityValue = 0x78;
+            else
+                personalityValue = 0x88;
+
+            for (j = 0; gTrainers[trainerNum].trainerName[j] != 0xFF; j++)
+                nameHash += gTrainers[trainerNum].trainerName[j];
+
+            switch (gTrainers[trainerNum].partyFlags)
+            {
+            case 0:
+            {
+                const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerNum].party.NoItemDefaultMoves;
+
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
+                    nameHash += gSpeciesNames[partyData[i].species][j];
+
+                personalityValue += nameHash << 8;
+                fixedIV = partyData[i].iv * 31 / 255;
+                CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0);
+                break;
+            }
+            case F_TRAINER_PARTY_CUSTOM_MOVESET:
+            {
+                const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerNum].party.NoItemCustomMoves;
+
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
+                    nameHash += gSpeciesNames[partyData[i].species][j];
+
+                personalityValue += nameHash << 8;
+                fixedIV = partyData[i].iv * 31 / 255;
+                CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, 2, 0);
+
+                for (j = 0; j < 4; j++)
+                {
+                    SetMonData(&party[i], MON_DATA_MOVE1 + j, &partyData[i].moves[j]);
+                    SetMonData(&party[i], MON_DATA_PP1 + j, &gBattleMoves[partyData[i].moves[j]].pp);
+                }
+                break;
+            }
+            case F_TRAINER_PARTY_HELD_ITEM:
+            {
+                const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerNum].party.ItemDefaultMoves;
+
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
+                    nameHash += gSpeciesNames[partyData[i].species][j];
+
+                personalityValue += nameHash << 8;
+                fixedIV = partyData[i].iv * 31 / 255;
+                CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, 2, 0);
+
+                SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
+                break;
+            }
+            case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
+            {
+                const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerNum].party.ItemCustomMoves;
+
+                for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++)
+                    nameHash += gSpeciesNames[partyData[i].species][j];
+
+                personalityValue += nameHash << 8;
+                fixedIV = partyData[i].iv * 31 / 255;
+                CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, 2, 0);
+
+                SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
+
+                for (j = 0; j < 4; j++)
+                {
+                    SetMonData(&party[i], MON_DATA_MOVE1 + j, &partyData[i].moves[j]);
+                    SetMonData(&party[i], MON_DATA_PP1 + j, &gBattleMoves[partyData[i].moves[j]].pp);
+                }
+                break;
+            }
+            }
+        }
+
+        gBattleTypeFlags |= gTrainers[trainerNum].doubleBattle;
+    }
+
+    return gTrainers[trainerNum].partySize;
+}
+
+void sub_8038A04(void) // unused
+{
+    if (REG_VCOUNT < 0xA0 && REG_VCOUNT >= 0x6F)
+        SetGpuReg(REG_OFFSET_BG0CNT, 0x9800);
+}
+
+void VBlankCB_Battle(void)
+{
+    // change gRngSeed every vblank unless the battle could be recorded
+    if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_RECORDED)))
+        Random();
+
+    SetGpuReg(REG_OFFSET_BG0HOFS, gBattle_BG0_X);
+    SetGpuReg(REG_OFFSET_BG0VOFS, gBattle_BG0_Y);
+    SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
+    SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
+    SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X);
+    SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y);
+    SetGpuReg(REG_OFFSET_BG3HOFS, gBattle_BG3_X);
+    SetGpuReg(REG_OFFSET_BG3VOFS, gBattle_BG3_Y);
+    SetGpuReg(REG_OFFSET_WIN0H, gBattle_WIN0H);
+    SetGpuReg(REG_OFFSET_WIN0V, gBattle_WIN0V);
+    SetGpuReg(REG_OFFSET_WIN1H, gBattle_WIN1H);
+    SetGpuReg(REG_OFFSET_WIN1V, gBattle_WIN1V);
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_80BA0A8();
+}
+
+void nullsub_17(void)
+{
+
+}
+
+static void sub_8038B04(struct Sprite *sprite)
+{
+    if (sprite->data[0] != 0)
+        sprite->pos1.x = sprite->data[1] + ((sprite->data[2] & 0xFF00) >> 8);
+    else
+        sprite->pos1.x = sprite->data[1] - ((sprite->data[2] & 0xFF00) >> 8);
+
+    sprite->data[2] += 0x180;
+
+    if (sprite->affineAnimEnded)
+    {
+        FreeSpriteTilesByTag(0x2710);
+        FreeSpritePaletteByTag(0x2710);
+        FreeSpriteOamMatrix(sprite);
+        DestroySprite(sprite);
+    }
+}
+
+void sub_8038B74(struct Sprite *sprite)
+{
+    StartSpriteAffineAnim(sprite, 1);
+    sprite->callback = sub_8038B04;
+    PlaySE(SE_BT_START);
+}
+
+static void sub_8038B94(u8 taskId)
+{
+    struct Pokemon *sp4 = NULL;
+    struct Pokemon *sp8 = NULL;
+    u8 r2 = gBattleScripting.multiplayerId;
+    u32 r7;
+    s32 i;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+    {
+        switch (gLinkPlayers[r2].lp_field_18)
+        {
+        case 0:
+        case 2:
+            sp4 = gPlayerParty;
+            sp8 = gEnemyParty;
+            break;
+        case 1:
+        case 3:
+            sp4 = gEnemyParty;
+            sp8 = gPlayerParty;
+            break;
+        }
+    }
+    else
+    {
+        sp4 = gPlayerParty;
+        sp8 = gEnemyParty;
+    }
+
+    r7 = 0;
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        u16 species = GetMonData(&sp4[i], MON_DATA_SPECIES2);
+        u16 hp = GetMonData(&sp4[i], MON_DATA_HP);
+        u32 status = GetMonData(&sp4[i], MON_DATA_STATUS);
+
+        if (species == SPECIES_NONE)
+            continue;
+        if (species != SPECIES_EGG && hp != 0 && status == 0)
+            r7 |= 1 << i * 2;
+
+        if (species == 0)
+            continue;
+        if (hp != 0 && (species == SPECIES_EGG || status != 0))
+            r7 |= 2 << i * 2;
+
+        if (species == 0)
+            continue;
+        if (species != SPECIES_EGG && hp == 0)
+            r7 |= 3 << i * 2;
+    }
+    gTasks[taskId].data[3] = r7;
+
+    r7 = 0;
+    for (i = 0; i < PARTY_SIZE; i++)
+    {
+        u16 species = GetMonData(&sp8[i], MON_DATA_SPECIES2);
+        u16 hp = GetMonData(&sp8[i], MON_DATA_HP);
+        u32 status = GetMonData(&sp8[i], MON_DATA_STATUS);
+
+        if (species == SPECIES_NONE)
+            continue;
+        if (species != SPECIES_EGG && hp != 0 && status == 0)
+            r7 |= 1 << i * 2;
+
+        if (species == SPECIES_NONE)
+            continue;
+        if (hp != 0 && (species == SPECIES_EGG || status != 0))
+            r7 |= 2 << i * 2;
+
+        if (species == SPECIES_NONE)
+            continue;
+        if (species != SPECIES_EGG && hp == 0)
+            r7 |= 3 << i * 2;
+    }
+    gTasks[taskId].data[4] = r7;
+}
+
+void sub_8038D64(void)
+{
+    s32 i;
+    u8 taskId;
+
+    SetHBlankCallback(NULL);
+    SetVBlankCallback(NULL);
+    gBattleTypeFlags &= ~(BATTLE_TYPE_20);
+
+    if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
+    {
+        SetMainCallback2(gMain.savedCallback);
+        FreeBattleResources();
+        FreeBattleSpritesData();
+        FreeMonSpritesGfx();
+    }
+    else
+    {
+        CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+        SetGpuReg(REG_OFFSET_MOSAIC, 0);
+        SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
+        SetGpuReg(REG_OFFSET_WIN0V, 0x5051);
+        SetGpuReg(REG_OFFSET_WININ, 0);
+        SetGpuReg(REG_OFFSET_WINOUT, 0);
+        gBattle_WIN0H = 0xF0;
+        gBattle_WIN0V = 0x5051;
+        dp12_8087EA4();
+
+        for (i = 0; i < 80; i++)
+        {
+            gUnknown_02038C28.unk0[i] = 0xF0;
+            gUnknown_02038C28.unk780[i] = 0xF0;
+        }
+        for (i = 80; i < 160; i++)
+        {
+            asm(""::"r"(i));  // Needed to stop the compiler from optimizing out the loop counter
+            gUnknown_02038C28.unk0[i] = 0xFF10;
+            gUnknown_02038C28.unk780[i] = 0xFF10;
+        }
+
+        ResetPaletteFade();
+
+        gBattle_BG0_X = 0;
+        gBattle_BG0_Y = 0;
+        gBattle_BG1_X = 0;
+        gBattle_BG1_Y = 0;
+        gBattle_BG2_X = 0;
+        gBattle_BG2_Y = 0;
+        gBattle_BG3_X = 0;
+        gBattle_BG3_Y = 0;
+
+        sub_80356D0();
+        LoadCompressedPalette(gBattleTextboxPalette, 0, 64);
+        ApplyPlayerChosenFrameToBattleMenu();
+        ResetSpriteData();
+        ResetTasks();
+        LoadBattleEntryBackground();
+        SetGpuReg(REG_OFFSET_WINOUT, 0x37);
+        FreeAllSpritePalettes();
+        gReservedSpritePaletteCount = 4;
+        SetVBlankCallback(VBlankCB_Battle);
+
+        taskId = CreateTask(sub_8035D74, 0);
+        gTasks[taskId].data[1] = 0x10E;
+        gTasks[taskId].data[2] = 0x5A;
+        gTasks[taskId].data[5] = 1;
+        sub_8038B94(taskId);
+        SetMainCallback2(sub_8038F14);
+        gBattleCommunication[MULTIUSE_STATE] = 0;
+    }
+}
+
+static void sub_8038F14(void)
+{
+    sub_8038F34();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+    RunTasks();
+}
+
+static void sub_8038F34(void)
+{
+    s32 i;
+
+    switch (gBattleCommunication[MULTIUSE_STATE])
+    {
+    case 0:
+        ShowBg(0);
+        ShowBg(1);
+        ShowBg(2);
+        gBattleCommunication[1] = 0xFF;
+        gBattleCommunication[MULTIUSE_STATE]++;
+        break;
+    case 1:
+        if (--gBattleCommunication[1] == 0)
+        {
+            BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 2:
+        if (!gPaletteFade.active)
+        {
+            u8 monsCount;
+
+            gMain.field_439_x4 = sub_8185FAC();
+
+            if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+                monsCount = 4;
+            else
+                monsCount = 2;
+
+            for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++);
+
+            if (!gSaveBlock2Ptr->field_CA9_b && i == monsCount)
+            {
+                if (FlagGet(FLAG_SYS_FRONTIER_PASS))
+                {
+                    FreeAllWindowBuffers();
+                    SetMainCallback2(sub_80392A8);
+                }
+                else if (!gMain.field_439_x4)
+                {
+                    SetMainCallback2(gMain.savedCallback);
+                    FreeBattleResources();
+                    FreeBattleSpritesData();
+                    FreeMonSpritesGfx();
+                }
+                else if (gReceivedRemoteLinkPlayers == 0)
+                {
+                    CreateTask(sub_80B3AF8, 5);
+                    gBattleCommunication[MULTIUSE_STATE]++;
+                }
+                else
+                {
+                    gBattleCommunication[MULTIUSE_STATE]++;
+                }
+            }
+            else
+            {
+                SetMainCallback2(gMain.savedCallback);
+                FreeBattleResources();
+                FreeBattleSpritesData();
+                FreeMonSpritesGfx();
+            }
+        }
+        break;
+    case 3:
+        CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+
+        for (i = 0; i < 2; i++)
+            LoadChosenBattleElement(i);
+
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        gBattleCommunication[MULTIUSE_STATE]++;
+        break;
+    case 4:
+        if (!gPaletteFade.active)
+            gBattleCommunication[MULTIUSE_STATE]++;
+        break;
+    case 5:
+        if (!FuncIsActiveTask(sub_80B3AF8))
+            gBattleCommunication[MULTIUSE_STATE]++;
+        break;
+    case 6:
+        if (sub_800A520() == TRUE)
+        {
+            sub_800ADF8();
+            BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 7:
+        if (!IsTextPrinterActive(0))
+        {
+            if (sub_800A520() == TRUE)
+                gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 8:
+        if (!gLinkVSyncDisabled)
+            sub_800AC34();
+        gBattleCommunication[MULTIUSE_STATE]++;
+        break;
+    case 9:
+        if (!gMain.field_439_x4 || gLinkVSyncDisabled || gReceivedRemoteLinkPlayers != 1)
+        {
+            gMain.field_439_x4 = 0;
+            SetMainCallback2(gMain.savedCallback);
+            FreeBattleResources();
+            FreeBattleSpritesData();
+            FreeMonSpritesGfx();
+        }
+        break;
+    }
+}
+
+u32 sub_80391E0(u8 arrayId, u8 caseId)
+{
+    u32 ret = 0;
+
+    switch (caseId)
+    {
+    case 0:
+        ret = gUnknown_0831AA08[arrayId].bg;
+        break;
+    case 1:
+        ret = gUnknown_0831AA08[arrayId].charBaseIndex;
+        break;
+    case 2:
+        ret = gUnknown_0831AA08[arrayId].mapBaseIndex;
+        break;
+    case 3:
+        ret = gUnknown_0831AA08[arrayId].screenSize;
+        break;
+    case 4:
+        ret = gUnknown_0831AA08[arrayId].paletteMode;
+        break;
+    case 5:
+        ret = gUnknown_0831AA08[arrayId].priority;
+        break;
+    case 6:
+        ret = gUnknown_0831AA08[arrayId].baseTile;
+        break;
+    }
+
+    return ret;
+}
+
+static void sub_80392A8(void)
+{
+    s32 i;
+
+    SetHBlankCallback(NULL);
+    SetVBlankCallback(NULL);
+    CpuFill32(0, (void*)(VRAM), VRAM_SIZE);
+    ResetPaletteFade();
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gBattle_BG1_X = 0;
+    gBattle_BG1_Y = 0;
+    gBattle_BG2_X = 0;
+    gBattle_BG2_Y = 0;
+    gBattle_BG3_X = 0;
+    gBattle_BG3_Y = 0;
+    sub_80356D0();
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+    ApplyPlayerChosenFrameToBattleMenu();
+
+    for (i = 0; i < 2; i++)
+        LoadChosenBattleElement(i);
+
+    ResetSpriteData();
+    ResetTasks();
+    FreeAllSpritePalettes();
+    gReservedSpritePaletteCount = 4;
+    SetVBlankCallback(VBlankCB_Battle);
+    SetMainCallback2(sub_803937C);
+    BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+    gBattleCommunication[MULTIUSE_STATE] = 0;
+}
+
+static void sub_803937C(void)
+{
+    sub_803939C();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+    RunTasks();
+}
+
+static void sub_803939C(void)
+{
+    switch (gBattleCommunication[MULTIUSE_STATE])
+    {
+    case 0:
+        ShowBg(0);
+        ShowBg(1);
+        ShowBg(2);
+        gBattleCommunication[MULTIUSE_STATE]++;
+        break;
+    case 1:
+        if (gMain.field_439_x4 && gReceivedRemoteLinkPlayers == 0)
+            CreateTask(sub_80B3AF8, 5);
+        gBattleCommunication[MULTIUSE_STATE]++;
+        break;
+    case 2:
+        if (!FuncIsActiveTask(sub_80B3AF8))
+            gBattleCommunication[MULTIUSE_STATE]++;
+        break;
+    case 3:
+        if (!gPaletteFade.active)
+        {
+            BattleHandleAddTextPrinter(gText_RecordBattleToPass, 0);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 4:
+        if (!IsTextPrinterActive(0))
+        {
+            HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
+            BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
+            gBattleCommunication[CURSOR_POSITION] = 1;
+            BattleCreateYesNoCursorAt(1);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 5:
+        if (gMain.newKeys & DPAD_UP)
+        {
+            if (gBattleCommunication[CURSOR_POSITION] != 0)
+            {
+                PlaySE(SE_SELECT);
+                BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
+                gBattleCommunication[CURSOR_POSITION] = 0;
+                BattleCreateYesNoCursorAt(0);
+            }
+        }
+        else if (gMain.newKeys & DPAD_DOWN)
+        {
+            if (gBattleCommunication[CURSOR_POSITION] == 0)
+            {
+                PlaySE(SE_SELECT);
+                BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
+                gBattleCommunication[CURSOR_POSITION] = 1;
+                BattleCreateYesNoCursorAt(1);
+            }
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            if (gBattleCommunication[CURSOR_POSITION] == 0)
+            {
+                HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
+                gBattleCommunication[1] = MoveRecordedBattleToSaveData();
+                gBattleCommunication[MULTIUSE_STATE] = 10;
+            }
+            else
+            {
+                gBattleCommunication[MULTIUSE_STATE]++;
+            }
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 6:
+        if (sub_800A520() == TRUE)
+        {
+            HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
+            if (gMain.field_439_x4)
+            {
+                sub_800ADF8();
+                BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
+            }
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 8:
+        if (--gBattleCommunication[1] == 0)
+        {
+            if (gMain.field_439_x4 && !gLinkVSyncDisabled)
+                sub_800AC34();
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 9:
+        if (!gMain.field_439_x4 || gLinkVSyncDisabled || gReceivedRemoteLinkPlayers != 1)
+        {
+            gMain.field_439_x4 = 0;
+            if (!gPaletteFade.active)
+            {
+                SetMainCallback2(gMain.savedCallback);
+                FreeBattleResources();
+                FreeBattleSpritesData();
+                FreeMonSpritesGfx();
+            }
+        }
+        break;
+    case 10:
+        if (gBattleCommunication[1] == 1)
+        {
+            PlaySE(SE_SAVE);
+            BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordedOnPass);
+            BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
+            gBattleCommunication[1] = 0x80;
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        else
+        {
+            BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordCouldntBeSaved);
+            BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
+            gBattleCommunication[1] = 0x80;
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 11:
+        if (sub_800A520() == TRUE && !IsTextPrinterActive(0) && --gBattleCommunication[1] == 0)
+        {
+            if (gMain.field_439_x4)
+            {
+                sub_800ADF8();
+                BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
+            }
+            gBattleCommunication[MULTIUSE_STATE]++;
+        }
+        break;
+    case 12:
+    case 7:
+        if (!IsTextPrinterActive(0))
+        {
+            if (gMain.field_439_x4)
+            {
+                if (sub_800A520() == TRUE)
+                {
+                    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                    gBattleCommunication[1] = 0x20;
+                    gBattleCommunication[MULTIUSE_STATE] = 8;
+                }
+
+            }
+            else
+            {
+                BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                gBattleCommunication[1] = 0x20;
+                gBattleCommunication[MULTIUSE_STATE] = 8;
+            }
+        }
+        break;
+    }
+}
+
+static void TryCorrectShedinjaLanguage(struct Pokemon *mon)
+{
+    u8 nickname[POKEMON_NAME_LENGTH + 1];
+    u8 language = LANGUAGE_JAPANESE;
+
+    if (GetMonData(mon, MON_DATA_SPECIES) == SPECIES_SHEDINJA
+     && GetMonData(mon, MON_DATA_LANGUAGE) != language)
+    {
+        GetMonData(mon, MON_DATA_NICKNAME, nickname);
+        if (StringCompareWithoutExtCtrlCodes(nickname, gText_ShedinjaJapaneseName) == 0)
+            SetMonData(mon, MON_DATA_LANGUAGE, &language);
+    }
+}
+
+u32 sub_80397C4(u32 setId, u32 tableId)
+{
+    return gUnknown_0831ABA0[setId][tableId].width * 8;
+}
+
+#define tBank               data[0]
+#define tSpeciesId          data[2]
+
+void oac_poke_opponent(struct Sprite *sprite)
+{
+    sprite->callback = sub_803980C;
+    StartSpriteAnimIfDifferent(sprite, 0);
+    BeginNormalPaletteFade(0x20000, 0, 10, 10, 0x2108);
+}
+
+static void sub_803980C(struct Sprite *sprite)
+{
+    if ((gUnknown_020243FC & 1) == 0)
+    {
+        sprite->pos2.x += 2;
+        if (sprite->pos2.x == 0)
+        {
+            sprite->callback = sub_8039838;
+        }
+    }
+}
+
+static void sub_8039838(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+    {
+        sub_8076918(sprite->tBank);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[sprite->tBank]);
+        sprite->callback = sub_8039894;
+        StartSpriteAnimIfDifferent(sprite, 0);
+        BeginNormalPaletteFade(0x20000, 0, 10, 0, 0x2108);
+    }
+}
+
+static void sub_8039894(struct Sprite *sprite)
+{
+    if (!gPaletteFade.active)
+    {
+        BattleAnimateFrontSprite(sprite, sprite->tSpeciesId, FALSE, 1);
+    }
+}
+
+void SpriteCallbackDummy_2(struct Sprite *sprite)
+{
+
+}
+
+static void sub_80398BC(struct Sprite *sprite) // unused?
+{
+    sprite->data[3] = 6;
+    sprite->data[4] = 1;
+    sprite->callback = sub_80398D0;
+}
+
+static void sub_80398D0(struct Sprite *sprite)
+{
+    sprite->data[4]--;
+    if (sprite->data[4] == 0)
+    {
+        sprite->data[4] = 8;
+        sprite->invisible ^= 1;
+        sprite->data[3]--;
+        if (sprite->data[3] == 0)
+        {
+            sprite->invisible = FALSE;
+            sprite->callback = SpriteCallbackDummy_2;
+            gUnknown_02022F88 = 0;
+        }
+    }
+}
+
+extern const struct MonCoords gMonFrontPicCoords[];
+extern const struct MonCoords gCastformFrontSpriteCoords[];
+
+void sub_8039934(struct Sprite *sprite)
+{
+    u8 bank = sprite->tBank;
+    u16 species;
+    u8 yOffset;
+
+    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != 0)
+        species = gBattleSpritesDataPtr->bankData[bank].transformSpecies;
+    else
+        species = sprite->tSpeciesId;
+
+    GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_PERSONALITY);  // Unused return value
+
+    if (species == SPECIES_UNOWN)
+    {
+        u32 personalityValue = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_PERSONALITY);
+        u16 unownForm = ((((personalityValue & 0x3000000) >> 18) | ((personalityValue & 0x30000) >> 12) | ((personalityValue & 0x300) >> 6) | (personalityValue & 3)) % 0x1C);
+        u16 unownSpecies;
+
+        if (unownForm == 0)
+            unownSpecies = SPECIES_UNOWN;  // Use the A Unown form
+        else
+            unownSpecies = NUM_SPECIES + unownForm;  // Use one of the other Unown letters
+
+        yOffset = gMonFrontPicCoords[unownSpecies].y_offset;
+    }
+    else if (species == SPECIES_CASTFORM)
+    {
+        yOffset = gCastformFrontSpriteCoords[gBattleMonForms[bank]].y_offset;
+    }
+    else if (species > NUM_SPECIES)
+    {
+        yOffset = gMonFrontPicCoords[SPECIES_NONE].y_offset;
+    }
+    else
+    {
+        yOffset = gMonFrontPicCoords[species].y_offset;
+    }
+
+    sprite->data[3] = 8 - yOffset / 8;
+    sprite->data[4] = 1;
+    sprite->callback = sub_8039A48;
+}
+
+static void sub_8039A48(struct Sprite *sprite)
+{
+    s32 i;
+
+    sprite->data[4]--;
+    if (sprite->data[4] == 0)
+    {
+        sprite->data[4] = 2;
+        sprite->pos2.y += 8;
+        sprite->data[3]--;
+        if (sprite->data[3] < 0)
+        {
+            FreeSpriteOamMatrix(sprite);
+            DestroySprite(sprite);
+        }
+        else
+        {
+            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBankPosition(sprite->tBank)] + (gBattleMonForms[sprite->tBank] << 11) + (sprite->data[3] << 8);
+
+            for (i = 0; i < 0x100; i++)
+                *(dst++) = 0;
+
+            StartSpriteAnim(sprite, gBattleMonForms[sprite->tBank]);
+        }
+    }
+}
+
+void sub_8039AD8(struct Sprite *sprite)
+{
+    sprite->data[3] = 8;
+    sprite->data[4] = sprite->invisible;
+    sprite->callback = sub_8039AF4;
+}
+
+static void sub_8039AF4(struct Sprite *sprite)
+{
+    sprite->data[3]--;
+    if (sprite->data[3] == 0)
+    {
+        sprite->invisible ^= 1;
+        sprite->data[3] = 8;
+    }
+}
+
+void sub_8039B2C(struct Sprite *sprite)
+{
+    sprite->invisible = sprite->data[4];
+    sprite->data[4] = FALSE;
+    sprite->callback = SpriteCallbackDummy_2;
+}
+
+void sub_8039B58(struct Sprite *sprite)
+{
+    if (sprite->affineAnimEnded)
+    {
+        if (!(gHitMarker & HITMARKER_NO_ANIMATIONS) || gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+        {
+            if (HasTwoFramesAnimation(sprite->tSpeciesId))
+                StartSpriteAnim(sprite, 1);
+        }
+        BattleAnimateFrontSprite(sprite, sprite->tSpeciesId, TRUE, 1);
+    }
+}
+
+void sub_8039BB4(struct Sprite *sprite)
+{
+    sprite->callback = oac_poke_ally_;
+}
+
+static void oac_poke_ally_(struct Sprite *sprite)
+{
+    if ((gUnknown_020243FC & 1) == 0)
+    {
+        sprite->pos2.x -= 2;
+        if (sprite->pos2.x == 0)
+        {
+            sprite->callback = SpriteCallbackDummy_3;
+            sprite->data[1] = 0;
+        }
+    }
+}
+
+void sub_80105DC(struct Sprite *sprite)
+{
+    sprite->callback = SpriteCallbackDummy_3;
+}
+
+static void SpriteCallbackDummy_3(struct Sprite *sprite)
+{
+}
+
+void sub_8039C00(struct Sprite *sprite)
+{
+    if (!(gUnknown_020243FC & 1))
+    {
+        sprite->pos2.x += sprite->data[1];
+        sprite->pos2.y += sprite->data[2];
+    }
+}
+
+void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d)
+{
+    u8 bounceHealthBoxSpriteId;
+    u8 spriteId2;
+
+    if (b)
+    {
+        if (gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2)
+            return;
+    }
+    else
+    {
+        if (gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4)
+            return;
+    }
+
+    bounceHealthBoxSpriteId = CreateInvisibleSpriteWithCallback(SpriteCB_HealthBoxBounce);
+    if (b == TRUE)
+    {
+        spriteId2 = gHealthBoxesIds[bank];
+        gBattleSpritesDataPtr->healthBoxesData[bank].field_2 = bounceHealthBoxSpriteId;
+        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2 = 1;
+        gSprites[bounceHealthBoxSpriteId].data[0] = 0x80;
+    }
+    else
+    {
+        spriteId2 = gBankSpriteIds[bank];
+        gBattleSpritesDataPtr->healthBoxesData[bank].field_3 = bounceHealthBoxSpriteId;
+        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4 = 1;
+        gSprites[bounceHealthBoxSpriteId].data[0] = 0xC0;
+    }
+    gSprites[bounceHealthBoxSpriteId].data[1] = c;
+    gSprites[bounceHealthBoxSpriteId].data[2] = d;
+    gSprites[bounceHealthBoxSpriteId].data[3] = spriteId2;
+    gSprites[bounceHealthBoxSpriteId].data[4] = b;
+    gSprites[spriteId2].pos2.x = 0;
+    gSprites[spriteId2].pos2.y = 0;
+}
+
+void dp11b_obj_free(u8 bank, bool8 b)
+{
+    u8 r4;
+
+    if (b == TRUE)
+    {
+        if (!gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2)
+            return;
+
+        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_2].data[3];
+        DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_2]);
+        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2 = 0;
+    }
+    else
+    {
+        if (!gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4)
+            return;
+
+        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_3].data[3];
+        DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_3]);
+        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4 = 0;
+    }
+    gSprites[r4].pos2.x = 0;
+    gSprites[r4].pos2.y = 0;
+}
+
+static void SpriteCB_HealthBoxBounce(struct Sprite *sprite)
+{
+    u8 spriteId = sprite->data[3];
+    s32 var;
+
+    if (sprite->data[4] == 1)
+        var = sprite->data[0];
+    else
+        var = sprite->data[0];
+
+    gSprites[spriteId].pos2.y = Sin(var, sprite->data[2]) + sprite->data[2];
+    sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF;
+}
+
+void sub_8039E44(struct Sprite *sprite)
+{
+    if (sprite->affineAnimEnded)
+        BattleAnimateBackSprite(sprite, sprite->tSpeciesId);
+}
+
+void sub_8039E60(struct Sprite *sprite)
+{
+    sub_8039E9C(sprite);
+    if (sprite->animEnded)
+        sprite->callback = SpriteCallbackDummy_3;
+}
+
+void sub_8039E84(struct Sprite *sprite)
+{
+    StartSpriteAnim(sprite, 1);
+    sprite->callback = sub_8039E60;
+}
+
+void sub_8039E9C(struct Sprite *sprite)
+{
+    if (sprite->animDelayCounter == 0)
+        sprite->centerToCornerVecX = gUnknown_0831ACE0[sprite->animCmdIndex];
+}
+
+void nullsub_20(void)
+{
+
+}
+
+void BeginBattleIntro(void)
+{
+    BattleStartClearSetData();
+    gBattleCommunication[1] = 0;
+    gBattleMainFunc = BattleIntroGetMonsData;
+}
+
+static void BattleMainCB1(void)
+{
+    gBattleMainFunc();
+
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        gBattleBankFunc[gActiveBank]();
+}
+
+static void BattleStartClearSetData(void)
+{
+    s32 i;
+    u32 j;
+    u8 *dataPtr;
+
+    TurnValuesCleanUp(FALSE);
+    SpecialStatusesClear();
+
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    {
+        gStatuses3[i] = 0;
+
+        dataPtr = (u8 *)&gDisableStructs[i];
+        for (j = 0; j < sizeof(struct DisableStruct); j++)
+            dataPtr[j] = 0;
+
+        gDisableStructs[i].isFirstTurn = 2;
+        gUnknown_02024284[i] = 0;
+        gLastMoves[i] = 0;
+        gLastLandedMoves[i] = 0;
+        gLastHitByType[i] = 0;
+        gLastResultingMoves[i] = 0;
+        gLastHitBy[i] = 0xFF;
+        gLockedMoves[i] = 0;
+        gLastPrintedMoves[i] = 0;
+        gBattleResources->flags->flags[i] = 0;
+        gPalaceSelectionBattleScripts[i] = 0;
+    }
+
+    for (i = 0; i < 2; i++)
+    {
+        gSideStatuses[i] = 0;
+
+        dataPtr = (u8 *)&gSideTimers[i];
+        for (j = 0; j < sizeof(struct SideTimer); j++)
+            dataPtr[j] = 0;
+    }
+
+    gBankAttacker = 0;
+    gBankDefender = 0;
+    gBattleWeather = 0;
+
+    dataPtr = (u8 *)&gWishFutureKnock;
+    for (i = 0; i < sizeof(struct WishFutureKnock); i++)
+        dataPtr[i] = 0;
+
+    gHitMarker = 0;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+    {
+        if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gSaveBlock2Ptr->optionsBattleSceneOff == TRUE)
+            gHitMarker |= HITMARKER_NO_ANIMATIONS;
+    }
+    else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && GetBattleStyleInRecordedBattle())
+        gHitMarker |= HITMARKER_NO_ANIMATIONS;
+
+    gBattleScripting.battleStyle = gSaveBlock2Ptr->optionsBattleStyle;
+
+    gMultiHitCounter = 0;
+    gBattleOutcome = 0;
+    gBattleExecBuffer = 0;
+    gPaydayMoney = 0;
+    gBattleResources->battleScriptsStack->size = 0;
+    gBattleResources->battleCallbackStack->size = 0;
+
+    for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
+        gBattleCommunication[i] = 0;
+
+    gPauseCounterBattle = 0;
+    gBattleMoveDamage = 0;
+    gUnknown_020243FC = 0;
+    gBattleScripting.animTurn = 0;
+    gBattleScripting.animTargetsHit = 0;
+    gLeveledUpInBattle = 0;
+    gAbsentBankFlags = 0;
+    gBattleStruct->runTries = 0;
+    gBattleStruct->field_79 = 0;
+    gBattleStruct->field_7A = 0;
+    *(&gBattleStruct->field_7C) = gBaseStats[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275;
+    gBattleStruct->field_7B = 3;
+    gBattleStruct->wildVictorySong = 0;
+    gBattleStruct->moneyMultiplier = 1;
+
+    for (i = 0; i < 8; i++)
+    {
+        *((u8 *)gBattleStruct->mirrorMoves + i) = 0;
+        *((u8 *)gBattleStruct->usedHeldItems + i) = 0;
+        *((u8 *)gBattleStruct->choicedMove + i) = 0;
+        *((u8 *)gBattleStruct->changedItems + i) = 0;
+        *(i + 0 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+        *(i + 1 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+        *(i + 2 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+        *(i + 3 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    }
+
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    {
+        *(gBattleStruct->AI_monToSwitchIntoId + i) = 6;
+    }
+
+    gBattleStruct->field_DF = 0;
+    gBattleStruct->field_92 = 0;
+
+    gRandomTurnNumber = Random();
+
+    dataPtr = (u8 *)(&gBattleResults);
+    for (i = 0; i < sizeof(struct BattleResults); i++)
+        dataPtr[i] = 0;
+
+    gBattleResults.unk5_6 = IsMonShiny(&gEnemyParty[0]);
+
+    gBattleStruct->field_2A0 = 0;
+    gBattleStruct->field_2A1 = 0;
+}
+
+void SwitchInClearSetData(void)
+{
+    struct DisableStruct disableStructCopy = gDisableStructs[gActiveBank];
+    s32 i;
+    u8 *ptr;
+
+    if (gBattleMoves[gCurrentMove].effect != EFFECT_BATON_PASS)
+    {
+        for (i = 0; i < BATTLE_STATS_NO; i++)
+            gBattleMons[gActiveBank].statStages[i] = 6;
+        for (i = 0; i < gBattleBanksCount; i++)
+        {
+            if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBank)
+                gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
+            if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].bankWithSureHit == gActiveBank)
+            {
+                gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
+                gDisableStructs[i].bankWithSureHit = 0;
+            }
+        }
+    }
+    if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
+    {
+        gBattleMons[gActiveBank].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED);
+        gStatuses3[gActiveBank] &= (STATUS3_LEECHSEED_BANK | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT);
+
+        for (i = 0; i < gBattleBanksCount; i++)
+        {
+            if (GetBankSide(gActiveBank) != GetBankSide(i)
+             && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
+             && (gDisableStructs[i].bankWithSureHit == gActiveBank))
+            {
+                gStatuses3[i] &= ~(STATUS3_ALWAYS_HITS);
+                gStatuses3[i] |= 0x10;
+            }
+        }
+    }
+    else
+    {
+        gBattleMons[gActiveBank].status2 = 0;
+        gStatuses3[gActiveBank] = 0;
+    }
+
+    for (i = 0; i < gBattleBanksCount; i++)
+    {
+        if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBank))
+            gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBank));
+        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && *(gBattleStruct->wrappedBy + i) == gActiveBank)
+            gBattleMons[i].status2 &= ~(STATUS2_WRAPPED);
+    }
+
+    gActionSelectionCursor[gActiveBank] = 0;
+    gMoveSelectionCursor[gActiveBank] = 0;
+
+    ptr = (u8 *)&gDisableStructs[gActiveBank];
+    for (i = 0; i < sizeof(struct DisableStruct); i++)
+        ptr[i] = 0;
+
+    if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
+    {
+        gDisableStructs[gActiveBank].substituteHP = disableStructCopy.substituteHP;
+        gDisableStructs[gActiveBank].bankWithSureHit = disableStructCopy.bankWithSureHit;
+        gDisableStructs[gActiveBank].perishSongTimer1 = disableStructCopy.perishSongTimer1;
+        gDisableStructs[gActiveBank].perishSongTimer2 = disableStructCopy.perishSongTimer2;
+        gDisableStructs[gActiveBank].bankPreventingEscape = disableStructCopy.bankPreventingEscape;
+    }
+
+    gMoveResultFlags = 0;
+    gDisableStructs[gActiveBank].isFirstTurn = 2;
+    gDisableStructs[gActiveBank].truantUnknownBit = disableStructCopy.truantUnknownBit;
+    gLastMoves[gActiveBank] = 0;
+    gLastLandedMoves[gActiveBank] = 0;
+    gLastHitByType[gActiveBank] = 0;
+    gLastResultingMoves[gActiveBank] = 0;
+    gLastPrintedMoves[gActiveBank] = 0;
+    gLastHitBy[gActiveBank] = 0xFF;
+
+    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 0) = 0;
+    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 1) = 0;
+    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+
+    gBattleStruct->field_92 &= ~(gBitTable[gActiveBank]);
+
+    for (i = 0; i < gBattleBanksCount; i++)
+    {
+        if (i != gActiveBank && GetBankSide(i) != GetBankSide(gActiveBank))
+        {
+            *(gBattleStruct->mirrorMoves + i * 2 + 0) = 0;
+            *(gBattleStruct->mirrorMoves + i * 2 + 1) = 0;
+        }
+        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    }
+
+    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 0) = 0;
+    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 1) = 0;
+
+    gBattleResources->flags->flags[gActiveBank] = 0;
+    gCurrentMove = 0;
+    gBattleStruct->field_DA = 0xFF;
+
+    ClearBankMoveHistory(gActiveBank);
+    ClearBankAbilityHistory(gActiveBank);
+}
+
+void FaintClearSetData(void)
+{
+    s32 i;
+    u8 *ptr;
+
+    for (i = 0; i < BATTLE_STATS_NO; i++)
+        gBattleMons[gActiveBank].statStages[i] = 6;
+
+    gBattleMons[gActiveBank].status2 = 0;
+    gStatuses3[gActiveBank] = 0;
+
+    for (i = 0; i < gBattleBanksCount; i++)
+    {
+        if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBank)
+            gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
+        if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBank))
+            gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBank));
+        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && *(gBattleStruct->wrappedBy + i) == gActiveBank)
+            gBattleMons[i].status2 &= ~(STATUS2_WRAPPED);
+    }
+
+    gActionSelectionCursor[gActiveBank] = 0;
+    gMoveSelectionCursor[gActiveBank] = 0;
+
+    ptr = (u8 *)&gDisableStructs[gActiveBank];
+    for (i = 0; i < sizeof(struct DisableStruct); i++)
+        ptr[i] = 0;
+
+    gProtectStructs[gActiveBank].protected = 0;
+    gProtectStructs[gActiveBank].endured = 0;
+    gProtectStructs[gActiveBank].onlyStruggle = 0;
+    gProtectStructs[gActiveBank].helpingHand = 0;
+    gProtectStructs[gActiveBank].bounceMove = 0;
+    gProtectStructs[gActiveBank].stealMove = 0;
+    gProtectStructs[gActiveBank].flag0Unknown = 0;
+    gProtectStructs[gActiveBank].prlzImmobility = 0;
+    gProtectStructs[gActiveBank].confusionSelfDmg = 0;
+    gProtectStructs[gActiveBank].targetNotAffected = 0;
+    gProtectStructs[gActiveBank].chargingTurn = 0;
+    gProtectStructs[gActiveBank].fleeFlag = 0;
+    gProtectStructs[gActiveBank].usedImprisionedMove = 0;
+    gProtectStructs[gActiveBank].loveImmobility = 0;
+    gProtectStructs[gActiveBank].usedDisabledMove = 0;
+    gProtectStructs[gActiveBank].usedTauntedMove = 0;
+    gProtectStructs[gActiveBank].flag2Unknown = 0;
+    gProtectStructs[gActiveBank].flinchImmobility = 0;
+    gProtectStructs[gActiveBank].notFirstStrike = 0;
+
+    gDisableStructs[gActiveBank].isFirstTurn = 2;
+
+    gLastMoves[gActiveBank] = 0;
+    gLastLandedMoves[gActiveBank] = 0;
+    gLastHitByType[gActiveBank] = 0;
+    gLastResultingMoves[gActiveBank] = 0;
+    gLastPrintedMoves[gActiveBank] = 0;
+    gLastHitBy[gActiveBank] = 0xFF;
+
+    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 0) = 0;
+    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 1) = 0;
+
+    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 0) = 0;
+    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 1) = 0;
+    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+
+    gBattleStruct->field_92 &= ~(gBitTable[gActiveBank]);
+
+    for (i = 0; i < gBattleBanksCount; i++)
+    {
+        if (i != gActiveBank && GetBankSide(i) != GetBankSide(gActiveBank))
+        {
+            *(gBattleStruct->mirrorMoves + i * 2 + 0) = 0;
+            *(gBattleStruct->mirrorMoves + i * 2 + 1) = 0;
+        }
+        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    }
+
+    gBattleResources->flags->flags[gActiveBank] = 0;
+
+    gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
+    gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
+
+    ClearBankMoveHistory(gActiveBank);
+    ClearBankAbilityHistory(gActiveBank);
+}
+
+static void BattleIntroGetMonsData(void)
+{
+    switch (gBattleCommunication[MULTIUSE_STATE])
+    {
+    case 0:
+        gActiveBank = gBattleCommunication[1];
+        EmitGetMonData(0, 0, 0);
+        MarkBufferBankForExecution(gActiveBank);
+        gBattleCommunication[MULTIUSE_STATE]++;
+        break;
+    case 1:
+        if (gBattleExecBuffer == 0)
+        {
+            gBattleCommunication[1]++;
+            if (gBattleCommunication[1] == gBattleBanksCount)
+                gBattleMainFunc = BattleIntroPrepareBackgroundSlide;
+            else
+                gBattleCommunication[MULTIUSE_STATE] = 0;
+        }
+        break;
+    }
+}
+
+static void BattleIntroPrepareBackgroundSlide(void)
+{
+    if (gBattleExecBuffer == 0)
+    {
+        gActiveBank = GetBankByPosition(0);
+        EmitIntroSlide(0, gBattleTerrain);
+        MarkBufferBankForExecution(gActiveBank);
+        gBattleMainFunc = BattleIntroDrawTrainersOrMonsSprites;
+        gBattleCommunication[0] = 0;
+        gBattleCommunication[1] = 0;
+    }
+}
+
+static void BattleIntroDrawTrainersOrMonsSprites(void)
+{
+    u8 *ptr;
+    s32 i;
+
+    if (gBattleExecBuffer)
+        return;
+
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    {
+        if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI)
+         && GetBankSide(gActiveBank) == SIDE_PLAYER)
+        {
+            ptr = (u8 *)&gBattleMons[gActiveBank];
+            for (i = 0; i < sizeof(struct BattlePokemon); i++)
+                ptr[i] = 0;
+        }
+        else
+        {
+            u16* hpOnSwitchout;
+
+            ptr = (u8 *)&gBattleMons[gActiveBank];
+            for (i = 0; i < sizeof(struct BattlePokemon); i++)
+                ptr[i] = gBattleBufferB[gActiveBank][4 + i];
+
+            gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
+            gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
+            gBattleMons[gActiveBank].ability = GetAbilityBySpecies(gBattleMons[gActiveBank].species, gBattleMons[gActiveBank].altAbility);
+            hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBankSide(gActiveBank)];
+            *hpOnSwitchout = gBattleMons[gActiveBank].hp;
+            for (i = 0; i < BATTLE_STATS_NO; i++)
+                gBattleMons[gActiveBank].statStages[i] = 6;
+            gBattleMons[gActiveBank].status2 = 0;
+        }
+
+        if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_LEFT)
+        {
+            EmitDrawTrainerPic(0);
+            MarkBufferBankForExecution(gActiveBank);
+        }
+
+        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+        {
+            if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_LEFT)
+            {
+                EmitDrawTrainerPic(0);
+                MarkBufferBankForExecution(gActiveBank);
+            }
+            if (GetBankSide(gActiveBank) == SIDE_OPPONENT
+             && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
+                                      | BATTLE_TYPE_FRONTIER
+                                      | BATTLE_TYPE_LINK
+                                      | BATTLE_TYPE_x2000000
+                                      | BATTLE_TYPE_x4000000)))
+            {
+                HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), FLAG_SET_SEEN, gBattleMons[gActiveBank].personality);
+            }
+        }
+        else
+        {
+            if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
+            {
+                if (!(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
+                                      | BATTLE_TYPE_FRONTIER
+                                      | BATTLE_TYPE_LINK
+                                      | BATTLE_TYPE_x2000000
+                                      | BATTLE_TYPE_x4000000)))
+                {
+                    HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), FLAG_SET_SEEN, gBattleMons[gActiveBank].personality);
+                }
+                EmitLoadMonSprite(0);
+                MarkBufferBankForExecution(gActiveBank);
+                gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES, NULL);
+            }
+        }
+
+        if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
+        {
+            if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_RIGHT
+             || GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
+            {
+                EmitDrawTrainerPic(0);
+                MarkBufferBankForExecution(gActiveBank);
+            }
+        }
+
+        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
+        {
+            EmitDrawTrainerPic(0);
+            MarkBufferBankForExecution(gActiveBank);
+        }
+
+        if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
+            sub_81A56B4();
+    }
+    gBattleMainFunc = BattleIntroDrawPartySummaryScreens;
+}
+
+static void BattleIntroDrawPartySummaryScreens(void)
+{
+    s32 i;
+    struct HpAndStatus hpStatus[6];
+
+    if (gBattleExecBuffer)
+        return;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+    {
+        for (i = 0; i < PARTY_SIZE; i++)
+        {
+            if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
+             || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
+            {
+                hpStatus[i].hp = 0xFFFF;
+                hpStatus[i].status = 0;
+            }
+            else
+            {
+                hpStatus[i].hp = GetMonData(&gEnemyParty[i], MON_DATA_HP);
+                hpStatus[i].status = GetMonData(&gEnemyParty[i], MON_DATA_STATUS);
+            }
+        }
+        gActiveBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+        EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
+        MarkBufferBankForExecution(gActiveBank);
+
+        for (i = 0; i < PARTY_SIZE; i++)
+        {
+            if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
+             || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
+            {
+                hpStatus[i].hp = 0xFFFF;
+                hpStatus[i].status = 0;
+            }
+            else
+            {
+                hpStatus[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
+                hpStatus[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
+            }
+        }
+        gActiveBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+        EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
+        MarkBufferBankForExecution(gActiveBank);
+
+        gBattleMainFunc = BattleIntroPrintTrainerWantsToBattle;
+    }
+    else
+    {
+        // The struct gets set here, but nothing is ever done with it since
+        // wild battles don't show the party summary.
+        // Still, there's no point in having dead code.
+
+        for (i = 0; i < 6; i++)
+        {
+            if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
+             || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
+            {
+                hpStatus[i].hp = 0xFFFF;
+                hpStatus[i].status = 0;
+            }
+            else
+            {
+                hpStatus[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
+                hpStatus[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
+            }
+        }
+
+        gBattleMainFunc = BattleIntroPrintWildMonAttacked;
+    }
+
+}
+
+static void BattleIntroPrintTrainerWantsToBattle(void)
+{
+    if (gBattleExecBuffer == 0)
+    {
+        gActiveBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+        PrepareStringBattle(STRINGID_INTROMSG, gActiveBank);
+        gBattleMainFunc = BattleIntroPrintOpponentSendsOut;
+    }
+}
+
+static void BattleIntroPrintWildMonAttacked(void)
+{
+    if (gBattleExecBuffer == 0)
+    {
+        gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
+        PrepareStringBattle(STRINGID_INTROMSG, 0);
+    }
+}
+
+static void BattleIntroPrintOpponentSendsOut(void)
+{
+    u32 identity;
+
+    if (gBattleExecBuffer)
+        return;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+        identity = B_POSITION_OPPONENT_LEFT;
+    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+            identity = B_POSITION_OPPONENT_LEFT;
+        else
+            identity = B_POSITION_PLAYER_LEFT;
+    }
+    else
+        identity = B_POSITION_OPPONENT_LEFT;
+
+    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(identity));
+    gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
+}
+
+static void BattleIntroOpponent2SendsOutMonAnimation(void)
+{
+    u32 identity;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+        identity = B_POSITION_OPPONENT_RIGHT;
+    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+            identity = B_POSITION_OPPONENT_RIGHT;
+        else
+            identity = B_POSITION_PLAYER_RIGHT;
+    }
+    else
+        identity = B_POSITION_OPPONENT_RIGHT;
+
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    {
+        if (GetBankPosition(gActiveBank) == identity)
+        {
+            EmitIntroTrainerBallThrow(0);
+            MarkBufferBankForExecution(gActiveBank);
+        }
+    }
+
+    gBattleMainFunc = BattleIntroRecordMonsToDex;
+}
+
+#ifdef NONMATCHING
+static void BattleIntroOpponent1SendsOutMonAnimation(void)
+{
+    u32 identity;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+        identity = B_POSITION_OPPONENT_LEFT;
+    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+            identity = B_POSITION_OPPONENT_LEFT;
+        else
+            identity = B_POSITION_PLAYER_LEFT;
+    }
+    else
+        identity = B_POSITION_OPPONENT_LEFT;
+
+    if (gBattleExecBuffer)
+        return;
+
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    {
+        if (GetBankPosition(gActiveBank) == identity)
+        {
+            EmitIntroTrainerBallThrow(0);
+            MarkBufferBankForExecution(gActiveBank);
+            if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS))
+            {
+                gBattleMainFunc = BattleIntroOpponent2SendsOutMonAnimation;
+                return;
+            }
+        }
+    }
+
+    gBattleMainFunc = BattleIntroRecordMonsToDex;
+}
+
+#else
+__attribute__((naked))
+static void BattleIntroOpponent1SendsOutMonAnimation(void)
+{
+    asm(".syntax unified\n\
+        	push {r4-r6,lr}\n\
+	ldr r0, =gBattleTypeFlags\n\
+	ldr r2, [r0]\n\
+	movs r0, 0x80\n\
+	lsls r0, 17\n\
+	ands r0, r2\n\
+	cmp r0, 0\n\
+	beq _0803B298\n\
+	movs r0, 0x80\n\
+	lsls r0, 18\n\
+	ands r0, r2\n\
+	cmp r0, 0\n\
+	beq _0803B298\n\
+	movs r1, 0x80\n\
+	lsls r1, 24\n\
+	ands r1, r2\n\
+	negs r0, r1\n\
+	orrs r0, r1\n\
+	lsrs r5, r0, 31\n\
+	b _0803B29A\n\
+	.pool\n\
+_0803B288:\n\
+	ldr r1, =gBattleMainFunc\n\
+	ldr r0, =BattleIntroOpponent2SendsOutMonAnimation\n\
+	b _0803B2F0\n\
+	.pool\n\
+_0803B298:\n\
+	movs r5, 0x1\n\
+_0803B29A:\n\
+	ldr r0, =gBattleExecBuffer\n\
+	ldr r2, [r0]\n\
+	cmp r2, 0\n\
+	bne _0803B2F2\n\
+	ldr r0, =gActiveBank\n\
+	strb r2, [r0]\n\
+	ldr r1, =gBattleBanksCount\n\
+	adds r4, r0, 0\n\
+	ldrb r1, [r1]\n\
+	cmp r2, r1\n\
+	bcs _0803B2EC\n\
+	adds r6, r4, 0\n\
+_0803B2B2:\n\
+	ldrb r0, [r4]\n\
+	bl GetBankPosition\n\
+	lsls r0, 24\n\
+	lsrs r0, 24\n\
+	cmp r0, r5\n\
+	bne _0803B2D8\n\
+	movs r0, 0\n\
+	bl EmitIntroTrainerBallThrow\n\
+	ldrb r0, [r4]\n\
+	bl MarkBufferBankForExecution\n\
+	ldr r0, =gBattleTypeFlags\n\
+	ldr r0, [r0]\n\
+	ldr r1, =0x00008040\n\
+	ands r0, r1\n\
+	cmp r0, 0\n\
+	bne _0803B288\n\
+_0803B2D8:\n\
+	ldrb r0, [r6]\n\
+	adds r0, 0x1\n\
+	strb r0, [r6]\n\
+	ldr r1, =gBattleBanksCount\n\
+	lsls r0, 24\n\
+	lsrs r0, 24\n\
+	ldr r4, =gActiveBank\n\
+	ldrb r1, [r1]\n\
+	cmp r0, r1\n\
+	bcc _0803B2B2\n\
+_0803B2EC:\n\
+	ldr r1, =gBattleMainFunc\n\
+	ldr r0, =BattleIntroRecordMonsToDex\n\
+_0803B2F0:\n\
+	str r0, [r1]\n\
+_0803B2F2:\n\
+	pop {r4-r6}\n\
+	pop {r0}\n\
+	bx r0\n\
+	.pool\n\
+        .syntax divided");
+}
+
+#endif // NONMATCHING
+
+static void BattleIntroRecordMonsToDex(void)
+{
+    if (gBattleExecBuffer == 0)
+    {
+        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        {
+            if (GetBankSide(gActiveBank) == SIDE_OPPONENT
+             && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
+                                      | BATTLE_TYPE_FRONTIER
+                                      | BATTLE_TYPE_LINK
+                                      | BATTLE_TYPE_x2000000
+                                      | BATTLE_TYPE_x4000000)))
+            {
+                HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), FLAG_SET_SEEN, gBattleMons[gActiveBank].personality);
+            }
+        }
+        gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
+    }
+}
+
+void sub_803B3AC(void) // unused
+{
+    if (gBattleExecBuffer == 0)
+        gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
+}
+
+static void BattleIntroPrintPlayerSendsOut(void)
+{
+    if (gBattleExecBuffer == 0)
+    {
+        u8 identity;
+
+        if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+            identity = B_POSITION_PLAYER_LEFT;
+        else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+        {
+            if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+                identity = B_POSITION_PLAYER_LEFT;
+            else
+                identity = B_POSITION_OPPONENT_LEFT;
+        }
+        else
+            identity = B_POSITION_PLAYER_LEFT;
+
+        if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
+            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(identity));
+
+        gBattleMainFunc = BattleIntroPlayer1SendsOutMonAnimation;
+    }
+}
+
+static void BattleIntroPlayer2SendsOutMonAnimation(void)
+{
+    u32 identity;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+        identity = B_POSITION_PLAYER_RIGHT;
+    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+            identity = B_POSITION_PLAYER_RIGHT;
+        else
+            identity = B_POSITION_OPPONENT_RIGHT;
+    }
+    else
+        identity = B_POSITION_PLAYER_RIGHT;
+
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    {
+        if (GetBankPosition(gActiveBank) == identity)
+        {
+            EmitIntroTrainerBallThrow(0);
+            MarkBufferBankForExecution(gActiveBank);
+        }
+    }
+
+    gBattleStruct->switchInAbilitiesCounter = 0;
+    gBattleStruct->switchInItemsCounter = 0;
+    gBattleStruct->overworldWeatherDone = FALSE;
+
+    gBattleMainFunc = TryDoEventsBeforeFirstTurn;
+}
+
+static void BattleIntroPlayer1SendsOutMonAnimation(void)
+{
+    u32 identity;
+
+    if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
+        identity = B_POSITION_PLAYER_LEFT;
+    else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
+            identity = B_POSITION_PLAYER_LEFT;
+        else
+            identity = B_POSITION_OPPONENT_LEFT;
+    }
+    else
+        identity = B_POSITION_PLAYER_LEFT;
+
+    if (gBattleExecBuffer)
+        return;
+
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    {
+        if (GetBankPosition(gActiveBank) == identity)
+        {
+            EmitIntroTrainerBallThrow(0);
+            MarkBufferBankForExecution(gActiveBank);
+            if (gBattleTypeFlags & (BATTLE_TYPE_MULTI))
+            {
+                gBattleMainFunc = BattleIntroPlayer2SendsOutMonAnimation;
+                return;
+            }
+        }
+    }
+
+    gBattleStruct->switchInAbilitiesCounter = 0;
+    gBattleStruct->switchInItemsCounter = 0;
+    gBattleStruct->overworldWeatherDone = FALSE;
+
+    gBattleMainFunc = TryDoEventsBeforeFirstTurn;
+}
+
+void sub_803B598(void) // unused
+{
+    if (gBattleExecBuffer == 0)
+    {
+        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        {
+            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+            {
+                EmitSwitchInAnim(0, gBattlePartyID[gActiveBank], FALSE);
+                MarkBufferBankForExecution(gActiveBank);
+            }
+        }
+
+        gBattleStruct->switchInAbilitiesCounter = 0;
+        gBattleStruct->switchInItemsCounter = 0;
+        gBattleStruct->overworldWeatherDone = FALSE;
+
+        gBattleMainFunc = TryDoEventsBeforeFirstTurn;
+    }
+}
+
+static void TryDoEventsBeforeFirstTurn(void)
+{
+    s32 i;
+    s32 j;
+    u8 effect = 0;
+
+    if (gBattleExecBuffer)
+        return;
+
+    if (gBattleStruct->switchInAbilitiesCounter == 0)
+    {
+        for (i = 0; i < gBattleBanksCount; i++)
+            gBanksByTurnOrder[i] = i;
+        for (i = 0; i < gBattleBanksCount - 1; i++)
+        {
+            for (j = i + 1; j < gBattleBanksCount; j++)
+            {
+                if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], TRUE) != 0)
+                    SwapTurnOrder(i, j);
+            }
+        }
+    }
+    if (!gBattleStruct->overworldWeatherDone
+        && AbilityBattleEffects(0, 0, 0, ABILITYEFFECT_SWITCH_IN_WEATHER, 0) != 0)
+    {
+        gBattleStruct->overworldWeatherDone = TRUE;
+        return;
+    }
+    // check all switch in abilities happening from the fastest mon to slowest
+    while (gBattleStruct->switchInAbilitiesCounter < gBattleBanksCount)
+    {
+        if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gBanksByTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0)
+            effect++;
+
+        gBattleStruct->switchInAbilitiesCounter++;
+
+        if (effect)
+            return;
+    }
+    if (AbilityBattleEffects(ABILITYEFFECT_INTIMIDATE1, 0, 0, 0, 0) != 0)
+        return;
+    if (AbilityBattleEffects(ABILITYEFFECT_TRACE, 0, 0, 0, 0) != 0)
+        return;
+    // check all switch in items having effect from the fastest mon to slowest
+    while (gBattleStruct->switchInItemsCounter < gBattleBanksCount)
+    {
+        if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBanksByTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0)
+            effect++;
+
+        gBattleStruct->switchInItemsCounter++;
+
+        if (effect)
+            return;
+    }
+    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    {
+        *(gBattleStruct->monToSwitchIntoId + i) = 6;
+        gActionForBanks[i] = ACTION_INIT_VALUE;
+        gChosenMovesByBanks[i] = MOVE_NONE;
+    }
+    TurnValuesCleanUp(FALSE);
+    SpecialStatusesClear();
+    *(&gBattleStruct->field_91) = gAbsentBankFlags;
+    BattleHandleAddTextPrinter(gText_EmptyString3, 0);
+    gBattleMainFunc = HandleTurnActionSelectionState;
+    ResetSentPokesToOpponentValue();
+
+    for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
+        gBattleCommunication[i] = 0;
+
+    for (i = 0; i < gBattleBanksCount; i++)
+        gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
+
+    *(&gBattleStruct->turnEffectsTracker) = 0;
+    *(&gBattleStruct->turnEffectsBank) = 0;
+    *(&gBattleStruct->wishPerishSongState) = 0;
+    *(&gBattleStruct->wishPerishSongBank) = 0;
+    gBattleScripting.atk49_state = 0;
+    gBattleStruct->faintedActionsState = 0;
+    gBattleStruct->turncountersTracker = 0;
+    gMoveResultFlags = 0;
+
+    gRandomTurnNumber = Random();
+
+    if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
+    {
+        StopCryAndClearCrySongs();
+        BattleScriptExecute(BattleScript_82DB8BE);
+    }
+}
+
+static void HandleEndTurn_ContinueBattle(void)
+{
+    s32 i;
+
+    if (gBattleExecBuffer == 0)
+    {
+        gBattleMainFunc = BattleTurnPassed;
+        for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
+            gBattleCommunication[i] = 0;
+        for (i = 0; i < gBattleBanksCount; i++)
+        {
+            gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
+            if ((gBattleMons[i].status1 & STATUS1_SLEEP) && (gBattleMons[i].status2 & STATUS2_MULTIPLETURNS))
+                CancelMultiTurnMoves(i);
+        }
+        gBattleStruct->turnEffectsTracker = 0;
+        gBattleStruct->turnEffectsBank = 0;
+        gBattleStruct->wishPerishSongState = 0;
+        gBattleStruct->wishPerishSongBank = 0;
+        gBattleStruct->turncountersTracker = 0;
+        gMoveResultFlags = 0;
+    }
+}
+
+void BattleTurnPassed(void)
+{
+    s32 i;
+
+    TurnValuesCleanUp(TRUE);
+    if (gBattleOutcome == 0)
+    {
+        if (UpdateTurnCounters() != 0)
+            return;
+        if (TurnBasedEffects() != 0)
+            return;
+    }
+    if (HandleFaintedMonActions() != 0)
+        return;
+    gBattleStruct->faintedActionsState = 0;
+    if (HandleWishPerishSongOnTurnEnd() != 0)
+        return;
+
+    TurnValuesCleanUp(FALSE);
+    gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
+    gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
+    gHitMarker &= ~(HITMARKER_x400000);
+    gHitMarker &= ~(HITMARKER_x100000);
+    gBattleScripting.animTurn = 0;
+    gBattleScripting.animTargetsHit = 0;
+    gBattleScripting.atk49_state = 0;
+    gBattleMoveDamage = 0;
+    gMoveResultFlags = 0;
+
+    for (i = 0; i < 5; i++)
+        gBattleCommunication[i] = 0;
+
+    if (gBattleOutcome != 0)
+    {
+        gCurrentActionFuncId = 12;
+        gBattleMainFunc = RunTurnActionsFunctions;
+        return;
+    }
+
+    if (gBattleResults.battleTurnCounter < 0xFF)
+    {
+        gBattleResults.battleTurnCounter++;
+        gBattleStruct->field_DA++;
+    }
+
+    for (i = 0; i < gBattleBanksCount; i++)
+    {
+        gActionForBanks[i] = ACTION_INIT_VALUE;
+        gChosenMovesByBanks[i] = MOVE_NONE;
+    }
+
+    for (i = 0; i < 4; i++)
+        *(gBattleStruct->monToSwitchIntoId + i) = 6;
+
+    *(&gBattleStruct->field_91) = gAbsentBankFlags;
+    BattleHandleAddTextPrinter(gText_EmptyString3, 0);
+    gBattleMainFunc = HandleTurnActionSelectionState;
+    gRandomTurnNumber = Random();
+
+    if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
+        BattleScriptExecute(BattleScript_82DB881);
+    else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->field_DA == 0)
+        BattleScriptExecute(BattleScript_82DB8BE);
+}
+
+u8 IsRunningFromBattleImpossible(void)
+{
+    u8 holdEffect;
+    u8 side;
+    s32 i;
+
+    if (gBattleMons[gActiveBank].item == ITEM_ENIGMA_BERRY)
+        holdEffect = gEnigmaBerries[gActiveBank].holdEffect;
+    else
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBank].item);
+
+    gStringBank = gActiveBank;
+
+    if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
+        return 0;
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        return 0;
+    if (gBattleMons[gActiveBank].ability == ABILITY_RUN_AWAY)
+        return 0;
+
+    side = GetBankSide(gActiveBank);
+
+    for (i = 0; i < gBattleBanksCount; i++)
+    {
+        if (side != GetBankSide(i)
+         && gBattleMons[i].ability == ABILITY_SHADOW_TAG)
+        {
+            gBattleScripting.bank = i;
+            gLastUsedAbility = gBattleMons[i].ability;
+            gBattleCommunication[MULTISTRING_CHOOSER] = 2;
+            return 2;
+        }
+        if (side != GetBankSide(i)
+         && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE
+         && gBattleMons[gActiveBank].type1 != TYPE_FLYING
+         && gBattleMons[gActiveBank].type2 != TYPE_FLYING
+         && gBattleMons[i].ability == ABILITY_ARENA_TRAP)
+        {
+            gBattleScripting.bank = i;
+            gLastUsedAbility = gBattleMons[i].ability;
+            gBattleCommunication[MULTISTRING_CHOOSER] = 2;
+            return 2;
+        }
+    }
+    i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK, gActiveBank, ABILITY_MAGNET_PULL, 0, 0);
+    if (i != 0 && (gBattleMons[gActiveBank].type1 == TYPE_STEEL || gBattleMons[gActiveBank].type2 == TYPE_STEEL))
+    {
+        gBattleScripting.bank = i - 1;
+        gLastUsedAbility = gBattleMons[i - 1].ability;
+        gBattleCommunication[MULTISTRING_CHOOSER] = 2;
+        return 2;
+    }
+    if ((gBattleMons[gActiveBank].status2 & (STATUS2_ESCAPE_PREVENTION | STATUS2_WRAPPED))
+        || (gStatuses3[gActiveBank] & STATUS3_ROOTED))
+    {
+        gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+        return 1;
+    }
+    if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE)
+    {
+        gBattleCommunication[MULTISTRING_CHOOSER] = 1;
+        return 1;
+    }
+    return 0;
+}
+
+void sub_803BDA0(u8 bank)
+{
+    s32 i;
+    u8 r4;
+    u8 r1;
+
+    // gBattleStruct->field_60[bank][i]
+
+    for (i = 0; i < 3; i++)
+        gUnknown_0203CF00[i] = *(bank * 3 + i + (u8*)(gBattleStruct->field_60));
+
+    r4 = pokemon_order_func(gBattlePartyID[bank]);
+    r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + bank));
+    sub_81B8FB0(r4, r1);
+
+    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
+    {
+        for (i = 0; i < 3; i++)
+        {
+            *(bank * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+            *((bank ^ BIT_MON) * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+        }
+    }
+    else
+    {
+        for (i = 0; i < 3; i++)
+        {
+            *(bank * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+        }
+    }
+}
+
+enum
+{
+    STATE_TURN_START_RECORD,
+    STATE_BEFORE_ACTION_CHOSEN,
+    STATE_WAIT_ACTION_CHOSEN,
+    STATE_WAIT_ACTION_CASE_CHOSEN,
+    STATE_WAIT_ACTION_CONFIRMED_STANDBY,
+    STATE_WAIT_ACTION_CONFIRMED,
+    STATE_SELECTION_SCRIPT,
+    STATE_WAIT_SET_BEFORE_ACTION,
+    STATE_SELECTION_SCRIPT_MAY_RUN
+};
+
+static void HandleTurnActionSelectionState(void)
+{
+    s32 i;
+
+    gBattleCommunication[ACTIONS_CONFIRMED_COUNT] = 0;
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    {
+        u8 identity = GetBankPosition(gActiveBank);
+        switch (gBattleCommunication[gActiveBank])
+        {
+        case STATE_TURN_START_RECORD: // recorded battle related on start of every turn
+            RecordedBattle_CopyBankMoves();
+            gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
+            break;
+        case STATE_BEFORE_ACTION_CHOSEN: // choose an action
+            *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
+            if (gBattleTypeFlags & BATTLE_TYPE_MULTI
+                || !(identity & BIT_MON)
+                || gBattleStruct->field_91 & gBitTable[GetBankByPosition(identity ^ BIT_MON)]
+                || gBattleCommunication[GetBankByPosition(identity ^ BIT_MON)] == 5)
+            {
+                if (gBattleStruct->field_91 & gBitTable[gActiveBank])
+                {
+                    gActionForBanks[gActiveBank] = ACTION_NOTHING_FAINTED;
+                    if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
+                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED;
+                    else
+                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
+                }
+                else
+                {
+                    if (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS
+                        || gBattleMons[gActiveBank].status2 & STATUS2_RECHARGE)
+                    {
+                        gActionForBanks[gActiveBank] = ACTION_USE_MOVE;
+                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
+                    }
+                    else
+                    {
+                        EmitChooseAction(0, gActionForBanks[0], gBattleBufferB[0][1] | (gBattleBufferB[0][2] << 8));
+                        MarkBufferBankForExecution(gActiveBank);
+                        gBattleCommunication[gActiveBank]++;
+                    }
+                }
+            }
+            break;
+        case STATE_WAIT_ACTION_CHOSEN: // try to perform an action
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            {
+                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]);
+                gActionForBanks[gActiveBank] = gBattleBufferB[gActiveBank][1];
+
+                switch (gBattleBufferB[gActiveBank][1])
+                {
+                case ACTION_USE_MOVE:
+                    if (AreAllMovesUnusable())
+                    {
+                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
+                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
+                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
+                        *(gBattleStruct->moveTarget + gActiveBank) = gBattleBufferB[gActiveBank][3];
+                        return;
+                    }
+                    else if (gDisableStructs[gActiveBank].encoredMove != 0)
+                    {
+                        gChosenMovesByBanks[gActiveBank] = gDisableStructs[gActiveBank].encoredMove;
+                        *(gBattleStruct->chosenMovePositions + gActiveBank) = gDisableStructs[gActiveBank].encoredMovePos;
+                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
+                        return;
+                    }
+                    else
+                    {
+                        struct ChooseMoveStruct moveInfo;
+
+                        moveInfo.species = gBattleMons[gActiveBank].species;
+                        moveInfo.monType1 = gBattleMons[gActiveBank].type1;
+                        moveInfo.monType2 = gBattleMons[gActiveBank].type2;
+
+                        for (i = 0; i < 4; i++)
+                        {
+                            moveInfo.moves[i] = gBattleMons[gActiveBank].moves[i];
+                            moveInfo.currentPp[i] = gBattleMons[gActiveBank].pp[i];
+                            moveInfo.maxPp[i] = CalculatePPWithBonus(
+                                                            gBattleMons[gActiveBank].moves[i],
+                                                            gBattleMons[gActiveBank].ppBonuses,
+                                                            i);
+                        }
+
+                        EmitChooseMove(0, (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) != 0, FALSE, &moveInfo);
+                        MarkBufferBankForExecution(gActiveBank);
+                    }
+                    break;
+                case ACTION_USE_ITEM:
+                    if (gBattleTypeFlags & (BATTLE_TYPE_LINK
+                                            | BATTLE_TYPE_FRONTIER_NO_PYRAMID
+                                            | BATTLE_TYPE_EREADER_TRAINER
+                                            | BATTLE_TYPE_x2000000))
+                    {
+                        RecordedBattle_ClearBankAction(gActiveBank, 1);
+                        gSelectionBattleScripts[gActiveBank] = BattleScript_ActionSelectionItemsCantBeUsed;
+                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
+                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
+                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
+                        return;
+                    }
+                    else
+                    {
+                        EmitChooseItem(0, gBattleStruct->field_60[gActiveBank]);
+                        MarkBufferBankForExecution(gActiveBank);
+                    }
+                    break;
+                case ACTION_SWITCH:
+                    *(gBattleStruct->field_58 + gActiveBank) = gBattlePartyID[gActiveBank];
+                    if (gBattleMons[gActiveBank].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)
+                        || gBattleTypeFlags & BATTLE_TYPE_ARENA
+                        || gStatuses3[gActiveBank] & STATUS3_ROOTED)
+                    {
+                        EmitChoosePokemon(0, 2, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                    }
+                    else if ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBank, ABILITY_SHADOW_TAG, 0, 0))
+                             || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBank, ABILITY_ARENA_TRAP, 0, 0))
+                                 && gBattleMons[gActiveBank].type1 != TYPE_FLYING
+                                 && gBattleMons[gActiveBank].type2 != TYPE_FLYING
+                                 && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE)
+                             || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK, gActiveBank, ABILITY_MAGNET_PULL, 0, 0))
+                                 && (gBattleMons[gActiveBank].type1 == TYPE_STEEL
+                                     || gBattleMons[gActiveBank].type2 == TYPE_STEEL)))
+                    {
+                        EmitChoosePokemon(0, ((i - 1) << 4) | 4, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBank]);
+                    }
+                    else
+                    {
+                        if (gActiveBank == 2 && gActionForBanks[0] == ACTION_SWITCH)
+                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                        else if (gActiveBank == 3 && gActionForBanks[1] == ACTION_SWITCH)
+                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                        else
+                            EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                    }
+                    MarkBufferBankForExecution(gActiveBank);
+                    break;
+                case ACTION_SAFARI_ZONE_BALL:
+                    if (IsPlayerPartyAndPokemonStorageFull())
+                    {
+                        gSelectionBattleScripts[gActiveBank] = BattleScript_PrintFullBox;
+                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
+                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
+                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
+                        return;
+                    }
+                    break;
+                case ACTION_POKEBLOCK_CASE:
+                    EmitChooseItem(0, gBattleStruct->field_60[gActiveBank]);
+                    MarkBufferBankForExecution(gActiveBank);
+                    break;
+                case ACTION_CANCEL_PARTNER:
+                    gBattleCommunication[gActiveBank] = 7;
+                    gBattleCommunication[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] = 1;
+                    RecordedBattle_ClearBankAction(gActiveBank, 1);
+                    if (gBattleMons[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_MULTIPLETURNS
+                        || gBattleMons[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_RECHARGE)
+                    {
+                        EmitCmd50(0);
+                        MarkBufferBankForExecution(gActiveBank);
+                        return;
+                    }
+                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_SWITCH)
+                    {
+                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 2);
+                    }
+                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_RUN)
+                    {
+                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
+                    }
+                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE
+                             && (gProtectStructs[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].onlyStruggle
+                                || gDisableStructs[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].encoredMove))
+                    {
+                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
+                    }
+                    else if (gBattleTypeFlags & BATTLE_TYPE_PALACE
+                             && gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE)
+                    {
+                        gRngValue = gBattlePalaceMoveSelectionRngValue;
+                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
+                    }
+                    else
+                    {
+                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 3);
+                    }
+                    EmitCmd50(0);
+                    MarkBufferBankForExecution(gActiveBank);
+                    return;
+                }
+
+                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
+                    && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000)
+                    && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
+                {
+                    gSelectionBattleScripts[gActiveBank] = BattleScript_AskIfWantsToForfeitMatch;
+                    gBattleCommunication[gActiveBank] = 8;
+                    *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
+                    *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
+                    return;
+                }
+                else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
+                         && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+                         && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
+                {
+                    BattleScriptExecute(BattleScript_PrintCantRunFromTrainer);
+                    gBattleCommunication[gActiveBank] = 1;
+                }
+                else if (IsRunningFromBattleImpossible()
+                         && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
+                {
+                    gSelectionBattleScripts[gActiveBank] = BattleScript_PrintCantEscapeFromBattle;
+                    gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
+                    *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
+                    *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
+                    return;
+                }
+                else
+                {
+                    gBattleCommunication[gActiveBank]++;
+                }
+            }
+            break;
+        case STATE_WAIT_ACTION_CASE_CHOSEN:
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            {
+                switch (gActionForBanks[gActiveBank])
+                {
+                case ACTION_USE_MOVE:
+                    switch (gBattleBufferB[gActiveBank][1])
+                    {
+                    case 3:
+                    case 4:
+                    case 5:
+                    case 6:
+                    case 7:
+                    case 8:
+                    case 9:
+                        gActionForBanks[gActiveBank] = gBattleBufferB[gActiveBank][1];
+                        return;
+                    case 15:
+                        gActionForBanks[gActiveBank] = ACTION_SWITCH;
+                        sub_803CDF8();
+                        return;
+                    default:
+                        sub_818603C(2);
+                        if ((gBattleBufferB[gActiveBank][2] | (gBattleBufferB[gActiveBank][3] << 8)) == 0xFFFF)
+                        {
+                            gBattleCommunication[gActiveBank] = 1;
+                            RecordedBattle_ClearBankAction(gActiveBank, 1);
+                        }
+                        else if (TrySetCantSelectMoveBattleScript())
+                        {
+                            RecordedBattle_ClearBankAction(gActiveBank, 1);
+                            gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
+                            *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
+                            gBattleBufferB[gActiveBank][1] = 0;
+                            *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_WAIT_ACTION_CHOSEN;
+                            return;
+                        }
+                        else
+                        {
+                            if (!(gBattleTypeFlags & BATTLE_TYPE_PALACE))
+                            {
+                                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][2]);
+                                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][3]);
+                            }
+                            *(gBattleStruct->chosenMovePositions + gActiveBank) = gBattleBufferB[gActiveBank][2];
+                            gChosenMovesByBanks[gActiveBank] = gBattleMons[gActiveBank].moves[*(gBattleStruct->chosenMovePositions + gActiveBank)];
+                            *(gBattleStruct->moveTarget + gActiveBank) = gBattleBufferB[gActiveBank][3];
+                            gBattleCommunication[gActiveBank]++;
+                        }
+                        break;
+                    }
+                    break;
+                case ACTION_USE_ITEM:
+                    if ((gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8)) == 0)
+                    {
+                        gBattleCommunication[gActiveBank] = 1;
+                    }
+                    else
+                    {
+                        gLastUsedItem = (gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8));
+                        gBattleCommunication[gActiveBank]++;
+                    }
+                    break;
+                case ACTION_SWITCH:
+                    if (gBattleBufferB[gActiveBank][1] == 6)
+                    {
+                        gBattleCommunication[gActiveBank] = 1;
+                        RecordedBattle_ClearBankAction(gActiveBank, 1);
+                    }
+                    else
+                    {
+                        sub_803CDF8();
+                        gBattleCommunication[gActiveBank]++;
+                    }
+                    break;
+                case ACTION_RUN:
+                    gHitMarker |= HITMARKER_RUN;
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                case ACTION_WATCHES_CAREFULLY:
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                case ACTION_SAFARI_ZONE_BALL:
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                case ACTION_POKEBLOCK_CASE:
+                    if ((gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8)) != 0)
+                    {
+                        gBattleCommunication[gActiveBank]++;
+                    }
+                    else
+                    {
+                        gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
+                    }
+                    break;
+                case ACTION_GO_NEAR:
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                case ACTION_SAFARI_ZONE_RUN:
+                    gHitMarker |= HITMARKER_RUN;
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                case ACTION_9:
+                    gBattleCommunication[gActiveBank]++;
+                    break;
+                }
+            }
+            break;
+        case STATE_WAIT_ACTION_CONFIRMED_STANDBY:
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            {
+                i = (sub_803CDB8() != 0);
+
+                if (((gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_DOUBLE)) != BATTLE_TYPE_DOUBLE)
+                    || (identity & BIT_MON)
+                    || (*(&gBattleStruct->field_91) & gBitTable[GetBankByPosition(identity ^ BIT_MON)]))
+                {
+                    EmitLinkStandbyMsg(0, 0, i);
+                }
+                else
+                {
+                    EmitLinkStandbyMsg(0, 1, i);
+                }
+                MarkBufferBankForExecution(gActiveBank);
+                gBattleCommunication[gActiveBank]++;
+            }
+            break;
+        case STATE_WAIT_ACTION_CONFIRMED:
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            {
+                gBattleCommunication[ACTIONS_CONFIRMED_COUNT]++;
+            }
+            break;
+        case STATE_SELECTION_SCRIPT:
+            if (*(gBattleStruct->selectionScriptFinished + gActiveBank))
+            {
+                gBattleCommunication[gActiveBank] = *(gBattleStruct->stateIdAfterSelScript + gActiveBank);
+            }
+            else
+            {
+                gBankAttacker = gActiveBank;
+                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBank];
+                if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+                {
+                    gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+                }
+                gSelectionBattleScripts[gActiveBank] = gBattlescriptCurrInstr;
+            }
+            break;
+        case STATE_WAIT_SET_BEFORE_ACTION:
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            {
+                gBattleCommunication[gActiveBank] = 1;
+            }
+            break;
+        case STATE_SELECTION_SCRIPT_MAY_RUN:
+            if (*(gBattleStruct->selectionScriptFinished + gActiveBank))
+            {
+                if (gBattleBufferB[gActiveBank][1] == 13)
+                {
+                    gHitMarker |= HITMARKER_RUN;
+                    gActionForBanks[gActiveBank] = ACTION_RUN;
+                    gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
+                }
+                else
+                {
+                    RecordedBattle_ClearBankAction(gActiveBank, 1);
+                    gBattleCommunication[gActiveBank] = *(gBattleStruct->stateIdAfterSelScript + gActiveBank);
+                }
+            }
+            else
+            {
+                gBankAttacker = gActiveBank;
+                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBank];
+                if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+                {
+                    gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+                }
+                gSelectionBattleScripts[gActiveBank] = gBattlescriptCurrInstr;
+            }
+            break;
+        }
+    }
+
+    // check if everyone chose actions
+    if (gBattleCommunication[ACTIONS_CONFIRMED_COUNT] == gBattleBanksCount)
+    {
+        sub_818603C(1);
+        gBattleMainFunc = SetActionsAndBanksTurnOrder;
+
+        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
+        {
+            for (i = 0; i < gBattleBanksCount; i++)
+            {
+                if (gActionForBanks[i] == ACTION_SWITCH)
+                    sub_80571DC(i, *(gBattleStruct->monToSwitchIntoId + i));
+            }
+        }
+    }
+}
+
+static bool8 sub_803CDB8(void)
+{
+    s32 i, var;
+
+    for (var = 0, i = 0; i < gBattleBanksCount; i++)
+    {
+        if (gBattleCommunication[i] == 5)
+            var++;
+    }
+
+    if (var + 1 == gBattleBanksCount)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static void sub_803CDF8(void)
+{
+    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = gBattleBufferB[gActiveBank][1];
+    RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]);
+
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
+    {
+        *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 0) &= 0xF;
+        *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBank][2] & 0xF0);
+        *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 1) = gBattleBufferB[gActiveBank][3];
+
+        *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 0) &= (0xF0);
+        *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBank][2] & 0xF0) >> 4;
+        *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 2) = gBattleBufferB[gActiveBank][3];
+    }
+}
+
+void SwapTurnOrder(u8 id1, u8 id2)
+{
+    u32 temp = gActionsByTurnOrder[id1];
+    gActionsByTurnOrder[id1] = gActionsByTurnOrder[id2];
+    gActionsByTurnOrder[id2] = temp;
+
+    temp = gBanksByTurnOrder[id1];
+    gBanksByTurnOrder[id1] = gBanksByTurnOrder[id2];
+    gBanksByTurnOrder[id2] = temp;
+}
+
+u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
+{
+    u8 strikesFirst = 0;
+    u8 speedMultiplierBank1 = 0, speedMultiplierBank2 = 0;
+    u32 speedBank1 = 0, speedBank2 = 0;
+    u8 holdEffect = 0;
+    u8 holdEffectParam = 0;
+    u16 moveBank1 = 0, moveBank2 = 0;
+
+    if (WEATHER_HAS_EFFECT)
+    {
+        if ((gBattleMons[bank1].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY)
+            || (gBattleMons[bank1].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY))
+            speedMultiplierBank1 = 2;
+        else
+            speedMultiplierBank1 = 1;
+
+        if ((gBattleMons[bank2].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY)
+            || (gBattleMons[bank2].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY))
+            speedMultiplierBank2 = 2;
+        else
+            speedMultiplierBank2 = 1;
+    }
+    else
+    {
+        speedMultiplierBank1 = 1;
+        speedMultiplierBank2 = 1;
+    }
+
+    speedBank1 = (gBattleMons[bank1].speed * speedMultiplierBank1)
+                * (gStatStageRatios[gBattleMons[bank1].statStages[STAT_STAGE_SPEED]][0])
+                / (gStatStageRatios[gBattleMons[bank1].statStages[STAT_STAGE_SPEED]][1]);
+
+    if (gBattleMons[bank1].item == ITEM_ENIGMA_BERRY)
+    {
+        holdEffect = gEnigmaBerries[bank1].holdEffect;
+        holdEffectParam = gEnigmaBerries[bank1].holdEffectParam;
+    }
+    else
+    {
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank1].item);
+        holdEffectParam = ItemId_GetHoldEffectParam(gBattleMons[bank1].item);
+    }
+
+    // badge boost
+    if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
+        && FlagGet(FLAG_BADGE03_GET)
+        && GetBankSide(bank1) == SIDE_PLAYER)
+    {
+        speedBank1 = (speedBank1 * 110) / 100;
+    }
+
+    if (holdEffect == HOLD_EFFECT_MACHO_BRACE)
+        speedBank1 /= 2;
+
+    if (gBattleMons[bank1].status1 & STATUS1_PARALYSIS)
+        speedBank1 /= 4;
+
+    if (holdEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (0xFFFF * holdEffectParam) / 100)
+        speedBank1 = UINT_MAX;
+
+    // check second bank's speed
+
+    speedBank2 = (gBattleMons[bank2].speed * speedMultiplierBank2)
+                * (gStatStageRatios[gBattleMons[bank2].statStages[STAT_STAGE_SPEED]][0])
+                / (gStatStageRatios[gBattleMons[bank2].statStages[STAT_STAGE_SPEED]][1]);
+
+    if (gBattleMons[bank2].item == ITEM_ENIGMA_BERRY)
+    {
+        holdEffect = gEnigmaBerries[bank2].holdEffect;
+        holdEffectParam = gEnigmaBerries[bank2].holdEffectParam;
+    }
+    else
+    {
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank2].item);
+        holdEffectParam = ItemId_GetHoldEffectParam(gBattleMons[bank2].item);
+    }
+
+    // badge boost
+    if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
+        && FlagGet(FLAG_BADGE03_GET)
+        && GetBankSide(bank2) == SIDE_PLAYER)
+    {
+        speedBank2 = (speedBank2 * 110) / 100;
+    }
+
+    if (holdEffect == HOLD_EFFECT_MACHO_BRACE)
+        speedBank2 /= 2;
+
+    if (gBattleMons[bank2].status1 & STATUS1_PARALYSIS)
+        speedBank2 /= 4;
+
+    if (holdEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (0xFFFF * holdEffectParam) / 100)
+        speedBank2 = UINT_MAX;
+
+    if (ignoreChosenMoves)
+    {
+        moveBank1 = MOVE_NONE;
+        moveBank2 = MOVE_NONE;
+    }
+    else
+    {
+        if (gActionForBanks[bank1] == ACTION_USE_MOVE)
+        {
+            if (gProtectStructs[bank1].onlyStruggle)
+                moveBank1 = MOVE_STRUGGLE;
+            else
+                moveBank1 = gBattleMons[bank1].moves[*(gBattleStruct->chosenMovePositions + bank1)];
+        }
+        else
+            moveBank1 = MOVE_NONE;
+
+        if (gActionForBanks[bank2] == ACTION_USE_MOVE)
+        {
+            if (gProtectStructs[bank2].onlyStruggle)
+                moveBank2 = MOVE_STRUGGLE;
+            else
+                moveBank2 = gBattleMons[bank2].moves[*(gBattleStruct->chosenMovePositions + bank2)];
+        }
+        else
+            moveBank2 = MOVE_NONE;
+    }
+
+    // both move priorities are different than 0
+    if (gBattleMoves[moveBank1].priority != 0 || gBattleMoves[moveBank2].priority != 0)
+    {
+        // both priorities are the same
+        if (gBattleMoves[moveBank1].priority == gBattleMoves[moveBank2].priority)
+        {
+            if (speedBank1 == speedBank2 && Random() & 1)
+                strikesFirst = 2; // same speeds, same priorities
+            else if (speedBank1 < speedBank2)
+                strikesFirst = 1; // bank2 has more speed
+
+            // else bank1 has more speed
+        }
+        else if (gBattleMoves[moveBank1].priority < gBattleMoves[moveBank2].priority)
+            strikesFirst = 1; // bank2's move has greater priority
+
+        // else bank1's move has greater priority
+    }
+    // both priorities are equal to 0
+    else
+    {
+        if (speedBank1 == speedBank2 && Random() & 1)
+            strikesFirst = 2; // same speeds, same priorities
+        else if (speedBank1 < speedBank2)
+            strikesFirst = 1; // bank2 has more speed
+
+        // else bank1 has more speed
+    }
+
+    return strikesFirst;
+}
+
+static void SetActionsAndBanksTurnOrder(void)
+{
+    s32 var = 0;
+    s32 i, j;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
+    {
+        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        {
+            gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
+            gBanksByTurnOrder[var] = gActiveBank;
+            var++;
+        }
+    }
+    else
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_LINK)
+        {
+            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                {
+                    var = 5;
+                    break;
+                }
+            }
+        }
+        else
+        {
+            if (gActionForBanks[0] == ACTION_RUN)
+            {
+                gActiveBank = 0;
+                var = 5;
+            }
+            if (gActionForBanks[2] == ACTION_RUN)
+            {
+                gActiveBank = 2;
+                var = 5;
+            }
+        }
+
+        if (var == 5)
+        {
+            gActionsByTurnOrder[0] = gActionForBanks[gActiveBank];
+            gBanksByTurnOrder[0] = gActiveBank;
+            var = 1;
+            for (i = 0; i < gBattleBanksCount; i++)
+            {
+                if (i != gActiveBank)
+                {
+                    gActionsByTurnOrder[var] = gActionForBanks[i];
+                    gBanksByTurnOrder[var] = i;
+                    var++;
+                }
+            }
+            gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
+            gBattleStruct->focusPunchBank = 0;
+            return;
+        }
+        else
+        {
+            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_USE_ITEM || gActionForBanks[gActiveBank] == ACTION_SWITCH)
+                {
+                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
+                    gBanksByTurnOrder[var] = gActiveBank;
+                    var++;
+                }
+            }
+            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+            {
+                if (gActionForBanks[gActiveBank] != ACTION_USE_ITEM && gActionForBanks[gActiveBank] != ACTION_SWITCH)
+                {
+                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
+                    gBanksByTurnOrder[var] = gActiveBank;
+                    var++;
+                }
+            }
+            for (i = 0; i < gBattleBanksCount - 1; i++)
+            {
+                for (j = i + 1; j < gBattleBanksCount; j++)
+                {
+                    u8 bank1 = gBanksByTurnOrder[i];
+                    u8 bank2 = gBanksByTurnOrder[j];
+                    if (gActionsByTurnOrder[i] != ACTION_USE_ITEM
+                        && gActionsByTurnOrder[j] != ACTION_USE_ITEM
+                        && gActionsByTurnOrder[i] != ACTION_SWITCH
+                        && gActionsByTurnOrder[j] != ACTION_SWITCH)
+                    {
+                        if (GetWhoStrikesFirst(bank1, bank2, FALSE))
+                            SwapTurnOrder(i, j);
+                    }
+                }
+            }
+        }
+    }
+    gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
+    gBattleStruct->focusPunchBank = 0;
+}
+
+static void TurnValuesCleanUp(bool8 var0)
+{
+    s32 i;
+    u8 *dataPtr;
+
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    {
+        if (var0)
+        {
+            gProtectStructs[gActiveBank].protected = 0;
+            gProtectStructs[gActiveBank].endured = 0;
+        }
+        else
+        {
+            dataPtr = (u8*)(&gProtectStructs[gActiveBank]);
+            for (i = 0; i < sizeof(struct ProtectStruct); i++)
+                dataPtr[i] = 0;
+
+            if (gDisableStructs[gActiveBank].isFirstTurn)
+                gDisableStructs[gActiveBank].isFirstTurn--;
+
+            if (gDisableStructs[gActiveBank].rechargeCounter)
+            {
+                gDisableStructs[gActiveBank].rechargeCounter--;
+                if (gDisableStructs[gActiveBank].rechargeCounter == 0)
+                    gBattleMons[gActiveBank].status2 &= ~(STATUS2_RECHARGE);
+            }
+        }
+
+        if (gDisableStructs[gActiveBank].substituteHP == 0)
+                gBattleMons[gActiveBank].status2 &= ~(STATUS2_SUBSTITUTE);
+    }
+
+    gSideTimers[0].followmeTimer = 0;
+    gSideTimers[1].followmeTimer = 0;
+}
+
+static void SpecialStatusesClear(void)
+{
+    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    {
+        s32 i;
+        u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBank]);
+
+        for (i = 0; i < sizeof(struct SpecialStatus); i++)
+            dataPtr[i] = 0;
+    }
+}
+
+static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
+{
+    if (!(gHitMarker & HITMARKER_RUN))
+    {
+        while (gBattleStruct->focusPunchBank < gBattleBanksCount)
+        {
+            gActiveBank = gBankAttacker = gBattleStruct->focusPunchBank;
+            gBattleStruct->focusPunchBank++;
+            if (gChosenMovesByBanks[gActiveBank] == MOVE_FOCUS_PUNCH
+                && !(gBattleMons[gActiveBank].status1 & STATUS1_SLEEP)
+                && !(gDisableStructs[gBankAttacker].truantCounter)
+                && !(gProtectStructs[gActiveBank].onlyStruggle))
+            {
+                BattleScriptExecute(BattleScript_FocusPunchSetUp);
+                return;
+            }
+        }
+    }
+
+    TryClearRageStatuses();
+    gCurrentTurnActionNumber = 0;
+{
+    // something stupid needed to match
+    u8 zero;
+    gCurrentActionFuncId = gActionsByTurnOrder[(zero = 0)];
+}
+    gDynamicBasePower = 0;
+    gBattleStruct->dynamicMoveType = 0;
+    gBattleMainFunc = RunTurnActionsFunctions;
+    gBattleCommunication[3] = 0;
+    gBattleCommunication[4] = 0;
+    gBattleScripting.multihitMoveEffect = 0;
+    gBattleResources->battleScriptsStack->size = 0;
+}
+
+static void RunTurnActionsFunctions(void)
+{
+    if (gBattleOutcome != 0)
+        gCurrentActionFuncId = 12;
+
+    *(&gBattleStruct->savedTurnActionNumber) = gCurrentTurnActionNumber;
+    sTurnActionsFuncsTable[gCurrentActionFuncId]();
+
+    if (gCurrentTurnActionNumber >= gBattleBanksCount) // everyone did their actions, turn finished
+    {
+        gHitMarker &= ~(HITMARKER_x100000);
+        gBattleMainFunc = sEndTurnFuncsTable[gBattleOutcome & 0x7F];
+    }
+    else
+    {
+        if (gBattleStruct->savedTurnActionNumber != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another bank
+        {
+            gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
+            gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
+        }
+    }
+}
+
+static void HandleEndTurn_BattleWon(void)
+{
+    gCurrentActionFuncId = 0;
+
+    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+    {
+        gSpecialVar_Result = gBattleOutcome;
+        gBattleTextBuff1[0] = gBattleOutcome;
+        gBankAttacker = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+        gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
+        gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
+            && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER))
+    {
+        BattleStopLowHpSound();
+        gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon;
+
+        if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE)
+            PlayBGM(MUS_KACHI3);
+        else
+            PlayBGM(MUS_KACHI1);
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
+    {
+        BattleStopLowHpSound();
+        gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon;
+
+        switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
+        {
+        case TRAINER_CLASS_ELITE_FOUR:
+        case TRAINER_CLASS_CHAMPION:
+            PlayBGM(MUS_KACHI5);
+            break;
+        case TRAINER_CLASS_TEAM_AQUA:
+        case TRAINER_CLASS_TEAM_MAGMA:
+        case TRAINER_CLASS_AQUA_ADMIN:
+        case TRAINER_CLASS_AQUA_LEADER:
+        case TRAINER_CLASS_MAGMA_ADMIN:
+        case TRAINER_CLASS_MAGMA_LEADER:
+            PlayBGM(MUS_KACHI4);
+            break;
+        case TRAINER_CLASS_LEADER:
+            PlayBGM(MUS_KACHI3);
+            break;
+        default:
+            PlayBGM(MUS_KACHI1);
+            break;
+        }
+    }
+    else
+    {
+        gBattlescriptCurrInstr = BattleScript_PayDayMoneyAndPickUpItems;
+    }
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+static void HandleEndTurn_BattleLost(void)
+{
+    gCurrentActionFuncId = 0;
+
+    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+    {
+        if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
+        {
+            if (gBattleOutcome & B_OUTCOME_LINK_BATTLE_RAN)
+            {
+                gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle;
+                gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
+                gSaveBlock2Ptr->field_CA9_b = 1;
+            }
+            else
+            {
+                gBattlescriptCurrInstr = BattleScript_82DAA0B;
+                gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
+            }
+        }
+        else
+        {
+            gBattleTextBuff1[0] = gBattleOutcome;
+            gBankAttacker = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+            gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
+            gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
+        }
+    }
+    else
+    {
+        gBattlescriptCurrInstr = BattleScript_LocalBattleLost;
+    }
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+static void HandleEndTurn_RanFromBattle(void)
+{
+    gCurrentActionFuncId = 0;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+    {
+        gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
+        gBattleOutcome = B_OUTCOME_FORFEITED;
+        gSaveBlock2Ptr->field_CA9_b = 1;
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
+    {
+        gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited;
+        gBattleOutcome = B_OUTCOME_FORFEITED;
+    }
+    else
+    {
+        switch (gProtectStructs[gBankAttacker].fleeFlag)
+        {
+        default:
+            gBattlescriptCurrInstr = BattleScript_GotAwaySafely;
+            break;
+        case 1:
+            gBattlescriptCurrInstr = BattleScript_SmokeBallEscape;
+            break;
+        case 2:
+            gBattlescriptCurrInstr = BattleScript_RanAwayUsingMonAbility;
+            break;
+        }
+    }
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+static void HandleEndTurn_MonFled(void)
+{
+    gCurrentActionFuncId = 0;
+
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker]);
+    gBattlescriptCurrInstr = BattleScript_WildMonFled;
+
+    gBattleMainFunc = HandleEndTurn_FinishBattle;
+}
+
+static void HandleEndTurn_FinishBattle(void)
+{
+    if (gCurrentActionFuncId == 0xB || gCurrentActionFuncId == 0xC)
+    {
+        if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
+                                  | BATTLE_TYPE_x2000000
+                                  | BATTLE_TYPE_FIRST_BATTLE
+                                  | BATTLE_TYPE_SAFARI
+                                  | BATTLE_TYPE_EREADER_TRAINER
+                                  | BATTLE_TYPE_WALLY_TUTORIAL
+                                  | BATTLE_TYPE_FRONTIER)))
+        {
+            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+            {
+                if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+                {
+                    if (gBattleResults.playerMon1Species == SPECIES_NONE)
+                    {
+                        gBattleResults.playerMon1Species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES, NULL);
+                        GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_NICKNAME, gBattleResults.playerMon1Name);
+                    }
+                    else
+                    {
+                        gBattleResults.playerMon2Species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES, NULL);
+                        GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_NICKNAME, gBattleResults.playerMon2Name);
+                    }
+                }
+            }
+            PutPokemonTodayCaughtOnAir();
+        }
+
+        if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
+                                  | BATTLE_TYPE_x2000000
+                                  | BATTLE_TYPE_TRAINER
+                                  | BATTLE_TYPE_FIRST_BATTLE
+                                  | BATTLE_TYPE_SAFARI
+                                  | BATTLE_TYPE_FRONTIER
+                                  | BATTLE_TYPE_EREADER_TRAINER
+                                  | BATTLE_TYPE_WALLY_TUTORIAL))
+            && gBattleResults.unk5_6)
+        {
+            sub_80EE184();
+        }
+
+        sub_8186444();
+        BeginFastPaletteFade(3);
+        FadeOutMapMusic(5);
+        gBattleMainFunc = FreeResetData_ReturnToOvOrDoEvolutions;
+        gCB2_AfterEvolution = BattleMainCB2;
+    }
+    else
+    {
+        if (gBattleExecBuffer == 0)
+            gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+    }
+}
+
+static void FreeResetData_ReturnToOvOrDoEvolutions(void)
+{
+    if (!gPaletteFade.active)
+    {
+        ResetSpriteData();
+        if (gLeveledUpInBattle == 0 || gBattleOutcome != B_OUTCOME_WON)
+        {
+            gBattleMainFunc = ReturnFromBattleToOverworld;
+            return;
+        }
+        else
+        {
+            gBattleMainFunc = TryEvolvePokemon;
+        }
+    }
+
+    FreeAllWindowBuffers();
+    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
+    {
+        FreeMonSpritesGfx();
+        FreeBattleResources();
+        FreeBattleSpritesData();
+    }
+}
+
+static void TryEvolvePokemon(void)
+{
+    s32 i;
+
+    while (gLeveledUpInBattle != 0)
+    {
+        for (i = 0; i < 6; i++)
+        {
+            if (gLeveledUpInBattle & gBitTable[i])
+            {
+                u16 species;
+                u8 levelUpBits = gLeveledUpInBattle;
+
+                levelUpBits &= ~(gBitTable[i]);
+                gLeveledUpInBattle = levelUpBits;
+
+                species = GetEvolutionTargetSpecies(&gPlayerParty[i], 0, levelUpBits);
+                if (species != SPECIES_NONE)
+                {
+                    FreeAllWindowBuffers();
+                    gBattleMainFunc = WaitForEvoSceneToFinish;
+                    EvolutionScene(&gPlayerParty[i], species, TRUE, i);
+                    return;
+                }
+            }
+        }
+    }
+
+    gBattleMainFunc = ReturnFromBattleToOverworld;
+}
+
+static void WaitForEvoSceneToFinish(void)
+{
+    if (gMain.callback2 == BattleMainCB2)
+        gBattleMainFunc = TryEvolvePokemon;
+}
+
+static void ReturnFromBattleToOverworld(void)
+{
+    if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
+    {
+        RandomlyGivePartyPokerus(gPlayerParty);
+        PartySpreadPokerus(gPlayerParty);
+    }
+
+    if (gBattleTypeFlags & BATTLE_TYPE_LINK && gReceivedRemoteLinkPlayers != 0)
+        return;
+
+    gSpecialVar_Result = gBattleOutcome;
+    gMain.inBattle = 0;
+    gMain.callback1 = gPreBattleCallback1;
+
+    if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
+    {
+        UpdateRoamerHPStatus(&gEnemyParty[0]);
+        if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
+            SetRoamerInactive();
+    }
+
+    m4aSongNumStop(0x5A);
+    SetMainCallback2(gMain.savedCallback);
+}
+
+void RunBattleScriptCommands_PopCallbacksStack(void)
+{
+    if (gCurrentActionFuncId == 0xB || gCurrentActionFuncId == 0xC)
+    {
+        if (BATTLE_CALLBACKS_STACK->size != 0)
+            BATTLE_CALLBACKS_STACK->size--;
+        gBattleMainFunc = BATTLE_CALLBACKS_STACK->function[BATTLE_CALLBACKS_STACK->size];
+    }
+    else
+    {
+        if (gBattleExecBuffer == 0)
+            gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+    }
+}
+
+void RunBattleScriptCommands(void)
+{
+    if (gBattleExecBuffer == 0)
+        gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
+}
+
+static void HandleAction_UseMove(void)
+{
+    u8 side;
+    u8 var = 4;
+
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+
+    if (*(&gBattleStruct->field_91) & gBitTable[gBankAttacker])
+    {
+        gCurrentActionFuncId = ACTION_FINISHED;
+        return;
+    }
+
+    gCritMultiplier = 1;
+    gBattleScripting.dmgMultiplier = 1;
+    gBattleStruct->atkCancellerTracker = 0;
+    gMoveResultFlags = 0;
+    gMultiHitCounter = 0;
+    gBattleCommunication[6] = 0;
+    gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBankAttacker);
+
+    // choose move
+    if (gProtectStructs[gBankAttacker].onlyStruggle)
+    {
+        gProtectStructs[gBankAttacker].onlyStruggle = 0;
+        gCurrentMove = gChosenMove = MOVE_STRUGGLE;
+        gHitMarker |= HITMARKER_NO_PPDEDUCT;
+        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
+    }
+    else if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE)
+    {
+        gCurrentMove = gChosenMove = gLockedMoves[gBankAttacker];
+    }
+    // encore forces you to use the same move
+    else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
+             && gDisableStructs[gBankAttacker].encoredMove == gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
+    {
+        gCurrentMove = gChosenMove = gDisableStructs[gBankAttacker].encoredMove;
+        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
+        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
+    }
+    // check if the encored move wasn't overwritten
+    else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
+             && gDisableStructs[gBankAttacker].encoredMove != gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
+    {
+        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gDisableStructs[gBankAttacker].encoredMove = MOVE_NONE;
+        gDisableStructs[gBankAttacker].encoredMovePos = 0;
+        gDisableStructs[gBankAttacker].encoreTimer1 = 0;
+        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
+    }
+    else if (gBattleMons[gBankAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBankAttacker])
+    {
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
+    }
+    else
+    {
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+    }
+
+    if (gBattleMons[gBankAttacker].hp != 0)
+    {
+        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+            gBattleResults.lastUsedMovePlayer = gCurrentMove;
+        else
+            gBattleResults.lastUsedMoveOpponent = gCurrentMove;
+    }
+
+    // choose target
+    side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
+    if (gSideTimers[side].followmeTimer != 0
+        && gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED
+        && GetBankSide(gBankAttacker) != GetBankSide(gSideTimers[side].followmeTarget)
+        && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
+    {
+        gBankDefender = gSideTimers[side].followmeTarget;
+    }
+    else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
+             && gSideTimers[side].followmeTimer == 0
+             && (gBattleMoves[gCurrentMove].power != 0
+                 || gBattleMoves[gCurrentMove].target != MOVE_TARGET_x10)
+             && gBattleMons[*(gBattleStruct->moveTarget + gBankAttacker)].ability != ABILITY_LIGHTNING_ROD
+             && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
+    {
+        side = GetBankSide(gBankAttacker);
+        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        {
+            if (side != GetBankSide(gActiveBank)
+                && *(gBattleStruct->moveTarget + gBankAttacker) != gActiveBank
+                && gBattleMons[gActiveBank].ability == ABILITY_LIGHTNING_ROD
+                && BankGetTurnOrder(gActiveBank) < var)
+            {
+                var = BankGetTurnOrder(gActiveBank);
+            }
+        }
+        if (var == 4)
+        {
+            if (gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
+            {
+                if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+                {
+                    if (Random() & 1)
+                        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+                    else
+                        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+                }
+                else
+                {
+                    if (Random() & 1)
+                        gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+                    else
+                        gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+                }
+            }
+            else
+            {
+                gBankDefender = *(gBattleStruct->moveTarget + gBankAttacker);
+            }
+
+            if (gAbsentBankFlags & gBitTable[gBankDefender])
+            {
+                if (GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
+                {
+                    gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
+                }
+                else
+                {
+                    gBankDefender = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
+                    if (gAbsentBankFlags & gBitTable[gBankDefender])
+                        gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
+                }
+            }
+        }
+        else
+        {
+            gActiveBank = gBanksByTurnOrder[var];
+            RecordAbilityBattle(gActiveBank, gBattleMons[gActiveBank].ability);
+            gSpecialStatuses[gActiveBank].lightningRodRedirected = 1;
+            gBankDefender = gActiveBank;
+        }
+    }
+    else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
+             && gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
+    {
+        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+        {
+            if (Random() & 1)
+                gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+            else
+                gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+        }
+        else
+        {
+            if (Random() & 1)
+                gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+            else
+                gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+        }
+
+        if (gAbsentBankFlags & gBitTable[gBankDefender]
+            && GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
+        {
+            gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
+        }
+    }
+    else
+    {
+        gBankDefender = *(gBattleStruct->moveTarget + gBankAttacker);
+        if (gAbsentBankFlags & gBitTable[gBankDefender])
+        {
+            if (GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
+            {
+                gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
+            }
+            else
+            {
+                gBankDefender = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
+                if (gAbsentBankFlags & gBitTable[gBankDefender])
+                    gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
+            }
+        }
+    }
+
+    // choose battlescript
+    if (gBattleTypeFlags & BATTLE_TYPE_PALACE
+        && gProtectStructs[gBankAttacker].flag_x10)
+    {
+        if (gBattleMons[gBankAttacker].hp == 0)
+        {
+            gCurrentActionFuncId = 12;
+            return;
+        }
+        else if (gPalaceSelectionBattleScripts[gBankAttacker] != NULL)
+        {
+            gBattleCommunication[MULTISTRING_CHOOSER] = 4;
+            gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBankAttacker];
+            gPalaceSelectionBattleScripts[gBankAttacker] = NULL;
+        }
+        else
+        {
+            gBattleCommunication[MULTISTRING_CHOOSER] = 4;
+            gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround;
+        }
+    }
+    else
+    {
+        gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
+    }
+
+    if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
+        sub_81A56E8(gBankAttacker);
+
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+static void HandleAction_Switch(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gActionSelectionCursor[gBankAttacker] = 0;
+    gMoveSelectionCursor[gBankAttacker] = 0;
+
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, *(gBattleStruct->field_58 + gBankAttacker))
+
+    gBattleScripting.bank = gBankAttacker;
+    gBattlescriptCurrInstr = BattleScript_ActionSwitch;
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+
+    if (gBattleResults.playerSwitchesCounter < 255)
+        gBattleResults.playerSwitchesCounter++;
+}
+
+static void HandleAction_UseItem(void)
+{
+    gBankAttacker = gBankDefender = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    ClearFuryCutterDestinyBondGrudge(gBankAttacker);
+    gLastUsedItem = gBattleBufferB[gBankAttacker][1] | (gBattleBufferB[gBankAttacker][2] << 8);
+
+    if (gLastUsedItem <= ITEM_PREMIER_BALL) // is ball
+    {
+        gBattlescriptCurrInstr = gBattlescriptsForBallThrow[gLastUsedItem];
+    }
+    else if (gLastUsedItem == ITEM_POKE_DOLL || gLastUsedItem == ITEM_FLUFFY_TAIL)
+    {
+        gBattlescriptCurrInstr = gBattlescriptsForRunningByItem[0];
+    }
+    else if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+    {
+        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[0];
+    }
+    else
+    {
+        gBattleScripting.bank = gBankAttacker;
+
+        switch (*(gBattleStruct->AI_itemType + (gBankAttacker >> 1)))
+        {
+        case AI_ITEM_FULL_RESTORE:
+        case AI_ITEM_HEAL_HP:
+            break;
+        case AI_ITEM_CURE_CONDITION:
+            gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+            if (*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 1)
+            {
+                if (*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 0x3E)
+                    gBattleCommunication[MULTISTRING_CHOOSER] = 5;
+            }
+            else
+            {
+                while (!(*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 1))
+                {
+                    *(gBattleStruct->AI_itemFlags + gBankAttacker / 2) >>= 1;
+                    gBattleCommunication[MULTISTRING_CHOOSER]++;
+                }
+            }
+            break;
+        case AI_ITEM_X_STAT:
+            gBattleCommunication[MULTISTRING_CHOOSER] = 4;
+            if (*(gBattleStruct->AI_itemFlags + (gBankAttacker >> 1)) & 0x80)
+            {
+                gBattleCommunication[MULTISTRING_CHOOSER] = 5;
+            }
+            else
+            {
+                PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK)
+                PREPARE_STRING_BUFFER(gBattleTextBuff2, 0xD2)
+
+                while (!((*(gBattleStruct->AI_itemFlags + (gBankAttacker >> 1))) & 1))
+                {
+                    *(gBattleStruct->AI_itemFlags + gBankAttacker / 2) >>= 1;
+                    gBattleTextBuff1[2]++;
+                }
+
+                gBattleScripting.animArg1 = gBattleTextBuff1[2] + 14;
+                gBattleScripting.animArg2 = 0;
+            }
+            break;
+        case AI_ITEM_GUARD_SPECS:
+            if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
+                gBattleCommunication[MULTISTRING_CHOOSER] = 2;
+            else
+                gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+            break;
+        }
+
+        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[*(gBattleStruct->AI_itemType + gBankAttacker / 2)];
+    }
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+bool8 TryRunFromBattle(u8 bank)
+{
+    bool8 effect = FALSE;
+    u8 holdEffect;
+    u8 pyramidMultiplier;
+    u8 speedVar;
+
+    if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY)
+        holdEffect = gEnigmaBerries[bank].holdEffect;
+    else
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank].item);
+
+    gStringBank = bank;
+
+    if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
+    {
+        gLastUsedItem = gBattleMons[bank].item ;
+        gProtectStructs[bank].fleeFlag = 1;
+        effect++;
+    }
+    else if (gBattleMons[bank].ability == ABILITY_RUN_AWAY)
+    {
+        if (InBattlePyramid())
+        {
+            gBattleStruct->runTries++;
+            pyramidMultiplier = sub_81A9E28();
+            speedVar = (gBattleMons[bank].speed * pyramidMultiplier) / (gBattleMons[bank ^ BIT_SIDE].speed) + (gBattleStruct->runTries * 30);
+            if (speedVar > (Random() & 0xFF))
+            {
+                gLastUsedAbility = ABILITY_RUN_AWAY;
+                gProtectStructs[bank].fleeFlag = 2;
+                effect++;
+            }
+        }
+        else
+        {
+            gLastUsedAbility = ABILITY_RUN_AWAY;
+            gProtectStructs[bank].fleeFlag = 2;
+            effect++;
+        }
+    }
+    else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000) && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
+    {
+        effect++;
+    }
+    else
+    {
+        if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
+        {
+            if (InBattlePyramid())
+            {
+                pyramidMultiplier = sub_81A9E28();
+                speedVar = (gBattleMons[bank].speed * pyramidMultiplier) / (gBattleMons[bank ^ BIT_SIDE].speed) + (gBattleStruct->runTries * 30);
+                if (speedVar > (Random() & 0xFF))
+                    effect++;
+            }
+            else if (gBattleMons[bank].speed < gBattleMons[bank ^ BIT_SIDE].speed)
+            {
+                speedVar = (gBattleMons[bank].speed * 128) / (gBattleMons[bank ^ BIT_SIDE].speed) + (gBattleStruct->runTries * 30);
+                if (speedVar > (Random() & 0xFF))
+                    effect++;
+            }
+            else // same speed or faster
+            {
+                effect++;
+            }
+        }
+
+        gBattleStruct->runTries++;
+    }
+
+    if (effect)
+    {
+        gCurrentTurnActionNumber = gBattleBanksCount;
+        gBattleOutcome = B_OUTCOME_RAN;
+    }
+
+    return effect;
+}
+
+static void HandleAction_Run(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+
+    if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
+    {
+        gCurrentTurnActionNumber = gBattleBanksCount;
+
+        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        {
+            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                    gBattleOutcome |= B_OUTCOME_LOST;
+            }
+            else
+            {
+                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                    gBattleOutcome |= B_OUTCOME_WON;
+            }
+        }
+
+        gBattleOutcome |= B_OUTCOME_LINK_BATTLE_RAN;
+        gSaveBlock2Ptr->field_CA9_b = 1;
+    }
+    else
+    {
+        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+        {
+            if (!TryRunFromBattle(gBankAttacker)) // failed to run away
+            {
+                ClearFuryCutterDestinyBondGrudge(gBankAttacker);
+                gBattleCommunication[MULTISTRING_CHOOSER] = 3;
+                gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
+                gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+            }
+        }
+        else
+        {
+            if (gBattleMons[gBankAttacker].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
+            {
+                gBattleCommunication[MULTISTRING_CHOOSER] = 4;
+                gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
+                gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+            }
+            else
+            {
+                gCurrentTurnActionNumber = gBattleBanksCount;
+                gBattleOutcome = B_OUTCOME_POKE_FLED;
+            }
+        }
+    }
+}
+
+static void HandleAction_WatchesCarefully(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+static void HandleAction_SafariZoneBallThrow(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gNumSafariBalls--;
+    gLastUsedItem = ITEM_SAFARI_BALL;
+    gBattlescriptCurrInstr = gBattlescriptsForBallThrow[ITEM_SAFARI_BALL];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+static void HandleAction_ThrowPokeblock(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+    gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBankAttacker][1] - 1;
+    gLastUsedItem = gBattleBufferB[gBankAttacker][2];
+
+    if (gBattleResults.field_1F < 0xFF)
+        gBattleResults.field_1F++;
+    if (gBattleStruct->field_7A < 3)
+        gBattleStruct->field_7A++;
+    if (gBattleStruct->field_7B > 1)
+    {
+        if (gBattleStruct->field_7B < sUnknown_0831BCE0[gBattleStruct->field_7A][gBattleCommunication[MULTISTRING_CHOOSER]])
+            gBattleStruct->field_7B = 1;
+        else
+            gBattleStruct->field_7B -= sUnknown_0831BCE0[gBattleStruct->field_7A][gBattleCommunication[MULTISTRING_CHOOSER]];
+    }
+
+    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[2];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+static void HandleAction_GoNear(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+
+    gBattleStruct->field_7C += sUnknown_0831BCEF[gBattleStruct->field_79];
+    if (gBattleStruct->field_7C > 20)
+        gBattleStruct->field_7C = 20;
+
+    gBattleStruct->field_7B +=sUnknown_0831BCF3[gBattleStruct->field_79];
+    if (gBattleStruct->field_7B > 20)
+        gBattleStruct->field_7B = 20;
+
+    if (gBattleStruct->field_79 < 3)
+    {
+        gBattleStruct->field_79++;
+        gBattleCommunication[MULTISTRING_CHOOSER] = 0;
+    }
+    else
+    {
+        gBattleCommunication[MULTISTRING_CHOOSER] = 1;
+    }
+    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[1];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+}
+
+static void HandleAction_SafriZoneRun(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    PlaySE(SE_NIGERU);
+    gCurrentTurnActionNumber = gBattleBanksCount;
+    gBattleOutcome = B_OUTCOME_RAN;
+}
+
+static void HandleAction_Action9(void)
+{
+    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattle_BG0_X = 0;
+    gBattle_BG0_Y = 0;
+
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker])
+
+    gBattlescriptCurrInstr = gBattlescriptsForSafariActions[3];
+    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+    gActionsByTurnOrder[1] = ACTION_FINISHED;
+}
+
+static void HandleAction_Action11(void)
+{
+    if (!HandleFaintedMonActions())
+    {
+        gBattleStruct->faintedActionsState = 0;
+        gCurrentActionFuncId = ACTION_FINISHED;
+    }
+}
+
+static void HandleAction_NothingIsFainted(void)
+{
+    gCurrentTurnActionNumber++;
+    gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
+    gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
+                    | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR
+                    | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000
+                    | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT
+                    | HITMARKER_x8000000 | HITMARKER_x4000000);
+}
+
+static void HandleAction_ActionFinished(void)
+{
+    *(gBattleStruct->monToSwitchIntoId + gBanksByTurnOrder[gCurrentTurnActionNumber]) = 6;
+    gCurrentTurnActionNumber++;
+    gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
+    SpecialStatusesClear();
+    gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
+                    | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR
+                    | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000
+                    | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT
+                    | HITMARKER_x8000000 | HITMARKER_x4000000);
+
+    gCurrentMove = 0;
+    gBattleMoveDamage = 0;
+    gMoveResultFlags = 0;
+    gBattleScripting.animTurn = 0;
+    gBattleScripting.animTargetsHit = 0;
+    gLastLandedMoves[gBankAttacker] = 0;
+    gLastHitByType[gBankAttacker] = 0;
+    gBattleStruct->dynamicMoveType = 0;
+    gDynamicBasePower = 0;
+    gBattleScripting.atk49_state = 0;
+    gBattleCommunication[3] = 0;
+    gBattleCommunication[4] = 0;
+    gBattleScripting.multihitMoveEffect = 0;
+    gBattleResources->battleScriptsStack->size = 0;
+}
-- 
cgit v1.2.3


From a78b0636f50c012c3618d55a9b83f834319de6e0 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 16 Jan 2018 16:42:31 -0600
Subject: more renaming

---
 src/battle_ai_script_commands.c |  6 +--
 src/battle_anim.c               | 24 ++++++------
 src/battle_gfx_sfx_util.c       | 48 +++++++++++------------
 src/battle_main.c               | 84 ++++++++++++++++++++---------------------
 4 files changed, 81 insertions(+), 81 deletions(-)

(limited to 'src')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 07bedb113..5dd9ecdc0 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1314,10 +1314,10 @@ static void BattleAICmd_count_usable_party_mons(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        u32 identity;
+        u32 position;
         bankOnField1 = gBattlePartyID[bank];
-        identity = GetBankPosition(bank) ^ BIT_MON;
-        bankOnField2 = gBattlePartyID[GetBankByPosition(identity)];
+        position = GetBankPosition(bank) ^ BIT_MON;
+        bankOnField2 = gBattlePartyID[GetBankByPosition(position)];
     }
     else // in singles there's only one bank by side
     {
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 76da24383..c1051f93a 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -613,8 +613,8 @@ static void ScriptCmd_monbg(void)
 
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankPosition(bank);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(bank);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -632,8 +632,8 @@ static void ScriptCmd_monbg(void)
     bank ^= BIT_MON;
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankPosition(bank);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(bank);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -893,8 +893,8 @@ static void sub_80A4980(u8 taskId)
     if (gTasks[taskId].data[1] != 1)
     {
         u8 to_BG2;
-        u8 identity = GetBankPosition(gTasks[taskId].data[2]);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(gTasks[taskId].data[2]);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             to_BG2 = FALSE;
         else
             to_BG2 = TRUE;
@@ -937,8 +937,8 @@ static void ScriptCmd_monbg_22(void)
 
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankPosition(bank);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(bank);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -949,8 +949,8 @@ static void ScriptCmd_monbg_22(void)
     bank ^= BIT_MON;
     if (animBankId > 1 && IsAnimBankSpriteVisible(bank))
     {
-        u8 identity = GetBankPosition(bank);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(bank);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
@@ -1001,8 +1001,8 @@ static void sub_80A4BB0(u8 taskId)
     {
         bool8 toBG_2;
         u8 bank = gTasks[taskId].data[2];
-        u8 identity = GetBankPosition(bank);
-        if (identity == B_POSITION_OPPONENT_LEFT || identity == B_POSITION_PLAYER_RIGHT || IsContest())
+        u8 position = GetBankPosition(bank);
+        if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
             toBG_2 = TRUE;
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index d6a52b898..4bfbebf98 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -543,7 +543,7 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
 {
     u32 monsPersonality, currentPersonality, otId;
     u16 species;
-    u8 identity;
+    u8 position;
     u16 paletteOffset;
     const void *lzPaletteData;
 
@@ -561,9 +561,9 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
-    identity = GetBankPosition(bank);
+    position = GetBankPosition(bank);
     HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
-                                              gMonSpritesGfxPtr->sprites[identity],
+                                              gMonSpritesGfxPtr->sprites[position],
                                               species, currentPersonality);
 
     paletteOffset = 0x100 + bank * 16;
@@ -596,7 +596,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
 {
     u32 monsPersonality, currentPersonality, otId;
     u16 species;
-    u8 identity;
+    u8 position;
     u16 paletteOffset;
     const void *lzPaletteData;
 
@@ -614,18 +614,18 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
-    identity = GetBankPosition(bank);
+    position = GetBankPosition(bank);
 
     if (sub_80688F8(1, bank) == 1 || gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
     {
         HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species],
-                                                  gMonSpritesGfxPtr->sprites[identity],
+                                                  gMonSpritesGfxPtr->sprites[position],
                                                   species, currentPersonality);
     }
     else
     {
         HandleLoadSpecialPokePic(&gMonBackPicTable[species],
-                                gMonSpritesGfxPtr->sprites[identity],
+                                gMonSpritesGfxPtr->sprites[position],
                                 species, currentPersonality);
     }
 
@@ -665,18 +665,18 @@ void nullsub_24(u16 species)
 
 void DecompressTrainerFrontPic(u16 frontPicId, u8 bank)
 {
-    u8 identity = GetBankPosition(bank);
+    u8 position = GetBankPosition(bank);
     DecompressPicFromTable_2(&gTrainerFrontPicTable[frontPicId],
-                             gMonSpritesGfxPtr->sprites[identity],
+                             gMonSpritesGfxPtr->sprites[position],
                              SPECIES_NONE);
     LoadCompressedObjectPalette(&gTrainerFrontPicPaletteTable[frontPicId]);
 }
 
 void DecompressTrainerBackPic(u16 backPicId, u8 bank)
 {
-    u8 identity = GetBankPosition(bank);
+    u8 position = GetBankPosition(bank);
     DecompressPicFromTable_2(&gTrainerBackPicTable[backPicId],
-                             gMonSpritesGfxPtr->sprites[identity],
+                             gMonSpritesGfxPtr->sprites[position],
                              SPECIES_NONE);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[backPicId].data,
                           0x100 + 16 * bank, 0x20);
@@ -885,7 +885,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
     u16 paletteOffset;
     u32 personalityValue;
     u32 otId;
-    u8 identity;
+    u8 position;
     const u8 *lzPaletteData;
 
     if (notTransform)
@@ -909,7 +909,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
 
         if (IsContest())
         {
-            identity = 0;
+            position = 0;
             targetSpecies = gContestResources->field_18->field_2;
             personalityValue = gContestResources->field_18->field_8;
             otId = gContestResources->field_18->field_C;
@@ -921,7 +921,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
         }
         else
         {
-            identity = GetBankPosition(bankAtk);
+            position = GetBankPosition(bankAtk);
 
             if (GetBankSide(bankDef) == SIDE_OPPONENT)
                 targetSpecies = GetMonData(&gEnemyParty[gBattlePartyID[bankDef]], MON_DATA_SPECIES);
@@ -934,7 +934,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
                 otId = GetMonData(&gPlayerParty[gBattlePartyID[bankAtk]], MON_DATA_OT_ID);
 
                 HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[targetSpecies],
-                                                          gMonSpritesGfxPtr->sprites[identity],
+                                                          gMonSpritesGfxPtr->sprites[position],
                                                           targetSpecies,
                                                           gTransformedPersonalities[bankAtk]);
             }
@@ -944,13 +944,13 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
                 otId = GetMonData(&gEnemyParty[gBattlePartyID[bankAtk]], MON_DATA_OT_ID);
 
                 HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[targetSpecies],
-                                                          gMonSpritesGfxPtr->sprites[identity],
+                                                          gMonSpritesGfxPtr->sprites[position],
                                                           targetSpecies,
                                                           gTransformedPersonalities[bankAtk]);
             }
         }
 
-        src = gMonSpritesGfxPtr->sprites[identity];
+        src = gMonSpritesGfxPtr->sprites[position];
         dst = (void *)(VRAM + 0x10000 + gSprites[gBankSpriteIds[bankAtk]].oam.tileNum * 32);
         DmaCopy32(3, src, dst, 0x800);
         paletteOffset = 0x100 + bankAtk * 16;
@@ -981,7 +981,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
 
 void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
 {
-    u8 identity;
+    u8 position;
     s32 i;
     u32 var;
     const void *substitutePal;
@@ -989,23 +989,23 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
     if (!loadMonSprite)
     {
         if (IsContest())
-            identity = 0;
+            position = 0;
         else
-            identity = GetBankPosition(bank);
+            position = GetBankPosition(bank);
 
         if (IsContest())
-            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[identity]);
+            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[position]);
         else if (GetBankSide(bank) != SIDE_PLAYER)
-            LZDecompressVram(gSubstituteDollGfx, gMonSpritesGfxPtr->sprites[identity]);
+            LZDecompressVram(gSubstituteDollGfx, gMonSpritesGfxPtr->sprites[position]);
         else
-            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[identity]);
+            LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[position]);
 
         i = 1;
         var = bank * 16;
         substitutePal = gSubstituteDollPal;
         for (; i < 4; i++)
         {
-            register void *dmaSrc asm("r0") = gMonSpritesGfxPtr->sprites[identity];
+            register void *dmaSrc asm("r0") = gMonSpritesGfxPtr->sprites[position];
             void *dmaDst = (i * 0x800) + dmaSrc;
             u32 dmaSize = 0x800;
             DmaCopy32(3, dmaSrc, dmaDst, dmaSize);
diff --git a/src/battle_main.c b/src/battle_main.c
index b19dcace1..0fd823fa1 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -3274,46 +3274,46 @@ static void BattleIntroPrintWildMonAttacked(void)
 
 static void BattleIntroPrintOpponentSendsOut(void)
 {
-    u32 identity;
+    u32 position;
 
     if (gBattleExecBuffer)
         return;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_OPPONENT_LEFT;
+        position = B_POSITION_OPPONENT_LEFT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_OPPONENT_LEFT;
+            position = B_POSITION_OPPONENT_LEFT;
         else
-            identity = B_POSITION_PLAYER_LEFT;
+            position = B_POSITION_PLAYER_LEFT;
     }
     else
-        identity = B_POSITION_OPPONENT_LEFT;
+        position = B_POSITION_OPPONENT_LEFT;
 
-    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(identity));
+    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(position));
     gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
 }
 
 static void BattleIntroOpponent2SendsOutMonAnimation(void)
 {
-    u32 identity;
+    u32 position;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_OPPONENT_RIGHT;
+        position = B_POSITION_OPPONENT_RIGHT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_OPPONENT_RIGHT;
+            position = B_POSITION_OPPONENT_RIGHT;
         else
-            identity = B_POSITION_PLAYER_RIGHT;
+            position = B_POSITION_PLAYER_RIGHT;
     }
     else
-        identity = B_POSITION_OPPONENT_RIGHT;
+        position = B_POSITION_OPPONENT_RIGHT;
 
     for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
-        if (GetBankPosition(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == position)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3326,26 +3326,26 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void)
 #ifdef NONMATCHING
 static void BattleIntroOpponent1SendsOutMonAnimation(void)
 {
-    u32 identity;
+    u32 position;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_OPPONENT_LEFT;
+        position = B_POSITION_OPPONENT_LEFT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_OPPONENT_LEFT;
+            position = B_POSITION_OPPONENT_LEFT;
         else
-            identity = B_POSITION_PLAYER_LEFT;
+            position = B_POSITION_PLAYER_LEFT;
     }
     else
-        identity = B_POSITION_OPPONENT_LEFT;
+        position = B_POSITION_OPPONENT_LEFT;
 
     if (gBattleExecBuffer)
         return;
 
     for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
-        if (GetBankPosition(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == position)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3479,22 +3479,22 @@ static void BattleIntroPrintPlayerSendsOut(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        u8 identity;
+        u8 position;
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-            identity = B_POSITION_PLAYER_LEFT;
+            position = B_POSITION_PLAYER_LEFT;
         else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-                identity = B_POSITION_PLAYER_LEFT;
+                position = B_POSITION_PLAYER_LEFT;
             else
-                identity = B_POSITION_OPPONENT_LEFT;
+                position = B_POSITION_OPPONENT_LEFT;
         }
         else
-            identity = B_POSITION_PLAYER_LEFT;
+            position = B_POSITION_PLAYER_LEFT;
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
-            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(identity));
+            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(position));
 
         gBattleMainFunc = BattleIntroPlayer1SendsOutMonAnimation;
     }
@@ -3502,23 +3502,23 @@ static void BattleIntroPrintPlayerSendsOut(void)
 
 static void BattleIntroPlayer2SendsOutMonAnimation(void)
 {
-    u32 identity;
+    u32 position;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_PLAYER_RIGHT;
+        position = B_POSITION_PLAYER_RIGHT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_PLAYER_RIGHT;
+            position = B_POSITION_PLAYER_RIGHT;
         else
-            identity = B_POSITION_OPPONENT_RIGHT;
+            position = B_POSITION_OPPONENT_RIGHT;
     }
     else
-        identity = B_POSITION_PLAYER_RIGHT;
+        position = B_POSITION_PLAYER_RIGHT;
 
     for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
-        if (GetBankPosition(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == position)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3534,26 +3534,26 @@ static void BattleIntroPlayer2SendsOutMonAnimation(void)
 
 static void BattleIntroPlayer1SendsOutMonAnimation(void)
 {
-    u32 identity;
+    u32 position;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
-        identity = B_POSITION_PLAYER_LEFT;
+        position = B_POSITION_PLAYER_LEFT;
     else if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x80000000)
-            identity = B_POSITION_PLAYER_LEFT;
+            position = B_POSITION_PLAYER_LEFT;
         else
-            identity = B_POSITION_OPPONENT_LEFT;
+            position = B_POSITION_OPPONENT_LEFT;
     }
     else
-        identity = B_POSITION_PLAYER_LEFT;
+        position = B_POSITION_PLAYER_LEFT;
 
     if (gBattleExecBuffer)
         return;
 
     for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
-        if (GetBankPosition(gActiveBank) == identity)
+        if (GetBankPosition(gActiveBank) == position)
         {
             EmitIntroTrainerBallThrow(0);
             MarkBufferBankForExecution(gActiveBank);
@@ -3891,7 +3891,7 @@ static void HandleTurnActionSelectionState(void)
     gBattleCommunication[ACTIONS_CONFIRMED_COUNT] = 0;
     for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
     {
-        u8 identity = GetBankPosition(gActiveBank);
+        u8 position = GetBankPosition(gActiveBank);
         switch (gBattleCommunication[gActiveBank])
         {
         case STATE_TURN_START_RECORD: // recorded battle related on start of every turn
@@ -3901,9 +3901,9 @@ static void HandleTurnActionSelectionState(void)
         case STATE_BEFORE_ACTION_CHOSEN: // choose an action
             *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI
-                || !(identity & BIT_MON)
-                || gBattleStruct->field_91 & gBitTable[GetBankByPosition(identity ^ BIT_MON)]
-                || gBattleCommunication[GetBankByPosition(identity ^ BIT_MON)] == 5)
+                || !(position & BIT_MON)
+                || gBattleStruct->field_91 & gBitTable[GetBankByPosition(position ^ BIT_MON)]
+                || gBattleCommunication[GetBankByPosition(position ^ BIT_MON)] == 5)
             {
                 if (gBattleStruct->field_91 & gBitTable[gActiveBank])
                 {
@@ -4225,8 +4225,8 @@ static void HandleTurnActionSelectionState(void)
                 i = (sub_803CDB8() != 0);
 
                 if (((gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_DOUBLE)) != BATTLE_TYPE_DOUBLE)
-                    || (identity & BIT_MON)
-                    || (*(&gBattleStruct->field_91) & gBitTable[GetBankByPosition(identity ^ BIT_MON)]))
+                    || (position & BIT_MON)
+                    || (*(&gBattleStruct->field_91) & gBitTable[GetBankByPosition(position ^ BIT_MON)]))
                 {
                     EmitLinkStandbyMsg(0, 0, i);
                 }
-- 
cgit v1.2.3


From 295aa96a052d4ab7daecbc9fb5da166dd0d2a0f1 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 16 Jan 2018 23:57:26 +0100
Subject: decompile unk transition

---
 src/unk_transition.c | 633 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 633 insertions(+)
 create mode 100644 src/unk_transition.c

(limited to 'src')

diff --git a/src/unk_transition.c b/src/unk_transition.c
new file mode 100644
index 000000000..feaddc8ce
--- /dev/null
+++ b/src/unk_transition.c
@@ -0,0 +1,633 @@
+#include "global.h"
+#include "sprite.h"
+#include "decompress.h"
+#include "unk_transition.h"
+#include "battle_transition.h"
+#include "task.h"
+#include "palette.h"
+#include "trig.h"
+#include "bg.h"
+#include "gpu_regs.h"
+
+typedef bool8 (*TransitionStateFunc)(struct Task *task);
+
+// this file's functions
+static void sub_81DA848(struct Sprite *sprite);
+static void sub_81DA9BC(struct Sprite *sprite);
+static bool8 sub_81DAACC(struct Task *task);
+static bool8 sub_81DAC14(struct Task *task);
+static bool8 sub_81DABBC(struct Task *task);
+static bool8 sub_81DAB4C(struct Task *task);
+static bool8 sub_81DAC80(struct Task *task);
+static bool8 sub_81DACEC(struct Task *task);
+static bool8 sub_81DAD58(struct Task *task);
+static bool8 sub_81DADC4(struct Task *task);
+static bool8 sub_81DAE44(struct Task *task);
+static bool8 sub_81DAEB0(struct Task *task);
+static bool8 sub_81DAF34(struct Task *task);
+static bool8 sub_81DAFA0(struct Task *task);
+static bool8 sub_81DB02C(struct Task *task);
+static bool8 sub_81DB098(struct Task *task);
+static bool8 sub_81DB124(struct Task *task);
+static bool8 sub_81DB190(struct Task *task);
+static bool8 sub_81DB224(struct Task *task);
+static bool8 sub_81DB290(struct Task *task);
+static bool8 sub_81DB328(struct Task *task);
+
+// const rom data
+// TODO: move those from .s file to .c
+extern const u8 gUnknown_0862AD54[];
+extern const u8 gUnknown_0862AF30[];
+extern const u8 gUnknown_0862B0DC[];
+extern const u16 gUnknown_0862B53C[];
+
+static const struct OamData sOamData_862B71C =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct CompressedSpriteSheet sUnknown_0862B724 =
+{
+    gUnknown_0862B0DC, 0x1800, 11920
+};
+
+static const struct SpritePalette sUnknown_0862B72C =
+{
+    gUnknown_0862B53C, 11920
+};
+
+static const union AnimCmd sSpriteAnim_862B734[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862B73C[] =
+{
+    ANIMCMD_FRAME(64, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_862B744[] =
+{
+    ANIMCMD_FRAME(128, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_862B74C[] =
+{
+    sSpriteAnim_862B734,
+    sSpriteAnim_862B73C,
+    sSpriteAnim_862B744
+};
+
+static const struct SpriteTemplate sUnknown_0862B758 =
+{
+    .tileTag = 11920,
+    .paletteTag = 11920,
+    .oam = &sOamData_862B71C,
+    .anims = sSpriteAnimTable_862B74C,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const TransitionStateFunc sPhase2_34_Funcs[] =
+{
+    sub_81DAACC,
+    sub_81DAC14,
+    sub_81DABBC,
+    sub_81DAB4C,
+    sub_81DAC80
+};
+
+static const TransitionStateFunc sPhase2_35_Funcs[] =
+{
+    sub_81DAACC,
+    sub_81DACEC,
+    sub_81DABBC,
+    sub_81DAB4C,
+    sub_81DAD58
+};
+
+static const TransitionStateFunc sPhase2_36_Funcs[] =
+{
+    sub_81DAACC,
+    sub_81DADC4,
+    sub_81DABBC,
+    sub_81DAB4C,
+    sub_81DAE44
+};
+
+static const TransitionStateFunc sPhase2_37_Funcs[] =
+{
+    sub_81DAACC,
+    sub_81DAEB0,
+    sub_81DABBC,
+    sub_81DAB4C,
+    sub_81DAF34
+};
+
+static const TransitionStateFunc sPhase2_38_Funcs[] =
+{
+    sub_81DAACC,
+    sub_81DAFA0,
+    sub_81DABBC,
+    sub_81DAB4C,
+    sub_81DB02C
+};
+
+static const TransitionStateFunc sPhase2_39_Funcs[] =
+{
+    sub_81DAACC,
+    sub_81DB098,
+    sub_81DABBC,
+    sub_81DAB4C,
+    sub_81DB124
+};
+
+static const TransitionStateFunc sPhase2_40_Funcs[] =
+{
+    sub_81DAACC,
+    sub_81DB190,
+    sub_81DABBC,
+    sub_81DAB4C,
+    sub_81DB224
+};
+
+static const TransitionStateFunc sPhase2_41_Funcs[] =
+{
+    sub_81DAACC,
+    sub_81DB290,
+    sub_81DABBC,
+    sub_81DAB4C,
+    sub_81DB328
+};
+
+// code
+static void sub_81DA700(void)
+{
+    u16 *dst1, *dst2;
+
+    sub_8149F58(&dst1, &dst2);
+    LZ77UnCompVram(gUnknown_0862AD54, dst2);
+    LZ77UnCompVram(gUnknown_0862AF30, dst1);
+    LoadPalette(gUnknown_0862B53C, 0xF0, 0x20);
+    LoadCompressedObjectPic(&sUnknown_0862B724);
+    LoadSpritePalette(&sUnknown_0862B72C);
+}
+
+static u8 sub_81DA74C(s16 x, s16 y, u8 arg2, u8 arg3, s8 arg4, s8 arg5, u8 spriteAnimNum)
+{
+    u8 spriteId = CreateSprite(&sUnknown_0862B758, x, y, 0);
+
+    switch (spriteAnimNum)
+    {
+    case 0:
+        gSprites[spriteId].data[0] = 120;
+        gSprites[spriteId].data[1] = 45;
+        break;
+    case 1:
+        gSprites[spriteId].data[0] = 89;
+        gSprites[spriteId].data[1] = 97;
+        break;
+    case 2:
+        gSprites[spriteId].data[0] = 151;
+        gSprites[spriteId].data[1] = 97;
+        break;
+    }
+
+    gSprites[spriteId].data[2] = arg4;
+    gSprites[spriteId].data[3] = arg5;
+    gSprites[spriteId].data[6] = arg2;
+    gSprites[spriteId].data[7] = arg3;
+    gSprites[spriteId].data[4] = 0;
+    gSprites[spriteId].data[5] = 0;
+
+    StartSpriteAnim(&gSprites[spriteId], spriteAnimNum);
+    gSprites[spriteId].callback = sub_81DA848;
+
+    return spriteId;
+}
+
+static void sub_81DA848(struct Sprite *sprite)
+{
+    s16 *data = sprite->data;
+
+    if (sprite->pos1.x == data[0] && sprite->pos1.y == data[1])
+    {
+        sprite->callback = SpriteCallbackDummy;
+    }
+    else
+    {
+        if (data[4] == data[6])
+        {
+            sprite->pos1.x += data[2];
+            data[4] = 0;
+        }
+        else
+        {
+            data[4]++;
+        }
+
+        if (data[5] == data[7])
+        {
+            sprite->pos1.y += data[3];
+            data[5] = 0;
+        }
+        else
+        {
+            data[5]++;
+        }
+    }
+}
+
+static u8 sub_81DA8BC(s16 x, s16 y, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, u8 spriteAnimNum)
+{
+    u8 spriteId = CreateSprite(&sUnknown_0862B758, x, y, 0);
+
+    switch (spriteAnimNum)
+    {
+    case 0:
+        gSprites[spriteId].data[0] = 120;
+        gSprites[spriteId].data[1] = 45;
+        break;
+    case 1:
+        gSprites[spriteId].data[0] = 89;
+        gSprites[spriteId].data[1] = 97;
+        break;
+    case 2:
+        gSprites[spriteId].data[0] = 151;
+        gSprites[spriteId].data[1] = 97;
+        break;
+    }
+
+    gSprites[spriteId].data[2] = arg2;
+    gSprites[spriteId].data[3] = arg3;
+    gSprites[spriteId].data[4] = arg4;
+    gSprites[spriteId].data[5] = arg5;
+    gSprites[spriteId].data[6] = arg6;
+
+    StartSpriteAnim(&gSprites[spriteId], spriteAnimNum);
+    gSprites[spriteId].callback = sub_81DA9BC;
+
+    return spriteId;
+}
+
+static void sub_81DA9BC(struct Sprite *sprite)
+{
+    sprite->pos2.x = (Sin2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096
+    sprite->pos2.y = (Cos2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096
+
+    sprite->data[2] = (sprite->data[2] + sprite->data[3]) % 360;
+
+    if (sprite->data[4] != sprite->data[5])
+        sprite->data[4] += sprite->data[6];
+    else
+        sprite->callback = SpriteCallbackDummy;
+}
+
+#define tState          data[0]
+
+static void sub_81DAA20(struct Task *task)
+{
+    FreeSpriteTilesByTag(11920);
+    FreeSpritePaletteByTag(11920);
+
+    DestroySprite(&gSprites[task->data[4]]);
+    DestroySprite(&gSprites[task->data[5]]);
+    DestroySprite(&gSprites[task->data[6]]);
+}
+
+static bool8 sub_81DAA74(struct Task *task)
+{
+    if (gSprites[task->data[4]].callback == SpriteCallbackDummy
+        && gSprites[task->data[5]].callback == SpriteCallbackDummy
+        && gSprites[task->data[6]].callback == SpriteCallbackDummy)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static bool8 sub_81DAACC(struct Task *task)
+{
+    if (task->data[1] == 0)
+    {
+        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
+        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON);
+        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON);
+
+        task->data[1]++;
+        return FALSE;
+    }
+    else
+    {
+        sub_81DA700();
+        SetGpuReg(REG_OFFSET_BLDCNT, 0x3F41);
+        SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000);
+        ChangeBgX(0, 0, 0);
+        ChangeBgY(0, 0, 0);
+        ChangeBgY(0, 0x500, 2);
+
+        task->data[1] = 0;
+        task->tState++;
+        return TRUE;
+    }
+}
+
+static bool8 sub_81DAB4C(struct Task *task)
+{
+    if (task->data[2] == 0)
+        SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON);
+
+    if (task->data[2] == 16)
+    {
+        if (task->data[3] == 31)
+        {
+            BeginNormalPaletteFade(-1, -1, 0, 0x10, 0);
+            task->tState++;
+        }
+        else
+        {
+            task->data[3]++;
+        }
+    }
+    else
+    {
+        u16 var;
+
+        task->data[2]++;
+        var = task->data[2];
+        SetGpuReg(REG_OFFSET_BLDALPHA, (var) | ((16 - var) << 8));
+    }
+
+    return FALSE;
+}
+
+static bool8 sub_81DABBC(struct Task *task)
+{
+    if (sub_81DAA74(task) == TRUE)
+        task->tState++;
+
+    return FALSE;
+}
+
+void Phase2Task_34(u8 taskId)
+{
+    while (sPhase2_34_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 sub_81DAC14(struct Task *task)
+{
+    task->data[4] = sub_81DA74C(120, -51, 0, 0, 0,   2, 0);
+    task->data[5] = sub_81DA74C(-7,  193, 0, 0, 2,  -2, 1);
+    task->data[6] = sub_81DA74C(247, 193, 0, 0, -2, -2, 2);
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 sub_81DAC80(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_81DAA20(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_34));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_35(u8 taskId)
+{
+    while (sPhase2_35_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 sub_81DACEC(struct Task *task)
+{
+    task->data[4] = sub_81DA74C(120, 197, 0, 0, 0, -4, 0);
+    task->data[5] = sub_81DA74C(241, 59,  0, 1, -4, 2, 1);
+    task->data[6] = sub_81DA74C(-1,  59,  0, 1, 4,  2, 2);
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 sub_81DAD58(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_81DAA20(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_35));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_36(u8 taskId)
+{
+    while (sPhase2_36_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 sub_81DADC4(struct Task *task)
+{
+    task->data[4] = sub_81DA8BC(120, 45, 12,  4, 128, 0, -4, 0);
+    task->data[5] = sub_81DA8BC(89,  97, 252, 4, 128, 0, -4, 1);
+    task->data[6] = sub_81DA8BC(151, 97, 132, 4, 128, 0, -4, 2);
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 sub_81DAE44(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_81DAA20(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_36));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_37(u8 taskId)
+{
+    while (sPhase2_37_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 sub_81DAEB0(struct Task *task)
+{
+    task->data[4] = sub_81DA8BC(120, 80, 284, 8, 131, 35, -3, 0);
+    task->data[5] = sub_81DA8BC(120, 80, 44,  8, 131, 35, -3, 1);
+    task->data[6] = sub_81DA8BC(121, 80, 164, 8, 131, 35, -3, 2);
+
+    task->tState++;
+    return FALSE;
+}
+
+static bool8 sub_81DAF34(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_81DAA20(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_37));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_38(u8 taskId)
+{
+    while (sPhase2_38_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 sub_81DAFA0(struct Task *task)
+{
+    if (task->data[1] == 0)
+    {
+        task->data[4] = sub_81DA74C(120, -51, 0, 0, 0, 4,  0);
+    }
+    else if (task->data[1] == 16)
+    {
+        task->data[5] = sub_81DA74C(-7,  193, 0, 0, 4, -4, 1);
+    }
+    else if (task->data[1] == 32)
+    {
+        task->data[6] = sub_81DA74C(247, 193, 0, 0, -4, -4, 2);
+        task->tState++;
+    }
+
+    task->data[1]++;
+    return FALSE;
+}
+
+static bool8 sub_81DB02C(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_81DAA20(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_38));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_39(u8 taskId)
+{
+    while (sPhase2_39_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 sub_81DB098(struct Task *task)
+{
+    if (task->data[1] == 0)
+    {
+        task->data[4] = sub_81DA74C(120, 197, 0, 0, 0, -8,  0);
+    }
+    else if (task->data[1] == 16)
+    {
+        task->data[5] = sub_81DA74C(241, 78,  0, 0, -8, 1,  1);
+    }
+    else if (task->data[1] == 32)
+    {
+        task->data[6] = sub_81DA74C(-1,  78,  0, 0, 8,  1,  2);
+        task->tState++;
+    }
+
+    task->data[1]++;
+    return FALSE;
+}
+
+static bool8 sub_81DB124(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_81DAA20(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_39));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_40(u8 taskId)
+{
+    while (sPhase2_40_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 sub_81DB190(struct Task *task)
+{
+    if (task->data[1] == 0)
+    {
+        task->data[4] = sub_81DA8BC(120, 45, 12,  4, 128, 0, -4, 0);
+    }
+    else if (task->data[1] == 16)
+    {
+        task->data[5] = sub_81DA8BC(89,  97, 252, 4, 128, 0, -4, 1);
+    }
+    else if (task->data[1] == 32)
+    {
+        task->data[6] = sub_81DA8BC(151, 97, 132, 4, 128, 0, -4, 2);
+        task->tState++;
+    }
+
+    task->data[1]++;
+    return FALSE;
+}
+
+static bool8 sub_81DB224(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_81DAA20(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_40));
+    }
+
+    return FALSE;
+}
+
+void Phase2Task_41(u8 taskId)
+{
+    while (sPhase2_41_Funcs[gTasks[taskId].tState](&gTasks[taskId]));
+}
+
+static bool8 sub_81DB290(struct Task *task)
+{
+    if (task->data[1] == 0)
+    {
+        task->data[4] = sub_81DA8BC(120, 80, 284, 8, 131, 35, -3, 0);
+    }
+    else if (task->data[1] == 16)
+    {
+        task->data[5] = sub_81DA8BC(120, 80, 44,  8, 131, 35, -3, 1);
+    }
+    else if (task->data[1] == 32)
+    {
+        task->data[6] = sub_81DA8BC(121, 80, 164, 8, 131, 35, -3, 2);
+        task->tState++;
+    }
+
+    task->data[1]++;
+    return FALSE;
+}
+
+static bool8 sub_81DB328(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_81DAA20(task);
+        DestroyTask(FindTaskIdByFunc(Phase2Task_41));
+    }
+
+    return FALSE;
+}
-- 
cgit v1.2.3


From 6fa557c2ec0999196b0334431573c263e93f9bd3 Mon Sep 17 00:00:00 2001
From: Thomas Winwood <twwinwood@gmail.com>
Date: Wed, 17 Jan 2018 19:33:23 +0000
Subject: Document sub_814F8F8, sub_814F950 and sUnknownMoveTable

These are left over from the Japanese games, which provide more variation to
the attack string than the English games.
---
 src/battle_message.c | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/battle_message.c b/src/battle_message.c
index e37a4c30c..3fa3d0563 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1324,6 +1324,8 @@ const u8 gText_BattleRecordedOnPass[] = _("{B_PLAYER_NAME}’s battle result was
 const u8 gText_LinkTrainerWantsToBattlePause[] = _("{B_20}\nwants to battle!{PAUSE 49}");
 const u8 gText_TwoLinkTrainersWantToBattlePause[] = _("{B_20} and {B_21}\nwant to battle!{PAUSE 49}");
 
+// This is four lists of moves which use a different attack string in Japanese
+// to the default. See the documentation for sub_814F950 for more detail.
 static const u16 sUnknownMoveTable[] =
 {
     MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_GROWTH,
@@ -1338,16 +1340,16 @@ static const u16 sUnknownMoveTable[] =
     MOVE_TRICK, MOVE_ASSIST, MOVE_INGRAIN, MOVE_KNOCK_OFF,
     MOVE_CAMOUFLAGE, MOVE_ASTONISH, MOVE_ODOR_SLEUTH,
     MOVE_GRASS_WHISTLE, MOVE_SHEER_COLD, MOVE_MUDDY_WATER,
-    MOVE_IRON_DEFENSE, MOVE_BOUNCE, MOVE_NONE,
+    MOVE_IRON_DEFENSE, MOVE_BOUNCE, 0,
 
     MOVE_TELEPORT, MOVE_RECOVER, MOVE_BIDE, MOVE_AMNESIA,
-    MOVE_FLAIL, MOVE_TAUNT, MOVE_BULK_UP, MOVE_NONE,
+    MOVE_FLAIL, MOVE_TAUNT, MOVE_BULK_UP, 0,
 
     MOVE_MEDITATE, MOVE_AGILITY, MOVE_MIMIC, MOVE_DOUBLE_TEAM,
     MOVE_BARRAGE, MOVE_TRANSFORM, MOVE_STRUGGLE, MOVE_SCARY_FACE,
     MOVE_CHARGE, MOVE_WISH, MOVE_BRICK_BREAK, MOVE_YAWN,
     MOVE_FEATHER_DANCE, MOVE_TEETER_DANCE, MOVE_MUD_SPORT,
-    MOVE_FAKE_TEARS, MOVE_WATER_SPORT, MOVE_CALM_MIND, MOVE_NONE,
+    MOVE_FAKE_TEARS, MOVE_WATER_SPORT, MOVE_CALM_MIND, 0,
 
     MOVE_POUND, MOVE_SCRATCH, MOVE_VICE_GRIP,
     MOVE_WING_ATTACK, MOVE_FLY, MOVE_BIND, MOVE_SLAM,
@@ -1361,7 +1363,7 @@ static const u16 sUnknownMoveTable[] =
     MOVE_FORESIGHT, MOVE_CHARM, MOVE_ATTRACT, MOVE_ROCK_SMASH,
     MOVE_UPROAR, MOVE_SPIT_UP, MOVE_SWALLOW, MOVE_TORMENT,
     MOVE_FLATTER, MOVE_ROLE_PLAY, MOVE_ENDEAVOR, MOVE_TICKLE,
-    MOVE_COVET, MOVE_NONE
+    MOVE_COVET, 0
 };
 
 static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS, EOS, 0, 0};
@@ -2330,6 +2332,10 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
     }
 }
 
+// Loads one of two text strings into the provided buffer. This is functionally
+// unused, since the value loaded into the buffer is not read; it loaded one of
+// two particles (either "は" or "の") which works in tandem with sub_814F950
+// below to effect changes in the meaning of the line.
 static void sub_814F8F8(u8* textBuff)
 {
     s32 counter = 0;
@@ -2337,7 +2343,7 @@ static void sub_814F8F8(u8* textBuff)
 
     while (counter != 4)
     {
-        if (sUnknownMoveTable[i] == MOVE_NONE)
+        if (sUnknownMoveTable[i] == 0)
             counter++;
         if (sUnknownMoveTable[i++] == gStringInfo->currentMove)
             break;
@@ -2352,6 +2358,24 @@ static void sub_814F8F8(u8* textBuff)
     }
 }
 
+// Appends "!" to the text buffer `dst`. In the original Japanese this looked
+// into the table of moves at sUnknownMoveTable and varied the line accordingly.
+// 
+// gText_ExclamationMark was a plain "!", used for any attack not on the list.
+// It resulted in the translation "<NAME>'s <ATTACK>!".
+// 
+// gText_ExclamationMark2 was "を つかった！". This resulted in the translation
+// "<NAME> used <ATTACK>!", which was used for all attacks in English.
+// 
+// gText_ExclamationMark3 was "した！". This was used for those moves whose
+// names were verbs, such as Recover, and resulted in translations like "<NAME>
+// recovered itself!".
+// 
+// gText_ExclamationMark4 was "を した！" This resulted in a translation of
+// "<NAME> did an <ATTACK>!".
+// 
+// gText_ExclamationMark5 was " こうげき！" This resulted in a translation of
+// "<NAME>'s <ATTACK> attack!".
 static void sub_814F950(u8* dst)
 {
     s32 counter = 0;
-- 
cgit v1.2.3


From c74334c26a1565b3cae586efd2f8a07a8bb0f912 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Fri, 19 Jan 2018 12:49:08 -0600
Subject: Fix address of berry struct in item.c

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

(limited to 'src')

diff --git a/src/item.c b/src/item.c
index 931027e25..a17599db9 100644
--- a/src/item.c
+++ b/src/item.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "item.h"
+#include "berry.h"
 #include "constants/items.h"
 #include "string_util.h"
 #include "text.h"
@@ -11,7 +12,6 @@ extern bool8 InBattlePyramid(void);
 extern const u8 gText_PokeBalls[];
 extern const u8 gText_Berries[];
 extern const u8 gText_Berry[];
-extern const u8 gUnknown_085897E4[][28]; // not sure what this one is
 
 bool8 CheckPyramidBagHasItem(u16 itemId, u16 count);
 bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count);
@@ -96,8 +96,8 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity)
     }
     else
     {
-        if (itemId >= 0x85 && itemId <= 0xAF)
-            GetBerryCountString(string, gUnknown_085897E4[itemId], quantity);
+        if (itemId >= ITEM_CHERI_BERRY && itemId <= ITEM_ENIGMA_BERRY)
+            GetBerryCountString(string, gBerries[itemId - ITEM_CHERI_BERRY].name, quantity);
         else
             StringCopy(string, ItemId_GetItem(itemId)->name);
     }
-- 
cgit v1.2.3


From c408110319885748b4fcc696063242c7002f4d30 Mon Sep 17 00:00:00 2001
From: Devin <easyaspi314@users.noreply.github.com>
Date: Fri, 19 Jan 2018 15:06:49 -0500
Subject: Fix file permissions.

---
 src/braille_puzzles.c        | 0
 src/clear_save_data_screen.c | 0
 src/diploma.c                | 0
 src/field_map_obj.c          | 0
 src/field_special_scene.c    | 0
 src/libisagbprn.c            | 0
 src/pokemon_summary_screen.c | 0
 src/save_failed_screen.c     | 0
 src/save_location.c          | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 src/braille_puzzles.c
 mode change 100755 => 100644 src/clear_save_data_screen.c
 mode change 100755 => 100644 src/diploma.c
 mode change 100755 => 100644 src/field_map_obj.c
 mode change 100755 => 100644 src/field_special_scene.c
 mode change 100755 => 100644 src/libisagbprn.c
 mode change 100755 => 100644 src/pokemon_summary_screen.c
 mode change 100755 => 100644 src/save_failed_screen.c
 mode change 100755 => 100644 src/save_location.c

(limited to 'src')

diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
old mode 100755
new mode 100644
diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c
old mode 100755
new mode 100644
diff --git a/src/diploma.c b/src/diploma.c
old mode 100755
new mode 100644
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
old mode 100755
new mode 100644
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
old mode 100755
new mode 100644
diff --git a/src/libisagbprn.c b/src/libisagbprn.c
old mode 100755
new mode 100644
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
old mode 100755
new mode 100644
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
old mode 100755
new mode 100644
diff --git a/src/save_location.c b/src/save_location.c
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 098671750b2ccc4be5815da7cab6d78c8b7eccc4 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sat, 20 Jan 2018 00:49:21 -0600
Subject: Extract data from text window

---
 src/save_failed_screen.c | 8 ++++----
 src/text_window.c        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 218ef68d7..efe38fbae 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -21,9 +21,9 @@ extern const u8 gBirchHelpGfx[];
 extern const u8 gBirchBagTilemap[];
 extern const u8 gBirchGrassTilemap[];
 extern const u16 gBirchBagGrassPal[];
-extern const u16 gUnknown_0850FEFC[];
+extern const u16 gTextWindowFrame1_Pal[];
 extern const u16 gUnknown_0860F074[];
-extern const u32 gUnknown_0850E87C[];
+extern const u32 gTextWindowFrame1_Gfx[];
 extern struct SaveSection gSaveDataBuffer;
 
 extern u8 gText_SaveFailedCheckingBackup[];
@@ -226,7 +226,7 @@ static void CB2_SaveFailedScreen(void)
             InitBgsFromTemplates(0, gUnknown_085EFD88, 3);
             SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]);
             CpuFill32(0, &gDecompressionBuffer[0x2000], 0x800);
-            LoadBgTiles(0, gUnknown_0850E87C, 0x120, 0x214);
+            LoadBgTiles(0, gTextWindowFrame1_Gfx, 0x120, 0x214);
             InitWindows(gUnknown_085EFD94);
             // AddWindowWithoutTileMap returns a u16/integer, but the info is clobbered into a u8 here resulting in lost info. Bug?
             gSaveFailedWindowIds[TEXT_WIN_ID] = AddWindowWithoutTileMap(gUnknown_085EFD9C);
@@ -239,7 +239,7 @@ static void CB2_SaveFailedScreen(void)
             ResetPaletteFade();
             LoadPalette(gBirchBagGrassPal, 0, 0x40);
             LoadPalette(sSaveFailedClockPal, 0x100, 0x20);
-            LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20);
+            LoadPalette(gTextWindowFrame1_Pal, 0xE0, 0x20);
             LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
             SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE);
             SetWindowBorderStyle(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE);
diff --git a/src/text_window.c b/src/text_window.c
index 336536c04..c5334b11e 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -8,7 +8,7 @@ extern u8 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset);
 extern void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette);
 
 extern const struct TilesPal gUnknown_0851021C[];
-extern const u32 gUnknown_08DDD748[];
+extern const u32 gMessageBox_Gfx[];
 extern const u16 gUnknown_0851017C[];
 extern const u16 gUnknown_08DDD728[];
 
@@ -22,7 +22,7 @@ const struct TilesPal* sub_8098758(u8 id)
 
 void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset)
 {
-    LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gUnknown_08DDD748, 0x1C0, destOffset);
+    LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gMessageBox_Gfx, 0x1C0, destOffset);
     LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20);
 }
 
-- 
cgit v1.2.3


From b47b9e57589cbe0334a5a370d35bd44592c806e3 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sat, 20 Jan 2018 16:22:16 -0600
Subject: Extract data from starter_choose

---
 src/starter_choose.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/starter_choose.c b/src/starter_choose.c
index 2d78af8fb..c2c553d46 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -74,7 +74,7 @@ static void Task_MoveStarterChooseCursor(u8 taskId);
 static void sub_8134668(u8 taskId);
 static void CreateStarterPokemonLabel(u8 selection);
 static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y);
-static void StarterPokemonSpriteCallback(struct Sprite *sprite);
+void StarterPokemonSpriteCallback(struct Sprite *sprite);
 
 static IWRAM_DATA u16 sStarterChooseWindowId;
 
@@ -361,7 +361,7 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
     return spriteId;
 }
 
-static void sub_81346DC(struct Sprite *sprite)
+void sub_81346DC(struct Sprite *sprite)
 {
     sprite->pos1.x = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][0];
     sprite->pos1.y = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][1];
@@ -369,7 +369,7 @@ static void sub_81346DC(struct Sprite *sprite)
     sprite->data[1] = (u8)(sprite->data[1]) + 4;
 }
 
-static void sub_813473C(struct Sprite *sprite)
+void sub_813473C(struct Sprite *sprite)
 {
     if (gTasks[sprite->data[0]].tStarterSelection == sprite->data[1])
         StartSpriteAnimIfDifferent(sprite, 1);
@@ -377,7 +377,7 @@ static void sub_813473C(struct Sprite *sprite)
         StartSpriteAnimIfDifferent(sprite, 0);
 }
 
-static void StarterPokemonSpriteCallback(struct Sprite *sprite)
+void StarterPokemonSpriteCallback(struct Sprite *sprite)
 {
     //Move sprite to upper center of screen
     if (sprite->pos1.x > STARTER_PKMN_POS_X)
-- 
cgit v1.2.3


From 59e1aacd26207f6bcbd1d0107886627c53950a7c Mon Sep 17 00:00:00 2001
From: golem galvanize <golemgalvanize@github.com>
Date: Sat, 20 Jan 2018 17:26:30 -0500
Subject: DIEGO SEND HELP

---
 src/mail.c | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'src')

diff --git a/src/mail.c b/src/mail.c
index 68a55e242..ca3531786 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -240,30 +240,6 @@ static const struct MailLayout sUnknown_0859F458[] = {
     { 0x05, 0x09, 0x60, 0x05, 0x1e, Unknown_0859F444 }
 };
 
-// What the heck are these meant to be? Call them u16 for now.
-
-static const u16 Unknown_0859F4E8[] = {
-    0x00, 0x4000, 0x00, 0x00
-};
-
-static const u16 Unknown_0859F4F0[] = {
-    0x00, 0x00, -1, 0x00
-};
-
-static const u16 Unknown_0859F4F8[] = {
-    0x04, 0x00, -1, 0x00
-};
-
-static const u16 Unknown_0859F500[] = {
-    0x00, 0x40, -1, 0x00
-};
-
-static const u16 *const sUnknown_0859F508[] = {
-    Unknown_0859F4F0,
-    Unknown_0859F4F8,
-    Unknown_0859F500
-};
-
 // .text
 
 void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag)
-- 
cgit v1.2.3


From 0bc7fb92db8658c461f81ef57bc9bc4f3ee80c7b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 21 Jan 2018 12:36:11 +0100
Subject: start decompiling mystery event script

---
 src/mystery_event_msg.c    |  13 ++
 src/mystery_event_script.c | 396 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 409 insertions(+)
 create mode 100644 src/mystery_event_msg.c
 create mode 100644 src/mystery_event_script.c

(limited to 'src')

diff --git a/src/mystery_event_msg.c b/src/mystery_event_msg.c
new file mode 100644
index 000000000..74261179b
--- /dev/null
+++ b/src/mystery_event_msg.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+const u8 gText_MysteryGiftBerry[] = _("Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.");
+const u8 gText_MysteryGiftBerryTransform[] = _("The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.");
+const u8 gText_MysteryGiftBerryObtained[] = _("The {STR_VAR_1} BERRY has already been\nobtained.");
+const u8 gText_MysteryGiftSpecialRibbon[] = _("A special RIBBON was awarded to\nyour party POKéMON.");
+const u8 gText_MysteryGiftNationalDex[] = _("The POKéDEX has been upgraded\nwith the NATIONAL MODE.");
+const u8 gText_MysteryGiftRareWord[] = _("A rare word has been added.");
+const u8 gText_MysteryGiftSentOver[] = _("{STR_VAR_1} was sent over!");
+const u8 gText_MysteryGiftFullParty[] = _("Your party is full.\n{STR_VAR_1} could not be sent over.");
+const u8 gText_MysteryGiftNewTrainer[] = _("A new TRAINER has arrived in\nHOENN.");
+const u8 gText_MysteryGiftNewAdversaryInBattleTower[] = _("A new adversary has arrived in the\nBATTLE TOWER.");
+const u8 gText_MysteryGiftCantBeUsed[] = _("This data can’t be used in\nthis version.");
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
new file mode 100644
index 000000000..d64c2c69e
--- /dev/null
+++ b/src/mystery_event_script.c
@@ -0,0 +1,396 @@
+#include "global.h"
+#include "berry.h"
+#include "battle_tower.h"
+#include "easy_chat.h"
+#include "event_data.h"
+#include "mail.h"
+#include "mystery_event_script.h"
+#include "pokedex.h"
+#include "pokemon.h"
+#include "pokemon_size_record.h"
+#include "script.h"
+#include "constants/species.h"
+#include "strings.h"
+#include "string_util.h"
+#include "text.h"
+#include "util.h"
+#include "mystery_event_msg.h"
+#include "pokemon_storage_system.h"
+
+extern void sub_811EFC0(u8);
+extern void ValidateEReaderTrainer(void);
+
+extern ScrCmdFunc gMysteryEventScriptCmdTable[];
+extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];
+
+#define LANGUAGE_MASK 0x1
+#define VERSION_MASK 0x200
+
+EWRAM_DATA struct ScriptContext sMysteryEventScriptContext = {0};
+
+static bool32 CheckCompatibility(u16 a1, u32 a2, u16 a3, u32 a4)
+{
+    if (!(a1 & LANGUAGE_MASK))
+        return FALSE;
+
+    if (!(a2 & LANGUAGE_MASK))
+        return FALSE;
+
+    if (!(a3 & 0x4))
+        return FALSE;
+
+    if (!(a4 & VERSION_MASK))
+        return FALSE;
+
+    return TRUE;
+}
+
+static void SetIncompatible(void)
+{
+    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftCantBeUsed);
+    SetMysteryEventScriptStatus(3);
+}
+
+static void InitMysteryEventScript(struct ScriptContext *ctx, u8 *script)
+{
+    InitScriptContext(ctx, gMysteryEventScriptCmdTable, gMysteryEventScriptCmdTableEnd);
+    SetupBytecodeScript(ctx, script);
+    ctx->data[0] = (u32)script;
+    ctx->data[1] = 0;
+    ctx->data[2] = 0;
+    ctx->data[3] = 0;
+}
+
+static bool32 RunMysteryEventScriptCommand(struct ScriptContext *ctx)
+{
+    if (RunScriptCommand(ctx) && ctx->data[3])
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void sub_8153870(u8 *script)
+{
+    InitMysteryEventScript(&sMysteryEventScriptContext, script);
+}
+
+bool32 sub_8153884(u32 *a0)
+{
+    bool32 ret = RunMysteryEventScriptCommand(&sMysteryEventScriptContext);
+    *a0 = sMysteryEventScriptContext.data[2];
+
+    return ret;
+}
+
+u32 RunMysteryEventScript(u8 *script)
+{
+    struct ScriptContext *ctx = &sMysteryEventScriptContext;
+    InitMysteryEventScript(ctx, script);
+    while (RunMysteryEventScriptCommand(ctx))
+        ;
+    return ctx->data[2];
+}
+
+void SetMysteryEventScriptStatus(u32 val)
+{
+    sMysteryEventScriptContext.data[2] = val;
+}
+
+static int CalcRecordMixingGiftChecksum(void)
+{
+    unsigned int i;
+    int sum = 0;
+    u8 *data = (u8*)(&gSaveBlock1Ptr->recordMixingGift.data);
+
+    for (i = 0; i < sizeof(gSaveBlock1Ptr->recordMixingGift.data); i++)
+        sum += data[i];
+
+    return sum;
+}
+
+static bool32 IsRecordMixingGiftValid(void)
+{
+    struct RecordMixingGiftData *data = &gSaveBlock1Ptr->recordMixingGift.data;
+    int checksum = CalcRecordMixingGiftChecksum();
+
+    if (data->unk0 == 0
+        || data->quantity == 0
+        || data->itemId == 0
+        || checksum == 0
+        || checksum != gSaveBlock1Ptr->recordMixingGift.checksum)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+static void ClearRecordMixingGift(void)
+{
+    CpuFill16(0, &gSaveBlock1Ptr->recordMixingGift, sizeof(gSaveBlock1Ptr->recordMixingGift));
+}
+
+static void SetRecordMixingGift(u8 unk, u8 quantity, u16 itemId)
+{
+    if (!unk || !quantity || !itemId)
+    {
+        ClearRecordMixingGift();
+    }
+    else
+    {
+        gSaveBlock1Ptr->recordMixingGift.data.unk0 = unk;
+        gSaveBlock1Ptr->recordMixingGift.data.quantity = quantity;
+        gSaveBlock1Ptr->recordMixingGift.data.itemId = itemId;
+        gSaveBlock1Ptr->recordMixingGift.checksum = CalcRecordMixingGiftChecksum();
+    }
+}
+
+u16 GetRecordMixingGift(void)
+{
+    struct RecordMixingGiftData *data = &gSaveBlock1Ptr->recordMixingGift.data;
+
+    if (!IsRecordMixingGiftValid())
+    {
+        ClearRecordMixingGift();
+        return 0;
+    }
+    else
+    {
+        u16 itemId = data->itemId;
+        data->quantity--;
+        if (data->quantity == 0)
+            ClearRecordMixingGift();
+        else
+            gSaveBlock1Ptr->recordMixingGift.checksum = CalcRecordMixingGiftChecksum();
+
+        return itemId;
+    }
+}
+
+bool8 MEScrCmd_end(struct ScriptContext *ctx)
+{
+    StopScript(ctx);
+    return TRUE;
+}
+
+bool8 MEScrCmd_checkcompat(struct ScriptContext *ctx)
+{
+    u16 v1;
+    u32 v2;
+    u16 v3;
+    u32 v4;
+
+    ctx->data[1] = ScriptReadWord(ctx);
+    v1 = ScriptReadHalfword(ctx);
+    v2 = ScriptReadWord(ctx);
+    v3 = ScriptReadHalfword(ctx);
+    v4 = ScriptReadWord(ctx);
+
+    if (CheckCompatibility(v1, v2, v3, v4) == TRUE)
+        ctx->data[3] = 1;
+    else
+        SetIncompatible();
+
+    return TRUE;
+}
+
+bool8 MEScrCmd_nop(struct ScriptContext *ctx)
+{
+    return FALSE;
+}
+
+bool8 MEScrCmd_setstatus(struct ScriptContext *ctx)
+{
+    u8 value = ScriptReadByte(ctx);
+    ctx->data[2] = value;
+    return FALSE;
+}
+
+bool8 MEScrCmd_setmsg(struct ScriptContext *ctx)
+{
+    u8 value = ScriptReadByte(ctx);
+    u8 *str = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    if (value == 255 || value == ctx->data[2])
+        StringExpandPlaceholders(gStringVar4, str);
+    return FALSE;
+}
+
+bool8 MEScrCmd_runscript(struct ScriptContext *ctx)
+{
+    u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    ScriptContext2_RunNewScript(script);
+    return FALSE;
+}
+
+bool8 MEScrCmd_setenigmaberry(struct ScriptContext *ctx)
+{
+    u8 *str;
+    const u8 *message;
+    bool32 haveBerry = IsEnigmaBerryValid();
+    u8 *berry = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    StringCopyN(gStringVar1, gSaveBlock1Ptr->enigmaBerry.berry.name, BERRY_NAME_COUNT);
+    SetEnigmaBerry(berry);
+    StringCopyN(gStringVar2, gSaveBlock1Ptr->enigmaBerry.berry.name, BERRY_NAME_COUNT);
+
+    if (!haveBerry)
+    {
+        str = gStringVar4;
+        message = gText_MysteryGiftBerry;
+    }
+    else if (StringCompare(gStringVar1, gStringVar2))
+    {
+        str = gStringVar4;
+        message = gText_MysteryGiftBerryTransform;
+    }
+    else
+    {
+        str = gStringVar4;
+        message = gText_MysteryGiftBerryObtained;
+    }
+
+    StringExpandPlaceholders(str, message);
+
+    ctx->data[2] = 2;
+
+    if (IsEnigmaBerryValid() == TRUE)
+        VarSet(VAR_ENIGMA_BERRY_AVAILABLE, 1);
+    else
+        ctx->data[2] = 1;
+
+    return FALSE;
+}
+
+bool8 MEScrCmd_giveribbon(struct ScriptContext *ctx)
+{
+    u8 index = ScriptReadByte(ctx);
+    u8 ribbonId = ScriptReadByte(ctx);
+    GiveGiftRibbonToParty(index, ribbonId);
+    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftSpecialRibbon);
+    ctx->data[2] = 2;
+    return FALSE;
+}
+
+bool8 MEScrCmd_initramscript(struct ScriptContext *ctx)
+{
+    u8 mapGroup = ScriptReadByte(ctx);
+    u8 mapNum = ScriptReadByte(ctx);
+    u8 objectId = ScriptReadByte(ctx);
+    u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    u8 *scriptEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    InitRamScript(script, scriptEnd - script, mapGroup, mapNum, objectId);
+    return FALSE;
+}
+
+bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx)
+{
+    EnableNationalPokedex();
+    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNationalDex);
+    ctx->data[2] = 2;
+    return FALSE;
+}
+
+bool8 MEScrCmd_addrareword(struct ScriptContext *ctx)
+{
+    sub_811EFC0(ScriptReadByte(ctx));
+    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftRareWord);
+    ctx->data[2] = 2;
+    return FALSE;
+}
+
+bool8 MEScrCmd_setrecordmixinggift(struct ScriptContext *ctx)
+{
+    u8 unk = ScriptReadByte(ctx);
+    u8 quantity = ScriptReadByte(ctx);
+    u16 itemId = ScriptReadHalfword(ctx);
+    SetRecordMixingGift(unk, quantity, itemId);
+    return FALSE;
+}
+
+bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
+{
+    struct MailStruct mail;
+    struct Pokemon pokemon;
+    u16 species;
+    u16 heldItem;
+    u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0];
+    void *pokemonPtr = (void *)data;
+    void *mailPtr = (void *)(data + sizeof(struct Pokemon));
+
+    pokemon = *(struct Pokemon *)pokemonPtr;
+    species = GetMonData(&pokemon, MON_DATA_SPECIES2);
+
+    if (species == SPECIES_EGG)
+        StringCopyN(gStringVar1, gText_EggNickname, POKEMON_NAME_LENGTH + 1);
+    else
+        StringCopyN(gStringVar1, gText_Pokemon, POKEMON_NAME_LENGTH + 1);
+
+    if (gPlayerPartyCount == PARTY_SIZE)
+    {
+        StringExpandPlaceholders(gStringVar4, gText_MysteryGiftFullParty);
+        ctx->data[2] = 3;
+    }
+    else
+    {
+        memcpy(&gPlayerParty[5], pokemonPtr, sizeof(struct Pokemon));
+        memcpy(&mail, mailPtr, sizeof(struct MailStruct));
+
+        if (species != SPECIES_EGG)
+        {
+            u16 pokedexNum = SpeciesToNationalPokedexNum(species);
+            GetSetPokedexFlag(pokedexNum, FLAG_SET_SEEN);
+            GetSetPokedexFlag(pokedexNum, FLAG_SET_CAUGHT);
+        }
+
+        heldItem = GetMonData(&gPlayerParty[5], MON_DATA_HELD_ITEM);
+        if (ItemIsMail(heldItem))
+            GiveMailToMon2(&gPlayerParty[5], &mail);
+        CompactPartySlots();
+        CalculatePlayerPartyCount();
+        StringExpandPlaceholders(gStringVar4, gText_MysteryGiftSentOver);
+        ctx->data[2] = 2;
+    }
+
+    return FALSE;
+}
+
+bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx)
+{
+    u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0];
+    memcpy((void*)(gSaveBlock2Ptr) + 0xBEC, (void *)data, 0xBC);
+    ValidateEReaderTrainer();
+    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNewTrainer);
+    ctx->data[2] = 2;
+    return FALSE;
+}
+
+bool8 MEScrCmd_enableresetrtc(struct ScriptContext *ctx)
+{
+    EnableResetRTC();
+    StringExpandPlaceholders(gStringVar4, gText_InGameClockUsable);
+    ctx->data[2] = 2;
+    return FALSE;
+}
+
+bool8 MEScrCmd_checksum(struct ScriptContext *ctx)
+{
+    int checksum = ScriptReadWord(ctx);
+    u8 *data = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    u8 *dataEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    if (checksum != CalcByteArraySum(data, dataEnd - data))
+    {
+        ctx->data[3] = 0;
+        ctx->data[2] = 1;
+    }
+    return TRUE;
+}
+
+bool8 MEScrCmd_crc(struct ScriptContext *ctx)
+{
+    int crc = ScriptReadWord(ctx);
+    u8 *data = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    u8 *dataEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    if (crc != CalcCRC16(data, dataEnd - data))
+    {
+        ctx->data[3] = 0;
+        ctx->data[2] = 1;
+    }
+    return TRUE;
+}
-- 
cgit v1.2.3


From e0fbd5daad0646c77d1f587d2763bc707df5d417 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 21 Jan 2018 13:32:11 +0100
Subject: text window cleanup

---
 src/option_menu.c        |  13 +++---
 src/save_failed_screen.c |   3 +-
 src/text_window.c        | 112 ++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 98 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/option_menu.c b/src/option_menu.c
index b76d9e0e6..7f92756ab 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -262,9 +262,7 @@ void CB2_InitOptionMenu(void)
 static void Task_OptionMenuFadeIn(u8 taskId)
 {
     if (!gPaletteFade.active)
-    {
         gTasks[taskId].func = Task_OptionMenuProcessInput;
-    }
 }
 
 static void Task_OptionMenuProcessInput(u8 taskId)
@@ -517,12 +515,11 @@ static void Sound_DrawChoices(u8 selection)
     DrawOptionMenuChoice(gText_SoundStereo, GetStringRightAlignXOffset(1, gText_SoundStereo, 198), 48, styles[1]);
 }
 
-// TODO: 19 should be defined in text_window.h
 static u8 FrameType_ProcessInput(u8 selection)
 {
     if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (selection < 19)
+        if (selection < WINDOW_FRAMES_COUNT - 1)
             selection++;
         else
             selection = 0;
@@ -536,7 +533,7 @@ static u8 FrameType_ProcessInput(u8 selection)
         if (selection != 0)
             selection--;
         else
-            selection = 19;
+            selection = WINDOW_FRAMES_COUNT - 1;
 
         LoadBgTiles(1, GetWindowFrameTilesPal(selection)->tiles, 0x120, 0x1A2);
         LoadPalette(GetWindowFrameTilesPal(selection)->pal, 0x70, 0x20);
@@ -601,7 +598,7 @@ static u8 ButtonMode_ProcessInput(u8 selection)
 
 static void ButtonMode_DrawChoices(u8 selection)
 {
-    s32 widthNormal, widthLR, widthLA, yLR;
+    s32 widthNormal, widthLR, widthLA, xLR;
     u8 styles[3];
 
     styles[0] = 0;
@@ -616,8 +613,8 @@ static void ButtonMode_DrawChoices(u8 selection)
     widthLA = GetStringWidth(1, gText_ButtonTypeLEqualsA, 0);
 
     widthLR -= 94;
-    yLR = (widthNormal - widthLR - widthLA) / 2 + 104;
-    DrawOptionMenuChoice(gText_ButtonTypeLR, yLR, 64, styles[1]);
+    xLR = (widthNormal - widthLR - widthLA) / 2 + 104;
+    DrawOptionMenuChoice(gText_ButtonTypeLR, xLR, 64, styles[1]);
 
     DrawOptionMenuChoice(gText_ButtonTypeLEqualsA, GetStringRightAlignXOffset(1, gText_ButtonTypeLEqualsA, 198), 64, styles[2]);
 }
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index efe38fbae..8764daa5f 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -9,6 +9,7 @@
 #include "menu.h"
 #include "save.h"
 #include "gba/flash_internal.h"
+#include "text_window.h"
 
 #define MSG_WIN_TOP 12
 #define CLOCK_WIN_TOP (MSG_WIN_TOP - 4)
@@ -21,9 +22,7 @@ extern const u8 gBirchHelpGfx[];
 extern const u8 gBirchBagTilemap[];
 extern const u8 gBirchGrassTilemap[];
 extern const u16 gBirchBagGrassPal[];
-extern const u16 gTextWindowFrame1_Pal[];
 extern const u16 gUnknown_0860F074[];
-extern const u32 gTextWindowFrame1_Gfx[];
 extern struct SaveSection gSaveDataBuffer;
 
 extern u8 gText_SaveFailedCheckingBackup[];
diff --git a/src/text_window.c b/src/text_window.c
index 4c357ec7f..33cd7cffe 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -3,21 +3,92 @@
 #include "text_window.h"
 #include "window.h"
 #include "palette.h"
-
-extern u8 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset);
-extern void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette);
-
-extern const struct TilesPal gUnknown_0851021C[20];
-extern const u32 gMessageBox_Gfx[];
-extern const u16 gUnknown_0851017C[];
-extern const u16 gUnknown_08DDD728[];
-
-const struct TilesPal* GetWindowFrameTilesPal(u8 id)
+#include "bg.h"
+#include "graphics.h"
+
+// const rom data
+const u32 gTextWindowFrame1_Gfx[] = INCBIN_U32("graphics/text_window/1.4bpp");
+static const u32 sTextWindowFrame2_Gfx[] = INCBIN_U32("graphics/text_window/2.4bpp");
+static const u32 sTextWindowFrame3_Gfx[] = INCBIN_U32("graphics/text_window/3.4bpp");
+static const u32 sTextWindowFrame4_Gfx[] = INCBIN_U32("graphics/text_window/4.4bpp");
+static const u32 sTextWindowFrame5_Gfx[] = INCBIN_U32("graphics/text_window/5.4bpp");
+static const u32 sTextWindowFrame6_Gfx[] = INCBIN_U32("graphics/text_window/6.4bpp");
+static const u32 sTextWindowFrame7_Gfx[] = INCBIN_U32("graphics/text_window/7.4bpp");
+static const u32 sTextWindowFrame8_Gfx[] = INCBIN_U32("graphics/text_window/8.4bpp");
+static const u32 sTextWindowFrame9_Gfx[] = INCBIN_U32("graphics/text_window/9.4bpp");
+static const u32 sTextWindowFrame10_Gfx[] = INCBIN_U32("graphics/text_window/10.4bpp");
+static const u32 sTextWindowFrame11_Gfx[] = INCBIN_U32("graphics/text_window/11.4bpp");
+static const u32 sTextWindowFrame12_Gfx[] = INCBIN_U32("graphics/text_window/12.4bpp");
+static const u32 sTextWindowFrame13_Gfx[] = INCBIN_U32("graphics/text_window/13.4bpp");
+static const u32 sTextWindowFrame14_Gfx[] = INCBIN_U32("graphics/text_window/14.4bpp");
+static const u32 sTextWindowFrame15_Gfx[] = INCBIN_U32("graphics/text_window/15.4bpp");
+static const u32 sTextWindowFrame16_Gfx[] = INCBIN_U32("graphics/text_window/16.4bpp");
+static const u32 sTextWindowFrame17_Gfx[] = INCBIN_U32("graphics/text_window/17.4bpp");
+static const u32 sTextWindowFrame18_Gfx[] = INCBIN_U32("graphics/text_window/18.4bpp");
+static const u32 sTextWindowFrame19_Gfx[] = INCBIN_U32("graphics/text_window/19.4bpp");
+static const u32 sTextWindowFrame20_Gfx[] = INCBIN_U32("graphics/text_window/20.4bpp");
+
+const u16 gTextWindowFrame1_Pal[] = INCBIN_U16("graphics/text_window/1.gbapal");
+static const u16 sTextWindowFrame2_Pal[] = INCBIN_U16("graphics/text_window/2.gbapal");
+static const u16 sTextWindowFrame3_Pal[] = INCBIN_U16("graphics/text_window/3.gbapal");
+static const u16 sTextWindowFrame4_Pal[] = INCBIN_U16("graphics/text_window/4.gbapal");
+static const u16 sTextWindowFrame5_Pal[] = INCBIN_U16("graphics/text_window/5.gbapal");
+static const u16 sTextWindowFrame6_Pal[] = INCBIN_U16("graphics/text_window/6.gbapal");
+static const u16 sTextWindowFrame7_Pal[] = INCBIN_U16("graphics/text_window/7.gbapal");
+static const u16 sTextWindowFrame8_Pal[] = INCBIN_U16("graphics/text_window/8.gbapal");
+static const u16 sTextWindowFrame9_Pal[] = INCBIN_U16("graphics/text_window/9.gbapal");
+static const u16 sTextWindowFrame10_Pal[] = INCBIN_U16("graphics/text_window/10.gbapal");
+static const u16 sTextWindowFrame11_Pal[] = INCBIN_U16("graphics/text_window/11.gbapal");
+static const u16 sTextWindowFrame12_Pal[] = INCBIN_U16("graphics/text_window/12.gbapal");
+static const u16 sTextWindowFrame13_Pal[] = INCBIN_U16("graphics/text_window/13.gbapal");
+static const u16 sTextWindowFrame14_Pal[] = INCBIN_U16("graphics/text_window/14.gbapal");
+static const u16 sTextWindowFrame15_Pal[] = INCBIN_U16("graphics/text_window/15.gbapal");
+static const u16 sTextWindowFrame16_Pal[] = INCBIN_U16("graphics/text_window/16.gbapal");
+static const u16 sTextWindowFrame17_Pal[] = INCBIN_U16("graphics/text_window/17.gbapal");
+static const u16 sTextWindowFrame18_Pal[] = INCBIN_U16("graphics/text_window/18.gbapal");
+static const u16 sTextWindowFrame19_Pal[] = INCBIN_U16("graphics/text_window/19.gbapal");
+static const u16 sTextWindowFrame20_Pal[] = INCBIN_U16("graphics/text_window/20.gbapal");
+
+static const u16 sUnknown_0851017C[][16] =
 {
-    if (id >= ARRAY_COUNT(gUnknown_0851021C))
-        return &gUnknown_0851021C[0];
+    INCBIN_U16("graphics/text_window/message_box.gbapal"),
+    INCBIN_U16("graphics/text_window/text_pal1.gbapal"),
+    INCBIN_U16("graphics/text_window/text_pal2.gbapal"),
+    INCBIN_U16("graphics/text_window/text_pal3.gbapal"),
+    INCBIN_U16("graphics/text_window/text_pal4.gbapal")
+};
+
+static const struct TilesPal sWindowFrames[WINDOW_FRAMES_COUNT] =
+{
+    {gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal},
+    {sTextWindowFrame2_Gfx, sTextWindowFrame2_Pal},
+    {sTextWindowFrame3_Gfx, sTextWindowFrame3_Pal},
+    {sTextWindowFrame4_Gfx, sTextWindowFrame4_Pal},
+    {sTextWindowFrame5_Gfx, sTextWindowFrame5_Pal},
+    {sTextWindowFrame6_Gfx, sTextWindowFrame6_Pal},
+    {sTextWindowFrame7_Gfx, sTextWindowFrame7_Pal},
+    {sTextWindowFrame8_Gfx, sTextWindowFrame8_Pal},
+    {sTextWindowFrame9_Gfx, sTextWindowFrame9_Pal},
+    {sTextWindowFrame10_Gfx, sTextWindowFrame10_Pal},
+    {sTextWindowFrame11_Gfx, sTextWindowFrame11_Pal},
+    {sTextWindowFrame12_Gfx, sTextWindowFrame12_Pal},
+    {sTextWindowFrame13_Gfx, sTextWindowFrame13_Pal},
+    {sTextWindowFrame14_Gfx, sTextWindowFrame14_Pal},
+    {sTextWindowFrame15_Gfx, sTextWindowFrame15_Pal},
+    {sTextWindowFrame16_Gfx, sTextWindowFrame16_Pal},
+    {sTextWindowFrame17_Gfx, sTextWindowFrame17_Pal},
+    {sTextWindowFrame18_Gfx, sTextWindowFrame18_Pal},
+    {sTextWindowFrame19_Gfx, sTextWindowFrame19_Pal},
+    {sTextWindowFrame20_Gfx, sTextWindowFrame20_Pal}
+};
+
+// code
+const struct TilesPal *GetWindowFrameTilesPal(u8 id)
+{
+    if (id >= WINDOW_FRAMES_COUNT)
+        return &sWindowFrames[0];
     else
-        return &gUnknown_0851021C[id];
+        return &sWindowFrames[id];
 }
 
 void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset)
@@ -33,8 +104,8 @@ void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset)
 
 void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset)
 {
-    LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gUnknown_0851021C[frameId].tiles, 0x120, destOffset);
-    LoadPalette(gUnknown_0851021C[frameId].pal, palOffset, 0x20);
+    LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), sWindowFrames[frameId].tiles, 0x120, destOffset);
+    LoadPalette(sWindowFrames[frameId].pal, palOffset, 0x20);
 }
 
 void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset)
@@ -89,7 +160,7 @@ void rbox_fill_rectangle(u8 windowId)
     FillBgTilemapBufferRect(bgLayer, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, 0x11);
 }
 
-const u16* stdpal_get(u8 id)
+const u16 *stdpal_get(u8 id)
 {
     switch (id)
     {
@@ -110,16 +181,17 @@ const u16* stdpal_get(u8 id)
         id = 0x40;
         break;
     }
-    return &gUnknown_0851017C[id];
+
+    return (const u16 *)(sUnknown_0851017C) + id;
 }
 
-const u16* GetOverworldTextboxPalettePtr(void)
+const u16 *GetOverworldTextboxPalettePtr(void)
 {
-    return gUnknown_08DDD728;
+    return gMessageBox_Pal;
 }
 
 void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset)
 {
-    LoadBgTiles(bg, gUnknown_0851021C[gSaveBlock2Ptr->optionsWindowFrameType].tiles, 0x120, destOffset);
+    LoadBgTiles(bg, sWindowFrames[gSaveBlock2Ptr->optionsWindowFrameType].tiles, 0x120, destOffset);
     LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, palOffset, 0x20);
 }
-- 
cgit v1.2.3


From e85d7d5492fb854ba627fb93f4265f1953437327 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 21 Jan 2018 14:23:04 +0100
Subject: Add a comment about one battle transition

---
 src/battle_transition.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/battle_transition.c b/src/battle_transition.c
index ca2134837..e003e0fce 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -2730,6 +2730,10 @@ static bool8 Phase2_ShredSplit_Func2(struct Task *task)
     return FALSE;
 }
 
+// This function never increments the state counter, because the loop condition
+// is always false, resulting in the game being stuck in an infinite loop.
+// It's possible this transition is only partially 
+// done and the second part was left out.
 static bool8 Phase2_ShredSplit_Func3(struct Task *task)
 {
     u16 i;
-- 
cgit v1.2.3


From f59eedb67284b46354b6767d2491b563b63dd809 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 21 Jan 2018 20:45:43 +0100
Subject: decompile hof pc

---
 src/hof_pc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 src/hof_pc.c

(limited to 'src')

diff --git a/src/hof_pc.c b/src/hof_pc.c
new file mode 100644
index 000000000..e772f04e8
--- /dev/null
+++ b/src/hof_pc.c
@@ -0,0 +1,46 @@
+#include "global.h"
+#include "hall_of_fame.h"
+#include "main.h"
+#include "palette.h"
+#include "overworld.h"
+#include "script.h"
+#include "script_menu.h"
+#include "task.h"
+
+extern void (*gFieldCallback)(void);
+extern void (*gUnknown_0300485C)(void);
+
+extern void Overworld_PlaySpecialMapMusic(void);
+extern bool16 ScrSpecial_CreatePCMenu(void);
+extern void ScriptMenu_DisplayPCStartupPrompt(void);
+
+static void ReshowPCMenuAfterHallOfFamePC(void);
+static void Task_WaitForPaletteFade(u8);
+
+void AccessHallOfFamePC(void)
+{
+    SetMainCallback2(CB2_DoHallOfFamePC);
+    ScriptContext2_Enable();
+}
+
+void ReturnFromHallOfFamePC(void)
+{
+    SetMainCallback2(c2_exit_to_overworld_2_switch);
+    gFieldCallback = ReshowPCMenuAfterHallOfFamePC;
+}
+
+static void ReshowPCMenuAfterHallOfFamePC(void)
+{
+    ScriptContext2_Enable();
+    Overworld_PlaySpecialMapMusic();
+    ScrSpecial_CreatePCMenu();
+    ScriptMenu_DisplayPCStartupPrompt();
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+    CreateTask(Task_WaitForPaletteFade, 10);
+}
+
+static void Task_WaitForPaletteFade(u8 taskId)
+{
+    if (!gPaletteFade.active)
+        DestroyTask(taskId);
+}
-- 
cgit v1.2.3


From fbf91fabcf6c3ce07c78a0962754f32994cced9e Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 21 Jan 2018 21:32:30 +0100
Subject: review changes mystery event

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

(limited to 'src')

diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
index 86e7217ef..8822cd05a 100644
--- a/src/mystery_event_script.c
+++ b/src/mystery_event_script.c
@@ -86,8 +86,8 @@ u32 RunMysteryEventScript(u8 *script)
 {
     struct ScriptContext *ctx = &sMysteryEventScriptContext;
     InitMysteryEventScript(ctx, script);
-    while (RunMysteryEventScriptCommand(ctx))
-        ;
+    while (RunMysteryEventScriptCommand(ctx));
+
     return ctx->data[2];
 }
 
@@ -208,7 +208,7 @@ bool8 MEScrCmd_setmsg(struct ScriptContext *ctx)
 {
     u8 value = ScriptReadByte(ctx);
     u8 *str = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
-    if (value == 255 || value == ctx->data[2])
+    if (value == 0xFF || value == ctx->data[2])
         StringExpandPlaceholders(gStringVar4, str);
     return FALSE;
 }
-- 
cgit v1.2.3


From ad73f920612f747a963d9aed8867aa930ebc8173 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 22 Jan 2018 21:32:50 +0100
Subject: start decompiling pokemon animation

---
 src/pokemon_animation.c | 1015 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1015 insertions(+)
 create mode 100644 src/pokemon_animation.c

(limited to 'src')

diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
new file mode 100644
index 000000000..960b42dd1
--- /dev/null
+++ b/src/pokemon_animation.c
@@ -0,0 +1,1015 @@
+#include "global.h"
+#include "pokemon.h"
+#include "sprite.h"
+#include "pokemon_animation.h"
+#include "trig.h"
+#include "task.h"
+
+struct UnkAnimStruct
+{
+    s16 field_0;
+    s16 field_2;
+    s16 field_4;
+    s16 field_6;
+    s16 field_8;
+};
+
+extern u16 gBattlePartyID[];
+extern bool32 gUnknown_03001274;
+extern struct UnkAnimStruct gUnknown_03001240[];
+extern u8 gUnknown_03001270;
+
+// this file's functions
+void pokemonanimfunc_00(struct Sprite *sprite);
+void pokemonanimfunc_01(struct Sprite *sprite);
+void pokemonanimfunc_02(struct Sprite *sprite);
+void pokemonanimfunc_03(struct Sprite *sprite);
+void pokemonanimfunc_04(struct Sprite *sprite);
+void pokemonanimfunc_05(struct Sprite *sprite);
+void pokemonanimfunc_06(struct Sprite *sprite);
+void pokemonanimfunc_07(struct Sprite *sprite);
+void pokemonanimfunc_08(struct Sprite *sprite);
+void pokemonanimfunc_09(struct Sprite *sprite);
+void pokemonanimfunc_0A(struct Sprite *sprite);
+void pokemonanimfunc_0B(struct Sprite *sprite);
+void pokemonanimfunc_0C(struct Sprite *sprite);
+void pokemonanimfunc_0D(struct Sprite *sprite);
+void pokemonanimfunc_0E(struct Sprite *sprite);
+void pokemonanimfunc_0F(struct Sprite *sprite);
+void pokemonanimfunc_10(struct Sprite *sprite);
+void pokemonanimfunc_11(struct Sprite *sprite);
+void pokemonanimfunc_12(struct Sprite *sprite);
+void pokemonanimfunc_13(struct Sprite *sprite);
+void pokemonanimfunc_14(struct Sprite *sprite);
+void pokemonanimfunc_15(struct Sprite *sprite);
+void pokemonanimfunc_16(struct Sprite *sprite);
+void pokemonanimfunc_17(struct Sprite *sprite);
+void pokemonanimfunc_18(struct Sprite *sprite);
+void pokemonanimfunc_19(struct Sprite *sprite);
+void pokemonanimfunc_1A(struct Sprite *sprite);
+void pokemonanimfunc_1B(struct Sprite *sprite);
+void pokemonanimfunc_1C(struct Sprite *sprite);
+void pokemonanimfunc_1D(struct Sprite *sprite);
+void pokemonanimfunc_1E(struct Sprite *sprite);
+void pokemonanimfunc_1F(struct Sprite *sprite);
+void pokemonanimfunc_20(struct Sprite *sprite);
+void pokemonanimfunc_21(struct Sprite *sprite);
+void pokemonanimfunc_22(struct Sprite *sprite);
+void pokemonanimfunc_23(struct Sprite *sprite);
+void pokemonanimfunc_24(struct Sprite *sprite);
+void pokemonanimfunc_25(struct Sprite *sprite);
+void pokemonanimfunc_26(struct Sprite *sprite);
+void pokemonanimfunc_27(struct Sprite *sprite);
+void pokemonanimfunc_28(struct Sprite *sprite);
+void pokemonanimfunc_29(struct Sprite *sprite);
+void pokemonanimfunc_2A(struct Sprite *sprite);
+void pokemonanimfunc_2B(struct Sprite *sprite);
+void pokemonanimfunc_2C(struct Sprite *sprite);
+void pokemonanimfunc_2D(struct Sprite *sprite);
+void pokemonanimfunc_2E(struct Sprite *sprite);
+void pokemonanimfunc_2F(struct Sprite *sprite);
+void pokemonanimfunc_30(struct Sprite *sprite);
+void pokemonanimfunc_31(struct Sprite *sprite);
+void pokemonanimfunc_32(struct Sprite *sprite);
+void pokemonanimfunc_33(struct Sprite *sprite);
+void pokemonanimfunc_34(struct Sprite *sprite);
+void pokemonanimfunc_35(struct Sprite *sprite);
+void pokemonanimfunc_36(struct Sprite *sprite);
+void pokemonanimfunc_37(struct Sprite *sprite);
+void pokemonanimfunc_38(struct Sprite *sprite);
+void pokemonanimfunc_39(struct Sprite *sprite);
+void pokemonanimfunc_3A(struct Sprite *sprite);
+void pokemonanimfunc_3B(struct Sprite *sprite);
+void pokemonanimfunc_3C(struct Sprite *sprite);
+void pokemonanimfunc_3D(struct Sprite *sprite);
+void pokemonanimfunc_3E(struct Sprite *sprite);
+void pokemonanimfunc_3F(struct Sprite *sprite);
+void pokemonanimfunc_40(struct Sprite *sprite);
+void pokemonanimfunc_41(struct Sprite *sprite);
+void pokemonanimfunc_42(struct Sprite *sprite);
+void pokemonanimfunc_43(struct Sprite *sprite);
+void pokemonanimfunc_44(struct Sprite *sprite);
+void pokemonanimfunc_45(struct Sprite *sprite);
+void pokemonanimfunc_46(struct Sprite *sprite);
+void pokemonanimfunc_47(struct Sprite *sprite);
+void pokemonanimfunc_48(struct Sprite *sprite);
+void pokemonanimfunc_49(struct Sprite *sprite);
+void pokemonanimfunc_4A(struct Sprite *sprite);
+void pokemonanimfunc_4B(struct Sprite *sprite);
+void pokemonanimfunc_4C(struct Sprite *sprite);
+void pokemonanimfunc_4D(struct Sprite *sprite);
+void pokemonanimfunc_4E(struct Sprite *sprite);
+void pokemonanimfunc_4F(struct Sprite *sprite);
+void pokemonanimfunc_50(struct Sprite *sprite);
+void pokemonanimfunc_51(struct Sprite *sprite);
+void pokemonanimfunc_52(struct Sprite *sprite);
+void pokemonanimfunc_53(struct Sprite *sprite);
+void pokemonanimfunc_54(struct Sprite *sprite);
+void pokemonanimfunc_55(struct Sprite *sprite);
+void pokemonanimfunc_56(struct Sprite *sprite);
+void pokemonanimfunc_57(struct Sprite *sprite);
+void pokemonanimfunc_58(struct Sprite *sprite);
+void pokemonanimfunc_59(struct Sprite *sprite);
+void pokemonanimfunc_5A(struct Sprite *sprite);
+void pokemonanimfunc_5B(struct Sprite *sprite);
+void pokemonanimfunc_5C(struct Sprite *sprite);
+void pokemonanimfunc_5D(struct Sprite *sprite);
+void pokemonanimfunc_5E(struct Sprite *sprite);
+void pokemonanimfunc_5F(struct Sprite *sprite);
+void pokemonanimfunc_60(struct Sprite *sprite);
+void pokemonanimfunc_61(struct Sprite *sprite);
+void pokemonanimfunc_62(struct Sprite *sprite);
+void pokemonanimfunc_63(struct Sprite *sprite);
+void pokemonanimfunc_64(struct Sprite *sprite);
+void pokemonanimfunc_65(struct Sprite *sprite);
+void pokemonanimfunc_66(struct Sprite *sprite);
+void pokemonanimfunc_67(struct Sprite *sprite);
+void pokemonanimfunc_68(struct Sprite *sprite);
+void pokemonanimfunc_69(struct Sprite *sprite);
+void pokemonanimfunc_6A(struct Sprite *sprite);
+void pokemonanimfunc_6B(struct Sprite *sprite);
+void pokemonanimfunc_6C(struct Sprite *sprite);
+void pokemonanimfunc_6D(struct Sprite *sprite);
+void pokemonanimfunc_6E(struct Sprite *sprite);
+void pokemonanimfunc_6F(struct Sprite *sprite);
+void pokemonanimfunc_70(struct Sprite *sprite);
+void pokemonanimfunc_71(struct Sprite *sprite);
+void pokemonanimfunc_72(struct Sprite *sprite);
+void pokemonanimfunc_73(struct Sprite *sprite);
+void pokemonanimfunc_74(struct Sprite *sprite);
+void pokemonanimfunc_75(struct Sprite *sprite);
+void pokemonanimfunc_76(struct Sprite *sprite);
+void pokemonanimfunc_77(struct Sprite *sprite);
+void pokemonanimfunc_78(struct Sprite *sprite);
+void pokemonanimfunc_79(struct Sprite *sprite);
+void pokemonanimfunc_7A(struct Sprite *sprite);
+void pokemonanimfunc_7B(struct Sprite *sprite);
+void pokemonanimfunc_7C(struct Sprite *sprite);
+void pokemonanimfunc_7D(struct Sprite *sprite);
+void pokemonanimfunc_7E(struct Sprite *sprite);
+void pokemonanimfunc_7F(struct Sprite *sprite);
+void pokemonanimfunc_80(struct Sprite *sprite);
+void pokemonanimfunc_81(struct Sprite *sprite);
+void pokemonanimfunc_82(struct Sprite *sprite);
+void pokemonanimfunc_83(struct Sprite *sprite);
+void pokemonanimfunc_84(struct Sprite *sprite);
+void pokemonanimfunc_85(struct Sprite *sprite);
+void pokemonanimfunc_86(struct Sprite *sprite);
+void pokemonanimfunc_87(struct Sprite *sprite);
+void pokemonanimfunc_88(struct Sprite *sprite);
+void pokemonanimfunc_89(struct Sprite *sprite);
+void pokemonanimfunc_8A(struct Sprite *sprite);
+void pokemonanimfunc_8B(struct Sprite *sprite);
+void pokemonanimfunc_8C(struct Sprite *sprite);
+void pokemonanimfunc_8D(struct Sprite *sprite);
+void pokemonanimfunc_8E(struct Sprite *sprite);
+void pokemonanimfunc_8F(struct Sprite *sprite);
+void pokemonanimfunc_90(struct Sprite *sprite);
+void pokemonanimfunc_91(struct Sprite *sprite);
+void pokemonanimfunc_92(struct Sprite *sprite);
+void pokemonanimfunc_93(struct Sprite *sprite);
+void pokemonanimfunc_94(struct Sprite *sprite);
+void pokemonanimfunc_95(struct Sprite *sprite);
+void pokemonanimfunc_96(struct Sprite *sprite);
+
+// const rom data
+static const u8 sSpeciesToBackAnimId[] =
+{
+    0x00, // SPECIES_NONE
+    0x13, // SPECIES_BULBASAUR
+    0x02, // SPECIES_IVYSAUR
+    0x08, // SPECIES_VENUSAUR
+    0x12, // SPECIES_CHARMANDER
+    0x15, // SPECIES_CHARMELEON
+    0x17, // SPECIES_CHARIZARD
+    0x12, // SPECIES_SQUIRTLE
+    0x12, // SPECIES_WARTORTLE
+    0x19, // SPECIES_BLASTOISE
+    0x02, // SPECIES_CATERPIE
+    0x13, // SPECIES_METAPOD
+    0x11, // SPECIES_BUTTERFREE
+    0x02, // SPECIES_WEEDLE
+    0x13, // SPECIES_KAKUNA
+    0x01, // SPECIES_BEEDRILL
+    0x0f, // SPECIES_PIDGEY
+    0x15, // SPECIES_PIDGEOTTO
+    0x0f, // SPECIES_PIDGEOT
+    0x0a, // SPECIES_RATTATA
+    0x0a, // SPECIES_RATICATE
+    0x0f, // SPECIES_SPEAROW
+    0x15, // SPECIES_FEAROW
+    0x0f, // SPECIES_EKANS
+    0x09, // SPECIES_ARBOK
+    0x16, // SPECIES_PIKACHU
+    0x16, // SPECIES_RAICHU
+    0x12, // SPECIES_SANDSHREW
+    0x10, // SPECIES_SANDSLASH
+    0x12, // SPECIES_NIDORAN_F
+    0x15, // SPECIES_NIDORINA
+    0x09, // SPECIES_NIDOQUEEN
+    0x12, // SPECIES_NIDORAN_M
+    0x15, // SPECIES_NIDORINO
+    0x09, // SPECIES_NIDOKING
+    0x13, // SPECIES_CLEFAIRY
+    0x13, // SPECIES_CLEFABLE
+    0x10, // SPECIES_VULPIX
+    0x01, // SPECIES_NINETALES
+    0x13, // SPECIES_JIGGLYPUFF
+    0x06, // SPECIES_WIGGLYTUFF
+    0x11, // SPECIES_ZUBAT
+    0x09, // SPECIES_GOLBAT
+    0x02, // SPECIES_ODDISH
+    0x02, // SPECIES_GLOOM
+    0x14, // SPECIES_VILEPLUME
+    0x02, // SPECIES_PARAS
+    0x08, // SPECIES_PARASECT
+    0x0a, // SPECIES_VENONAT
+    0x11, // SPECIES_VENOMOTH
+    0x09, // SPECIES_DIGLETT
+    0x09, // SPECIES_DUGTRIO
+    0x10, // SPECIES_MEOWTH
+    0x0f, // SPECIES_PERSIAN
+    0x02, // SPECIES_PSYDUCK
+    0x14, // SPECIES_GOLDUCK
+    0x10, // SPECIES_MANKEY
+    0x10, // SPECIES_PRIMEAPE
+    0x15, // SPECIES_GROWLITHE
+    0x15, // SPECIES_ARCANINE
+    0x12, // SPECIES_POLIWAG
+    0x09, // SPECIES_POLIWHIRL
+    0x0e, // SPECIES_POLIWRATH
+    0x14, // SPECIES_ABRA
+    0x14, // SPECIES_KADABRA
+    0x0d, // SPECIES_ALAKAZAM
+    0x15, // SPECIES_MACHOP
+    0x09, // SPECIES_MACHOKE
+    0x09, // SPECIES_MACHAMP
+    0x0b, // SPECIES_BELLSPROUT
+    0x0b, // SPECIES_WEEPINBELL
+    0x0b, // SPECIES_VICTREEBEL
+    0x02, // SPECIES_TENTACOOL
+    0x02, // SPECIES_TENTACRUEL
+    0x0e, // SPECIES_GEODUDE
+    0x08, // SPECIES_GRAVELER
+    0x08, // SPECIES_GOLEM
+    0x17, // SPECIES_PONYTA
+    0x15, // SPECIES_RAPIDASH
+    0x02, // SPECIES_SLOWPOKE
+    0x13, // SPECIES_SLOWBRO
+    0x0f, // SPECIES_MAGNEMITE
+    0x0f, // SPECIES_MAGNETON
+    0x02, // SPECIES_FARFETCHD
+    0x0f, // SPECIES_DODUO
+    0x15, // SPECIES_DODRIO
+    0x13, // SPECIES_SEEL
+    0x02, // SPECIES_DEWGONG
+    0x0b, // SPECIES_GRIMER
+    0x0c, // SPECIES_MUK
+    0x13, // SPECIES_SHELLDER
+    0x0f, // SPECIES_CLOYSTER
+    0x01, // SPECIES_GASTLY
+    0x01, // SPECIES_HAUNTER
+    0x14, // SPECIES_GENGAR
+    0x09, // SPECIES_ONIX
+    0x13, // SPECIES_DROWZEE
+    0x14, // SPECIES_HYPNO
+    0x0a, // SPECIES_KRABBY
+    0x09, // SPECIES_KINGLER
+    0x15, // SPECIES_VOLTORB
+    0x15, // SPECIES_ELECTRODE
+    0x02, // SPECIES_EXEGGCUTE
+    0x10, // SPECIES_EXEGGUTOR
+    0x15, // SPECIES_CUBONE
+    0x10, // SPECIES_MAROWAK
+    0x02, // SPECIES_HITMONLEE
+    0x0f, // SPECIES_HITMONCHAN
+    0x02, // SPECIES_LICKITUNG
+    0x06, // SPECIES_KOFFING
+    0x06, // SPECIES_WEEZING
+    0x0e, // SPECIES_RHYHORN
+    0x0e, // SPECIES_RHYDON
+    0x12, // SPECIES_CHANSEY
+    0x0b, // SPECIES_TANGELA
+    0x12, // SPECIES_KANGASKHAN
+    0x13, // SPECIES_HORSEA
+    0x11, // SPECIES_SEADRA
+    0x11, // SPECIES_GOLDEEN
+    0x11, // SPECIES_SEAKING
+    0x13, // SPECIES_STARYU
+    0x19, // SPECIES_STARMIE
+    0x14, // SPECIES_MR_MIME
+    0x0f, // SPECIES_SCYTHER
+    0x13, // SPECIES_JYNX
+    0x16, // SPECIES_ELECTABUZZ
+    0x17, // SPECIES_MAGMAR
+    0x0e, // SPECIES_PINSIR
+    0x0e, // SPECIES_TAUROS
+    0x10, // SPECIES_MAGIKARP
+    0x09, // SPECIES_GYARADOS
+    0x19, // SPECIES_LAPRAS
+    0x05, // SPECIES_DITTO
+    0x12, // SPECIES_EEVEE
+    0x19, // SPECIES_VAPOREON
+    0x16, // SPECIES_JOLTEON
+    0x17, // SPECIES_FLAREON
+    0x01, // SPECIES_PORYGON
+    0x13, // SPECIES_OMANYTE
+    0x13, // SPECIES_OMASTAR
+    0x13, // SPECIES_KABUTO
+    0x15, // SPECIES_KABUTOPS
+    0x15, // SPECIES_AERODACTYL
+    0x13, // SPECIES_SNORLAX
+    0x19, // SPECIES_ARTICUNO
+    0x16, // SPECIES_ZAPDOS
+    0x17, // SPECIES_MOLTRES
+    0x02, // SPECIES_DRATINI
+    0x0f, // SPECIES_DRAGONAIR
+    0x09, // SPECIES_DRAGONITE
+    0x0d, // SPECIES_MEWTWO
+    0x12, // SPECIES_MEW
+    0x12, // SPECIES_CHIKORITA
+    0x02, // SPECIES_BAYLEEF
+    0x09, // SPECIES_MEGANIUM
+    0x12, // SPECIES_CYNDAQUIL
+    0x15, // SPECIES_QUILAVA
+    0x17, // SPECIES_TYPHLOSION
+    0x15, // SPECIES_TOTODILE
+    0x15, // SPECIES_CROCONAW
+    0x09, // SPECIES_FERALIGATR
+    0x12, // SPECIES_SENTRET
+    0x10, // SPECIES_FURRET
+    0x11, // SPECIES_HOOTHOOT
+    0x0f, // SPECIES_NOCTOWL
+    0x0a, // SPECIES_LEDYBA
+    0x11, // SPECIES_LEDIAN
+    0x0a, // SPECIES_SPINARAK
+    0x02, // SPECIES_ARIADOS
+    0x0f, // SPECIES_CROBAT
+    0x0b, // SPECIES_CHINCHOU
+    0x16, // SPECIES_LANTURN
+    0x12, // SPECIES_PICHU
+    0x13, // SPECIES_CLEFFA
+    0x13, // SPECIES_IGGLYBUFF
+    0x13, // SPECIES_TOGEPI
+    0x11, // SPECIES_TOGETIC
+    0x12, // SPECIES_NATU
+    0x14, // SPECIES_XATU
+    0x12, // SPECIES_MAREEP
+    0x13, // SPECIES_FLAAFFY
+    0x16, // SPECIES_AMPHAROS
+    0x11, // SPECIES_BELLOSSOM
+    0x12, // SPECIES_MARILL
+    0x13, // SPECIES_AZUMARILL
+    0x02, // SPECIES_SUDOWOODO
+    0x10, // SPECIES_POLITOED
+    0x11, // SPECIES_HOPPIP
+    0x11, // SPECIES_SKIPLOOM
+    0x11, // SPECIES_JUMPLUFF
+    0x10, // SPECIES_AIPOM
+    0x13, // SPECIES_SUNKERN
+    0x02, // SPECIES_SUNFLORA
+    0x11, // SPECIES_YANMA
+    0x0b, // SPECIES_WOOPER
+    0x02, // SPECIES_QUAGSIRE
+    0x14, // SPECIES_ESPEON
+    0x14, // SPECIES_UMBREON
+    0x12, // SPECIES_MURKROW
+    0x13, // SPECIES_SLOWKING
+    0x01, // SPECIES_MISDREAVUS
+    0x14, // SPECIES_UNOWN
+    0x0b, // SPECIES_WOBBUFFET
+    0x14, // SPECIES_GIRAFARIG
+    0x08, // SPECIES_PINECO
+    0x09, // SPECIES_FORRETRESS
+    0x0f, // SPECIES_DUNSPARCE
+    0x05, // SPECIES_GLIGAR
+    0x09, // SPECIES_STEELIX
+    0x15, // SPECIES_SNUBBULL
+    0x09, // SPECIES_GRANBULL
+    0x0d, // SPECIES_QWILFISH
+    0x15, // SPECIES_SCIZOR
+    0x13, // SPECIES_SHUCKLE
+    0x15, // SPECIES_HERACROSS
+    0x0f, // SPECIES_SNEASEL
+    0x13, // SPECIES_TEDDIURSA
+    0x09, // SPECIES_URSARING
+    0x17, // SPECIES_SLUGMA
+    0x17, // SPECIES_MAGCARGO
+    0x0a, // SPECIES_SWINUB
+    0x08, // SPECIES_PILOSWINE
+    0x02, // SPECIES_CORSOLA
+    0x02, // SPECIES_REMORAID
+    0x05, // SPECIES_OCTILLERY
+    0x0f, // SPECIES_DELIBIRD
+    0x02, // SPECIES_MANTINE
+    0x15, // SPECIES_SKARMORY
+    0x09, // SPECIES_HOUNDOUR
+    0x09, // SPECIES_HOUNDOOM
+    0x19, // SPECIES_KINGDRA
+    0x15, // SPECIES_PHANPY
+    0x0e, // SPECIES_DONPHAN
+    0x01, // SPECIES_PORYGON2
+    0x13, // SPECIES_STANTLER
+    0x02, // SPECIES_SMEARGLE
+    0x0f, // SPECIES_TYROGUE
+    0x07, // SPECIES_HITMONTOP
+    0x02, // SPECIES_SMOOCHUM
+    0x08, // SPECIES_ELEKID
+    0x17, // SPECIES_MAGBY
+    0x02, // SPECIES_MILTANK
+    0x13, // SPECIES_BLISSEY
+    0x16, // SPECIES_RAIKOU
+    0x17, // SPECIES_ENTEI
+    0x19, // SPECIES_SUICUNE
+    0x0e, // SPECIES_LARVITAR
+    0x09, // SPECIES_PUPITAR
+    0x0e, // SPECIES_TYRANITAR
+    0x19, // SPECIES_LUGIA
+    0x17, // SPECIES_HO_OH
+    0x18, // SPECIES_CELEBI
+    0x00, // SPECIES_OLD_UNOWN_B
+    0x00, // SPECIES_OLD_UNOWN_C
+    0x00, // SPECIES_OLD_UNOWN_D
+    0x00, // SPECIES_OLD_UNOWN_E
+    0x00, // SPECIES_OLD_UNOWN_F
+    0x00, // SPECIES_OLD_UNOWN_G
+    0x00, // SPECIES_OLD_UNOWN_H
+    0x00, // SPECIES_OLD_UNOWN_I
+    0x00, // SPECIES_OLD_UNOWN_J
+    0x00, // SPECIES_OLD_UNOWN_K
+    0x00, // SPECIES_OLD_UNOWN_L
+    0x00, // SPECIES_OLD_UNOWN_M
+    0x00, // SPECIES_OLD_UNOWN_N
+    0x00, // SPECIES_OLD_UNOWN_O
+    0x00, // SPECIES_OLD_UNOWN_P
+    0x00, // SPECIES_OLD_UNOWN_Q
+    0x00, // SPECIES_OLD_UNOWN_R
+    0x00, // SPECIES_OLD_UNOWN_S
+    0x00, // SPECIES_OLD_UNOWN_T
+    0x00, // SPECIES_OLD_UNOWN_U
+    0x00, // SPECIES_OLD_UNOWN_V
+    0x00, // SPECIES_OLD_UNOWN_W
+    0x00, // SPECIES_OLD_UNOWN_X
+    0x00, // SPECIES_OLD_UNOWN_Y
+    0x00, // SPECIES_OLD_UNOWN_Z
+    0x10, // SPECIES_TREECKO
+    0x15, // SPECIES_GROVYLE
+    0x09, // SPECIES_SCEPTILE
+    0x12, // SPECIES_TORCHIC
+    0x10, // SPECIES_COMBUSKEN
+    0x17, // SPECIES_BLAZIKEN
+    0x02, // SPECIES_MUDKIP
+    0x12, // SPECIES_MARSHTOMP
+    0x19, // SPECIES_SWAMPERT
+    0x12, // SPECIES_POOCHYENA
+    0x08, // SPECIES_MIGHTYENA
+    0x0f, // SPECIES_ZIGZAGOON
+    0x15, // SPECIES_LINOONE
+    0x0b, // SPECIES_WURMPLE
+    0x08, // SPECIES_SILCOON
+    0x11, // SPECIES_BEAUTIFLY
+    0x08, // SPECIES_CASCOON
+    0x0f, // SPECIES_DUSTOX
+    0x02, // SPECIES_LOTAD
+    0x10, // SPECIES_LOMBRE
+    0x10, // SPECIES_LUDICOLO
+    0x13, // SPECIES_SEEDOT
+    0x09, // SPECIES_NUZLEAF
+    0x14, // SPECIES_SHIFTRY
+    0x0a, // SPECIES_NINCADA
+    0x01, // SPECIES_NINJASK
+    0x14, // SPECIES_SHEDINJA
+    0x12, // SPECIES_TAILLOW
+    0x15, // SPECIES_SWELLOW
+    0x13, // SPECIES_SHROOMISH
+    0x15, // SPECIES_BRELOOM
+    0x07, // SPECIES_SPINDA
+    0x11, // SPECIES_WINGULL
+    0x11, // SPECIES_PELIPPER
+    0x03, // SPECIES_SURSKIT
+    0x11, // SPECIES_MASQUERAIN
+    0x19, // SPECIES_WAILMER
+    0x19, // SPECIES_WAILORD
+    0x13, // SPECIES_SKITTY
+    0x12, // SPECIES_DELCATTY
+    0x01, // SPECIES_KECLEON
+    0x13, // SPECIES_BALTOY
+    0x14, // SPECIES_CLAYDOL
+    0x0e, // SPECIES_NOSEPASS
+    0x17, // SPECIES_TORKOAL
+    0x01, // SPECIES_SABLEYE
+    0x0b, // SPECIES_BARBOACH
+    0x09, // SPECIES_WHISCASH
+    0x04, // SPECIES_LUVDISC
+    0x0f, // SPECIES_CORPHISH
+    0x15, // SPECIES_CRAWDAUNT
+    0x03, // SPECIES_FEEBAS
+    0x19, // SPECIES_MILOTIC
+    0x04, // SPECIES_CARVANHA
+    0x15, // SPECIES_SHARPEDO
+    0x13, // SPECIES_TRAPINCH
+    0x01, // SPECIES_VIBRAVA
+    0x0f, // SPECIES_FLYGON
+    0x0e, // SPECIES_MAKUHITA
+    0x0e, // SPECIES_HARIYAMA
+    0x15, // SPECIES_ELECTRIKE
+    0x09, // SPECIES_MANECTRIC
+    0x0e, // SPECIES_NUMEL
+    0x17, // SPECIES_CAMERUPT
+    0x13, // SPECIES_SPHEAL
+    0x09, // SPECIES_SEALEO
+    0x09, // SPECIES_WALREIN
+    0x0a, // SPECIES_CACNEA
+    0x08, // SPECIES_CACTURNE
+    0x0f, // SPECIES_SNORUNT
+    0x0f, // SPECIES_GLALIE
+    0x13, // SPECIES_LUNATONE
+    0x13, // SPECIES_SOLROCK
+    0x10, // SPECIES_AZURILL
+    0x10, // SPECIES_SPOINK
+    0x14, // SPECIES_GRUMPIG
+    0x12, // SPECIES_PLUSLE
+    0x12, // SPECIES_MINUN
+    0x09, // SPECIES_MAWILE
+    0x14, // SPECIES_MEDITITE
+    0x14, // SPECIES_MEDICHAM
+    0x11, // SPECIES_SWABLU
+    0x11, // SPECIES_ALTARIA
+    0x12, // SPECIES_WYNAUT
+    0x01, // SPECIES_DUSKULL
+    0x01, // SPECIES_DUSCLOPS
+    0x18, // SPECIES_ROSELIA
+    0x02, // SPECIES_SLAKOTH
+    0x10, // SPECIES_VIGOROTH
+    0x08, // SPECIES_SLAKING
+    0x0b, // SPECIES_GULPIN
+    0x0b, // SPECIES_SWALOT
+    0x0e, // SPECIES_TROPIUS
+    0x13, // SPECIES_WHISMUR
+    0x09, // SPECIES_LOUDRED
+    0x0d, // SPECIES_EXPLOUD
+    0x13, // SPECIES_CLAMPERL
+    0x11, // SPECIES_HUNTAIL
+    0x11, // SPECIES_GOREBYSS
+    0x14, // SPECIES_ABSOL
+    0x01, // SPECIES_SHUPPET
+    0x01, // SPECIES_BANETTE
+    0x0b, // SPECIES_SEVIPER
+    0x15, // SPECIES_ZANGOOSE
+    0x02, // SPECIES_RELICANTH
+    0x15, // SPECIES_ARON
+    0x09, // SPECIES_LAIRON
+    0x0e, // SPECIES_AGGRON
+    0x11, // SPECIES_CASTFORM
+    0x11, // SPECIES_VOLBEAT
+    0x11, // SPECIES_ILLUMISE
+    0x0c, // SPECIES_LILEEP
+    0x0b, // SPECIES_CRADILY
+    0x0f, // SPECIES_ANORITH
+    0x09, // SPECIES_ARMALDO
+    0x14, // SPECIES_RALTS
+    0x14, // SPECIES_KIRLIA
+    0x14, // SPECIES_GARDEVOIR
+    0x09, // SPECIES_BAGON
+    0x09, // SPECIES_SHELGON
+    0x08, // SPECIES_SALAMENCE
+    0x0f, // SPECIES_BELDUM
+    0x15, // SPECIES_METANG
+    0x09, // SPECIES_METAGROSS
+    0x09, // SPECIES_REGIROCK
+    0x09, // SPECIES_REGICE
+    0x09, // SPECIES_REGISTEEL
+    0x19, // SPECIES_KYOGRE
+    0x17, // SPECIES_GROUDON
+    0x0d, // SPECIES_RAYQUAZA
+    0x01, // SPECIES_LATIAS
+    0x01, // SPECIES_LATIOS
+    0x11, // SPECIES_JIRACHI
+    0x14, // SPECIES_DEOXYS
+    0x11, // SPECIES_CHIMECHO
+};
+
+const u8 gUnknown_0860AA64[] = {0x00, 0x05, 0x01, 0x01, 0x00, 0x0f, 0x01, 0x04, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x00, 0xff};
+
+const u8 gUnknown_0860AA80[] = {0x06, 0x1e, 0xfe, 0x0f, 0x06, 0x1e, 0xff, 0x00};
+
+static void (* const sMonAnimFunctions[])(struct Sprite *sprite) =
+{
+    pokemonanimfunc_00,
+    pokemonanimfunc_01,
+    pokemonanimfunc_02,
+    pokemonanimfunc_03,
+    pokemonanimfunc_04,
+    pokemonanimfunc_05,
+    pokemonanimfunc_06,
+    pokemonanimfunc_07,
+    pokemonanimfunc_08,
+    pokemonanimfunc_09,
+    pokemonanimfunc_0A,
+    pokemonanimfunc_0B,
+    pokemonanimfunc_0C,
+    pokemonanimfunc_0D,
+    pokemonanimfunc_0E,
+    pokemonanimfunc_0F,
+    pokemonanimfunc_10,
+    pokemonanimfunc_11,
+    pokemonanimfunc_12,
+    pokemonanimfunc_13,
+    pokemonanimfunc_14,
+    pokemonanimfunc_15,
+    pokemonanimfunc_16,
+    pokemonanimfunc_17,
+    pokemonanimfunc_18,
+    pokemonanimfunc_19,
+    pokemonanimfunc_1A,
+    pokemonanimfunc_1B,
+    pokemonanimfunc_1C,
+    pokemonanimfunc_1D,
+    pokemonanimfunc_1E,
+    pokemonanimfunc_1F,
+    pokemonanimfunc_20,
+    pokemonanimfunc_21,
+    pokemonanimfunc_22,
+    pokemonanimfunc_23,
+    pokemonanimfunc_24,
+    pokemonanimfunc_25,
+    pokemonanimfunc_26,
+    pokemonanimfunc_27,
+    pokemonanimfunc_28,
+    pokemonanimfunc_29,
+    pokemonanimfunc_2A,
+    pokemonanimfunc_2B,
+    pokemonanimfunc_2C,
+    pokemonanimfunc_2D,
+    pokemonanimfunc_2E,
+    pokemonanimfunc_2F,
+    pokemonanimfunc_30,
+    pokemonanimfunc_31,
+    pokemonanimfunc_32,
+    pokemonanimfunc_33,
+    pokemonanimfunc_34,
+    pokemonanimfunc_35,
+    pokemonanimfunc_36,
+    pokemonanimfunc_37,
+    pokemonanimfunc_38,
+    pokemonanimfunc_39,
+    pokemonanimfunc_3A,
+    pokemonanimfunc_3B,
+    pokemonanimfunc_3C,
+    pokemonanimfunc_3D,
+    pokemonanimfunc_3E,
+    pokemonanimfunc_3F,
+    pokemonanimfunc_40,
+    pokemonanimfunc_41,
+    pokemonanimfunc_42,
+    pokemonanimfunc_43,
+    pokemonanimfunc_44,
+    pokemonanimfunc_45,
+    pokemonanimfunc_46,
+    pokemonanimfunc_47,
+    pokemonanimfunc_48,
+    pokemonanimfunc_49,
+    pokemonanimfunc_4A,
+    pokemonanimfunc_4B,
+    pokemonanimfunc_4C,
+    pokemonanimfunc_4D,
+    pokemonanimfunc_4E,
+    pokemonanimfunc_4F,
+    pokemonanimfunc_50,
+    pokemonanimfunc_51,
+    pokemonanimfunc_52,
+    pokemonanimfunc_53,
+    pokemonanimfunc_54,
+    pokemonanimfunc_55,
+    pokemonanimfunc_56,
+    pokemonanimfunc_57,
+    pokemonanimfunc_58,
+    pokemonanimfunc_59,
+    pokemonanimfunc_5A,
+    pokemonanimfunc_5B,
+    pokemonanimfunc_5C,
+    pokemonanimfunc_5D,
+    pokemonanimfunc_5E,
+    pokemonanimfunc_5F,
+    pokemonanimfunc_60,
+    pokemonanimfunc_61,
+    pokemonanimfunc_62,
+    pokemonanimfunc_63,
+    pokemonanimfunc_64,
+    pokemonanimfunc_65,
+    pokemonanimfunc_66,
+    pokemonanimfunc_67,
+    pokemonanimfunc_68,
+    pokemonanimfunc_69,
+    pokemonanimfunc_6A,
+    pokemonanimfunc_6B,
+    pokemonanimfunc_6C,
+    pokemonanimfunc_6D,
+    pokemonanimfunc_6E,
+    pokemonanimfunc_6F,
+    pokemonanimfunc_70,
+    pokemonanimfunc_71,
+    pokemonanimfunc_72,
+    pokemonanimfunc_73,
+    pokemonanimfunc_74,
+    pokemonanimfunc_75,
+    pokemonanimfunc_76,
+    pokemonanimfunc_77,
+    pokemonanimfunc_78,
+    pokemonanimfunc_79,
+    pokemonanimfunc_7A,
+    pokemonanimfunc_7B,
+    pokemonanimfunc_7C,
+    pokemonanimfunc_7D,
+    pokemonanimfunc_7E,
+    pokemonanimfunc_7F,
+    pokemonanimfunc_80,
+    pokemonanimfunc_81,
+    pokemonanimfunc_82,
+    pokemonanimfunc_83,
+    pokemonanimfunc_84,
+    pokemonanimfunc_85,
+    pokemonanimfunc_86,
+    pokemonanimfunc_87,
+    pokemonanimfunc_88,
+    pokemonanimfunc_89,
+    pokemonanimfunc_8A,
+    pokemonanimfunc_8B,
+    pokemonanimfunc_8C,
+    pokemonanimfunc_8D,
+    pokemonanimfunc_8E,
+    pokemonanimfunc_8F,
+    pokemonanimfunc_90,
+    pokemonanimfunc_91,
+    pokemonanimfunc_92,
+    pokemonanimfunc_93,
+    pokemonanimfunc_94,
+    pokemonanimfunc_95,
+    pokemonanimfunc_96
+};
+
+// counting from Id 1, because 0 in sSpeciesToBackAnimId is used for mons with no back animation
+static const u8 sBackAnimationIds[] =
+{
+    0x60, 0x5f, 0x02, // 1
+    0x5e, 0x03, 0x46, // 2
+    0x6d, 0x3e, 0x6e, // 3
+    0x6f, 0x70, 0x3f, // 4
+    0x71, 0x13, 0x72, // 5
+    0x6c, 0x6b, 0x3a, // 6
+    0x64, 0x14, 0x4f, // 7
+    0x5d, 0x0f, 0x4c, // 8
+    0x61, 0x57, 0x58, // 9
+    0x67, 0x66, 0x59, // 0xA
+    0x74, 0x73, 0x5a, // 0xB
+    0x75, 0x76, 0x5b, // 0xC
+    0x77, 0x78, 0x65, // 0xD
+    0x63, 0x5c, 0x62, // 0xE
+    0x6a, 0x69, 0x68, // 0xF
+    0x7b, 0x7a, 0x79, // 0x10
+    0x7e, 0x7d, 0x7c, // 0x11
+    0x81, 0x80, 0x7f, // 0x12
+    0x84, 0x82, 0x83, // 0x13
+    0x85, 0x86, 0x87, // 0x14
+    0x88, 0x89, 0x8a, // 0x15
+    0x8b, 0x8c, 0x8d, // 0x16
+    0x8e, 0x8f, 0x90, // 0x17
+    0x91, 0x92, 0x93, // 0x18
+    0x94, 0x95, 0x96, // 0x19
+};
+
+static const u8 sBackAnimNatureModTable[] =
+{
+    0x00, // NATURE_HARDY
+	0x02, // NATURE_LONELY
+	0x00, // NATURE_BRAVE
+	0x00, // NATURE_ADAMANT
+	0x00, // NATURE_NAUGHTY
+	0x01, // NATURE_BOLD
+	0x01, // NATURE_DOCILE
+	0x01, // NATURE_RELAXED
+	0x00, // NATURE_IMPISH
+	0x01, // NATURE_LAX
+	0x02, // NATURE_TIMID
+	0x00, // NATURE_HASTY
+	0x01, // NATURE_SERIOUS
+	0x00, // NATURE_JOLLY
+	0x00, // NATURE_NAIVE
+	0x02, // NATURE_MODEST
+	0x02, // NATURE_MILD
+	0x02, // NATURE_QUIET
+	0x02, // NATURE_BASHFUL
+	0x01, // NATURE_RASH
+	0x01, // NATURE_CALM
+	0x02, // NATURE_GENTLE
+	0x01, // NATURE_SASSY
+	0x02, // NATURE_CAREFUL
+	0x01, // NATURE_QUIRKY
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_860AD48[] =
+{
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+    AFFINEANIMCMDTYPE_END
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_860AD58[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMDTYPE_END
+};
+
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_860AD68[] =
+{
+    gSpriteAffineAnim_860AD48,
+    gSpriteAffineAnim_860AD58
+};
+
+// code
+void MonAnimDummySpriteCallback(struct Sprite *sprite)
+{
+}
+
+void sub_817F3F0(struct Sprite *sprite, s16 index, s16 amplitudeX, s16 amplitudeY)
+{
+    s16 xAdder, yAdder;
+
+    amplitudeX *= -1;
+    amplitudeY *= -1;
+
+    xAdder = Cos(index, amplitudeX) - Sin(index, amplitudeY);
+    yAdder = Cos(index, amplitudeY) + Sin(index, amplitudeX);
+
+    amplitudeX *= -1;
+    amplitudeY *= -1;
+
+    sprite->pos2.x = xAdder + amplitudeX;
+    sprite->pos2.y = yAdder + amplitudeY;
+}
+
+u8 GetSpeciesBackAnimId(u16 species)
+{
+    if (sSpeciesToBackAnimId[species] != 0)
+        return sSpeciesToBackAnimId[species] - 1;
+    else
+        return 0;
+}
+
+void sub_817F498(u8 taskId)
+{
+    u32 i;
+    struct Sprite *sprite = (struct Sprite*)(u32)((gTasks[taskId].data[1] << 0x10) | (gTasks[taskId].data[2]));
+
+    if (gTasks[taskId].data[0] == 0)
+    {
+        gTasks[taskId].data[4] = sprite->data[0];
+        gTasks[taskId].data[5] = sprite->data[2];
+        sprite->data[1] = 1;
+        sprite->data[0] = 0;
+
+        for (i = 2; i < 8; i++)
+            sprite->data[i] = 0;
+
+        sprite->callback = sMonAnimFunctions[gTasks[taskId].data[3]];
+        gUnknown_03001274 = FALSE;
+
+        gTasks[taskId].data[0]++;
+    }
+    if (sprite->callback == SpriteCallbackDummy)
+    {
+        sprite->data[0] = gTasks[taskId].data[4];
+        sprite->data[2] = gTasks[taskId].data[5];
+        sprite->data[1] = 0;
+
+        DestroyTask(taskId);
+    }
+}
+
+void LaunchAnimationTaskForFrontSprite(struct Sprite *sprite, u8 frontAnimId)
+{
+    u8 taskId = CreateTask(sub_817F498, 128);
+    gTasks[taskId].data[1] = (u32)(sprite) >> 0x10;
+    gTasks[taskId].data[2] = (u32)(sprite);
+    gTasks[taskId].data[3] = frontAnimId;
+}
+
+void sub_817F578(struct Sprite *sprite, u8 frontAnimId)
+{
+    gUnknown_03001274 = TRUE;
+    sprite->callback = sMonAnimFunctions[frontAnimId];
+}
+
+void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimId)
+{
+    u8 nature, taskId, animId, bank;
+
+    taskId = CreateTask(sub_817F498, 128);
+    gTasks[taskId].data[1] = (u32)(sprite) >> 0x10;
+    gTasks[taskId].data[2] = (u32)(sprite);
+
+    bank = sprite->data[0];
+    nature = GetNature(&gPlayerParty[gBattlePartyID[bank]]);
+
+    animId = 3 * backAnimId + sBackAnimNatureModTable[nature];
+    gTasks[taskId].data[3] = sBackAnimationIds[animId];
+}
+
+void sub_817F60C(struct Sprite *sprite)
+{
+    sprite->callback = MonAnimDummySpriteCallback;
+}
+
+void sub_817F618(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
+{
+    u8 matrixNum;
+    struct ObjAffineSrcData affineSrcData;
+    struct OamMatrix dest;
+
+    affineSrcData.xScale = xScale;
+    affineSrcData.yScale = yScale;
+    affineSrcData.rotation = rotation;
+
+    matrixNum = sprite->oam.matrixNum;
+
+    ObjAffineSet(&affineSrcData, &dest, 1, 2);
+    gOamMatrices[matrixNum].a = dest.a;
+    gOamMatrices[matrixNum].b = dest.b;
+    gOamMatrices[matrixNum].c = dest.c;
+    gOamMatrices[matrixNum].d = dest.d;
+}
+
+void sub_817F670(struct Sprite *sprite)
+{
+    sprite->oam.affineMode = 3;
+    sprite->affineAnims = gSpriteAffineAnimTable_860AD68;
+
+    if (gUnknown_03001274 == TRUE)
+        InitSpriteAffineAnim(sprite);
+
+    if (!sprite->data[1])
+        StartSpriteAffineAnim(sprite, 1);
+    else
+        StartSpriteAffineAnim(sprite, 0);
+
+    CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
+    sprite->affineAnimPaused = 1;
+}
+
+void sub_817F6D4(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
+{
+    if (!sprite->data[1])
+    {
+        xScale *= -1;
+        rotation *= -1;
+    }
+
+    sub_817F618(sprite, xScale, yScale, rotation);
+}
+
+void sub_817F70C(struct Sprite *sprite)
+{
+    if (!sprite->data[1])
+        sprite->pos2.x *= -1;
+}
+
+bool32 sub_817F724(u8 id)
+{
+    if (id >= 4)
+    {
+        return FALSE;
+    }
+    else
+    {
+        gUnknown_03001240[id].field_6 = 0;
+        gUnknown_03001240[id].field_0 = 0;
+        gUnknown_03001240[id].field_4 = 1;
+        gUnknown_03001240[id].field_2 = 0;
+        gUnknown_03001240[id].field_8 = 0;
+        return TRUE;
+    }
+}
+
+u8 sub_817F758(void)
+{
+    gUnknown_03001270 = (gUnknown_03001270 + 1) % 4;
+    sub_817F724(gUnknown_03001270);
+    return gUnknown_03001270;
+}
+
+void sub_817F77C(struct Sprite *sprite)
+{
+    sprite->oam.affineMode = 1;
+    CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
+
+    if (gUnknown_03001274 == TRUE)
+    {
+        if (!sprite->data[1])
+            sprite->hFlip = 1;
+        else
+            sprite->hFlip = 0;
+
+        FreeOamMatrix(sprite->oam.matrixNum);
+        sprite->oam.matrixNum |= (sprite->hFlip << 3);
+        sprite->oam.affineMode = 0;
+    }
+}
-- 
cgit v1.2.3


From 5a57485ece9686eadaf2a96365aa285587ab51af Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 23 Jan 2018 21:30:13 -0600
Subject: Decompile naming_screen.c

---
 src/naming_screen.c | 2177 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2177 insertions(+)
 create mode 100644 src/naming_screen.c

(limited to 'src')

diff --git a/src/naming_screen.c b/src/naming_screen.c
new file mode 100644
index 000000000..403254f9f
--- /dev/null
+++ b/src/naming_screen.c
@@ -0,0 +1,2177 @@
+#include "global.h"
+#include "naming_screen.h"
+#include "malloc.h"
+#include "palette.h"
+#include "task.h"
+#include "sprite.h"
+#include "string_util.h"
+#include "new_menu_helpers.h"
+#include "window.h"
+#include "bg.h"
+#include "gpu_regs.h"
+#include "pokemon.h"
+#include "field_specials.h"
+#include "field_player_avatar.h"
+#include "field_map_obj.h"
+#include "event_data.h"
+#include "constants/vars.h"
+#include "constants/songs.h"
+#include "pokemon_storage_system.h"
+#include "sound.h"
+#include "trig.h"
+#include "field_effect.h"
+#include "pokemon_icon.h"
+#include "data2.h"
+#include "strings.h"
+#include "menu.h"
+#include "text_window.h"
+#include "overworld.h"
+
+extern EWRAM_DATA struct NamingScreenData *gNamingScreenData;
+extern u16 gKeyRepeatStartDelay;
+
+// graphics
+static const u8 gSpriteImage_858BBF8[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp");
+static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_icon/1.4bpp");
+const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
+static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal");
+extern const u16 gNamingScreenMenu_Pal[];
+extern const u8 gNamingScreenMenu_Gfx[];
+extern const u8 gUnknown_08DD4544[];
+extern const u8 gUnknown_08DD4620[];
+extern const u8 gUnknown_08DD46E0[];
+extern const u8 gUnknown_08DD47A0[];
+extern const u8 gNamingScreenRWindow_Gfx[];
+extern const u8 gNamingScreenKeyboardButton_Gfx[];
+extern const u8 gNamingScreenROptions_Gfx[];
+extern const u8 gNamingScreenCursor_Gfx[];
+extern const u8 gNamingScreenRightPointingTriangleTiles[];
+extern const u8 gNamingScreenUnderscoreTiles[];
+
+// text
+extern const u8 gExpandedPlaceholder_Empty[];
+extern const u8 gText_PkmnTransferredSomeonesPC[];
+extern const u8 gText_PkmnTransferredLanettesPC[];
+extern const u8 gText_PkmnBoxSomeonesPCFull[];
+extern const u8 gText_PkmnBoxLanettesPCFull[];
+extern const u8 gText_MoveOkBack[];
+extern const u8 gText_YourName[];
+extern const u8 gText_BoxName[];
+extern const u8 gText_PkmnsNickname[];
+extern const u8 gText_TellHimTheWords[];
+
+// start of .rodata
+static const u8 *const gUnknown_0858BDB8[] = 
+{
+    gText_PkmnTransferredSomeonesPC,
+    gText_PkmnTransferredLanettesPC,
+    gText_PkmnBoxSomeonesPCFull,
+    gText_PkmnBoxLanettesPCFull
+};
+
+static const u8 gUnknown_0858BDC8[] = _("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!");
+
+static const struct BgTemplate gUnknown_0858BE00[] = 
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .priority = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 29,
+        .priority = 1
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 28,
+        .priority = 2
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 31,
+        .priority = 3
+    }
+};
+
+static const struct WindowTemplate gUnknown_0858BE10[] = {
+    { 0x01, 0x03, 0x0A, 0x13, 0x08, 0x0A, 0x030 },
+    { 0x02, 0x03, 0x0A, 0x13, 0x08, 0x0A, 0x0C8 },
+    { 0x03, 0x08, 0x06, 0x11, 0x02, 0x0A, 0x030 },
+    { 0x03, 0x08, 0x04, 0x11, 0x02, 0x0A, 0x052 },
+    { 0x00, 0x00, 0x00, 0x1E, 0x02, 0x0B, 0x074 },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const u8 gUnknown_0858BE40[] = __("abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234   56789   !?♂♀/-  …“”‘’   ");
+
+static const u8 gUnknown_0858BEA0[] = { 8, 8, 6 };
+static const u8 gUnknown_0858BEA3[] = { 0, 12, 24, 56, 68, 80, 92, 123, 0, 12, 24, 56, 68, 80, 92, 123, 0, 22, 44, 66, 88, 110, 0, 0 };
+
+// forward declarations
+static const struct NamingScreenTemplate *const sNamingScreenTemplates[];
+static const struct SubspriteTable gUnknown_0858C050[];
+static const struct SubspriteTable gUnknown_0858C058[];
+static const struct SubspriteTable gUnknown_0858C070[];
+static const struct SubspriteTable gUnknown_0858C078[];
+static const struct SpriteTemplate gUnknown_0858C0C0;
+static const struct SpriteTemplate gUnknown_0858C0D8;
+static const struct SpriteTemplate gUnknown_0858C0F0;
+static const struct SpriteTemplate gUnknown_0858C108;
+static const struct SpriteTemplate gUnknown_0858C120;
+static const struct SpriteTemplate gUnknown_0858C138;
+static const struct SpriteTemplate gUnknown_0858C150;
+static const struct SpriteTemplate gUnknown_0858C168;
+static const struct SpriteTemplate gUnknown_0858C180;
+static const u8* const gUnknown_0858C198[][4];
+static const struct SpriteSheet gUnknown_0858C1C8[];
+static const struct SpritePalette gUnknown_0858C230[];
+
+static void C2_NamingScreen(void);
+static void NamingScreen_Init(void);
+static void choose_name_or_words_screen_init_bgs(void);
+static void sub_80E3194(void);
+static void sub_80E31B0(u8 taskId);
+static bool8 MainState_BeginFadeIn(void);
+static bool8 MainState_WaitFadeIn(void);
+static bool8 MainState_HandleInput(void);
+static bool8 MainState_MoveToOKButton(void);
+static bool8 MainState_6(void);
+static bool8 MainState_BeginFadeInOut(void);
+static bool8 MainState_WaitFadeOutAndExit(void);
+static void DisplaySentToPCMessage(void);
+static bool8 sub_80E3604(void);
+static bool8 MainState_StartPageSwap(void);
+static bool8 MainState_WaitPageSwap(void);
+static void StartPageSwapAnim(void);
+static void Task_HandlePageSwapAnim(u8);
+static bool8 IsPageSwapAnimNotInProgress(void);
+static void sub_80E3948(u8, u8, u8);
+static void Task_80E39BC(u8);
+static u16 sub_80E3A74(u8);
+static void sub_80E3AE8(u8);
+static void sub_80E3B10(struct Task *, u8, u8);
+static void sub_80E3CC8(void);
+static void CursorInit(void);
+static void SetCursorPos(s16, s16);
+static void GetCursorPos(s16 *x, s16 *y);
+static void MoveCursorToOKButton(void);
+static void sub_80E3E3C(u8);
+static void sub_80E3E94(u8);
+static u8 IsCursorAnimFinished(void);
+static u8 GetCurrentPageColumnCount(void);
+static void sub_80E3F8C(void);
+static void sub_80E4050(void);
+static void sub_80E41B8(u8, struct Sprite *, struct Sprite *);
+static void sub_80E4218(void);
+static void sub_80E4290(void);
+static void sub_80E4354(void);
+static u8 HandleKeyboardEvent(void);
+static u8 sub_80E45E0(void);
+static u8 GetInputEvent(void);
+static void SetInputState(u8);
+static void sub_80E4964(void);
+static u8 GetTextCaretPosition(void);
+static void DeleteTextCharacter(void);
+static bool8 sub_80E4B54(void);
+static void AddTextCharacter(u8);
+static void sub_80E4BE4(void);
+static void choose_name_or_words_screen_load_bg_tile_patterns(void);
+static void sub_80E4CB8(void);
+static void choose_name_or_words_screen_apply_bg_pals(void);
+static void sub_80E4CF8(u8, const void *);
+static void nullsub_10(u8, u8);
+static void sub_80E4D10(void);
+static void sub_80E4DE4(u8, u8);
+static void sub_80E4E5C(void);
+static void sub_80E4EF0(void);
+static void sub_80E4F58(void);
+static void NamingScreen_TurnOffScreen(void);
+static void NamingScreen_InitDisplayMode(void);
+static void VBlankCB_NamingScreen(void);
+static void sub_80E501C(void);
+static bool8 sub_80E503C(u8);
+
+void DoNamingScreen(u8 templateNum, u8 *destBuffer, u16 monSpecies, u16 monGender, u32 monPersonality, MainCallback returnCallback)
+{
+    gNamingScreenData = Alloc(sizeof(struct NamingScreenData));
+    if (!gNamingScreenData)
+    {
+        SetMainCallback2(returnCallback);
+    }
+    else
+    {
+        gNamingScreenData->templateNum = templateNum;
+        gNamingScreenData->unk1E34 = monSpecies;
+        gNamingScreenData->unk1E36 = monGender;
+        gNamingScreenData->unk1E38 = monPersonality;
+        gNamingScreenData->destBuffer = destBuffer;
+        gNamingScreenData->returnCallback = returnCallback;
+        
+        if (templateNum == 0)
+            StartTimer1();
+        
+        SetMainCallback2(C2_NamingScreen);
+    }
+}
+
+static void C2_NamingScreen(void)
+{
+    switch (gMain.state)
+    {
+    case 0:
+        NamingScreen_TurnOffScreen();
+        NamingScreen_Init();
+        gMain.state++;
+        break;
+    case 1:
+        choose_name_or_words_screen_init_bgs();
+        gMain.state++;
+        break;
+    case 2:
+        ResetPaletteFade();
+        gMain.state++;
+        break;
+    case 3:
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        gMain.state++;
+        break;
+    case 4:
+        ResetTasks();
+        gMain.state++;
+        break;
+    case 5:
+        choose_name_or_words_screen_apply_bg_pals();
+        gMain.state++;
+        break;
+    case 6:
+        choose_name_or_words_screen_load_bg_tile_patterns();
+        gMain.state++;
+        break;
+    case 7:
+        sub_80E3CC8();
+        UpdatePaletteFade();
+        sub_80E501C();
+        gMain.state++;
+        break;
+    default:
+        sub_80E4CB8();
+        sub_80E3194();
+        break;
+    }
+}
+
+static void NamingScreen_Init(void)
+{
+    gNamingScreenData->state = 0;
+    gNamingScreenData->bg1vOffset = 0;
+    gNamingScreenData->bg2vOffset = 0;
+    gNamingScreenData->unk1E1C = 1;
+    gNamingScreenData->unk1E1E = 2;
+    gNamingScreenData->unk1E20 = 0;
+    gNamingScreenData->unk1E21 = 1;
+    gNamingScreenData->template = sNamingScreenTemplates[gNamingScreenData->templateNum];
+    gNamingScreenData->currentPage = gNamingScreenData->template->unk4;
+    gNamingScreenData->unk1E16 = (240 - gNamingScreenData->template->maxChars * 8) / 2 + 6;
+    if (gNamingScreenData->templateNum == 4)
+        gNamingScreenData->unk1E16 += 11;
+    gNamingScreenData->unk1E25 = gKeyRepeatStartDelay;
+    memset(gNamingScreenData->textBuffer, 0xFF, sizeof(gNamingScreenData->textBuffer));
+    if (gNamingScreenData->template->unk0 != 0)
+        StringCopy(gNamingScreenData->textBuffer, gNamingScreenData->destBuffer);
+    gKeyRepeatStartDelay = 16;
+}
+
+static void sub_80E2FA4(void)
+{
+    u8 i;
+    for (i = 0; i < MAX_SPRITES; i++)
+    {
+        if (gSprites[i].inUse)
+            gSprites[i].invisible = FALSE;
+    }
+    sub_80E3E3C(0);
+}
+
+static void choose_name_or_words_screen_init_bgs(void)
+{
+    u8 i;
+    
+    DmaClearLarge16(3, (void *)VRAM, VRAM_SIZE, 0x1000);
+    DmaClear32(3, (void *)OAM, OAM_SIZE);
+    DmaClear16(3, (void *)PLTT, PLTT_SIZE);
+    
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0);
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_0858BE00, 4);
+    
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    ChangeBgX(1, 0, 0);
+    ChangeBgY(1, 0, 0);
+    ChangeBgX(2, 0, 0);
+    ChangeBgY(2, 0, 0);
+    ChangeBgX(3, 0, 0);
+    ChangeBgY(3, 0, 0);
+    
+    sub_81971D0();
+    sub_8197200();
+    
+    for (i = 0; i < 5; i++)
+        gNamingScreenData->windows[i] = AddWindow(&gUnknown_0858BE10[i]);
+    
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
+    SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2);
+    SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0xC, 0x8));
+    
+    SetBgTilemapBuffer(1, gNamingScreenData->tilemapBuffer1);
+    SetBgTilemapBuffer(2, gNamingScreenData->tilemapBuffer2);
+    SetBgTilemapBuffer(3, gNamingScreenData->tilemapBuffer3);
+    
+    FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 0x20, 0x20);
+    FillBgTilemapBufferRect_Palette0(2, 0, 0, 0, 0x20, 0x20);
+    FillBgTilemapBufferRect_Palette0(3, 0, 0, 0, 0x20, 0x20);
+}
+
+static void sub_80E3194(void)
+{
+    CreateTask(sub_80E31B0, 2);
+    SetMainCallback2(sub_80E4F58);
+}
+
+static void sub_80E31B0(u8 taskId)
+{
+    switch (gNamingScreenData->state)
+    {
+    case 0:
+        MainState_BeginFadeIn();
+        sub_80E2FA4();
+        NamingScreen_InitDisplayMode();
+        break;
+    case 1:
+        MainState_WaitFadeIn();
+        break;
+    case 2:
+        MainState_HandleInput();
+        break;
+    case 3:
+        MainState_MoveToOKButton();
+        MainState_HandleInput();
+        break;
+    case 4:
+        MainState_StartPageSwap();
+        break;
+    case 5:
+        MainState_WaitPageSwap();
+        break;
+    case 6:
+        MainState_6();
+        break;
+    case 7:
+        sub_80E3604();
+        break;
+    case 8:
+        MainState_BeginFadeInOut();
+        break;
+    case 9:
+        MainState_WaitFadeOutAndExit();
+        break;
+    }
+}
+
+static const u8 gUnknown_0858BEBB[] = { 0, 2, 1 };
+static const u8 gUnknown_0858BEBE[] = { 1, 0, 2 };
+static const u8 gUnknown_0858BEC1[] = { 2, 1, 0 };
+
+static u8 sub_80E3244(u8 a1)
+{
+    return gUnknown_0858BEBB[a1];
+}
+
+static u8 sub_80E3254(void)
+{
+    return gUnknown_0858BEBE[gNamingScreenData->currentPage];
+}
+
+static u8 sub_80E3274(void)
+{
+    return gUnknown_0858BEC1[gNamingScreenData->currentPage];
+}
+
+static bool8 MainState_BeginFadeIn(void)
+{
+    sub_80E4CF8(3, gUnknown_08DD4544);
+    gNamingScreenData->currentPage = 1;
+    sub_80E4CF8(2, gUnknown_08DD46E0);
+    sub_80E4CF8(1, gUnknown_08DD4620);
+    sub_80E4DE4(gNamingScreenData->windows[1], 0);
+    sub_80E4DE4(gNamingScreenData->windows[0], 1);
+    nullsub_10(2, 0);
+    nullsub_10(1, 1);
+    sub_80E4D10();
+    sub_80E4964();
+    sub_80E4EF0();
+    CopyBgTilemapBufferToVram(1);
+    CopyBgTilemapBufferToVram(2);
+    CopyBgTilemapBufferToVram(3);
+    BlendPalettes(-1, 16, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+    gNamingScreenData->state++;
+    return FALSE;
+}
+
+static bool8 MainState_WaitFadeIn(void)
+{
+    if (!gPaletteFade.active)
+    {
+        SetInputState(INPUT_STATE_ENABLED);
+        sub_80E3E94(1);
+        gNamingScreenData->state++;
+    }
+    return FALSE;
+}
+
+static bool8 MainState_HandleInput(void)
+{
+    return HandleKeyboardEvent();
+}
+
+static bool8 MainState_MoveToOKButton(void)
+{
+    if (IsCursorAnimFinished())
+    {
+        SetInputState(INPUT_STATE_ENABLED);
+        MoveCursorToOKButton();
+        gNamingScreenData->state = MAIN_STATE_HANDLE_INPUT;
+    }
+    return FALSE;
+}
+
+static bool8 MainState_6(void)
+{
+    sub_80E4BE4();
+    SetInputState(INPUT_STATE_DISABLED);
+    sub_80E3E94(0);
+    sub_80E3948(3, 0, 1);
+    if (gNamingScreenData->templateNum == NAMING_SCREEN_CAUGHT_MON &&
+        CalculatePlayerPartyCount() >= 6)
+    {
+        DisplaySentToPCMessage();
+        gNamingScreenData->state = MAIN_STATE_UPDATE_SENT_TO_PC_MESSAGE;
+        return FALSE;
+    }
+    else
+    {
+        gNamingScreenData->state = MAIN_STATE_BEGIN_FADE_OUT;
+        return TRUE;  //Exit the naming screen
+    }
+}
+
+static bool8 MainState_BeginFadeInOut(void)
+{
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    gNamingScreenData->state++;
+    return FALSE;
+}
+
+static bool8 MainState_WaitFadeOutAndExit(void)
+{
+    if (!gPaletteFade.active)
+    {
+        if (gNamingScreenData->templateNum == NAMING_SCREEN_PLAYER)
+            SeedRngAndSetTrainerId();
+        SetMainCallback2(gNamingScreenData->returnCallback);
+        DestroyTask(FindTaskIdByFunc(sub_80E31B0));
+        FreeAllWindowBuffers();
+        FREE_AND_SET_NULL(gNamingScreenData);
+    }
+    return FALSE;
+}
+
+static void DisplaySentToPCMessage(void)
+{
+    u8 stringToDisplay = 0;
+    
+    if (!sub_813B260())
+    {
+        StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN)));
+        StringCopy(gStringVar2, gNamingScreenData->destBuffer);
+    }
+    else
+    {
+        StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN)));
+        StringCopy(gStringVar2, gNamingScreenData->destBuffer);
+        StringCopy(gStringVar3, GetBoxNamePtr(get_unknown_box_id()));
+        stringToDisplay = 2;
+    }
+    
+    if (FlagGet(FLAG_SYS_PC_LANETTE))
+        stringToDisplay++;
+    
+    StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]);
+    sub_81973C4(0, 0);
+    gTextFlags.flag_0 = TRUE;
+    AddTextPrinterParametrized(0, 1, gStringVar4, GetPlayerTextSpeed(), 0, 2, 1, 3);
+    CopyWindowToVram(0, 3);
+}
+
+static bool8 sub_80E3604(void)
+{
+    RunTextPrinters();
+    
+    if (!IsTextPrinterActive(0) && (gMain.newKeys & A_BUTTON))
+        gNamingScreenData->state = MAIN_STATE_BEGIN_FADE_OUT;
+    
+    return FALSE;
+}
+
+static bool8 MainState_StartPageSwap(void)
+{
+    SetInputState(INPUT_STATE_DISABLED);
+    sub_80E4050();
+    StartPageSwapAnim();
+    sub_80E3E3C(1);
+    sub_80E3948(0, 0, 1);
+    PlaySE(SE_WIN_OPEN);
+    gNamingScreenData->state = MAIN_STATE_WAIT_PAGE_SWAP;
+    return FALSE;
+}
+
+static bool8 MainState_WaitPageSwap(void)
+{
+    s16 cursorX;
+    s16 cursorY;
+    bool32 var3;
+        
+    if (IsPageSwapAnimNotInProgress())
+    {
+        
+        GetCursorPos(&cursorX, &cursorY);
+        var3 = (cursorX == GetCurrentPageColumnCount());
+        
+        gNamingScreenData->state = MAIN_STATE_HANDLE_INPUT;
+        gNamingScreenData->currentPage++;
+        gNamingScreenData->currentPage %= 3;
+        
+        if (var3)
+        {
+            cursorX = GetCurrentPageColumnCount();
+        }
+        else
+        {
+            if (cursorX >= GetCurrentPageColumnCount())
+                cursorX = GetCurrentPageColumnCount() - 1;
+        }
+        
+        SetCursorPos(cursorX, cursorY);
+        sub_80E4E5C();
+        SetInputState(INPUT_STATE_ENABLED);
+        sub_80E3E3C(0);
+    }
+    return FALSE;
+}
+
+//--------------------------------------------------
+// Page Swap
+//--------------------------------------------------
+
+#define tState data[0]
+#define tFrameCount data[1]
+
+static bool8 PageSwapAnimState_Init(struct Task *);
+static bool8 PageSwapAnimState_1(struct Task *);
+static bool8 PageSwapAnimState_2(struct Task *);
+static bool8 PageSwapAnimState_Done(struct Task *);
+
+static bool8 (*const sPageSwapAnimStateFuncs[])(struct Task *) = 
+{
+    PageSwapAnimState_Init,
+    PageSwapAnimState_1,
+    PageSwapAnimState_2,
+    PageSwapAnimState_Done,
+};
+
+static void StartPageSwapAnim(void)
+{
+    u8 taskId;
+
+    taskId = CreateTask(Task_HandlePageSwapAnim, 0);
+    Task_HandlePageSwapAnim(taskId);
+}
+
+static void Task_HandlePageSwapAnim(u8 taskId)
+{
+    while (sPageSwapAnimStateFuncs[gTasks[taskId].tState](&gTasks[taskId]) != 0);
+}
+
+static bool8 IsPageSwapAnimNotInProgress(void)
+{
+    if (FindTaskIdByFunc(Task_HandlePageSwapAnim) == 0xFF)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static bool8 PageSwapAnimState_Init(struct Task *task)
+{
+    gNamingScreenData->bg1vOffset = 0;
+    gNamingScreenData->bg2vOffset = 0;
+    task->tState++;
+    return 0;
+}
+
+static bool8 PageSwapAnimState_1(struct Task *task)
+{
+    u16 *const arr[] =
+    {
+        &gNamingScreenData->bg2vOffset,
+        &gNamingScreenData->bg1vOffset
+    };
+
+    task->tFrameCount += 4;
+    *arr[gNamingScreenData->unk1E20] = Sin(task->tFrameCount, 40);
+    *arr[gNamingScreenData->unk1E21] = Sin((task->tFrameCount + 128) & 0xFF, 40);
+    if (task->tFrameCount >= 64)
+    {
+        u8 temp = gNamingScreenData->unk1E1C;  //Why u8 and not u16?
+
+        gNamingScreenData->unk1E1C = gNamingScreenData->unk1E1E;
+        gNamingScreenData->unk1E1E = temp;
+        task->tState++;
+    }
+    return 0;
+}
+
+static bool8 PageSwapAnimState_2(struct Task *task)
+{
+    u16 *const arr[] = {&gNamingScreenData->bg2vOffset, &gNamingScreenData->bg1vOffset};
+
+    task->tFrameCount += 4;
+    *arr[gNamingScreenData->unk1E20] = Sin(task->tFrameCount, 40);
+    *arr[gNamingScreenData->unk1E21] = Sin((task->tFrameCount + 128) & 0xFF, 40);
+    if (task->tFrameCount >= 128)
+    {
+        u8 temp = gNamingScreenData->unk1E20;
+
+        gNamingScreenData->unk1E20 = gNamingScreenData->unk1E21;
+        gNamingScreenData->unk1E21 = temp;
+        task->tState++;
+    }
+    return 0;
+}
+
+static bool8 PageSwapAnimState_Done(struct Task *task)
+{
+    DestroyTask(FindTaskIdByFunc(Task_HandlePageSwapAnim));
+    return 0;
+}
+
+#undef tState
+#undef tFrameCount
+
+//--------------------------------------------------
+//
+//--------------------------------------------------
+
+static void sub_80E3920(void)
+{
+    u8 taskId;
+
+    taskId = CreateTask(Task_80E39BC, 3);
+    gTasks[taskId].data[0] = 3;
+}
+
+static void sub_80E3948(u8 a, u8 b, u8 c)
+{
+    struct Task *task = &gTasks[FindTaskIdByFunc(Task_80E39BC)];
+
+    if (a == task->data[0] && c == 0)
+    {
+        task->data[1] = b;
+        task->data[2] = 1;
+        return;
+    }
+    if (a == 3 && task->data[1] == 0 && c == 0)
+        return;
+    if (task->data[0] != 3)
+        sub_80E3AE8(task->data[0]);
+    sub_80E3B10(task, a, b);
+}
+
+static void Task_80E39BC(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    if (task->data[0] == 3 || task->data[2] == 0)
+        return;
+    MultiplyInvertedPaletteRGBComponents(sub_80E3A74(task->data[0]), task->data[3], task->data[3], task->data[3]);
+    if (task->data[5] != 0)
+    {
+        task->data[5]--;
+        if (task->data[5] != 0)
+            return;
+    }
+    task->data[5] = 2;
+    if (task->data[4] >= 0)
+    {
+        if (task->data[3] < 14)
+        {
+            task->data[3] += task->data[4];
+            task->data[6] += task->data[4];
+        }
+        else
+        {
+            task->data[3] = 16;
+            task->data[6]++;
+        }
+    }
+    else
+    {
+        task->data[3] += task->data[4];
+        task->data[6] += task->data[4];
+    }
+    
+    if (task->data[3] == 16 && task->data[6] == 22)
+    {
+        task->data[4] = -4;
+    }
+    else if (task->data[3] == 0)
+    {
+        task->data[2] = task->data[1];
+        task->data[4] = 2;
+        task->data[6] = 0;
+    }
+}
+
+static u16 sub_80E3A74(u8 a)
+{
+    const u16 arr[] =
+    {
+        IndexOfSpritePaletteTag(4) * 16 + 0x10E,
+        IndexOfSpritePaletteTag(6) * 16 + 0x10E,
+        IndexOfSpritePaletteTag(7) * 16 + 0x10E,
+        IndexOfSpritePaletteTag(7) * 16 + 0x101,
+    };
+
+    return arr[a];
+}
+
+static void sub_80E3AE8(u8 a)
+{
+    u16 index = sub_80E3A74(a);
+
+    gPlttBufferFaded[index] = gPlttBufferUnfaded[index];
+}
+
+static void sub_80E3B10(struct Task *task, u8 b, u8 c)
+{
+    task->data[0] = b;
+    task->data[1] = c;
+    task->data[2] = 1;
+    task->data[3] = 4;
+    task->data[4] = 2;
+    task->data[5] = 0;
+    task->data[6] = 4;
+}
+
+static void sub_80E3B30(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+        StartSpriteAnim(sprite, 0);
+    sprite->invisible = (sprite->data[4] & 0xFF);
+    if (sprite->data[0] == GetCurrentPageColumnCount())
+        sprite->invisible = TRUE;
+    if (sprite->invisible || (sprite->data[4] & 0xFF00) == 0
+     || sprite->data[0] != sprite->data[2] || sprite->data[1] != sprite->data[3])
+    {
+        sprite->data[5] = 0;
+        sprite->data[6] = 2;
+        sprite->data[7] = 2;
+    }
+    sprite->data[7]--;
+    if (sprite->data[7] == 0)
+    {
+        sprite->data[5] += sprite->data[6];
+        if (sprite->data[5] == 16 || sprite->data[5] == 0)
+            sprite->data[6] = -sprite->data[6];
+        sprite->data[7] = 2;
+    }
+    if ((sprite->data[4] & 0xFF00) != 0)
+    {
+        s8 gb = sprite->data[5];
+        s8 r = sprite->data[5] >> 1;
+        u16 index = IndexOfSpritePaletteTag(5) * 16 + 0x0101;
+
+        MultiplyInvertedPaletteRGBComponents(index, r, gb, gb);
+    }
+}
+
+static void sub_80E3C20(struct Sprite *sprite)
+{
+    const s16 arr[] = {0, -4, -2, -1};
+
+    if (sprite->data[0] == 0 || --sprite->data[0] == 0)
+    {
+        sprite->data[0] = 8;
+        sprite->data[1] = (sprite->data[1] + 1) & 3;
+    }
+    sprite->pos2.x = arr[sprite->data[1]];
+}
+
+static void sub_80E3C6C(struct Sprite *sprite)
+{
+    const s16 arr[] = {2, 3, 2, 1};
+    u8 var;
+
+    var = GetTextCaretPosition();
+    if (var != (u8)sprite->data[0])
+    {
+        sprite->pos2.y = 0;
+        sprite->data[1] = 0;
+        sprite->data[2] = 0;
+    }
+    else
+    {
+        sprite->pos2.y = arr[sprite->data[1]];
+        sprite->data[2]++;
+        if (sprite->data[2] > 8)
+        {
+            sprite->data[1] = (sprite->data[1] + 1) & 3;
+            sprite->data[2] = 0;
+        }
+    }
+}
+
+//--------------------------------------------------
+// Cursor
+//--------------------------------------------------
+
+static void sub_80E3CC8(void)
+{
+    CursorInit();
+    sub_80E3F8C();
+    sub_80E4218();
+    sub_80E4290();
+    sub_80E4354();
+}
+
+static void CursorInit(void)
+{
+    gNamingScreenData->cursorSpriteId = CreateSprite(&gUnknown_0858C138, 38, 88, 1);
+    sub_80E3E3C(1);
+    gSprites[gNamingScreenData->cursorSpriteId].oam.priority = 1;
+    gSprites[gNamingScreenData->cursorSpriteId].oam.objMode = 1;
+    gSprites[gNamingScreenData->cursorSpriteId].data[6] = 1;
+    gSprites[gNamingScreenData->cursorSpriteId].data[6] = 2;
+    SetCursorPos(0, 0);
+}
+
+static void SetCursorPos(s16 x, s16 y)
+{
+    struct Sprite *cursorSprite = &gSprites[gNamingScreenData->cursorSpriteId];
+    
+    if (x < gUnknown_0858BEA0[sub_80E3274()])
+        cursorSprite->pos1.x = gUnknown_0858BEA3[x + sub_80E3274() * 8] + 38;
+    else
+        cursorSprite->pos1.x = 0;
+
+    cursorSprite->pos1.y = y * 16 + 88;
+    cursorSprite->data[2] = cursorSprite->data[0];
+    cursorSprite->data[3] = cursorSprite->data[1];
+    cursorSprite->data[0] = x;
+    cursorSprite->data[1] = y;
+}
+
+static void GetCursorPos(s16 *x, s16 *y)
+{
+    struct Sprite *cursorSprite = &gSprites[gNamingScreenData->cursorSpriteId];
+    
+    *x = cursorSprite->data[0];
+    *y = cursorSprite->data[1];
+}
+
+static void MoveCursorToOKButton(void)
+{
+    SetCursorPos(GetCurrentPageColumnCount(), 2);
+}
+
+static void sub_80E3E3C(u8 a)
+{
+    gSprites[gNamingScreenData->cursorSpriteId].data[4] &= -256;
+    gSprites[gNamingScreenData->cursorSpriteId].data[4] |= a;
+    StartSpriteAnim(&gSprites[gNamingScreenData->cursorSpriteId], 0);
+}
+
+static void sub_80E3E94(u8 a)
+{
+    gSprites[gNamingScreenData->cursorSpriteId].data[4] &= 0xFF;
+    gSprites[gNamingScreenData->cursorSpriteId].data[4] |= a << 8;
+}
+
+static void sub_80E3ED8(void)
+{
+    StartSpriteAnim(&gSprites[gNamingScreenData->cursorSpriteId], 1);
+}
+
+static bool8 IsCursorAnimFinished(void)
+{
+    return gSprites[gNamingScreenData->cursorSpriteId].animEnded;
+}
+
+enum
+{
+    KEY_ROLE_CHAR,
+    KEY_ROLE_PAGE,
+    KEY_ROLE_BACKSPACE,
+    KEY_ROLE_OK,
+};
+
+static const u8 sKeyRoles[] = {KEY_ROLE_PAGE, KEY_ROLE_BACKSPACE, KEY_ROLE_OK};
+
+static u8 GetKeyRoleAtCursorPos(void)
+{
+    s16 cursorX;
+    s16 cursorY;
+
+    GetCursorPos(&cursorX, &cursorY);
+    if (cursorX < GetCurrentPageColumnCount())
+        return KEY_ROLE_CHAR;
+    else
+        return sKeyRoles[cursorY];
+}
+
+static u8 GetCurrentPageColumnCount(void)
+{
+    return gUnknown_0858BEA0[sub_80E3274()];
+}
+
+static void sub_80E3F8C(void)
+{
+    u8 spriteId1;
+    u8 spriteId2;
+    u8 spriteId3;
+
+    spriteId1 = CreateSprite(&gUnknown_0858C0C0, 0xCC, 0x58, 0);
+    gNamingScreenData->unk1E24 = spriteId1;
+    SetSubspriteTables(&gSprites[spriteId1], gUnknown_0858C050);
+    gSprites[spriteId1].invisible = TRUE;
+
+    spriteId2 = CreateSprite(&gUnknown_0858C0F0, 0xCC, 0x54, 1);
+    gSprites[spriteId1].data[6] = spriteId2;
+    SetSubspriteTables(&gSprites[spriteId2], gUnknown_0858C058);
+    gSprites[spriteId2].invisible = TRUE;
+
+    spriteId3 = CreateSprite(&gUnknown_0858C0D8, 0xCC, 0x53, 2);
+    gSprites[spriteId3].oam.priority = 1;
+    gSprites[spriteId1].data[7] = spriteId3;
+    gSprites[spriteId3].invisible = TRUE;
+}
+
+static void sub_80E4050(void)
+{
+    struct Sprite *sprite = &gSprites[gNamingScreenData->unk1E24];
+
+    sprite->data[0] = 2;
+    sprite->data[1] = gNamingScreenData->currentPage;
+}
+
+static u8 sub_80E40AC(struct Sprite *);
+static u8 sub_80E4100(struct Sprite *);
+static u8 sub_80E4104(struct Sprite *);
+static u8 sub_80E4178(struct Sprite *);
+
+static u8 (*const gUnknown_0858BEE8[])(struct Sprite *) =
+{
+    sub_80E40AC,
+    sub_80E4100,
+    sub_80E4104,
+    sub_80E4178,
+};
+
+static void sub_80E4084(struct Sprite *sprite)
+{
+    while (gUnknown_0858BEE8[sprite->data[0]](sprite) != 0);
+}
+
+static u8 sub_80E40AC(struct Sprite *sprite)
+{
+    struct Sprite *sprite1 = &gSprites[sprite->data[6]];
+    struct Sprite *sprite2 = &gSprites[sprite->data[7]];
+
+    sub_80E41B8(sub_80E3244(gNamingScreenData->currentPage), sprite1, sprite2);
+    sprite->data[0]++;
+    return 0;
+}
+
+static u8 sub_80E4100(struct Sprite *sprite)
+{
+    return 0;
+}
+
+static u8 sub_80E4104(struct Sprite *sprite)
+{
+    struct Sprite *r4 = &gSprites[sprite->data[6]];
+    struct Sprite *r5 = &gSprites[sprite->data[7]];
+
+    r4->pos2.y++;
+    if (r4->pos2.y > 7)
+    {
+        sprite->data[0]++;
+        r4->pos2.y = -4;
+        r4->invisible = TRUE;
+        sub_80E41B8(sub_80E3244(((u8)sprite->data[1] + 1) % 3), r4, r5);
+    }
+    return 0;
+}
+
+static u8 sub_80E4178(struct Sprite *sprite)
+{
+    struct Sprite *r2 = &gSprites[sprite->data[6]];
+
+    r2->invisible = FALSE;
+    r2->pos2.y++;
+    if (r2->pos2.y >= 0)
+    {
+        r2->pos2.y = 0;
+        sprite->data[0] = 1;
+    }
+    return 0;
+}
+
+static const u16 gUnknown_0858BEF8[] = {1, 3, 2};
+static const u16 gUnknown_0858BEFE[] = {4, 6, 5};
+
+static void sub_80E41B8(u8 a, struct Sprite *b, struct Sprite *c)
+{
+    c->oam.paletteNum = IndexOfSpritePaletteTag(gUnknown_0858BEF8[a]);
+    b->sheetTileStart = GetSpriteTileStartByTag(gUnknown_0858BEFE[a]);
+    b->subspriteTableNum = a;
+}
+
+//
+
+static void sub_80E4218(void)
+{
+    u8 spriteId;
+
+    spriteId = CreateSprite(&gUnknown_0858C108, 0xCC, 0x74, 0);
+    SetSubspriteTables(&gSprites[spriteId], gUnknown_0858C070);
+    gSprites[spriteId].invisible = TRUE;
+
+    spriteId = CreateSprite(&gUnknown_0858C120, 0xCC, 0x8C, 0);
+    SetSubspriteTables(&gSprites[spriteId], gUnknown_0858C070);
+    gSprites[spriteId].invisible = TRUE;
+}
+
+static void sub_80E4290(void)
+{
+    u8 spriteId;
+    s16 r1;
+    u8 i;
+
+    r1 = gNamingScreenData->unk1E16 - 5;
+    spriteId = CreateSprite(&gUnknown_0858C150, r1, 0x38, 0);
+    gSprites[spriteId].oam.priority = 3;
+    gSprites[spriteId].invisible = TRUE;
+    r1 = gNamingScreenData->unk1E16;
+    for (i = 0; i < gNamingScreenData->template->maxChars; i++, r1 += 8)
+    {
+        spriteId = CreateSprite(&gUnknown_0858C168, r1 + 3, 0x3C, 0);
+        gSprites[spriteId].oam.priority = 3;
+        gSprites[spriteId].data[0] = i;
+        gSprites[spriteId].invisible = TRUE;
+    }
+}
+
+//
+
+static void TaskDummy2(void);
+static void sub_80E4384(void);
+static void sub_80E43E0(void);
+static void sub_80E4420(void);
+static void sub_80E447C(void);
+
+static void (*const gUnknown_0858BF04[])(void) =
+{
+    TaskDummy2,
+    sub_80E4384,
+    sub_80E43E0,
+    sub_80E4420,
+    sub_80E447C,
+};
+
+static void sub_80E4354(void)
+{
+    gUnknown_0858BF04[gNamingScreenData->template->unk2]();
+}
+
+static void TaskDummy2(void)
+{
+    
+}
+
+static void sub_80E4384(void)
+{
+    u8 rivalGfxId;
+    u8 spriteId;
+
+    rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->unk1E34);
+    spriteId = AddPseudoFieldObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0);
+    gSprites[spriteId].oam.priority = 3;
+    StartSpriteAnim(&gSprites[spriteId], 4);
+}
+
+static void sub_80E43E0(void)
+{
+    u8 spriteId;
+
+    spriteId = CreateSprite(&gUnknown_0858C180, 0x38, 0x29, 0);
+    SetSubspriteTables(&gSprites[spriteId], gUnknown_0858C078);
+    gSprites[spriteId].oam.priority = 3;
+}
+
+static void sub_80E4420(void)
+{
+    u8 spriteId;
+
+    sub_80D2F04();
+    spriteId = CreateMonIcon(gNamingScreenData->unk1E34, SpriteCallbackDummy, 0x38, 0x28, 0, gNamingScreenData->unk1E38, 1);
+    gSprites[spriteId].oam.priority = 3;
+}
+
+static void sub_80E447C(void)
+{
+    u8 spriteId;
+
+    spriteId = AddPseudoFieldObject(0x13, SpriteCallbackDummy, 0x38, 0x25, 0);
+    gSprites[spriteId].oam.priority = 3;
+    StartSpriteAnim(&gSprites[spriteId], 4);
+}
+
+//--------------------------------------------------
+// Keyboard handling
+//--------------------------------------------------
+
+static bool8 KeyboardKeyHandler_Character(u8);
+static bool8 KeyboardKeyHandler_Page(u8);
+static bool8 KeyboardKeyHandler_Backspace(u8);
+static bool8 KeyboardKeyHandler_OK(u8);
+
+static bool8 (*const sKeyboardKeyHandlers[])(u8) =
+{
+    KeyboardKeyHandler_Character,
+    KeyboardKeyHandler_Page,
+    KeyboardKeyHandler_Backspace,
+    KeyboardKeyHandler_OK,
+};
+
+static bool8 HandleKeyboardEvent(void)
+{
+    u8 event = GetInputEvent();
+    u8 keyRole = GetKeyRoleAtCursorPos();
+
+    if (event == KBEVENT_PRESSED_SELECT)
+    {
+        return sub_80E45E0();
+    }
+    else if (event == KBEVENT_PRESSED_B)
+    {
+        DeleteTextCharacter();
+        return FALSE;
+    }
+    else if (event == KBEVENT_PRESSED_START)
+    {
+        MoveCursorToOKButton();
+        return FALSE;
+    }
+    else
+    {
+        return sKeyboardKeyHandlers[keyRole](event);
+    }
+}
+
+static bool8 KeyboardKeyHandler_Character(u8 event)
+{
+    sub_80E3948(3, 0, 0);
+    if (event == KBEVENT_PRESSED_A)
+    {
+        bool8 var = sub_80E4B54();
+
+        sub_80E3ED8();
+        if (var)
+        {
+            SetInputState(INPUT_STATE_2);
+            gNamingScreenData->state = MAIN_STATE_MOVE_TO_OK_BUTTON;
+        }
+    }
+    return FALSE;
+}
+
+static bool8 KeyboardKeyHandler_Page(u8 event)
+{
+    sub_80E3948(0, 1, 0);
+    if (event == KBEVENT_PRESSED_A)
+        return sub_80E45E0();
+    else
+        return FALSE;
+}
+
+static bool8 KeyboardKeyHandler_Backspace(u8 event)
+{
+    sub_80E3948(1, 1, 0);
+    if (event == KBEVENT_PRESSED_A)
+        DeleteTextCharacter();
+    return FALSE;
+}
+
+static bool8 KeyboardKeyHandler_OK(u8 event)
+{
+    sub_80E3948(2, 1, 0);
+    if (event == KBEVENT_PRESSED_A)
+    {
+        PlaySE(SE_SELECT);
+        gNamingScreenData->state = MAIN_STATE_6;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
+static bool8 sub_80E45E0(void)
+{
+    gNamingScreenData->state = MAIN_STATE_START_PAGE_SWAP;
+    return TRUE;
+}
+
+//--------------------------------------------------
+// Input handling
+//--------------------------------------------------
+
+enum
+{
+    FNKEY_CASE,
+    FNKEY_BACK,
+    FNKEY_OK,
+};
+
+#define tState data[0]
+#define tKeyboardEvent data[1]
+#define tKbFunctionKey data[2]
+
+
+static void InputState_Disabled(struct Task *);
+static void InputState_Enabled(struct Task *);
+static void InputState_2(struct Task *);
+
+static void (*const sInputStateFuncs[])(struct Task *) =
+{
+    InputState_Disabled,
+    InputState_Enabled,
+    InputState_2,
+};
+
+static void Task_HandleInput(u8);
+static void HandleDpadMovement(struct Task *);
+
+static void InputInit(void)
+{
+    CreateTask(Task_HandleInput, 1);
+}
+
+static u8 GetInputEvent(void)
+{
+    u8 taskId = FindTaskIdByFunc(Task_HandleInput);
+
+    return gTasks[taskId].tKeyboardEvent;
+}
+
+static void SetInputState(u8 state)
+{
+    u8 taskId = FindTaskIdByFunc(Task_HandleInput);
+
+    gTasks[taskId].tState = state;
+}
+
+static void Task_HandleInput(u8 taskId)
+{
+    sInputStateFuncs[gTasks[taskId].tState](&gTasks[taskId]);
+}
+
+static void InputState_Disabled(struct Task *task)
+{
+    task->tKeyboardEvent = 0;
+}
+
+static void InputState_Enabled(struct Task *task)
+{
+    task->tKeyboardEvent = 0;
+    
+    if (gMain.newKeys & A_BUTTON)
+        task->tKeyboardEvent = KBEVENT_PRESSED_A;
+    else if (gMain.newKeys & B_BUTTON)
+        task->tKeyboardEvent = KBEVENT_PRESSED_B;
+    else if (gMain.newKeys & SELECT_BUTTON)
+        task->tKeyboardEvent = KBEVENT_PRESSED_SELECT;
+    else if (gMain.newKeys & START_BUTTON)
+        task->tKeyboardEvent = KBEVENT_PRESSED_START;
+    else
+        HandleDpadMovement(task);
+}
+
+static void InputState_2(struct Task *task)
+{
+    task->tKeyboardEvent = 0;
+}
+
+static void HandleDpadMovement(struct Task *task)
+{
+    const s16 sDpadDeltaX[] =
+    {
+        0,   //none
+        0,   //up
+        0,   //down
+        -1,  //left
+        1    //right
+    };
+
+    const s16 sDpadDeltaY[] =
+    {
+        0,   //none
+        -1,  //up
+        1,   //down
+        0,   //left
+        0    //right
+    };
+
+    const s16 s4RowTo3RowTableY[] = {0, 1, 1, 2};
+    const s16 gUnknown_0858BF50[] = {0, 0, 3};
+
+    s16 cursorX;
+    s16 cursorY;
+    u16 dpadDir;
+    s16 prevCursorX;
+
+    GetCursorPos(&cursorX, &cursorY);
+    dpadDir = 0;
+    if (gMain.newAndRepeatedKeys & DPAD_UP)
+        dpadDir = 1;
+    if (gMain.newAndRepeatedKeys & DPAD_DOWN)
+        dpadDir = 2;
+    if (gMain.newAndRepeatedKeys & DPAD_LEFT)
+        dpadDir = 3;
+    if (gMain.newAndRepeatedKeys & DPAD_RIGHT)
+        dpadDir = 4;
+
+    //Get new cursor position
+    prevCursorX = cursorX;
+    cursorX += sDpadDeltaX[dpadDir];
+    cursorY += sDpadDeltaY[dpadDir];
+
+    //Wrap cursor position in the X direction
+    if (cursorX < 0)
+        cursorX = GetCurrentPageColumnCount();
+    if (cursorX > GetCurrentPageColumnCount())
+        cursorX = 0;
+
+    //Handle cursor movement in X direction
+    if (sDpadDeltaX[dpadDir] != 0)
+    {
+        if (cursorX == GetCurrentPageColumnCount())
+        {
+            //We are now on the last column
+            task->tKbFunctionKey = cursorY;
+            cursorY = s4RowTo3RowTableY[cursorY];
+        }
+        else if (prevCursorX == GetCurrentPageColumnCount())
+        {
+            if (cursorY == 1)
+                cursorY = task->tKbFunctionKey;
+            else
+                cursorY = gUnknown_0858BF50[cursorY];
+        }
+    }
+
+    if (cursorX == GetCurrentPageColumnCount())
+    {
+        //There are only 3 keys on the last column, unlike the others,
+        //so wrap Y accordingly
+        if (cursorY < 0)
+            cursorY = 2;
+        if (cursorY > 2)
+            cursorY = 0;
+        if (cursorY == 0)
+            task->tKbFunctionKey = FNKEY_BACK;
+        else if (cursorY == 2)
+            task->tKbFunctionKey = FNKEY_OK;
+    }
+    else
+    {
+        if (cursorY < 0)
+            cursorY = 3;
+        if (cursorY > 3)
+            cursorY = 0;
+    }
+    SetCursorPos(cursorX, cursorY);
+}
+
+#undef tState
+#undef tKeyboardEvent
+#undef tKbFunctionKey
+
+static void sub_80E4894(void)
+{
+    FillWindowPixelBuffer(gNamingScreenData->windows[3], 0x11);
+    PrintTextOnWindow(gNamingScreenData->windows[3], 1, gNamingScreenData->template->title, 8, 1, 0, 0);
+    PutWindowTilemap(gNamingScreenData->windows[3]);
+}
+
+static void sub_80E48E8(void)
+{
+    u8 buffer[0x20];
+    
+    StringCopy(buffer, gSpeciesNames[gNamingScreenData->unk1E34]);
+    StringAppendN(buffer, gNamingScreenData->template->title, 15);
+    FillWindowPixelBuffer(gNamingScreenData->windows[3], 0x11);
+    PrintTextOnWindow(gNamingScreenData->windows[3], 1, buffer, 8, 1, 0, 0);
+    PutWindowTilemap(gNamingScreenData->windows[3]);
+}
+
+static void (*const gUnknown_0858BF58[])(void) =
+{
+    sub_80E4894,
+    sub_80E4894,
+    sub_80E48E8,
+    sub_80E48E8,
+    sub_80E4894,
+};
+
+static void sub_80E4964(void)
+{
+    gUnknown_0858BF58[gNamingScreenData->templateNum]();
+}
+
+static void TaskDummy3(void);
+static void sub_80E49BC(void);
+
+static void (*const gUnknown_0858BF6C[])(void) =
+{
+    TaskDummy3,
+    sub_80E49BC,
+};
+
+static void sub_80E498C(void)
+{
+    gUnknown_0858BF6C[gNamingScreenData->template->unk3]();
+}
+
+static void TaskDummy3(void)
+{
+    
+}
+
+static const struct TextColor sGenderColors[2] = 
+{
+    {0, 9, 8},
+    {0, 5, 4}
+};
+
+static void sub_80E49BC(void)
+{
+    u8 genderSymbol[2];
+    bool8 isFemale = FALSE;
+    
+    StringCopy(genderSymbol, gText_MaleSymbol);
+
+    if (gNamingScreenData->unk1E36 != MON_GENDERLESS)
+    {
+        if (gNamingScreenData->unk1E36 == MON_FEMALE)
+        {
+            StringCopy(genderSymbol, gText_FemaleSymbol);
+            isFemale = TRUE;
+        }
+        box_print(gNamingScreenData->windows[2], 1, 0x68, 1, &sGenderColors[isFemale], -1, genderSymbol);
+    }
+}
+
+static u8 GetCharAtKeyboardPos(s16 a, s16 b)
+{
+    return gUnknown_0858BE40[a + b * 8 + sub_80E3274() * 32];
+}
+
+
+static u8 GetTextCaretPosition(void)
+{
+    u8 i;
+
+    for (i = 0; i < gNamingScreenData->template->maxChars; i++)
+    {
+        if (gNamingScreenData->textBuffer[i] == EOS)
+            return i;
+    }
+    return gNamingScreenData->template->maxChars - 1;
+}
+
+static u8 GetPreviousTextCaretPosition(void)
+{
+    s8 i;
+
+    for (i = gNamingScreenData->template->maxChars - 1; i > 0; i--)
+    {
+        if (gNamingScreenData->textBuffer[i] != EOS)
+            return i;
+    }
+    return 0;
+}
+
+static void DeleteTextCharacter(void)
+{
+    u8 index;
+    u8 var2;
+
+    index = GetPreviousTextCaretPosition();
+    gNamingScreenData->textBuffer[index] = 0;
+    sub_80E4D10();
+    CopyBgTilemapBufferToVram(3);
+    gNamingScreenData->textBuffer[index] = EOS;
+    var2 = GetKeyRoleAtCursorPos();
+    if (var2 == 0 || var2 == 2)
+        sub_80E3948(1, 0, 1);
+    PlaySE(SE_BOWA);
+}
+
+static bool8 sub_80E4B54(void)
+{
+    s16 x;
+    s16 y;
+
+    GetCursorPos(&x, &y);
+    AddTextCharacter(GetCharAtKeyboardPos(x, y));
+    sub_80E4D10();
+    CopyBgTilemapBufferToVram(3);
+    PlaySE(SE_SELECT);
+    
+    if (GetPreviousTextCaretPosition() != gNamingScreenData->template->maxChars - 1)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+static void AddTextCharacter(u8 ch)
+{
+    u8 index = GetTextCaretPosition();
+
+    gNamingScreenData->textBuffer[index] = ch;
+}
+
+static void sub_80E4BE4(void)
+{
+    u8 i;
+
+    for (i = 0; i < gNamingScreenData->template->maxChars; i++)
+    {
+        if (gNamingScreenData->textBuffer[i] != CHAR_SPACE && gNamingScreenData->textBuffer[i] != EOS)
+        {
+            StringCopyN(gNamingScreenData->destBuffer, gNamingScreenData->textBuffer, gNamingScreenData->template->maxChars + 1);
+            break;
+        }
+    }
+}
+
+static void choose_name_or_words_screen_load_bg_tile_patterns(void)
+{
+    LZ77UnCompWram(gNamingScreenMenu_Gfx, gNamingScreenData->tileBuffer);
+    LoadBgTiles(1, gNamingScreenData->tileBuffer, 0x600, 0);
+    LoadBgTiles(2, gNamingScreenData->tileBuffer, 0x600, 0);
+    LoadBgTiles(3, gNamingScreenData->tileBuffer, 0x600, 0);
+    LoadSpriteSheets(gUnknown_0858C1C8);
+    LoadSpritePalettes(gUnknown_0858C230);
+}
+
+static void sub_80E4CB8(void)
+{
+    InputInit();
+    sub_80E3920();
+}
+
+static void choose_name_or_words_screen_apply_bg_pals(void)
+{
+    LoadPalette(gNamingScreenMenu_Pal, 0, 0xC0);
+    LoadPalette(gUnknown_0858BD78, 0xA0, sizeof(gUnknown_0858BD78));
+    LoadPalette(stdpal_get(2), 0xB0, 0x20);
+}
+
+static void sub_80E4CF8(u8 bg, const void *src)
+{
+    CopyToBgTilemapBuffer(bg, src, 0, 0);
+}
+
+static void nullsub_10(u8 a1, u8 a2)
+{
+    
+}
+
+static void sub_80E4D10(void)
+{
+    u8 i;
+    u8 temp[2];
+    u16 unk2;
+    u8 maxChars = gNamingScreenData->template->maxChars;
+    u16 unk = gNamingScreenData->unk1E16 - 0x40;
+    
+    FillWindowPixelBuffer(gNamingScreenData->windows[2], 0x11);
+    
+    for (i = 0; i < maxChars; i++)
+    {
+        temp[0] = gNamingScreenData->textBuffer[i];
+        temp[1] = gExpandedPlaceholder_Empty[0];
+        unk2 = (sub_80E503C(temp[0]) == 1) ? 2 : 0;
+        
+        PrintTextOnWindow(gNamingScreenData->windows[2], 1, temp, i * 8 + unk + unk2, 1, 0xFF, NULL);
+    }
+    
+    sub_80E498C();
+    CopyWindowToVram(gNamingScreenData->windows[2], 2);
+    PutWindowTilemap(gNamingScreenData->windows[2]);
+}
+
+static const struct AlignedTextColor sUnkColor1 =
+{
+    13, 1, 2
+};
+
+static const struct AlignedTextColor sUnkColor2 =
+{
+    14, 1, 2
+};
+
+static const struct AlignedTextColor sUnkColor3 =
+{
+    15, 1, 2
+};
+
+static const u8 sFillValues[3] = 
+{
+    0xEE, 0xDD, 0xFF
+};
+
+static const struct AlignedTextColor *const sUnkColors[3] = 
+{
+    &sUnkColor2,
+    &sUnkColor1,
+    &sUnkColor3
+};
+
+static void sub_80E4DE4(u8 window, u8 a1)
+{
+    u8 i;
+    
+    FillWindowPixelBuffer(window, sFillValues[a1]);
+    
+    for (i = 0; i < 4; i++)
+    {
+        box_print(window, 1, 0, i * 16 + 1, sUnkColors[a1], 0, gUnknown_0858C198[a1][i]);
+    }
+    
+    PutWindowTilemap(window);
+}
+
+static const u8 *const gUnknown_0858BF98[] = 
+{
+    gUnknown_08DD4620,
+    gUnknown_08DD46E0,
+    gUnknown_08DD47A0
+};
+
+static void sub_80E4E5C(void)
+{
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    u8 bg1Priority = GetGpuReg(REG_OFFSET_BG1CNT) & 3;
+    u8 bg2Priority = GetGpuReg(REG_OFFSET_BG2CNT) & 3;
+    
+    if (bg1Priority > bg2Priority)
+    {
+        unk1 = 1;
+        unk2 = 1;
+        unk3 = gNamingScreenData->windows[0];
+    }
+    else
+    {
+        unk1 = 2;
+        unk2 = 2;
+        unk3 = gNamingScreenData->windows[1];
+    }
+    
+    sub_80E4CF8(unk1, gUnknown_0858BF98[gNamingScreenData->currentPage]);
+    sub_80E4DE4(unk3, sub_80E3254());
+    nullsub_10(unk1, sub_80E3254());
+    CopyBgTilemapBufferToVram(unk2);
+}
+
+static void sub_80E4EF0(void)
+{
+    const u8 arr[] = { 15, 1, 2 };
+    
+    FillWindowPixelBuffer(gNamingScreenData->windows[4], 0xFF);
+    box_print(gNamingScreenData->windows[4], 0, 2, 1, arr, 0, gText_MoveOkBack);
+    PutWindowTilemap(gNamingScreenData->windows[4]);
+    CopyWindowToVram(gNamingScreenData->windows[4], 3);
+}
+
+static void sub_80E4F58(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+static void NamingScreen_TurnOffScreen(void)
+{
+    SetVBlankCallback(NULL);
+    SetHBlankCallback(NULL);
+}
+
+static void NamingScreen_InitDisplayMode(void)
+{
+    SetVBlankCallback(VBlankCB_NamingScreen);
+}
+
+static void VBlankCB_NamingScreen(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    SetGpuReg(REG_OFFSET_BG1VOFS, gNamingScreenData->bg1vOffset);
+    SetGpuReg(REG_OFFSET_BG2VOFS, gNamingScreenData->bg2vOffset);
+    SetGpuReg(REG_OFFSET_BG1CNT, GetGpuReg(REG_OFFSET_BG1CNT) & 0xFFFC);
+    SetGpuRegBits(REG_OFFSET_BG1CNT, gNamingScreenData->unk1E1C);
+    SetGpuReg(REG_OFFSET_BG2CNT, GetGpuReg(REG_OFFSET_BG2CNT) & 0xFFFC);
+    SetGpuRegBits(REG_OFFSET_BG2CNT, gNamingScreenData->unk1E1E);
+}
+
+static void sub_80E501C(void)
+{
+    ShowBg(0);
+    ShowBg(1);
+    ShowBg(2);
+    ShowBg(3);
+}
+
+static bool8 sub_80E503C(u8 character)
+{
+    u8 i;
+    
+    for (i = 0; gUnknown_0858BDC8[i] != EOS; i++)
+    {
+        if (character == gUnknown_0858BDC8[i])
+            return FALSE;
+    }
+    return FALSE;
+}
+
+static void sub_80E5074(void)
+{
+    DoNamingScreen(0, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, sub_8086194);
+}
+
+static void sub_80E509C(void)
+{
+    DoNamingScreen(1, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, sub_8086194);
+}
+
+static void sub_80E50C4(void)
+{
+    DoNamingScreen(2, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, sub_8086194);
+}
+
+static void sub_80E50EC(void)
+{
+    DoNamingScreen(3, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, sub_8086194);
+}
+
+//--------------------------------------------------
+// Forward-declared variables
+//--------------------------------------------------
+
+static const struct NamingScreenTemplate playerNamingScreenTemplate =
+{
+    .unk0 = 0,
+    .maxChars = 7,
+    .unk2 = 1,
+    .unk3 = 0,
+    .unk4 = 1,
+    .unk5 = 35,
+    .unk6 = 0,
+    .unk7 = 0,
+    .title = gText_YourName,
+};
+
+static const struct NamingScreenTemplate pcBoxNamingTemplate =
+{
+    .unk0 = 0,
+    .maxChars = 8,
+    .unk2 = 2,
+    .unk3 = 0,
+    .unk4 = 1,
+    .unk5 = 19,
+    .unk6 = 0,
+    .unk7 = 0,
+    .title = gText_BoxName,
+};
+
+static const struct NamingScreenTemplate monNamingScreenTemplate =
+{
+    .unk0 = 0,
+    .maxChars = 10,
+    .unk2 = 3,
+    .unk3 = 1,
+    .unk4 = 1,
+    .unk5 = 35,
+    .unk6 = 0,
+    .unk7 = 0,
+    .title = gText_PkmnsNickname,
+};
+
+static const struct NamingScreenTemplate wandaWordsScreenTemplate =
+{
+    .unk0 = 1,
+    .maxChars = 15,
+    .unk2 = 4,
+    .unk3 = 0,
+    .unk4 = 1,
+    .unk5 = 11,
+    .unk6 = 0,
+    .unk7 = 0,
+    .title = gText_TellHimTheWords,
+};
+
+static const struct NamingScreenTemplate *const sNamingScreenTemplates[] =
+{
+    &playerNamingScreenTemplate,
+    &pcBoxNamingTemplate,
+    &monNamingScreenTemplate,
+    &monNamingScreenTemplate,
+    &wandaWordsScreenTemplate,
+};
+
+const struct OamData gOamData_858BFEC =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+const struct OamData gOamData_858BFF4 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+const struct OamData gOamData_858BFFC =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 2,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const struct Subsprite gUnknown_0858C004[] =
+{
+    {-20,  -16, 1,  1,   0,     1},
+    { 12,  -16, 0,  0,   4,     1},
+    {-20,  -8,  1,  1,   5,     1},
+    { 12,  -8,  0,  0,   9,     1},
+    {-20,   0,  1,  1,  10,     1},
+    { 12,   0,  0,  0,  14,     1},
+    {-20,   8,  1,  1,  15,     1},
+    { 12,   8,  0,  0,  19,     1}
+};
+
+static const struct Subsprite gUnknown_0858C024[] =
+{
+    {-12,  -4,  1,  0,   0,     1},
+    {  4,  -4,  0,  0,   2,     1}
+};
+
+static const struct Subsprite gUnknown_0858C02C[] =
+{
+    {-20,  -12, 1,  1,   0,     1},
+    { 12,  -12, 0,  0,   4,     1},
+    {-20,  -4,  1,  1,   5,     1},
+    { 12,  -4,  0,  0,   9,     1},
+    {-20,   4,  1,  1,  10,     1},
+    { 12,   4,  0,  0,  14,     1}
+};
+
+static const struct Subsprite gUnknown_0858C044[] =
+{
+    {-8,   -12, 1,  0,   0,     3},
+    {-8,   -4,  1,  0,   2,     3},
+    {-8,    4,  1,  0,   4,     3}
+};
+
+static const struct SubspriteTable gUnknown_0858C050[] =
+{
+    {ARRAY_COUNT(gUnknown_0858C004), gUnknown_0858C004}
+};
+
+static const struct SubspriteTable gUnknown_0858C058[] =
+{
+    {ARRAY_COUNT(gUnknown_0858C024), gUnknown_0858C024},
+    {ARRAY_COUNT(gUnknown_0858C024), gUnknown_0858C024},
+    {ARRAY_COUNT(gUnknown_0858C024), gUnknown_0858C024}
+};
+
+static const struct SubspriteTable gUnknown_0858C070[] =
+{
+    {ARRAY_COUNT(gUnknown_0858C02C), gUnknown_0858C02C}
+};
+
+static const struct SubspriteTable gUnknown_0858C078[] =
+{
+    {ARRAY_COUNT(gUnknown_0858C044), gUnknown_0858C044}
+};
+
+static const struct SpriteFrameImage gUnknown_0858C080[] =
+{
+    {gSpriteImage_858BBF8, sizeof(gSpriteImage_858BBF8)},
+    {gSpriteImage_858BCB8, sizeof(gSpriteImage_858BCB8)},
+};
+
+static const union AnimCmd gSpriteAnim_858C090[] = 
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd gSpriteAnim_858C098[] = 
+{
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(8, 8),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_858C0A4[] = 
+{
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_JUMP(0)
+};
+
+static const union AnimCmd *const gSpriteAnimTable_858C0B0[] =
+{
+    gSpriteAnim_858C090
+};
+
+static const union AnimCmd *const gSpriteAnimTable_858C0B4[] =
+{
+    gSpriteAnim_858C090,
+    gSpriteAnim_858C098
+};
+
+static const union AnimCmd *const gSpriteAnimTable_858C0BC[] =
+{
+    gSpriteAnim_858C0A4
+};
+
+static const struct SpriteTemplate gUnknown_0858C0C0 = 
+{
+    .tileTag = 0x0002,
+    .paletteTag = 0x0004,
+    .oam = &gOamData_858BFEC,
+    .anims = gSpriteAnimTable_858C0B0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80E4084
+};
+
+static const struct SpriteTemplate gUnknown_0858C0D8 = 
+{
+    .tileTag = 0x0003,
+    .paletteTag = 0x0001,
+    .oam = &gOamData_858BFFC,
+    .anims = gSpriteAnimTable_858C0B0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+static const struct SpriteTemplate gUnknown_0858C0F0 = 
+{
+    .tileTag = 0x0004,
+    .paletteTag = 0x0004,
+    .oam = &gOamData_858BFEC,
+    .anims = gSpriteAnimTable_858C0B0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+static const struct SpriteTemplate gUnknown_0858C108 = 
+{
+    .tileTag = 0x0000,
+    .paletteTag = 0x0006,
+    .oam = &gOamData_858BFEC,
+    .anims = gSpriteAnimTable_858C0B0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+static const struct SpriteTemplate gUnknown_0858C120 = 
+{
+    .tileTag = 0x0001,
+    .paletteTag = 0x0007,
+    .oam = &gOamData_858BFEC,
+    .anims = gSpriteAnimTable_858C0B0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+static const struct SpriteTemplate gUnknown_0858C138 = 
+{
+    .tileTag = 0x0007,
+    .paletteTag = 0x0005,
+    .oam = &gOamData_858BFF4,
+    .anims = gSpriteAnimTable_858C0B4,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80E3B30
+};
+
+static const struct SpriteTemplate gUnknown_0858C150 = 
+{
+    .tileTag = 0x000A,
+    .paletteTag = 0x0003,
+    .oam = &gOamData_858BFEC,
+    .anims = gSpriteAnimTable_858C0B0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80E3C20
+};
+
+static const struct SpriteTemplate gUnknown_0858C168 = 
+{
+    .tileTag = 0x000B,
+    .paletteTag = 0x0003,
+    .oam = &gOamData_858BFEC,
+    .anims = gSpriteAnimTable_858C0B0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80E3C6C
+};
+
+static const struct SpriteTemplate gUnknown_0858C180 = 
+{
+    .tileTag = 0xFFFF,
+    .paletteTag = 0x0000,
+    .oam = &gOamData_858BFEC,
+    .anims = gSpriteAnimTable_858C0BC,
+    .images = gUnknown_0858C080,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+extern const u8 gUnknown_0862B88D[];
+extern const u8 gUnknown_0862B8AE[];
+extern const u8 gUnknown_0862B8CF[];
+extern const u8 gUnknown_0862B8F0[];
+extern const u8 gUnknown_0862B911[];
+extern const u8 gUnknown_0862B932[];
+extern const u8 gUnknown_0862B953[];
+extern const u8 gUnknown_0862B974[];
+extern const u8 gUnknown_0862B995[];
+extern const u8 gUnknown_0862B9AE[];
+extern const u8 gUnknown_0862B9C7[];
+extern const u8 gUnknown_0862B9E0[];
+
+static const u8* const gUnknown_0858C198[][4] = 
+{
+    {
+        gUnknown_0862B88D,
+        gUnknown_0862B8AE,
+        gUnknown_0862B8CF,
+        gUnknown_0862B8F0
+    },
+    {
+        gUnknown_0862B911,
+        gUnknown_0862B932,
+        gUnknown_0862B953,
+        gUnknown_0862B974
+    },
+    {
+        gUnknown_0862B995,
+        gUnknown_0862B9AE,
+        gUnknown_0862B9C7,
+        gUnknown_0862B9E0
+    },
+};
+
+static const struct SpriteSheet gUnknown_0858C1C8[] =
+{
+    {gNamingScreenRWindow_Gfx + 0x280,          0x1E0,  0x0000},
+    {gNamingScreenRWindow_Gfx + 0x460,          0x1E0,  0x0001},
+    {gNamingScreenRWindow_Gfx,                  0x280,  0x0002},
+    {gNamingScreenKeyboardButton_Gfx + 0x20,    0x100,  0x0003},
+    {gNamingScreenROptions_Gfx,                 0x060,  0x0004},
+    {gNamingScreenROptions_Gfx + 0xA0,          0x060,  0x0005},
+    {gNamingScreenROptions_Gfx + 0x140,         0x060,  0x0006},
+    {gNamingScreenCursor_Gfx,                   0x080,  0x0007},
+    {gNamingScreenCursor_Gfx + 0xA0,            0x080,  0x0008},
+    {gNamingScreenCursor_Gfx + 0x140,           0x080,  0x0009},
+    {gNamingScreenRightPointingTriangleTiles,   0x020,  0x000A},
+    {gNamingScreenUnderscoreTiles,              0x020,  0x000B},
+    {NULL}
+};
+
+static const struct SpritePalette gUnknown_0858C230[] =
+{
+    {gNamingScreenMenu_Pal,         0x0000},
+    {gNamingScreenMenu_Pal + 0x10,  0x0001},
+    {gNamingScreenMenu_Pal + 0x20,  0x0002},
+    {gNamingScreenMenu_Pal + 0x30,  0x0003},
+    {gNamingScreenMenu_Pal + 0x40,  0x0004},
+    {gNamingScreenMenu_Pal + 0x50,  0x0005},
+    {gNamingScreenMenu_Pal + 0x40,  0x0006},
+    {gNamingScreenMenu_Pal + 0x40,  0x0007},
+    {NULL}
+};
-- 
cgit v1.2.3


From cc307730a12b3f9f2b3194aa77f8d7f66946a193 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 23 Jan 2018 21:34:15 -0600
Subject: Add entry in sym_ewram.txt and organize a bit

---
 src/naming_screen.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/naming_screen.c b/src/naming_screen.c
index 403254f9f..c8dcfc1b1 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -27,14 +27,10 @@
 #include "text_window.h"
 #include "overworld.h"
 
-extern EWRAM_DATA struct NamingScreenData *gNamingScreenData;
+EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL;
 extern u16 gKeyRepeatStartDelay;
 
-// graphics
-static const u8 gSpriteImage_858BBF8[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp");
-static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_icon/1.4bpp");
-const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
-static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal");
+// extern graphics
 extern const u16 gNamingScreenMenu_Pal[];
 extern const u8 gNamingScreenMenu_Gfx[];
 extern const u8 gUnknown_08DD4544[];
@@ -48,7 +44,7 @@ extern const u8 gNamingScreenCursor_Gfx[];
 extern const u8 gNamingScreenRightPointingTriangleTiles[];
 extern const u8 gNamingScreenUnderscoreTiles[];
 
-// text
+// extern text
 extern const u8 gExpandedPlaceholder_Empty[];
 extern const u8 gText_PkmnTransferredSomeonesPC[];
 extern const u8 gText_PkmnTransferredLanettesPC[];
@@ -61,6 +57,11 @@ extern const u8 gText_PkmnsNickname[];
 extern const u8 gText_TellHimTheWords[];
 
 // start of .rodata
+static const u8 gSpriteImage_858BBF8[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp");
+static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_icon/1.4bpp");
+static const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
+static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal");
+
 static const u8 *const gUnknown_0858BDB8[] = 
 {
     gText_PkmnTransferredSomeonesPC,
-- 
cgit v1.2.3


From 5784098446d4f380434a939e4c72577c8136bb81 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 23 Jan 2018 23:14:22 -0600
Subject: Organization and naming

---
 src/naming_screen.c | 185 +++++++++++++++++++++++++++-------------------------
 1 file changed, 96 insertions(+), 89 deletions(-)

(limited to 'src')

diff --git a/src/naming_screen.c b/src/naming_screen.c
index c8dcfc1b1..b206c9c37 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -26,6 +26,7 @@
 #include "menu.h"
 #include "text_window.h"
 #include "overworld.h"
+#include "constants/map_objects.h"
 
 EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL;
 extern u16 gKeyRepeatStartDelay;
@@ -55,6 +56,19 @@ extern const u8 gText_YourName[];
 extern const u8 gText_BoxName[];
 extern const u8 gText_PkmnsNickname[];
 extern const u8 gText_TellHimTheWords[];
+extern const u8 gUnknown_0862B88D[];
+extern const u8 gUnknown_0862B8AE[];
+extern const u8 gUnknown_0862B8CF[];
+extern const u8 gUnknown_0862B8F0[];
+extern const u8 gUnknown_0862B911[];
+extern const u8 gUnknown_0862B932[];
+extern const u8 gUnknown_0862B953[];
+extern const u8 gUnknown_0862B974[];
+extern const u8 gUnknown_0862B995[];
+extern const u8 gUnknown_0862B9AE[];
+extern const u8 gUnknown_0862B9C7[];
+extern const u8 gUnknown_0862B9E0[];
+
 
 // start of .rodata
 static const u8 gSpriteImage_858BBF8[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp");
@@ -126,8 +140,8 @@ static const struct SpriteTemplate gUnknown_0858C0F0;
 static const struct SpriteTemplate gUnknown_0858C108;
 static const struct SpriteTemplate gUnknown_0858C120;
 static const struct SpriteTemplate gUnknown_0858C138;
-static const struct SpriteTemplate gUnknown_0858C150;
-static const struct SpriteTemplate gUnknown_0858C168;
+static const struct SpriteTemplate sSpriteTemplate_InputArrow;
+static const struct SpriteTemplate sSpriteTemplate_Underscore;
 static const struct SpriteTemplate gUnknown_0858C180;
 static const u8* const gUnknown_0858C198[][4];
 static const struct SpriteSheet gUnknown_0858C1C8[];
@@ -135,7 +149,7 @@ static const struct SpritePalette gUnknown_0858C230[];
 
 static void C2_NamingScreen(void);
 static void NamingScreen_Init(void);
-static void choose_name_or_words_screen_init_bgs(void);
+static void NamingScreen_InitBGs(void);
 static void sub_80E3194(void);
 static void sub_80E31B0(u8 taskId);
 static bool8 MainState_BeginFadeIn(void);
@@ -166,12 +180,12 @@ static void sub_80E3E3C(u8);
 static void sub_80E3E94(u8);
 static u8 IsCursorAnimFinished(void);
 static u8 GetCurrentPageColumnCount(void);
-static void sub_80E3F8C(void);
+static void CreatePageSwitcherSprites(void);
 static void sub_80E4050(void);
 static void sub_80E41B8(u8, struct Sprite *, struct Sprite *);
-static void sub_80E4218(void);
-static void sub_80E4290(void);
-static void sub_80E4354(void);
+static void CreateBackOkSprites(void);
+static void CreateUnderscoreSprites(void);
+static void CreateInputTargetIcon(void);
 static u8 HandleKeyboardEvent(void);
 static u8 sub_80E45E0(void);
 static u8 GetInputEvent(void);
@@ -208,9 +222,9 @@ void DoNamingScreen(u8 templateNum, u8 *destBuffer, u16 monSpecies, u16 monGende
     else
     {
         gNamingScreenData->templateNum = templateNum;
-        gNamingScreenData->unk1E34 = monSpecies;
-        gNamingScreenData->unk1E36 = monGender;
-        gNamingScreenData->unk1E38 = monPersonality;
+        gNamingScreenData->monSpecies = monSpecies;
+        gNamingScreenData->monGender = monGender;
+        gNamingScreenData->monPersonality = monPersonality;
         gNamingScreenData->destBuffer = destBuffer;
         gNamingScreenData->returnCallback = returnCallback;
         
@@ -231,7 +245,7 @@ static void C2_NamingScreen(void)
         gMain.state++;
         break;
     case 1:
-        choose_name_or_words_screen_init_bgs();
+        NamingScreen_InitBGs();
         gMain.state++;
         break;
     case 2:
@@ -273,16 +287,16 @@ static void NamingScreen_Init(void)
     gNamingScreenData->state = 0;
     gNamingScreenData->bg1vOffset = 0;
     gNamingScreenData->bg2vOffset = 0;
-    gNamingScreenData->unk1E1C = 1;
-    gNamingScreenData->unk1E1E = 2;
-    gNamingScreenData->unk1E20 = 0;
-    gNamingScreenData->unk1E21 = 1;
+    gNamingScreenData->bg1Priority = BGCNT_PRIORITY(1);
+    gNamingScreenData->bg2Priority = BGCNT_PRIORITY(2);
+    gNamingScreenData->bgToReveal = 0;
+    gNamingScreenData->bgToHide = 1;
     gNamingScreenData->template = sNamingScreenTemplates[gNamingScreenData->templateNum];
     gNamingScreenData->currentPage = gNamingScreenData->template->unk4;
-    gNamingScreenData->unk1E16 = (240 - gNamingScreenData->template->maxChars * 8) / 2 + 6;
+    gNamingScreenData->inputCharBaseXPos = (240 - gNamingScreenData->template->maxChars * 8) / 2 + 6;
     if (gNamingScreenData->templateNum == 4)
-        gNamingScreenData->unk1E16 += 11;
-    gNamingScreenData->unk1E25 = gKeyRepeatStartDelay;
+        gNamingScreenData->inputCharBaseXPos += 11;
+    gNamingScreenData->keyRepeatStartDelayCopy = gKeyRepeatStartDelay;
     memset(gNamingScreenData->textBuffer, 0xFF, sizeof(gNamingScreenData->textBuffer));
     if (gNamingScreenData->template->unk0 != 0)
         StringCopy(gNamingScreenData->textBuffer, gNamingScreenData->destBuffer);
@@ -300,7 +314,7 @@ static void sub_80E2FA4(void)
     sub_80E3E3C(0);
 }
 
-static void choose_name_or_words_screen_init_bgs(void)
+static void NamingScreen_InitBGs(void)
 {
     u8 i;
     
@@ -636,14 +650,14 @@ static bool8 PageSwapAnimState_1(struct Task *task)
     };
 
     task->tFrameCount += 4;
-    *arr[gNamingScreenData->unk1E20] = Sin(task->tFrameCount, 40);
-    *arr[gNamingScreenData->unk1E21] = Sin((task->tFrameCount + 128) & 0xFF, 40);
+    *arr[gNamingScreenData->bgToReveal] = Sin(task->tFrameCount, 40);
+    *arr[gNamingScreenData->bgToHide] = Sin((task->tFrameCount + 128) & 0xFF, 40);
     if (task->tFrameCount >= 64)
     {
-        u8 temp = gNamingScreenData->unk1E1C;  //Why u8 and not u16?
+        u8 temp = gNamingScreenData->bg1Priority;  //Why u8 and not u16?
 
-        gNamingScreenData->unk1E1C = gNamingScreenData->unk1E1E;
-        gNamingScreenData->unk1E1E = temp;
+        gNamingScreenData->bg1Priority = gNamingScreenData->bg2Priority;
+        gNamingScreenData->bg2Priority = temp;
         task->tState++;
     }
     return 0;
@@ -651,17 +665,21 @@ static bool8 PageSwapAnimState_1(struct Task *task)
 
 static bool8 PageSwapAnimState_2(struct Task *task)
 {
-    u16 *const arr[] = {&gNamingScreenData->bg2vOffset, &gNamingScreenData->bg1vOffset};
+    u16 *const arr[] =
+    {
+        &gNamingScreenData->bg2vOffset,
+        &gNamingScreenData->bg1vOffset
+    };
 
     task->tFrameCount += 4;
-    *arr[gNamingScreenData->unk1E20] = Sin(task->tFrameCount, 40);
-    *arr[gNamingScreenData->unk1E21] = Sin((task->tFrameCount + 128) & 0xFF, 40);
+    *arr[gNamingScreenData->bgToReveal] = Sin(task->tFrameCount, 40);
+    *arr[gNamingScreenData->bgToHide] = Sin((task->tFrameCount + 128) & 0xFF, 40);
     if (task->tFrameCount >= 128)
     {
-        u8 temp = gNamingScreenData->unk1E20;
+        u8 temp = gNamingScreenData->bgToReveal;
 
-        gNamingScreenData->unk1E20 = gNamingScreenData->unk1E21;
-        gNamingScreenData->unk1E21 = temp;
+        gNamingScreenData->bgToReveal = gNamingScreenData->bgToHide;
+        gNamingScreenData->bgToHide = temp;
         task->tState++;
     }
     return 0;
@@ -856,10 +874,10 @@ static void sub_80E3C6C(struct Sprite *sprite)
 static void sub_80E3CC8(void)
 {
     CursorInit();
-    sub_80E3F8C();
-    sub_80E4218();
-    sub_80E4290();
-    sub_80E4354();
+    CreatePageSwitcherSprites();
+    CreateBackOkSprites();
+    CreateUnderscoreSprites();
+    CreateInputTargetIcon();
 }
 
 static void CursorInit(void)
@@ -952,14 +970,14 @@ static u8 GetCurrentPageColumnCount(void)
     return gUnknown_0858BEA0[sub_80E3274()];
 }
 
-static void sub_80E3F8C(void)
+static void CreatePageSwitcherSprites(void)
 {
     u8 spriteId1;
     u8 spriteId2;
     u8 spriteId3;
 
     spriteId1 = CreateSprite(&gUnknown_0858C0C0, 0xCC, 0x58, 0);
-    gNamingScreenData->unk1E24 = spriteId1;
+    gNamingScreenData->selectBtnFrameSpriteId = spriteId1;
     SetSubspriteTables(&gSprites[spriteId1], gUnknown_0858C050);
     gSprites[spriteId1].invisible = TRUE;
 
@@ -976,7 +994,7 @@ static void sub_80E3F8C(void)
 
 static void sub_80E4050(void)
 {
-    struct Sprite *sprite = &gSprites[gNamingScreenData->unk1E24];
+    struct Sprite *sprite = &gSprites[gNamingScreenData->selectBtnFrameSpriteId];
 
     sprite->data[0] = 2;
     sprite->data[1] = gNamingScreenData->currentPage;
@@ -1057,7 +1075,7 @@ static void sub_80E41B8(u8 a, struct Sprite *b, struct Sprite *c)
 
 //
 
-static void sub_80E4218(void)
+static void CreateBackOkSprites(void)
 {
     u8 spriteId;
 
@@ -1070,46 +1088,48 @@ static void sub_80E4218(void)
     gSprites[spriteId].invisible = TRUE;
 }
 
-static void sub_80E4290(void)
+static void CreateUnderscoreSprites(void)
 {
     u8 spriteId;
-    s16 r1;
+    s16 xPos;
     u8 i;
 
-    r1 = gNamingScreenData->unk1E16 - 5;
-    spriteId = CreateSprite(&gUnknown_0858C150, r1, 0x38, 0);
+    xPos = gNamingScreenData->inputCharBaseXPos - 5;
+    spriteId = CreateSprite(&sSpriteTemplate_InputArrow, xPos, 0x38, 0);
     gSprites[spriteId].oam.priority = 3;
     gSprites[spriteId].invisible = TRUE;
-    r1 = gNamingScreenData->unk1E16;
-    for (i = 0; i < gNamingScreenData->template->maxChars; i++, r1 += 8)
+    xPos = gNamingScreenData->inputCharBaseXPos;
+    for (i = 0; i < gNamingScreenData->template->maxChars; i++, xPos += 8)
     {
-        spriteId = CreateSprite(&gUnknown_0858C168, r1 + 3, 0x3C, 0);
+        spriteId = CreateSprite(&sSpriteTemplate_Underscore, xPos + 3, 0x3C, 0);
         gSprites[spriteId].oam.priority = 3;
         gSprites[spriteId].data[0] = i;
         gSprites[spriteId].invisible = TRUE;
     }
 }
 
-//
+//--------------------------------------------------
+// Icon creation (the thing you're naming or giving input to)
+//--------------------------------------------------
 
 static void TaskDummy2(void);
-static void sub_80E4384(void);
-static void sub_80E43E0(void);
-static void sub_80E4420(void);
-static void sub_80E447C(void);
+static void NamingScreen_CreatePlayerIcon(void);
+static void NamingScreen_CreatePCIcon(void);
+static void NamingScreen_CreateMonIcon(void);
+static void NamingScreen_CreateWandaDadIcon(void);
 
-static void (*const gUnknown_0858BF04[])(void) =
+static void (*const sIconFunctions[])(void) =
 {
     TaskDummy2,
-    sub_80E4384,
-    sub_80E43E0,
-    sub_80E4420,
-    sub_80E447C,
+    NamingScreen_CreatePlayerIcon,
+    NamingScreen_CreatePCIcon,
+    NamingScreen_CreateMonIcon,
+    NamingScreen_CreateWandaDadIcon,
 };
 
-static void sub_80E4354(void)
+static void CreateInputTargetIcon(void)
 {
-    gUnknown_0858BF04[gNamingScreenData->template->unk2]();
+    sIconFunctions[gNamingScreenData->template->iconFunction]();
 }
 
 static void TaskDummy2(void)
@@ -1117,18 +1137,18 @@ static void TaskDummy2(void)
     
 }
 
-static void sub_80E4384(void)
+static void NamingScreen_CreatePlayerIcon(void)
 {
     u8 rivalGfxId;
     u8 spriteId;
 
-    rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->unk1E34);
+    rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies);
     spriteId = AddPseudoFieldObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0);
     gSprites[spriteId].oam.priority = 3;
     StartSpriteAnim(&gSprites[spriteId], 4);
 }
 
-static void sub_80E43E0(void)
+static void NamingScreen_CreatePCIcon(void)
 {
     u8 spriteId;
 
@@ -1137,20 +1157,20 @@ static void sub_80E43E0(void)
     gSprites[spriteId].oam.priority = 3;
 }
 
-static void sub_80E4420(void)
+static void NamingScreen_CreateMonIcon(void)
 {
     u8 spriteId;
 
     sub_80D2F04();
-    spriteId = CreateMonIcon(gNamingScreenData->unk1E34, SpriteCallbackDummy, 0x38, 0x28, 0, gNamingScreenData->unk1E38, 1);
+    spriteId = CreateMonIcon(gNamingScreenData->monSpecies, SpriteCallbackDummy, 0x38, 0x28, 0, gNamingScreenData->monPersonality, 1);
     gSprites[spriteId].oam.priority = 3;
 }
 
-static void sub_80E447C(void)
+static void NamingScreen_CreateWandaDadIcon(void)
 {
     u8 spriteId;
 
-    spriteId = AddPseudoFieldObject(0x13, SpriteCallbackDummy, 0x38, 0x25, 0);
+    spriteId = AddPseudoFieldObject(MAP_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0);
     gSprites[spriteId].oam.priority = 3;
     StartSpriteAnim(&gSprites[spriteId], 4);
 }
@@ -1436,7 +1456,7 @@ static void sub_80E48E8(void)
 {
     u8 buffer[0x20];
     
-    StringCopy(buffer, gSpeciesNames[gNamingScreenData->unk1E34]);
+    StringCopy(buffer, gSpeciesNames[gNamingScreenData->monSpecies]);
     StringAppendN(buffer, gNamingScreenData->template->title, 15);
     FillWindowPixelBuffer(gNamingScreenData->windows[3], 0x11);
     PrintTextOnWindow(gNamingScreenData->windows[3], 1, buffer, 8, 1, 0, 0);
@@ -1489,9 +1509,9 @@ static void sub_80E49BC(void)
     
     StringCopy(genderSymbol, gText_MaleSymbol);
 
-    if (gNamingScreenData->unk1E36 != MON_GENDERLESS)
+    if (gNamingScreenData->monGender != MON_GENDERLESS)
     {
-        if (gNamingScreenData->unk1E36 == MON_FEMALE)
+        if (gNamingScreenData->monGender == MON_FEMALE)
         {
             StringCopy(genderSymbol, gText_FemaleSymbol);
             isFemale = TRUE;
@@ -1623,7 +1643,7 @@ static void sub_80E4D10(void)
     u8 temp[2];
     u16 unk2;
     u8 maxChars = gNamingScreenData->template->maxChars;
-    u16 unk = gNamingScreenData->unk1E16 - 0x40;
+    u16 unk = gNamingScreenData->inputCharBaseXPos - 0x40;
     
     FillWindowPixelBuffer(gNamingScreenData->windows[2], 0x11);
     
@@ -1753,9 +1773,9 @@ static void VBlankCB_NamingScreen(void)
     SetGpuReg(REG_OFFSET_BG1VOFS, gNamingScreenData->bg1vOffset);
     SetGpuReg(REG_OFFSET_BG2VOFS, gNamingScreenData->bg2vOffset);
     SetGpuReg(REG_OFFSET_BG1CNT, GetGpuReg(REG_OFFSET_BG1CNT) & 0xFFFC);
-    SetGpuRegBits(REG_OFFSET_BG1CNT, gNamingScreenData->unk1E1C);
+    SetGpuRegBits(REG_OFFSET_BG1CNT, gNamingScreenData->bg1Priority);
     SetGpuReg(REG_OFFSET_BG2CNT, GetGpuReg(REG_OFFSET_BG2CNT) & 0xFFFC);
-    SetGpuRegBits(REG_OFFSET_BG2CNT, gNamingScreenData->unk1E1E);
+    SetGpuRegBits(REG_OFFSET_BG2CNT, gNamingScreenData->bg2Priority);
 }
 
 static void sub_80E501C(void)
@@ -1806,7 +1826,7 @@ static const struct NamingScreenTemplate playerNamingScreenTemplate =
 {
     .unk0 = 0,
     .maxChars = 7,
-    .unk2 = 1,
+    .iconFunction = 1,
     .unk3 = 0,
     .unk4 = 1,
     .unk5 = 35,
@@ -1819,7 +1839,7 @@ static const struct NamingScreenTemplate pcBoxNamingTemplate =
 {
     .unk0 = 0,
     .maxChars = 8,
-    .unk2 = 2,
+    .iconFunction = 2,
     .unk3 = 0,
     .unk4 = 1,
     .unk5 = 19,
@@ -1832,7 +1852,7 @@ static const struct NamingScreenTemplate monNamingScreenTemplate =
 {
     .unk0 = 0,
     .maxChars = 10,
-    .unk2 = 3,
+    .iconFunction = 3,
     .unk3 = 1,
     .unk4 = 1,
     .unk5 = 35,
@@ -1845,7 +1865,7 @@ static const struct NamingScreenTemplate wandaWordsScreenTemplate =
 {
     .unk0 = 1,
     .maxChars = 15,
-    .unk2 = 4,
+    .iconFunction = 4,
     .unk3 = 0,
     .unk4 = 1,
     .unk5 = 11,
@@ -2079,7 +2099,7 @@ static const struct SpriteTemplate gUnknown_0858C138 =
     .callback = sub_80E3B30
 };
 
-static const struct SpriteTemplate gUnknown_0858C150 = 
+static const struct SpriteTemplate sSpriteTemplate_InputArrow = 
 {
     .tileTag = 0x000A,
     .paletteTag = 0x0003,
@@ -2090,7 +2110,7 @@ static const struct SpriteTemplate gUnknown_0858C150 =
     .callback = sub_80E3C20
 };
 
-static const struct SpriteTemplate gUnknown_0858C168 = 
+static const struct SpriteTemplate sSpriteTemplate_Underscore = 
 {
     .tileTag = 0x000B,
     .paletteTag = 0x0003,
@@ -2112,19 +2132,6 @@ static const struct SpriteTemplate gUnknown_0858C180 =
     .callback = SpriteCallbackDummy
 };
 
-extern const u8 gUnknown_0862B88D[];
-extern const u8 gUnknown_0862B8AE[];
-extern const u8 gUnknown_0862B8CF[];
-extern const u8 gUnknown_0862B8F0[];
-extern const u8 gUnknown_0862B911[];
-extern const u8 gUnknown_0862B932[];
-extern const u8 gUnknown_0862B953[];
-extern const u8 gUnknown_0862B974[];
-extern const u8 gUnknown_0862B995[];
-extern const u8 gUnknown_0862B9AE[];
-extern const u8 gUnknown_0862B9C7[];
-extern const u8 gUnknown_0862B9E0[];
-
 static const u8* const gUnknown_0858C198[][4] = 
 {
     {
-- 
cgit v1.2.3


From b8b0431477b841162b48b30afb46bb31c11960a0 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 23 Jan 2018 23:32:16 -0600
Subject: Identification

---
 src/naming_screen.c | 46 +++++++++++++++++++---------------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/naming_screen.c b/src/naming_screen.c
index b206c9c37..889956560 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -292,13 +292,13 @@ static void NamingScreen_Init(void)
     gNamingScreenData->bgToReveal = 0;
     gNamingScreenData->bgToHide = 1;
     gNamingScreenData->template = sNamingScreenTemplates[gNamingScreenData->templateNum];
-    gNamingScreenData->currentPage = gNamingScreenData->template->unk4;
+    gNamingScreenData->currentPage = gNamingScreenData->template->initialPage;
     gNamingScreenData->inputCharBaseXPos = (240 - gNamingScreenData->template->maxChars * 8) / 2 + 6;
     if (gNamingScreenData->templateNum == 4)
         gNamingScreenData->inputCharBaseXPos += 11;
     gNamingScreenData->keyRepeatStartDelayCopy = gKeyRepeatStartDelay;
     memset(gNamingScreenData->textBuffer, 0xFF, sizeof(gNamingScreenData->textBuffer));
-    if (gNamingScreenData->template->unk0 != 0)
+    if (gNamingScreenData->template->copyExistingString != 0)
         StringCopy(gNamingScreenData->textBuffer, gNamingScreenData->destBuffer);
     gKeyRepeatStartDelay = 16;
 }
@@ -1488,7 +1488,7 @@ static void (*const gUnknown_0858BF6C[])(void) =
 
 static void sub_80E498C(void)
 {
-    gUnknown_0858BF6C[gNamingScreenData->template->unk3]();
+    gUnknown_0858BF6C[gNamingScreenData->template->addGenderIcon]();
 }
 
 static void TaskDummy3(void)
@@ -1824,53 +1824,45 @@ static void sub_80E50EC(void)
 
 static const struct NamingScreenTemplate playerNamingScreenTemplate =
 {
-    .unk0 = 0,
+    .copyExistingString = 0,
     .maxChars = 7,
     .iconFunction = 1,
-    .unk3 = 0,
-    .unk4 = 1,
-    .unk5 = 35,
-    .unk6 = 0,
-    .unk7 = 0,
+    .addGenderIcon = 0,
+    .initialPage = 1,
+    .unused = 35,
     .title = gText_YourName,
 };
 
 static const struct NamingScreenTemplate pcBoxNamingTemplate =
 {
-    .unk0 = 0,
+    .copyExistingString = 0,
     .maxChars = 8,
     .iconFunction = 2,
-    .unk3 = 0,
-    .unk4 = 1,
-    .unk5 = 19,
-    .unk6 = 0,
-    .unk7 = 0,
+    .addGenderIcon = 0,
+    .initialPage = 1,
+    .unused = 19,
     .title = gText_BoxName,
 };
 
 static const struct NamingScreenTemplate monNamingScreenTemplate =
 {
-    .unk0 = 0,
+    .copyExistingString = 0,
     .maxChars = 10,
     .iconFunction = 3,
-    .unk3 = 1,
-    .unk4 = 1,
-    .unk5 = 35,
-    .unk6 = 0,
-    .unk7 = 0,
+    .addGenderIcon = 1,
+    .initialPage = 1,
+    .unused = 35,
     .title = gText_PkmnsNickname,
 };
 
 static const struct NamingScreenTemplate wandaWordsScreenTemplate =
 {
-    .unk0 = 1,
+    .copyExistingString = 1,
     .maxChars = 15,
     .iconFunction = 4,
-    .unk3 = 0,
-    .unk4 = 1,
-    .unk5 = 11,
-    .unk6 = 0,
-    .unk7 = 0,
+    .addGenderIcon = 0,
+    .initialPage = 1,
+    .unused = 11,
     .title = gText_TellHimTheWords,
 };
 
-- 
cgit v1.2.3


From 0c47cd6fc3723bffce2d36c41ab601eab8831626 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Wed, 24 Jan 2018 00:18:10 -0600
Subject: Renamed link_strings and fixed warning in fldeff_cut.s

---
 src/naming_screen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/naming_screen.c b/src/naming_screen.c
index 889956560..54b6f0bb9 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1738,10 +1738,10 @@ static void sub_80E4E5C(void)
 
 static void sub_80E4EF0(void)
 {
-    const u8 arr[] = { 15, 1, 2 };
+    const struct TextColor color[] = { 15, 1, 2 };
     
     FillWindowPixelBuffer(gNamingScreenData->windows[4], 0xFF);
-    box_print(gNamingScreenData->windows[4], 0, 2, 1, arr, 0, gText_MoveOkBack);
+    box_print(gNamingScreenData->windows[4], 0, 2, 1, color, 0, gText_MoveOkBack);
     PutWindowTilemap(gNamingScreenData->windows[4]);
     CopyWindowToVram(gNamingScreenData->windows[4], 3);
 }
-- 
cgit v1.2.3


From 10037ac0e1c1737dc7cb309257369b17ccd5e028 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Wed, 24 Jan 2018 01:03:20 -0600
Subject: Fix spelling of 'Parametrized' to 'Parameterized'

---
 src/battle_interface.c       | 2 +-
 src/berry_blender.c          | 2 +-
 src/decoration.c             | 2 +-
 src/diploma.c                | 4 ++--
 src/egg_hatch.c              | 2 +-
 src/hall_of_fame.c           | 8 ++++----
 src/naming_screen.c          | 2 +-
 src/pokeblock.c              | 2 +-
 src/pokeblock_feed.c         | 2 +-
 src/pokemon_summary_screen.c | 4 ++--
 src/save_failed_screen.c     | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/battle_interface.c b/src/battle_interface.c
index 6a6bf00a2..2338682e2 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -2575,7 +2575,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y,
     color.bgColor = 1;
     color.shadowColor = 3;
 
-    AddTextPrinterParametrized2(winId, 0, x, y, 0, 0, &color, -1, str);
+    AddTextPrinterParameterized2(winId, 0, x, y, 0, 0, &color, -1, str);
 
     *windowId = winId;
     return (u8*)(GetWindowAttribute(winId, WINDOW_TILE_DATA));
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 51580b50b..c7f465967 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -3602,7 +3602,7 @@ static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s3
         FillWindowPixelBuffer(windowId, txtColor.fgColor | (txtColor.fgColor << 4));
     }
 
-    AddTextPrinterParametrized2(windowId, 1, x, y, letterSpacing, 1, &txtColor, speed, string);
+    AddTextPrinterParameterized2(windowId, 1, x, y, letterSpacing, 1, &txtColor, speed, string);
 }
 
 static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed)
diff --git a/src/decoration.c b/src/decoration.c
index c539091c8..a9777c86f 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -500,7 +500,7 @@ void sub_8126B80(u8 taskId)
 void sub_8126C08(void)
 {
     FillWindowPixelBuffer(0, 0x11);
-    AddTextPrinterParametrized(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3);
+    AddTextPrinterParameterized(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3);
 }
 
 void SecretBasePC_Decorate(u8 taskId)
diff --git a/src/diploma.c b/src/diploma.c
index fedc10bd0..24e5e9727 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -17,7 +17,7 @@ extern int decompress_and_copy_tile_data_to_vram(u8 bg_id, void *src, int size,
 extern bool8 free_temp_tile_data_buffers_if_possible(void);
 extern void sub_80861E8(void); // rom4
 extern bool16 sub_80C0944(void);
-extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str);
+extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str);
 
 extern u16 gUnknown_0860F074[];
 
@@ -215,5 +215,5 @@ static void PrintDiplomaText(u8 *text, u8 var1, u8 var2)
         .shadowColor = 3,
     };
 
-    AddTextPrinterParametrized2(0, 1, var1, var2, 0, 0, &color, -1, text);
+    AddTextPrinterParameterized2(0, 1, var1, var2, 0, 0, &color, -1, text);
 }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 37f2b2e19..435886638 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -866,7 +866,7 @@ static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed)
     sEggHatchData->textColor.fgColor = 0;
     sEggHatchData->textColor.bgColor = 5;
     sEggHatchData->textColor.shadowColor = 6;
-    AddTextPrinterParametrized2(windowId, 1, x, y, 0, 0, &sEggHatchData->textColor, speed, string);
+    AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, &sEggHatchData->textColor, speed, string);
 }
 
 u8 GetEggStepsToSubtract(void)
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 3e70e22fa..5390814eb 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -82,7 +82,7 @@ extern const u8 gContestConfetti_Gfx[];
 extern const u8 gContestConfetti_Pal[];
 
 extern void sub_81973C4(u8, u8);
-extern u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
+extern u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
 extern void sub_8175620(void);
 extern u8 TrySavingData(u8);
 extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);
@@ -540,7 +540,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
     *lastSavedTeam = *sHofMonPtr;
 
     sub_81973C4(0, 0);
-    AddTextPrinterParametrized(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
+    AddTextPrinterParameterized(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
     CopyWindowToVram(0, 3);
     gTasks[taskId].func = Task_Hof_TrySaveData;
 }
@@ -747,7 +747,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
         FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
         HallOfFame_PrintPlayerInfo(1, 2);
         sub_81973C4(0, 0);
-        AddTextPrinterParametrized(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3);
+        AddTextPrinterParameterized(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3);
         CopyWindowToVram(0, 3);
         gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
     }
@@ -1116,7 +1116,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
 {
     sub_8198180(gText_UnkCtrlF800Exit, 8, 1);
     sub_81973C4(0, 0);
-    AddTextPrinterParametrized(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
+    AddTextPrinterParameterized(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
     CopyWindowToVram(0, 3);
     gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
 }
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 54b6f0bb9..7139b5c90 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -532,7 +532,7 @@ static void DisplaySentToPCMessage(void)
     StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]);
     sub_81973C4(0, 0);
     gTextFlags.flag_0 = TRUE;
-    AddTextPrinterParametrized(0, 1, gStringVar4, GetPlayerTextSpeed(), 0, 2, 1, 3);
+    AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), 0, 2, 1, 3);
     CopyWindowToVram(0, 3);
 }
 
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 573eed52b..1a4ce3155 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -583,7 +583,7 @@ static void HandleInitWindows(void)
 
 static void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x)
 {
-    AddTextPrinterParametrized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string);
+    AddTextPrinterParameterized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string);
 }
 
 static void PutPokeblockInfoText(void)
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index b26da118c..d899e54f1 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -792,7 +792,7 @@ static void Task_HandleMonAtePokeblock(u8 taskId)
         StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2);
 
     gTextFlags.flag_0 = 1;
-    AddTextPrinterParametrized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3);
+    AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3);
     gTasks[taskId].func = Task_WaitForAtePokeblockText;
 }
 
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index a900badd1..4affd830d 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -162,7 +162,7 @@ extern struct BattleMove gBattleMoves[];
 
 extern u32 ChangeBgX(u8 bg, u32 value, u8 op);
 extern void sub_8199C30(u8 a, u8 b, u8 c, u8 d, u8 e, u8 f);
-extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor* colors, s8 speed, u8 *str);
+extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor* colors, s8 speed, u8 *str);
 extern s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth);
 extern s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth);
 extern bool8 sub_81A6BF4();
@@ -2557,7 +2557,7 @@ void sub_81C2554()
 
 void sub_81C25A4(u8 a, u8 *b, u8 c, u8 d, u8 e, u8 f)
 {
-    AddTextPrinterParametrized2(a, 1, c, d, 0, e, &gUnknown_0861CD2C[f], 0, b);
+    AddTextPrinterParameterized2(a, 1, c, d, 0, e, &gUnknown_0861CD2C[f], 0, b);
 }
 
 void sub_81C25E8()
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 8764daa5f..95897e721 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -173,7 +173,7 @@ static void SaveFailedScreenTextPrint(u8 *text, u8 var1, u8 var2)
     color.fgColor = 0;
     color.bgColor = 15;
     color.shadowColor = 3;
-    AddTextPrinterParametrized2(gSaveFailedWindowIds[TEXT_WIN_ID], 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
+    AddTextPrinterParameterized2(gSaveFailedWindowIds[TEXT_WIN_ID], 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
 }
 
 void DoSaveFailedScreen(u8 saveType)
-- 
cgit v1.2.3


From 4e43a251b002c91074ae066849437700b4f724e9 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 24 Jan 2018 19:37:30 +0100
Subject: more pokemon anim funcs

---
 src/pokemon_animation.c | 827 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 821 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 960b42dd1..1cac2c473 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -4,10 +4,11 @@
 #include "pokemon_animation.h"
 #include "trig.h"
 #include "task.h"
+#include "blend_palette.h"
 
 struct UnkAnimStruct
 {
-    s16 field_0;
+    u16 field_0;
     s16 field_2;
     s16 field_4;
     s16 field_6;
@@ -172,6 +173,8 @@ void pokemonanimfunc_94(struct Sprite *sprite);
 void pokemonanimfunc_95(struct Sprite *sprite);
 void pokemonanimfunc_96(struct Sprite *sprite);
 
+void SpriteCB_SetDummyOnAnimEnd(struct Sprite *sprite);
+
 // const rom data
 static const u8 sSpeciesToBackAnimId[] =
 {
@@ -591,7 +594,13 @@ static const u8 sSpeciesToBackAnimId[] =
 
 const u8 gUnknown_0860AA64[] = {0x00, 0x05, 0x01, 0x01, 0x00, 0x0f, 0x01, 0x04, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x00, 0xff};
 
-const u8 gUnknown_0860AA80[] = {0x06, 0x1e, 0xfe, 0x0f, 0x06, 0x1e, 0xff, 0x00};
+const u8 gUnknown_0860AA80[][2] =
+{
+    {6,     30},
+    {0xFE,  15},
+    {6,     30},
+    {0xFF,  0}
+};
 
 static void (* const sMonAnimFunctions[])(struct Sprite *sprite) =
 {
@@ -825,6 +834,8 @@ static const union AffineAnimCmd *const gSpriteAffineAnimTable_860AD68[] =
     gSpriteAffineAnim_860AD58
 };
 
+extern const s8 gUnknown_0860AD70[][3];
+
 // code
 void MonAnimDummySpriteCallback(struct Sprite *sprite)
 {
@@ -919,7 +930,7 @@ void sub_817F60C(struct Sprite *sprite)
     sprite->callback = MonAnimDummySpriteCallback;
 }
 
-void sub_817F618(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
+void SetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
 {
     u8 matrixNum;
     struct ObjAffineSrcData affineSrcData;
@@ -938,7 +949,7 @@ void sub_817F618(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
     gOamMatrices[matrixNum].d = dest.d;
 }
 
-void sub_817F670(struct Sprite *sprite)
+void HandleStartAffineAnim(struct Sprite *sprite)
 {
     sprite->oam.affineMode = 3;
     sprite->affineAnims = gSpriteAffineAnimTable_860AD68;
@@ -955,7 +966,7 @@ void sub_817F670(struct Sprite *sprite)
     sprite->affineAnimPaused = 1;
 }
 
-void sub_817F6D4(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
+void HandleSetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
 {
     if (!sprite->data[1])
     {
@@ -963,7 +974,7 @@ void sub_817F6D4(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
         rotation *= -1;
     }
 
-    sub_817F618(sprite, xScale, yScale, rotation);
+    SetAffineData(sprite, xScale, yScale, rotation);
 }
 
 void sub_817F70C(struct Sprite *sprite)
@@ -1013,3 +1024,807 @@ void sub_817F77C(struct Sprite *sprite)
         sprite->oam.affineMode = 0;
     }
 }
+
+void pokemonanimfunc_01(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    if (sprite->data[2] > 40)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 var = (sprite->data[2] * 512 / 40) % 256;
+
+        sprite->data[4] = Sin(var, 32) + 256;
+        sprite->data[5] = Cos(var, 32) + 256;
+        HandleSetAffineData(sprite, sprite->data[4], sprite->data[5], 0);
+    }
+
+    sprite->data[2]++;
+}
+
+void pokemonanimfunc_02(struct Sprite *sprite)
+{
+    if (sprite->data[2] > 40)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+    }
+    else
+    {
+        s8 var;
+
+        if (!(sprite->data[2] & 1))
+            var = 1;
+        else
+            var = -1;
+
+        sprite->pos2.x = Sin((sprite->data[2] * 128 / 40) % 256, 6) * var;
+    }
+
+    sprite->data[2]++;
+}
+
+void sub_817F8FC(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+
+    if (sprite->data[2] > sprite->data[0])
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+    }
+    else
+    {
+        sprite->pos2.x = Sin((sprite->data[2] * 384 / sprite->data[0]) % 256, 6);
+    }
+
+    sprite->data[2]++;
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_03(struct Sprite *sprite)
+{
+    sprite->data[0] = 40;
+    sub_817F8FC(sprite);
+    sprite->callback = sub_817F8FC;
+}
+
+void sub_817F978(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+
+    if (sprite->data[2] > sprite->data[0])
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        sprite->pos2.y = -(Sin((sprite->data[2] * 384 / sprite->data[0]) % 256, 6));
+    }
+
+    sprite->data[2]++;
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_04(struct Sprite *sprite)
+{
+    sprite->data[0] = 40;
+    sub_817F978(sprite);
+    sprite->callback = sub_817F978;
+}
+
+#ifdef NONMATCHING
+void sub_817F9F4(struct Sprite *sprite)
+{
+    s32 counter = sprite->data[2];
+
+    if (counter > 384)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        s32 divCounter = counter / 128;
+
+        switch (divCounter)
+        {
+        case 0:
+        case 1:
+            sprite->pos2.y = -(Sin(counter % 128, sprite->data[0] * 2));
+            break;
+        case 2:
+        case 3:
+            sprite->pos2.y = -(Sin(counter - 256, sprite->data[0] * 3));
+            break;
+        }
+    }
+
+    sprite->data[2] += 12;
+}
+
+#else
+__attribute__((naked))
+void sub_817F9F4(struct Sprite *sprite)
+{
+    asm(".syntax unified\n\
+        	push {r4,lr}\n\
+	adds r4, r0, 0\n\
+	movs r0, 0x32\n\
+	ldrsh r1, [r4, r0]\n\
+	movs r0, 0xC0\n\
+	lsls r0, 1\n\
+	cmp r1, r0\n\
+	ble _0817FA14\n\
+	ldr r0, =SpriteCB_SetDummyOnAnimEnd\n\
+	str r0, [r4, 0x1C]\n\
+	movs r0, 0\n\
+	strh r0, [r4, 0x24]\n\
+	b _0817FA5E\n\
+	.pool\n\
+_0817FA14:\n\
+	adds r0, r1, 0\n\
+	cmp r1, 0\n\
+	bge _0817FA1C\n\
+	adds r0, 0x7F\n\
+_0817FA1C:\n\
+	asrs r2, r0, 7\n\
+	lsls r0, r2, 16\n\
+	asrs r0, 16\n\
+	cmp r0, 0\n\
+	blt _0817FA60\n\
+	cmp r0, 0x1\n\
+	ble _0817FA48\n\
+	cmp r0, 0x3\n\
+	bgt _0817FA60\n\
+	ldr r2, =0xffffff00\n\
+	adds r1, r2\n\
+	lsls r0, r1, 16\n\
+	asrs r0, 16\n\
+	movs r1, 0x2E\n\
+	ldrsh r2, [r4, r1]\n\
+	lsls r1, r2, 1\n\
+	adds r1, r2\n\
+	lsls r1, 16\n\
+	b _0817FA56\n\
+	.pool\n\
+_0817FA48:\n\
+	lsls r0, r2, 7\n\
+	subs r0, r1, r0\n\
+	lsls r0, 16\n\
+	asrs r0, 16\n\
+	movs r2, 0x2E\n\
+	ldrsh r1, [r4, r2]\n\
+	lsls r1, 17\n\
+_0817FA56:\n\
+	asrs r1, 16\n\
+	bl Sin\n\
+	negs r0, r0\n\
+_0817FA5E:\n\
+	strh r0, [r4, 0x26]\n\
+_0817FA60:\n\
+	ldrh r0, [r4, 0x32]\n\
+	adds r0, 0xC\n\
+	strh r0, [r4, 0x32]\n\
+	pop {r4}\n\
+	pop {r0}\n\
+	bx r0\n\
+        .syntax divided");
+}
+
+#endif // NONMATCHING
+
+void pokemonanimfunc_1E(struct Sprite *sprite)
+{
+    sprite->data[0] = 4;
+    sub_817F9F4(sprite);
+    sprite->callback = sub_817F9F4;
+}
+
+void pokemonanimfunc_06(struct Sprite *sprite)
+{
+    s32 counter = sprite->data[2];
+
+    if (counter > 768)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        s16 divCounter = counter / 128;
+
+        switch (divCounter)
+        {
+        case 0:
+        case 1:
+            sprite->pos2.x = 0;
+            break;
+        case 2:
+            counter = 0;
+            break;
+        case 3:
+            sprite->pos2.x = -(counter % 128 * 8) / 128;
+            break;
+        case 4:
+            sprite->pos2.x = (counter % 128) / 8 - 8;
+            break;
+        case 5:
+            sprite->pos2.x = -(counter % 128 * 8) / 128 + 8;
+            break;
+        }
+
+        sprite->pos2.y = -(Sin(counter % 128, 8));
+    }
+
+    sprite->data[2] += 12;
+}
+
+void pokemonanimfunc_09(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    if (sprite->data[2] > 40)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 index = (sprite->data[2] * 256 / 40) % 256;
+
+        if (sprite->data[2] % 2 == 0)
+        {
+            sprite->data[4] = Sin(index, 32) + 256;
+            sprite->data[5] = Sin(index, 32) + 256;
+        }
+        else
+        {
+            sprite->data[4] = Sin(index, 8) + 256;
+            sprite->data[5] = Sin(index, 8) + 256;
+        }
+
+        HandleSetAffineData(sprite, sprite->data[4], sprite->data[5], 0);
+    }
+
+    sprite->data[2]++;
+}
+
+void sub_817FC20(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+
+    if (sprite->data[2] == 0)
+        sprite->data[3] = 0;
+
+    if (gUnknown_0860AD70[sprite->data[3]][2] == sprite->data[2])
+    {
+        if (gUnknown_0860AD70[sprite->data[3]][2] == 0)
+        {
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+        else
+        {
+            sprite->data[3]++;
+            sprite->data[2] = 0;
+        }
+    }
+
+    if (gUnknown_0860AD70[sprite->data[3]][2] == 0)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->pos2.x += gUnknown_0860AD70[sprite->data[3]][0];
+        sprite->pos2.y += gUnknown_0860AD70[sprite->data[3]][1];
+        sprite->data[2]++;
+        sub_817F70C(sprite);
+    }
+}
+
+void pokemonanimfunc_0A(struct Sprite *sprite)
+{
+    sub_817FC20(sprite);
+    sprite->callback = sub_817FC20;
+}
+
+void sub_817FCDC(struct Sprite *sprite)
+{
+    s32 counter = sprite->data[2];
+
+    if (counter > 2304)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+    }
+    else
+    {
+        sprite->pos2.x = Sin(counter % 256, sprite->data[7]);
+    }
+
+    sprite->data[2] += sprite->data[0];
+}
+
+void pokemonanimfunc_0F(struct Sprite *sprite)
+{
+    sprite->data[0] = 60;
+    sprite->data[7] = 3;
+    sub_817FCDC(sprite);
+    sprite->callback = sub_817FCDC;
+}
+
+void sub_817FD44(struct Sprite *sprite)
+{
+    s32 counter = sprite->data[2];
+
+    if (counter > 2304)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        sprite->pos2.y = Sin(counter % 256, 3);
+    }
+
+    sprite->data[2] += sprite->data[0];
+}
+
+void pokemonanimfunc_10(struct Sprite *sprite)
+{
+    sprite->data[0] = 60;
+    sub_817FD44(sprite);
+    sprite->callback = sub_817FD44;
+}
+
+void pokemonanimfunc_11(struct Sprite *sprite)
+{
+    if (sprite->data[2] > 512)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        s8 var;
+        s32 index, amplitude;
+
+        if (!(sprite->data[2] & 1))
+            var = 1;
+        else
+            var = -1;
+
+        amplitude = Sin(sprite->data[2] / 4, 8);
+        index = sprite->data[2] % 256;
+
+        sprite->pos2.y = Sin(index, amplitude) * var;
+        sprite->pos2.x = Cos(index, amplitude) * var;
+    }
+
+    sprite->data[2] += 9;
+}
+
+void sub_817FE30(struct Sprite *sprite)
+{
+    s16 id = sprite->data[0];
+
+    if (gUnknown_03001240[id].field_0 != 0)
+    {
+        gUnknown_03001240[id].field_0--;
+    }
+    else
+    {
+        if (sprite->data[2] == 0 && gUnknown_03001240[id].field_8 == 0)
+        {
+            HandleStartAffineAnim(sprite);
+            gUnknown_03001240[id].field_8++;
+        }
+
+        if (sprite->data[2] > gUnknown_03001240[id].field_6)
+        {
+            HandleSetAffineData(sprite, 0x100, 0x100, 0);
+
+            if (gUnknown_03001240[id].field_4 > 1)
+            {
+                gUnknown_03001240[id].field_4--;
+                gUnknown_03001240[id].field_0 = 10;
+                sprite->data[2] = 0;
+            }
+            else
+            {
+                sub_817F77C(sprite);
+                sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+            }
+        }
+        else
+        {
+            sprite->data[6] = Sin(sprite->data[2] % 256, 4096);
+            HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[6]);
+        }
+
+        sprite->data[2] += 16;
+    }
+}
+
+void pokemonanimfunc_12(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_6 = 512;
+    gUnknown_03001240[id].field_0 = 0;
+    sub_817FE30(sprite);
+    sprite->callback = sub_817FE30;
+}
+
+void sub_817FF3C(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0];
+
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    if (sprite->data[2] > gUnknown_03001240[id].field_0)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->data[6] = (65536 / gUnknown_03001240[id].field_8) * sprite->data[2];
+        HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[6]);
+    }
+
+    sprite->data[2]++;
+}
+
+void pokemonanimfunc_1F(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_0 = 60;
+    gUnknown_03001240[id].field_8 = 20;
+    sub_817FF3C(sprite);
+    sprite->callback = sub_817FF3C;
+}
+
+void sub_817FFF0(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0];
+
+    sub_817F70C(sprite);
+
+    if (sprite->data[2] > gUnknown_03001240[id].field_6)
+    {
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 index = (sprite->data[2] + 192) % 256;
+
+        sprite->pos2.x = -(Cos(index, gUnknown_03001240[id].field_8 * 2));
+        sprite->pos2.y = Sin(index, gUnknown_03001240[id].field_8) + gUnknown_03001240[id].field_8;
+    }
+
+    sprite->data[2] += gUnknown_03001240[id].field_2;
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_14(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_6 = 512;
+    gUnknown_03001240[id].field_8 = 6;
+    gUnknown_03001240[id].field_2 = 24;
+    sub_817FFF0(sprite);
+    sprite->callback = sub_817FFF0;
+}
+
+void pokemonanimfunc_15(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+
+    if (sprite->data[2] > 128)
+    {
+        BlendPalette(sprite->data[7], 0x10, 0, 0);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->data[6] = Sin(sprite->data[2], 16);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0);
+    }
+
+    sprite->data[2]++;
+}
+
+void pokemonanimfunc_16(struct Sprite *sprite)
+{
+    s16 index1 = 0, index2 = 0;
+
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    if (sprite->data[2] > 40)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        index2 = (sprite->data[2] * 128) / 40;
+
+        if (sprite->data[2] >= 10 && sprite->data[2] <= 29)
+        {
+            sprite->data[7] += 51;
+            index1 = 0xFF & sprite->data[7];
+        }
+
+        if (sprite->data[1] == 0)
+            sprite->data[4] = (Sin(index2, 40) - 256) + Sin(index1, 16);
+        else
+            sprite->data[4] = (256 - Sin(index2, 40)) - Sin(index1, 16);
+
+        sprite->data[5] = Sin(index2, 16) + 256;
+        SetAffineData(sprite, sprite->data[4], sprite->data[5], 0);
+    }
+
+    sprite->data[2]++;
+}
+
+void pokemonanimfunc_17(struct Sprite *sprite)
+{
+    s16 posY = 0, index1 = 0, index2 = 0;
+
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    if (sprite->data[2] > 40)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.y = posY;
+    }
+    else
+    {
+        index2 = (sprite->data[2] * 128) / 40;
+
+        if (sprite->data[2] >= 10 && sprite->data[2] <= 29)
+        {
+            sprite->data[7] += 51;
+            index1 = 0xFF & sprite->data[7];
+        }
+
+        if (sprite->data[1] == 0)
+            sprite->data[4] = -(Sin(index2, 16)) - 256;
+        else
+            sprite->data[4] = Sin(index2, 16) + 256;
+
+        sprite->data[5] = (256 - Sin(index2, 40)) - Sin(index1, 8);
+
+        if (sprite->data[5] != 256)
+            posY = (256 - sprite->data[5]) / 8;
+
+        sprite->pos2.y = -(posY);
+        SetAffineData(sprite, sprite->data[4], sprite->data[5], 0);
+    }
+
+    sprite->data[2]++;
+}
+
+void sub_818031C(struct Sprite *sprite)
+{
+    u8 index = sprite->data[2];
+    u8 var7 = sprite->data[6];
+    u8 var5 = gUnknown_0860AA80[sprite->data[5]][0];
+    u8 var6 = gUnknown_0860AA80[sprite->data[5]][1];
+    u8 amplitude = 0;
+
+    if (var5 != 0xFE)
+        amplitude = (var6 - var7) * var5 / var6;
+    else
+        amplitude = 0;
+
+    if (var5 == 0xFF)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        sprite->pos2.y = Sin(index, amplitude);
+
+        if (var7 == var6)
+        {
+            sprite->data[5]++;
+            sprite->data[6] = 0;
+        }
+        else
+        {
+            sprite->data[2] += sprite->data[0];
+            sprite->data[6]++;
+        }
+    }
+}
+
+void pokemonanimfunc_19(struct Sprite *sprite)
+{
+    sprite->data[0] = 48;
+    sub_818031C(sprite);
+    sprite->callback = sub_818031C;
+}
+
+void pokemonanimfunc_1A(struct Sprite *sprite)
+{
+    u8 counter = 0;
+
+    sub_817F70C(sprite);
+    counter = sprite->data[2];
+
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    if (sprite->data[2] > 35)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+    }
+    else
+    {
+        s16 index = ((counter - 10) * 128) / 20;
+
+        if (counter < 10)
+            HandleSetAffineData(sprite, 0x100, 0x100, counter / 2 * 512);
+        else if (counter >= 10 && counter <= 29)
+            sprite->pos2.x = -(Sin(index, 5));
+        else
+            HandleSetAffineData(sprite, 0x100, 0x100, (35 - counter) / 2 * 1024);
+    }
+
+    sprite->data[2]++;
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_1B(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    if (sprite->data[2] > 100)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->pos2.y = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 index = (sprite->data[2] * 256) / 100;
+        sprite->pos2.y = Sin(index, 10);
+        HandleSetAffineData(sprite, 0x100, 0x100, Sin(index, 3276));
+    }
+
+    sprite->data[2]++;
+}
+
+void sub_81804F8(struct Sprite *sprite)
+{
+    s32 var = 0;
+    s16 index = 0;
+
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    if (sprite->data[2] > 100)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->pos2.y = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        index = (sprite->data[2] * 256) / 100;
+        var = (sprite->data[2] * 512) / 100;
+        var &= 0xFF;
+        sprite->pos2.y = Sin(index, sprite->data[0]);
+        HandleSetAffineData(sprite, 0x100, 0x100, Sin(var, 3276));
+    }
+
+    sprite->data[2]++;
+}
+
+void pokemonanimfunc_1C(struct Sprite *sprite)
+{
+    sprite->data[0] = 10;
+    sub_81804F8(sprite);
+    sprite->callback = sub_81804F8;
+}
+
+void sub_81805B0(struct Sprite *sprite)
+{
+    s32 var = 0;
+    s16 index = 0;
+
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    if (sprite->data[2] > 100)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->pos2.y = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        index = (sprite->data[2] * 256) / 100;
+        var = (sprite->data[2] * 512) / 100;
+        var &= 0xFF;
+        sprite->pos2.y = -(Sin(index / 2, sprite->data[0] * 2));
+        HandleSetAffineData(sprite, 0x100, 0x100, Sin(var, 3276));
+    }
+
+    sprite->data[2]++;
+}
+
+void pokemonanimfunc_18(struct Sprite *sprite)
+{
+    sprite->data[0] = 5;
+    sub_81805B0(sprite);
+    sprite->callback = sub_81805B0;
+}
+
+void pokemonanimfunc_1D(struct Sprite *sprite)
+{
+    s32 var;
+    s16 index = 0;
+
+    sub_817F70C(sprite);
+    var = 0;
+
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    if (sprite->data[2] > 100)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->pos2.x = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 toDiv = 100;
+
+        index = (sprite->data[2] * 256) / toDiv;
+        var = (sprite->data[2] * 512) / toDiv;
+        var &= 0xFF;
+        sprite->pos2.x = Sin(index, 8);
+        HandleSetAffineData(sprite, 0x100, 0x100, Sin(var, 3276));
+    }
+
+    sprite->data[2]++;
+    sub_817F70C(sprite);
+}
-- 
cgit v1.2.3


From 7231aa2658e9c38f14ba3f319f45f83c9da0dea5 Mon Sep 17 00:00:00 2001
From: golem galvanize <golemgalvanize@github.com>
Date: Wed, 24 Jan 2018 16:45:37 -0500
Subject: got it almost matching

---
 src/text.c | 4117 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 2211 insertions(+), 1906 deletions(-)

(limited to 'src')

diff --git a/src/text.c b/src/text.c
index 5db3ba308..6be46b7b1 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,6 +1,9 @@
 #include "global.h"
+#include "battle.h"
 #include "main.h"
+#include "m4a.h"
 #include "palette.h"
+#include "sound.h"
 #include "string_util.h"
 #include "window.h"
 #include "text.h"
@@ -14,6 +17,7 @@ extern u16 Font6Func(struct TextPrinter *textPrinter);
 extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
 extern void PlaySE(u16 songNum);
 extern u8* UnkTextUtil_GetPtrI(u8 a1);
+extern int sub_8197964();
 
 EWRAM_DATA struct TextPrinter gTempTextPrinter = {0};
 EWRAM_DATA struct TextPrinter gTextPrinters[NUM_TEXT_PRINTERS] = {0};
@@ -24,6 +28,7 @@ static u16 gLastTextFgColor;
 static u16 gLastTextShadowColor;
 
 extern struct Main gMain;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 const struct FontInfo *gFonts;
 u8 gUnknown_03002F84;
@@ -35,22 +40,22 @@ u8 gGlyphDimensions[0x2];
 TextFlags gTextFlags;
 
 const u8 gFontHalfRowOffsets[] = {
-	0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00,
+    0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00,
     0x09, 0x0A, 0x0B, 0x09, 0x0C, 0x0D, 0x0E, 0x0C, 0x0F, 0x10, 0x11, 0x0F, 0x09, 0x0A, 0x0B, 0x09,
     0x12, 0x13, 0x14, 0x12, 0x15, 0x16, 0x17, 0x15, 0x18, 0x19, 0x1A, 0x18, 0x12, 0x13, 0x14, 0x12,
-	0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00,
+    0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00,
     0x1B, 0x1C, 0x1D, 0x1B, 0x1E, 0x1F, 0x20, 0x1E, 0x21, 0x22, 0x23, 0x21, 0x1B, 0x1C, 0x1D, 0x1B,
     0x24, 0x25, 0x26, 0x24, 0x27, 0x28, 0x29, 0x27, 0x2A, 0x2B, 0x2C, 0x2A, 0x24, 0x25, 0x26, 0x24,
-	0x2D, 0x2E, 0x2F, 0x2D, 0x30, 0x31, 0x32, 0x30, 0x33, 0x34, 0x35, 0x33, 0x2D, 0x2E, 0x2F, 0x2D,
+    0x2D, 0x2E, 0x2F, 0x2D, 0x30, 0x31, 0x32, 0x30, 0x33, 0x34, 0x35, 0x33, 0x2D, 0x2E, 0x2F, 0x2D,
     0x1B, 0x1C, 0x1D, 0x1B, 0x1E, 0x1F, 0x20, 0x1E, 0x21, 0x22, 0x23, 0x21, 0x1B, 0x1C, 0x1D, 0x1B,
     0x36, 0x37, 0x38, 0x36, 0x39, 0x3A, 0x3B, 0x39, 0x3C, 0x3D, 0x3E, 0x3C, 0x36, 0x37, 0x38, 0x36,
-	0x3F, 0x40, 0x41, 0x3F, 0x42, 0x43, 0x44, 0x42, 0x45, 0x46, 0x47, 0x45, 0x3F, 0x40, 0x41, 0x3F,
+    0x3F, 0x40, 0x41, 0x3F, 0x42, 0x43, 0x44, 0x42, 0x45, 0x46, 0x47, 0x45, 0x3F, 0x40, 0x41, 0x3F,
     0x48, 0x49, 0x4A, 0x48, 0x4B, 0x4C, 0x4D, 0x4B, 0x4E, 0x4F, 0x50, 0x4E, 0x48, 0x49, 0x4A, 0x48,
     0x36, 0x37, 0x38, 0x36, 0x39, 0x3A, 0x3B, 0x39, 0x3C, 0x3D, 0x3E, 0x3C, 0x36, 0x37, 0x38, 0x36,
-	0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00,
+    0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00,
     0x09, 0x0A, 0x0B, 0x09, 0x0C, 0x0D, 0x0E, 0x0C, 0x0F, 0x10, 0x11, 0x0F, 0x09, 0x0A, 0x0B, 0x09,
     0x12, 0x13, 0x14, 0x12, 0x15, 0x16, 0x17, 0x15, 0x18, 0x19, 0x1A, 0x18, 0x12, 0x13, 0x14, 0x12,
-	0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00
+    0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00
 };
 
 const u8 gDownArrowTiles[] = INCBIN_U8("data/graphics/fonts/down_arrow.4bpp");
@@ -378,460 +383,460 @@ __attribute__((naked))
 void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor)
 {
     asm("push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, #0x24\n\
-	lsl r0, #24\n\
-	lsr r0, #24\n\
-	lsl r1, #24\n\
-	lsr r1, #24\n\
-	lsl r2, #24\n\
-	lsr r2, #24\n\
-	ldr r3, =gFontHalfRowLookupTable\n\
-	ldr r4, =gLastTextBgColor\n\
-	strh r1, [r4]\n\
-	ldr r4, =gLastTextFgColor\n\
-	strh r0, [r4]\n\
-	ldr r4, =gLastTextShadowColor\n\
-	strh r2, [r4]\n\
-	lsl r5, r1, #12\n\
-	lsl r6, r0, #12\n\
-	lsl r4, r2, #12\n\
-	mov r8, r4\n\
-	lsl r7, r1, #8\n\
-	str r7, [sp]\n\
-	lsl r4, r1, #4\n\
-	mov r9, r4\n\
-	orr r7, r4\n\
-	str r7, [sp, #0x4]\n\
-	orr r7, r1\n\
-	add r4, r5, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	add r4, r6, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	mov r4, r8\n\
-	orr r7, r4\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	lsl r7, r0, #8\n\
-	mov r10, r7\n\
-	mov r4, r10\n\
-	mov r7, r9\n\
-	orr r4, r7\n\
-	str r4, [sp, #0x8]\n\
-	add r7, r4, #0\n\
-	orr r7, r1\n\
-	add r4, r5, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	add r4, r6, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	mov r4, r8\n\
-	orr r7, r4\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	lsl r7, r2, #8\n\
-	mov r12, r7\n\
-	mov r4, r12\n\
-	mov r7, r9\n\
-	orr r4, r7\n\
-	str r4, [sp, #0xC]\n\
-	add r7, r4, #0\n\
-	orr r7, r1\n\
-	add r4, r5, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	add r4, r6, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	mov r4, r8\n\
-	orr r7, r4\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	lsl r7, r0, #4\n\
-	mov r9, r7\n\
-	ldr r4, [sp]\n\
-	orr r4, r7\n\
-	str r4, [sp, #0x10]\n\
-	add r7, r4, #0\n\
-	orr r7, r1\n\
-	add r4, r5, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	add r4, r6, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	mov r4, r8\n\
-	orr r7, r4\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	mov r7, r10\n\
-	add r4, r7, #0\n\
-	mov r7, r9\n\
-	orr r4, r7\n\
-	str r4, [sp, #0x14]\n\
-	add r7, r4, #0\n\
-	orr r7, r1\n\
-	add r4, r5, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	add r4, r6, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	mov r4, r8\n\
-	orr r7, r4\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	mov r7, r12\n\
-	add r4, r7, #0\n\
-	mov r7, r9\n\
-	orr r4, r7\n\
-	str r4, [sp, #0x18]\n\
-	add r7, r4, #0\n\
-	orr r7, r1\n\
-	add r4, r5, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	add r4, r6, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	mov r4, r8\n\
-	orr r7, r4\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	lsl r7, r2, #4\n\
-	mov r9, r7\n\
-	mov r4, r9\n\
-	ldr r7, [sp]\n\
-	orr r7, r4\n\
-	str r7, [sp, #0x1C]\n\
-	orr r7, r1\n\
-	add r4, r5, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	add r4, r6, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	mov r4, r8\n\
-	orr r7, r4\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	mov r7, r9\n\
-	mov r4, r10\n\
-	orr r4, r7\n\
-	str r4, [sp, #0x20]\n\
-	add r7, r4, #0\n\
-	orr r7, r1\n\
-	add r4, r5, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	add r4, r6, #0\n\
-	orr r4, r7\n\
-	strh r4, [r3]\n\
-	add r3, #0x2\n\
-	mov r4, r8\n\
-	orr r7, r4\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	mov r4, r12\n\
-	mov r7, r9\n\
-	orr r4, r7\n\
-	add r7, r4, #0\n\
-	orr r7, r1\n\
-	add r1, r5, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	add r1, r6, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	mov r1, r8\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	ldr r7, [sp, #0x4]\n\
-	orr r7, r0\n\
-	add r1, r5, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	add r1, r6, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	mov r1, r8\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	ldr r7, [sp, #0x8]\n\
-	orr r7, r0\n\
-	add r1, r5, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	add r1, r6, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	mov r1, r8\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	ldr r7, [sp, #0xC]\n\
-	orr r7, r0\n\
-	add r1, r5, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	add r1, r6, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	mov r1, r8\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	ldr r7, [sp, #0x10]\n\
-	orr r7, r0\n\
-	add r1, r5, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	add r1, r6, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	mov r1, r8\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	ldr r7, [sp, #0x14]\n\
-	orr r7, r0\n\
-	add r1, r5, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	add r1, r6, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	mov r1, r8\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	ldr r7, [sp, #0x18]\n\
-	orr r7, r0\n\
-	add r1, r5, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	add r1, r6, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	mov r1, r8\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	ldr r7, [sp, #0x1C]\n\
-	orr r7, r0\n\
-	add r1, r5, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	add r1, r6, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	mov r1, r8\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	ldr r7, [sp, #0x20]\n\
-	orr r7, r0\n\
-	add r1, r5, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	add r1, r6, #0\n\
-	orr r1, r7\n\
-	strh r1, [r3]\n\
-	add r3, #0x2\n\
-	mov r1, r8\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	add r7, r4, #0\n\
-	orr r7, r0\n\
-	add r0, r5, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	add r0, r6, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	add r7, r2, #0\n\
-	ldr r0, [sp, #0x4]\n\
-	orr r7, r0\n\
-	add r0, r5, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	add r0, r6, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	orr r7, r1\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	add r7, r2, #0\n\
-	ldr r1, [sp, #0x8]\n\
-	orr r7, r1\n\
-	add r0, r5, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	add r0, r6, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	mov r0, r8\n\
-	orr r7, r0\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	add r7, r2, #0\n\
-	ldr r1, [sp, #0xC]\n\
-	orr r7, r1\n\
-	add r0, r5, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	add r0, r6, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	mov r0, r8\n\
-	orr r7, r0\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	add r7, r2, #0\n\
-	ldr r1, [sp, #0x10]\n\
-	orr r7, r1\n\
-	add r0, r5, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	add r0, r6, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	mov r0, r8\n\
-	orr r7, r0\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	add r7, r2, #0\n\
-	ldr r1, [sp, #0x14]\n\
-	orr r7, r1\n\
-	add r0, r5, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	add r0, r6, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	mov r0, r8\n\
-	orr r7, r0\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	add r7, r2, #0\n\
-	ldr r1, [sp, #0x18]\n\
-	orr r7, r1\n\
-	add r0, r5, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	add r0, r6, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	mov r0, r8\n\
-	orr r7, r0\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	add r7, r2, #0\n\
-	ldr r1, [sp, #0x1C]\n\
-	orr r7, r1\n\
-	add r0, r5, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	add r0, r6, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	mov r0, r8\n\
-	orr r7, r0\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	add r7, r2, #0\n\
-	ldr r1, [sp, #0x20]\n\
-	orr r7, r1\n\
-	add r0, r5, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	add r0, r6, #0\n\
-	orr r0, r7\n\
-	strh r0, [r3]\n\
-	add r3, #0x2\n\
-	mov r0, r8\n\
-	orr r7, r0\n\
-	strh r7, [r3]\n\
-	add r3, #0x2\n\
-	add r7, r2, #0\n\
-	orr r7, r4\n\
-	orr r5, r7\n\
-	strh r5, [r3]\n\
-	add r3, #0x2\n\
-	orr r6, r7\n\
-	strh r6, [r3]\n\
-	orr r0, r7\n\
-	strh r0, [r3, #0x2]\n\
-	add sp, #0x24\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool");
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, #0x24\n\
+    lsl r0, #24\n\
+    lsr r0, #24\n\
+    lsl r1, #24\n\
+    lsr r1, #24\n\
+    lsl r2, #24\n\
+    lsr r2, #24\n\
+    ldr r3, =gFontHalfRowLookupTable\n\
+    ldr r4, =gLastTextBgColor\n\
+    strh r1, [r4]\n\
+    ldr r4, =gLastTextFgColor\n\
+    strh r0, [r4]\n\
+    ldr r4, =gLastTextShadowColor\n\
+    strh r2, [r4]\n\
+    lsl r5, r1, #12\n\
+    lsl r6, r0, #12\n\
+    lsl r4, r2, #12\n\
+    mov r8, r4\n\
+    lsl r7, r1, #8\n\
+    str r7, [sp]\n\
+    lsl r4, r1, #4\n\
+    mov r9, r4\n\
+    orr r7, r4\n\
+    str r7, [sp, #0x4]\n\
+    orr r7, r1\n\
+    add r4, r5, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    add r4, r6, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    mov r4, r8\n\
+    orr r7, r4\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    lsl r7, r0, #8\n\
+    mov r10, r7\n\
+    mov r4, r10\n\
+    mov r7, r9\n\
+    orr r4, r7\n\
+    str r4, [sp, #0x8]\n\
+    add r7, r4, #0\n\
+    orr r7, r1\n\
+    add r4, r5, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    add r4, r6, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    mov r4, r8\n\
+    orr r7, r4\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    lsl r7, r2, #8\n\
+    mov r12, r7\n\
+    mov r4, r12\n\
+    mov r7, r9\n\
+    orr r4, r7\n\
+    str r4, [sp, #0xC]\n\
+    add r7, r4, #0\n\
+    orr r7, r1\n\
+    add r4, r5, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    add r4, r6, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    mov r4, r8\n\
+    orr r7, r4\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    lsl r7, r0, #4\n\
+    mov r9, r7\n\
+    ldr r4, [sp]\n\
+    orr r4, r7\n\
+    str r4, [sp, #0x10]\n\
+    add r7, r4, #0\n\
+    orr r7, r1\n\
+    add r4, r5, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    add r4, r6, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    mov r4, r8\n\
+    orr r7, r4\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    mov r7, r10\n\
+    add r4, r7, #0\n\
+    mov r7, r9\n\
+    orr r4, r7\n\
+    str r4, [sp, #0x14]\n\
+    add r7, r4, #0\n\
+    orr r7, r1\n\
+    add r4, r5, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    add r4, r6, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    mov r4, r8\n\
+    orr r7, r4\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    mov r7, r12\n\
+    add r4, r7, #0\n\
+    mov r7, r9\n\
+    orr r4, r7\n\
+    str r4, [sp, #0x18]\n\
+    add r7, r4, #0\n\
+    orr r7, r1\n\
+    add r4, r5, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    add r4, r6, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    mov r4, r8\n\
+    orr r7, r4\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    lsl r7, r2, #4\n\
+    mov r9, r7\n\
+    mov r4, r9\n\
+    ldr r7, [sp]\n\
+    orr r7, r4\n\
+    str r7, [sp, #0x1C]\n\
+    orr r7, r1\n\
+    add r4, r5, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    add r4, r6, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    mov r4, r8\n\
+    orr r7, r4\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    mov r7, r9\n\
+    mov r4, r10\n\
+    orr r4, r7\n\
+    str r4, [sp, #0x20]\n\
+    add r7, r4, #0\n\
+    orr r7, r1\n\
+    add r4, r5, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    add r4, r6, #0\n\
+    orr r4, r7\n\
+    strh r4, [r3]\n\
+    add r3, #0x2\n\
+    mov r4, r8\n\
+    orr r7, r4\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    mov r4, r12\n\
+    mov r7, r9\n\
+    orr r4, r7\n\
+    add r7, r4, #0\n\
+    orr r7, r1\n\
+    add r1, r5, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    add r1, r6, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    mov r1, r8\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    ldr r7, [sp, #0x4]\n\
+    orr r7, r0\n\
+    add r1, r5, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    add r1, r6, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    mov r1, r8\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    ldr r7, [sp, #0x8]\n\
+    orr r7, r0\n\
+    add r1, r5, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    add r1, r6, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    mov r1, r8\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    ldr r7, [sp, #0xC]\n\
+    orr r7, r0\n\
+    add r1, r5, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    add r1, r6, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    mov r1, r8\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    ldr r7, [sp, #0x10]\n\
+    orr r7, r0\n\
+    add r1, r5, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    add r1, r6, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    mov r1, r8\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    ldr r7, [sp, #0x14]\n\
+    orr r7, r0\n\
+    add r1, r5, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    add r1, r6, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    mov r1, r8\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    ldr r7, [sp, #0x18]\n\
+    orr r7, r0\n\
+    add r1, r5, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    add r1, r6, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    mov r1, r8\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    ldr r7, [sp, #0x1C]\n\
+    orr r7, r0\n\
+    add r1, r5, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    add r1, r6, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    mov r1, r8\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    ldr r7, [sp, #0x20]\n\
+    orr r7, r0\n\
+    add r1, r5, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    add r1, r6, #0\n\
+    orr r1, r7\n\
+    strh r1, [r3]\n\
+    add r3, #0x2\n\
+    mov r1, r8\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    add r7, r4, #0\n\
+    orr r7, r0\n\
+    add r0, r5, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    add r0, r6, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    add r7, r2, #0\n\
+    ldr r0, [sp, #0x4]\n\
+    orr r7, r0\n\
+    add r0, r5, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    add r0, r6, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    orr r7, r1\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    add r7, r2, #0\n\
+    ldr r1, [sp, #0x8]\n\
+    orr r7, r1\n\
+    add r0, r5, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    add r0, r6, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    mov r0, r8\n\
+    orr r7, r0\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    add r7, r2, #0\n\
+    ldr r1, [sp, #0xC]\n\
+    orr r7, r1\n\
+    add r0, r5, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    add r0, r6, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    mov r0, r8\n\
+    orr r7, r0\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    add r7, r2, #0\n\
+    ldr r1, [sp, #0x10]\n\
+    orr r7, r1\n\
+    add r0, r5, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    add r0, r6, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    mov r0, r8\n\
+    orr r7, r0\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    add r7, r2, #0\n\
+    ldr r1, [sp, #0x14]\n\
+    orr r7, r1\n\
+    add r0, r5, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    add r0, r6, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    mov r0, r8\n\
+    orr r7, r0\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    add r7, r2, #0\n\
+    ldr r1, [sp, #0x18]\n\
+    orr r7, r1\n\
+    add r0, r5, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    add r0, r6, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    mov r0, r8\n\
+    orr r7, r0\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    add r7, r2, #0\n\
+    ldr r1, [sp, #0x1C]\n\
+    orr r7, r1\n\
+    add r0, r5, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    add r0, r6, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    mov r0, r8\n\
+    orr r7, r0\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    add r7, r2, #0\n\
+    ldr r1, [sp, #0x20]\n\
+    orr r7, r1\n\
+    add r0, r5, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    add r0, r6, #0\n\
+    orr r0, r7\n\
+    strh r0, [r3]\n\
+    add r3, #0x2\n\
+    mov r0, r8\n\
+    orr r7, r0\n\
+    strh r7, [r3]\n\
+    add r3, #0x2\n\
+    add r7, r2, #0\n\
+    orr r7, r4\n\
+    orr r5, r7\n\
+    strh r5, [r3]\n\
+    add r3, #0x2\n\
+    orr r6, r7\n\
+    strh r6, [r3]\n\
+    orr r0, r7\n\
+    strh r0, [r3, #0x2]\n\
+    add sp, #0x24\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool");
 }
 #endif
 
@@ -874,165 +879,165 @@ __attribute__((naked))
 void DecompressGlyphTile(const u16 *src, u16 *dest)
 {
     asm("push {r4-r7,lr}\n\
-	mov r7, r8\n\
-	push {r7}\n\
-	ldrh r7, [r0]\n\
-	ldr r5, =gFontHalfRowLookupTable\n\
-	ldr r4, =gFontHalfRowOffsets\n\
-	mov r2, #0xFF\n\
-	mov r8, r2\n\
-	add r2, r7, #0\n\
-	mov r3, r8\n\
-	and r2, r3\n\
-	add r2, r4\n\
-	ldrb r2, [r2]\n\
-	lsl r2, #1\n\
-	add r2, r5\n\
-	ldrh r3, [r2]\n\
-	lsl r3, #16\n\
-	lsr r2, r7, #8\n\
-	add r2, r4\n\
-	ldrb r2, [r2]\n\
-	lsl r2, #1\n\
-	add r2, r5\n\
-	ldrh r2, [r2]\n\
-	orr r3, r2\n\
-	add r6, r1, #0\n\
-	stmia r6!, {r3}\n\
-	ldrh r7, [r0, #0x2]\n\
-	add r0, #0x4\n\
-	add r2, r7, #0\n\
-	mov r3, r8\n\
-	and r2, r3\n\
-	add r2, r4\n\
-	ldrb r2, [r2]\n\
-	lsl r2, #1\n\
-	add r2, r5\n\
-	ldrh r3, [r2]\n\
-	lsl r3, #16\n\
-	lsr r2, r7, #8\n\
-	add r2, r4\n\
-	ldrb r2, [r2]\n\
-	lsl r2, #1\n\
-	add r2, r5\n\
-	ldrh r2, [r2]\n\
-	orr r3, r2\n\
-	str r3, [r1, #0x4]\n\
-	add r6, #0x4\n\
-	ldrh r7, [r0]\n\
-	add r0, #0x2\n\
-	add r1, r7, #0\n\
-	mov r2, r8\n\
-	and r1, r2\n\
-	add r1, r4\n\
-	ldrb r1, [r1]\n\
-	lsl r1, #1\n\
-	add r1, r5\n\
-	ldrh r2, [r1]\n\
-	lsl r2, #16\n\
-	lsr r1, r7, #8\n\
-	add r1, r4\n\
-	ldrb r1, [r1]\n\
-	lsl r1, #1\n\
-	add r1, r5\n\
-	ldrh r1, [r1]\n\
-	orr r2, r1\n\
-	stmia r6!, {r2}\n\
-	ldrh r7, [r0]\n\
-	add r0, #0x2\n\
-	add r1, r7, #0\n\
-	mov r3, r8\n\
-	and r1, r3\n\
-	add r1, r4\n\
-	ldrb r1, [r1]\n\
-	lsl r1, #1\n\
-	add r1, r5\n\
-	ldrh r2, [r1]\n\
-	lsl r2, #16\n\
-	lsr r1, r7, #8\n\
-	add r1, r4\n\
-	ldrb r1, [r1]\n\
-	lsl r1, #1\n\
-	add r1, r5\n\
-	ldrh r1, [r1]\n\
-	orr r2, r1\n\
-	stmia r6!, {r2}\n\
-	ldrh r7, [r0]\n\
-	add r0, #0x2\n\
-	add r1, r7, #0\n\
-	and r1, r3\n\
-	add r1, r4\n\
-	ldrb r1, [r1]\n\
-	lsl r1, #1\n\
-	add r1, r5\n\
-	ldrh r2, [r1]\n\
-	lsl r2, #16\n\
-	lsr r1, r7, #8\n\
-	add r1, r4\n\
-	ldrb r1, [r1]\n\
-	lsl r1, #1\n\
-	add r1, r5\n\
-	ldrh r1, [r1]\n\
-	orr r2, r1\n\
-	stmia r6!, {r2}\n\
-	ldrh r7, [r0]\n\
-	add r0, #0x2\n\
-	add r1, r7, #0\n\
-	and r1, r3\n\
-	add r1, r4\n\
-	ldrb r1, [r1]\n\
-	lsl r1, #1\n\
-	add r1, r5\n\
-	ldrh r2, [r1]\n\
-	lsl r2, #16\n\
-	lsr r1, r7, #8\n\
-	add r1, r4\n\
-	ldrb r1, [r1]\n\
-	lsl r1, #1\n\
-	add r1, r5\n\
-	ldrh r1, [r1]\n\
-	orr r2, r1\n\
-	stmia r6!, {r2}\n\
-	ldrh r7, [r0]\n\
-	add r1, r7, #0\n\
-	and r1, r3\n\
-	add r1, r4\n\
-	ldrb r1, [r1]\n\
-	lsl r1, #1\n\
-	add r1, r5\n\
-	ldrh r2, [r1]\n\
-	lsl r2, #16\n\
-	lsr r1, r7, #8\n\
-	add r1, r4\n\
-	ldrb r1, [r1]\n\
-	lsl r1, #1\n\
-	add r1, r5\n\
-	ldrh r1, [r1]\n\
-	orr r2, r1\n\
-	stmia r6!, {r2}\n\
-	ldrh r7, [r0, #0x2]\n\
-	add r0, r7, #0\n\
-	and r0, r3\n\
-	add r0, r4\n\
-	ldrb r0, [r0]\n\
-	lsl r0, #1\n\
-	add r0, r5\n\
-	ldrh r1, [r0]\n\
-	lsl r1, #16\n\
-	lsr r0, r7, #8\n\
-	add r0, r4\n\
-	ldrb r0, [r0]\n\
-	lsl r0, #1\n\
-	add r0, r5\n\
-	ldrh r0, [r0]\n\
-	orr r1, r0\n\
-	str r1, [r6]\n\
-	pop {r3}\n\
-	mov r8, r3\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool");
+    mov r7, r8\n\
+    push {r7}\n\
+    ldrh r7, [r0]\n\
+    ldr r5, =gFontHalfRowLookupTable\n\
+    ldr r4, =gFontHalfRowOffsets\n\
+    mov r2, #0xFF\n\
+    mov r8, r2\n\
+    add r2, r7, #0\n\
+    mov r3, r8\n\
+    and r2, r3\n\
+    add r2, r4\n\
+    ldrb r2, [r2]\n\
+    lsl r2, #1\n\
+    add r2, r5\n\
+    ldrh r3, [r2]\n\
+    lsl r3, #16\n\
+    lsr r2, r7, #8\n\
+    add r2, r4\n\
+    ldrb r2, [r2]\n\
+    lsl r2, #1\n\
+    add r2, r5\n\
+    ldrh r2, [r2]\n\
+    orr r3, r2\n\
+    add r6, r1, #0\n\
+    stmia r6!, {r3}\n\
+    ldrh r7, [r0, #0x2]\n\
+    add r0, #0x4\n\
+    add r2, r7, #0\n\
+    mov r3, r8\n\
+    and r2, r3\n\
+    add r2, r4\n\
+    ldrb r2, [r2]\n\
+    lsl r2, #1\n\
+    add r2, r5\n\
+    ldrh r3, [r2]\n\
+    lsl r3, #16\n\
+    lsr r2, r7, #8\n\
+    add r2, r4\n\
+    ldrb r2, [r2]\n\
+    lsl r2, #1\n\
+    add r2, r5\n\
+    ldrh r2, [r2]\n\
+    orr r3, r2\n\
+    str r3, [r1, #0x4]\n\
+    add r6, #0x4\n\
+    ldrh r7, [r0]\n\
+    add r0, #0x2\n\
+    add r1, r7, #0\n\
+    mov r2, r8\n\
+    and r1, r2\n\
+    add r1, r4\n\
+    ldrb r1, [r1]\n\
+    lsl r1, #1\n\
+    add r1, r5\n\
+    ldrh r2, [r1]\n\
+    lsl r2, #16\n\
+    lsr r1, r7, #8\n\
+    add r1, r4\n\
+    ldrb r1, [r1]\n\
+    lsl r1, #1\n\
+    add r1, r5\n\
+    ldrh r1, [r1]\n\
+    orr r2, r1\n\
+    stmia r6!, {r2}\n\
+    ldrh r7, [r0]\n\
+    add r0, #0x2\n\
+    add r1, r7, #0\n\
+    mov r3, r8\n\
+    and r1, r3\n\
+    add r1, r4\n\
+    ldrb r1, [r1]\n\
+    lsl r1, #1\n\
+    add r1, r5\n\
+    ldrh r2, [r1]\n\
+    lsl r2, #16\n\
+    lsr r1, r7, #8\n\
+    add r1, r4\n\
+    ldrb r1, [r1]\n\
+    lsl r1, #1\n\
+    add r1, r5\n\
+    ldrh r1, [r1]\n\
+    orr r2, r1\n\
+    stmia r6!, {r2}\n\
+    ldrh r7, [r0]\n\
+    add r0, #0x2\n\
+    add r1, r7, #0\n\
+    and r1, r3\n\
+    add r1, r4\n\
+    ldrb r1, [r1]\n\
+    lsl r1, #1\n\
+    add r1, r5\n\
+    ldrh r2, [r1]\n\
+    lsl r2, #16\n\
+    lsr r1, r7, #8\n\
+    add r1, r4\n\
+    ldrb r1, [r1]\n\
+    lsl r1, #1\n\
+    add r1, r5\n\
+    ldrh r1, [r1]\n\
+    orr r2, r1\n\
+    stmia r6!, {r2}\n\
+    ldrh r7, [r0]\n\
+    add r0, #0x2\n\
+    add r1, r7, #0\n\
+    and r1, r3\n\
+    add r1, r4\n\
+    ldrb r1, [r1]\n\
+    lsl r1, #1\n\
+    add r1, r5\n\
+    ldrh r2, [r1]\n\
+    lsl r2, #16\n\
+    lsr r1, r7, #8\n\
+    add r1, r4\n\
+    ldrb r1, [r1]\n\
+    lsl r1, #1\n\
+    add r1, r5\n\
+    ldrh r1, [r1]\n\
+    orr r2, r1\n\
+    stmia r6!, {r2}\n\
+    ldrh r7, [r0]\n\
+    add r1, r7, #0\n\
+    and r1, r3\n\
+    add r1, r4\n\
+    ldrb r1, [r1]\n\
+    lsl r1, #1\n\
+    add r1, r5\n\
+    ldrh r2, [r1]\n\
+    lsl r2, #16\n\
+    lsr r1, r7, #8\n\
+    add r1, r4\n\
+    ldrb r1, [r1]\n\
+    lsl r1, #1\n\
+    add r1, r5\n\
+    ldrh r1, [r1]\n\
+    orr r2, r1\n\
+    stmia r6!, {r2}\n\
+    ldrh r7, [r0, #0x2]\n\
+    add r0, r7, #0\n\
+    and r0, r3\n\
+    add r0, r4\n\
+    ldrb r0, [r0]\n\
+    lsl r0, #1\n\
+    add r0, r5\n\
+    ldrh r1, [r0]\n\
+    lsl r1, #16\n\
+    lsr r0, r7, #8\n\
+    add r0, r4\n\
+    ldrb r0, [r0]\n\
+    lsl r0, #1\n\
+    add r0, r5\n\
+    ldrh r0, [r0]\n\
+    orr r1, r0\n\
+    str r1, [r6]\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool");
 }
 #endif
 
@@ -1055,703 +1060,703 @@ __attribute__((naked))
 void CopyGlyphToWindow(struct TextPrinter *x)
 {
     asm("push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, #0x8C\n\
-	add r3, r0, #0\n\
-	ldrb r1, [r3, #0x4]\n\
-	lsl r0, r1, #1\n\
-	add r0, r1\n\
-	lsl r0, #2\n\
-	ldr r1, =gWindows\n\
-	add r1, r0, r1\n\
-	add r2, r1, #0\n\
-	ldrb r7, [r1, #0x3]\n\
-	lsl r0, r7, #3\n\
-	ldrb r6, [r3, #0x8]\n\
-	sub r4, r0, r6\n\
-	ldr r5, =gUnknown_03002F90\n\
-	add r0, r5, #0\n\
-	add r0, #0x80\n\
-	ldrb r0, [r0]\n\
-	cmp r4, r0\n\
-	ble _08004DD2\n\
-	add r4, r0, #0\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, #0x8C\n\
+    add r3, r0, #0\n\
+    ldrb r1, [r3, #0x4]\n\
+    lsl r0, r1, #1\n\
+    add r0, r1\n\
+    lsl r0, #2\n\
+    ldr r1, =gWindows\n\
+    add r1, r0, r1\n\
+    add r2, r1, #0\n\
+    ldrb r7, [r1, #0x3]\n\
+    lsl r0, r7, #3\n\
+    ldrb r6, [r3, #0x8]\n\
+    sub r4, r0, r6\n\
+    ldr r5, =gUnknown_03002F90\n\
+    add r0, r5, #0\n\
+    add r0, #0x80\n\
+    ldrb r0, [r0]\n\
+    cmp r4, r0\n\
+    ble _08004DD2\n\
+    add r4, r0, #0\n\
 _08004DD2:\n\
-	ldrb r0, [r1, #0x4]\n\
-	lsl r0, #3\n\
-	ldrb r3, [r3, #0x9]\n\
-	sub r0, r3\n\
-	add r1, r5, #0\n\
-	add r1, #0x81\n\
-	ldrb r1, [r1]\n\
-	cmp r0, r1\n\
-	ble _08004DE6\n\
-	add r0, r1, #0\n\
+    ldrb r0, [r1, #0x4]\n\
+    lsl r0, #3\n\
+    ldrb r3, [r3, #0x9]\n\
+    sub r0, r3\n\
+    add r1, r5, #0\n\
+    add r1, #0x81\n\
+    ldrb r1, [r1]\n\
+    cmp r0, r1\n\
+    ble _08004DE6\n\
+    add r0, r1, #0\n\
 _08004DE6:\n\
-	str r6, [sp]\n\
-	mov r8, r3\n\
-	add r3, r5, #0\n\
-	ldr r2, [r2, #0x8]\n\
-	mov r9, r2\n\
-	lsl r1, r7, #5\n\
-	str r1, [sp, #0x4]\n\
-	cmp r4, #0x8\n\
-	ble _08004DFA\n\
-	b _08004F94\n\
+    str r6, [sp]\n\
+    mov r8, r3\n\
+    add r3, r5, #0\n\
+    ldr r2, [r2, #0x8]\n\
+    mov r9, r2\n\
+    lsl r1, r7, #5\n\
+    str r1, [sp, #0x4]\n\
+    cmp r4, #0x8\n\
+    ble _08004DFA\n\
+    b _08004F94\n\
 _08004DFA:\n\
-	cmp r0, #0x8\n\
-	bgt _08004E84\n\
-	mov r1, r8\n\
-	str r3, [sp, #0x8]\n\
-	add r2, r6, #0\n\
-	add r2, r4\n\
-	mov r8, r2\n\
-	add r0, r1, r0\n\
-	str r0, [sp, #0xC]\n\
-	str r6, [sp, #0x10]\n\
-	cmp r1, r0\n\
-	bcc _08004E14\n\
-	b _080052AA\n\
+    cmp r0, #0x8\n\
+    bgt _08004E84\n\
+    mov r1, r8\n\
+    str r3, [sp, #0x8]\n\
+    add r2, r6, #0\n\
+    add r2, r4\n\
+    mov r8, r2\n\
+    add r0, r1, r0\n\
+    str r0, [sp, #0xC]\n\
+    str r6, [sp, #0x10]\n\
+    cmp r1, r0\n\
+    bcc _08004E14\n\
+    b _080052AA\n\
 _08004E14:\n\
-	ldr r3, [sp, #0x8]\n\
-	ldm r3!, {r5}\n\
-	str r3, [sp, #0x8]\n\
-	ldr r4, [sp, #0x10]\n\
-	add r0, r1, #0x1\n\
-	mov r10, r0\n\
-	cmp r4, r8\n\
-	bcs _08004E72\n\
-	mov r2, #0x7\n\
-	mov r12, r2\n\
-	lsr r0, r1, #3\n\
-	ldr r2, [sp, #0x4]\n\
-	add r3, r0, #0\n\
-	mul r3, r2\n\
-	add r7, r3, #0\n\
-	mov r3, r12\n\
-	and r1, r3\n\
-	lsl r6, r1, #2\n\
+    ldr r3, [sp, #0x8]\n\
+    ldm r3!, {r5}\n\
+    str r3, [sp, #0x8]\n\
+    ldr r4, [sp, #0x10]\n\
+    add r0, r1, #0x1\n\
+    mov r10, r0\n\
+    cmp r4, r8\n\
+    bcs _08004E72\n\
+    mov r2, #0x7\n\
+    mov r12, r2\n\
+    lsr r0, r1, #3\n\
+    ldr r2, [sp, #0x4]\n\
+    add r3, r0, #0\n\
+    mul r3, r2\n\
+    add r7, r3, #0\n\
+    mov r3, r12\n\
+    and r1, r3\n\
+    lsl r6, r1, #2\n\
 _08004E38:\n\
-	add r3, r5, #0\n\
-	mov r0, #0xF\n\
-	and r3, r0\n\
-	cmp r3, #0\n\
-	beq _08004E6A\n\
-	lsr r2, r4, #3\n\
-	lsl r2, #5\n\
-	add r2, r9\n\
-	add r0, r4, #0\n\
-	mov r1, r12\n\
-	and r0, r1\n\
-	lsr r0, #1\n\
-	add r2, r0\n\
-	add r2, r7\n\
-	add r2, r6\n\
-	mov r1, #0x1\n\
-	and r1, r4\n\
-	lsl r1, #2\n\
-	lsl r3, r1\n\
-	mov r0, #0xF0\n\
-	asr r0, r1\n\
-	ldrb r1, [r2]\n\
-	and r0, r1\n\
-	orr r3, r0\n\
-	strb r3, [r2]\n\
+    add r3, r5, #0\n\
+    mov r0, #0xF\n\
+    and r3, r0\n\
+    cmp r3, #0\n\
+    beq _08004E6A\n\
+    lsr r2, r4, #3\n\
+    lsl r2, #5\n\
+    add r2, r9\n\
+    add r0, r4, #0\n\
+    mov r1, r12\n\
+    and r0, r1\n\
+    lsr r0, #1\n\
+    add r2, r0\n\
+    add r2, r7\n\
+    add r2, r6\n\
+    mov r1, #0x1\n\
+    and r1, r4\n\
+    lsl r1, #2\n\
+    lsl r3, r1\n\
+    mov r0, #0xF0\n\
+    asr r0, r1\n\
+    ldrb r1, [r2]\n\
+    and r0, r1\n\
+    orr r3, r0\n\
+    strb r3, [r2]\n\
 _08004E6A:\n\
-	lsr r5, #4\n\
-	add r4, #0x1\n\
-	cmp r4, r8\n\
-	bcc _08004E38\n\
+    lsr r5, #4\n\
+    add r4, #0x1\n\
+    cmp r4, r8\n\
+    bcc _08004E38\n\
 _08004E72:\n\
-	mov r1, r10\n\
-	ldr r2, [sp, #0xC]\n\
-	cmp r1, r2\n\
-	bcc _08004E14\n\
-	b _080052AA\n\
-	.pool\n\
+    mov r1, r10\n\
+    ldr r2, [sp, #0xC]\n\
+    cmp r1, r2\n\
+    bcc _08004E14\n\
+    b _080052AA\n\
+    .pool\n\
 _08004E84:\n\
-	mov r1, r8\n\
-	str r3, [sp, #0x14]\n\
-	ldr r3, [sp]\n\
-	add r3, r4\n\
-	mov r12, r3\n\
-	add r2, r1, #0\n\
-	add r2, #0x8\n\
-	str r2, [sp, #0x18]\n\
-	ldr r3, [sp]\n\
-	str r3, [sp, #0x1C]\n\
-	mov r2, r12\n\
-	str r2, [sp, #0x74]\n\
-	ldr r3, [sp, #0x18]\n\
-	str r3, [sp, #0x88]\n\
-	sub r0, #0x8\n\
-	str r0, [sp, #0x80]\n\
-	cmp r1, r3\n\
-	bcs _08004F0E\n\
+    mov r1, r8\n\
+    str r3, [sp, #0x14]\n\
+    ldr r3, [sp]\n\
+    add r3, r4\n\
+    mov r12, r3\n\
+    add r2, r1, #0\n\
+    add r2, #0x8\n\
+    str r2, [sp, #0x18]\n\
+    ldr r3, [sp]\n\
+    str r3, [sp, #0x1C]\n\
+    mov r2, r12\n\
+    str r2, [sp, #0x74]\n\
+    ldr r3, [sp, #0x18]\n\
+    str r3, [sp, #0x88]\n\
+    sub r0, #0x8\n\
+    str r0, [sp, #0x80]\n\
+    cmp r1, r3\n\
+    bcs _08004F0E\n\
 _08004EA8:\n\
-	ldr r0, [sp, #0x14]\n\
-	ldm r0!, {r5}\n\
-	str r0, [sp, #0x14]\n\
-	ldr r4, [sp, #0x1C]\n\
-	add r2, r1, #0x1\n\
-	mov r8, r2\n\
-	cmp r4, r12\n\
-	bcs _08004F06\n\
-	mov r3, #0x7\n\
-	mov r10, r3\n\
-	lsr r0, r1, #3\n\
-	ldr r3, [sp, #0x4]\n\
-	add r2, r0, #0\n\
-	mul r2, r3\n\
-	add r7, r2, #0\n\
-	mov r0, r10\n\
-	and r1, r0\n\
-	lsl r6, r1, #2\n\
+    ldr r0, [sp, #0x14]\n\
+    ldm r0!, {r5}\n\
+    str r0, [sp, #0x14]\n\
+    ldr r4, [sp, #0x1C]\n\
+    add r2, r1, #0x1\n\
+    mov r8, r2\n\
+    cmp r4, r12\n\
+    bcs _08004F06\n\
+    mov r3, #0x7\n\
+    mov r10, r3\n\
+    lsr r0, r1, #3\n\
+    ldr r3, [sp, #0x4]\n\
+    add r2, r0, #0\n\
+    mul r2, r3\n\
+    add r7, r2, #0\n\
+    mov r0, r10\n\
+    and r1, r0\n\
+    lsl r6, r1, #2\n\
 _08004ECC:\n\
-	add r3, r5, #0\n\
-	mov r1, #0xF\n\
-	and r3, r1\n\
-	cmp r3, #0\n\
-	beq _08004EFE\n\
-	lsr r2, r4, #3\n\
-	lsl r2, #5\n\
-	add r2, r9\n\
-	add r0, r4, #0\n\
-	mov r1, r10\n\
-	and r0, r1\n\
-	lsr r0, #1\n\
-	add r2, r0\n\
-	add r2, r7\n\
-	add r2, r6\n\
-	mov r1, #0x1\n\
-	and r1, r4\n\
-	lsl r1, #2\n\
-	lsl r3, r1\n\
-	mov r0, #0xF0\n\
-	asr r0, r1\n\
-	ldrb r1, [r2]\n\
-	and r0, r1\n\
-	orr r3, r0\n\
-	strb r3, [r2]\n\
+    add r3, r5, #0\n\
+    mov r1, #0xF\n\
+    and r3, r1\n\
+    cmp r3, #0\n\
+    beq _08004EFE\n\
+    lsr r2, r4, #3\n\
+    lsl r2, #5\n\
+    add r2, r9\n\
+    add r0, r4, #0\n\
+    mov r1, r10\n\
+    and r0, r1\n\
+    lsr r0, #1\n\
+    add r2, r0\n\
+    add r2, r7\n\
+    add r2, r6\n\
+    mov r1, #0x1\n\
+    and r1, r4\n\
+    lsl r1, #2\n\
+    lsl r3, r1\n\
+    mov r0, #0xF0\n\
+    asr r0, r1\n\
+    ldrb r1, [r2]\n\
+    and r0, r1\n\
+    orr r3, r0\n\
+    strb r3, [r2]\n\
 _08004EFE:\n\
-	lsr r5, #4\n\
-	add r4, #0x1\n\
-	cmp r4, r12\n\
-	bcc _08004ECC\n\
+    lsr r5, #4\n\
+    add r4, #0x1\n\
+    cmp r4, r12\n\
+    bcc _08004ECC\n\
 _08004F06:\n\
-	mov r1, r8\n\
-	ldr r2, [sp, #0x18]\n\
-	cmp r1, r2\n\
-	bcc _08004EA8\n\
+    mov r1, r8\n\
+    ldr r2, [sp, #0x18]\n\
+    cmp r1, r2\n\
+    bcc _08004EA8\n\
 _08004F0E:\n\
-	ldr r1, [sp, #0x88]\n\
-	ldr r3, =gUnknown_03002FD0\n\
-	str r3, [sp, #0x20]\n\
-	ldr r0, [sp, #0x74]\n\
-	mov r8, r0\n\
-	ldr r2, [sp, #0x80]\n\
-	add r2, r1, r2\n\
-	str r2, [sp, #0x24]\n\
-	ldr r3, [sp]\n\
-	str r3, [sp, #0x28]\n\
-	cmp r1, r2\n\
-	bcc _08004F28\n\
-	b _080052AA\n\
+    ldr r1, [sp, #0x88]\n\
+    ldr r3, =gUnknown_03002FD0\n\
+    str r3, [sp, #0x20]\n\
+    ldr r0, [sp, #0x74]\n\
+    mov r8, r0\n\
+    ldr r2, [sp, #0x80]\n\
+    add r2, r1, r2\n\
+    str r2, [sp, #0x24]\n\
+    ldr r3, [sp]\n\
+    str r3, [sp, #0x28]\n\
+    cmp r1, r2\n\
+    bcc _08004F28\n\
+    b _080052AA\n\
 _08004F28:\n\
-	ldr r0, [sp, #0x20]\n\
-	ldm r0!, {r5}\n\
-	str r0, [sp, #0x20]\n\
-	ldr r4, [sp, #0x28]\n\
-	add r2, r1, #0x1\n\
-	mov r10, r2\n\
-	cmp r4, r8\n\
-	bcs _08004F86\n\
-	mov r3, #0x7\n\
-	mov r12, r3\n\
-	lsr r0, r1, #3\n\
-	ldr r3, [sp, #0x4]\n\
-	add r2, r0, #0\n\
-	mul r2, r3\n\
-	add r7, r2, #0\n\
-	mov r0, r12\n\
-	and r1, r0\n\
-	lsl r6, r1, #2\n\
+    ldr r0, [sp, #0x20]\n\
+    ldm r0!, {r5}\n\
+    str r0, [sp, #0x20]\n\
+    ldr r4, [sp, #0x28]\n\
+    add r2, r1, #0x1\n\
+    mov r10, r2\n\
+    cmp r4, r8\n\
+    bcs _08004F86\n\
+    mov r3, #0x7\n\
+    mov r12, r3\n\
+    lsr r0, r1, #3\n\
+    ldr r3, [sp, #0x4]\n\
+    add r2, r0, #0\n\
+    mul r2, r3\n\
+    add r7, r2, #0\n\
+    mov r0, r12\n\
+    and r1, r0\n\
+    lsl r6, r1, #2\n\
 _08004F4C:\n\
-	add r3, r5, #0\n\
-	mov r1, #0xF\n\
-	and r3, r1\n\
-	cmp r3, #0\n\
-	beq _08004F7E\n\
-	lsr r2, r4, #3\n\
-	lsl r2, #5\n\
-	add r2, r9\n\
-	add r0, r4, #0\n\
-	mov r1, r12\n\
-	and r0, r1\n\
-	lsr r0, #1\n\
-	add r2, r0\n\
-	add r2, r7\n\
-	add r2, r6\n\
-	mov r1, #0x1\n\
-	and r1, r4\n\
-	lsl r1, #2\n\
-	lsl r3, r1\n\
-	mov r0, #0xF0\n\
-	asr r0, r1\n\
-	ldrb r1, [r2]\n\
-	and r0, r1\n\
-	orr r3, r0\n\
-	strb r3, [r2]\n\
+    add r3, r5, #0\n\
+    mov r1, #0xF\n\
+    and r3, r1\n\
+    cmp r3, #0\n\
+    beq _08004F7E\n\
+    lsr r2, r4, #3\n\
+    lsl r2, #5\n\
+    add r2, r9\n\
+    add r0, r4, #0\n\
+    mov r1, r12\n\
+    and r0, r1\n\
+    lsr r0, #1\n\
+    add r2, r0\n\
+    add r2, r7\n\
+    add r2, r6\n\
+    mov r1, #0x1\n\
+    and r1, r4\n\
+    lsl r1, #2\n\
+    lsl r3, r1\n\
+    mov r0, #0xF0\n\
+    asr r0, r1\n\
+    ldrb r1, [r2]\n\
+    and r0, r1\n\
+    orr r3, r0\n\
+    strb r3, [r2]\n\
 _08004F7E:\n\
-	lsr r5, #4\n\
-	add r4, #0x1\n\
-	cmp r4, r8\n\
-	bcc _08004F4C\n\
+    lsr r5, #4\n\
+    add r4, #0x1\n\
+    cmp r4, r8\n\
+    bcc _08004F4C\n\
 _08004F86:\n\
-	mov r1, r10\n\
-	ldr r2, [sp, #0x24]\n\
-	cmp r1, r2\n\
-	bcc _08004F28\n\
-	b _080052AA\n\
-	.pool\n\
+    mov r1, r10\n\
+    ldr r2, [sp, #0x24]\n\
+    cmp r1, r2\n\
+    bcc _08004F28\n\
+    b _080052AA\n\
+    .pool\n\
 _08004F94:\n\
-	cmp r0, #0x8\n\
-	ble _08004F9A\n\
-	b _080050A4\n\
+    cmp r0, #0x8\n\
+    ble _08004F9A\n\
+    b _080050A4\n\
 _08004F9A:\n\
-	mov r1, r8\n\
-	str r3, [sp, #0x2C]\n\
-	ldr r3, [sp]\n\
-	add r3, #0x8\n\
-	mov r12, r3\n\
-	add r0, r8\n\
-	str r0, [sp, #0x30]\n\
-	ldr r0, [sp]\n\
-	str r0, [sp, #0x34]\n\
-	ldr r2, [sp, #0x30]\n\
-	str r2, [sp, #0x78]\n\
-	str r3, [sp, #0x84]\n\
-	sub r4, #0x8\n\
-	str r4, [sp, #0x7C]\n\
-	cmp r8, r2\n\
-	bcs _0800501C\n\
+    mov r1, r8\n\
+    str r3, [sp, #0x2C]\n\
+    ldr r3, [sp]\n\
+    add r3, #0x8\n\
+    mov r12, r3\n\
+    add r0, r8\n\
+    str r0, [sp, #0x30]\n\
+    ldr r0, [sp]\n\
+    str r0, [sp, #0x34]\n\
+    ldr r2, [sp, #0x30]\n\
+    str r2, [sp, #0x78]\n\
+    str r3, [sp, #0x84]\n\
+    sub r4, #0x8\n\
+    str r4, [sp, #0x7C]\n\
+    cmp r8, r2\n\
+    bcs _0800501C\n\
 _08004FBA:\n\
-	ldr r0, [sp, #0x2C]\n\
-	ldm r0!, {r5}\n\
-	str r0, [sp, #0x2C]\n\
-	ldr r4, [sp, #0x34]\n\
-	add r2, r1, #0x1\n\
-	mov r10, r2\n\
-	cmp r4, r12\n\
-	bcs _08005014\n\
-	lsr r0, r1, #3\n\
-	ldr r2, [sp, #0x4]\n\
-	add r3, r0, #0\n\
-	mul r3, r2\n\
-	add r7, r3, #0\n\
-	mov r3, #0x7\n\
-	and r1, r3\n\
-	lsl r6, r1, #2\n\
+    ldr r0, [sp, #0x2C]\n\
+    ldm r0!, {r5}\n\
+    str r0, [sp, #0x2C]\n\
+    ldr r4, [sp, #0x34]\n\
+    add r2, r1, #0x1\n\
+    mov r10, r2\n\
+    cmp r4, r12\n\
+    bcs _08005014\n\
+    lsr r0, r1, #3\n\
+    ldr r2, [sp, #0x4]\n\
+    add r3, r0, #0\n\
+    mul r3, r2\n\
+    add r7, r3, #0\n\
+    mov r3, #0x7\n\
+    and r1, r3\n\
+    lsl r6, r1, #2\n\
 _08004FDA:\n\
-	add r3, r5, #0\n\
-	mov r0, #0xF\n\
-	and r3, r0\n\
-	cmp r3, #0\n\
-	beq _0800500C\n\
-	lsr r2, r4, #3\n\
-	lsl r2, #5\n\
-	add r2, r9\n\
-	add r0, r4, #0\n\
-	mov r1, #0x7\n\
-	and r0, r1\n\
-	lsr r0, #1\n\
-	add r2, r0\n\
-	add r2, r7\n\
-	add r2, r6\n\
-	mov r1, #0x1\n\
-	and r1, r4\n\
-	lsl r1, #2\n\
-	lsl r3, r1\n\
-	mov r0, #0xF0\n\
-	asr r0, r1\n\
-	ldrb r1, [r2]\n\
-	and r0, r1\n\
-	orr r3, r0\n\
-	strb r3, [r2]\n\
+    add r3, r5, #0\n\
+    mov r0, #0xF\n\
+    and r3, r0\n\
+    cmp r3, #0\n\
+    beq _0800500C\n\
+    lsr r2, r4, #3\n\
+    lsl r2, #5\n\
+    add r2, r9\n\
+    add r0, r4, #0\n\
+    mov r1, #0x7\n\
+    and r0, r1\n\
+    lsr r0, #1\n\
+    add r2, r0\n\
+    add r2, r7\n\
+    add r2, r6\n\
+    mov r1, #0x1\n\
+    and r1, r4\n\
+    lsl r1, #2\n\
+    lsl r3, r1\n\
+    mov r0, #0xF0\n\
+    asr r0, r1\n\
+    ldrb r1, [r2]\n\
+    and r0, r1\n\
+    orr r3, r0\n\
+    strb r3, [r2]\n\
 _0800500C:\n\
-	lsr r5, #4\n\
-	add r4, #0x1\n\
-	cmp r4, r12\n\
-	bcc _08004FDA\n\
+    lsr r5, #4\n\
+    add r4, #0x1\n\
+    cmp r4, r12\n\
+    bcc _08004FDA\n\
 _08005014:\n\
-	mov r1, r10\n\
-	ldr r2, [sp, #0x30]\n\
-	cmp r1, r2\n\
-	bcc _08004FBA\n\
+    mov r1, r10\n\
+    ldr r2, [sp, #0x30]\n\
+    cmp r1, r2\n\
+    bcc _08004FBA\n\
 _0800501C:\n\
-	mov r1, r8\n\
-	ldr r3, =gUnknown_03002FB0\n\
-	str r3, [sp, #0x38]\n\
-	ldr r0, [sp, #0x84]\n\
-	ldr r2, [sp, #0x7C]\n\
-	add r0, r2\n\
-	mov r8, r0\n\
-	ldr r3, [sp, #0x78]\n\
-	str r3, [sp, #0x3C]\n\
-	ldr r0, [sp, #0x84]\n\
-	str r0, [sp, #0x40]\n\
-	cmp r1, r3\n\
-	bcc _08005038\n\
-	b _080052AA\n\
+    mov r1, r8\n\
+    ldr r3, =gUnknown_03002FB0\n\
+    str r3, [sp, #0x38]\n\
+    ldr r0, [sp, #0x84]\n\
+    ldr r2, [sp, #0x7C]\n\
+    add r0, r2\n\
+    mov r8, r0\n\
+    ldr r3, [sp, #0x78]\n\
+    str r3, [sp, #0x3C]\n\
+    ldr r0, [sp, #0x84]\n\
+    str r0, [sp, #0x40]\n\
+    cmp r1, r3\n\
+    bcc _08005038\n\
+    b _080052AA\n\
 _08005038:\n\
-	ldr r2, [sp, #0x38]\n\
-	ldm r2!, {r5}\n\
-	str r2, [sp, #0x38]\n\
-	ldr r4, [sp, #0x40]\n\
-	add r3, r1, #0x1\n\
-	mov r10, r3\n\
-	cmp r4, r8\n\
-	bcs _08005096\n\
-	mov r0, #0x7\n\
-	mov r12, r0\n\
-	lsr r0, r1, #3\n\
-	ldr r3, [sp, #0x4]\n\
-	add r2, r0, #0\n\
-	mul r2, r3\n\
-	add r7, r2, #0\n\
-	mov r0, r12\n\
-	and r1, r0\n\
-	lsl r6, r1, #2\n\
+    ldr r2, [sp, #0x38]\n\
+    ldm r2!, {r5}\n\
+    str r2, [sp, #0x38]\n\
+    ldr r4, [sp, #0x40]\n\
+    add r3, r1, #0x1\n\
+    mov r10, r3\n\
+    cmp r4, r8\n\
+    bcs _08005096\n\
+    mov r0, #0x7\n\
+    mov r12, r0\n\
+    lsr r0, r1, #3\n\
+    ldr r3, [sp, #0x4]\n\
+    add r2, r0, #0\n\
+    mul r2, r3\n\
+    add r7, r2, #0\n\
+    mov r0, r12\n\
+    and r1, r0\n\
+    lsl r6, r1, #2\n\
 _0800505C:\n\
-	add r3, r5, #0\n\
-	mov r1, #0xF\n\
-	and r3, r1\n\
-	cmp r3, #0\n\
-	beq _0800508E\n\
-	lsr r2, r4, #3\n\
-	lsl r2, #5\n\
-	add r2, r9\n\
-	add r0, r4, #0\n\
-	mov r1, r12\n\
-	and r0, r1\n\
-	lsr r0, #1\n\
-	add r2, r0\n\
-	add r2, r7\n\
-	add r2, r6\n\
-	mov r1, #0x1\n\
-	and r1, r4\n\
-	lsl r1, #2\n\
-	lsl r3, r1\n\
-	mov r0, #0xF0\n\
-	asr r0, r1\n\
-	ldrb r1, [r2]\n\
-	and r0, r1\n\
-	orr r3, r0\n\
-	strb r3, [r2]\n\
+    add r3, r5, #0\n\
+    mov r1, #0xF\n\
+    and r3, r1\n\
+    cmp r3, #0\n\
+    beq _0800508E\n\
+    lsr r2, r4, #3\n\
+    lsl r2, #5\n\
+    add r2, r9\n\
+    add r0, r4, #0\n\
+    mov r1, r12\n\
+    and r0, r1\n\
+    lsr r0, #1\n\
+    add r2, r0\n\
+    add r2, r7\n\
+    add r2, r6\n\
+    mov r1, #0x1\n\
+    and r1, r4\n\
+    lsl r1, #2\n\
+    lsl r3, r1\n\
+    mov r0, #0xF0\n\
+    asr r0, r1\n\
+    ldrb r1, [r2]\n\
+    and r0, r1\n\
+    orr r3, r0\n\
+    strb r3, [r2]\n\
 _0800508E:\n\
-	lsr r5, #4\n\
-	add r4, #0x1\n\
-	cmp r4, r8\n\
-	bcc _0800505C\n\
+    lsr r5, #4\n\
+    add r4, #0x1\n\
+    cmp r4, r8\n\
+    bcc _0800505C\n\
 _08005096:\n\
-	mov r1, r10\n\
-	ldr r2, [sp, #0x3C]\n\
-	cmp r1, r2\n\
-	bcc _08005038\n\
-	b _080052AA\n\
-	.pool\n\
+    mov r1, r10\n\
+    ldr r2, [sp, #0x3C]\n\
+    cmp r1, r2\n\
+    bcc _08005038\n\
+    b _080052AA\n\
+    .pool\n\
 _080050A4:\n\
-	mov r1, r8\n\
-	str r5, [sp, #0x44]\n\
-	ldr r3, [sp]\n\
-	add r3, #0x8\n\
-	mov r12, r3\n\
-	mov r2, r8\n\
-	add r2, #0x8\n\
-	str r2, [sp, #0x48]\n\
-	ldr r3, [sp]\n\
-	str r3, [sp, #0x4C]\n\
-	str r2, [sp, #0x88]\n\
-	sub r0, #0x8\n\
-	str r0, [sp, #0x80]\n\
-	mov r0, r12\n\
-	str r0, [sp, #0x84]\n\
-	sub r4, #0x8\n\
-	str r4, [sp, #0x7C]\n\
-	cmp r8, r2\n\
-	bcs _0800512C\n\
+    mov r1, r8\n\
+    str r5, [sp, #0x44]\n\
+    ldr r3, [sp]\n\
+    add r3, #0x8\n\
+    mov r12, r3\n\
+    mov r2, r8\n\
+    add r2, #0x8\n\
+    str r2, [sp, #0x48]\n\
+    ldr r3, [sp]\n\
+    str r3, [sp, #0x4C]\n\
+    str r2, [sp, #0x88]\n\
+    sub r0, #0x8\n\
+    str r0, [sp, #0x80]\n\
+    mov r0, r12\n\
+    str r0, [sp, #0x84]\n\
+    sub r4, #0x8\n\
+    str r4, [sp, #0x7C]\n\
+    cmp r8, r2\n\
+    bcs _0800512C\n\
 _080050CA:\n\
-	ldr r2, [sp, #0x44]\n\
-	ldm r2!, {r5}\n\
-	str r2, [sp, #0x44]\n\
-	ldr r4, [sp, #0x4C]\n\
-	add r3, r1, #0x1\n\
-	mov r10, r3\n\
-	cmp r4, r12\n\
-	bcs _08005124\n\
-	lsr r0, r1, #3\n\
-	ldr r3, [sp, #0x4]\n\
-	add r2, r0, #0\n\
-	mul r2, r3\n\
-	add r7, r2, #0\n\
-	mov r0, #0x7\n\
-	and r1, r0\n\
-	lsl r6, r1, #2\n\
+    ldr r2, [sp, #0x44]\n\
+    ldm r2!, {r5}\n\
+    str r2, [sp, #0x44]\n\
+    ldr r4, [sp, #0x4C]\n\
+    add r3, r1, #0x1\n\
+    mov r10, r3\n\
+    cmp r4, r12\n\
+    bcs _08005124\n\
+    lsr r0, r1, #3\n\
+    ldr r3, [sp, #0x4]\n\
+    add r2, r0, #0\n\
+    mul r2, r3\n\
+    add r7, r2, #0\n\
+    mov r0, #0x7\n\
+    and r1, r0\n\
+    lsl r6, r1, #2\n\
 _080050EA:\n\
-	add r3, r5, #0\n\
-	mov r1, #0xF\n\
-	and r3, r1\n\
-	cmp r3, #0\n\
-	beq _0800511C\n\
-	lsr r2, r4, #3\n\
-	lsl r2, #5\n\
-	add r2, r9\n\
-	add r0, r4, #0\n\
-	mov r1, #0x7\n\
-	and r0, r1\n\
-	lsr r0, #1\n\
-	add r2, r0\n\
-	add r2, r7\n\
-	add r2, r6\n\
-	mov r1, #0x1\n\
-	and r1, r4\n\
-	lsl r1, #2\n\
-	lsl r3, r1\n\
-	mov r0, #0xF0\n\
-	asr r0, r1\n\
-	ldrb r1, [r2]\n\
-	and r0, r1\n\
-	orr r3, r0\n\
-	strb r3, [r2]\n\
+    add r3, r5, #0\n\
+    mov r1, #0xF\n\
+    and r3, r1\n\
+    cmp r3, #0\n\
+    beq _0800511C\n\
+    lsr r2, r4, #3\n\
+    lsl r2, #5\n\
+    add r2, r9\n\
+    add r0, r4, #0\n\
+    mov r1, #0x7\n\
+    and r0, r1\n\
+    lsr r0, #1\n\
+    add r2, r0\n\
+    add r2, r7\n\
+    add r2, r6\n\
+    mov r1, #0x1\n\
+    and r1, r4\n\
+    lsl r1, #2\n\
+    lsl r3, r1\n\
+    mov r0, #0xF0\n\
+    asr r0, r1\n\
+    ldrb r1, [r2]\n\
+    and r0, r1\n\
+    orr r3, r0\n\
+    strb r3, [r2]\n\
 _0800511C:\n\
-	lsr r5, #4\n\
-	add r4, #0x1\n\
-	cmp r4, r12\n\
-	bcc _080050EA\n\
+    lsr r5, #4\n\
+    add r4, #0x1\n\
+    cmp r4, r12\n\
+    bcc _080050EA\n\
 _08005124:\n\
-	mov r1, r10\n\
-	ldr r2, [sp, #0x48]\n\
-	cmp r1, r2\n\
-	bcc _080050CA\n\
+    mov r1, r10\n\
+    ldr r2, [sp, #0x48]\n\
+    cmp r1, r2\n\
+    bcc _080050CA\n\
 _0800512C:\n\
-	mov r1, r8\n\
-	ldr r3, =gUnknown_03002FB0\n\
-	str r3, [sp, #0x50]\n\
-	ldr r0, [sp, #0x84]\n\
-	ldr r2, [sp, #0x7C]\n\
-	add r0, r2\n\
-	mov r8, r0\n\
-	ldr r3, [sp, #0x88]\n\
-	str r3, [sp, #0x54]\n\
-	ldr r0, [sp, #0x84]\n\
-	str r0, [sp, #0x58]\n\
-	cmp r1, r3\n\
-	bcs _080051AC\n\
+    mov r1, r8\n\
+    ldr r3, =gUnknown_03002FB0\n\
+    str r3, [sp, #0x50]\n\
+    ldr r0, [sp, #0x84]\n\
+    ldr r2, [sp, #0x7C]\n\
+    add r0, r2\n\
+    mov r8, r0\n\
+    ldr r3, [sp, #0x88]\n\
+    str r3, [sp, #0x54]\n\
+    ldr r0, [sp, #0x84]\n\
+    str r0, [sp, #0x58]\n\
+    cmp r1, r3\n\
+    bcs _080051AC\n\
 _08005146:\n\
-	ldr r2, [sp, #0x50]\n\
-	ldm r2!, {r5}\n\
-	str r2, [sp, #0x50]\n\
-	ldr r4, [sp, #0x58]\n\
-	add r3, r1, #0x1\n\
-	mov r10, r3\n\
-	cmp r4, r8\n\
-	bcs _080051A4\n\
-	mov r0, #0x7\n\
-	mov r12, r0\n\
-	lsr r0, r1, #3\n\
-	ldr r3, [sp, #0x4]\n\
-	add r2, r0, #0\n\
-	mul r2, r3\n\
-	add r7, r2, #0\n\
-	mov r0, r12\n\
-	and r1, r0\n\
-	lsl r6, r1, #2\n\
+    ldr r2, [sp, #0x50]\n\
+    ldm r2!, {r5}\n\
+    str r2, [sp, #0x50]\n\
+    ldr r4, [sp, #0x58]\n\
+    add r3, r1, #0x1\n\
+    mov r10, r3\n\
+    cmp r4, r8\n\
+    bcs _080051A4\n\
+    mov r0, #0x7\n\
+    mov r12, r0\n\
+    lsr r0, r1, #3\n\
+    ldr r3, [sp, #0x4]\n\
+    add r2, r0, #0\n\
+    mul r2, r3\n\
+    add r7, r2, #0\n\
+    mov r0, r12\n\
+    and r1, r0\n\
+    lsl r6, r1, #2\n\
 _0800516A:\n\
-	add r3, r5, #0\n\
-	mov r1, #0xF\n\
-	and r3, r1\n\
-	cmp r3, #0\n\
-	beq _0800519C\n\
-	lsr r2, r4, #3\n\
-	lsl r2, #5\n\
-	add r2, r9\n\
-	add r0, r4, #0\n\
-	mov r1, r12\n\
-	and r0, r1\n\
-	lsr r0, #1\n\
-	add r2, r0\n\
-	add r2, r7\n\
-	add r2, r6\n\
-	mov r1, #0x1\n\
-	and r1, r4\n\
-	lsl r1, #2\n\
-	lsl r3, r1\n\
-	mov r0, #0xF0\n\
-	asr r0, r1\n\
-	ldrb r1, [r2]\n\
-	and r0, r1\n\
-	orr r3, r0\n\
-	strb r3, [r2]\n\
+    add r3, r5, #0\n\
+    mov r1, #0xF\n\
+    and r3, r1\n\
+    cmp r3, #0\n\
+    beq _0800519C\n\
+    lsr r2, r4, #3\n\
+    lsl r2, #5\n\
+    add r2, r9\n\
+    add r0, r4, #0\n\
+    mov r1, r12\n\
+    and r0, r1\n\
+    lsr r0, #1\n\
+    add r2, r0\n\
+    add r2, r7\n\
+    add r2, r6\n\
+    mov r1, #0x1\n\
+    and r1, r4\n\
+    lsl r1, #2\n\
+    lsl r3, r1\n\
+    mov r0, #0xF0\n\
+    asr r0, r1\n\
+    ldrb r1, [r2]\n\
+    and r0, r1\n\
+    orr r3, r0\n\
+    strb r3, [r2]\n\
 _0800519C:\n\
-	lsr r5, #4\n\
-	add r4, #0x1\n\
-	cmp r4, r8\n\
-	bcc _0800516A\n\
+    lsr r5, #4\n\
+    add r4, #0x1\n\
+    cmp r4, r8\n\
+    bcc _0800516A\n\
 _080051A4:\n\
-	mov r1, r10\n\
-	ldr r2, [sp, #0x54]\n\
-	cmp r1, r2\n\
-	bcc _08005146\n\
+    mov r1, r10\n\
+    ldr r2, [sp, #0x54]\n\
+    cmp r1, r2\n\
+    bcc _08005146\n\
 _080051AC:\n\
-	ldr r1, [sp, #0x88]\n\
-	ldr r3, =gUnknown_03002FD0\n\
-	str r3, [sp, #0x5C]\n\
-	ldr r0, [sp, #0x84]\n\
-	mov r8, r0\n\
-	ldr r2, [sp, #0x80]\n\
-	add r2, r1, r2\n\
-	str r2, [sp, #0x60]\n\
-	ldr r3, [sp]\n\
-	str r3, [sp, #0x64]\n\
-	cmp r1, r2\n\
-	bcs _0800522A\n\
+    ldr r1, [sp, #0x88]\n\
+    ldr r3, =gUnknown_03002FD0\n\
+    str r3, [sp, #0x5C]\n\
+    ldr r0, [sp, #0x84]\n\
+    mov r8, r0\n\
+    ldr r2, [sp, #0x80]\n\
+    add r2, r1, r2\n\
+    str r2, [sp, #0x60]\n\
+    ldr r3, [sp]\n\
+    str r3, [sp, #0x64]\n\
+    cmp r1, r2\n\
+    bcs _0800522A\n\
 _080051C4:\n\
-	ldr r0, [sp, #0x5C]\n\
-	ldm r0!, {r5}\n\
-	str r0, [sp, #0x5C]\n\
-	ldr r4, [sp, #0x64]\n\
-	add r2, r1, #0x1\n\
-	mov r10, r2\n\
-	cmp r4, r8\n\
-	bcs _08005222\n\
-	mov r3, #0x7\n\
-	mov r12, r3\n\
-	lsr r0, r1, #3\n\
-	ldr r3, [sp, #0x4]\n\
-	add r2, r0, #0\n\
-	mul r2, r3\n\
-	add r7, r2, #0\n\
-	mov r0, r12\n\
-	and r1, r0\n\
-	lsl r6, r1, #2\n\
+    ldr r0, [sp, #0x5C]\n\
+    ldm r0!, {r5}\n\
+    str r0, [sp, #0x5C]\n\
+    ldr r4, [sp, #0x64]\n\
+    add r2, r1, #0x1\n\
+    mov r10, r2\n\
+    cmp r4, r8\n\
+    bcs _08005222\n\
+    mov r3, #0x7\n\
+    mov r12, r3\n\
+    lsr r0, r1, #3\n\
+    ldr r3, [sp, #0x4]\n\
+    add r2, r0, #0\n\
+    mul r2, r3\n\
+    add r7, r2, #0\n\
+    mov r0, r12\n\
+    and r1, r0\n\
+    lsl r6, r1, #2\n\
 _080051E8:\n\
-	add r3, r5, #0\n\
-	mov r1, #0xF\n\
-	and r3, r1\n\
-	cmp r3, #0\n\
-	beq _0800521A\n\
-	lsr r2, r4, #3\n\
-	lsl r2, #5\n\
-	add r2, r9\n\
-	add r0, r4, #0\n\
-	mov r1, r12\n\
-	and r0, r1\n\
-	lsr r0, #1\n\
-	add r2, r0\n\
-	add r2, r7\n\
-	add r2, r6\n\
-	mov r1, #0x1\n\
-	and r1, r4\n\
-	lsl r1, #2\n\
-	lsl r3, r1\n\
-	mov r0, #0xF0\n\
-	asr r0, r1\n\
-	ldrb r1, [r2]\n\
-	and r0, r1\n\
-	orr r3, r0\n\
-	strb r3, [r2]\n\
+    add r3, r5, #0\n\
+    mov r1, #0xF\n\
+    and r3, r1\n\
+    cmp r3, #0\n\
+    beq _0800521A\n\
+    lsr r2, r4, #3\n\
+    lsl r2, #5\n\
+    add r2, r9\n\
+    add r0, r4, #0\n\
+    mov r1, r12\n\
+    and r0, r1\n\
+    lsr r0, #1\n\
+    add r2, r0\n\
+    add r2, r7\n\
+    add r2, r6\n\
+    mov r1, #0x1\n\
+    and r1, r4\n\
+    lsl r1, #2\n\
+    lsl r3, r1\n\
+    mov r0, #0xF0\n\
+    asr r0, r1\n\
+    ldrb r1, [r2]\n\
+    and r0, r1\n\
+    orr r3, r0\n\
+    strb r3, [r2]\n\
 _0800521A:\n\
-	lsr r5, #4\n\
-	add r4, #0x1\n\
-	cmp r4, r8\n\
-	bcc _080051E8\n\
+    lsr r5, #4\n\
+    add r4, #0x1\n\
+    cmp r4, r8\n\
+    bcc _080051E8\n\
 _08005222:\n\
-	mov r1, r10\n\
-	ldr r2, [sp, #0x60]\n\
-	cmp r1, r2\n\
-	bcc _080051C4\n\
+    mov r1, r10\n\
+    ldr r2, [sp, #0x60]\n\
+    cmp r1, r2\n\
+    bcc _080051C4\n\
 _0800522A:\n\
-	ldr r4, [sp, #0x84]\n\
-	ldr r1, [sp, #0x88]\n\
-	ldr r3, =gUnknown_03002FF0\n\
-	str r3, [sp, #0x68]\n\
-	ldr r0, [sp, #0x7C]\n\
-	add r0, r4\n\
-	mov r8, r0\n\
-	ldr r2, [sp, #0x80]\n\
-	add r2, r1, r2\n\
-	str r2, [sp, #0x6C]\n\
-	str r4, [sp, #0x70]\n\
-	cmp r1, r2\n\
-	bcs _080052AA\n\
+    ldr r4, [sp, #0x84]\n\
+    ldr r1, [sp, #0x88]\n\
+    ldr r3, =gUnknown_03002FF0\n\
+    str r3, [sp, #0x68]\n\
+    ldr r0, [sp, #0x7C]\n\
+    add r0, r4\n\
+    mov r8, r0\n\
+    ldr r2, [sp, #0x80]\n\
+    add r2, r1, r2\n\
+    str r2, [sp, #0x6C]\n\
+    str r4, [sp, #0x70]\n\
+    cmp r1, r2\n\
+    bcs _080052AA\n\
 _08005244:\n\
-	ldr r3, [sp, #0x68]\n\
-	ldm r3!, {r5}\n\
-	str r3, [sp, #0x68]\n\
-	ldr r4, [sp, #0x70]\n\
-	add r0, r1, #0x1\n\
-	mov r10, r0\n\
-	cmp r4, r8\n\
-	bcs _080052A2\n\
-	mov r2, #0x7\n\
-	mov r12, r2\n\
-	lsr r0, r1, #3\n\
-	ldr r2, [sp, #0x4]\n\
-	add r3, r0, #0\n\
-	mul r3, r2\n\
-	add r7, r3, #0\n\
-	mov r3, r12\n\
-	and r1, r3\n\
-	lsl r6, r1, #2\n\
+    ldr r3, [sp, #0x68]\n\
+    ldm r3!, {r5}\n\
+    str r3, [sp, #0x68]\n\
+    ldr r4, [sp, #0x70]\n\
+    add r0, r1, #0x1\n\
+    mov r10, r0\n\
+    cmp r4, r8\n\
+    bcs _080052A2\n\
+    mov r2, #0x7\n\
+    mov r12, r2\n\
+    lsr r0, r1, #3\n\
+    ldr r2, [sp, #0x4]\n\
+    add r3, r0, #0\n\
+    mul r3, r2\n\
+    add r7, r3, #0\n\
+    mov r3, r12\n\
+    and r1, r3\n\
+    lsl r6, r1, #2\n\
 _08005268:\n\
-	add r3, r5, #0\n\
-	mov r0, #0xF\n\
-	and r3, r0\n\
-	cmp r3, #0\n\
-	beq _0800529A\n\
-	lsr r2, r4, #3\n\
-	lsl r2, #5\n\
-	add r2, r9\n\
-	add r0, r4, #0\n\
-	mov r1, r12\n\
-	and r0, r1\n\
-	lsr r0, #1\n\
-	add r2, r0\n\
-	add r2, r7\n\
-	add r2, r6\n\
-	mov r1, #0x1\n\
-	and r1, r4\n\
-	lsl r1, #2\n\
-	lsl r3, r1\n\
-	mov r0, #0xF0\n\
-	asr r0, r1\n\
-	ldrb r1, [r2]\n\
-	and r0, r1\n\
-	orr r3, r0\n\
-	strb r3, [r2]\n\
+    add r3, r5, #0\n\
+    mov r0, #0xF\n\
+    and r3, r0\n\
+    cmp r3, #0\n\
+    beq _0800529A\n\
+    lsr r2, r4, #3\n\
+    lsl r2, #5\n\
+    add r2, r9\n\
+    add r0, r4, #0\n\
+    mov r1, r12\n\
+    and r0, r1\n\
+    lsr r0, #1\n\
+    add r2, r0\n\
+    add r2, r7\n\
+    add r2, r6\n\
+    mov r1, #0x1\n\
+    and r1, r4\n\
+    lsl r1, #2\n\
+    lsl r3, r1\n\
+    mov r0, #0xF0\n\
+    asr r0, r1\n\
+    ldrb r1, [r2]\n\
+    and r0, r1\n\
+    orr r3, r0\n\
+    strb r3, [r2]\n\
 _0800529A:\n\
-	lsr r5, #4\n\
-	add r4, #0x1\n\
-	cmp r4, r8\n\
-	bcc _08005268\n\
+    lsr r5, #4\n\
+    add r4, #0x1\n\
+    cmp r4, r8\n\
+    bcc _08005268\n\
 _080052A2:\n\
-	mov r1, r10\n\
-	ldr r2, [sp, #0x6C]\n\
-	cmp r1, r2\n\
-	bcc _08005244\n\
+    mov r1, r10\n\
+    ldr r2, [sp, #0x6C]\n\
+    cmp r1, r2\n\
+    bcc _08005244\n\
 _080052AA:\n\
-	add sp, #0x8C\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool");
+    add sp, #0x8C\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool");
 }
 
 void ClearTextSpan(struct TextPrinter *textPrinter, u32 width)
@@ -2046,733 +2051,1033 @@ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *c
         }
     }
 }
-
+#ifdef NONMATCHING
+u16 RenderText(struct TextPrinter *textPrinter)
+{
+    struct TextPrinterSubStruct* r4 = &textPrinter->sub_union.sub;
+    int temp;
+    int r4two;
+    int jpnvar;
+    u8* tempTwo;
+    u16 songId;
+    int dummy;
+    u8 dummyTwo;
+    
+    switch (textPrinter->state) // _080057C4
+    {
+        case 0: // _080057F0
+            if ((gMain.heldKeys & (A_BUTTON | B_BUTTON)) && r4->font_type_upper)
+                textPrinter->delayCounter = 0;
+            if (textPrinter->delayCounter && textPrinter->text_speed) //_0800580A
+            {
+                textPrinter->delayCounter--;
+                if (gTextFlags.flag_0 && (gMain.newKeys & (A_BUTTON | B_BUTTON)))
+                {
+                    r4->font_type_upper = 1;
+                    textPrinter->delayCounter = 0;
+                }
+                return 3;
+            }
+            else // _0800584C
+            {
+                if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED) && gTextFlags.flag_2)
+                    textPrinter->delayCounter = 3;
+                else
+                    textPrinter->delayCounter = textPrinter->text_speed;
+                temp = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                switch (temp) //_0800588A
+                {
+                    case 0xF8+6: //_080058B8
+                        textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
+                        textPrinter->subPrinter.currentY += (gFonts[textPrinter->subPrinter.fontId].maxLetterHeight + textPrinter->subPrinter.lineSpacing);
+                        return 2;
+                    case 0xF8+5: //_080058DC
+                        textPrinter->subPrinter.current_text_offset++;
+                        return 2;
+                    case 0xF8+4: //_080058E0
+                        temp = *textPrinter->subPrinter.current_text_offset;
+                        textPrinter->subPrinter.current_text_offset++;
+                        switch (temp) // _080058F0
+                        {
+                            
+                            case 1: // _08005960
+                                textPrinter->subPrinter.fontColor_h = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                                return 2;
+                            case 2: // _08005982
+                                textPrinter->subPrinter.bgColor = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                                return 2;
+                            case 3: // _080059A6
+                                textPrinter->subPrinter.shadowColor = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                                return 2;
+                            case 4: // _080059C0
+                                textPrinter->subPrinter.fontColor_h = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                textPrinter->subPrinter.bgColor = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                textPrinter->subPrinter.shadowColor = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                                return 2;
+                            case 5: // _08005A0E
+                                textPrinter->subPrinter.current_text_offset++;
+                                return 2;
+                            case 6: //_08005A12
+                                r4->font_type = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                return 2;
+                            case 7: // _08005A0A
+                                return 2;
+                            case 8: // _08005A2A
+                                textPrinter->delayCounter = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                textPrinter->state = 6;
+                                return 2;
+                            case 9: // _08005A3A
+                                textPrinter->state = 1;
+                                if (gTextFlags.flag_2)
+                                    r4->frames_visible_counter = 0;
+                                return 3;
+                            case 10: // _08005A58
+                                textPrinter->state = 5;
+                                return 3;
+                            case 11: // _08005A5C
+                                songId = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                songId |= *textPrinter->subPrinter.current_text_offset << 8;
+                                textPrinter->subPrinter.current_text_offset++;
+                                PlayBGM(songId);
+                                return 2;
+                            case 16: // _08005A76
+                                songId = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                songId |= (*textPrinter->subPrinter.current_text_offset << 8);
+                                textPrinter->subPrinter.current_text_offset++;
+                                PlaySE(songId);
+                                return 2;
+                            case 13: // _08005A90
+                                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x + *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                return 2;
+                            case 14: // _08005A98
+                                textPrinter->subPrinter.currentY = textPrinter->subPrinter.y + *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                return 2;
+                            case 15: // _08005AA4
+                                FillWindowPixelBuffer(textPrinter->subPrinter.windowId, textPrinter->subPrinter.bgColor | textPrinter->subPrinter.bgColor << 4);
+                                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
+                                textPrinter->subPrinter.currentY = textPrinter->subPrinter.y;
+                                return 2;
+                            case 23: // _08005ABE
+                                m4aMPlayStop(&gMPlayInfo_BGM);
+                                return 2;
+                            case 24: // _08005ACC
+                                m4aMPlayContinue(&gMPlayInfo_BGM);
+                                return 2;
+                            case 17: // _08005AD8
+                                temp = *textPrinter->subPrinter.current_text_offset;
+                                textPrinter->subPrinter.current_text_offset++;
+                                if (temp > 0)
+                                {
+                                    ClearTextSpan(textPrinter, temp);
+                                    textPrinter->subPrinter.currentX += temp;
+                                    return 0;
+                                }
+                                return 2;
+                            case 18: // _08005AF2
+                                textPrinter->subPrinter.currentX = *textPrinter->subPrinter.current_text_offset + textPrinter->subPrinter.x;
+                                textPrinter->subPrinter.current_text_offset++;
+                                return 2;
+                            case 19: // _08005B02
+                                temp = *textPrinter->subPrinter.current_text_offset;
+                                temp += textPrinter->subPrinter.x;
+                                textPrinter->subPrinter.current_text_offset++;
+                                r4two = temp - textPrinter->subPrinter.currentX;
+                                if (temp - textPrinter->subPrinter.currentX > 0)
+                                {
+                                    ClearTextSpan(textPrinter, r4two);
+                                    textPrinter->subPrinter.currentX += r4two;
+                                    return 0;
+                                }
+                                return 2;
+                            case 20: // _08005B26
+                                textPrinter->minLetterSpacing = *textPrinter->subPrinter.current_text_offset++;
+                                return 2;
+                            case 21: // _08005B36
+                                textPrinter->japanese = 1;
+                                return 2;
+                            case 22: // _08005B3E
+                                textPrinter->japanese = 0;
+                                return 2;
+                            case 12: // _08005B5A
+                                dummyTwo = *textPrinter->subPrinter.current_text_offset;
+                                dummy = 0x100;
+                                temp = dummy | dummyTwo;
+                                textPrinter->subPrinter.current_text_offset++;
+                                break;
+                        }
+                        break;
+                    case 0xF8+3: // _08005B48
+                        textPrinter->state = 2;
+                        TextPrinterInitDownArrowCounters(textPrinter);
+                        return 3;
+                    case 0xF8+2: // _08005B4C
+                        textPrinter->state = 3;
+                        TextPrinterInitDownArrowCounters(textPrinter);
+                        return 3;
+                    case 0xF8+1: // _08005B5A
+                        dummyTwo = *textPrinter->subPrinter.current_text_offset;
+                        dummy = 0x100;
+                        temp = dummy | dummyTwo;
+                        textPrinter->subPrinter.current_text_offset++;
+                        break;
+                    case 0xF8+0: // _08005B6C
+                        temp = *textPrinter->subPrinter.current_text_offset;
+                        textPrinter->subPrinter.current_text_offset++;
+                        gUnknown_03002F90[0x80] = DrawKeypadIcon(textPrinter->subPrinter.windowId, temp, textPrinter->subPrinter.currentX, textPrinter->subPrinter.currentY);
+                        textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80] +  textPrinter->subPrinter.letterSpacing;
+                        return 0;
+                    case 0xF8+7: // _08005D6C
+                        return 1;
+                }
+                
+            }
+            switch (r4->font_type) // _08005B90
+            {
+                case 0: // _08005BCC
+                    jpnvar =  textPrinter->japanese;
+                    DecompressGlyphFont0(temp, jpnvar);
+                    break;
+                case 1: // _08005BDA
+                    jpnvar =  textPrinter->japanese;
+                    DecompressGlyphFont1(temp, jpnvar);
+                    break;
+                case 2:
+                case 3:
+                case 4:
+                case 5: // _08005BE8
+                    jpnvar =  textPrinter->japanese;
+                    DecompressGlyphFont2(temp, jpnvar);
+                    break;
+                case 7: // _08005BF6
+                    jpnvar =  textPrinter->japanese;
+                    DecompressGlyphFont7(temp, jpnvar);
+                    break;
+                case 8: // _08005C04
+                    jpnvar =  textPrinter->japanese;
+                    DecompressGlyphFont8(temp, jpnvar);
+                    break;
+                case 6: // _08005C10
+                    break;
+            }
+            CopyGlyphToWindow(textPrinter); // _08005C10
+            if (textPrinter->minLetterSpacing) 
+            {
+                textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80];
+                r4two = textPrinter->minLetterSpacing - gUnknown_03002F90[0x80];
+                if (r4two > 0)
+                {
+                    ClearTextSpan(textPrinter, r4two);
+                    textPrinter->subPrinter.currentX += r4two;
+                }
+            }
+            else // _08005C48
+            {
+                if (textPrinter->japanese)
+                    textPrinter->subPrinter.currentX += (gUnknown_03002F90[0x80] + textPrinter->subPrinter.letterSpacing);
+                else
+                    textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80];
+            }
+            return 0;
+        case 1: // _08005C78
+            if (TextPrinterWait(textPrinter))
+                textPrinter->state = 0;
+            return 3;
+        case 2: // _08005C8C
+            if (TextPrinterWaitWithDownArrow(textPrinter))
+            {
+                FillWindowPixelBuffer(textPrinter->subPrinter.windowId, (textPrinter->subPrinter.bgColor << 4) | textPrinter->subPrinter.bgColor);
+                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
+                textPrinter->subPrinter.currentY = textPrinter->subPrinter.y;
+                textPrinter->state = 0;
+            }
+            return 3;
+        case 3: // _08005CB8
+            if (TextPrinterWaitWithDownArrow(textPrinter))
+            {
+                TextPrinterClearDownArrow(textPrinter);
+                textPrinter->scrollDistance = gFonts[textPrinter->subPrinter.fontId].maxLetterHeight + textPrinter->subPrinter.lineSpacing;
+                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
+                textPrinter->state = 4;
+            }
+            return 3;
+        case 4: // _08005CF0
+            if (textPrinter->scrollDistance)
+            {
+                int scrollSpeed = sub_8197964();
+                int r4two = gWindowVerticalScrollSpeeds[scrollSpeed];
+                if (textPrinter->scrollDistance < r4two)
+                {
+                    ScrollWindow(textPrinter->subPrinter.windowId, 0, textPrinter->scrollDistance, textPrinter->subPrinter.bgColor << 4 | textPrinter->subPrinter.bgColor);
+                    textPrinter->scrollDistance = 0;
+                }
+                else
+                {
+                    ScrollWindow(textPrinter->subPrinter.windowId, 0, (int)r4two, textPrinter->subPrinter.bgColor << 4 | textPrinter->subPrinter.bgColor);
+                    textPrinter->scrollDistance -= r4two;
+                }
+                CopyWindowToVram(textPrinter->subPrinter.windowId, 2);
+            }
+            else
+                textPrinter->state = 0;
+            return 3;
+        case 5: // _08005D48
+            if (!IsSEPlaying())
+                textPrinter->state = 0;
+            return 3;
+        case 6: // _08005D5A
+            if (textPrinter->delayCounter != 0)
+                textPrinter->delayCounter--;
+            else
+                textPrinter->state = 0;
+            return 3;
+    }
+    return 1;
+}
+#else
 __attribute__((naked))
-u16 RenderText(struct TextPrinter *textPrinter) // 80057B4
+u16 RenderText(struct TextPrinter *textPrinter)
 {
     asm("push {r4-r6,lr}\n\
-	add r6, r0, #0\n\
-	add r4, r6, #0\n\
-	add r4, #0x14\n\
-	ldrb r0, [r6, #0x1C]\n\
-	cmp r0, #0x6\n\
-	bls _080057C4\n\
-	b _08005D6C\n\
+    add r6, r0, #0\n\
+    add r4, r6, #0\n\
+    add r4, #0x14\n\
+    ldrb r0, [r6, #0x1C]\n\
+    cmp r0, #0x6\n\
+    bls _080057C4\n\
+    b _08005D6C\n\
 _080057C4:\n\
-	lsl r0, #2\n\
-	ldr r1, =_080057D4\n\
-	add r0, r1\n\
-	ldr r0, [r0]\n\
-	mov pc, r0\n\
-	.pool\n\
-	.align 2, 0\n\
+    lsl r0, #2\n\
+    ldr r1, =_080057D4\n\
+    add r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .pool\n\
+    .align 2, 0\n\
 _080057D4:\n\
-	.4byte _080057F0\n\
-	.4byte _08005C78\n\
-	.4byte _08005C8C\n\
-	.4byte _08005CB8\n\
-	.4byte _08005CF0\n\
-	.4byte _08005D48\n\
-	.4byte _08005D5A\n\
+    .4byte _080057F0\n\
+    .4byte _08005C78\n\
+    .4byte _08005C8C\n\
+    .4byte _08005CB8\n\
+    .4byte _08005CF0\n\
+    .4byte _08005D48\n\
+    .4byte _08005D5A\n\
 _080057F0:\n\
-	ldr r2, =gMain\n\
-	ldrh r1, [r2, #0x2C]\n\
-	mov r0, #0x3\n\
-	and r0, r1\n\
-	cmp r0, #0\n\
-	beq _0800580A\n\
-	ldrb r1, [r4]\n\
-	mov r0, #0x10\n\
-	and r0, r1\n\
-	cmp r0, #0\n\
-	beq _0800580A\n\
-	mov r0, #0\n\
-	strb r0, [r6, #0x1E]\n\
+    ldr r2, =gMain\n\
+    ldrh r1, [r2, #0x2C]\n\
+    mov r0, #0x3\n\
+    and r0, r1\n\
+    cmp r0, #0\n\
+    beq _0800580A\n\
+    ldrb r1, [r4]\n\
+    mov r0, #0x10\n\
+    and r0, r1\n\
+    cmp r0, #0\n\
+    beq _0800580A\n\
+    mov r0, #0\n\
+    strb r0, [r6, #0x1E]\n\
 _0800580A:\n\
-	ldrb r1, [r6, #0x1E]\n\
-	cmp r1, #0\n\
-	beq _0800584C\n\
-	ldrb r0, [r6, #0x1D]\n\
-	cmp r0, #0\n\
-	beq _0800584C\n\
-	sub r0, r1, #0x1\n\
-	strb r0, [r6, #0x1E]\n\
-	ldr r0, =gTextFlags\n\
-	ldrb r1, [r0]\n\
-	mov r0, #0x1\n\
-	and r0, r1\n\
-	cmp r0, #0\n\
-	bne _08005828\n\
-	b _08005B56\n\
+    ldrb r1, [r6, #0x1E]\n\
+    cmp r1, #0\n\
+    beq _0800584C\n\
+    ldrb r0, [r6, #0x1D]\n\
+    cmp r0, #0\n\
+    beq _0800584C\n\
+    sub r0, r1, #0x1\n\
+    strb r0, [r6, #0x1E]\n\
+    ldr r0, =gTextFlags\n\
+    ldrb r1, [r0]\n\
+    mov r0, #0x1\n\
+    and r0, r1\n\
+    cmp r0, #0\n\
+    bne _08005828\n\
+    b _08005B56\n\
 _08005828:\n\
-	ldrh r1, [r2, #0x2E]\n\
-	mov r0, #0x3\n\
-	and r0, r1\n\
-	cmp r0, #0\n\
-	bne _08005834\n\
-	b _08005B56\n\
+    ldrh r1, [r2, #0x2E]\n\
+    mov r0, #0x3\n\
+    and r0, r1\n\
+    cmp r0, #0\n\
+    bne _08005834\n\
+    b _08005B56\n\
 _08005834:\n\
-	ldrb r0, [r4]\n\
-	mov r1, #0x10\n\
-	orr r0, r1\n\
-	strb r0, [r4]\n\
-	mov r0, #0\n\
-	strb r0, [r6, #0x1E]\n\
-	b _08005B56\n\
-	.pool\n\
+    ldrb r0, [r4]\n\
+    mov r1, #0x10\n\
+    orr r0, r1\n\
+    strb r0, [r4]\n\
+    mov r0, #0\n\
+    strb r0, [r6, #0x1E]\n\
+    b _08005B56\n\
+    .pool\n\
 _0800584C:\n\
-	ldr r0, =gBattleTypeFlags\n\
-	ldr r0, [r0]\n\
-	mov r1, #0x80\n\
-	lsl r1, #17\n\
-	and r0, r1\n\
-	cmp r0, #0\n\
-	bne _08005874\n\
-	ldr r0, =gTextFlags\n\
-	ldrb r1, [r0]\n\
-	mov r0, #0x4\n\
-	and r0, r1\n\
-	cmp r0, #0\n\
-	beq _08005874\n\
-	mov r0, #0x3\n\
-	b _08005876\n\
-	.pool\n\
+    ldr r0, =gBattleTypeFlags\n\
+    ldr r0, [r0]\n\
+    mov r1, #0x80\n\
+    lsl r1, #17\n\
+    and r0, r1\n\
+    cmp r0, #0\n\
+    bne _08005874\n\
+    ldr r0, =gTextFlags\n\
+    ldrb r1, [r0]\n\
+    mov r0, #0x4\n\
+    and r0, r1\n\
+    cmp r0, #0\n\
+    beq _08005874\n\
+    mov r0, #0x3\n\
+    b _08005876\n\
+    .pool\n\
 _08005874:\n\
-	ldrb r0, [r6, #0x1D]\n\
+    ldrb r0, [r6, #0x1D]\n\
 _08005876:\n\
-	strb r0, [r6, #0x1E]\n\
-	ldr r0, [r6]\n\
-	ldrb r3, [r0]\n\
-	add r0, #0x1\n\
-	str r0, [r6]\n\
-	add r0, r3, #0\n\
-	sub r0, #0xF8\n\
-	cmp r0, #0x7\n\
-	bls _0800588A\n\
-	b _08005B90\n\
+    strb r0, [r6, #0x1E]\n\
+    ldr r0, [r6]\n\
+    ldrb r3, [r0]\n\
+    add r0, #0x1\n\
+    str r0, [r6]\n\
+    add r0, r3, #0\n\
+    sub r0, #0xF8\n\
+    cmp r0, #0x7\n\
+    bls _0800588A\n\
+    b _08005B90\n\
 _0800588A:\n\
-	lsl r0, #2\n\
-	ldr r1, =_08005898\n\
-	add r0, r1\n\
-	ldr r0, [r0]\n\
-	mov pc, r0\n\
-	.pool\n\
-	.align 2, 0\n\
+    lsl r0, #2\n\
+    ldr r1, =_08005898\n\
+    add r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .pool\n\
+    .align 2, 0\n\
 _08005898:\n\
-	.4byte _08005B6C\n\
-	.4byte _08005B5A\n\
-	.4byte _08005B4C\n\
-	.4byte _08005B48\n\
-	.4byte _080058E0\n\
-	.4byte _080058DC\n\
-	.4byte _080058B8\n\
-	.4byte _08005D6C\n\
+    .4byte _08005B6C\n\
+    .4byte _08005B5A\n\
+    .4byte _08005B4C\n\
+    .4byte _08005B48\n\
+    .4byte _080058E0\n\
+    .4byte _080058DC\n\
+    .4byte _080058B8\n\
+    .4byte _08005D6C\n\
 _080058B8:\n\
-	ldrb r0, [r6, #0x6]\n\
-	strb r0, [r6, #0x8]\n\
-	ldrb r1, [r6, #0x5]\n\
-	ldr r0, =gFonts\n\
-	ldr r2, [r0]\n\
-	lsl r0, r1, #1\n\
-	add r0, r1\n\
-	lsl r0, #2\n\
-	add r0, r2\n\
-	ldrb r1, [r6, #0xB]\n\
-	ldrb r0, [r0, #0x5]\n\
-	add r1, r0\n\
-	ldrb r0, [r6, #0x9]\n\
-	add r0, r1\n\
-	b _08005ABA\n\
-	.pool\n\
+    ldrb r0, [r6, #0x6]\n\
+    strb r0, [r6, #0x8]\n\
+    ldrb r1, [r6, #0x5]\n\
+    ldr r0, =gFonts\n\
+    ldr r2, [r0]\n\
+    lsl r0, r1, #1\n\
+    add r0, r1\n\
+    lsl r0, #2\n\
+    add r0, r2\n\
+    ldrb r1, [r6, #0xB]\n\
+    ldrb r0, [r0, #0x5]\n\
+    add r1, r0\n\
+    ldrb r0, [r6, #0x9]\n\
+    add r0, r1\n\
+    b _08005ABA\n\
+    .pool\n\
 _080058DC:\n\
-	ldr r0, [r6]\n\
-	b _08005B30\n\
+    ldr r0, [r6]\n\
+    b _08005B30\n\
 _080058E0:\n\
-	ldr r0, [r6]\n\
-	ldrb r3, [r0]\n\
-	add r0, #0x1\n\
-	str r0, [r6]\n\
-	sub r0, r3, #0x1\n\
-	cmp r0, #0x17\n\
-	bls _080058F0\n\
-	b _08005B90\n\
+    ldr r0, [r6]\n\
+    ldrb r3, [r0]\n\
+    add r0, #0x1\n\
+    str r0, [r6]\n\
+    sub r0, r3, #0x1\n\
+    cmp r0, #0x17\n\
+    bls _080058F0\n\
+    b _08005B90\n\
 _080058F0:\n\
-	lsl r0, #2\n\
-	ldr r1, =_08005900\n\
-	add r0, r1\n\
-	ldr r0, [r0]\n\
-	mov pc, r0\n\
-	.pool\n\
-	.align 2, 0\n\
+    lsl r0, #2\n\
+    ldr r1, =_08005900\n\
+    add r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .pool\n\
+    .align 2, 0\n\
 _08005900:\n\
-	.4byte _08005960\n\
-	.4byte _08005982\n\
-	.4byte _080059A6\n\
-	.4byte _080059C0\n\
-	.4byte _08005A0E\n\
-	.4byte _08005A12\n\
-	.4byte _08005A0A\n\
-	.4byte _08005A2A\n\
-	.4byte _08005A3A\n\
-	.4byte _08005A58\n\
-	.4byte _08005A5C\n\
-	.4byte _08005B5A\n\
-	.4byte _08005A90\n\
-	.4byte _08005A98\n\
-	.4byte _08005AA4\n\
-	.4byte _08005A76\n\
-	.4byte _08005AD8\n\
-	.4byte _08005AF2\n\
-	.4byte _08005B02\n\
-	.4byte _08005B26\n\
-	.4byte _08005B36\n\
-	.4byte _08005B3E\n\
-	.4byte _08005ABE\n\
-	.4byte _08005ACC\n\
+    .4byte _08005960 @0\n\
+    .4byte _08005982 @1\n\
+    .4byte _080059A6 @2\n\
+    .4byte _080059C0 @3\n\
+    .4byte _08005A0E @4\n\
+    .4byte _08005A12 @5\n\
+    .4byte _08005A0A @6\n\
+    .4byte _08005A2A @7\n\
+    .4byte _08005A3A @8\n\
+    .4byte _08005A58 @9\n\
+    .4byte _08005A5C @10\n\
+    .4byte _08005B5A @11\n\
+    .4byte _08005A90 @12\n\
+    .4byte _08005A98 @13\n\
+    .4byte _08005AA4 @14\n\
+    .4byte _08005A76 @15\n\
+    .4byte _08005AD8 @16\n\
+    .4byte _08005AF2 @17\n\
+    .4byte _08005B02 @18\n\
+    .4byte _08005B26 @19\n\
+    .4byte _08005B36 @20\n\
+    .4byte _08005B3E @21\n\
+    .4byte _08005ABE @22\n\
+    .4byte _08005ACC @23\n\
 _08005960:\n\
-	ldr r2, [r6]\n\
-	ldrb r1, [r2]\n\
-	lsl r1, #4\n\
-	ldrb r3, [r6, #0xC]\n\
-	mov r0, #0xF\n\
-	and r0, r3\n\
-	orr r0, r1\n\
-	strb r0, [r6, #0xC]\n\
-	add r2, #0x1\n\
-	str r2, [r6]\n\
-	lsl r0, #24\n\
-	lsr r0, #28\n\
-	ldrb r2, [r6, #0xD]\n\
-	lsl r1, r2, #28\n\
-	lsr r1, #28\n\
-	lsr r2, #4\n\
-	b _08005A06\n\
+    ldr r2, [r6]\n\
+    ldrb r1, [r2]\n\
+    lsl r1, #4\n\
+    ldrb r3, [r6, #0xC]\n\
+    mov r0, #0xF\n\
+    and r0, r3\n\
+    orr r0, r1\n\
+    strb r0, [r6, #0xC]\n\
+    add r2, #0x1\n\
+    str r2, [r6]\n\
+    lsl r0, #24\n\
+    lsr r0, #28\n\
+    ldrb r2, [r6, #0xD]\n\
+    lsl r1, r2, #28\n\
+    lsr r1, #28\n\
+    lsr r2, #4\n\
+    b _08005A06\n\
 _08005982:\n\
-	ldr r1, [r6]\n\
-	ldrb r2, [r1]\n\
-	mov r0, #0xF\n\
-	and r0, r2\n\
-	ldrb r3, [r6, #0xD]\n\
-	mov r2, #0x10\n\
-	neg r2, r2\n\
-	and r2, r3\n\
-	orr r2, r0\n\
-	strb r2, [r6, #0xD]\n\
-	add r1, #0x1\n\
-	str r1, [r6]\n\
-	ldrb r0, [r6, #0xC]\n\
-	lsr r0, #4\n\
-	lsl r1, r2, #28\n\
-	lsr r1, #28\n\
-	lsr r2, #4\n\
-	b _08005A06\n\
+    ldr r1, [r6]\n\
+    ldrb r2, [r1]\n\
+    mov r0, #0xF\n\
+    and r0, r2\n\
+    ldrb r3, [r6, #0xD]\n\
+    mov r2, #0x10\n\
+    neg r2, r2\n\
+    and r2, r3\n\
+    orr r2, r0\n\
+    strb r2, [r6, #0xD]\n\
+    add r1, #0x1\n\
+    str r1, [r6]\n\
+    ldrb r0, [r6, #0xC]\n\
+    lsr r0, #4\n\
+    lsl r1, r2, #28\n\
+    lsr r1, #28\n\
+    lsr r2, #4\n\
+    b _08005A06\n\
 _080059A6:\n\
-	ldr r1, [r6]\n\
-	ldrb r0, [r1]\n\
-	lsl r0, #4\n\
-	ldrb r3, [r6, #0xD]\n\
-	mov r2, #0xF\n\
-	and r2, r3\n\
-	orr r2, r0\n\
-	strb r2, [r6, #0xD]\n\
-	add r1, #0x1\n\
-	str r1, [r6]\n\
-	ldrb r0, [r6, #0xC]\n\
-	lsr r0, #4\n\
-	b _080059FE\n\
+    ldr r1, [r6]\n\
+    ldrb r0, [r1]\n\
+    lsl r0, #4\n\
+    ldrb r3, [r6, #0xD]\n\
+    mov r2, #0xF\n\
+    and r2, r3\n\
+    orr r2, r0\n\
+    strb r2, [r6, #0xD]\n\
+    add r1, #0x1\n\
+    str r1, [r6]\n\
+    ldrb r0, [r6, #0xC]\n\
+    lsr r0, #4\n\
+    b _080059FE\n\
 _080059C0:\n\
-	ldr r3, [r6]\n\
-	ldrb r1, [r3]\n\
-	lsl r1, #4\n\
-	ldrb r4, [r6, #0xC]\n\
-	mov r2, #0xF\n\
-	add r0, r2, #0\n\
-	and r0, r4\n\
-	orr r0, r1\n\
-	strb r0, [r6, #0xC]\n\
-	add r5, r3, #0x1\n\
-	str r5, [r6]\n\
-	ldrb r3, [r3, #0x1]\n\
-	add r1, r2, #0\n\
-	and r1, r3\n\
-	ldrb r4, [r6, #0xD]\n\
-	mov r3, #0x10\n\
-	neg r3, r3\n\
-	and r3, r4\n\
-	orr r3, r1\n\
-	strb r3, [r6, #0xD]\n\
-	add r4, r5, #0x1\n\
-	str r4, [r6]\n\
-	ldrb r1, [r5, #0x1]\n\
-	lsl r1, #4\n\
-	and r2, r3\n\
-	orr r2, r1\n\
-	strb r2, [r6, #0xD]\n\
-	add r4, #0x1\n\
-	str r4, [r6]\n\
-	lsl r0, #24\n\
-	lsr r0, #28\n\
+    ldr r3, [r6]\n\
+    ldrb r1, [r3]\n\
+    lsl r1, #4\n\
+    ldrb r4, [r6, #0xC]\n\
+    mov r2, #0xF\n\
+    add r0, r2, #0\n\
+    and r0, r4\n\
+    orr r0, r1\n\
+    strb r0, [r6, #0xC]\n\
+    add r5, r3, #0x1\n\
+    str r5, [r6]\n\
+    ldrb r3, [r3, #0x1]\n\
+    add r1, r2, #0\n\
+    and r1, r3\n\
+    ldrb r4, [r6, #0xD]\n\
+    mov r3, #0x10\n\
+    neg r3, r3\n\
+    and r3, r4\n\
+    orr r3, r1\n\
+    strb r3, [r6, #0xD]\n\
+    add r4, r5, #0x1\n\
+    str r4, [r6]\n\
+    ldrb r1, [r5, #0x1]\n\
+    lsl r1, #4\n\
+    and r2, r3\n\
+    orr r2, r1\n\
+    strb r2, [r6, #0xD]\n\
+    add r4, #0x1\n\
+    str r4, [r6]\n\
+    lsl r0, #24\n\
+    lsr r0, #28\n\
 _080059FE:\n\
-	lsl r1, r2, #28\n\
-	lsr r1, #28\n\
-	lsl r2, #24\n\
-	lsr r2, #28\n\
+    lsl r1, r2, #28\n\
+    lsr r1, #28\n\
+    lsl r2, #24\n\
+    lsr r2, #28\n\
 _08005A06:\n\
-	bl GenerateFontHalfRowLookupTable\n\
+    bl GenerateFontHalfRowLookupTable\n\
 _08005A0A:\n\
-	mov r0, #0x2\n\
-	b _08005D6E\n\
+    mov r0, #0x2\n\
+    b _08005D6E\n\
 _08005A0E:\n\
-	ldr r0, [r6]\n\
-	b _08005B30\n\
+    ldr r0, [r6]\n\
+    b _08005B30\n\
 _08005A12:\n\
-	ldr r0, [r6]\n\
-	ldrb r0, [r0]\n\
-	mov r1, #0xF\n\
-	and r1, r0\n\
-	ldrb r2, [r4]\n\
-	mov r0, #0x10\n\
-	neg r0, r0\n\
-	and r0, r2\n\
-	orr r0, r1\n\
-	strb r0, [r4]\n\
-	ldr r0, [r6]\n\
-	b _08005B30\n\
+    ldr r0, [r6]\n\
+    ldrb r0, [r0]\n\
+    mov r1, #0xF\n\
+    and r1, r0\n\
+    ldrb r2, [r4]\n\
+    mov r0, #0x10\n\
+    neg r0, r0\n\
+    and r0, r2\n\
+    orr r0, r1\n\
+    strb r0, [r4]\n\
+    ldr r0, [r6]\n\
+    b _08005B30\n\
 _08005A2A:\n\
-	ldr r0, [r6]\n\
-	ldrb r1, [r0]\n\
-	strb r1, [r6, #0x1E]\n\
-	add r0, #0x1\n\
-	str r0, [r6]\n\
-	mov r0, #0x6\n\
-	strb r0, [r6, #0x1C]\n\
-	b _08005A0A\n\
+    ldr r0, [r6]\n\
+    ldrb r1, [r0]\n\
+    strb r1, [r6, #0x1E]\n\
+    add r0, #0x1\n\
+    str r0, [r6]\n\
+    mov r0, #0x6\n\
+    strb r0, [r6, #0x1C]\n\
+    b _08005A0A\n\
 _08005A3A:\n\
-	mov r0, #0x1\n\
-	strb r0, [r6, #0x1C]\n\
-	ldr r0, =gTextFlags\n\
-	ldrb r1, [r0]\n\
-	mov r0, #0x4\n\
-	and r0, r1\n\
-	cmp r0, #0\n\
-	bne _08005A4C\n\
-	b _08005B56\n\
+    mov r0, #0x1\n\
+    strb r0, [r6, #0x1C]\n\
+    ldr r0, =gTextFlags\n\
+    ldrb r1, [r0]\n\
+    mov r0, #0x4\n\
+    and r0, r1\n\
+    cmp r0, #0\n\
+    bne _08005A4C\n\
+    b _08005B56\n\
 _08005A4C:\n\
-	mov r0, #0\n\
-	strb r0, [r4, #0x2]\n\
-	b _08005B56\n\
-	.pool\n\
+    mov r0, #0\n\
+    strb r0, [r4, #0x2]\n\
+    b _08005B56\n\
+    .pool\n\
 _08005A58:\n\
-	mov r0, #0x5\n\
-	b _08005D56\n\
+    mov r0, #0x5\n\
+    b _08005D56\n\
 _08005A5C:\n\
-	ldr r0, [r6]\n\
-	ldrb r3, [r0]\n\
-	add r1, r0, #0x1\n\
-	str r1, [r6]\n\
-	ldrb r0, [r0, #0x1]\n\
-	lsl r0, #8\n\
-	orr r3, r0\n\
-	add r1, #0x1\n\
-	str r1, [r6]\n\
-	add r0, r3, #0\n\
-	bl PlayBGM\n\
-	b _08005A0A\n\
+    ldr r0, [r6]\n\
+    ldrb r3, [r0]\n\
+    add r1, r0, #0x1\n\
+    str r1, [r6]\n\
+    ldrb r0, [r0, #0x1]\n\
+    lsl r0, #8\n\
+    orr r3, r0\n\
+    add r1, #0x1\n\
+    str r1, [r6]\n\
+    add r0, r3, #0\n\
+    bl PlayBGM\n\
+    b _08005A0A\n\
 _08005A76:\n\
-	ldr r0, [r6]\n\
-	ldrb r3, [r0]\n\
-	add r1, r0, #0x1\n\
-	str r1, [r6]\n\
-	ldrb r0, [r0, #0x1]\n\
-	lsl r0, #8\n\
-	orr r3, r0\n\
-	add r1, #0x1\n\
-	str r1, [r6]\n\
-	add r0, r3, #0\n\
-	bl PlaySE\n\
-	b _08005A0A\n\
+    ldr r0, [r6]\n\
+    ldrb r3, [r0]\n\
+    add r1, r0, #0x1\n\
+    str r1, [r6]\n\
+    ldrb r0, [r0, #0x1]\n\
+    lsl r0, #8\n\
+    orr r3, r0\n\
+    add r1, #0x1\n\
+    str r1, [r6]\n\
+    add r0, r3, #0\n\
+    bl PlaySE\n\
+    b _08005A0A\n\
 _08005A90:\n\
-	ldr r1, [r6]\n\
-	ldrb r0, [r1]\n\
-	ldrb r3, [r6, #0x6]\n\
-	b _08005AF8\n\
+    ldr r1, [r6]\n\
+    ldrb r0, [r1]\n\
+    ldrb r3, [r6, #0x6]\n\
+    b _08005AF8\n\
 _08005A98:\n\
-	ldr r1, [r6]\n\
-	ldrb r0, [r1]\n\
-	ldrb r2, [r6, #0x7]\n\
-	add r0, r2\n\
-	strb r0, [r6, #0x9]\n\
-	b _08005AFC\n\
+    ldr r1, [r6]\n\
+    ldrb r0, [r1]\n\
+    ldrb r2, [r6, #0x7]\n\
+    add r0, r2\n\
+    strb r0, [r6, #0x9]\n\
+    b _08005AFC\n\
 _08005AA4:\n\
-	ldrb r0, [r6, #0x4]\n\
-	ldrb r2, [r6, #0xD]\n\
-	lsl r2, #28\n\
-	lsr r1, r2, #4\n\
-	orr r1, r2\n\
-	lsr r1, #24\n\
-	bl FillWindowPixelBuffer\n\
-	ldrb r0, [r6, #0x6]\n\
-	strb r0, [r6, #0x8]\n\
-	ldrb r0, [r6, #0x7]\n\
+    ldrb r0, [r6, #0x4]\n\
+    ldrb r2, [r6, #0xD]\n\
+    lsl r2, #28\n\
+    lsr r1, r2, #4\n\
+    orr r1, r2\n\
+    lsr r1, #24\n\
+    bl FillWindowPixelBuffer\n\
+    ldrb r0, [r6, #0x6]\n\
+    strb r0, [r6, #0x8]\n\
+    ldrb r0, [r6, #0x7]\n\
 _08005ABA:\n\
-	strb r0, [r6, #0x9]\n\
-	b _08005A0A\n\
+    strb r0, [r6, #0x9]\n\
+    b _08005A0A\n\
 _08005ABE:\n\
-	ldr r0, =gMPlayInfo_BGM\n\
-	bl m4aMPlayStop\n\
-	b _08005A0A\n\
-	.pool\n\
+    ldr r0, =gMPlayInfo_BGM\n\
+    bl m4aMPlayStop\n\
+    b _08005A0A\n\
+    .pool\n\
 _08005ACC:\n\
-	ldr r0, =gMPlayInfo_BGM\n\
-	bl m4aMPlayContinue\n\
-	b _08005A0A\n\
-	.pool\n\
+    ldr r0, =gMPlayInfo_BGM\n\
+    bl m4aMPlayContinue\n\
+    b _08005A0A\n\
+    .pool\n\
 _08005AD8:\n\
-	ldr r0, [r6]\n\
-	ldrb r4, [r0]\n\
-	add r0, #0x1\n\
-	str r0, [r6]\n\
-	cmp r4, #0\n\
-	ble _08005A0A\n\
-	add r0, r6, #0\n\
-	add r1, r4, #0\n\
-	bl ClearTextSpan\n\
-	ldrb r0, [r6, #0x8]\n\
-	add r0, r4\n\
-	b _08005C6E\n\
+    ldr r0, [r6]\n\
+    ldrb r4, [r0]\n\
+    add r0, #0x1\n\
+    str r0, [r6]\n\
+    cmp r4, #0\n\
+    ble _08005A0A\n\
+    add r0, r6, #0\n\
+    add r1, r4, #0\n\
+    bl ClearTextSpan\n\
+    ldrb r0, [r6, #0x8]\n\
+    add r0, r4\n\
+    b _08005C6E\n\
 _08005AF2:\n\
-	ldr r1, [r6]\n\
-	ldrb r0, [r6, #0x6]\n\
-	ldrb r3, [r1]\n\
+    ldr r1, [r6]\n\
+    ldrb r0, [r6, #0x6]\n\
+    ldrb r3, [r1]\n\
 _08005AF8:\n\
-	add r0, r3\n\
-	strb r0, [r6, #0x8]\n\
+    add r0, r3\n\
+    strb r0, [r6, #0x8]\n\
 _08005AFC:\n\
-	add r1, #0x1\n\
-	str r1, [r6]\n\
-	b _08005A0A\n\
+    add r1, #0x1\n\
+    str r1, [r6]\n\
+    b _08005A0A\n\
 _08005B02:\n\
-	ldr r0, [r6]\n\
-	ldrb r2, [r0]\n\
-	ldrb r1, [r6, #0x6]\n\
-	add r2, r1\n\
-	add r0, #0x1\n\
-	str r0, [r6]\n\
-	ldrb r0, [r6, #0x8]\n\
-	sub r4, r2, r0\n\
-	cmp r4, #0\n\
-	bgt _08005B18\n\
-	b _08005A0A\n\
+    ldr r0, [r6]\n\
+    ldrb r2, [r0]\n\
+    ldrb r1, [r6, #0x6]\n\
+    add r2, r1\n\
+    add r0, #0x1\n\
+    str r0, [r6]\n\
+    ldrb r0, [r6, #0x8]\n\
+    sub r4, r2, r0\n\
+    cmp r4, #0\n\
+    bgt _08005B18\n\
+    b _08005A0A\n\
 _08005B18:\n\
-	add r0, r6, #0\n\
-	add r1, r4, #0\n\
-	bl ClearTextSpan\n\
-	ldrb r0, [r6, #0x8]\n\
-	add r0, r4\n\
-	b _08005C6E\n\
+    add r0, r6, #0\n\
+    add r1, r4, #0\n\
+    bl ClearTextSpan\n\
+    ldrb r0, [r6, #0x8]\n\
+    add r0, r4\n\
+    b _08005C6E\n\
 _08005B26:\n\
-	ldr r0, [r6]\n\
-	ldrb r2, [r0]\n\
-	add r1, r6, #0\n\
-	add r1, #0x20\n\
-	strb r2, [r1]\n\
+    ldr r0, [r6]\n\
+    ldrb r2, [r0]\n\
+    add r1, r6, #0\n\
+    add r1, #0x20\n\
+    strb r2, [r1]\n\
 _08005B30:\n\
-	add r0, #0x1\n\
-	str r0, [r6]\n\
-	b _08005A0A\n\
+    add r0, #0x1\n\
+    str r0, [r6]\n\
+    b _08005A0A\n\
 _08005B36:\n\
-	add r1, r6, #0\n\
-	add r1, #0x21\n\
-	mov r0, #0x1\n\
-	b _08005B44\n\
+    add r1, r6, #0\n\
+    add r1, #0x21\n\
+    mov r0, #0x1\n\
+    b _08005B44\n\
 _08005B3E:\n\
-	add r1, r6, #0\n\
-	add r1, #0x21\n\
-	mov r0, #0\n\
+    add r1, r6, #0\n\
+    add r1, #0x21\n\
+    mov r0, #0\n\
 _08005B44:\n\
-	strb r0, [r1]\n\
-	b _08005A0A\n\
+    strb r0, [r1]\n\
+    b _08005A0A\n\
 _08005B48:\n\
-	mov r0, #0x2\n\
-	b _08005B4E\n\
+    mov r0, #0x2\n\
+    b _08005B4E\n\
 _08005B4C:\n\
-	mov r0, #0x3\n\
+    mov r0, #0x3\n\
 _08005B4E:\n\
-	strb r0, [r6, #0x1C]\n\
-	add r0, r6, #0\n\
-	bl TextPrinterInitDownArrowCounters\n\
+    strb r0, [r6, #0x1C]\n\
+    add r0, r6, #0\n\
+    bl TextPrinterInitDownArrowCounters\n\
 _08005B56:\n\
-	mov r0, #0x3\n\
-	b _08005D6E\n\
+    mov r0, #0x3\n\
+    b _08005D6E\n\
 _08005B5A:\n\
-	ldr r0, [r6]\n\
-	ldrb r3, [r0]\n\
-	mov r2, #0x80\n\
-	lsl r2, #1\n\
-	add r1, r2, #0\n\
-	orr r3, r1\n\
-	add r0, #0x1\n\
-	str r0, [r6]\n\
-	b _08005B90\n\
+    ldr r0, [r6]\n\
+    ldrb r3, [r0]\n\
+    mov r2, #0x80\n\
+    lsl r2, #1\n\
+    add r1, r2, #0\n\
+    orr r3, r1\n\
+    add r0, #0x1\n\
+    str r0, [r6]\n\
+    b _08005B90\n\
 _08005B6C:\n\
-	ldr r0, [r6]\n\
-	ldrb r3, [r0]\n\
-	add r0, #0x1\n\
-	str r0, [r6]\n\
-	ldrb r0, [r6, #0x4]\n\
-	add r1, r3, #0\n\
-	ldrb r2, [r6, #0x8]\n\
-	ldrb r3, [r6, #0x9]\n\
-	bl DrawKeypadIcon\n\
-	ldr r1, =gUnknown_03002F90\n\
-	add r1, #0x80\n\
-	strb r0, [r1]\n\
-	ldrb r3, [r6, #0xA]\n\
-	add r0, r3\n\
-	b _08005C6A\n\
-	.pool\n\
+    ldr r0, [r6]\n\
+    ldrb r3, [r0]\n\
+    add r0, #0x1\n\
+    str r0, [r6]\n\
+    ldrb r0, [r6, #0x4]\n\
+    add r1, r3, #0\n\
+    ldrb r2, [r6, #0x8]\n\
+    ldrb r3, [r6, #0x9]\n\
+    bl DrawKeypadIcon\n\
+    ldr r1, =gUnknown_03002F90\n\
+    add r1, #0x80\n\
+    strb r0, [r1]\n\
+    ldrb r3, [r6, #0xA]\n\
+    add r0, r3\n\
+    b _08005C6A\n\
+    .pool\n\
 _08005B90:\n\
-	ldr r0, [r4]\n\
-	lsl r0, #28\n\
-	lsr r0, #28\n\
-	cmp r0, #0x8\n\
-	bhi _08005C10\n\
-	lsl r0, #2\n\
-	ldr r1, =_08005BA8\n\
-	add r0, r1\n\
-	ldr r0, [r0]\n\
-	mov pc, r0\n\
-	.pool\n\
-	.align 2, 0\n\
+    ldr r0, [r4]\n\
+    lsl r0, #28\n\
+    lsr r0, #28\n\
+    cmp r0, #0x8\n\
+    bhi _08005C10\n\
+    lsl r0, #2\n\
+    ldr r1, =_08005BA8\n\
+    add r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .pool\n\
+    .align 2, 0\n\
 _08005BA8:\n\
-	.4byte _08005BCC\n\
-	.4byte _08005BDA\n\
-	.4byte _08005BE8\n\
-	.4byte _08005BE8\n\
-	.4byte _08005BE8\n\
-	.4byte _08005BE8\n\
-	.4byte _08005C10\n\
-	.4byte _08005BF6\n\
-	.4byte _08005C04\n\
+    .4byte _08005BCC\n\
+    .4byte _08005BDA\n\
+    .4byte _08005BE8\n\
+    .4byte _08005BE8\n\
+    .4byte _08005BE8\n\
+    .4byte _08005BE8\n\
+    .4byte _08005C10\n\
+    .4byte _08005BF6\n\
+    .4byte _08005C04\n\
 _08005BCC:\n\
-	add r0, r6, #0\n\
-	add r0, #0x21\n\
-	ldrb r1, [r0]\n\
-	add r0, r3, #0\n\
-	bl DecompressGlyphFont0\n\
-	b _08005C10\n\
+    add r0, r6, #0\n\
+    add r0, #0x21\n\
+    ldrb r1, [r0]\n\
+    add r0, r3, #0\n\
+    bl DecompressGlyphFont0\n\
+    b _08005C10\n\
 _08005BDA:\n\
-	add r0, r6, #0\n\
-	add r0, #0x21\n\
-	ldrb r1, [r0]\n\
-	add r0, r3, #0\n\
-	bl DecompressGlyphFont1\n\
-	b _08005C10\n\
+    add r0, r6, #0\n\
+    add r0, #0x21\n\
+    ldrb r1, [r0]\n\
+    add r0, r3, #0\n\
+    bl DecompressGlyphFont1\n\
+    b _08005C10\n\
 _08005BE8:\n\
-	add r0, r6, #0\n\
-	add r0, #0x21\n\
-	ldrb r1, [r0]\n\
-	add r0, r3, #0\n\
-	bl DecompressGlyphFont2\n\
-	b _08005C10\n\
+    add r0, r6, #0\n\
+    add r0, #0x21\n\
+    ldrb r1, [r0]\n\
+    add r0, r3, #0\n\
+    bl DecompressGlyphFont2\n\
+    b _08005C10\n\
 _08005BF6:\n\
-	add r0, r6, #0\n\
-	add r0, #0x21\n\
-	ldrb r1, [r0]\n\
-	add r0, r3, #0\n\
-	bl DecompressGlyphFont7\n\
-	b _08005C10\n\
+    add r0, r6, #0\n\
+    add r0, #0x21\n\
+    ldrb r1, [r0]\n\
+    add r0, r3, #0\n\
+    bl DecompressGlyphFont7\n\
+    b _08005C10\n\
 _08005C04:\n\
-	add r0, r6, #0\n\
-	add r0, #0x21\n\
-	ldrb r1, [r0]\n\
-	add r0, r3, #0\n\
-	bl DecompressGlyphFont8\n\
+    add r0, r6, #0\n\
+    add r0, #0x21\n\
+    ldrb r1, [r0]\n\
+    add r0, r3, #0\n\
+    bl DecompressGlyphFont8\n\
 _08005C10:\n\
-	add r0, r6, #0\n\
-	bl CopyGlyphToWindow\n\
-	add r2, r6, #0\n\
-	add r2, #0x20\n\
-	ldrb r0, [r2]\n\
-	cmp r0, #0\n\
-	beq _08005C48\n\
-	ldr r1, =gUnknown_03002F90\n\
-	add r1, #0x80\n\
-	ldrb r0, [r1]\n\
-	ldrb r3, [r6, #0x8]\n\
-	add r0, r3\n\
-	strb r0, [r6, #0x8]\n\
-	ldrb r2, [r2]\n\
-	ldrb r0, [r1]\n\
-	sub r4, r2, r0\n\
-	cmp r4, #0\n\
-	ble _08005C70\n\
-	add r0, r6, #0\n\
-	add r1, r4, #0\n\
-	bl ClearTextSpan\n\
-	ldrb r0, [r6, #0x8]\n\
-	add r0, r4\n\
-	b _08005C6E\n\
-	.pool\n\
+    add r0, r6, #0\n\
+    bl CopyGlyphToWindow\n\
+    add r2, r6, #0\n\
+    add r2, #0x20\n\
+    ldrb r0, [r2]\n\
+    cmp r0, #0\n\
+    beq _08005C48\n\
+    ldr r1, =gUnknown_03002F90\n\
+    add r1, #0x80\n\
+    ldrb r0, [r1]\n\
+    ldrb r3, [r6, #0x8]\n\
+    add r0, r3\n\
+    strb r0, [r6, #0x8]\n\
+    ldrb r2, [r2]\n\
+    ldrb r0, [r1]\n\
+    sub r4, r2, r0\n\
+    cmp r4, #0\n\
+    ble _08005C70\n\
+    add r0, r6, #0\n\
+    add r1, r4, #0\n\
+    bl ClearTextSpan\n\
+    ldrb r0, [r6, #0x8]\n\
+    add r0, r4\n\
+    b _08005C6E\n\
+    .pool\n\
 _08005C48:\n\
-	add r0, r6, #0\n\
-	add r0, #0x21\n\
-	ldrb r0, [r0]\n\
-	cmp r0, #0\n\
-	beq _08005C64\n\
-	ldr r0, =gUnknown_03002F90\n\
-	add r0, #0x80\n\
-	ldrb r1, [r6, #0xA]\n\
-	ldrb r0, [r0]\n\
-	add r1, r0\n\
-	ldrb r0, [r6, #0x8]\n\
-	b _08005C6C\n\
-	.pool\n\
+    add r0, r6, #0\n\
+    add r0, #0x21\n\
+    ldrb r0, [r0]\n\
+    cmp r0, #0\n\
+    beq _08005C64\n\
+    ldr r0, =gUnknown_03002F90\n\
+    add r0, #0x80\n\
+    ldrb r1, [r6, #0xA]\n\
+    ldrb r0, [r0]\n\
+    add r1, r0\n\
+    ldrb r0, [r6, #0x8]\n\
+    b _08005C6C\n\
+    .pool\n\
 _08005C64:\n\
-	ldr r0, =gUnknown_03002F90\n\
-	add r0, #0x80\n\
-	ldrb r0, [r0]\n\
+    ldr r0, =gUnknown_03002F90\n\
+    add r0, #0x80\n\
+    ldrb r0, [r0]\n\
 _08005C6A:\n\
-	ldrb r1, [r6, #0x8]\n\
+    ldrb r1, [r6, #0x8]\n\
 _08005C6C:\n\
-	add r0, r1\n\
+    add r0, r1\n\
 _08005C6E:\n\
-	strb r0, [r6, #0x8]\n\
+    strb r0, [r6, #0x8]\n\
 _08005C70:\n\
-	mov r0, #0\n\
-	b _08005D6E\n\
-	.pool\n\
+    mov r0, #0\n\
+    b _08005D6E\n\
+    .pool\n\
 _08005C78:\n\
-	add r0, r6, #0\n\
-	bl TextPrinterWait\n\
-	lsl r0, #16\n\
-	cmp r0, #0\n\
-	bne _08005C86\n\
-	b _08005B56\n\
+    add r0, r6, #0\n\
+    bl TextPrinterWait\n\
+    lsl r0, #16\n\
+    cmp r0, #0\n\
+    bne _08005C86\n\
+    b _08005B56\n\
 _08005C86:\n\
-	mov r0, #0\n\
-	strb r0, [r6, #0x1C]\n\
-	b _08005B56\n\
+    mov r0, #0\n\
+    strb r0, [r6, #0x1C]\n\
+    b _08005B56\n\
 _08005C8C:\n\
-	add r0, r6, #0\n\
-	bl TextPrinterWaitWithDownArrow\n\
-	lsl r0, #16\n\
-	cmp r0, #0\n\
-	bne _08005C9A\n\
-	b _08005B56\n\
+    add r0, r6, #0\n\
+    bl TextPrinterWaitWithDownArrow\n\
+    lsl r0, #16\n\
+    cmp r0, #0\n\
+    bne _08005C9A\n\
+    b _08005B56\n\
 _08005C9A:\n\
-	ldrb r0, [r6, #0x4]\n\
-	ldrb r2, [r6, #0xD]\n\
-	lsl r2, #28\n\
-	lsr r1, r2, #4\n\
-	orr r1, r2\n\
-	lsr r1, #24\n\
-	bl FillWindowPixelBuffer\n\
-	ldrb r0, [r6, #0x6]\n\
-	mov r1, #0\n\
-	strb r0, [r6, #0x8]\n\
-	ldrb r0, [r6, #0x7]\n\
-	strb r0, [r6, #0x9]\n\
-	strb r1, [r6, #0x1C]\n\
-	b _08005B56\n\
+    ldrb r0, [r6, #0x4]\n\
+    ldrb r2, [r6, #0xD]\n\
+    lsl r2, #28\n\
+    lsr r1, r2, #4\n\
+    orr r1, r2\n\
+    lsr r1, #24\n\
+    bl FillWindowPixelBuffer\n\
+    ldrb r0, [r6, #0x6]\n\
+    mov r1, #0\n\
+    strb r0, [r6, #0x8]\n\
+    ldrb r0, [r6, #0x7]\n\
+    strb r0, [r6, #0x9]\n\
+    strb r1, [r6, #0x1C]\n\
+    b _08005B56\n\
 _08005CB8:\n\
-	add r0, r6, #0\n\
-	bl TextPrinterWaitWithDownArrow\n\
-	lsl r0, #16\n\
-	cmp r0, #0\n\
-	bne _08005CC6\n\
-	b _08005B56\n\
+    add r0, r6, #0\n\
+    bl TextPrinterWaitWithDownArrow\n\
+    lsl r0, #16\n\
+    cmp r0, #0\n\
+    bne _08005CC6\n\
+    b _08005B56\n\
 _08005CC6:\n\
-	add r0, r6, #0\n\
-	bl TextPrinterClearDownArrow\n\
-	ldrb r1, [r6, #0x5]\n\
-	ldr r0, =gFonts\n\
-	ldr r2, [r0]\n\
-	lsl r0, r1, #1\n\
-	add r0, r1\n\
-	lsl r0, #2\n\
-	add r0, r2\n\
-	ldrb r1, [r6, #0xB]\n\
-	ldrb r0, [r0, #0x5]\n\
-	add r1, r0\n\
-	strb r1, [r6, #0x1F]\n\
-	ldrb r0, [r6, #0x6]\n\
-	strb r0, [r6, #0x8]\n\
-	mov r0, #0x4\n\
-	strb r0, [r6, #0x1C]\n\
-	b _08005B56\n\
-	.pool\n\
+    add r0, r6, #0\n\
+    bl TextPrinterClearDownArrow\n\
+    ldrb r1, [r6, #0x5]\n\
+    ldr r0, =gFonts\n\
+    ldr r2, [r0]\n\
+    lsl r0, r1, #1\n\
+    add r0, r1\n\
+    lsl r0, #2\n\
+    add r0, r2\n\
+    ldrb r1, [r6, #0xB]\n\
+    ldrb r0, [r0, #0x5]\n\
+    add r1, r0\n\
+    strb r1, [r6, #0x1F]\n\
+    ldrb r0, [r6, #0x6]\n\
+    strb r0, [r6, #0x8]\n\
+    mov r0, #0x4\n\
+    strb r0, [r6, #0x1C]\n\
+    b _08005B56\n\
+    .pool\n\
 _08005CF0:\n\
-	ldrb r0, [r6, #0x1F]\n\
-	cmp r0, #0\n\
-	beq _08005D44\n\
-	bl sub_8197964\n\
-	ldr r1, =gWindowVerticalScrollSpeeds\n\
-	add r0, r1\n\
-	ldrb r4, [r0]\n\
-	ldrb r2, [r6, #0x1F]\n\
-	cmp r2, r4\n\
-	bge _08005D20\n\
-	ldrb r0, [r6, #0x4]\n\
-	ldrb r1, [r6, #0xD]\n\
-	lsl r1, #28\n\
-	lsr r3, r1, #4\n\
-	orr r3, r1\n\
-	lsr r3, #24\n\
-	mov r1, #0\n\
-	bl ScrollWindow\n\
-	mov r0, #0\n\
-	b _08005D38\n\
-	.pool\n\
+    ldrb r0, [r6, #0x1F]\n\
+    cmp r0, #0\n\
+    beq _08005D44\n\
+    bl sub_8197964\n\
+    ldr r1, =gWindowVerticalScrollSpeeds\n\
+    add r0, r1\n\
+    ldrb r4, [r0]\n\
+    ldrb r2, [r6, #0x1F]\n\
+    cmp r2, r4\n\
+    bge _08005D20\n\
+    ldrb r0, [r6, #0x4]\n\
+    ldrb r1, [r6, #0xD]\n\
+    lsl r1, #28\n\
+    lsr r3, r1, #4\n\
+    orr r3, r1\n\
+    lsr r3, #24\n\
+    mov r1, #0\n\
+    bl ScrollWindow\n\
+    mov r0, #0\n\
+    b _08005D38\n\
+    .pool\n\
 _08005D20:\n\
-	ldrb r0, [r6, #0x4]\n\
-	ldrb r1, [r6, #0xD]\n\
-	lsl r1, #28\n\
-	lsr r3, r1, #4\n\
-	orr r3, r1\n\
-	lsr r3, #24\n\
-	mov r1, #0\n\
-	add r2, r4, #0\n\
-	bl ScrollWindow\n\
-	ldrb r0, [r6, #0x1F]\n\
-	sub r0, r4\n\
+    ldrb r0, [r6, #0x4]\n\
+    ldrb r1, [r6, #0xD]\n\
+    lsl r1, #28\n\
+    lsr r3, r1, #4\n\
+    orr r3, r1\n\
+    lsr r3, #24\n\
+    mov r1, #0\n\
+    add r2, r4, #0\n\
+    bl ScrollWindow\n\
+    ldrb r0, [r6, #0x1F]\n\
+    sub r0, r4\n\
 _08005D38:\n\
-	strb r0, [r6, #0x1F]\n\
-	ldrb r0, [r6, #0x4]\n\
-	mov r1, #0x2\n\
-	bl CopyWindowToVram\n\
-	b _08005B56\n\
+    strb r0, [r6, #0x1F]\n\
+    ldrb r0, [r6, #0x4]\n\
+    mov r1, #0x2\n\
+    bl CopyWindowToVram\n\
+    b _08005B56\n\
 _08005D44:\n\
-	strb r0, [r6, #0x1C]\n\
-	b _08005B56\n\
+    strb r0, [r6, #0x1C]\n\
+    b _08005B56\n\
 _08005D48:\n\
-	bl IsSEPlaying\n\
-	lsl r0, #24\n\
-	lsr r0, #24\n\
-	cmp r0, #0\n\
-	beq _08005D56\n\
-	b _08005B56\n\
+    bl IsSEPlaying\n\
+    lsl r0, #24\n\
+    lsr r0, #24\n\
+    cmp r0, #0\n\
+    beq _08005D56\n\
+    b _08005B56\n\
 _08005D56:\n\
-	strb r0, [r6, #0x1C]\n\
-	b _08005B56\n\
+    strb r0, [r6, #0x1C]\n\
+    b _08005B56\n\
 _08005D5A:\n\
-	ldrb r0, [r6, #0x1E]\n\
-	add r1, r0, #0\n\
-	cmp r1, #0\n\
-	beq _08005D68\n\
-	sub r0, #0x1\n\
-	strb r0, [r6, #0x1E]\n\
-	b _08005B56\n\
+    ldrb r0, [r6, #0x1E]\n\
+    add r1, r0, #0\n\
+    cmp r1, #0\n\
+    beq _08005D68\n\
+    sub r0, #0x1\n\
+    strb r0, [r6, #0x1E]\n\
+    b _08005B56\n\
 _08005D68:\n\
-	strb r1, [r6, #0x1C]\n\
-	b _08005B56\n\
+    strb r1, [r6, #0x1C]\n\
+    b _08005B56\n\
 _08005D6C:\n\
-	mov r0, #0x1\n\
+    mov r0, #0x1\n\
 _08005D6E:\n\
-	pop {r4-r6}\n\
-	pop {r1}\n\
-	bx r1");
+    pop {r4-r6}\n\
+    pop {r1}\n\
+    bx r1\n");
 }
+#endif
 
 u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing)
 {
-- 
cgit v1.2.3


From 7d8a2ae7f0d9edaca7770cf472909bf9197acf2a Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Thu, 25 Jan 2018 15:25:35 -0600
Subject: Decompile new_menu_helpers.s

---
 src/battle_message.c         |   2 +-
 src/battle_script_commands.c |   2 +-
 src/berry_blender.c          |   2 +-
 src/daycare.c                |   6 +-
 src/decoration.c             |   4 +-
 src/hall_of_fame.c           |   8 +-
 src/naming_screen.c          |   2 +-
 src/new_menu_helpers.c       | 442 +++++++++++++++++++++++++++++++++++++++++++
 src/scrcmd.c                 |   6 +-
 src/start_menu.c             |   6 +-
 src/text.c                   |   6 +-
 src/unk_text_util_2.c        |  12 +-
 12 files changed, 470 insertions(+), 28 deletions(-)
 create mode 100644 src/new_menu_helpers.c

(limited to 'src')

diff --git a/src/battle_message.c b/src/battle_message.c
index 3fa3d0563..32de3df27 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -2440,7 +2440,7 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1)
     textSubPrinter.letterSpacing = r8[(12 * arg1) + 4];
     textSubPrinter.lineSpacing = r8[(12 * arg1) + 5];
     textSubPrinter.fontColor_l = 0;
-    textSubPrinter.fontColor_h = r8[(12 * arg1) + 7];
+    textSubPrinter.fgColor = r8[(12 * arg1) + 7];
     textSubPrinter.bgColor = r8[(12 * arg1) + 8];
     textSubPrinter.shadowColor = r8[(12 * arg1) + 9];
 
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c7976fc2a..72c637849 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -6730,7 +6730,7 @@ static void PutLevelAndGenderOnLvlUpBox(void)
     subPrinter.letterSpacing = 0;
     subPrinter.lineSpacing = 0;
     subPrinter.fontColor_l = TEXT_COLOR_TRANSPARENT;
-    subPrinter.fontColor_h = TEXT_COLOR_WHITE;
+    subPrinter.fgColor = TEXT_COLOR_WHITE;
     subPrinter.bgColor = TEXT_COLOR_TRANSPARENT;
     subPrinter.shadowColor = TEXT_COLOR_DARK_GREY;
 
diff --git a/src/berry_blender.c b/src/berry_blender.c
index c7f465967..3494492de 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -3489,7 +3489,7 @@ void ShowBerryBlenderRecordWindow(void)
 
     winTemplate = sBlenderRecordWindowTemplate;
     gResultsWindowId = AddWindow(&winTemplate);
-    sub_81973FC(gResultsWindowId, 0);
+    NewMenuHelpers_DrawStdWindowFrame(gResultsWindowId, 0);
     FillWindowPixelBuffer(gResultsWindowId, 0x11);
 
     xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90);
diff --git a/src/daycare.c b/src/daycare.c
index 59ee562bd..f7d1825fd 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -43,7 +43,7 @@ extern u16 ItemIdToBattleMoveId(u16);
 extern s32 ListMenuHandleInputGetItemId(u8);
 extern void sub_81AE6C8(u8, u16*, u16*);
 extern void sub_819746C(u8, bool8);
-extern void sub_81973FC(u8, bool8);
+extern void NewMenuHelpers_DrawStdWindowFrame(u8, bool8);
 extern void sub_81B9328(void);
 extern void sub_81AF078(u32, bool8, struct ListMenu *);
 extern void c2_exit_to_overworld_2_switch(void);
@@ -1212,7 +1212,7 @@ static void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y)
     gTextFlags.flag_1 = 0;
     printer.letterSpacing = 0;
     printer.lineSpacing = 1;
-    printer.fontColor_h = 2;
+    printer.fgColor = 2;
     printer.bgColor = 1;
     printer.shadowColor = 3;
 
@@ -1296,7 +1296,7 @@ void ShowDaycareLevelMenu(void)
     u8 daycareMenuTaskId;
 
     windowId = AddWindow(&sDaycareLevelMenuWindowTemplate);
-    sub_81973FC(windowId, FALSE);
+    NewMenuHelpers_DrawStdWindowFrame(windowId, FALSE);
 
     menuTemplate = sDaycareListMenuLevelTemplate;
     menuTemplate.unk_10 = windowId;
diff --git a/src/decoration.c b/src/decoration.c
index a9777c86f..8fb620b36 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -727,7 +727,7 @@ void sub_81271CC(u8 taskId)
 {
     sub_8126A58(1);
     sub_8126A88();
-    sub_81973C4(0, 0);
+    NewMenuHelpers_DrawDialogueFrame(0, 0);
     sub_8126C08();
     gTasks[taskId].func = sub_8126B80;
 }
@@ -2712,7 +2712,7 @@ void sub_812A334(void)
     u8 taskId;
 
     pal_fill_black();
-    sub_81973C4(0, 1);
+    NewMenuHelpers_DrawDialogueFrame(0, 1);
     sub_8126ABC();
     taskId = CreateTask(sub_812A2C4, 8);
     gTasks[taskId].data[2] = 0;
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 5390814eb..85fb518b5 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -81,7 +81,7 @@ extern const u8 gText_MainMenuTime[];
 extern const u8 gContestConfetti_Gfx[];
 extern const u8 gContestConfetti_Pal[];
 
-extern void sub_81973C4(u8, u8);
+extern void NewMenuHelpers_DrawDialogueFrame(u8, u8);
 extern u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
 extern void sub_8175620(void);
 extern u8 TrySavingData(u8);
@@ -539,7 +539,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
     }
     *lastSavedTeam = *sHofMonPtr;
 
-    sub_81973C4(0, 0);
+    NewMenuHelpers_DrawDialogueFrame(0, 0);
     AddTextPrinterParameterized(0, 1, gText_SavingDontTurnOffPower, 0, NULL, 2, 1, 3);
     CopyWindowToVram(0, 3);
     gTasks[taskId].func = Task_Hof_TrySaveData;
@@ -746,7 +746,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
     {
         FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
         HallOfFame_PrintPlayerInfo(1, 2);
-        sub_81973C4(0, 0);
+        NewMenuHelpers_DrawDialogueFrame(0, 0);
         AddTextPrinterParameterized(0, 1, gText_LeagueChamp, 0, NULL, 2, 1, 3);
         CopyWindowToVram(0, 3);
         gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
@@ -1115,7 +1115,7 @@ static void Task_HofPC_HandleExit(u8 taskId)
 static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
 {
     sub_8198180(gText_UnkCtrlF800Exit, 8, 1);
-    sub_81973C4(0, 0);
+    NewMenuHelpers_DrawDialogueFrame(0, 0);
     AddTextPrinterParameterized(0, 1, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
     CopyWindowToVram(0, 3);
     gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 7139b5c90..9a5cec1e0 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -530,7 +530,7 @@ static void DisplaySentToPCMessage(void)
         stringToDisplay++;
     
     StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]);
-    sub_81973C4(0, 0);
+    NewMenuHelpers_DrawDialogueFrame(0, 0);
     gTextFlags.flag_0 = TRUE;
     AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), 0, 2, 1, 3);
     CopyWindowToVram(0, 3);
diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c
new file mode 100644
index 000000000..baa053a22
--- /dev/null
+++ b/src/new_menu_helpers.c
@@ -0,0 +1,442 @@
+#include "global.h"
+#include "bg.h"
+#include "palette.h"
+#include "window.h"
+#include "text.h"
+#include "new_menu_helpers.h"
+#include "text_window.h"
+#include "menu.h"
+#include "menu_helpers.h"
+
+#define STD_WINDOW_PALETTE_NUM 14
+#define STD_WINDOW_BASE_TILE_NUM 0x214
+#define DLG_WINDOW_PALETTE_NUM 15
+#define DLG_WINDOW_BASE_TILE_NUM 0x200
+
+extern EWRAM_DATA u8 gUnknown_0203CD8C;
+extern EWRAM_DATA u8 gUnknown_0203CD8D;
+
+extern const u8 gUnknown_0860EA6C[];
+extern const u16 gUnknown_0860EA4C[];
+extern const u16 gUnknown_0860F074[];
+extern const u8 gUnknown_0860F094[];
+extern const struct WindowTemplate gUnknown_0860F098[];
+extern const struct WindowTemplate gUnknown_0860F0A8;
+
+extern void sub_819645C(void);
+// Forward declarations
+extern void sub_81973A4(void);
+extern void DrawStandardFrame(u8, u8, u8, u8, u8, u8);
+extern void DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
+extern void sub_81977BC(u8, u8, u8, u8, u8, u8);
+extern void sub_8197804(u8, u8, u8, u8, u8, u8);
+
+void sub_8197184(u8 window, u32 destTile, u32 destPalette)
+{
+    LoadBgTiles(GetWindowAttribute(window, WINDOW_PRIORITY), gUnknown_0860EA6C, 0x100, destTile);
+    LoadPalette(gUnknown_0860EA4C, destPalette * 16, 32);
+}
+
+void sub_81971C4(void)
+{
+    sub_819645C();
+}
+
+void sub_81971D0(void)
+{
+    InitWindows(gUnknown_0860F098);
+    gUnknown_0203CD8C = 0xFF;
+    gUnknown_0203CD8D = 0xFF;
+}
+
+void sub_81971F4(void)
+{
+    FreeAllWindowBuffers();
+}
+
+void sub_8197200(void)
+{
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    DeactivateAllTextPrinters();
+    sub_81973A4();
+}
+
+u16 sub_8197224(void)
+{
+    RunTextPrinters();
+    return IsTextPrinterActive(0);
+}
+
+u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor)
+{
+    struct TextSubPrinter printer;
+    
+    printer.current_text_offset = str;
+    printer.windowId = windowId;
+    printer.fontId = fontId;
+    printer.x = 0;
+    printer.y = 1;
+    printer.currentX = 0;
+    printer.currentY = 1;
+    printer.letterSpacing = 0;
+    printer.lineSpacing = 0;
+    printer.fontColor_l = 0;
+    printer.fgColor = fgColor;
+    printer.bgColor = bgColor;
+    printer.shadowColor = shadowColor;
+    
+    gTextFlags.flag_1 = 0;
+    return AddTextPrinter(&printer, speed, callback); 
+}
+
+void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress)
+{
+    void (*callback)(struct TextSubPrinter *, u16) = NULL;
+    gTextFlags.flag_0 = allowSkippingDelayWithButtonPress;
+    AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), callback, 2, 1, 3);
+}
+
+void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress)
+{
+    gTextFlags.flag_0 = allowSkippingDelayWithButtonPress;
+    AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3);
+}
+
+void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed)
+{
+    gTextFlags.flag_0 = allowSkippingDelayWithButtonPress;
+    AddTextPrinterParameterized(0, 1, gStringVar4, speed, NULL, 2, 1, 3);
+}
+
+void sub_81973A4(void)
+{
+    copy_textbox_border_tile_patterns_to_vram(0, DLG_WINDOW_BASE_TILE_NUM, 0xF0);
+    sub_809882C(0, STD_WINDOW_BASE_TILE_NUM, 0xE0);
+}
+
+void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram)
+{
+    CallWindowFunction(windowId, DrawDialogueFrame);
+    FillWindowPixelBuffer(windowId, 0x11);
+    PutWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 copyToVram)
+{
+    CallWindowFunction(windowId, DrawStandardFrame);
+    FillWindowPixelBuffer(windowId, 0x11);
+    PutWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void sub_8197434(u8 windowId, bool8 copyToVram)
+{
+    CallWindowFunction(windowId, sub_8197804);
+    FillWindowPixelBuffer(windowId, 0x11);
+    ClearWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void sub_819746C(u8 windowId, bool8 copyToVram)
+{
+    CallWindowFunction(windowId, sub_81977BC);
+    FillWindowPixelBuffer(windowId, 0x11);
+    ClearWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    int i;
+    
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 0,
+                            tilemapLeft - 1,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 1,
+                            tilemapLeft,
+                            tilemapTop - 1,
+                            width,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 2,
+                            tilemapLeft + width,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+    
+    for (i = tilemapTop; i < tilemapTop + height; i++)
+    {
+        FillBgTilemapBufferRect(bg,
+                                STD_WINDOW_BASE_TILE_NUM + 3,
+                                tilemapLeft - 1,
+                                i,
+                                1,
+                                1,
+                                STD_WINDOW_PALETTE_NUM);
+        FillBgTilemapBufferRect(bg,
+                                STD_WINDOW_BASE_TILE_NUM + 5,
+                                tilemapLeft + width,
+                                i,
+                                1,
+                                1,
+                                STD_WINDOW_PALETTE_NUM);
+    }
+    
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 6,
+                            tilemapLeft - 1,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 7,
+                            tilemapLeft,
+                            tilemapTop + height,
+                            width,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 8,
+                            tilemapLeft + width,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+}
+
+void DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 1,
+                            tilemapLeft - 2,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 3,
+                            tilemapLeft - 1,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 4,
+                            tilemapLeft,
+                            tilemapTop - 1,
+                            width - 1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 5,
+                            tilemapLeft + width - 1,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 6,
+                            tilemapLeft + width,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 7,
+                            tilemapLeft - 2,
+                            tilemapTop,
+                            1,
+                            5,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 9,
+                            tilemapLeft - 1,
+                            tilemapTop,
+                            width + 1,
+                            5,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 10,
+                            tilemapLeft + width,
+                            tilemapTop,
+                            1,
+                            5,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 1),
+                            tilemapLeft - 2,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 3),
+                            tilemapLeft - 1,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 4),
+                            tilemapLeft,
+                            tilemapTop + height,
+                            width - 1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 5),
+                            tilemapLeft + width - 1,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 6),
+                            tilemapLeft + width,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+}
+
+void sub_81977BC(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, STD_WINDOW_PALETTE_NUM);
+}
+
+void sub_8197804(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, STD_WINDOW_PALETTE_NUM);
+}
+
+void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram)
+{
+    SetWindowBorderStyle(windowId, copyToVram, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM);
+}
+
+void sub_819786C(u8 windowId, bool8 copyToVram)
+{
+    copy_textbox_border_tile_patterns_to_vram(windowId, DLG_WINDOW_BASE_TILE_NUM, 0xF0);
+    sub_8197B1C(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, 0xF);
+}
+
+void sub_819789C(void)
+{
+    LoadPalette(gUnknown_0860F074, 0xE0, 0x14);
+}
+
+void sub_81978B0(u16 offset)
+{
+    LoadPalette(gUnknown_0860F074, offset, 0x14);
+}
+
+const u16 *sub_81978C8(void)
+{
+    return gUnknown_0860F074;
+}
+
+u16 sub_81978D0(u8 colorNum)
+{
+    if (colorNum > 15)
+        colorNum = 0;
+    return gUnknown_0860F074[colorNum];
+}
+
+void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback)
+{
+    sub_81973A4();
+    DisplayMessageAndContinueTask(taskId, 0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM, 1, GetPlayerTextSpeed(), string, callback);
+    CopyWindowToVram(0, 3);
+}
+
+void sub_8197930(void)
+{
+    CreateYesNoMenu(&gUnknown_0860F0A8, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0);
+}
+
+void sub_8197948(u8 initialCursorPos)
+{
+    CreateYesNoMenu(&gUnknown_0860F0A8, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, initialCursorPos);
+}
+
+u32 sub_8197964(void)
+{
+    if (gTextFlags.flag_3)
+        return 1;
+    return gSaveBlock2Ptr->optionsTextSpeed;
+}
+
+u8 GetPlayerTextSpeed(void)
+{
+    u32 speed;
+    if (gSaveBlock2Ptr->optionsTextSpeed > 2)
+        gSaveBlock2Ptr->optionsTextSpeed = 1;
+    speed = sub_8197964();
+    return gUnknown_0860F094[speed];
+}
+
+u8 sub_81979C4(u8 a1)
+{
+    if (gUnknown_0203CD8C == 0xFF)
+        gUnknown_0203CD8C = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139);
+    return gUnknown_0203CD8C;
+}
+
+u8 GetStartMenuWindowId(void)
+{
+    return gUnknown_0203CD8C;
+}
+
+void remove_start_menu_window_maybe(void)
+{
+    if (gUnknown_0203CD8C != 0xFF)
+    {
+        RemoveWindow(gUnknown_0203CD8C);
+        gUnknown_0203CD8C = 0xFF;
+    }
+}
+
+u16 sub_8197A30(void)
+{
+    return DLG_WINDOW_BASE_TILE_NUM;
+}
+
+u16 sub_8197A38(void)
+{
+    return STD_WINDOW_BASE_TILE_NUM;
+}
+
+u8 AddMapNamePopUpWindow(void)
+{
+    if (gUnknown_0203CD8D == 0xFF)
+        gUnknown_0203CD8D = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107);
+    return gUnknown_0203CD8D;
+}
+
+u8 GetMapNamePopUpWindowId(void)
+{
+    return gUnknown_0203CD8D;
+}
+
+void RemoveMapNamePopUpWindow(void)
+{
+    if (gUnknown_0203CD8D != 0xFF)
+    {
+        RemoveWindow(gUnknown_0203CD8D);
+        gUnknown_0203CD8D = 0xFF;
+    }
+}
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 0557cd95e..5a4cc4591 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1313,7 +1313,7 @@ bool8 ScrCmd_cmdDB(struct ScriptContext *ctx)
     if (msg == NULL)
         msg = (const u8 *)ctx->data[0];
     sub_81973A4();
-    sub_81973C4(0, 1);
+    NewMenuHelpers_DrawDialogueFrame(0, 1);
     PrintTextOnWindow(0, 1, msg, 0, 1, 0, 0);
     return FALSE;
 }
@@ -1530,7 +1530,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
     template2 = template1;
     gUnknown_03000F30 = AddWindow(&template2);
     sub_809882C(gUnknown_03000F30, 0x214, 0xE0);
-    sub_81973FC(gUnknown_03000F30, 0);
+    NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0);
     PutWindowTilemap(gUnknown_03000F30);
     FillWindowPixelBuffer(gUnknown_03000F30, 0x11);
     PrintTextOnWindow(gUnknown_03000F30, 6, gStringVar4, temp1, temp2, 0xFF, 0x0);
@@ -1651,7 +1651,7 @@ _0809AEC6:\n\
 	bl sub_809882C\n\
 	ldrb r0, [r5]\n\
 	mov r1, #0\n\
-	bl sub_81973FC\n\
+	bl NewMenuHelpers_DrawStdWindowFrame\n\
 	ldrb r0, [r5]\n\
 	bl PutWindowTilemap\n\
 	ldrb r0, [r5]\n\
diff --git a/src/start_menu.c b/src/start_menu.c
index a820cd992..36d249078 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -32,7 +32,7 @@ extern bool32 InUnionRoom(void);
 extern bool8 InBattlePike(void);
 extern bool8 InBattlePyramid(void);
 extern bool8 InMultiBattleRoom(void);
-extern void sub_81973FC(u8 windowId, u8 a1);
+extern void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, u8 a1);
 extern void sub_8198070(u8 windowId, u8 a1);
 
 // this file's functions
@@ -224,7 +224,7 @@ void DisplaySafariBallsWindow(void)
 {
     sSafariBallsWindowId = AddWindow(&gSafariBallsWindowTemplate);
     PutWindowTilemap(sSafariBallsWindowId);
-    sub_81973FC(sSafariBallsWindowId, 0);
+    NewMenuHelpers_DrawStdWindowFrame(sSafariBallsWindowId, 0);
     ConvertIntToDecimalStringN(gStringVar1, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2);
     StringExpandPlaceholders(gStringVar4, gText_SafariBallStock);
     PrintTextOnWindow(sSafariBallsWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
@@ -239,7 +239,7 @@ void DisplayPyramidFloorWindow(void)
     else
         sBattlePyramidFloorWindowId = AddWindow(&gPyramidFloorWindowTemplate_2);
     PutWindowTilemap(sBattlePyramidFloorWindowId);
-    sub_81973FC(sBattlePyramidFloorWindowId, 0);
+    NewMenuHelpers_DrawStdWindowFrame(sBattlePyramidFloorWindowId, 0);
     StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->field_CAA[4]]);
     StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor);
     PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
diff --git a/src/text.c b/src/text.c
index 5db3ba308..50e39ab0c 100644
--- a/src/text.c
+++ b/src/text.c
@@ -159,7 +159,7 @@ u16 PrintTextOnWindow(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 spee
     subPrinter.letterSpacing = gFonts[fontId].letterSpacing;
     subPrinter.lineSpacing = gFonts[fontId].lineSpacing;
     subPrinter.fontColor_l = gFonts[fontId].fontColor_l;
-    subPrinter.fontColor_h = gFonts[fontId].fontColor_h;
+    subPrinter.fgColor = gFonts[fontId].fgColor;
     subPrinter.bgColor = gFonts[fontId].bgColor;
     subPrinter.shadowColor = gFonts[fontId].shadowColor;
     return AddTextPrinter(&subPrinter, speed, callback);
@@ -189,7 +189,7 @@ bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*ca
     gTempTextPrinter.minLetterSpacing = 0;
     gTempTextPrinter.japanese = 0;
 
-    GenerateFontHalfRowLookupTable(textSubPrinter->fontColor_h, textSubPrinter->bgColor, textSubPrinter->shadowColor);
+    GenerateFontHalfRowLookupTable(textSubPrinter->fgColor, textSubPrinter->bgColor, textSubPrinter->shadowColor);
     if (speed != TEXT_SPEED_FF && speed != 0x0)
     {
         --gTempTextPrinter.text_speed;
@@ -3218,7 +3218,7 @@ u8 GetFontAttribute(u8 fontId, u8 attributeId)
             result = gFontInfos[fontId].fontColor_l;
             break;
         case 5:
-            result = gFontInfos[fontId].fontColor_h;
+            result = gFontInfos[fontId].fgColor;
             break;
         case 6:
             result = gFontInfos[fontId].bgColor;
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
index 8eaab32b6..ca8246128 100644
--- a/src/unk_text_util_2.c
+++ b/src/unk_text_util_2.c
@@ -57,24 +57,24 @@ u16 Font6Func(struct TextPrinter *textPrinter)
                     switch (char_)
                     {
                         case 1:
-                            textPrinter->subPrinter.fontColor_h = *textPrinter->subPrinter.current_text_offset ++;
-                            GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                            textPrinter->subPrinter.fgColor = *textPrinter->subPrinter.current_text_offset ++;
+                            GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fgColor, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
                             return 2;
                         case 2:
                             textPrinter->subPrinter.bgColor = *textPrinter->subPrinter.current_text_offset ++;
-                            GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                            GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fgColor, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
                             return 2;
                         case 3:
                             textPrinter->subPrinter.shadowColor = *textPrinter->subPrinter.current_text_offset ++;
-                            GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                            GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fgColor, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
                             return 2;
                         case 4:
-                            textPrinter->subPrinter.fontColor_h = *textPrinter->subPrinter.current_text_offset;
+                            textPrinter->subPrinter.fgColor = *textPrinter->subPrinter.current_text_offset;
                             textPrinter->subPrinter.bgColor = *++ textPrinter->subPrinter.current_text_offset;
                             textPrinter->subPrinter.shadowColor = *++ textPrinter->subPrinter.current_text_offset;
                             textPrinter->subPrinter.current_text_offset ++;
 
-                            GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                            GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fgColor, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
                             return 2;
                         case 5:
                             textPrinter->subPrinter.current_text_offset ++;
-- 
cgit v1.2.3


From 2da7bdbb1175802e55103c4f9df95e035aa38c40 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Fri, 26 Jan 2018 23:41:52 -0600
Subject: Begin menu.s decomp

---
 src/menu.c             | 849 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/new_menu_helpers.c |  35 +-
 2 files changed, 864 insertions(+), 20 deletions(-)
 create mode 100644 src/menu.c

(limited to 'src')

diff --git a/src/menu.c b/src/menu.c
new file mode 100644
index 000000000..9ff8d47b6
--- /dev/null
+++ b/src/menu.c
@@ -0,0 +1,849 @@
+#include "global.h"
+#include "new_menu_helpers.h"
+#include "bg.h"
+#include "window.h"
+#include "palette.h"
+#include "menu.h"
+#include "constants/songs.h"
+#include "main.h"
+#include "sound.h"
+
+struct SomeUnkStruct
+{
+    u8 unk1;
+    u8 unk2;
+    u16 unk3;
+};
+
+struct Menu
+{
+    u8 left;
+    u8 top;
+    s8 cursorPos;
+    s8 minCursorPos;
+    s8 maxCursorPos;
+    u8 windowId;
+    u8 fontId;
+    u8 menu_field_7;
+    u8 cursorHeight;
+    u8 menu_field_9;
+    u8 menu_field_A;
+    u8 menu_field_B;
+};
+
+extern EWRAM_DATA struct Menu gUnknown_0203CD90;
+extern EWRAM_DATA u16 gUnknown_0203CD9C;
+extern EWRAM_DATA u8 gUnknown_0203CD9E;
+extern EWRAM_DATA u8 gUnknown_0203CD9F;
+extern EWRAM_DATA u8 gUnknown_0203CDA0;
+
+const u16 gUnknown_0860F0B0[] = INCBIN_U16("graphics/interface/860F0B0.gbapal");
+const u8 gUnknown_0860F0D0[] = { 15, 1, 2 };
+const struct SomeUnkStruct gUnknown_0860F0D4[] = 
+{
+    { 12, 12, 0x00 },
+    { 32, 12, 0x20 },
+    { 32, 12, 0x64 },
+    { 32, 12, 0x60 },
+    { 32, 12, 0x80 },
+    { 32, 12, 0x48 },
+    { 32, 12, 0x44 },
+    { 32, 12, 0x6C },
+    { 32, 12, 0x68 },
+    { 32, 12, 0x88 },
+    { 32, 12, 0xA4 },
+    { 32, 12, 0x24 },
+    { 32, 12, 0x28 },
+    { 32, 12, 0x2C },
+    { 32, 12, 0x40 },
+    { 32, 12, 0x84 },
+    { 32, 12, 0x4C },
+    { 32, 12, 0xA0 },
+    { 32, 12, 0x8C },
+    { 42, 12, 0xA8 },
+    { 42, 12, 0xC0 },
+    { 42, 12, 0xC8 },
+    { 42, 12, 0xE0 },
+    { 42, 12, 0xE8 },
+    {  8,  8, 0xAE },
+    {  8,  8, 0xAF },
+};
+
+extern const u8 gText_SelectorArrow3[];
+extern const u8 gText_YesNo[];
+
+extern void sub_8197BB4(u8, u8, u8, u8, u8, u8);
+extern void sub_8197E30(u8, u8, u8, u8, u8, u8);
+extern void DrawWindowBorder(u8, u8, u8, u8, u8, u8);
+extern void sub_81980A8(u8, u8, u8, u8, u8, u8);
+extern u8 MoveMenuCursor(s8);
+extern u8 sub_8199134(s8, s8);
+extern void sub_8199F74(u8, u8, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8, u8);
+extern void sub_8198C78(void);
+
+void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextSubPrinter *, u16))
+{
+    gTextFlags.flag_0 = a1;
+    AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), callback, 2, 1, 3);
+}
+
+void sub_8197AE8(bool8 copyToVram)
+{
+    FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0x11);
+    if (copyToVram == TRUE)
+        CopyBgTilemapBufferToVram(0);
+}
+
+void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a3, u8 a4)
+{
+    gUnknown_0203CD9C = a3;
+    gUnknown_0203CD9E = a4;
+    CallWindowFunction(windowId, sub_8197BB4);
+    FillWindowPixelBuffer(windowId, 0x11);
+    PutWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void sub_8197B64(u8 windowId, bool8 copyToVram, u16 a3)
+{
+    gUnknown_0203CD9C = a3;
+    gUnknown_0203CD9E = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM);
+    CallWindowFunction(windowId, sub_8197BB4);
+    FillWindowPixelBuffer(windowId, 0x11);
+    PutWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void sub_8197BB4(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 1,
+                            tilemapLeft - 2,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 3,
+                            tilemapLeft - 1,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 4,
+                            tilemapLeft,
+                            tilemapTop - 1,
+                            width - 1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 5,
+                            tilemapLeft + width - 1,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 6,
+                            tilemapLeft + width,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 7,
+                            tilemapLeft - 2,
+                            tilemapTop,
+                            1,
+                            5,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 9,
+                            tilemapLeft - 1,
+                            tilemapTop,
+                            width + 1,
+                            5,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 10,
+                            tilemapLeft + width,
+                            tilemapTop,
+                            1,
+                            5,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(gUnknown_0203CD9C + 1),
+                            tilemapLeft - 2,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(gUnknown_0203CD9C + 3),
+                            tilemapLeft - 1,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(gUnknown_0203CD9C + 4),
+                            tilemapLeft,
+                            tilemapTop + height,
+                            width - 1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(gUnknown_0203CD9C + 5),
+                            tilemapLeft + width - 1,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(gUnknown_0203CD9C + 6),
+                            tilemapLeft + width,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+}
+
+void sub_8197DF8(u8 windowId, bool8 copyToVram)
+{
+    CallWindowFunction(windowId, sub_8197E30);
+    FillWindowPixelBuffer(windowId, 0);
+    ClearWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void sub_8197E30(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, 0);
+}
+
+void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 paletteNum)
+{
+    gUnknown_0203CD9C = baseTileNum;
+    gUnknown_0203CD9E = paletteNum;
+    CallWindowFunction(windowId, DrawWindowBorder);
+    FillWindowPixelBuffer(windowId, 0x11);
+    PutWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void sub_8197EC8(u8 windowId, bool8 copyToVram, u16 baseTileNum)
+{
+    gUnknown_0203CD9C = baseTileNum;
+    gUnknown_0203CD9E = GetWindowAttribute(windowId, WINDOW_PALETTE_NUM);
+    CallWindowFunction(windowId, DrawWindowBorder);
+    FillWindowPixelBuffer(windowId, 0x11);
+    PutWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void DrawWindowBorder(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 0,
+                            tilemapLeft - 1,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 1,
+                            tilemapLeft,
+                            tilemapTop - 1,
+                            width,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 2,
+                            tilemapLeft + width,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 3,
+                            tilemapLeft - 1,
+                            tilemapTop,
+                            1,
+                            height,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 5,
+                            tilemapLeft + width,
+                            tilemapTop,
+                            1,
+                            height,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 6,
+                            tilemapLeft - 1,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 7,
+                            tilemapLeft,
+                            tilemapTop + height,
+                            width,
+                            1,
+                            gUnknown_0203CD9E);
+    FillBgTilemapBufferRect(bg,
+                            gUnknown_0203CD9C + 8,
+                            tilemapLeft + width,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            gUnknown_0203CD9E);
+}
+
+void sub_8198070(u8 windowId, bool8 copyToVram)
+{
+    CallWindowFunction(windowId, sub_81980A8);
+    FillWindowPixelBuffer(windowId, 0);
+    ClearWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void sub_81980A8(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, 0);
+}
+
+u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile)
+{
+    struct WindowTemplate window;
+    memset(&window, 0, sizeof(window));
+    
+    if (bg > 3)
+        window.priority = 0;
+    else
+        window.priority = bg;
+    
+    window.tilemapTop = yPos;
+    window.height = 2;
+    window.tilemapLeft = 0x1E - xPos;
+    window.width = xPos;
+    window.paletteNum = palette;
+    window.baseBlock = baseTile;
+    
+    gUnknown_0203CDA0 = AddWindow(&window);
+    
+    if (palette > 15)
+        palette = 15 * 16;
+    else
+        palette *= 16;
+    
+    LoadPalette(gUnknown_0860F0B0, palette, sizeof(gUnknown_0860F0B0));
+    return gUnknown_0203CDA0;
+}
+
+void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram)
+{
+    u16 width = 0;
+    
+    if (gUnknown_0203CDA0 != 0xFF)
+    {
+        PutWindowTilemap(gUnknown_0203CDA0);
+        FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
+        width = GetStringWidth(0, string, 0);
+        box_print(gUnknown_0203CDA0,
+                  0,
+                  0xEC - (GetWindowAttribute(gUnknown_0203CDA0, WINDOW_TILEMAP_LEFT) * 8) - a2 - width,
+                  1,
+                  gUnknown_0860F0D0,
+                  0,
+                  string);
+        if (copyToVram)
+            CopyWindowToVram(gUnknown_0203CDA0, 3);
+    }
+}
+
+void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram)
+{
+    struct TextColor color;
+    u16 width = 0;
+    
+    if (gUnknown_0203CDA0 != 0xFF)
+    {
+        if (a3 != 0)
+        {
+            color.fgColor = 0;
+            color.bgColor = 1;
+            color.shadowColor = 2;
+        }
+        else
+        {
+            color.fgColor = 15;
+            color.bgColor = 1;
+            color.shadowColor = 2;
+        }
+        PutWindowTilemap(gUnknown_0203CDA0);
+        FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
+        if (string2 != NULL)
+        {
+            width = GetStringWidth(0, string2, 0);
+            box_print(gUnknown_0203CDA0,
+                      0,
+                      0xEC - (GetWindowAttribute(gUnknown_0203CDA0, WINDOW_TILEMAP_LEFT) * 8) - a4 - width,
+                      1,
+                      &color,
+                      0,
+                      string2);
+        }
+        AddTextPrinterParameterized2(gUnknown_0203CDA0, 1, 4, 1, 0, 0, &color, 0, string);
+        if (copyToVram)
+            CopyWindowToVram(gUnknown_0203CDA0, 3);
+    }
+}
+
+void sub_81982D8(void)
+{
+    if (gUnknown_0203CDA0 != 0xFF)
+        CopyWindowToVram(gUnknown_0203CDA0, 3);
+}
+
+void sub_81982F0(void)
+{
+    if (gUnknown_0203CDA0 != 0xFF)
+    {
+        FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
+        CopyWindowToVram(gUnknown_0203CDA0, 3);
+    }
+}
+
+void sub_8198314(void)
+{
+    if (gUnknown_0203CDA0 != 0xFF)
+    {
+        FillWindowPixelBuffer(gUnknown_0203CDA0, 0);
+        ClearWindowTilemap(gUnknown_0203CDA0);
+        CopyWindowToVram(gUnknown_0203CDA0, 3);
+        RemoveWindow(gUnknown_0203CDA0);
+        gUnknown_0203CDA0 = 0xFF;
+    }
+}
+
+u8 sub_8198348(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 cursorPos, u8 a7)
+{
+    s32 pos;
+    
+    gUnknown_0203CD90.left = left;
+    gUnknown_0203CD90.top = top;
+    gUnknown_0203CD90.minCursorPos = 0;
+    gUnknown_0203CD90.maxCursorPos = numChoices - 1;
+    gUnknown_0203CD90.windowId = windowId;
+    gUnknown_0203CD90.fontId = fontId;
+    gUnknown_0203CD90.cursorHeight = cursorHeight;
+    gUnknown_0203CD90.menu_field_B = a7;
+    
+    pos = cursorPos;
+    
+    if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
+        gUnknown_0203CD90.cursorPos = 0;
+    else
+        gUnknown_0203CD90.cursorPos = pos;
+    
+    MoveMenuCursor(0);
+    return gUnknown_0203CD90.cursorPos;
+}
+
+u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 cursorPos)
+{
+    return sub_8198348(windowId, fontId, left, top, cursorHeight, numChoices, cursorPos, 0);
+}
+
+u8 sub_81983EC(u8 windowId, u8 fontId, u8 left, u8 top, u8 numChoices, u8 cursorPos)
+{
+    return sub_81983AC(windowId, fontId, left, top, GetMenuCursorDimensionByFont(fontId, 1), numChoices, cursorPos);
+}
+
+void RedrawMenuCursor(u8 oldPos, u8 newPos)
+{
+    u8 width, height;
+    
+    width = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 0);
+    height = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 1);
+    FillWindowPixelRect(gUnknown_0203CD90.windowId, 0x11, gUnknown_0203CD90.left, gUnknown_0203CD90.cursorHeight * oldPos + gUnknown_0203CD90.top, width, height);
+    PrintTextOnWindow(gUnknown_0203CD90.windowId, gUnknown_0203CD90.fontId, gText_SelectorArrow3, gUnknown_0203CD90.left, gUnknown_0203CD90.cursorHeight * newPos + gUnknown_0203CD90.top, 0, 0);
+}
+
+u8 MoveMenuCursor(s8 cursorDelta)
+{
+    u8 oldPos = gUnknown_0203CD90.cursorPos;
+    int newPos = gUnknown_0203CD90.cursorPos + cursorDelta;
+    
+    if (newPos < gUnknown_0203CD90.minCursorPos)
+        gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.maxCursorPos;
+    else if (newPos > gUnknown_0203CD90.maxCursorPos)
+        gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.minCursorPos;
+    else
+        gUnknown_0203CD90.cursorPos += cursorDelta;
+    
+    RedrawMenuCursor(oldPos, gUnknown_0203CD90.cursorPos);
+    return gUnknown_0203CD90.cursorPos;
+}
+
+u8 MoveMenuCursorNoWrapAround(s8 cursorDelta)
+{
+    u8 oldPos = gUnknown_0203CD90.cursorPos;
+    int newPos = gUnknown_0203CD90.cursorPos + cursorDelta;
+    
+    if (newPos < gUnknown_0203CD90.minCursorPos)
+        gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.minCursorPos;
+    else if (newPos > gUnknown_0203CD90.maxCursorPos)
+        gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.maxCursorPos;
+    else
+        gUnknown_0203CD90.cursorPos += cursorDelta;
+    
+    RedrawMenuCursor(oldPos, gUnknown_0203CD90.cursorPos);
+    return gUnknown_0203CD90.cursorPos;
+}
+
+u8 GetMenuCursorPos(void)
+{
+    return gUnknown_0203CD90.cursorPos;
+}
+
+s8 ProcessMenuInput(void)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        if (!gUnknown_0203CD90.menu_field_B)
+            PlaySE(SE_SELECT);
+        return gUnknown_0203CD90.cursorPos;
+    }
+
+    if (gMain.newKeys & B_BUTTON)
+    {
+        return -1;
+    }
+
+    if (gMain.newKeys & DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        MoveMenuCursor(-1);
+        return -2;
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        MoveMenuCursor(1);
+        return -2;
+    }
+
+    return -2;
+}
+
+s8 ProcessMenuInputNoWrapAround(void)
+{
+    u8 oldPos = gUnknown_0203CD90.cursorPos;
+    
+    if (gMain.newKeys & A_BUTTON)
+    {
+        if (!gUnknown_0203CD90.menu_field_B)
+            PlaySE(SE_SELECT);
+        return gUnknown_0203CD90.cursorPos;
+    }
+
+    if (gMain.newKeys & B_BUTTON)
+    {
+        return -1;
+    }
+
+    if (gMain.newKeys & DPAD_UP)
+    {
+        if (oldPos != MoveMenuCursorNoWrapAround(-1))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        if (oldPos != MoveMenuCursorNoWrapAround(1))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+
+    return -2;
+}
+
+s8 ProcessMenuInput_other(void)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        if (!gUnknown_0203CD90.menu_field_B)
+            PlaySE(SE_SELECT);
+        return gUnknown_0203CD90.cursorPos;
+    }
+
+    if (gMain.newKeys & B_BUTTON)
+    {
+        return -1;
+    }
+
+    if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        MoveMenuCursor(-1);
+        return -2;
+    }
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        MoveMenuCursor(1);
+        return -2;
+    }
+
+    return -2;
+}
+
+s8 ProcessMenuInputNoWrapAround_other(void)
+{
+    u8 oldPos = gUnknown_0203CD90.cursorPos;
+    
+    if (gMain.newKeys & A_BUTTON)
+    {
+        if (!gUnknown_0203CD90.menu_field_B)
+            PlaySE(SE_SELECT);
+        return gUnknown_0203CD90.cursorPos;
+    }
+
+    if (gMain.newKeys & B_BUTTON)
+    {
+        return -1;
+    }
+
+    if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
+    {
+        if (oldPos != MoveMenuCursorNoWrapAround(-1))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
+    {
+        if (oldPos != MoveMenuCursorNoWrapAround(1))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+
+    return -2;
+}
+
+void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs)
+{
+    u8 i;
+    for (i = 0; i < itemCount; i++)
+    {
+        PrintTextOnWindow(windowId, fontId, strs[i].text, left, (lineHeight * i) + top, 0xFF, NULL);
+    }
+    CopyWindowToVram(windowId, 2);
+}
+
+void sub_81987BC(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 a6, u8 a7)
+{
+    u8 i;
+    for (i = 0; i < itemCount; i++)
+    {
+        sub_8199F74(windowId, fontId, strs[i].text, left, (lineHeight * i) + top, 0xFF, NULL, a6, a7);
+    }
+    CopyWindowToVram(windowId, 2);
+}
+
+void sub_8198854(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs)
+{
+    PrintTextArray(windowId, fontId, GetFontAttribute(fontId, 0), 1, lineHeight, itemCount, strs);
+}
+
+void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a8)
+{
+    u8 i;
+    struct TextSubPrinter printer;
+    
+    printer.windowId = windowId;
+    printer.fontId = fontId;
+    printer.fgColor = GetFontAttribute(fontId, 5);
+    printer.bgColor = GetFontAttribute(fontId, 6);
+    printer.shadowColor = GetFontAttribute(fontId, 7);
+    printer.fontColor_l = GetFontAttribute(fontId, 4);
+    printer.letterSpacing = letterSpacing;
+    printer.lineSpacing = GetFontAttribute(fontId, 3);
+    printer.x = left;
+    printer.currentX = left;
+    
+    for (i = 0; i < itemCount; i++)
+    {
+        printer.current_text_offset = strs[a8[i]].text;
+        printer.y = (lineHeight * i) + top;
+        printer.currentY = printer.y;
+        AddTextPrinter(&printer, 0xFF, 0);
+    }
+    
+    CopyWindowToVram(windowId, 2);
+}
+
+void sub_81989B8(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a5)
+{
+    AddItemMenuActionTextPrinters(windowId, fontId, GetFontAttribute(fontId, 0), 1, GetFontAttribute(fontId, 2), lineHeight, itemCount, strs, a5);
+}
+
+void SetWindowTemplateFields(struct WindowTemplate *template, u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock)
+{
+    template->priority = bg;
+    template->tilemapLeft = left;
+    template->tilemapTop = top;
+    template->width = width;
+    template->height = height;
+    template->paletteNum = paletteNum;
+    template->baseBlock = baseBlock;
+}
+
+struct WindowTemplate sub_8198A50(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock)
+{
+    struct WindowTemplate template;
+    SetWindowTemplateFields(&template, bg, left, top, width, height, paletteNum, baseBlock);
+    return template;
+}
+
+u16 sub_8198AA4(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock)
+{
+    struct WindowTemplate template;
+    SetWindowTemplateFields(&template, bg, left, top, width, height, paletteNum, baseBlock);
+    return AddWindow(&template);
+}
+
+void sub_8198AF8(struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16 baseTileNum, u8 paletteNum, u8 cursorPos)
+{
+    struct TextSubPrinter printer;
+    
+    gUnknown_0203CD9F = AddWindow(window);
+    SetWindowBorderStyle(gUnknown_0203CD9F, TRUE, baseTileNum, paletteNum);
+    
+    printer.current_text_offset = gText_YesNo;
+    printer.windowId = gUnknown_0203CD9F;
+    printer.fontId = fontId;
+    printer.x = GetFontAttribute(fontId, 0) + left;
+    printer.y = top;
+    printer.currentX = printer.x;
+    printer.currentY = printer.y;
+    printer.fgColor = GetFontAttribute(fontId, 5);
+    printer.bgColor = GetFontAttribute(fontId, 6);
+    printer.shadowColor = GetFontAttribute(fontId, 7);
+    printer.fontColor_l = GetFontAttribute(fontId, 4);
+    printer.letterSpacing = GetFontAttribute(fontId, 2);
+    printer.lineSpacing = GetFontAttribute(fontId, 3);
+    
+    AddTextPrinter(&printer, 0xFF, 0);
+    
+    sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, 1), 2, cursorPos);
+}
+
+void sub_8198C34(struct WindowTemplate *window, u8 fontId, u16 baseTileNum, u8 paletteNum)
+{
+    sub_8198AF8(window, fontId, 0, 1, baseTileNum, paletteNum, 0);
+}
+
+s8 ProcessMenuInputNoWrap_(void)
+{
+    s8 result = ProcessMenuInputNoWrapAround();
+    if (result != -2)
+        sub_8198C78();
+    return result;
+}
+
+void sub_8198C78(void)
+{
+    sub_8198070(gUnknown_0203CD9F, TRUE);
+    RemoveWindow(gUnknown_0203CD9F);
+}
+
+void sub_8198C94(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u8 a7, const struct MenuAction *strs)
+{
+    u8 i;
+    u8 j;
+    for (i = 0; i < a7; i++)
+    {
+        for (j = 0; j < a6; j++)
+        {
+            PrintTextOnWindow(windowId, fontId, strs[(i * a6) + j].text, (a4 * j) + left, (a5 * i) + top, 0xFF, NULL);
+        }
+    }
+    CopyWindowToVram(windowId, 2);
+}
+
+void sub_8198D54(u8 windowId, u8 fontId, u8 a2, u8 a3, u8 a4, u8 a5, const struct MenuAction *strs)
+{
+    sub_8198C94(windowId, fontId, GetFontAttribute(fontId, 0), 0, a2, a3, a4, a5, strs);
+}
+
+void sub_8198DBC(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 itemCount, u8 itemCount2, const struct MenuAction *strs, const u8 *a8)
+{
+    u8 i;
+    u8 j;
+    struct TextSubPrinter printer;
+    
+    printer.windowId = windowId;
+    printer.fontId = fontId;
+    printer.fgColor = GetFontAttribute(fontId, 5);
+    printer.bgColor = GetFontAttribute(fontId, 6);
+    printer.shadowColor = GetFontAttribute(fontId, 7);
+    printer.fontColor_l = GetFontAttribute(fontId, 4);
+    printer.letterSpacing = GetFontAttribute(fontId, 2);
+    printer.lineSpacing = GetFontAttribute(fontId, 3);
+    
+    for (i = 0; i < itemCount2; i++)
+    {
+        for (j = 0; j < itemCount; j++)
+        {
+            printer.current_text_offset = strs[a8[(itemCount * i) + j]].text;
+            printer.x = (a4 * j) + left;
+            printer.y = (GetFontAttribute(fontId, 1) * i) + top;
+            printer.currentX = printer.x;
+            printer.currentY = printer.y;
+            AddTextPrinter(&printer, 0xFF, 0);
+        }
+    }
+    
+    CopyWindowToVram(windowId, 2);
+}
+
+void sub_8198EF8(u8 windowId, u8 fontId, u8 a2, u8 a3, u8 a4, u8 a5, const struct MenuAction *strs, const u8 *a8)
+{
+    sub_8198DBC(windowId, fontId, GetFontAttribute(fontId, 0), 0, a2, a4, a5, strs, a8);
+}
+
+u8 sub_8198F58(u8 a0, u8 a1, s8 a2, s8 a3, u8 a4, u8 a5, u8 a6, u8 a7, u8 a8, u8 a9)
+{
+    s32 pos;
+    
+    gUnknown_0203CD90.left = a2;
+    gUnknown_0203CD90.top = a3;
+    gUnknown_0203CD90.minCursorPos = 0;
+    gUnknown_0203CD90.maxCursorPos = a8 - 1;
+    gUnknown_0203CD90.windowId = a0;
+    gUnknown_0203CD90.fontId = a1;
+    gUnknown_0203CD90.menu_field_7 = a4;
+    gUnknown_0203CD90.cursorHeight = a5;
+    gUnknown_0203CD90.menu_field_9 = a6;
+    gUnknown_0203CD90.menu_field_A = a7;
+    
+    pos = a9;
+    
+    if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
+        gUnknown_0203CD90.cursorPos = 0;
+    else
+        gUnknown_0203CD90.cursorPos = pos;
+    
+    sub_8199134(0, 0);
+    return gUnknown_0203CD90.cursorPos;
+}
diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c
index baa053a22..a4aad4058 100644
--- a/src/new_menu_helpers.c
+++ b/src/new_menu_helpers.c
@@ -13,17 +13,23 @@
 #define DLG_WINDOW_PALETTE_NUM 15
 #define DLG_WINDOW_BASE_TILE_NUM 0x200
 
-extern EWRAM_DATA u8 gUnknown_0203CD8C;
-extern EWRAM_DATA u8 gUnknown_0203CD8D;
+static EWRAM_DATA u8 gUnknown_0203CD8C = 0;
+static EWRAM_DATA u8 gUnknown_0203CD8D = 0;
 
-extern const u8 gUnknown_0860EA6C[];
-extern const u16 gUnknown_0860EA4C[];
-extern const u16 gUnknown_0860F074[];
-extern const u8 gUnknown_0860F094[];
-extern const struct WindowTemplate gUnknown_0860F098[];
-extern const struct WindowTemplate gUnknown_0860F0A8;
+const u16 gUnknown_0860F074[] = INCBIN_U16("graphics/interface/860F074.gbapal");
+static const u8 gUnknown_0860F094[] = { 8, 4, 1 };
+
+static const struct WindowTemplate gUnknown_0860F098[] = 
+{
+    { 0x00, 0x02, 0x0F, 0x1B, 0x04, 0x0F, 0x194 },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate gUnknown_0860F0A8 =
+{
+    0x00, 0x15, 0x09, 0x05, 0x04, 0x0F, 0x125
+};
 
-extern void sub_819645C(void);
 // Forward declarations
 extern void sub_81973A4(void);
 extern void DrawStandardFrame(u8, u8, u8, u8, u8, u8);
@@ -31,17 +37,6 @@ extern void DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
 extern void sub_81977BC(u8, u8, u8, u8, u8, u8);
 extern void sub_8197804(u8, u8, u8, u8, u8, u8);
 
-void sub_8197184(u8 window, u32 destTile, u32 destPalette)
-{
-    LoadBgTiles(GetWindowAttribute(window, WINDOW_PRIORITY), gUnknown_0860EA6C, 0x100, destTile);
-    LoadPalette(gUnknown_0860EA4C, destPalette * 16, 32);
-}
-
-void sub_81971C4(void)
-{
-    sub_819645C();
-}
-
 void sub_81971D0(void)
 {
     InitWindows(gUnknown_0860F098);
-- 
cgit v1.2.3


From 95827ab64bc2fe148a3c52b0c341002deec72b0e Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 27 Jan 2018 11:57:46 +0100
Subject: more pokemon anim functions decompiled

---
 src/pokemon_animation.c | 1310 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 1307 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 1cac2c473..87949e88b 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -592,7 +592,23 @@ static const u8 sSpeciesToBackAnimId[] =
     0x11, // SPECIES_CHIMECHO
 };
 
-const u8 gUnknown_0860AA64[] = {0x00, 0x05, 0x01, 0x01, 0x00, 0x0f, 0x01, 0x04, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x00, 0xff};
+const u8 gUnknown_0860AA64[][2] =
+{
+    {0, 5},
+    {1, 1},
+    {0, 15},
+    {1, 4},
+    {0, 2},
+    {1, 2},
+    {0, 2},
+    {1, 2},
+    {0, 2},
+    {1, 2},
+    {0, 2},
+    {1, 2},
+    {0, 2},
+    {0, 0xFF}
+};
 
 const u8 gUnknown_0860AA80[][2] =
 {
@@ -834,8 +850,6 @@ static const union AffineAnimCmd *const gSpriteAffineAnimTable_860AD68[] =
     gSpriteAffineAnim_860AD58
 };
 
-extern const s8 gUnknown_0860AD70[][3];
-
 // code
 void MonAnimDummySpriteCallback(struct Sprite *sprite)
 {
@@ -1301,6 +1315,20 @@ void pokemonanimfunc_09(struct Sprite *sprite)
     sprite->data[2]++;
 }
 
+static const s8 gUnknown_0860AD70[][3] =
+{
+    {-1, -1, 6},
+    {2,   0, 6},
+    {-2,  2, 6},
+    {2,   0, 6},
+    {-2, -2, 6},
+    {2,   0, 6},
+    {-2,  2, 6},
+    {2,   0, 6},
+    {-1, -1, 6},
+    {0,   0, 0},
+};
+
 void sub_817FC20(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
@@ -1828,3 +1856,1279 @@ void pokemonanimfunc_1D(struct Sprite *sprite)
     sprite->data[2]++;
     sub_817F70C(sprite);
 }
+
+void sub_8180714(struct Sprite *sprite)
+{
+    s16 posY = 0;
+
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[3] = 0;
+    }
+
+    sub_817F70C(sprite);
+
+    if (sprite->data[2] > sprite->data[0] * 3)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->pos2.y = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 yScale = Sin(sprite->data[4], 32) + 256;
+
+        if (sprite->data[2] > sprite->data[0] && sprite->data[2] < sprite->data[0] * 2)
+            sprite->data[3] += (128 / sprite->data[0]);
+        if (yScale > 256)
+            posY = (256 - yScale) / 8;
+
+        sprite->pos2.y = -(Sin(sprite->data[3], 10)) - posY;
+        HandleSetAffineData(sprite, 0x100 - Sin(sprite->data[4], 32), yScale, 0);
+        sprite->data[2]++;
+        sprite->data[4] = (sprite->data[4] + 128 / sprite->data[0]) & 0xFF;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_00(struct Sprite *sprite)
+{
+    sprite->data[0] = 16;
+    sub_8180714(sprite);
+    sprite->callback = sub_8180714;
+}
+
+void sub_8180828(struct Sprite *sprite)
+{
+    s16 posY = 0;
+
+    if (sprite->data[2] > (128 / sprite->data[6]) * sprite->data[7])
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->pos2.y = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 yScale = Sin(sprite->data[4], 32) + 256;
+
+        if (yScale > 256)
+            posY = (256 - yScale) / 8;
+
+        sprite->pos2.y = -(posY);
+        HandleSetAffineData(sprite, Sin(sprite->data[4], 48) + 256, yScale, 0);
+        sprite->data[2]++;
+        sprite->data[4] = (sprite->data[4] + sprite->data[6]) & 0xFF;
+    }
+}
+
+void pokemonanimfunc_13(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[7] = 3;
+        sprite->data[6] = 8;
+    }
+
+    sub_8180828(sprite);
+}
+
+static const s8 gUnknown_0860AD8E[][8][3] =
+{
+    {
+        {0,  8, 8},
+        {8, -8, 12},
+        {-8, 8, 12},
+        {8, -8, 12},
+        {-8, 8, 12},
+        {8, -8, 12},
+        {-8, 0, 12},
+        {0,  0, 0}
+    },
+    {
+        {0,  8, 16},
+        {8, -8, 24},
+        {-8, 8, 24},
+        {8, -8, 24},
+        {-8, 8, 24},
+        {8, -8, 24},
+        {-8, 0, 24},
+        {0,  0, 0}
+    },
+};
+
+void sub_8180900(struct Sprite *sprite)
+{
+    s16 var;
+    u8 structId;
+    s8 r9;
+    s16 r10;
+    s16 r7;
+    u32 arrId;
+
+    sub_817F70C(sprite);
+    structId = sprite->data[0];
+    var = gUnknown_03001240[structId].field_6;
+    r9 = gUnknown_0860AD8E[gUnknown_03001240[structId].field_8][sprite->data[4]][0];
+    r10 = gUnknown_0860AD8E[gUnknown_03001240[structId].field_8][sprite->data[4]][1] - r9;
+    arrId = gUnknown_03001240[structId].field_8;
+    r7 = sprite->data[3];
+
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+    }
+
+    if (gUnknown_0860AD8E[arrId][sprite->data[4]][2] == 0)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        u16 rotation;
+
+        sprite->pos2.y = -(Sin(r7 * 128 / gUnknown_0860AD8E[arrId][sprite->data[4]][2], 10));
+        sprite->pos2.x = (r10 * r7 / gUnknown_0860AD8E[arrId][sprite->data[4]][2]) + r9;
+
+        rotation = -(var * sprite->pos2.x) / 8;
+        HandleSetAffineData(sprite, 0x100, 0x100, rotation);
+
+        if (r7 == gUnknown_0860AD8E[arrId][sprite->data[4]][2])
+        {
+            sprite->data[4]++;
+            sprite->data[3] = 0;
+        }
+        else
+        {
+            sprite->data[3]++;
+        }
+    }
+
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_05(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+    gUnknown_03001240[id].field_6 = 4096;
+    gUnknown_03001240[id].field_8 = sprite->data[6];
+    sub_8180900(sprite);
+    sprite->callback = sub_8180900;
+}
+
+const u8 gUnknown_0860ADBE[] = {0x01, 0x01, 0x0c, 0xfe, 0x00, 0x0c, 0x01, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+void pokemonanimfunc_20(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+
+    if (sprite->data[2] > 128)
+    {
+        BlendPalette(sprite->data[7], 0x10, 0, 0x2DF);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->data[6] = Sin(sprite->data[2], 12);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0x2DF);
+    }
+
+    sprite->data[2] += 2;
+}
+
+void pokemonanimfunc_21(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+
+    if (sprite->data[2] > 128)
+    {
+        BlendPalette(sprite->data[7], 0x10, 0, 0x1F);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->data[6] = Sin(sprite->data[2], 12);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0x1F);
+    }
+
+    sprite->data[2] += 2;
+}
+
+void pokemonanimfunc_22(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+
+    if (sprite->data[2] > 128)
+    {
+        BlendPalette(sprite->data[7], 0x10, 0, 0x7C00);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->data[6] = Sin(sprite->data[2], 12);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0x7C00);
+    }
+
+    sprite->data[2] += 2;
+}
+
+void pokemonanimfunc_23(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+
+    if (sprite->data[2] > 128)
+    {
+        BlendPalette(sprite->data[7], 0x10, 0, 0x3FF);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->data[6] = Sin(sprite->data[2], 12);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0x3FF);
+    }
+
+    sprite->data[2] += 2;
+}
+
+void pokemonanimfunc_24(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+
+    if (sprite->data[2] > 128)
+    {
+        BlendPalette(sprite->data[7], 0x10, 0, 0x6018);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->data[6] = Sin(sprite->data[2], 12);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0x6018);
+    }
+
+    sprite->data[2] += 2;
+}
+
+void sub_8180CB4(struct Sprite *sprite);
+void sub_8180CE8(struct Sprite *sprite);
+void sub_8180D44(struct Sprite *sprite);
+void sub_8180DC0(struct Sprite *sprite);
+void sub_8180E28(struct Sprite *sprite);
+
+void pokemonanimfunc_25(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->callback = sub_8180CB4;
+}
+
+void sub_8180CB4(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (++sprite->pos2.x > 7)
+    {
+        sprite->pos2.x = 8;
+        sprite->data[7] = 2;
+        sprite->callback = sub_8180CE8;
+    }
+    sub_817F70C(sprite);
+}
+
+void sub_8180CE8(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+
+    sprite->pos2.x -= sprite->data[7];
+    sprite->data[7]++;
+    if (sprite->pos2.x <= 0)
+    {
+        s16 subResult;
+        u8 var = sprite->data[7];
+        sprite->data[6] = 0;
+        subResult = sprite->pos2.x;
+
+        do
+        {
+            subResult -= var;
+            sprite->data[6]++;
+            var++;
+        }
+        while (subResult > -8);
+
+        sprite->data[5] = 1;
+        sprite->callback = sub_8180D44;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8180D44(struct Sprite *sprite)
+{
+    u8 rotation;
+
+    sub_817F70C(sprite);
+    sprite->pos2.x -= sprite->data[7];
+    sprite->data[7]++;
+    rotation = (sprite->data[5] * 6) / sprite->data[6];
+
+    if (++sprite->data[5] > sprite->data[6])
+        sprite->data[5] = sprite->data[6];
+
+    HandleSetAffineData(sprite, 0x100, 0x100, rotation * 256);
+
+    if (sprite->pos2.x < -8)
+    {
+        sprite->pos2.x = -8;
+        sprite->data[4] = 2;
+        sprite->data[3] = 0;
+        sprite->data[2] = rotation;
+        sprite->callback = sub_8180DC0;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8180DC0(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+
+    if (sprite->data[3] > 11)
+    {
+        sprite->data[2] -= 2;
+        if (sprite->data[2] < 0)
+            sprite->data[2] = 0;
+
+        HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[2] << 8);
+        if (sprite->data[2] == 0)
+            sprite->callback = sub_8180E28;
+    }
+    else
+    {
+        sprite->pos2.x += sprite->data[4];
+        sprite->data[4] *= -1;
+        sprite->data[3]++;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8180E28(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+
+    sprite->pos2.x += 2;
+    if (sprite->pos2.x > 0)
+    {
+        sprite->pos2.x = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8180E78(struct Sprite *sprite);
+void sub_8180ED0(struct Sprite *sprite);
+void sub_8180F2C(struct Sprite *sprite);
+
+void pokemonanimfunc_26(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->data[3] = 0;
+    sprite->callback = sub_8180E78;
+}
+
+void sub_8180E78(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->pos2.x++;
+    sprite->pos2.y--;
+
+    if (sprite->pos2.x % 2 == 0 && sprite->data[3] <= 0)
+        sprite->data[3] = 10;
+    if (sprite->pos2.x > 7)
+    {
+        sprite->pos2.x = 8;
+        sprite->pos2.y = -8;
+        sprite->data[4] = 0;
+        sprite->callback = sub_8180ED0;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8180ED0(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->pos2.x = Cos(sprite->data[4], 16) - 8;
+    sprite->pos2.y = Sin(sprite->data[4], 16) - 8;
+
+    if (sprite->data[4] > 63)
+    {
+        sprite->data[2] = 160;
+        sprite->data[3] = 10;
+        sprite->callback = sub_8180F2C;
+    }
+    sprite->data[4] += 8;
+    if (sprite->data[4] > 64)
+        sprite->data[4] = 64;
+
+    sub_817F70C(sprite);
+}
+
+void sub_8180F2C(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+
+    if (sprite->data[3] > 0)
+    {
+        sprite->data[3]--;
+    }
+    else
+    {
+        u32 rotation;
+
+        sprite->pos2.x = Cos(sprite->data[2], 5) - 4;
+        sprite->pos2.y = -(Sin(sprite->data[2], 5)) + 4;
+        sprite->data[2] -= 4;
+        rotation = sprite->data[2] - 32;
+        HandleSetAffineData(sprite, 0x100, 0x100, rotation * 512);
+
+        if (sprite->data[2] <= 32)
+        {
+            sprite->pos2.x = 0;
+            sprite->pos2.y = 0;
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+    }
+
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_27(struct Sprite *sprite)
+{
+    if (sprite->data[3] > 0)
+    {
+        sprite->data[3]--;
+    }
+    else
+    {
+        sprite->data[4] = (sprite->data[4] == 0) ? 1 : 0;
+        sprite->invisible = sprite->data[4];
+        if (++sprite->data[2] > 19)
+        {
+            sprite->invisible = 0;
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+        sprite->data[3] = 2;
+    }
+}
+
+void sub_8181024(struct Sprite *sprite);
+void sub_8181068(struct Sprite *sprite);
+void sub_81810C4(struct Sprite *sprite);
+
+void pokemonanimfunc_28(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->callback = sub_8181024;
+}
+
+void sub_8181024(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->pos2.x--;
+    sprite->pos2.y++;
+
+    if (sprite->pos2.x <= -16)
+    {
+        sprite->pos2.x = -16;
+        sprite->pos2.y = 16;
+        sprite->callback = sub_8181068;
+        sprite->data[2] = 160;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8181068(struct Sprite *sprite)
+{
+    u32 rotation;
+
+    sub_817F70C(sprite);
+    sprite->data[2] -= 4;
+    sprite->pos2.x = Cos(sprite->data[2], 22);
+    sprite->pos2.y = -(Sin(sprite->data[2], 22));
+    rotation = sprite->data[2] - 32;
+    HandleSetAffineData(sprite, 0x100, 0x100, rotation * 512);
+
+    if (sprite->data[2] <= 32)
+        sprite->callback = sub_81810C4;
+
+    sub_817F70C(sprite);
+}
+
+void sub_81810C4(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->pos2.x--;
+    sprite->pos2.y++;
+
+    if (sprite->pos2.x <= 0)
+    {
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8181110(struct Sprite *sprite);
+void sub_8181144(struct Sprite *sprite);
+void sub_81811A4(struct Sprite *sprite);
+
+void pokemonanimfunc_29(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->callback = sub_8181110;
+}
+
+void sub_8181110(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->pos2.x++;
+    sprite->pos2.y--;
+
+    if (sprite->pos2.x > 15)
+    {
+        sprite->data[2] = 0;
+        sprite->callback = sub_8181144;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8181144(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->data[2] += 16;
+
+    if (sprite->pos2.x <= -16)
+    {
+        sprite->pos2.x = -16;
+        sprite->pos2.y = 16;
+        sprite->data[2] = 0;
+        sprite->callback = sub_81811A4;
+    }
+    else
+    {
+        sprite->pos2.x -= 2;
+        sprite->pos2.y += 2;
+    }
+
+    HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[2] << 8);
+    sub_817F70C(sprite);
+}
+
+void sub_81811A4(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->pos2.x++;
+    sprite->pos2.y--;;
+
+    if (sprite->pos2.x >= 0)
+    {
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8181214(struct Sprite *sprite);
+
+void pokemonanimfunc_2A(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+    gUnknown_03001240[id].field_2 = 2;
+    sub_8181214(sprite);
+    sprite->callback = sub_8181214;
+}
+
+void sub_8181214(struct Sprite *sprite)
+{
+    if (gUnknown_03001240[sprite->data[0]].field_0 != 0)
+    {
+        gUnknown_03001240[sprite->data[0]].field_0--;
+    }
+    else
+    {
+        sub_817F70C(sprite);
+        if (sprite->data[2] == 0)
+        {
+            sprite->data[2]++;
+            HandleStartAffineAnim(sprite);
+            sprite->data[7] = gUnknown_03001240[sprite->data[0]].field_2;
+            sprite->data[3] = -1;
+            sprite->data[4] = -1;
+            sprite->data[5] = 0;
+            sprite->data[6] = 0;
+        }
+
+        sprite->pos2.x += (sprite->data[7] * 2 * sprite->data[3]);
+        sprite->pos2.y += (sprite->data[7] * sprite->data[4]);
+        sprite->data[6] += 8;
+        if (sprite->pos2.x <= -16 || sprite->pos2.x >= 16)
+        {
+            sprite->pos2.x = sprite->data[3] * 16;
+            sprite->data[3] *= -1;
+            sprite->data[5]++;
+        }
+        else if (sprite->pos2.y <= -16 || sprite->pos2.y >= 16)
+        {
+            sprite->pos2.y = sprite->data[4] * 16;
+            sprite->data[4] *= -1;
+            sprite->data[5]++;
+        }
+
+        if (sprite->data[5] > 5 && sprite->pos2.x <= 0)
+        {
+            sprite->pos2.x = 0;
+            sprite->pos2.y = 0;
+            if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+            {
+                gUnknown_03001240[sprite->data[0]].field_4--;
+                sprite->data[5] = 0;
+                sprite->data[6] = 0;
+                gUnknown_03001240[sprite->data[0]].field_0 = 10;
+            }
+            else
+            {
+                sub_817F77C(sprite);
+                sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+            }
+        }
+
+        HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[6] << 8);
+        sub_817F70C(sprite);
+    }
+}
+
+void sub_8181370(struct Sprite *sprite);
+
+void pokemonanimfunc_2B(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->data[6] = 0;
+    sprite->data[7] = 0;
+    sprite->callback = sub_8181370;
+}
+
+void sub_8181370(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->data[6] += 4;
+    sprite->pos2.x = -(Sin(sprite->data[6], 16));
+    sprite->pos2.y = -(Sin((sprite->data[6] * 2) & 0xFF, 8));
+    if (sprite->data[6] > 192 && sprite->data[7] == 1)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->data[7]++;
+    }
+    else if (sprite->data[6] > 64 && sprite->data[7] == 0)
+    {
+        HandleSetAffineData(sprite, -0x100, 0x100, 0);
+        sprite->data[7]++;
+    }
+
+    if (sprite->data[6] > 255)
+    {
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_2C(struct Sprite *sprite)
+{
+    if (++sprite->data[2] == 1)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[6] = 0;
+        sprite->data[5] = 0;
+        sprite->data[4] = 0;
+    }
+
+    if (gUnknown_0860AA64[sprite->data[6]][1] == 0xFF)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        if (sprite->data[4] == 1)
+        {
+            if (gUnknown_0860AA64[sprite->data[6]][0] != 0)
+                BlendPalette(sprite->data[7], 0x10, 0x10, 0x3FF);
+            else
+                BlendPalette(sprite->data[7], 0x10, 0, 0x3FF);
+
+            sprite->data[4] = 0;
+        }
+
+        if (gUnknown_0860AA64[sprite->data[6]][1] == sprite->data[5])
+        {
+            sprite->data[4] = 1;
+            sprite->data[5] = 0;
+            sprite->data[6]++;
+        }
+        else
+        {
+            sprite->data[5]++;
+        }
+    }
+}
+
+void sub_81814D4(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    sub_817F70C(sprite);
+    if (sprite->data[2] > gUnknown_03001240[sprite->data[0]].field_8)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->pos2.x = 0;
+        if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+        {
+            gUnknown_03001240[sprite->data[0]].field_4--;
+            sprite->data[2] = 0;
+        }
+        else
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+    }
+    else
+    {
+        s16 index = (sprite->data[2] * 256) / gUnknown_03001240[sprite->data[0]].field_8;
+        sprite->pos2.x = -(Sin(index, 10));
+        HandleSetAffineData(sprite, 0x100, 0x100, Sin(index, 3276));
+    }
+
+    sprite->data[2]++;
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_2D(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+    gUnknown_03001240[id].field_8 = 50;
+    sub_81814D4(sprite);
+    sprite->callback = sub_81814D4;
+}
+
+void sub_81815D4(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        HandleStartAffineAnim(sprite);
+
+    sub_817F70C(sprite);
+    if (sprite->data[2] > gUnknown_03001240[sprite->data[0]].field_8)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->pos2.x = 0;
+        if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+        {
+            gUnknown_03001240[sprite->data[0]].field_4--;
+            sprite->data[2] = 0;
+        }
+        else
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+    }
+    else
+    {
+        s16 index = (sprite->data[2] * 256) / gUnknown_03001240[sprite->data[0]].field_8;
+        sprite->pos2.x = -(Sin(index, 10));
+        HandleSetAffineData(sprite, 0x100, 0x100, -(Sin(index, 3276)));
+    }
+
+    sprite->data[2]++;
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_2E(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+    gUnknown_03001240[id].field_8 = 50;
+    sub_81815D4(sprite);
+    sprite->callback = sub_81815D4;
+}
+
+void sub_8181708(struct Sprite *sprite);
+void sub_8181770(struct Sprite *sprite);
+void sub_8181794(struct Sprite *sprite);
+
+void pokemonanimfunc_2F(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->data[6] = -(14 * sprite->centerToCornerVecX / 10);
+    sprite->data[7] = 128;
+    sprite->callback = sub_8181708;
+}
+
+void sub_8181708(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->data[7]--;
+    sprite->pos2.x = Cos(sprite->data[7], sprite->data[6]) + sprite->data[6];
+
+    sprite->pos2.y = -(Sin(sprite->data[7], sprite->data[6] += 0)); // dummy += 0 is needed to match
+
+    HandleSetAffineData(sprite, 0x100, 0x100, (sprite->data[7] - 128) << 8);
+    if (sprite->data[7] <= 120)
+    {
+        sprite->data[7] = 120;
+        sprite->data[3] = 0;
+        sprite->callback = sub_8181770;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8181770(struct Sprite *sprite)
+{
+    if (sprite->data[3] == 20)
+    {
+        sprite->callback = sub_8181794;
+        sprite->data[3] = 0;
+    }
+
+    sprite->data[3]++;
+}
+
+void sub_8181794(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->data[7] += 2;
+    sprite->pos2.x = Cos(sprite->data[7], sprite->data[6]) + sprite->data[6];
+
+    sprite->pos2.y = -(Sin(sprite->data[7], sprite->data[6] += 0)); // dummy += 0 is needed to match
+
+    HandleSetAffineData(sprite, 0x100, 0x100, (sprite->data[7] - 128) << 8);
+    if (sprite->data[7] >= 128)
+    {
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->data[2] = 0;
+        sub_817F77C(sprite);
+        sprite->callback = pokemonanimfunc_10;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8181810(struct Sprite *sprite)
+{
+    if (gUnknown_03001240[sprite->data[0]].field_0 != 0)
+    {
+        gUnknown_03001240[sprite->data[0]].field_0--;
+    }
+    else
+    {
+        if (sprite->data[2] == 0)
+        {
+            HandleStartAffineAnim(sprite);
+            sprite->data[4] = 0;
+            sprite->data[5] = 0;
+            sprite->data[2] = 1;
+        }
+
+        if (sprite->data[5] == 0)
+        {
+            sprite->data[7] = Sin(sprite->data[4], 256);
+            sprite->pos2.y = Sin(sprite->data[4], 16);
+            sprite->data[6] = Sin(sprite->data[4], 32);
+            HandleSetAffineData(sprite, 0x100 - sprite->data[6], 0x100 + sprite->data[7], 0);
+            if (sprite->data[4] == 128)
+            {
+                sprite->data[4] = 0;
+                sprite->data[5] = 1;
+            }
+        }
+        else if (sprite->data[5] == 1)
+        {
+            sprite->data[7] = Sin(sprite->data[4], 32);
+            sprite->pos2.y = -(Sin(sprite->data[4], 8));
+            sprite->data[6] = Sin(sprite->data[4], 128);
+            HandleSetAffineData(sprite, 0x100 + sprite->data[6], 0x100 - sprite->data[7], 0);
+            if (sprite->data[4] == 128)
+            {
+                if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+                {
+                    gUnknown_03001240[sprite->data[0]].field_4--;
+                    gUnknown_03001240[sprite->data[0]].field_0 = 10;
+                    sprite->data[4] = 0;
+                    sprite->data[5] = 0;
+                }
+                else
+                {
+                    HandleSetAffineData(sprite, 0x100, 0x100, 0);
+                    sub_817F77C(sprite);
+                    sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+                }
+            }
+        }
+
+        sprite->data[4] += gUnknown_03001240[sprite->data[0]].field_6;
+    }
+}
+
+void pokemonanimfunc_30(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+    gUnknown_03001240[id].field_6 = 4;
+    sub_8181810(sprite);
+    sprite->callback = sub_8181810;
+}
+
+void pokemonanimfunc_31(struct Sprite *sprite)
+{
+    s32 counter = sprite->data[2];
+    sub_817F70C(sprite);
+    if (counter > 512)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        switch (sprite->data[2] / 128)
+        {
+        case 0:
+            sprite->pos2.x = -(counter % 128 * 8) / 128;
+            break;
+        case 1:
+            sprite->pos2.x = (counter % 128 / 16) - 8;
+            break;
+        case 2:
+            sprite->pos2.x = (counter % 128 / 16);
+            break;
+        case 3:
+            sprite->pos2.x = -(counter % 128 * 8) / 128 + 8;
+            break;
+        }
+
+        sprite->pos2.y = -(Sin(counter % 128, 8));
+    }
+
+    sprite->data[2] += 12;
+    sub_817F70C(sprite);
+}
+
+void sub_8181ABC(struct Sprite *sprite);
+void sub_8181B4C(struct Sprite *sprite);
+void sub_8181C2C(struct Sprite *sprite);
+
+void pokemonanimfunc_32(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+    gUnknown_03001240[id].field_8 = -1;
+    HandleStartAffineAnim(sprite);
+    sprite->data[3] = 0;
+    sub_8181ABC(sprite);
+    sprite->callback = sub_8181ABC;
+}
+
+void sub_8181ABC(struct Sprite *sprite)
+{
+    if (gUnknown_03001240[sprite->data[0]].field_0 != 0)
+    {
+        gUnknown_03001240[sprite->data[0]].field_0--;
+    }
+    else
+    {
+        s32 counter;
+
+        sub_817F70C(sprite);
+        counter = sprite->data[2];
+        if (sprite->data[2] > 128)
+        {
+            sprite->data[2] = 0;
+            sprite->callback = sub_8181B4C;
+        }
+        else
+        {
+            s32 var = 8 * gUnknown_03001240[sprite->data[0]].field_8;
+            sprite->pos2.x = var * (counter % 128) / 128;
+            sprite->pos2.y = -(Sin(counter % 128, 8));
+            sprite->data[2] += 12;
+        }
+
+        sub_817F70C(sprite);
+    }
+}
+
+void sub_8181B4C(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] > 48)
+    {
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->pos2.y = 0;
+        sprite->data[2] = 0;
+        sprite->callback = sub_8181C2C;
+    }
+    else
+    {
+        s16 yDelta;
+        s16 yScale = Sin(sprite->data[4], 64) + 256;
+        if (sprite->data[2] >= 16 && sprite->data[2] <= 31)
+        {
+            sprite->data[3] += 8;
+            sprite->pos2.x -= gUnknown_03001240[sprite->data[0]].field_8;
+        }
+
+        yDelta = 0;
+        if (yScale > 256)
+            yDelta = (256 - yScale) / 8;
+
+        sprite->pos2.y = -(Sin(sprite->data[3], 20)) - yDelta;
+        HandleSetAffineData(sprite, 256 - Sin(sprite->data[4], 32), yScale, 0);
+        sprite->data[2]++;
+        sprite->data[4] += 8;
+        sprite->data[4] &= 0xFF;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8181C2C(struct Sprite *sprite)
+{
+    s32 counter;
+
+    sub_817F70C(sprite);
+    counter = sprite->data[2];
+    if (counter > 128)
+    {
+        if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+        {
+            gUnknown_03001240[sprite->data[0]].field_4--;
+            gUnknown_03001240[sprite->data[0]].field_0 = 10;
+            sprite->data[3] = 0;
+            sprite->data[2] = 0;
+            sprite->data[4] = 0;
+            sprite->callback = sub_8181ABC;
+        }
+        else
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        register s32 var asm("r4") = gUnknown_03001240[sprite->data[0]].field_8;
+
+        sprite->pos2.x = (var << 3) * (counter % 128) / 128 - (gUnknown_03001240[sprite->data[0]].field_8 * 8);
+        sprite->pos2.y = -(Sin(counter % 128, 8));
+    }
+
+    sprite->data[2] += 12;
+    sub_817F70C(sprite);
+}
+
+void sub_8181CE8(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+    }
+
+    sub_817F70C(sprite);
+    if (sprite->data[7] > 254)
+    {
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+        {
+            gUnknown_03001240[sprite->data[0]].field_4--;
+            sprite->data[2] = 0;
+            sprite->data[7] = 0;
+        }
+        else
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+
+        sub_817F70C(sprite);
+    }
+    else
+    {
+        u16 rotation;
+
+        sprite->pos2.x = -(Sin(sprite->data[7], 16));
+        rotation = Sin(sprite->data[7], 32);
+        HandleSetAffineData(sprite, 0x100, 0x100, rotation << 8);
+        sprite->data[7] += gUnknown_03001240[sprite->data[0]].field_6;
+        sub_817F70C(sprite);
+    }
+}
+
+void pokemonanimfunc_33(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+    gUnknown_03001240[id].field_6 = 4;
+    sub_8181CE8(sprite);
+    sprite->callback = sub_8181CE8;
+}
+
+void pokemonanimfunc_34(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+    }
+
+    sub_817F70C(sprite);
+    if (sprite->data[7] > 254)
+    {
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sub_817F70C(sprite);
+    }
+    else
+    {
+        u16 rotation;
+
+        sprite->pos2.x = -(Sin(sprite->data[7], 16));
+        sprite->pos2.y = -(Sin(sprite->data[7] % 128, 16));
+        rotation = Sin(sprite->data[7], 32);
+        HandleSetAffineData(sprite, 0x100, 0x100, rotation << 8);
+        sprite->data[7] += 8;
+        sub_817F70C(sprite);
+    }
+}
+
+void pokemonanimfunc_35(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        sprite->data[7] = 0;
+
+    if (sprite->data[2] == sprite->data[7])
+    {
+        sprite->data[7] = 0;
+        sprite->data[2]++;
+        sprite->invisible = 0;
+    }
+    else
+    {
+        sprite->data[7]++;
+        sprite->invisible = 1;
+    }
+
+    if (sprite->data[2] > 10)
+    {
+        sprite->invisible = 0;
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+}
+
+void sub_8181F14(struct Sprite *sprite);
+void sub_8181F50(struct Sprite *sprite);
+void sub_8181FC0(struct Sprite *sprite);
+
+void pokemonanimfunc_36(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->data[7] = 0;
+    sprite->callback = sub_8181F14;
+}
+
+void sub_8181F14(struct Sprite *sprite)
+{
+    if (sprite->data[7] > 31)
+    {
+        sprite->data[7] = 32;
+        sprite->data[2] = 0;
+        sprite->callback = sub_8181F50;
+    }
+    else
+    {
+        sprite->data[7] += 4;
+    }
+
+    HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[7] << 8);
+}
+
+void sub_8181F50(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] > 512)
+    {
+        sprite->callback = sub_8181FC0;
+        sprite->data[6] = 0;
+    }
+    else
+    {
+        sprite->pos2.x = -(sprite->data[2] * 16) / 512;
+        sprite->pos2.y = -(Sin(sprite->data[2] % 128, 4));
+        sprite->data[2] += 12;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_8181FC0(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->data[7] -= 2;
+    if (sprite->data[7] < 0)
+    {
+        sprite->data[7] = 0;
+        sprite->pos2.x = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->pos2.x = -(Sin(sprite->data[7] * 2, 16));
+    }
+
+    HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[7] << 8);
+    sub_817F70C(sprite);
+}
-- 
cgit v1.2.3


From 8ca9bbe425ef909716317fb7d8751886f8db8c3b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 27 Jan 2018 21:10:00 +0100
Subject: more pokemon anim functions decompiled

---
 src/pokemon_animation.c | 1082 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 1072 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 87949e88b..1496069df 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -1071,14 +1071,13 @@ void pokemonanimfunc_02(struct Sprite *sprite)
     }
     else
     {
-        s8 var;
-
+        s8 sign;
         if (!(sprite->data[2] & 1))
-            var = 1;
+            sign = 1;
         else
-            var = -1;
+            sign = -1;
 
-        sprite->pos2.x = Sin((sprite->data[2] * 128 / 40) % 256, 6) * var;
+        sprite->pos2.x = Sin((sprite->data[2] * 128 / 40) % 256, 6) * sign;
     }
 
     sprite->data[2]++;
@@ -1427,19 +1426,19 @@ void pokemonanimfunc_11(struct Sprite *sprite)
     }
     else
     {
-        s8 var;
+        s8 sign;
         s32 index, amplitude;
 
         if (!(sprite->data[2] & 1))
-            var = 1;
+            sign = 1;
         else
-            var = -1;
+            sign = -1;
 
         amplitude = Sin(sprite->data[2] / 4, 8);
         index = sprite->data[2] % 256;
 
-        sprite->pos2.y = Sin(index, amplitude) * var;
-        sprite->pos2.x = Cos(index, amplitude) * var;
+        sprite->pos2.y = Sin(index, amplitude) * sign;
+        sprite->pos2.x = Cos(index, amplitude) * sign;
     }
 
     sprite->data[2] += 9;
@@ -3132,3 +3131,1066 @@ void sub_8181FC0(struct Sprite *sprite)
     HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[7] << 8);
     sub_817F70C(sprite);
 }
+
+void pokemonanimfunc_37(struct Sprite *sprite)
+{
+    u16 rotation;
+
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+    }
+
+    sub_817F70C(sprite);
+    if (sprite->data[7] > 255)
+    {
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        sprite->data[7] = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->data[7] += 16;
+        sprite->pos2.x = -(Sin(sprite->data[7] % 128, 8));
+        sprite->pos2.y = -(Sin(sprite->data[7] % 128, 8));
+    }
+
+    rotation = Sin(sprite->data[7] % 128, 16);
+    HandleSetAffineData(sprite, 0x100, 0x100, rotation << 8);
+    sub_817F70C(sprite);
+}
+
+void sub_81820FC(struct Sprite *sprite);
+void sub_818216C(struct Sprite *sprite);
+void sub_81821CC(struct Sprite *sprite);
+void sub_8182248(struct Sprite *sprite);
+
+void pokemonanimfunc_38(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->data[7] = 0;
+    sprite->data[4] = 0;
+    sprite->callback = sub_81820FC;
+}
+
+void sub_81820FC(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[7] > 24)
+    {
+        if (++sprite->data[4] > 4)
+        {
+            sprite->data[4] = 0;
+            sprite->callback = sub_818216C;
+        }
+    }
+    else
+    {
+        sprite->data[7] += 2;
+        sprite->pos2.x = Sin(sprite->data[7], 8);
+        sprite->pos2.y = -(Sin(sprite->data[7], 8));
+    }
+
+    HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+    sub_817F70C(sprite);
+}
+
+void sub_818216C(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[7] > 32)
+    {
+        sprite->data[6] = 1;
+        sprite->callback = sub_81821CC;
+    }
+    else
+    {
+        sprite->data[7] += 2;
+        sprite->pos2.x = Sin(sprite->data[7], 8);
+        sprite->pos2.y = -(Sin(sprite->data[7], 8));
+    }
+
+    HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+    sub_817F70C(sprite);
+}
+
+void sub_81821CC(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->data[7] += (sprite->data[6] * 4);
+    if (sprite->data[5] > 9)
+    {
+        sprite->data[7] = 32;
+        sprite->callback = sub_8182248;
+    }
+
+    sprite->pos2.x = Sin(sprite->data[7], 8);
+    sprite->pos2.y = -(Sin(sprite->data[7], 8));
+    if (sprite->data[7] <= 28 || sprite->data[7] >= 36)
+    {
+        sprite->data[6] *= -1;
+        sprite->data[5]++;
+    }
+
+    HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+    sub_817F70C(sprite);
+}
+
+void sub_8182248(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[7] <= 0)
+    {
+        sprite->data[7] = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->data[7] -= 2;
+        sprite->pos2.x = Sin(sprite->data[7], 8);
+        sprite->pos2.y = -(Sin(sprite->data[7], 8));
+    }
+
+    HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_39(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] > 40)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+    }
+    else
+    {
+        s8 sign;
+        if (!(sprite->data[2] & 1))
+            sign = 1;
+        else
+            sign = -1;
+
+        if ((sprite->data[2] % 4) / 2 == 0)
+        {
+            sprite->pos2.x = Sin((sprite->data[2] * 128 / 40) % 256, 16) * sign;
+            sprite->pos2.y = -(sprite->pos2.x);
+        }
+        else
+        {
+            sprite->pos2.x = -(Sin((sprite->data[2] * 128 / 40) % 256, 16)) * sign;
+            sprite->pos2.y = sprite->pos2.x;
+        }
+    }
+
+    sprite->data[2]++;
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_3A(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[5] = 0;
+        sprite->data[6] = 0;
+        sprite->data[7] = 0;
+        sprite->data[2]++;
+    }
+
+    if (sprite->data[6] > 0)
+    {
+        sprite->data[6]--;
+        if (sprite->data[5] != 3)
+        {
+            s16 scale = (8 * sprite->data[6]) / 20;
+            scale = Sin(sprite->data[7] - scale, 64);
+            HandleSetAffineData(sprite, 0x100 - scale, 0x100 - scale, 0);
+        }
+    }
+    else
+    {
+        s16 var;
+
+        if (sprite->data[5] == 3)
+        {
+            if (sprite->data[7] > 63)
+            {
+                sprite->data[7] = 64;
+                HandleSetAffineData(sprite, 0x100, 0x100, 0);
+                sub_817F77C(sprite);
+                sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+            }
+            var = Cos(sprite->data[7], 64);
+        }
+        else
+        {
+            var = Sin(sprite->data[7], 64);
+            if (sprite->data[7] > 63)
+            {
+                sprite->data[5] = 3;
+                sprite->data[6] = 10;
+                sprite->data[7] = 0;
+            }
+            else
+            {
+                if (var > 48 && sprite->data[5] == 1)
+                {
+                    sprite->data[5] = 2;
+                    sprite->data[6] = 20;
+                }
+                else if (var > 16 && sprite->data[5] == 0)
+                {
+                    sprite->data[5] = 1;
+                    sprite->data[6] = 20;
+                }
+            }
+        }
+
+        sprite->data[7] += 2;
+        HandleSetAffineData(sprite, 0x100 - var, 0x100 - var, 0);
+    }
+
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_3B(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+    }
+
+    if (sprite->data[7] > 512)
+    {
+        sprite->pos2.y = 0;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 yScale;
+
+        sprite->pos2.y = Sin(sprite->data[7] % 256, 8);
+        sprite->data[7] += 8;
+        yScale = Sin(sprite->data[7] % 128, 96);
+        HandleSetAffineData(sprite, 0x100, yScale + 0x100, 0);
+    }
+}
+
+void pokemonanimfunc_3C(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+    }
+
+    if (sprite->data[7] > 256)
+    {
+        sprite->pos2.y = 0;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 yScale;
+
+        sprite->pos2.y = Sin(sprite->data[7], 16);
+        sprite->data[7] += 4;
+        yScale = Sin((sprite->data[7] % 64) * 2, 128);
+        HandleSetAffineData(sprite, 0x100, yScale + 0x100, 0);
+    }
+}
+
+void sub_81825F8(struct Sprite *sprite);
+void sub_8182648(struct Sprite *sprite);
+void sub_81826F8(struct Sprite *sprite);
+
+void pokemonanimfunc_3D(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->callback = sub_81825F8;
+    sprite->data[7] = 0;
+}
+
+void sub_81825F8(struct Sprite *sprite)
+{
+    s16 yScale;
+
+    sprite->data[7] += 8;
+    if (sprite->data[7] > 63)
+    {
+        sprite->data[7] = 0;
+        sprite->data[6] = 0;
+        sprite->callback = sub_8182648;
+        yScale = Sin(64, 128); // 128 * 1 = 128
+    }
+    else
+    {
+        yScale = Sin(sprite->data[7], 128);
+    }
+
+    HandleSetAffineData(sprite, 0x100, 0x100 + yScale, 0);
+}
+
+void sub_8182648(struct Sprite *sprite)
+{
+    s16 yScale;
+
+    sprite->data[7] += 4;
+    if (sprite->data[7] > 95)
+    {
+        yScale = Cos(0, 128); // 128 * (-1) = -128
+        sprite->data[7] = 0;
+        sprite->data[6]++;
+    }
+    else
+    {
+        s16 sign, index;
+
+        sprite->pos2.y = -(sprite->data[6] * 4) - Sin(sprite->data[7], 8);
+        if (sprite->data[7] > 63)
+        {
+            sign = -1;
+            index = sprite->data[7] - 64;
+        }
+        else
+        {
+            sign = 1;
+            index = 0;
+        }
+
+        yScale = Cos((index * 2) + sprite->data[7], 128) * sign;
+    }
+
+    HandleSetAffineData(sprite, 0x100, 0x100 + yScale, 0);
+    if (sprite->data[6] == 3)
+    {
+        sprite->data[7] = 0;
+        sprite->callback = sub_81826F8;
+    }
+}
+
+void sub_81826F8(struct Sprite *sprite)
+{
+    s16 yScale;
+
+    sprite->data[7] += 8;
+    yScale = Cos(sprite->data[7], 128);
+    sprite->pos2.y = -(Cos(sprite->data[7], 12));
+    if (sprite->data[7] > 63)
+    {
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.y = 0;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+    }
+
+    HandleSetAffineData(sprite, 0x100, 0x100 + yScale, 0);
+}
+
+void sub_8182764(struct Sprite *sprite)
+{
+    if (sprite->data[7] > sprite->data[5])
+    {
+        sprite->pos2.x = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+    }
+    else
+    {
+        s16 xScale;
+
+        sprite->pos2.x = Sin(sprite->data[7] % 256, sprite->data[4]);
+        sprite->data[7] += sprite->data[6];
+        xScale = Sin(sprite->data[7] % 128, 96);
+        HandleSetAffineData(sprite, 0x100 + xScale, 0x100, 0);
+    }
+}
+
+void pokemonanimfunc_3E(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+        sprite->data[6] = 8;
+        sprite->data[5] = 512;
+        sprite->data[4] = 8;
+    }
+
+    sub_8182764(sprite);
+}
+
+void sub_8182830(struct Sprite *sprite)
+{
+    if (sprite->data[7] > sprite->data[5])
+    {
+        sprite->pos2.x = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+    }
+    else
+    {
+        s16 xScale;
+
+        sprite->pos2.x = Sin(sprite->data[7] % 256, sprite->data[4]);
+        sprite->data[7] += sprite->data[6];
+        xScale = Sin((sprite->data[7] % 64) * 2, 128);
+        HandleSetAffineData(sprite, 0x100 + xScale, 0x100, 0);
+    }
+}
+
+void pokemonanimfunc_3F(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+        sprite->data[6] = 4;
+        sprite->data[5] = 256;
+        sprite->data[4] = 16;
+    }
+
+    sub_8182830(sprite);
+}
+
+void pokemonanimfunc_40(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+    }
+
+    if (sprite->data[7] > 512)
+    {
+        sprite->pos2.x = 0;
+        sub_817F77C(sprite);
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 scale;
+
+        sprite->pos2.x = Sin(sprite->data[7] % 256, 8);
+        sprite->data[7] += 8;
+        scale = Sin(sprite->data[7] % 128, 96);
+        HandleSetAffineData(sprite, 0x100 + scale, 0x100 + scale, 0);
+    }
+
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_41(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+    }
+
+    if (sprite->data[7] > 512)
+    {
+        sprite->pos2.x = 0;
+        sub_817F77C(sprite);
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 scale;
+
+        sprite->pos2.x = -(Sin((sprite->data[7] % 256) / 2, 16));
+        sprite->data[7] += 8;
+        scale = -(Sin((sprite->data[7] % 256) / 2, 64));
+        HandleSetAffineData(sprite, 0x100 + scale, 0x100 + scale, 0);
+    }
+
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_42(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+    }
+
+    if (sprite->data[7] > 512)
+    {
+        sprite->pos2.x = 0;
+        sub_817F77C(sprite);
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        s16 scale;
+
+        sprite->pos2.x = -(Sin(sprite->data[7] % 256 , 8));
+        sprite->data[7] += 8;
+        scale = Sin((sprite->data[7] % 256) / 2, 96);
+        HandleSetAffineData(sprite, 0x100 + scale, 0x100 + scale, 0);
+    }
+
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_43(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] > 2048)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->data[6] = 0;
+    }
+    else
+    {
+        s16 caseVar = (sprite->data[2] / 512) % 4;
+        switch (caseVar)
+        {
+        case 0:
+            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512;
+            break;
+        case 1:
+            sprite->pos2.x = (sprite->data[2] % 512 / 32) - 16;
+            break;
+        case 2:
+            sprite->pos2.x = (sprite->data[2] % 512) / 32;
+            break;
+        case 3:
+            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512 + 16;
+            break;
+        }
+
+        sprite->pos2.y = -(Sin(sprite->data[2] % 128, 4));
+        sprite->data[2] += 24;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_44(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[6] = 0;
+        sprite->data[7] = 64;
+        sprite->data[2]++;
+    }
+
+    sprite->data[7] += 8;
+    if (sprite->data[6] == 4)
+    {
+        if (sprite->data[7] > 63)
+        {
+            sprite->data[7] = 0;
+            sprite->data[6]++;
+        }
+    }
+    else
+    {
+        if (sprite->data[7] > 127)
+        {
+            sprite->data[7] = 0;
+            sprite->data[6]++;
+        }
+    }
+
+    switch (sprite->data[6])
+    {
+    case 1:
+        sprite->pos2.x = -(Cos(sprite->data[7], 8));
+        sprite->pos2.y = Sin(sprite->data[7], 8) - 8;
+        break;
+    case 2:
+        sprite->pos2.x = Sin(sprite->data[7] + 128, 8) + 8;
+        sprite->pos2.y = -(Cos(sprite->data[7], 8));
+        break;
+    case 3:
+        sprite->pos2.x = Cos(sprite->data[7], 8);
+        sprite->pos2.y = Sin(sprite->data[7] + 128, 8) + 8;
+        break;
+    case 0:
+    case 4:
+        sprite->pos2.x = Sin(sprite->data[7], 8) - 8;
+        sprite->pos2.y = Cos(sprite->data[7], 8);
+        break;
+    default:
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        break;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_45(struct Sprite *sprite)
+{
+    sprite->data[0] = 32;
+    sub_8180714(sprite);
+    sprite->callback = sub_8180714;
+}
+
+void pokemonanimfunc_46(struct Sprite *sprite)
+{
+    sprite->data[0] = 80;
+    sub_817F8FC(sprite);
+    sprite->callback = sub_817F8FC;
+}
+
+void pokemonanimfunc_47(struct Sprite *sprite)
+{
+    sprite->data[0] = 80;
+    sub_817F978(sprite);
+    sprite->callback = sub_817F978;
+}
+
+void pokemonanimfunc_48(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_6 = 2048;
+    gUnknown_03001240[id].field_8 = sprite->data[6];
+    sub_8180900(sprite);
+    sprite->callback = sub_8180900;
+}
+
+void pokemonanimfunc_49(struct Sprite *sprite)
+{
+    sprite->data[6] = 1;
+    pokemonanimfunc_05(sprite);
+}
+
+void pokemonanimfunc_4A(struct Sprite *sprite)
+{
+    sprite->data[6] = 1;
+    pokemonanimfunc_48(sprite);
+}
+
+void pokemonanimfunc_4B(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+        sprite->data[0] = 0;
+
+    if (sprite->data[0] <= 0)
+    {
+        sub_817FC20(sprite);
+        sprite->data[0] = 1;
+    }
+    else
+    {
+        sprite->data[0]--;
+    }
+}
+
+void pokemonanimfunc_4C(struct Sprite *sprite)
+{
+    sprite->data[0] = 30;
+    sprite->data[7] = 3;
+    sub_817FCDC(sprite);
+    sprite->callback = sub_817FCDC;
+}
+
+void pokemonanimfunc_4D(struct Sprite *sprite)
+{
+    sprite->data[0] = 30;
+    sub_817FD44(sprite);
+    sprite->callback = sub_817FD44;
+}
+
+void pokemonanimfunc_4E(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_6 = 1024;
+    gUnknown_03001240[id].field_0 = 0;
+    gUnknown_03001240[id].field_4 = 2;
+    sub_817FE30(sprite);
+    sprite->callback = sub_817FE30;
+}
+
+void pokemonanimfunc_4F(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_6 = 512;
+    gUnknown_03001240[id].field_8 = 3;
+    gUnknown_03001240[id].field_2 = 12;
+    sub_817FFF0(sprite);
+    sprite->callback = sub_817FFF0;
+}
+
+void pokemonanimfunc_50(struct Sprite *sprite)
+{
+    sprite->data[0] = 24;
+    sub_818031C(sprite);
+    sprite->callback = sub_818031C;
+}
+
+void pokemonanimfunc_51(struct Sprite *sprite)
+{
+    sprite->data[0] = 5;
+    sub_81804F8(sprite);
+    sprite->callback = sub_81804F8;
+}
+
+void pokemonanimfunc_52(struct Sprite *sprite)
+{
+    sprite->data[0] = 3;
+    sub_817F9F4(sprite);
+    sprite->callback = sub_817F9F4;
+}
+
+void pokemonanimfunc_53(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_0 = 60;
+    gUnknown_03001240[id].field_8 = 30;
+    sub_817FF3C(sprite);
+    sprite->callback = sub_817FF3C;
+}
+
+void pokemonanimfunc_54(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_2 = 1;
+    gUnknown_03001240[id].field_4 = 2;
+    sub_8181214(sprite);
+    sprite->callback = sub_8181214;
+}
+
+void pokemonanimfunc_55(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_6 = 4;
+    gUnknown_03001240[id].field_4 = 2;
+    sub_8181810(sprite);
+    sprite->callback = sub_8181810;
+}
+
+void pokemonanimfunc_56(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_8 = 1;
+    gUnknown_03001240[id].field_4 = 2;
+    HandleStartAffineAnim(sprite);
+    sprite->data[3] = 0;
+    sub_8181ABC(sprite);
+    sprite->callback = sub_8181ABC;
+}
+
+void pokemonanimfunc_07(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_6 = 2;
+    sub_8181CE8(sprite);
+    sprite->callback = sub_8181CE8;
+}
+
+void pokemonanimfunc_08(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_6 = 4;
+    gUnknown_03001240[id].field_4 = 2;
+    sub_8181CE8(sprite);
+    sprite->callback = sub_8181CE8;
+}
+
+void pokemonanimfunc_0B(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_8 = 100;
+    sub_81814D4(sprite);
+    sprite->callback = sub_81814D4;
+}
+
+void pokemonanimfunc_0C(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_8 = 50;
+    gUnknown_03001240[id].field_4 = 2;
+    sub_81814D4(sprite);
+    sprite->callback = sub_81814D4;
+}
+
+void pokemonanimfunc_0D(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_8 = 100;
+    sub_81815D4(sprite);
+    sprite->callback = sub_81815D4;
+}
+
+void pokemonanimfunc_0E(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_8 = 50;
+    gUnknown_03001240[id].field_4 = 2;
+    sub_81815D4(sprite);
+    sprite->callback = sub_81815D4;
+}
+
+void sub_8183140(struct Sprite *sprite)
+{
+    s32 counter = sprite->data[2];
+    if (counter > 2304)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        sprite->pos2.y = Sin((counter + 192) % 256, sprite->data[7]) + sprite->data[7];
+    }
+
+    sprite->data[2] += sprite->data[0];
+}
+
+void pokemonanimfunc_57(struct Sprite *sprite)
+{
+    sprite->data[0] = 60;
+    sprite->data[7] = 3;
+    sub_8183140(sprite);
+    sprite->callback = sub_8183140;
+}
+
+void pokemonanimfunc_58(struct Sprite *sprite)
+{
+    sprite->data[0] = 30;
+    sprite->data[7] = 3;
+    sub_8183140(sprite);
+    sprite->callback = sub_8183140;
+}
+
+void pokemonanimfunc_59(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] > 2048)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->data[6] = 0;
+    }
+    else
+    {
+        s16 divCase = (sprite->data[2] / 512) % 4;
+        switch (divCase)
+        {
+        case 0:
+            sprite->pos2.x = (sprite->data[2] % 512) / 32;
+            break;
+        case 2:
+            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512;
+            break;
+        case 1:
+            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512 + 16;
+            break;
+        case 3:
+            sprite->pos2.x = (sprite->data[2] % 512) / 32 - 16;
+            break;
+        }
+
+        sprite->pos2.y = Sin(sprite->data[2] % 128, 4);
+        sprite->data[2] += 24;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void sub_81832C8(struct Sprite *sprite)
+{
+    s16 index1 = 0, index2 = 0;
+
+    if (sprite->data[5] > sprite->data[6])
+    {
+        sprite->pos2.y = 0;
+        sprite->data[5] = 0;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        if (sprite->data[4] <= 1)
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+        else
+        {
+            sprite->data[4]--;
+            sprite->data[7] = 0;
+        }
+    }
+    else
+    {
+        u8 amplitude, cmpVal1, cmpVal2;
+        s16 xScale, yScale;
+
+        index2 = (sprite->data[5] * 128) / sprite->data[6];
+        cmpVal1 = sprite->data[6] / 4;
+        cmpVal2 = cmpVal1 * 3;
+        if (sprite->data[5] >= cmpVal1 && sprite->data[5] < cmpVal2)
+        {
+            sprite->data[7] += 51;
+            index1 = sprite->data[7] & 0xFF;
+        }
+
+        if (sprite->data[1] == 0)
+            xScale = -0x100 - Sin(index2, 16);
+        else
+            xScale = 0x100 + Sin(index2, 16);
+
+        amplitude = sprite->data[3];
+        yScale = 0x100 - Sin(index2, amplitude) - Sin(index1, amplitude / 5);
+        SetAffineData(sprite, xScale, yScale, 0);
+        sprite->data[5]++;
+    }
+}
+
+void pokemonanimfunc_5A(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        HandleStartAffineAnim(sprite);
+        sprite->data[4] = 1;
+        sprite->data[6] = 40;
+        sprite->data[3] = 40;
+        sprite->data[5] = 0;
+        sprite->data[7] = 0;
+    }
+
+    sub_81832C8(sprite);
+}
+
+void sub_8183418(struct Sprite *sprite)
+{
+    s16 index1 = 0, index2;
+
+    if (sprite->data[5] > sprite->data[6])
+    {
+        sprite->data[5] = 0;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        if (sprite->data[4] <= 1)
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+        else
+        {
+            sprite->data[4]--;
+            sprite->data[7] = 0;
+        }
+    }
+    else
+    {
+        u8 amplitude, cmpVal1, cmpVal2;
+        s16 xScale;
+
+        index2 = (sprite->data[5] * 128) / sprite->data[6];
+        cmpVal1 = sprite->data[6] / 4;
+        cmpVal2 = cmpVal1 * 3;
+        if (sprite->data[5] >= cmpVal1 && sprite->data[5] < cmpVal2)
+        {
+            sprite->data[7] += 51;
+            index1 = sprite->data[7] & 0xFF;
+        }
+
+        amplitude = sprite->data[3];
+
+        if (sprite->data[1] == 0)
+            xScale = -0x100 + Sin(index2, amplitude) + Sin(index1, amplitude / 5 * 2);
+        else
+            xScale = 0x100 - Sin(index2, amplitude) - Sin(index1, amplitude / 5 * 2);
+
+        SetAffineData(sprite, xScale, 0x100, 0);
+        sprite->data[5]++;
+    }
+}
+
+void pokemonanimfunc_5B(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        HandleStartAffineAnim(sprite);
+        sprite->data[4] = 1;
+        sprite->data[6] = 40;
+        sprite->data[3] = 40;
+        sprite->data[5] = 0;
+        sprite->data[7] = 0;
+    }
+
+    sub_8183418(sprite);
+}
+
+void sub_8183574(struct Sprite *sprite)
+{
+    u8 var6, var7;
+    u8 var8 = sprite->data[2];
+    u8 var9 = sprite->data[6];
+    u8 var5 = gUnknown_0860AA80[sprite->data[5]][0];
+    u8 var2 = var5;
+    if (var5 != 0xFF)
+        var5 = sprite->data[7];
+    else
+        var5 = 0xFF; // needed to match
+
+    var6 = gUnknown_0860AA80[sprite->data[5]][1];
+    var7 = 0;
+    if (var2 != 0xFE)
+        var7 = (var6 - var9) * var5 / var6;
+
+    if (var5 == 0xFF)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        sprite->pos2.y = Sin((var8 + 192) % 256, var7) + var7;
+        if (var9 == var6)
+        {
+            sprite->data[5]++;
+            sprite->data[6] = 0;
+        }
+        else
+        {
+            sprite->data[2] += sprite->data[0];
+            sprite->data[6]++;
+        }
+    }
+}
-- 
cgit v1.2.3


From a3ed94dc69aea88c2e18ddab6099217c3ee1094b Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sat, 27 Jan 2018 17:46:32 -0600
Subject: Continue work on menu.c

---
 src/menu.c | 427 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 380 insertions(+), 47 deletions(-)

(limited to 'src')

diff --git a/src/menu.c b/src/menu.c
index 9ff8d47b6..02e650ef2 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -7,6 +7,7 @@
 #include "constants/songs.h"
 #include "main.h"
 #include "sound.h"
+#include "menu_helpers.h"
 
 struct SomeUnkStruct
 {
@@ -24,11 +25,11 @@ struct Menu
     s8 maxCursorPos;
     u8 windowId;
     u8 fontId;
-    u8 menu_field_7;
-    u8 cursorHeight;
-    u8 menu_field_9;
-    u8 menu_field_A;
-    u8 menu_field_B;
+    u8 optionWidth;
+    u8 optionHeight;
+    u8 horizontalCount;
+    u8 verticalCount;
+    bool8 APressMuted;
 };
 
 extern EWRAM_DATA struct Menu gUnknown_0203CD90;
@@ -435,7 +436,7 @@ void sub_8198314(void)
     }
 }
 
-u8 sub_8198348(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 cursorPos, u8 a7)
+u8 sub_8198348(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos, u8 a7)
 {
     s32 pos;
     
@@ -445,10 +446,10 @@ u8 sub_8198348(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numC
     gUnknown_0203CD90.maxCursorPos = numChoices - 1;
     gUnknown_0203CD90.windowId = windowId;
     gUnknown_0203CD90.fontId = fontId;
-    gUnknown_0203CD90.cursorHeight = cursorHeight;
-    gUnknown_0203CD90.menu_field_B = a7;
+    gUnknown_0203CD90.optionHeight = cursorHeight;
+    gUnknown_0203CD90.APressMuted = a7;
     
-    pos = cursorPos;
+    pos = initialCursorPos;
     
     if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
         gUnknown_0203CD90.cursorPos = 0;
@@ -459,14 +460,15 @@ u8 sub_8198348(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numC
     return gUnknown_0203CD90.cursorPos;
 }
 
-u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 cursorPos)
+u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos)
 {
-    return sub_8198348(windowId, fontId, left, top, cursorHeight, numChoices, cursorPos, 0);
+    return sub_8198348(windowId, fontId, left, top, cursorHeight, numChoices, initialCursorPos, 0);
 }
 
-u8 sub_81983EC(u8 windowId, u8 fontId, u8 left, u8 top, u8 numChoices, u8 cursorPos)
+u8 sub_81983EC(u8 windowId, u8 fontId, u8 left, u8 top, u8 numChoices, u8 initialCursorPos)
 {
-    return sub_81983AC(windowId, fontId, left, top, GetMenuCursorDimensionByFont(fontId, 1), numChoices, cursorPos);
+    u8 cursorHeight = GetMenuCursorDimensionByFont(fontId, 1);
+    return sub_81983AC(windowId, fontId, left, top, cursorHeight, numChoices, initialCursorPos);
 }
 
 void RedrawMenuCursor(u8 oldPos, u8 newPos)
@@ -475,8 +477,8 @@ void RedrawMenuCursor(u8 oldPos, u8 newPos)
     
     width = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 0);
     height = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 1);
-    FillWindowPixelRect(gUnknown_0203CD90.windowId, 0x11, gUnknown_0203CD90.left, gUnknown_0203CD90.cursorHeight * oldPos + gUnknown_0203CD90.top, width, height);
-    PrintTextOnWindow(gUnknown_0203CD90.windowId, gUnknown_0203CD90.fontId, gText_SelectorArrow3, gUnknown_0203CD90.left, gUnknown_0203CD90.cursorHeight * newPos + gUnknown_0203CD90.top, 0, 0);
+    FillWindowPixelRect(gUnknown_0203CD90.windowId, 0x11, gUnknown_0203CD90.left, gUnknown_0203CD90.optionHeight * oldPos + gUnknown_0203CD90.top, width, height);
+    PrintTextOnWindow(gUnknown_0203CD90.windowId, gUnknown_0203CD90.fontId, gText_SelectorArrow3, gUnknown_0203CD90.left, gUnknown_0203CD90.optionHeight * newPos + gUnknown_0203CD90.top, 0, 0);
 }
 
 u8 MoveMenuCursor(s8 cursorDelta)
@@ -520,17 +522,15 @@ s8 ProcessMenuInput(void)
 {
     if (gMain.newKeys & A_BUTTON)
     {
-        if (!gUnknown_0203CD90.menu_field_B)
+        if (!gUnknown_0203CD90.APressMuted)
             PlaySE(SE_SELECT);
         return gUnknown_0203CD90.cursorPos;
     }
-
-    if (gMain.newKeys & B_BUTTON)
+    else if (gMain.newKeys & B_BUTTON)
     {
         return -1;
     }
-
-    if (gMain.newKeys & DPAD_UP)
+    else if (gMain.newKeys & DPAD_UP)
     {
         PlaySE(SE_SELECT);
         MoveMenuCursor(-1);
@@ -552,17 +552,15 @@ s8 ProcessMenuInputNoWrapAround(void)
     
     if (gMain.newKeys & A_BUTTON)
     {
-        if (!gUnknown_0203CD90.menu_field_B)
+        if (!gUnknown_0203CD90.APressMuted)
             PlaySE(SE_SELECT);
         return gUnknown_0203CD90.cursorPos;
     }
-
-    if (gMain.newKeys & B_BUTTON)
+    else if (gMain.newKeys & B_BUTTON)
     {
         return -1;
     }
-
-    if (gMain.newKeys & DPAD_UP)
+    else if (gMain.newKeys & DPAD_UP)
     {
         if (oldPos != MoveMenuCursorNoWrapAround(-1))
             PlaySE(SE_SELECT);
@@ -582,17 +580,15 @@ s8 ProcessMenuInput_other(void)
 {
     if (gMain.newKeys & A_BUTTON)
     {
-        if (!gUnknown_0203CD90.menu_field_B)
+        if (!gUnknown_0203CD90.APressMuted)
             PlaySE(SE_SELECT);
         return gUnknown_0203CD90.cursorPos;
     }
-
-    if (gMain.newKeys & B_BUTTON)
+    else if (gMain.newKeys & B_BUTTON)
     {
         return -1;
     }
-
-    if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
     {
         PlaySE(SE_SELECT);
         MoveMenuCursor(-1);
@@ -614,17 +610,15 @@ s8 ProcessMenuInputNoWrapAround_other(void)
     
     if (gMain.newKeys & A_BUTTON)
     {
-        if (!gUnknown_0203CD90.menu_field_B)
+        if (!gUnknown_0203CD90.APressMuted)
             PlaySE(SE_SELECT);
         return gUnknown_0203CD90.cursorPos;
     }
-
-    if (gMain.newKeys & B_BUTTON)
+    else if (gMain.newKeys & B_BUTTON)
     {
         return -1;
     }
-
-    if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
     {
         if (oldPos != MoveMenuCursorNoWrapAround(-1))
             PlaySE(SE_SELECT);
@@ -722,7 +716,7 @@ u16 sub_8198AA4(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16
     return AddWindow(&template);
 }
 
-void sub_8198AF8(struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16 baseTileNum, u8 paletteNum, u8 cursorPos)
+void sub_8198AF8(struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16 baseTileNum, u8 paletteNum, u8 initialCursorPos)
 {
     struct TextSubPrinter printer;
     
@@ -745,7 +739,7 @@ void sub_8198AF8(struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16
     
     AddTextPrinter(&printer, 0xFF, 0);
     
-    sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, 1), 2, cursorPos);
+    sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, 1), 2, initialCursorPos);
 }
 
 void sub_8198C34(struct WindowTemplate *window, u8 fontId, u16 baseTileNum, u8 paletteNum)
@@ -822,20 +816,20 @@ void sub_8198EF8(u8 windowId, u8 fontId, u8 a2, u8 a3, u8 a4, u8 a5, const struc
     sub_8198DBC(windowId, fontId, GetFontAttribute(fontId, 0), 0, a2, a4, a5, strs, a8);
 }
 
-u8 sub_8198F58(u8 a0, u8 a1, s8 a2, s8 a3, u8 a4, u8 a5, u8 a6, u8 a7, u8 a8, u8 a9)
+u8 sub_8198F58(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 cursorHeight, u8 a6, u8 a7, u8 numChoices, u8 a9)
 {
     s32 pos;
     
-    gUnknown_0203CD90.left = a2;
-    gUnknown_0203CD90.top = a3;
+    gUnknown_0203CD90.left = left;
+    gUnknown_0203CD90.top = top;
     gUnknown_0203CD90.minCursorPos = 0;
-    gUnknown_0203CD90.maxCursorPos = a8 - 1;
-    gUnknown_0203CD90.windowId = a0;
-    gUnknown_0203CD90.fontId = a1;
-    gUnknown_0203CD90.menu_field_7 = a4;
-    gUnknown_0203CD90.cursorHeight = a5;
-    gUnknown_0203CD90.menu_field_9 = a6;
-    gUnknown_0203CD90.menu_field_A = a7;
+    gUnknown_0203CD90.maxCursorPos = numChoices - 1;
+    gUnknown_0203CD90.windowId = windowId;
+    gUnknown_0203CD90.fontId = fontId;
+    gUnknown_0203CD90.optionWidth = a4;
+    gUnknown_0203CD90.optionHeight = cursorHeight;
+    gUnknown_0203CD90.horizontalCount = a6;
+    gUnknown_0203CD90.verticalCount = a7;
     
     pos = a9;
     
@@ -847,3 +841,342 @@ u8 sub_8198F58(u8 a0, u8 a1, s8 a2, s8 a3, u8 a4, u8 a5, u8 a6, u8 a7, u8 a8, u8
     sub_8199134(0, 0);
     return gUnknown_0203CD90.cursorPos;
 }
+
+u8 sub_8198FD4(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u8 a7)
+{
+    u8 cursorHeight = GetMenuCursorDimensionByFont(fontId, 1);
+    u8 numChoices = a5 * a6;
+    return sub_8198F58(windowId, fontId, left, top, a4, cursorHeight, a5, a6, numChoices, a7);
+}
+
+void sub_8199060(u8 oldCursorPos, u8 newCursorPos)
+{
+    u8 cursorWidth = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 0);
+    u8 cursorHeight = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 1);
+    u8 xPos = (oldCursorPos % gUnknown_0203CD90.horizontalCount) * gUnknown_0203CD90.optionWidth + gUnknown_0203CD90.left;
+    u8 yPos = (oldCursorPos / gUnknown_0203CD90.horizontalCount) * gUnknown_0203CD90.optionHeight + gUnknown_0203CD90.top;
+    FillWindowPixelRect(gUnknown_0203CD90.windowId,
+                        0x11,
+                        xPos,
+                        yPos,
+                        cursorWidth,
+                        cursorHeight);
+    xPos = (newCursorPos % gUnknown_0203CD90.horizontalCount) * gUnknown_0203CD90.optionWidth + gUnknown_0203CD90.left;
+    yPos = (newCursorPos / gUnknown_0203CD90.horizontalCount) * gUnknown_0203CD90.optionHeight + gUnknown_0203CD90.top;
+    PrintTextOnWindow(gUnknown_0203CD90.windowId,
+                      gUnknown_0203CD90.fontId,
+                      gText_SelectorArrow3,
+                      xPos,
+                      yPos,
+                      0,
+                      0);
+}
+
+u8 sub_8199134(s8 deltaX, s8 deltaY)
+{
+    u8 oldPos = gUnknown_0203CD90.cursorPos;
+    
+    if (deltaX != 0)
+    {
+        if ((gUnknown_0203CD90.cursorPos % gUnknown_0203CD90.horizontalCount) + deltaX < 0)
+        {
+            gUnknown_0203CD90.cursorPos += gUnknown_0203CD90.horizontalCount - 1;
+        }
+        else if ((gUnknown_0203CD90.cursorPos % gUnknown_0203CD90.horizontalCount) + deltaX >= gUnknown_0203CD90.horizontalCount)
+        {
+            gUnknown_0203CD90.cursorPos = (gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) * gUnknown_0203CD90.horizontalCount;
+        }
+        else
+        {
+            gUnknown_0203CD90.cursorPos += deltaX;
+        }
+    }
+    
+    if (deltaY != 0)
+    {
+        if ((gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) + deltaY < 0)
+        {
+            gUnknown_0203CD90.cursorPos += gUnknown_0203CD90.horizontalCount * (gUnknown_0203CD90.verticalCount - 1);
+        }
+        else if ((gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) + deltaY >= gUnknown_0203CD90.verticalCount)
+        {
+            gUnknown_0203CD90.cursorPos -= gUnknown_0203CD90.horizontalCount * (gUnknown_0203CD90.verticalCount - 1);
+        }
+        else
+        {
+            gUnknown_0203CD90.cursorPos += (gUnknown_0203CD90.horizontalCount * deltaY);
+        }
+    }
+    
+    if (gUnknown_0203CD90.cursorPos > gUnknown_0203CD90.maxCursorPos)
+    {
+        gUnknown_0203CD90.cursorPos = oldPos;
+        return gUnknown_0203CD90.cursorPos;
+    }
+    else
+    {
+        sub_8199060(oldPos, gUnknown_0203CD90.cursorPos);
+        return gUnknown_0203CD90.cursorPos;
+    }
+}
+
+u8 sub_81991F8(s8 deltaX, s8 deltaY)
+{
+    u8 oldPos = gUnknown_0203CD90.cursorPos;
+    
+    if (deltaX != 0)
+    {
+        if (((gUnknown_0203CD90.cursorPos % gUnknown_0203CD90.horizontalCount) + deltaX >= 0) &&
+        ((gUnknown_0203CD90.cursorPos % gUnknown_0203CD90.horizontalCount) + deltaX < gUnknown_0203CD90.horizontalCount))
+        {
+            gUnknown_0203CD90.cursorPos += deltaX;
+        }
+    }
+    
+    if (deltaY != 0)
+    {
+        if (((gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) + deltaY >= 0) &&
+        ((gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) + deltaY < gUnknown_0203CD90.verticalCount))
+        {
+            gUnknown_0203CD90.cursorPos += (gUnknown_0203CD90.horizontalCount * deltaY);
+        }
+    }
+    
+    if (gUnknown_0203CD90.cursorPos > gUnknown_0203CD90.maxCursorPos)
+    {
+        gUnknown_0203CD90.cursorPos = oldPos;
+        return gUnknown_0203CD90.cursorPos;
+    }
+    else
+    {
+        sub_8199060(oldPos, gUnknown_0203CD90.cursorPos);
+        return gUnknown_0203CD90.cursorPos;
+    }
+}
+
+s8 sub_8199284(void)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        return gUnknown_0203CD90.cursorPos;
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        return -1;
+    }
+    else if (gMain.newKeys & DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        sub_8199134(0, -1);
+        return -2;
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        sub_8199134(0, 1);
+        return -2;
+    }
+    else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
+    {
+        PlaySE(SE_SELECT);
+        sub_8199134(-1, 0);
+        return -2;
+    }
+    else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
+    {
+        PlaySE(SE_SELECT);
+        sub_8199134(1, 0);
+        return -2;
+    }
+
+    return -2;
+}
+
+s8 sub_8199334(void)
+{
+    u8 oldPos = gUnknown_0203CD90.cursorPos;
+    
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        return gUnknown_0203CD90.cursorPos;
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        return -1;
+    }
+    else if (gMain.newKeys & DPAD_UP)
+    {
+        if (oldPos != sub_81991F8(0, -1))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        if (oldPos != sub_81991F8(0, 1))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+    else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
+    {
+        if (oldPos != sub_81991F8(-1, 0))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+    else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
+    {
+        if (oldPos != sub_81991F8(1, 0))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+
+    return -2;
+}
+
+s8 sub_81993D8(void)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        return gUnknown_0203CD90.cursorPos;
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        return -1;
+    }
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        sub_8199134(0, -1);
+        return -2;
+    }
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        sub_8199134(0, 1);
+        return -2;
+    }
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT || sub_812210C() == 1)
+    {
+        PlaySE(SE_SELECT);
+        sub_8199134(-1, 0);
+        return -2;
+    }
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT || sub_812210C() == 2)
+    {
+        PlaySE(SE_SELECT);
+        sub_8199134(1, 0);
+        return -2;
+    }
+
+    return -2;
+}
+
+s8 sub_8199484(void)
+{
+    u8 oldPos = gUnknown_0203CD90.cursorPos;
+    
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        return gUnknown_0203CD90.cursorPos;
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        return -1;
+    }
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
+    {
+        if (oldPos != sub_81991F8(0, -1))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
+    {
+        if (oldPos != sub_81991F8(0, 1))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT || sub_812210C() == 1)
+    {
+        if (oldPos != sub_81991F8(-1, 0))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+    else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT || sub_812210C() == 2)
+    {
+        if (oldPos != sub_81991F8(1, 0))
+            PlaySE(SE_SELECT);
+        return -2;
+    }
+
+    return -2;
+}
+
+u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted)
+{
+    s32 pos;
+    
+    gUnknown_0203CD90.left = 0;
+    gUnknown_0203CD90.top = 1;
+    gUnknown_0203CD90.minCursorPos = 0;
+    gUnknown_0203CD90.maxCursorPos = itemCount - 1;
+    gUnknown_0203CD90.windowId = windowId;
+    gUnknown_0203CD90.fontId = 1;
+    gUnknown_0203CD90.optionHeight = 16;
+    gUnknown_0203CD90.APressMuted = APressMuted;
+    
+    pos = initialCursorPos;
+    
+    if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
+        gUnknown_0203CD90.cursorPos = 0;
+    else
+        gUnknown_0203CD90.cursorPos = pos;
+    
+    return MoveMenuCursor(0);
+}
+
+u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 itemCount, u8 initialCursorPos)
+{
+    return InitMenuInUpperLeftCorner(windowId, itemCount, initialCursorPos, FALSE);
+}
+
+void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs)
+{
+    u32 i;
+    
+    for (i = 0; i < itemCount; i++)
+    {
+        PrintTextOnWindow(windowId, 1, strs[i].text, 8, (i * 16) + 1, 0xFF, NULL);
+    }
+    
+    CopyWindowToVram(windowId, 2);
+}
+
+void sub_81995E4(u8 windowId, u8 itemCount, const struct MenuAction *strs, const u8 *a8)
+{
+    u8 i;
+    struct TextSubPrinter printer;
+    
+    printer.windowId = windowId;
+    printer.fontId = 1;
+    printer.fgColor = GetFontAttribute(1, 5);
+    printer.bgColor = GetFontAttribute(1, 6);
+    printer.shadowColor = GetFontAttribute(1, 7);
+    printer.fontColor_l = GetFontAttribute(1, 4);
+    printer.letterSpacing = 0;
+    printer.lineSpacing = 0;
+    printer.x = 8;
+    printer.currentX = 8;
+    
+    for (i = 0; i < itemCount; i++)
+    {
+        printer.current_text_offset = strs[a8[i]].text;
+        printer.y = (i * 16) + 1;
+        printer.currentY = (i * 16) + 1;
+        AddTextPrinter(&printer, 0xFF, 0);
+    }
+    
+    CopyWindowToVram(windowId, 2);
+}
-- 
cgit v1.2.3


From 16c46905ff08ab61fbd36c9e30e8d18aa7a03467 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 28 Jan 2018 00:51:20 +0100
Subject: more pokemon animation functions

---
 src/pokemon_animation.c | 606 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 604 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 1496069df..67915d228 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -2025,8 +2025,6 @@ void pokemonanimfunc_05(struct Sprite *sprite)
     sprite->callback = sub_8180900;
 }
 
-const u8 gUnknown_0860ADBE[] = {0x01, 0x01, 0x0c, 0xfe, 0x00, 0x0c, 0x01, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00};
-
 void pokemonanimfunc_20(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
@@ -4194,3 +4192,607 @@ void sub_8183574(struct Sprite *sprite)
         }
     }
 }
+
+void pokemonanimfunc_5C(struct Sprite *sprite)
+{
+    sprite->data[0] = 40;
+    sprite->data[7] = 6;
+    sub_8183574(sprite);
+    sprite->callback = sub_8183574;
+}
+
+void pokemonanimfunc_5D(struct Sprite *sprite)
+{
+    sprite->data[0] = 70;
+    sprite->data[7] = 6;
+    sub_817FCDC(sprite);
+    sprite->callback = sub_817FCDC;
+}
+
+void pokemonanimfunc_5E(struct Sprite *sprite)
+{
+    sprite->data[0] = 20;
+    sub_817F8FC(sprite);
+    sprite->callback = sub_817F8FC;
+}
+
+void pokemonanimfunc_5F(struct Sprite *sprite)
+{
+    if (sprite->data[2] > 40)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+    }
+    else
+    {
+        s8 sign;
+        if (!(sprite->data[2] & 1))
+            sign = 1;
+        else
+            sign = -1;
+
+        sprite->pos2.x = Sin((sprite->data[2] * 128 / 40) % 256, 9) * sign;
+    }
+
+    sprite->data[2]++;
+}
+
+void pokemonanimfunc_60(struct Sprite *sprite)
+{
+    if (sprite->data[2] > 40)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->pos2.x = 0;
+    }
+    else
+    {
+        s8 sign;
+        if (!(sprite->data[2] & 1))
+            sign = 1;
+        else
+            sign = -1;
+
+        sprite->pos2.x = Sin((sprite->data[2] * 128 / 40) % 256, 12) * sign;
+    }
+
+    sprite->data[2]++;
+}
+
+void pokemonanimfunc_61(struct Sprite *sprite)
+{
+    sprite->data[0] = 70;
+    sprite->data[7] = 6;
+    sub_8183140(sprite);
+    sprite->callback = sub_8183140;
+}
+
+void pokemonanimfunc_62(struct Sprite *sprite)
+{
+    sprite->data[0] = 24;
+    sprite->data[7] = 6;
+    sub_8183574(sprite);
+    sprite->callback = sub_8183574;
+}
+
+void pokemonanimfunc_63(struct Sprite *sprite)
+{
+    sprite->data[0] = 56;
+    sprite->data[7] = 9;
+    sub_8183574(sprite);
+    sprite->callback = sub_8183574;
+}
+
+void pokemonanimfunc_64(struct Sprite *sprite)
+{
+    u8 id = sprite->data[0] = sub_817F758();
+
+    gUnknown_03001240[id].field_6 = 1024;
+    gUnknown_03001240[id].field_8 = 6;
+    gUnknown_03001240[id].field_2 = 24;
+    sub_817FFF0(sprite);
+    sprite->callback = sub_817FFF0;
+}
+
+void sub_81837DC(struct Sprite *sprite)
+{
+    s16 index1 = 0, index2 = 0;
+    if (sprite->data[5] > sprite->data[6])
+    {
+        sprite->pos2.y = 0;
+        sprite->data[5] = 0;
+        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        if (sprite->data[4] <= 1)
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+        else
+        {
+            sprite->data[4]--;
+            sprite->data[7] = 0;
+        }
+    }
+    else
+    {
+        u8 amplitude, cmpVal1, cmpVal2;
+        s16 xScale, yScale;
+
+        index2 = (sprite->data[5] * 128) / sprite->data[6];
+        cmpVal1 = sprite->data[6] / 4;
+        cmpVal2 = cmpVal1 * 3;
+        if (sprite->data[5] >= cmpVal1 && sprite->data[5] < cmpVal2)
+        {
+            sprite->data[7] += 51;
+            index1 = sprite->data[7] & 0xFF;
+        }
+
+        amplitude = sprite->data[3];
+
+        if (sprite->data[1] == 0)
+            xScale = Sin(index2, amplitude) + (Sin(index1, amplitude / 5 * 2) - 0x100);
+        else
+            xScale = 0x100 - Sin(index1, amplitude / 5 * 2) - Sin(index2, amplitude);
+
+        yScale = 0x100 - Sin(index1, amplitude / 5) - Sin(index2, amplitude);
+        SetAffineData(sprite, xScale, yScale, 0);
+        sprite->data[5]++;
+    }
+}
+
+void pokemonanimfunc_65(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        HandleStartAffineAnim(sprite);
+        sprite->data[4] = 1;
+        sprite->data[6] = 40;
+        sprite->data[3] = 40;
+        sprite->data[5] = 0;
+        sprite->data[7] = 0;
+    }
+
+    sub_81837DC(sprite);
+}
+
+void pokemonanimfunc_66(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] > 2048)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->data[6] = 0;
+    }
+    else
+    {
+        s16 divCase = (sprite->data[2] / 512) % 4;
+        switch (divCase)
+        {
+        case 0:
+            sprite->pos2.x = (sprite->data[2] % 512) / 32;
+            break;
+        case 2:
+            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512;
+            break;
+        case 1:
+            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512 + 16;
+            break;
+        case 3:
+            sprite->pos2.x = (sprite->data[2] % 512) / 32 - 16;
+            break;
+        }
+
+        sprite->pos2.y = Sin(sprite->data[2] % 128, 4);
+        sprite->data[2] += 48;
+    }
+
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_67(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] > 2048)
+    {
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        sprite->data[6] = 0;
+    }
+    else
+    {
+        s16 divCase = (sprite->data[2] / 512) % 4;
+        switch (divCase)
+        {
+        case 0:
+            sprite->pos2.x = (sprite->data[2] % 512) / 32;
+            break;
+        case 2:
+            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512;
+            break;
+        case 1:
+            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512 + 16;
+            break;
+        case 3:
+            sprite->pos2.x = (sprite->data[2] % 512) / 32 - 16;
+            break;
+        }
+
+        sprite->pos2.y = Sin(sprite->data[2] % 96, 4);
+        sprite->data[2] += 64;
+    }
+
+    sub_817F70C(sprite);
+}
+
+static const s8 gUnknown_0860ADBE[][3] =
+{
+//   x    y   timer
+    {1,   1, 12},
+    {-2,  0, 12},
+    {1,  -1, 12},
+    {0,  0,  0}
+};
+
+void sub_8183B4C(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] == 0)
+        sprite->data[3] = 0;
+
+    if (gUnknown_0860ADBE[sprite->data[3]][2] / sprite->data[5] == sprite->data[2])
+    {
+        sprite->data[3]++;
+        sprite->data[2] = 0;
+    }
+
+    if (gUnknown_0860ADBE[sprite->data[3]][2] / sprite->data[5] == 0)
+    {
+        if (--sprite->data[6] == 0)
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        else
+            sprite->data[2] = 0;
+    }
+    else
+    {
+        s32 amplitude = sprite->data[5];
+        sprite->pos2.x += (gUnknown_0860ADBE[sprite->data[3]][0] * amplitude);
+        sprite->pos2.y += (gUnknown_0860ADBE[sprite->data[3]][1] * sprite->data[5]); // what's the point of the var if you're not reusing it?
+        sprite->data[2]++;
+        sub_817F70C(sprite);
+    }
+}
+
+void pokemonanimfunc_68(struct Sprite *sprite)
+{
+    sprite->data[5] = 1;
+    sprite->data[6] = 1;
+    sub_8183B4C(sprite);
+    sprite->callback = sub_8183B4C;
+}
+
+void pokemonanimfunc_69(struct Sprite *sprite)
+{
+    sprite->data[5] = 2;
+    sprite->data[6] = 1;
+    sub_8183B4C(sprite);
+    sprite->callback = sub_8183B4C;
+}
+
+void pokemonanimfunc_6A(struct Sprite *sprite)
+{
+    sprite->data[5] = 2;
+    sprite->data[6] = 2;
+    sub_8183B4C(sprite);
+    sprite->callback = sub_8183B4C;
+}
+
+void sub_8183C6C(struct Sprite *sprite)
+{
+    if (sprite->data[7] > 255)
+    {
+        if (sprite->data[5] <= 1)
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+            HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        }
+        else
+        {
+            sprite->data[5]--;
+            sprite->data[7] = 0;
+        }
+    }
+    else
+    {
+        s16 scale;
+
+        sprite->data[7] += sprite->data[6];
+        if (sprite->data[7] > 256)
+            sprite->data[7] = 256;
+
+        scale = Sin(sprite->data[7] / 2, 64);
+        HandleSetAffineData(sprite, 0x100 - scale, 0x100 - scale, 0);
+    }
+}
+
+void pokemonanimfunc_6B(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+        sprite->data[6] = 4;
+        sprite->data[5] = 1;
+    }
+
+    sub_8183C6C(sprite);
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_6C(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+        sprite->data[6] = 8;
+        sprite->data[5] = 2;
+    }
+
+    sub_8183C6C(sprite);
+    sub_817F70C(sprite);
+}
+
+void pokemonanimfunc_6D(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+        sprite->data[6] = 8;
+        sprite->data[5] = 512;
+        sprite->data[4] = 16;
+    }
+
+    sub_8182764(sprite);
+}
+
+void pokemonanimfunc_6E(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+        sprite->data[6] = 4;
+        sprite->data[5] = 256;
+        sprite->data[4] = 16;
+    }
+
+    sub_8182764(sprite);
+}
+
+void pokemonanimfunc_6F(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+        sprite->data[6] = 8;
+        sprite->data[5] = 512;
+        sprite->data[4] = 16;
+    }
+
+    sub_8182830(sprite);
+}
+
+void pokemonanimfunc_70(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[2]++;
+        sprite->data[7] = 0;
+        sprite->data[6] = 8;
+        sprite->data[5] = 512;
+        sprite->data[4] = 8;
+    }
+
+    sub_8182830(sprite);
+}
+
+void pokemonanimfunc_71(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[7] = 5;
+        sprite->data[6] = 8;
+    }
+
+    sub_8180828(sprite);
+}
+
+void pokemonanimfunc_72(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[7] = 3;
+        sprite->data[6] = 4;
+    }
+
+    sub_8180828(sprite);
+}
+
+void pokemonanimfunc_73(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        HandleStartAffineAnim(sprite);
+        sprite->data[4] = 1;
+        sprite->data[6] = 30;
+        sprite->data[3] = 60;
+        sprite->data[7] = 0;
+    }
+
+    sub_81832C8(sprite);
+}
+
+void pokemonanimfunc_74(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        HandleStartAffineAnim(sprite);
+        sprite->data[4] = 2;
+        sprite->data[6] = 20;
+        sprite->data[3] = 70;
+        sprite->data[7] = 0;
+    }
+
+    sub_81832C8(sprite);
+}
+
+void pokemonanimfunc_75(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        HandleStartAffineAnim(sprite);
+        sprite->data[4] = 2;
+        sprite->data[6] = 20;
+        sprite->data[3] = 70;
+        sprite->data[5] = 0;
+        sprite->data[7] = 0;
+    }
+
+    sub_8183418(sprite);
+}
+
+void pokemonanimfunc_76(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        HandleStartAffineAnim(sprite);
+        sprite->data[4] = 1;
+        sprite->data[6] = 30;
+        sprite->data[3] = 60;
+        sprite->data[5] = 0;
+        sprite->data[7] = 0;
+    }
+
+    sub_8183418(sprite);
+}
+
+void pokemonanimfunc_77(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        HandleStartAffineAnim(sprite);
+        sprite->data[4] = 2;
+        sprite->data[6] = 20;
+        sprite->data[3] = 70;
+        sprite->data[5] = 0;
+        sprite->data[7] = 0;
+    }
+
+    sub_81837DC(sprite);
+}
+
+void pokemonanimfunc_78(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        HandleStartAffineAnim(sprite);
+        sprite->data[4] = 1;
+        sprite->data[6] = 30;
+        sprite->data[3] = 60;
+        sprite->data[5] = 0;
+        sprite->data[7] = 0;
+    }
+
+    sub_81837DC(sprite);
+}
+
+void sub_8183FA8(struct Sprite *sprite)
+{
+    if (sprite->data[7] > 255)
+    {
+        if (sprite->data[6] <= 1)
+        {
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+            sprite->pos2.x = 0;
+            sprite->pos2.y = 0;
+        }
+        else
+        {
+            sprite->data[7] %= 256;
+            sprite->data[6]--;
+        }
+    }
+    else
+    {
+        sprite->pos2.x = -(Sin(sprite->data[7], sprite->data[5]));
+        sprite->pos2.y = Sin((sprite->data[7] + 192) % 256, sprite->data[4]);
+        if (sprite->pos2.y > 0)
+            sprite->pos2.y *= -1;
+
+        sprite->pos2.y += sprite->data[4];
+        sprite->data[7] += sprite->data[3];
+    }
+}
+
+void pokemonanimfunc_79(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        sprite->data[6] = 1;
+        sprite->data[7] = 0;
+        sprite->data[5] = 12;
+        sprite->data[4] = 12;
+        sprite->data[3] = 4;
+    }
+
+    sub_8183FA8(sprite);
+}
+
+void pokemonanimfunc_7A(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        sprite->data[6] = 1;
+        sprite->data[7] = 0;
+        sprite->data[5] = 12;
+        sprite->data[4] = 12;
+        sprite->data[3] = 6;
+    }
+
+    sub_8183FA8(sprite);
+}
+
+void pokemonanimfunc_7B(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        sprite->data[6] = 2;
+        sprite->data[7] = 0;
+        sprite->data[5] = 12;
+        sprite->data[4] = 12;
+        sprite->data[3] = 8;
+    }
+
+    sub_8183FA8(sprite);
+}
-- 
cgit v1.2.3


From b377112cd6cf91ad01e8c469328d120d93ed2edc Mon Sep 17 00:00:00 2001
From: golem galvanize <golemgalvanize@github.com>
Date: Sat, 27 Jan 2018 22:58:44 -0500
Subject: decompile item_use

---
 src/item_use.c | 1271 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1271 insertions(+)
 create mode 100755 src/item_use.c

(limited to 'src')

diff --git a/src/item_use.c b/src/item_use.c
new file mode 100755
index 000000000..8c24e4a71
--- /dev/null
+++ b/src/item_use.c
@@ -0,0 +1,1271 @@
+#include "global.h"
+#include "battle.h"
+#include "berry.h"
+#include "bike.h"
+#include "coins.h"
+#include "constants/flags.h"
+#include "constants/items.h"
+#include "constants/songs.h"
+#include "constants/vars.h"
+#include "data2.h"
+#include "event_data.h"
+#include "fieldmap.h"
+#include "field_map_obj.h"
+#include "field_player_avatar.h"
+#include "field_screen.h"
+#include "field_weather.h"
+#include "item.h"
+#include "map_obj_8097404.h"
+#include "mail.h"
+#include "metatile_behavior.h"
+#include "overworld.h"
+#include "palette.h"
+#include "pokemon.h"
+#include "rom_818CFC8.h"
+#include "script.h"
+#include "sound.h"
+#include "string_util.h"
+#include "task.h"
+#include "text.h"
+
+extern u16 gSpecialVar_ItemId;
+extern void(**gUnknown_0203CE54)(void);
+extern void(**gUnknown_0203CF2C)(void);
+extern void(*gUnknown_0203A0F4)(u8 taskId);
+extern void(*gUnknown_085920D8[])(void);
+extern void (*gUnknown_03006328)(u8, u16, TaskFunc);
+extern void unknown_ItemMenu_Confirm(u8 taskId);
+extern void sub_81C5B14(u8 taskId);
+extern u8 gText_DadsAdvice[];
+extern u8 gText_CantDismountBike[];
+extern void sub_8197434(u8 a, u8 b);
+extern void sub_80984F4(void);
+extern void ItemUseOutOfBattle_TMHM(u8 a);
+extern void ItemUseOutOfBattle_EvolutionStone(u8 b);
+extern void bag_menu_mail_related(void);
+extern void OpenPokeblockCase(u8 a, void(*b)(void));
+extern void overworld_free_bg_tilemaps(void);
+extern bool32 sav1_map_is_biking_allowed(void);
+extern bool8 IsPlayerFacingSurfableFishableWater(void);
+extern bool8 sub_81221AC(void);
+extern u8 gText_ItemFinderNothing[];
+extern u8 gText_ItemFinderNearby[];
+extern u8 gText_ItemFinderOnTop[];
+extern u8 gText_CoinCase[];
+extern u8 gText_PowderQty[];
+extern u8 gUnknown_085920E4[];
+extern u8 Route102_EventScript_274482[];
+extern u8 Route102_EventScript_2744C0[];
+extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[];
+extern u8 gText_BootedUpHM[];
+extern u8 gText_BootedUpTM[];
+extern u8 gText_TMHMContainedVar1[];
+extern u8 gText_PlayerUsedVar2[];
+extern u8 gText_RepelEffectsLingered[];
+extern u8 gText_UsedVar2WildLured[];
+extern u8 gText_UsedVar2WildRepelled[];
+extern u8 gText_BoxFull[];
+extern u8 gText_WontHaveEffect[];
+extern int sub_80247BC(void);
+extern struct MapHeader* mapconnection_get_mapheader(struct MapConnection *connection);
+extern void SetUpItemUseCallback(u8 taskId);
+extern void ItemUseCB_Medicine(u8, u16, TaskFunc);
+extern void sub_81B67C8(u8, u16, TaskFunc);
+extern void sub_81B79E8(u8, u16, TaskFunc);
+extern void dp05_ether(u8, u16, TaskFunc);
+extern void dp05_pp_up(u8, u16, TaskFunc);
+extern void dp05_rare_candy(u8, u16, TaskFunc);
+extern void sub_81B6DC4(u8, u16, TaskFunc);
+extern void sub_81B7C74(u8, u16, TaskFunc);
+extern u16 ItemIdToBattleMoveId(u16);
+extern void bag_menu_yes_no(u8, u8, void(**)(u8 taskId));
+extern void (*gUnknown_085920E8[])(u8 taskId);
+extern void sub_81C5924(void);
+extern void sub_81C59BC(void);
+extern void sub_81AB9A8(u8);
+extern void sub_81ABA88(u8);
+extern void sub_80B7CC8(void);
+extern void flagmods_08054D70(void);
+extern u8* sub_806CF78(u16);
+extern bool8 ExecuteTableBasedItemEffect_(struct Pokemon*, u16, u8, u8);
+extern u8 gBankInMenu;
+extern u16 gBattlePartyID[];
+extern void sub_81B89F0(void);
+extern u8 GetItemEffectType(u16);
+
+void MapPostLoadHook_UseItem(void);
+extern void sub_80AF6D4(void);
+void Task_CallItemUseOnFieldCallback(u8 taskId);
+void bag_menu_inits_lists_menu(u8 taskId);
+void ItemUseOnFieldCB_Bike(u8 taskId);
+void ItemUseOnFieldCB_Rod(u8 taskId);
+void ItemUseOnFieldCB_Itemfinder(u8 taskId);
+void sub_80FD504(u8 taskId);
+void sub_80FD5CC(u8 taskId);
+void sub_80FDA94(u8 taskId);
+void sub_80FDADC(u8 taskId);
+void sub_80FD7C8(u8 taskId);
+void sub_80FDC00(u8 taskId);
+void sub_80FDD74(u8 taskId);
+void sub_80FDE08(u8 taskId);
+void sub_80FDE7C(u8 taskId);
+void sub_80FDF90(u8 taskId);
+void task08_0809AD8C(u8 taskId);
+void sub_80FE024(u8 taskId);
+void sub_80FE124(u8 taskId);
+void sub_80FE164(u8 taskId);
+
+void DisplayItemMessage(u8 taskId, u8 a, u8* str, void(*callback)(u8 taskId));
+void DisplayItemMessageInBattlePyramid(u8 taskId, u8* str, void(*callback)(u8 taskId));
+void DisplayItemMessageOnField(u8 taskId, u8* str, void(*callback)(u8 taskId));
+void sub_81C6714(u8 taskId);
+void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId);
+void StartFishing(u8 a);
+bool8 ItemfinderCheckForHiddenItems(struct MapEvents *, u8);
+u8 sub_80FD9B0(s16 a, s16 b);
+void sub_80FDA24(u8 a);
+void sub_80FD8E0(u8 taskId, s16 x, s16 y);
+void sub_80FDBEC(void);
+bool8 sub_80FDE2C(void);
+void ItemUseOutOfBattle_CannotUse(u8 taskId);
+
+void SetUpItemUseCallback(u8 taskId)
+{
+    u8 type;
+    if (gSpecialVar_ItemId == ITEM_ENIGMA_BERRY)
+        type = gTasks[taskId].data[4] - 1;
+    else
+        type = ItemId_GetType(gSpecialVar_ItemId) - 1;
+    if (!InBattlePyramid())
+    {
+        *gUnknown_0203CE54 = gUnknown_085920D8[type];
+        unknown_ItemMenu_Confirm(taskId);
+    }
+    else
+    {
+        *gUnknown_0203CF2C = gUnknown_085920D8[type];
+        sub_81C5B14(taskId);
+    }
+}
+
+void SetUpItemUseOnFieldCallback(u8 taskId)
+{
+    if (gTasks[taskId].data[3] != 1)
+    {
+        gFieldCallback = MapPostLoadHook_UseItem;
+        SetUpItemUseCallback(taskId);
+    }
+    else
+        gUnknown_0203A0F4(taskId);
+}
+
+void MapPostLoadHook_UseItem(void)
+{
+    pal_fill_black();
+    CreateTask(Task_CallItemUseOnFieldCallback, 8);
+}
+
+void Task_CallItemUseOnFieldCallback(u8 taskId)
+{
+    if (sub_80ABDFC() == 1)
+        gUnknown_0203A0F4(taskId);
+}
+
+void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField, u8 *str)
+{
+    StringExpandPlaceholders(gStringVar4, str);
+    if (!isUsingRegisteredKeyItemOnField)
+    {
+        if (!InBattlePyramid())
+            DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu);
+        else
+            DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, sub_81C6714);
+    }
+    else
+        DisplayItemMessageOnField(taskId, gStringVar4, CleanUpAfterFailingToUseRegisteredKeyItemOnField);
+}
+
+void DisplayDadsAdviceCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField)
+{
+    DisplayCannotUseItemMessage(taskId, isUsingRegisteredKeyItemOnField, gText_DadsAdvice);
+}
+
+void DisplayCannotDismountBikeMessage(u8 taskId, bool8 isUsingRegisteredKeyItemOnField)
+{
+    DisplayCannotUseItemMessage(taskId, isUsingRegisteredKeyItemOnField, gText_CantDismountBike);
+}
+
+void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId)
+{
+    sub_8197434(0, 1);
+    DestroyTask(taskId);
+    sub_80984F4();
+    ScriptContext2_Disable();
+}
+
+u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId)
+{
+    if (ItemId_GetFieldFunc(itemId) == ItemUseOutOfBattle_TMHM)
+        return 1;
+    else if (ItemId_GetFieldFunc(itemId) == ItemUseOutOfBattle_EvolutionStone)
+        return 2;
+    else
+        return 0;
+}
+
+void sub_80FD254()
+{
+    struct MailStruct mail;
+    mail.itemId = gSpecialVar_ItemId;
+    ReadMail(&mail, bag_menu_mail_related, 0);
+}
+
+void ItemUseOutOfBattle_Mail(u8 taskId)
+{
+    *gUnknown_0203CE54 = sub_80FD254;
+    unknown_ItemMenu_Confirm(taskId);
+}
+
+void ItemUseOutOfBattle_Bike(u8 taskId)
+{
+    s16* data = gTasks[taskId].data;
+    s16 coordsY;
+    s16 coordsX;
+    u8 behavior;
+    PlayerGetDestCoords(&coordsX, &coordsY);
+    behavior = MapGridGetMetatileBehaviorAt(coordsX, coordsY);
+    if (FlagGet(FLAG_SYS_CYCLING_ROAD) == TRUE || MetatileBehavior_IsVerticalRail(behavior) == TRUE || MetatileBehavior_IsHorizontalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE)
+        DisplayCannotDismountBikeMessage(taskId, data[3]);
+    else
+    {
+        if (sav1_map_is_biking_allowed() == TRUE && IsBikingDisallowedByPlayer() == 0)
+        {
+            gUnknown_0203A0F4 = ItemUseOnFieldCB_Bike;
+            SetUpItemUseOnFieldCallback(taskId);
+        }
+        else
+            DisplayDadsAdviceCannotUseItemMessage(taskId, data[3]);
+    }
+}
+
+void ItemUseOnFieldCB_Bike(u8 taskId)
+{
+    if (!ItemId_GetSecondaryId(gSpecialVar_ItemId))
+        GetOnOffBike(2);
+    else
+        GetOnOffBike(4);
+    sub_80984F4();
+    ScriptContext2_Disable();
+    DestroyTask(taskId);
+}
+
+bool32 CanFish()
+{
+    s16 x, y;
+    u16 tileBehavior;
+
+    GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
+    tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+
+    if (MetatileBehavior_IsWaterfall(tileBehavior))
+        return FALSE;
+
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_4))
+        return FALSE;
+
+    if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+    {
+        if (IsPlayerFacingSurfableFishableWater())
+            return TRUE;
+    }
+    else
+    {
+        if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior) && !MapGridIsImpassableAt(x, y))
+            return TRUE;
+        if (MetatileBehavior_8089510(tileBehavior) == TRUE)
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+void ItemUseOutOfBattle_Rod(u8 taskId)
+{
+    if (CanFish() == TRUE)
+    {
+        gUnknown_0203A0F4 = ItemUseOnFieldCB_Rod;
+        SetUpItemUseOnFieldCallback(taskId);
+    }
+    else
+        DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]);
+}
+
+void ItemUseOnFieldCB_Rod(u8 taskId)
+{
+    StartFishing(ItemId_GetSecondaryId(gSpecialVar_ItemId));
+    DestroyTask(taskId);
+}
+
+void ItemUseOutOfBattle_Itemfinder(u8 var)
+{
+    IncrementGameStat(0x27);
+    gUnknown_0203A0F4 = ItemUseOnFieldCB_Itemfinder;
+    SetUpItemUseOnFieldCallback(var);
+}
+
+void ItemUseOnFieldCB_Itemfinder(u8 taskId)
+{
+    if (ItemfinderCheckForHiddenItems(gMapHeader.events, taskId) == TRUE)
+        gTasks[taskId].func = sub_80FD504;
+    else
+        DisplayItemMessageOnField(taskId, gText_ItemFinderNothing, sub_80FD5CC);
+}
+
+void sub_80FD504(u8 taskId)
+{
+    u8 playerDir;
+    u8 playerDirToItem;
+    u8 i;
+    s16* data = gTasks[taskId].data;
+    if (!data[3])
+    {
+        if (data[4] == 4)
+        {
+            playerDirToItem = sub_80FD9B0(data[0], data[1]);
+            if (playerDirToItem)
+            {
+                sub_80FDA24(gUnknown_085920E4[playerDirToItem - 1]);
+                gTasks[taskId].func = sub_80FDA94;
+            }
+            else
+            {
+                playerDir = player_get_direction_lower_nybble();
+                for (i = 0; i < 4; i++)
+                {
+                    if (playerDir == gUnknown_085920E4[i])
+                        data[5] = (i + 1) & 3;
+                }
+                gTasks[taskId].func = sub_80FDADC;
+                data[3] = 0;
+                data[2] = 0;
+            }
+            return;
+        }
+        PlaySE(SE_DAUGI);
+        data[4]++;
+    }
+    data[3] = (data[3] + 1) & 0x1F;
+}
+
+void sub_80FD5CC(u8 taskId)
+{
+    sub_8197434(0, 1);
+    sub_80984F4();
+    ScriptContext2_Disable();
+    DestroyTask(taskId);
+}
+
+bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId)
+{
+    int distanceX, distanceY;
+    s16 x, y, i, newDistanceX, newDistanceY;
+    PlayerGetDestCoords(&x, &y);
+    gTasks[taskId].data[2] = FALSE;
+    for (i = 0; i < events->bgEventCount; i++)
+    {
+        if (events->bgEvents[i].kind == 7 && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4))
+        {
+            distanceX = (u16)events -> bgEvents[i].x + 7;
+            newDistanceX = distanceX - x;
+            distanceY = (u16)events -> bgEvents[i].y + 7;
+            newDistanceY = distanceY - y;
+            
+            if ((u16)(newDistanceX + 7) < 15 && (newDistanceY >= -5) && (newDistanceY < 6))
+                sub_80FD8E0(taskId, newDistanceX, newDistanceY);
+        }
+    }
+    
+    sub_80FD7C8(taskId);
+    if (gTasks[taskId].data[2] == TRUE)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+bool8 sub_80FD6D4(struct MapEvents *events, s16 x, s16 y)
+{
+    u8 bgEventCount = events->bgEventCount;
+    struct BgEvent *bgEvent = events->bgEvents;
+    int i;
+
+    for (i = 0; i < bgEventCount; i++)
+    {
+        if (bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed?
+        {
+            if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4))
+                return TRUE;
+            else
+                return FALSE;
+        }
+    }
+    return FALSE;
+}
+
+bool8 sub_80FD730(struct MapConnection *connection, int x, int y)
+{
+    struct MapHeader *mapHeader;
+    u16 localX, localY;
+    u32 localOffset;
+    s32 localLength;
+
+    mapHeader = mapconnection_get_mapheader(connection);
+
+    switch (connection->direction)
+    {
+    // same weird temp variable behavior seen in sub_80FD6D4
+    case 2:
+        localOffset = connection->offset + 7;
+        localX = x - localOffset;
+        localLength = mapHeader->mapData->height - 7;
+        localY = localLength + y; // additions are reversed for some reason
+        break;
+    case 1:
+        localOffset = connection->offset + 7;
+        localX = x - localOffset;
+        localLength = gMapHeader.mapData->height + 7;
+        localY = y - localLength;
+        break;
+    case 3:
+        localLength = mapHeader->mapData->width - 7;
+        localX = localLength + x; // additions are reversed for some reason
+        localOffset = connection->offset + 7;
+        localY = y - localOffset;
+        break;
+    case 4:
+        localLength = gMapHeader.mapData->width + 7;
+        localX = x - localLength;
+        localOffset = connection->offset + 7;
+        localY = y - localOffset;
+        break;
+    default:
+        return FALSE;
+    }
+    return sub_80FD6D4(mapHeader->events, localX, localY);
+}
+
+// weird math
+#ifdef NONMATCHING
+void sub_80FD7C8(u8 taskId)
+{
+    s16 x, y;
+    s16 curX, curY;
+    s16 width = gMapHeader.mapData->width + 7;
+    s16 height = gMapHeader.mapData->height + 7;
+
+    PlayerGetDestCoords(&x, &y);
+
+    for (curX = x - 7; curX <= x + 7; curX++)
+    {
+        for (curY = y - 5; curY <= y + 5; curY++)
+        {
+            if (7 > curX
+             || curX >= width
+             || 7 > curY
+             || curY >= height)
+            {
+                struct MapConnection *conn = sub_8088A8C(curX, curY);
+                if (conn && sub_80FD730(conn, curX, curY) == TRUE)
+                    sub_80FD8E0(taskId, curX - x, curY - y);
+            }
+        }
+    }
+}
+#else
+__attribute__((naked))
+void sub_80FD7C8(u8 taskId)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+	mov r7, r10\n\
+	mov r6, r9\n\
+	mov r5, r8\n\
+	push {r5-r7}\n\
+	sub sp, 0x14\n\
+	lsls r0, 24\n\
+	lsrs r0, 24\n\
+	str r0, [sp, 0x4]\n\
+	ldr r0, =gMapHeader\n\
+	ldr r1, [r0]\n\
+	ldr r0, [r1]\n\
+	adds r0, 0x7\n\
+	lsls r0, 16\n\
+	lsrs r0, 16\n\
+	str r0, [sp, 0x8]\n\
+	ldr r0, [r1, 0x4]\n\
+	adds r0, 0x7\n\
+	lsls r0, 16\n\
+	lsrs r0, 16\n\
+	str r0, [sp, 0xC]\n\
+	mov r4, sp\n\
+	adds r4, 0x2\n\
+	mov r0, sp\n\
+	adds r1, r4, 0\n\
+	bl PlayerGetDestCoords\n\
+	mov r0, sp\n\
+	ldrh r0, [r0]\n\
+	subs r0, 0x7\n\
+	lsls r0, 16\n\
+	lsrs r3, r0, 16\n\
+	asrs r0, 16\n\
+	mov r1, sp\n\
+	movs r2, 0\n\
+	ldrsh r1, [r1, r2]\n\
+	adds r1, 0x7\n\
+	cmp r0, r1\n\
+	bgt _080FD8CC\n\
+_080FD816:\n\
+	mov r5, sp\n\
+	ldrh r0, [r5, 0x2]\n\
+	subs r0, 0x5\n\
+	lsls r0, 16\n\
+	lsrs r4, r0, 16\n\
+	lsls r2, r4, 16\n\
+	asrs r1, r2, 16\n\
+	movs r6, 0x2\n\
+	ldrsh r0, [r5, r6]\n\
+	adds r0, 0x5\n\
+	lsls r3, 16\n\
+	mov r8, r3\n\
+	cmp r1, r0\n\
+	bgt _080FD8B6\n\
+	movs r0, 0x7\n\
+	str r0, [sp, 0x10]\n\
+	mov r1, r8\n\
+	asrs r1, 16\n\
+	mov r9, r1\n\
+	mov r10, r0\n\
+_080FD83E:\n\
+	ldr r3, [sp, 0x10]\n\
+	cmp r3, r9\n\
+	bgt _080FD860\n\
+	ldr r5, [sp, 0x8]\n\
+	lsls r0, r5, 16\n\
+	asrs r0, 16\n\
+	cmp r9, r0\n\
+	bge _080FD860\n\
+	asrs r1, r2, 16\n\
+	cmp r10, r1\n\
+	bgt _080FD860\n\
+	ldr r6, [sp, 0xC]\n\
+	lsls r0, r6, 16\n\
+	asrs r0, 16\n\
+	lsls r7, r4, 16\n\
+	cmp r1, r0\n\
+	blt _080FD89E\n\
+_080FD860:\n\
+	mov r0, r8\n\
+	asrs r5, r0, 16\n\
+	lsls r4, 16\n\
+	asrs r6, r4, 16\n\
+	adds r0, r5, 0\n\
+	adds r1, r6, 0\n\
+	bl sub_8088A8C\n\
+	adds r7, r4, 0\n\
+	cmp r0, 0\n\
+	beq _080FD89E\n\
+	adds r1, r5, 0\n\
+	adds r2, r6, 0\n\
+	bl sub_80FD730\n\
+	lsls r0, 24\n\
+	lsrs r0, 24\n\
+	cmp r0, 0x1\n\
+	bne _080FD89E\n\
+	mov r0, sp\n\
+	ldrh r1, [r0]\n\
+	subs r1, r5, r1\n\
+	lsls r1, 16\n\
+	asrs r1, 16\n\
+	ldrh r2, [r0, 0x2]\n\
+	subs r2, r6, r2\n\
+	lsls r2, 16\n\
+	asrs r2, 16\n\
+	ldr r0, [sp, 0x4]\n\
+	bl sub_80FD8E0\n\
+_080FD89E:\n\
+	movs r1, 0x80\n\
+	lsls r1, 9\n\
+	adds r0, r7, r1\n\
+	lsrs r4, r0, 16\n\
+	lsls r2, r4, 16\n\
+	asrs r1, r2, 16\n\
+	mov r3, sp\n\
+	movs r5, 0x2\n\
+	ldrsh r0, [r3, r5]\n\
+	adds r0, 0x5\n\
+	cmp r1, r0\n\
+	ble _080FD83E\n\
+_080FD8B6:\n\
+	movs r1, 0x80\n\
+	lsls r1, 9\n\
+	add r1, r8\n\
+	lsrs r3, r1, 16\n\
+	asrs r1, 16\n\
+	mov r0, sp\n\
+	movs r6, 0\n\
+	ldrsh r0, [r0, r6]\n\
+	adds r0, 0x7\n\
+	cmp r1, r0\n\
+	ble _080FD816\n\
+_080FD8CC:\n\
+	add sp, 0x14\n\
+	pop {r3-r5}\n\
+	mov r8, r3\n\
+	mov r9, r4\n\
+	mov r10, r5\n\
+	pop {r4-r7}\n\
+	pop {r0}\n\
+	bx r0\n\
+	.pool\n\
+    .syntax divided\n");
+}
+#endif
+
+void sub_80FD8E0(u8 taskId, s16 x, s16 y)
+{
+    s16 *data = gTasks[taskId].data;
+    s16 var1, var2, var3, var4;
+
+    if (data[2] == FALSE)
+    {
+        data[0] = x;
+        data[1] = y;
+        data[2] = TRUE;
+    }
+    else
+    {
+        // data[0] and data[1] contain the player's coordinates.
+        // x and y contain the item's coordinates.
+        if (data[0] < 0)
+            var1 = data[0] * -1; // item is to the left
+        else
+            var1 = data[0]; // item is to the right
+
+        if (data[1] < 0)
+            var2 = data[1] * -1; // item is to the north
+        else
+            var2 = data[1]; // item is to the south
+
+        if (x < 0)
+            var3 = x * -1;
+        else
+            var3 = x;
+
+        if (y < 0)
+            var4 = y * -1;
+        else
+            var4 = y;
+
+        if (var1 + var2 > var3 + var4)
+        {
+            data[0] = x;
+            data[1] = y;
+        }
+        else
+        {
+            if (var1 + var2 == var3 + var4 && (var2 > var4 || (var2 == var4 && data[1] < y)))
+            {
+                data[0] = x;
+                data[1] = y;
+            }
+        }
+    }
+}
+
+u8 sub_80FD9B0(s16 itemX, s16 itemY)
+{
+    s16 abX, abY;
+
+    if (itemX == 0 && itemY == 0)
+        return DIR_NONE; // player is standing on the item.
+
+    // get absolute X distance.
+    if (itemX < 0)
+        abX = itemX * -1;
+    else
+        abX = itemX;
+
+    // get absolute Y distance.
+    if (itemY < 0)
+        abY = itemY * -1;
+    else
+        abY = itemY;
+
+    if (abX > abY)
+    {
+        if (itemX < 0)
+            return DIR_EAST;
+        else
+            return DIR_NORTH;
+    }
+    else
+    {
+        if (abX < abY)
+        {
+            if (itemY < 0)
+                return DIR_SOUTH;
+            else
+                return DIR_WEST;
+        }
+        if (abX == abY)
+        {
+            if (itemY < 0)
+                return DIR_SOUTH;
+            else
+                return DIR_WEST;
+        }
+        return DIR_NONE; // should never get here. return something so it doesnt crash.
+    }
+}
+
+void sub_80FDA24(u8 direction)
+{
+    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    FieldObjectClearAnim(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    npc_sync_anim_pause_bits(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    PlayerTurnInPlace(direction);
+}
+
+void sub_80FDA94(u8 taskId)
+{
+    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
+        DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC);
+}
+
+void sub_80FDADC(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
+    || data[2] == FALSE)
+    {
+        sub_80FDA24(gUnknown_085920E4[data[5]]);
+        data[2] = 1;
+        data[5] = (data[5] + 1) & 3;
+        data[3]++;
+
+        if (data[3] == 4)
+            DisplayItemMessageOnField(taskId, gText_ItemFinderOnTop, sub_80FD5CC);
+    }
+}
+
+void ItemUseOutOfBattle_PokeblockCase(u8 taskId)
+{
+    if (sub_81221AC() == TRUE)
+    {
+        DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]);
+    }
+    else if (gTasks[taskId].data[3] != TRUE)
+    {
+        *gUnknown_0203CE54 = sub_80FDBEC;
+        unknown_ItemMenu_Confirm(taskId);
+    }
+    else
+    {
+        gFieldCallback = sub_80AF6D4;
+        fade_screen(1, 0);
+        gTasks[taskId].func = sub_80FDC00;
+    }
+}
+
+void sub_80FDBEC(void)
+{
+    OpenPokeblockCase(0, bag_menu_mail_related);
+}
+
+void sub_80FDC00(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        overworld_free_bg_tilemaps();
+        OpenPokeblockCase(0, c2_exit_to_overworld_2_switch);
+        DestroyTask(taskId);
+    }
+}
+
+void ItemUseOutOfBattle_CoinCase(u8 taskId)
+{
+    ConvertIntToDecimalStringN(gStringVar1, GetCoins(), 0, 4);
+    StringExpandPlaceholders(gStringVar4, gText_CoinCase);
+
+    if (!gTasks[taskId].data[3])
+    {
+        DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu);
+    }
+    else
+    {
+        DisplayItemMessageOnField(taskId, gStringVar4, CleanUpAfterFailingToUseRegisteredKeyItemOnField);
+    }
+}
+
+void ItemUseOutOfBattle_PowderJar(u8 taskId)
+{
+    ConvertIntToDecimalStringN(gStringVar1, sub_80247BC(), 0, 5);
+    StringExpandPlaceholders(gStringVar4, gText_PowderQty);
+
+    if (!gTasks[taskId].data[3])
+    {
+        DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu);
+    }
+    else
+    {
+        DisplayItemMessageOnField(taskId, gStringVar4, CleanUpAfterFailingToUseRegisteredKeyItemOnField);
+    }
+}
+
+void sub_80FDD10(u8 taskId)
+{
+    if (IsPlayerFacingPlantedBerryTree() == TRUE)
+    {
+        gUnknown_0203A0F4 = sub_80FDD74;
+        gFieldCallback = MapPostLoadHook_UseItem;
+        *gUnknown_0203CE54 = c2_exit_to_overworld_2_switch;
+        unknown_ItemMenu_Confirm(taskId);
+    }
+    else
+    {
+        ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
+    }
+}
+
+void sub_80FDD74(u8 taskId)
+{
+    RemoveBagItem(gSpecialVar_ItemId, 1);
+    ScriptContext2_Enable();
+    ScriptContext1_SetupScript(Route102_EventScript_274482);
+    DestroyTask(taskId);
+}
+
+void ItemUseOutOfBattle_WailmerPail(u8 taskId)
+{
+    if (sub_80FDE2C() == TRUE)
+    {
+        gUnknown_0203A0F4 = sub_80FDE7C;
+        SetUpItemUseOnFieldCallback(taskId);
+    }
+    else if (TryToWaterBerryTree() == TRUE)
+    {
+        gUnknown_0203A0F4 = sub_80FDE08;
+        SetUpItemUseOnFieldCallback(taskId);
+    }
+    else
+    {
+        DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]);
+    }
+}
+
+void sub_80FDE08(u8 taskId)
+{
+    ScriptContext2_Enable();
+    ScriptContext1_SetupScript(Route102_EventScript_2744C0);
+    DestroyTask(taskId);
+}
+
+bool8 sub_80FDE2C(void)
+{
+    u16 x, y;
+    u8 z;
+    u8 objId;
+    GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
+    z = PlayerGetZCoord();
+    objId = GetFieldObjectIdByXYZ(x, y, z);
+    if (objId == 16 || gMapObjects[objId].graphicsId != 0xE4)
+    {
+        return FALSE;
+    }
+    else
+        return TRUE;
+}
+
+void sub_80FDE7C(u8 taskId)
+{
+    ScriptContext2_Enable();
+    ScriptContext1_SetupScript(BattleFrontier_OutsideEast_EventScript_242CFC);
+    DestroyTask(taskId);
+}
+
+void ItemUseOutOfBattle_Medicine(u8 taskId)
+{
+    gUnknown_03006328 = ItemUseCB_Medicine;
+    SetUpItemUseCallback(taskId);
+}
+
+void ItemUseOutOfBattle_ReduceEV(u8 taskId)
+{
+    gUnknown_03006328 = sub_81B67C8;
+    SetUpItemUseCallback(taskId);
+}
+
+void ItemUseOutOfBattle_SacredAsh(u8 taskId)
+{
+    gUnknown_03006328 = sub_81B79E8;
+    SetUpItemUseCallback(taskId);
+}
+
+void ItemUseOutOfBattle_PPRecovery(u8 taskId)
+{
+    gUnknown_03006328 = dp05_ether;
+    SetUpItemUseCallback(taskId);
+}
+
+void ItemUseOutOfBattle_PPUp(u8 taskId)
+{
+    gUnknown_03006328 = dp05_pp_up;
+    SetUpItemUseCallback(taskId);
+}
+
+void ItemUseOutOfBattle_RareCandy(u8 taskId)
+{
+    gUnknown_03006328 = dp05_rare_candy;
+    SetUpItemUseCallback(taskId);
+}
+
+void ItemUseOutOfBattle_TMHM(u8 taskId)
+{
+    if (gSpecialVar_ItemId >= ITEM_HM01)
+        DisplayItemMessage(taskId, 1, gText_BootedUpHM, sub_80FDF90); // HM
+    else
+        DisplayItemMessage(taskId, 1, gText_BootedUpTM, sub_80FDF90); // TM
+}
+
+void sub_80FDF90(u8 taskId)
+{
+    PlaySE(SE_PC_LOGIN);
+    gTasks[taskId].func = task08_0809AD8C;
+}
+
+void task08_0809AD8C(u8 taskId)
+{
+    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    {
+        StringCopy(gStringVar1, gMoveNames[ItemIdToBattleMoveId(gSpecialVar_ItemId)]);
+        StringExpandPlaceholders(gStringVar4, gText_TMHMContainedVar1);
+        DisplayItemMessage(taskId, 1, gStringVar4, sub_80FE024);
+    }
+}
+
+void sub_80FE024(u8 taskId)
+{
+    bag_menu_yes_no(taskId, 6, gUnknown_085920E8);
+}
+
+void sub_80FE03C(u8 taskId)
+{
+    gUnknown_03006328 = sub_81B6DC4;
+    SetUpItemUseCallback(taskId);
+}
+
+void sub_80FE058(void)
+{
+    RemoveBagItem(gSpecialVar_ItemId, 1);
+    CopyItemName(gSpecialVar_ItemId, gStringVar2);
+    StringExpandPlaceholders(gStringVar4, gText_PlayerUsedVar2);
+    if (!InBattlePyramid())
+    {
+        sub_81AB9A8(ItemId_GetPocket(gSpecialVar_ItemId));
+        sub_81ABA88(ItemId_GetPocket(gSpecialVar_ItemId));
+    }
+    else
+    {
+        sub_81C5924();
+        sub_81C59BC();
+    }
+}
+
+void ItemUseOutOfBattle_Repel(u8 taskId)
+{
+    if (VarGet(VAR_REPEL_STEP_COUNT) == 0)
+        gTasks[taskId].func = sub_80FE124;
+    else if (!InBattlePyramid())
+        DisplayItemMessage(taskId, 1, gText_RepelEffectsLingered, bag_menu_inits_lists_menu);
+    else
+        DisplayItemMessageInBattlePyramid(taskId, gText_RepelEffectsLingered, sub_81C6714);
+}
+
+void sub_80FE124(u8 taskId)
+{
+    s16* data = gTasks[taskId].data;
+    
+    if (++data[8] > 7)
+    {
+        data[8] = 0;
+        PlaySE(SE_TU_SAA);
+        gTasks[taskId].func = sub_80FE164;
+    }
+}
+
+void sub_80FE164(u8 taskId)
+{
+    if (!IsSEPlaying())
+    {
+        VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId));
+        sub_80FE058();
+        if (!InBattlePyramid())
+            DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu);
+        else
+            DisplayItemMessageInBattlePyramid(taskId, gStringVar4, sub_81C6714);
+    }
+}
+
+void sub_80FE1D0(u8 taskId)
+{
+    if(++gTasks[taskId].data[8] > 7)
+    {
+        PlaySE(SE_BIDORO);
+        if (!InBattlePyramid())
+            DisplayItemMessage(taskId, 1, gStringVar4, bag_menu_inits_lists_menu);
+        else
+            DisplayItemMessageInBattlePyramid(taskId, gStringVar4, sub_81C6714);
+    }
+}
+
+void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId)
+{
+    CopyItemName(gSpecialVar_ItemId, gStringVar2);
+    if (gSpecialVar_ItemId == ITEM_WHITE_FLUTE)
+    {
+        FlagSet(FLAG_SYS_ENC_UP_ITEM);
+        FlagClear(FLAG_SYS_ENC_DOWN_ITEM);
+        StringExpandPlaceholders(gStringVar4, gText_UsedVar2WildLured);
+    }
+    else
+    {
+        FlagSet(FLAG_SYS_ENC_DOWN_ITEM);
+        FlagClear(FLAG_SYS_ENC_UP_ITEM);
+        StringExpandPlaceholders(gStringVar4, gText_UsedVar2WildRepelled);
+    }
+    gTasks[taskId].data[8] = 0;
+    gTasks[taskId].func = sub_80FE1D0;
+}
+
+void task08_080A1C44(u8 taskId)
+{
+    player_avatar_init_params_reset();
+    sub_80B7CC8();
+    DestroyTask(taskId);
+}
+
+void re_escape_rope(u8 taskId)
+{
+    flagmods_08054D70();
+    sub_80FE058();
+    gTasks[taskId].data[0] = 0;
+    DisplayItemMessageOnField(taskId, gStringVar4, task08_080A1C44);
+}
+
+bool8 sub_80FE314(void)
+{
+    if (gMapHeader.flags & 2)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void ItemUseOutOfBattle_EscapeRope(u8 taskId)
+{
+    if (sub_80FE314() == TRUE)
+    {
+        gUnknown_0203A0F4 = re_escape_rope;
+        SetUpItemUseOnFieldCallback(taskId);
+    }
+    else
+    {
+        DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]);
+    }
+}
+
+void ItemUseOutOfBattle_EvolutionStone(u8 taskId)
+{
+    gUnknown_03006328 = sub_81B7C74;
+    SetUpItemUseCallback(taskId);
+}
+
+void ItemUseInBattle_PokeBall(u8 taskId)
+{
+    if (IsPlayerPartyAndPokemonStorageFull() == FALSE) // have room for mon?
+    {
+        RemoveBagItem(gSpecialVar_ItemId, 1);
+        if (!InBattlePyramid())
+            unknown_ItemMenu_Confirm(taskId);
+        else
+            sub_81C5B14(taskId);
+    }
+    else if (!InBattlePyramid())
+        DisplayItemMessage(taskId, 1, gText_BoxFull, bag_menu_inits_lists_menu);
+    else
+        DisplayItemMessageInBattlePyramid(taskId, gText_BoxFull, sub_81C6714);
+}
+
+void sub_80FE408(u8 taskId)
+{
+    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    {
+        if (!InBattlePyramid())
+            unknown_ItemMenu_Confirm(taskId);
+        else
+            sub_81C5B14(taskId);
+    }
+}
+
+void sub_80FE440(u8 taskId)
+{
+    if(++gTasks[taskId].data[8] > 7)
+    {
+        PlaySE(SE_KAIFUKU);
+        RemoveBagItem(gSpecialVar_ItemId, 1);
+        if (!InBattlePyramid())
+            DisplayItemMessage(taskId, 1, sub_806CF78(gSpecialVar_ItemId), sub_80FE408);
+        else
+            DisplayItemMessageInBattlePyramid(taskId, sub_806CF78(gSpecialVar_ItemId), sub_80FE408);
+    }
+}
+
+void ItemUseInBattle_StatIncrease(u8 taskId)
+{
+    u16 partyId = gBattlePartyID[gBankInMenu];
+
+    if (ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gSpecialVar_ItemId, partyId, 0) != FALSE)
+    {
+        if (!InBattlePyramid())
+            DisplayItemMessage(taskId, 1, gText_WontHaveEffect, bag_menu_inits_lists_menu);
+        else
+            DisplayItemMessageInBattlePyramid(taskId, gText_WontHaveEffect, sub_81C6714);
+    }
+    else
+    {
+        gTasks[taskId].func = sub_80FE440;
+        gTasks[taskId].data[8] = 0;
+    }
+}
+
+void sub_80FE54C(u8 taskId)
+{
+    if (!InBattlePyramid())
+    {
+        *gUnknown_0203CE54 = sub_81B89F0;
+        unknown_ItemMenu_Confirm(taskId);
+    }
+    else
+    {
+        *gUnknown_0203CF2C = sub_81B89F0;
+        sub_81C5B14(taskId);
+    }
+}
+
+void ItemUseInBattle_Medicine(u8 taskId)
+{
+    gUnknown_03006328 = ItemUseCB_Medicine;
+    sub_80FE54C(taskId);
+}
+
+void sub_80FE5AC(u8 taskId)
+{
+    gUnknown_03006328 = sub_81B79E8;
+    sub_80FE54C(taskId);
+}
+
+void ItemUseInBattle_PPRecovery(u8 taskId)
+{
+    gUnknown_03006328 = dp05_ether;
+    sub_80FE54C(taskId);
+}
+
+void ItemUseInBattle_Escape(u8 taskId)
+{
+
+    if((gBattleTypeFlags & BATTLE_TYPE_TRAINER) == FALSE)
+    {
+        sub_80FE058();
+        if (!InBattlePyramid())
+            DisplayItemMessage(taskId, 1, gStringVar4, unknown_ItemMenu_Confirm);
+        else
+            DisplayItemMessageInBattlePyramid(taskId, gStringVar4, sub_81C5B14);
+    }
+    else
+    {
+        DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]);
+    }
+}
+
+void ItemUseOutOfBattle_EnigmaBerry(u8 taskId)
+{
+    switch (GetItemEffectType(gSpecialVar_ItemId) - 1)
+    {
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 10:
+    case 11:
+    case 12:
+    case 13:
+    case 14:
+    case 15:
+    case 16:
+        gTasks[taskId].data[4] = 1;
+        ItemUseOutOfBattle_Medicine(taskId);
+        break;
+    case 9:
+        gTasks[taskId].data[4] = 1;
+        ItemUseOutOfBattle_SacredAsh(taskId);
+        break;
+    case 0:
+        gTasks[taskId].data[4] = 1;
+        ItemUseOutOfBattle_RareCandy(taskId);
+        break;
+    case 18:
+    case 19:
+        gTasks[taskId].data[4] = 1;
+        ItemUseOutOfBattle_PPUp(taskId);
+        break;
+    case 20:
+        gTasks[taskId].data[4] = 1;
+        ItemUseOutOfBattle_PPRecovery(taskId);
+        break;
+    default:
+        gTasks[taskId].data[4] = 4;
+        ItemUseOutOfBattle_CannotUse(taskId);
+    }
+}
+
+void ItemUseInBattle_EnigmaBerry(u8 taskId)
+{
+    switch (GetItemEffectType(gSpecialVar_ItemId))
+    {
+    case 0:
+        ItemUseInBattle_StatIncrease(taskId);
+        break;
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+    case 11:
+        ItemUseInBattle_Medicine(taskId);
+        break;
+    case 21:
+        ItemUseInBattle_PPRecovery(taskId);
+        break;
+    default:
+        ItemUseOutOfBattle_CannotUse(taskId);
+    }
+}
+
+void ItemUseOutOfBattle_CannotUse(u8 taskId)
+{
+    DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]);
+}
-- 
cgit v1.2.3


From 2a16b7cb81419aed581a86a831d1e2413ad57b39 Mon Sep 17 00:00:00 2001
From: golem galvanize <golemgalvanize@github.com>
Date: Sun, 28 Jan 2018 00:22:06 -0500
Subject: decompile field_message_box

---
 src/field_message_box.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100755 src/field_message_box.c

(limited to 'src')

diff --git a/src/field_message_box.c b/src/field_message_box.c
new file mode 100755
index 000000000..fc51bc588
--- /dev/null
+++ b/src/field_message_box.c
@@ -0,0 +1,162 @@
+#include "global.h"
+#include "string.h"
+#include "string_util.h"
+#include "task.h"
+#include "text.h"
+
+extern void sub_81973A4(void);
+extern void sub_81973C4(u8, u8);
+extern u16 sub_8197224(void);
+extern int sub_8196094(void);
+extern void sub_8196080(u8*);
+extern void AddTextPrinterForMessage(u8);
+extern void sub_8197434(u8, u8);
+extern void sub_81973FC(u8, u8);
+
+extern u8 gUnknown_020375BC;
+
+void textbox_fdecode_auto_and_task_add(u8*, int);
+void textbox_auto_and_task_add(void);
+
+void sub_8098128(void)
+{
+    gUnknown_020375BC = 0;
+    gTextFlags.flag_0 = 0;
+    gTextFlags.flag_1 = 0;
+    gTextFlags.flag_2 = 0;
+    gTextFlags.flag_3 = 0;
+}
+
+void sub_8098154(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    
+    switch (task->data[0])
+    {
+        case 0:
+           sub_81973A4();
+           task->data[0]++;
+           break;
+        case 1:
+           sub_81973C4(0, 1);
+           task->data[0]++;
+           break;
+        case 2:
+            if (sub_8197224() != 1)
+            {
+                gUnknown_020375BC = 0;
+                DestroyTask(taskId);
+            }
+    }
+}
+
+void task_add_textbox(void)
+{
+    CreateTask(sub_8098154, 0x50);
+}
+
+void task_del_textbox(void)
+{
+    u8 taskId = FindTaskIdByFunc(sub_8098154);
+    if (taskId != 0xFF)
+        DestroyTask(taskId);
+}
+
+bool8 ShowFieldMessage(u8 *str)
+{
+    if (gUnknown_020375BC != 0)
+        return FALSE;
+    textbox_fdecode_auto_and_task_add(str, 1);
+    gUnknown_020375BC = 2;
+    return TRUE; 
+}
+
+void sub_8098214(u8 taskId)
+{
+    if (sub_8196094() == 0)
+    {
+        gUnknown_020375BC = 0;
+        DestroyTask(taskId);
+    }
+}
+
+bool8 sub_8098238(u8 *str)
+{
+    if (gUnknown_020375BC != 0)
+        return FALSE;
+    StringExpandPlaceholders(gStringVar4, str);
+    CreateTask(sub_8098214, 0);
+    sub_8196080(str);
+    gUnknown_020375BC = 2;
+    return TRUE;
+}
+
+bool8 ShowFieldAutoScrollMessage(u8 *str)
+{
+    if (gUnknown_020375BC != 0)
+        return FALSE;
+    gUnknown_020375BC = 3;
+    textbox_fdecode_auto_and_task_add(str, 0);
+    return TRUE;
+}
+
+bool8 sub_80982A0(u8 *str)
+{
+    gUnknown_020375BC = 3;
+    textbox_fdecode_auto_and_task_add(str, 1);
+    return TRUE;
+}
+
+bool8 sub_80982B8(void)
+{
+    if (gUnknown_020375BC != 0)
+        return FALSE;
+    gUnknown_020375BC = 2;
+    textbox_auto_and_task_add();
+    return TRUE;
+}
+
+void textbox_fdecode_auto_and_task_add(u8* str, int a)
+{
+    StringExpandPlaceholders(gStringVar4, str);
+    AddTextPrinterForMessage(a);
+    task_add_textbox();
+}
+
+void textbox_auto_and_task_add(void)
+{
+    AddTextPrinterForMessage(1);
+    task_add_textbox();
+}
+
+void HideFieldMessageBox(void)
+{
+    task_del_textbox();
+    sub_8197434(0, 1);
+    gUnknown_020375BC = 0;
+}
+
+u8 textbox_any_visible(void)
+{
+    return gUnknown_020375BC;
+}
+
+bool8 IsFieldMessageBoxHidden(void)
+{
+    if (gUnknown_020375BC == 0)
+        return TRUE;
+    return FALSE;
+}
+
+void sub_8098358(void)
+{
+    task_del_textbox();
+    sub_81973FC(0, 1);
+    gUnknown_020375BC = 0;
+}
+
+void sub_8098374(void)
+{
+    task_del_textbox();
+    gUnknown_020375BC = 0;
+}
-- 
cgit v1.2.3


From 3eaaa59c047f529c81bcfe2cd0f5d0c8fdcc6bff Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 29 Jan 2018 04:13:15 -0500
Subject: start decompiling field_map_obj_helpers

---
 src/field_map_obj_helpers.c | 371 ++++++++++++++++++++++++++++++++++++++++++++
 src/trainer_see.c           |   2 +-
 2 files changed, 372 insertions(+), 1 deletion(-)
 create mode 100755 src/field_map_obj_helpers.c

(limited to 'src')

diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
new file mode 100755
index 000000000..1247a7cd7
--- /dev/null
+++ b/src/field_map_obj_helpers.c
@@ -0,0 +1,371 @@
+#include "global.h"
+#include "field_ground_effect.h"
+#include "field_map_obj.h"
+
+typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
+
+extern const s8 gUnknown_0850E7BA[];
+extern const s8 gUnknown_0850E772[];
+
+extern s16 gUnknown_0850E768[];
+extern SpriteStepFunc *const gUnknown_0850E754[];
+extern const struct Coords16 gUnknown_0850DB7C[4];
+
+bool8 FreezeMapObject(struct MapObject *mapObject)
+{
+    if (mapObject->mapobj_bit_6 || mapObject->mapobj_bit_8)
+    {
+        return TRUE;
+    }
+    else
+    {
+        mapObject->mapobj_bit_8 = 1;
+        mapObject->mapobj_bit_23 = gSprites[mapObject->spriteId].animPaused;
+        mapObject->mapobj_bit_24 = gSprites[mapObject->spriteId].affineAnimPaused;
+        gSprites[mapObject->spriteId].animPaused = 1;
+        gSprites[mapObject->spriteId].affineAnimPaused = 1;
+        return FALSE;
+    }
+}
+
+void FreezeMapObjects(void)
+{
+    u8 i;
+    for (i = 0; i < 16; i++)
+        if (gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
+            FreezeMapObject(&gMapObjects[i]);
+}
+
+void FreezeMapObjectsExceptOne(u8 a1)
+{
+    u8 i;
+    for (i = 0; i < 16; i++)
+        if (i != a1 && gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
+            FreezeMapObject(&gMapObjects[i]);
+}
+
+void npc_sync_anim_pause_bits(struct MapObject *mapObject)
+{
+    if (mapObject->active && mapObject->mapobj_bit_8)
+    {
+        mapObject->mapobj_bit_8 = 0;
+        gSprites[mapObject->spriteId].animPaused = mapObject->mapobj_bit_23;
+        gSprites[mapObject->spriteId].affineAnimPaused = mapObject->mapobj_bit_24;
+    }
+}
+
+void UnfreezeMapObjects(void)
+{
+    u8 i;
+    for (i = 0; i < 16; i++)
+        if (gMapObjects[i].active)
+            npc_sync_anim_pause_bits(&gMapObjects[i]);
+}
+
+void little_step(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += gUnknown_0850DB7C[dir].x;
+    sprite->pos1.y += gUnknown_0850DB7C[dir].y;
+}
+
+void double_little_steps(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 2 * (u16) gUnknown_0850DB7C[dir].x;
+    sprite->pos1.y += 2 * (u16) gUnknown_0850DB7C[dir].y;
+}
+
+void triple_little_steps(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 2 * (u16) gUnknown_0850DB7C[dir].x + (u16) gUnknown_0850DB7C[dir].x;
+    sprite->pos1.y += 2 * (u16) gUnknown_0850DB7C[dir].y + (u16) gUnknown_0850DB7C[dir].y;
+}
+
+void quad_little_steps(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 4 * (u16) gUnknown_0850DB7C[dir].x;
+    sprite->pos1.y += 4 * (u16) gUnknown_0850DB7C[dir].y;
+}
+
+void oct_little_steps(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 8 * (u16) gUnknown_0850DB7C[dir].x;
+    sprite->pos1.y += 8 * (u16) gUnknown_0850DB7C[dir].y;
+}
+
+void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3)
+{
+    sprite->data[3] = a2;
+    sprite->data[4] = a3;
+    sprite->data[5] = 0;
+}
+
+bool8 obj_npc_ministep(struct Sprite *sprite)
+{
+    if (sprite->data[5] >= gUnknown_0850E768[sprite->data[4]])
+        return FALSE;
+
+    gUnknown_0850E754[sprite->data[4]][sprite->data[5]](sprite, sprite->data[3]);
+
+    sprite->data[5]++;
+
+    if (sprite->data[5] < gUnknown_0850E768[sprite->data[4]])
+        return FALSE;
+
+    return TRUE;
+}
+
+void sub_80976DC(struct Sprite *sprite, u8 a2)
+{
+    sprite->data[3] = a2;
+    sprite->data[4] = 0;
+    sprite->data[5] = 0;
+}
+
+bool8 sub_80976EC(struct Sprite *sprite)
+{
+    if (!(sprite->data[4] & 1))
+    {
+        little_step(sprite, sprite->data[3]);
+        sprite->data[5]++;
+    }
+
+    sprite->data[4]++;
+
+    if (sprite->data[5] > 15)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+// new helper added here in the middle. Perhaps Game Freak kept these organized in alphebetical order or some other heirarchy?
+
+s16 sub_8097728(s16 a1)
+{
+    return gUnknown_0850E7BA[a1];
+}
+
+s16 sub_809773C(s16 a1)
+{
+    return gUnknown_0850E772[a1];
+}
+
+void sub_8097750(struct Sprite *sprite)
+{
+    sprite->data[6] = 0;
+    sprite->data[7] = 0;
+}
+
+bool8 sub_8097758(struct Sprite *sprite)
+{
+    bool8 result = FALSE;
+
+    switch(sprite->data[7])
+    {
+        case 0:
+            sprite->pos2.x += sub_809773C(sprite->data[6]);
+            sprite->pos2.y += sub_8097728(sprite->data[6]);
+            break;
+        case 1:
+            sprite->pos2.x -= sub_809773C(0x47 - sprite->data[6]);
+            sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]);
+            break;
+        case 2:
+            sprite->pos2.x -= sub_809773C(sprite->data[6]);
+            sprite->pos2.y += sub_8097728(sprite->data[6]);
+            break;
+        case 3:
+            sprite->pos2.x += sub_809773C(0x47 - sprite->data[6]);
+            sprite->pos2.y += sub_8097728(0x47 - sprite->data[6]);
+            break;
+    }
+    if(++sprite->data[6] == 0x48)
+    {
+        sprite->data[6] = 0;
+        sprite->data[7]++;
+    }
+    if(sprite->data[7] == 0x4)
+    {
+        sprite->pos2.y = 0;
+        sprite->pos2.x = 0;
+        result = TRUE;
+    }
+    return result;
+}
+
+extern const s8 *const gUnknown_0850E834[];
+extern s16 gUnknown_0850E840[];
+extern u8 gUnknown_0850E846[];
+
+s16 sub_8097820(s16 a1, u8 a2)
+{
+    return gUnknown_0850E834[a2][a1];
+}
+
+void sub_809783C(struct Sprite *sprite, u8 a2, u8 a3, u8 a4)
+{
+    sprite->data[3] = a2;
+    sprite->data[4] = a3;
+    sprite->data[5] = a4;
+    sprite->data[6] = 0;
+}
+
+u8 sub_809785C(struct Sprite *sprite)
+{
+    s16 v5[3];
+    u8 v6[3];
+    u8 v2;
+
+    memcpy(v5, gUnknown_0850E840, 6); // TODO: get rid of memcpy
+    memcpy(v6, gUnknown_0850E846, 3);
+    v2 = 0;
+
+    if (sprite->data[4])
+        little_step(sprite, sprite->data[3]);
+
+    sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]);
+
+    sprite->data[6]++;
+
+    if (sprite->data[6] == (v5[sprite->data[4]] >> 1))
+        v2 = 1;
+
+    if (sprite->data[6] >= v5[sprite->data[4]])
+    {
+        sprite->pos2.y = 0;
+        v2 = -1;
+    }
+
+    return v2;
+}
+
+extern s16 gUnknown_0850E84A[];
+extern u8 gUnknown_0850E850[];
+
+u8 sub_80978E4(struct Sprite *sprite)
+{
+    s16 v5[3];
+    u8 v6[3];
+    u8 v2;
+
+    memcpy(v5, gUnknown_0850E84A, 6);
+    memcpy(v6, gUnknown_0850E850, 3);
+    v2 = 0;
+
+    if (sprite->data[4] && !(sprite->data[6] & 1))
+        little_step(sprite, sprite->data[3]);
+
+    sprite->pos2.y = sub_8097820(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]);
+
+    sprite->data[6]++;
+
+    if (sprite->data[6] == (v5[sprite->data[4]] >> 1))
+        v2 = 1;
+
+    if (sprite->data[6] >= v5[sprite->data[4]])
+    {
+        sprite->pos2.y = 0;
+        v2 = -1;
+    }
+
+    return v2;
+}
+
+void SetFieldObjectStepTimer(struct Sprite *sprite, u16 timer)
+{
+    sprite->data[3] = timer;
+}
+
+
+bool8 RunFieldObjectStepTimer(struct Sprite *sprite)
+{
+    sprite->data[3]--;
+
+    if (sprite->data[3] == 0)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3)
+{
+    sprite->animNum = a2;
+    sprite->animPaused = 0 ;
+    SeekSpriteAnim(sprite, a3);
+}
+
+bool8 sub_80979BC(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void sub_80979D4(struct Sprite *sprite, bool8 invisible)
+{
+    u16 x, y;
+    s16 x2, y2;
+
+    sprite->invisible = invisible;
+
+    if (sprite->coordOffsetEnabled)
+    {
+        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
+        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
+    }
+    else
+    {
+        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
+        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+    }
+
+    x2 = x - (sprite->centerToCornerVecX >> 1);
+    y2 = y - (sprite->centerToCornerVecY >> 1);
+
+    if ((s16)x > 255 || x2 < -16)
+        sprite->invisible = 1;
+    if ((s16)y > 175 || y2 < -16)
+        sprite->invisible = 1;
+}
+
+extern void sub_8097D68(struct Sprite *sprite);
+
+void sub_8097AC8(struct Sprite *sprite)
+{
+    sub_8097D68(sprite);
+    SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1);
+    sub_80979D4(sprite, sprite->data[2]);
+}
+
+void sub_8097AF0(void)
+{
+    int i;
+
+    for(i = 0; i < MAX_SPRITES; i++)
+    {
+        struct Sprite *sprite = &gSprites[i];
+        if(sprite->inUse && sprite->callback == sub_8097AC8)
+            DestroySprite(sprite);
+    }
+}
+
+int sub_8097B2C(u8 var) // this should return a u8, because all that call this shifts to u8, but it wont match because it doesnt shift u8 at the end.
+{
+    int i;
+
+    for(i = 0; i < MAX_SPRITES; i++)
+    {
+        struct Sprite *sprite = &gSprites[i];
+        if(sprite->inUse && sprite->callback == sub_8097AC8 && (u8)sprite->data[0] == var)
+            return i;
+    }
+    return MAX_SPRITES;
+}
+
+void sub_8097B78(u8 var1, u8 var2)
+{
+    u8 spriteId = sub_8097B2C(var1);
+
+    if(spriteId != MAX_SPRITES)
+        StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(var2));
+}
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 53bc5cbbb..38773ec50 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -639,7 +639,7 @@ void sub_80B45D0(void)
             gApproachingTrainerId++;
             gSpecialVar_Result = 1;
             UnfreezeMapObjects();
-            sub_80974D0(gApproachingTrainers[1].mapObjectId);
+            FreezeMapObjectsExceptOne(gApproachingTrainers[1].mapObjectId);
         }
         else
         {
-- 
cgit v1.2.3


From ed546d680f726e068183f94d0104a251f75fbfe2 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 29 Jan 2018 12:36:56 +0100
Subject: pokemon animation is decompiled

---
 src/hall_of_fame.c      |    3 +-
 src/pokemon_3.c         |   11 +-
 src/pokemon_animation.c | 2135 +++++++++++++++++++++++++++++++++--------------
 3 files changed, 1502 insertions(+), 647 deletions(-)

(limited to 'src')

diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 3e70e22fa..38183e807 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -25,6 +25,7 @@
 #include "random.h"
 #include "event_data.h"
 #include "overworld.h"
+#include "new_menu_helpers.h"
 
 struct HallofFameMon
 {
@@ -53,7 +54,6 @@ static EWRAM_DATA struct HofGfx *sHofGfxPtr = NULL;
 
 extern bool8 gHasHallOfFameRecords;
 extern u32 gUnknown_0203BCD4;
-extern u8 gDecompressionBuffer[];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern MainCallback gGameContinueCallback;
 extern u32 gDamagedSaveSectors;
@@ -82,7 +82,6 @@ extern const u8 gContestConfetti_Gfx[];
 extern const u8 gContestConfetti_Pal[];
 
 extern void sub_81973C4(u8, u8);
-extern u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
 extern void sub_8175620(void);
 extern u8 TrySavingData(u8);
 extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 95ec4b6a2..7ffb2f36a 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -74,8 +74,6 @@ extern u8 GetFrontierOpponentClass(u16 trainerId);
 extern u8 pokemon_order_func(u8 bankPartyId);
 extern void GetFrontierTrainerName(u8* dest, u16 trainerId);
 extern void sub_81C488C(u8);
-extern void sub_817F578(struct Sprite*, u8 frontAnimId);
-extern u8 GetSpeciesBackAnimId(u16 species);
 
 static void sub_806E6CC(u8 taskId);
 
@@ -1508,7 +1506,7 @@ static void Task_PokemonSummaryAnimateAfterDelay(u8 taskId)
 {
     if (--gTasks[taskId].data[3] == 0)
     {
-        sub_817F578(READ_PTR_FROM_TASK(taskId, 0), gTasks[taskId].data[2]);
+        StartMonSummaryAnimation(READ_PTR_FROM_TASK(taskId, 0), gTasks[taskId].data[2]);
         sub_81C488C(0xFF);
         DestroyTask(taskId);
     }
@@ -1523,7 +1521,6 @@ void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u
 }
 
 extern void SpriteCallbackDummy_2(struct Sprite*);
-extern void sub_817F60C(struct Sprite*);
 
 void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3)
 {
@@ -1580,11 +1577,11 @@ void PokemonSummaryDoMonAnimation(struct Sprite* sprite, u16 species, bool8 oneF
         gTasks[taskId].data[2] = gMonFrontAnimIdsTable[species - 1];
         gTasks[taskId].data[3] = gMonAnimationDelayTable[species - 1];
         sub_81C488C(taskId);
-        sub_817F60C(sprite);
+        SetSpriteCB_MonAnimDummy(sprite);
     }
     else
     {
-        sub_817F578(sprite, gMonFrontAnimIdsTable[species - 1]);
+        StartMonSummaryAnimation(sprite, gMonFrontAnimIdsTable[species - 1]);
     }
 }
 
@@ -1603,7 +1600,7 @@ void BattleAnimateBackSprite(struct Sprite* sprite, u16 species)
     }
     else
     {
-        LaunchAnimationTaskForBackSprite(sprite, GetSpeciesBackAnimId(species));
+        LaunchAnimationTaskForBackSprite(sprite, GetSpeciesBackAnimSet(species));
         sprite->callback = SpriteCallbackDummy_2;
     }
 }
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 67915d228..c8fcff93a 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -16,167 +16,171 @@ struct UnkAnimStruct
 };
 
 extern u16 gBattlePartyID[];
-extern bool32 gUnknown_03001274;
-extern struct UnkAnimStruct gUnknown_03001240[];
-extern u8 gUnknown_03001270;
 
 // this file's functions
-void pokemonanimfunc_00(struct Sprite *sprite);
-void pokemonanimfunc_01(struct Sprite *sprite);
-void pokemonanimfunc_02(struct Sprite *sprite);
-void pokemonanimfunc_03(struct Sprite *sprite);
-void pokemonanimfunc_04(struct Sprite *sprite);
-void pokemonanimfunc_05(struct Sprite *sprite);
-void pokemonanimfunc_06(struct Sprite *sprite);
-void pokemonanimfunc_07(struct Sprite *sprite);
-void pokemonanimfunc_08(struct Sprite *sprite);
-void pokemonanimfunc_09(struct Sprite *sprite);
-void pokemonanimfunc_0A(struct Sprite *sprite);
-void pokemonanimfunc_0B(struct Sprite *sprite);
-void pokemonanimfunc_0C(struct Sprite *sprite);
-void pokemonanimfunc_0D(struct Sprite *sprite);
-void pokemonanimfunc_0E(struct Sprite *sprite);
-void pokemonanimfunc_0F(struct Sprite *sprite);
-void pokemonanimfunc_10(struct Sprite *sprite);
-void pokemonanimfunc_11(struct Sprite *sprite);
-void pokemonanimfunc_12(struct Sprite *sprite);
-void pokemonanimfunc_13(struct Sprite *sprite);
-void pokemonanimfunc_14(struct Sprite *sprite);
-void pokemonanimfunc_15(struct Sprite *sprite);
-void pokemonanimfunc_16(struct Sprite *sprite);
-void pokemonanimfunc_17(struct Sprite *sprite);
-void pokemonanimfunc_18(struct Sprite *sprite);
-void pokemonanimfunc_19(struct Sprite *sprite);
-void pokemonanimfunc_1A(struct Sprite *sprite);
-void pokemonanimfunc_1B(struct Sprite *sprite);
-void pokemonanimfunc_1C(struct Sprite *sprite);
-void pokemonanimfunc_1D(struct Sprite *sprite);
-void pokemonanimfunc_1E(struct Sprite *sprite);
-void pokemonanimfunc_1F(struct Sprite *sprite);
-void pokemonanimfunc_20(struct Sprite *sprite);
-void pokemonanimfunc_21(struct Sprite *sprite);
-void pokemonanimfunc_22(struct Sprite *sprite);
-void pokemonanimfunc_23(struct Sprite *sprite);
-void pokemonanimfunc_24(struct Sprite *sprite);
-void pokemonanimfunc_25(struct Sprite *sprite);
-void pokemonanimfunc_26(struct Sprite *sprite);
-void pokemonanimfunc_27(struct Sprite *sprite);
-void pokemonanimfunc_28(struct Sprite *sprite);
-void pokemonanimfunc_29(struct Sprite *sprite);
-void pokemonanimfunc_2A(struct Sprite *sprite);
-void pokemonanimfunc_2B(struct Sprite *sprite);
-void pokemonanimfunc_2C(struct Sprite *sprite);
-void pokemonanimfunc_2D(struct Sprite *sprite);
-void pokemonanimfunc_2E(struct Sprite *sprite);
-void pokemonanimfunc_2F(struct Sprite *sprite);
-void pokemonanimfunc_30(struct Sprite *sprite);
-void pokemonanimfunc_31(struct Sprite *sprite);
-void pokemonanimfunc_32(struct Sprite *sprite);
-void pokemonanimfunc_33(struct Sprite *sprite);
-void pokemonanimfunc_34(struct Sprite *sprite);
-void pokemonanimfunc_35(struct Sprite *sprite);
-void pokemonanimfunc_36(struct Sprite *sprite);
-void pokemonanimfunc_37(struct Sprite *sprite);
-void pokemonanimfunc_38(struct Sprite *sprite);
-void pokemonanimfunc_39(struct Sprite *sprite);
-void pokemonanimfunc_3A(struct Sprite *sprite);
-void pokemonanimfunc_3B(struct Sprite *sprite);
-void pokemonanimfunc_3C(struct Sprite *sprite);
-void pokemonanimfunc_3D(struct Sprite *sprite);
-void pokemonanimfunc_3E(struct Sprite *sprite);
-void pokemonanimfunc_3F(struct Sprite *sprite);
-void pokemonanimfunc_40(struct Sprite *sprite);
-void pokemonanimfunc_41(struct Sprite *sprite);
-void pokemonanimfunc_42(struct Sprite *sprite);
-void pokemonanimfunc_43(struct Sprite *sprite);
-void pokemonanimfunc_44(struct Sprite *sprite);
-void pokemonanimfunc_45(struct Sprite *sprite);
-void pokemonanimfunc_46(struct Sprite *sprite);
-void pokemonanimfunc_47(struct Sprite *sprite);
-void pokemonanimfunc_48(struct Sprite *sprite);
-void pokemonanimfunc_49(struct Sprite *sprite);
-void pokemonanimfunc_4A(struct Sprite *sprite);
-void pokemonanimfunc_4B(struct Sprite *sprite);
-void pokemonanimfunc_4C(struct Sprite *sprite);
-void pokemonanimfunc_4D(struct Sprite *sprite);
-void pokemonanimfunc_4E(struct Sprite *sprite);
-void pokemonanimfunc_4F(struct Sprite *sprite);
-void pokemonanimfunc_50(struct Sprite *sprite);
-void pokemonanimfunc_51(struct Sprite *sprite);
-void pokemonanimfunc_52(struct Sprite *sprite);
-void pokemonanimfunc_53(struct Sprite *sprite);
-void pokemonanimfunc_54(struct Sprite *sprite);
-void pokemonanimfunc_55(struct Sprite *sprite);
-void pokemonanimfunc_56(struct Sprite *sprite);
-void pokemonanimfunc_57(struct Sprite *sprite);
-void pokemonanimfunc_58(struct Sprite *sprite);
-void pokemonanimfunc_59(struct Sprite *sprite);
-void pokemonanimfunc_5A(struct Sprite *sprite);
-void pokemonanimfunc_5B(struct Sprite *sprite);
-void pokemonanimfunc_5C(struct Sprite *sprite);
-void pokemonanimfunc_5D(struct Sprite *sprite);
-void pokemonanimfunc_5E(struct Sprite *sprite);
-void pokemonanimfunc_5F(struct Sprite *sprite);
-void pokemonanimfunc_60(struct Sprite *sprite);
-void pokemonanimfunc_61(struct Sprite *sprite);
-void pokemonanimfunc_62(struct Sprite *sprite);
-void pokemonanimfunc_63(struct Sprite *sprite);
-void pokemonanimfunc_64(struct Sprite *sprite);
-void pokemonanimfunc_65(struct Sprite *sprite);
-void pokemonanimfunc_66(struct Sprite *sprite);
-void pokemonanimfunc_67(struct Sprite *sprite);
-void pokemonanimfunc_68(struct Sprite *sprite);
-void pokemonanimfunc_69(struct Sprite *sprite);
-void pokemonanimfunc_6A(struct Sprite *sprite);
-void pokemonanimfunc_6B(struct Sprite *sprite);
-void pokemonanimfunc_6C(struct Sprite *sprite);
-void pokemonanimfunc_6D(struct Sprite *sprite);
-void pokemonanimfunc_6E(struct Sprite *sprite);
-void pokemonanimfunc_6F(struct Sprite *sprite);
-void pokemonanimfunc_70(struct Sprite *sprite);
-void pokemonanimfunc_71(struct Sprite *sprite);
-void pokemonanimfunc_72(struct Sprite *sprite);
-void pokemonanimfunc_73(struct Sprite *sprite);
-void pokemonanimfunc_74(struct Sprite *sprite);
-void pokemonanimfunc_75(struct Sprite *sprite);
-void pokemonanimfunc_76(struct Sprite *sprite);
-void pokemonanimfunc_77(struct Sprite *sprite);
-void pokemonanimfunc_78(struct Sprite *sprite);
-void pokemonanimfunc_79(struct Sprite *sprite);
-void pokemonanimfunc_7A(struct Sprite *sprite);
-void pokemonanimfunc_7B(struct Sprite *sprite);
-void pokemonanimfunc_7C(struct Sprite *sprite);
-void pokemonanimfunc_7D(struct Sprite *sprite);
-void pokemonanimfunc_7E(struct Sprite *sprite);
-void pokemonanimfunc_7F(struct Sprite *sprite);
-void pokemonanimfunc_80(struct Sprite *sprite);
-void pokemonanimfunc_81(struct Sprite *sprite);
-void pokemonanimfunc_82(struct Sprite *sprite);
-void pokemonanimfunc_83(struct Sprite *sprite);
-void pokemonanimfunc_84(struct Sprite *sprite);
-void pokemonanimfunc_85(struct Sprite *sprite);
-void pokemonanimfunc_86(struct Sprite *sprite);
-void pokemonanimfunc_87(struct Sprite *sprite);
-void pokemonanimfunc_88(struct Sprite *sprite);
-void pokemonanimfunc_89(struct Sprite *sprite);
-void pokemonanimfunc_8A(struct Sprite *sprite);
-void pokemonanimfunc_8B(struct Sprite *sprite);
-void pokemonanimfunc_8C(struct Sprite *sprite);
-void pokemonanimfunc_8D(struct Sprite *sprite);
-void pokemonanimfunc_8E(struct Sprite *sprite);
-void pokemonanimfunc_8F(struct Sprite *sprite);
-void pokemonanimfunc_90(struct Sprite *sprite);
-void pokemonanimfunc_91(struct Sprite *sprite);
-void pokemonanimfunc_92(struct Sprite *sprite);
-void pokemonanimfunc_93(struct Sprite *sprite);
-void pokemonanimfunc_94(struct Sprite *sprite);
-void pokemonanimfunc_95(struct Sprite *sprite);
-void pokemonanimfunc_96(struct Sprite *sprite);
-
-void SpriteCB_SetDummyOnAnimEnd(struct Sprite *sprite);
+static void pokemonanimfunc_00(struct Sprite *sprite);
+static void pokemonanimfunc_01(struct Sprite *sprite);
+static void pokemonanimfunc_02(struct Sprite *sprite);
+static void pokemonanimfunc_03(struct Sprite *sprite);
+static void pokemonanimfunc_04(struct Sprite *sprite);
+static void pokemonanimfunc_05(struct Sprite *sprite);
+static void pokemonanimfunc_06(struct Sprite *sprite);
+static void pokemonanimfunc_07(struct Sprite *sprite);
+static void pokemonanimfunc_08(struct Sprite *sprite);
+static void pokemonanimfunc_09(struct Sprite *sprite);
+static void pokemonanimfunc_0A(struct Sprite *sprite);
+static void pokemonanimfunc_0B(struct Sprite *sprite);
+static void pokemonanimfunc_0C(struct Sprite *sprite);
+static void pokemonanimfunc_0D(struct Sprite *sprite);
+static void pokemonanimfunc_0E(struct Sprite *sprite);
+static void pokemonanimfunc_0F(struct Sprite *sprite);
+static void pokemonanimfunc_10(struct Sprite *sprite);
+static void pokemonanimfunc_11(struct Sprite *sprite);
+static void pokemonanimfunc_12(struct Sprite *sprite);
+static void pokemonanimfunc_13(struct Sprite *sprite);
+static void pokemonanimfunc_14(struct Sprite *sprite);
+static void pokemonanimfunc_15(struct Sprite *sprite);
+static void pokemonanimfunc_16(struct Sprite *sprite);
+static void pokemonanimfunc_17(struct Sprite *sprite);
+static void pokemonanimfunc_18(struct Sprite *sprite);
+static void pokemonanimfunc_19(struct Sprite *sprite);
+static void pokemonanimfunc_1A(struct Sprite *sprite);
+static void pokemonanimfunc_1B(struct Sprite *sprite);
+static void pokemonanimfunc_1C(struct Sprite *sprite);
+static void pokemonanimfunc_1D(struct Sprite *sprite);
+static void pokemonanimfunc_1E(struct Sprite *sprite);
+static void pokemonanimfunc_1F(struct Sprite *sprite);
+static void pokemonanimfunc_20(struct Sprite *sprite);
+static void pokemonanimfunc_21(struct Sprite *sprite);
+static void pokemonanimfunc_22(struct Sprite *sprite);
+static void pokemonanimfunc_23(struct Sprite *sprite);
+static void pokemonanimfunc_24(struct Sprite *sprite);
+static void pokemonanimfunc_25(struct Sprite *sprite);
+static void pokemonanimfunc_26(struct Sprite *sprite);
+static void pokemonanimfunc_27(struct Sprite *sprite);
+static void pokemonanimfunc_28(struct Sprite *sprite);
+static void pokemonanimfunc_29(struct Sprite *sprite);
+static void pokemonanimfunc_2A(struct Sprite *sprite);
+static void pokemonanimfunc_2B(struct Sprite *sprite);
+static void pokemonanimfunc_2C(struct Sprite *sprite);
+static void pokemonanimfunc_2D(struct Sprite *sprite);
+static void pokemonanimfunc_2E(struct Sprite *sprite);
+static void pokemonanimfunc_2F(struct Sprite *sprite);
+static void pokemonanimfunc_30(struct Sprite *sprite);
+static void pokemonanimfunc_31(struct Sprite *sprite);
+static void pokemonanimfunc_32(struct Sprite *sprite);
+static void pokemonanimfunc_33(struct Sprite *sprite);
+static void pokemonanimfunc_34(struct Sprite *sprite);
+static void pokemonanimfunc_35(struct Sprite *sprite);
+static void pokemonanimfunc_36(struct Sprite *sprite);
+static void pokemonanimfunc_37(struct Sprite *sprite);
+static void pokemonanimfunc_38(struct Sprite *sprite);
+static void pokemonanimfunc_39(struct Sprite *sprite);
+static void pokemonanimfunc_3A(struct Sprite *sprite);
+static void pokemonanimfunc_3B(struct Sprite *sprite);
+static void pokemonanimfunc_3C(struct Sprite *sprite);
+static void pokemonanimfunc_3D(struct Sprite *sprite);
+static void pokemonanimfunc_3E(struct Sprite *sprite);
+static void pokemonanimfunc_3F(struct Sprite *sprite);
+static void pokemonanimfunc_40(struct Sprite *sprite);
+static void pokemonanimfunc_41(struct Sprite *sprite);
+static void pokemonanimfunc_42(struct Sprite *sprite);
+static void pokemonanimfunc_43(struct Sprite *sprite);
+static void pokemonanimfunc_44(struct Sprite *sprite);
+static void pokemonanimfunc_45(struct Sprite *sprite);
+static void pokemonanimfunc_46(struct Sprite *sprite);
+static void pokemonanimfunc_47(struct Sprite *sprite);
+static void pokemonanimfunc_48(struct Sprite *sprite);
+static void pokemonanimfunc_49(struct Sprite *sprite);
+static void pokemonanimfunc_4A(struct Sprite *sprite);
+static void pokemonanimfunc_4B(struct Sprite *sprite);
+static void pokemonanimfunc_4C(struct Sprite *sprite);
+static void pokemonanimfunc_4D(struct Sprite *sprite);
+static void pokemonanimfunc_4E(struct Sprite *sprite);
+static void pokemonanimfunc_4F(struct Sprite *sprite);
+static void pokemonanimfunc_50(struct Sprite *sprite);
+static void pokemonanimfunc_51(struct Sprite *sprite);
+static void pokemonanimfunc_52(struct Sprite *sprite);
+static void pokemonanimfunc_53(struct Sprite *sprite);
+static void pokemonanimfunc_54(struct Sprite *sprite);
+static void pokemonanimfunc_55(struct Sprite *sprite);
+static void pokemonanimfunc_56(struct Sprite *sprite);
+static void pokemonanimfunc_57(struct Sprite *sprite);
+static void pokemonanimfunc_58(struct Sprite *sprite);
+static void pokemonanimfunc_59(struct Sprite *sprite);
+static void pokemonanimfunc_5A(struct Sprite *sprite);
+static void pokemonanimfunc_5B(struct Sprite *sprite);
+static void pokemonanimfunc_5C(struct Sprite *sprite);
+static void pokemonanimfunc_5D(struct Sprite *sprite);
+static void pokemonanimfunc_5E(struct Sprite *sprite);
+static void pokemonanimfunc_5F(struct Sprite *sprite);
+static void pokemonanimfunc_60(struct Sprite *sprite);
+static void pokemonanimfunc_61(struct Sprite *sprite);
+static void pokemonanimfunc_62(struct Sprite *sprite);
+static void pokemonanimfunc_63(struct Sprite *sprite);
+static void pokemonanimfunc_64(struct Sprite *sprite);
+static void pokemonanimfunc_65(struct Sprite *sprite);
+static void pokemonanimfunc_66(struct Sprite *sprite);
+static void pokemonanimfunc_67(struct Sprite *sprite);
+static void pokemonanimfunc_68(struct Sprite *sprite);
+static void pokemonanimfunc_69(struct Sprite *sprite);
+static void pokemonanimfunc_6A(struct Sprite *sprite);
+static void pokemonanimfunc_6B(struct Sprite *sprite);
+static void pokemonanimfunc_6C(struct Sprite *sprite);
+static void pokemonanimfunc_6D(struct Sprite *sprite);
+static void pokemonanimfunc_6E(struct Sprite *sprite);
+static void pokemonanimfunc_6F(struct Sprite *sprite);
+static void pokemonanimfunc_70(struct Sprite *sprite);
+static void pokemonanimfunc_71(struct Sprite *sprite);
+static void pokemonanimfunc_72(struct Sprite *sprite);
+static void pokemonanimfunc_73(struct Sprite *sprite);
+static void pokemonanimfunc_74(struct Sprite *sprite);
+static void pokemonanimfunc_75(struct Sprite *sprite);
+static void pokemonanimfunc_76(struct Sprite *sprite);
+static void pokemonanimfunc_77(struct Sprite *sprite);
+static void pokemonanimfunc_78(struct Sprite *sprite);
+static void pokemonanimfunc_79(struct Sprite *sprite);
+static void pokemonanimfunc_7A(struct Sprite *sprite);
+static void pokemonanimfunc_7B(struct Sprite *sprite);
+static void pokemonanimfunc_7C(struct Sprite *sprite);
+static void pokemonanimfunc_7D(struct Sprite *sprite);
+static void pokemonanimfunc_7E(struct Sprite *sprite);
+static void pokemonanimfunc_7F(struct Sprite *sprite);
+static void pokemonanimfunc_80(struct Sprite *sprite);
+static void pokemonanimfunc_81(struct Sprite *sprite);
+static void pokemonanimfunc_82(struct Sprite *sprite);
+static void pokemonanimfunc_83(struct Sprite *sprite);
+static void pokemonanimfunc_84(struct Sprite *sprite);
+static void pokemonanimfunc_85(struct Sprite *sprite);
+static void pokemonanimfunc_86(struct Sprite *sprite);
+static void pokemonanimfunc_87(struct Sprite *sprite);
+static void pokemonanimfunc_88(struct Sprite *sprite);
+static void pokemonanimfunc_89(struct Sprite *sprite);
+static void pokemonanimfunc_8A(struct Sprite *sprite);
+static void pokemonanimfunc_8B(struct Sprite *sprite);
+static void pokemonanimfunc_8C(struct Sprite *sprite);
+static void pokemonanimfunc_8D(struct Sprite *sprite);
+static void pokemonanimfunc_8E(struct Sprite *sprite);
+static void pokemonanimfunc_8F(struct Sprite *sprite);
+static void pokemonanimfunc_90(struct Sprite *sprite);
+static void pokemonanimfunc_91(struct Sprite *sprite);
+static void pokemonanimfunc_92(struct Sprite *sprite);
+static void pokemonanimfunc_93(struct Sprite *sprite);
+static void pokemonanimfunc_94(struct Sprite *sprite);
+static void pokemonanimfunc_95(struct Sprite *sprite);
+static void pokemonanimfunc_96(struct Sprite *sprite);
+
+static void SpriteCB_SetDummyOnAnimEnd(struct Sprite *sprite);
+
+#define STRUCT_COUNT 4
+
+// IWRAM bss
+static IWRAM_DATA struct UnkAnimStruct sUnknown_03001240[STRUCT_COUNT];
+static IWRAM_DATA u8 sUnknown_03001270;
+static IWRAM_DATA bool32 sUnknown_03001274;
 
 // const rom data
-static const u8 sSpeciesToBackAnimId[] =
+static const u8 sSpeciesToBackAnimSet[] =
 {
     0x00, // SPECIES_NONE
     0x13, // SPECIES_BULBASAUR
@@ -592,7 +596,7 @@ static const u8 sSpeciesToBackAnimId[] =
     0x11, // SPECIES_CHIMECHO
 };
 
-const u8 gUnknown_0860AA64[][2] =
+static const u8 sUnknown_0860AA64[][2] =
 {
     {0, 5},
     {1, 1},
@@ -610,7 +614,7 @@ const u8 gUnknown_0860AA64[][2] =
     {0, 0xFF}
 };
 
-const u8 gUnknown_0860AA80[][2] =
+static const u8 sUnknown_0860AA80[][2] =
 {
     {6,     30},
     {0xFE,  15},
@@ -773,7 +777,7 @@ static void (* const sMonAnimFunctions[])(struct Sprite *sprite) =
     pokemonanimfunc_96
 };
 
-// counting from Id 1, because 0 in sSpeciesToBackAnimId is used for mons with no back animation
+// counting from Id 1, because 0 in sSpeciesToBackAnimSet is used for mons with no back animation
 static const u8 sBackAnimationIds[] =
 {
     0x60, 0x5f, 0x02, // 1
@@ -832,30 +836,30 @@ static const u8 sBackAnimNatureModTable[] =
 	0x01, // NATURE_QUIRKY
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_860AD48[] =
+static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] =
 {
-    AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMDTYPE_END
 };
 
-static const union AffineAnimCmd gSpriteAffineAnim_860AD58[] =
+static const union AffineAnimCmd sSpriteAffineAnim_860AD58[] =
 {
-    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(-256, 256, 0, 0),
     AFFINEANIMCMDTYPE_END
 };
 
-static const union AffineAnimCmd *const gSpriteAffineAnimTable_860AD68[] =
+static const union AffineAnimCmd *const sSpriteAffineAnimTable_860AD68[] =
 {
-    gSpriteAffineAnim_860AD48,
-    gSpriteAffineAnim_860AD58
+    sSpriteAffineAnim_860AD48,
+    sSpriteAffineAnim_860AD58
 };
 
 // code
-void MonAnimDummySpriteCallback(struct Sprite *sprite)
+static void MonAnimDummySpriteCallback(struct Sprite *sprite)
 {
 }
 
-void sub_817F3F0(struct Sprite *sprite, s16 index, s16 amplitudeX, s16 amplitudeY)
+static void sub_817F3F0(struct Sprite *sprite, u16 index, s16 amplitudeX, s16 amplitudeY)
 {
     s16 xAdder, yAdder;
 
@@ -872,38 +876,45 @@ void sub_817F3F0(struct Sprite *sprite, s16 index, s16 amplitudeX, s16 amplitude
     sprite->pos2.y = yAdder + amplitudeY;
 }
 
-u8 GetSpeciesBackAnimId(u16 species)
+u8 GetSpeciesBackAnimSet(u16 species)
 {
-    if (sSpeciesToBackAnimId[species] != 0)
-        return sSpeciesToBackAnimId[species] - 1;
+    if (sSpeciesToBackAnimSet[species] != 0)
+        return sSpeciesToBackAnimSet[species] - 1;
     else
         return 0;
 }
 
-void sub_817F498(u8 taskId)
+#define tState  data[0]
+#define tPtrLO  data[1]
+#define tPtrHI  data[2]
+#define tAnimId data[3]
+#define tSaved0 data[4]
+#define tSaved2 data[5]
+
+static void Task_HandleMonAnimation(u8 taskId)
 {
     u32 i;
-    struct Sprite *sprite = (struct Sprite*)(u32)((gTasks[taskId].data[1] << 0x10) | (gTasks[taskId].data[2]));
+    struct Sprite *sprite = (struct Sprite*)(u32)((gTasks[taskId].tPtrLO << 0x10) | (gTasks[taskId].tPtrHI));
 
-    if (gTasks[taskId].data[0] == 0)
+    if (gTasks[taskId].tState == 0)
     {
-        gTasks[taskId].data[4] = sprite->data[0];
-        gTasks[taskId].data[5] = sprite->data[2];
+        gTasks[taskId].tSaved0 = sprite->data[0];
+        gTasks[taskId].tSaved2 = sprite->data[2];
         sprite->data[1] = 1;
         sprite->data[0] = 0;
 
         for (i = 2; i < 8; i++)
             sprite->data[i] = 0;
 
-        sprite->callback = sMonAnimFunctions[gTasks[taskId].data[3]];
-        gUnknown_03001274 = FALSE;
+        sprite->callback = sMonAnimFunctions[gTasks[taskId].tAnimId];
+        sUnknown_03001274 = FALSE;
 
-        gTasks[taskId].data[0]++;
+        gTasks[taskId].tState++;
     }
     if (sprite->callback == SpriteCallbackDummy)
     {
-        sprite->data[0] = gTasks[taskId].data[4];
-        sprite->data[2] = gTasks[taskId].data[5];
+        sprite->data[0] = gTasks[taskId].tSaved0;
+        sprite->data[2] = gTasks[taskId].tSaved2;
         sprite->data[1] = 0;
 
         DestroyTask(taskId);
@@ -912,39 +923,46 @@ void sub_817F498(u8 taskId)
 
 void LaunchAnimationTaskForFrontSprite(struct Sprite *sprite, u8 frontAnimId)
 {
-    u8 taskId = CreateTask(sub_817F498, 128);
-    gTasks[taskId].data[1] = (u32)(sprite) >> 0x10;
-    gTasks[taskId].data[2] = (u32)(sprite);
-    gTasks[taskId].data[3] = frontAnimId;
+    u8 taskId = CreateTask(Task_HandleMonAnimation, 128);
+    gTasks[taskId].tPtrLO = (u32)(sprite) >> 0x10;
+    gTasks[taskId].tPtrHI = (u32)(sprite);
+    gTasks[taskId].tAnimId = frontAnimId;
 }
 
-void sub_817F578(struct Sprite *sprite, u8 frontAnimId)
+void StartMonSummaryAnimation(struct Sprite *sprite, u8 frontAnimId)
 {
-    gUnknown_03001274 = TRUE;
+    sUnknown_03001274 = TRUE;
     sprite->callback = sMonAnimFunctions[frontAnimId];
 }
 
-void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimId)
+void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimSet)
 {
     u8 nature, taskId, animId, bank;
 
-    taskId = CreateTask(sub_817F498, 128);
-    gTasks[taskId].data[1] = (u32)(sprite) >> 0x10;
-    gTasks[taskId].data[2] = (u32)(sprite);
+    taskId = CreateTask(Task_HandleMonAnimation, 128);
+    gTasks[taskId].tPtrLO = (u32)(sprite) >> 0x10;
+    gTasks[taskId].tPtrHI = (u32)(sprite);
 
     bank = sprite->data[0];
     nature = GetNature(&gPlayerParty[gBattlePartyID[bank]]);
 
-    animId = 3 * backAnimId + sBackAnimNatureModTable[nature];
-    gTasks[taskId].data[3] = sBackAnimationIds[animId];
+    animId = 3 * backAnimSet + sBackAnimNatureModTable[nature];
+    gTasks[taskId].tAnimId = sBackAnimationIds[animId];
 }
 
-void sub_817F60C(struct Sprite *sprite)
+#undef tState
+#undef tPtrLO
+#undef tPtrHI
+#undef tAnimId
+#undef tSaved0
+#undef tSaved2
+
+void SetSpriteCB_MonAnimDummy(struct Sprite *sprite)
 {
     sprite->callback = MonAnimDummySpriteCallback;
 }
 
-void SetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
+static void SetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
 {
     u8 matrixNum;
     struct ObjAffineSrcData affineSrcData;
@@ -963,12 +981,12 @@ void SetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
     gOamMatrices[matrixNum].d = dest.d;
 }
 
-void HandleStartAffineAnim(struct Sprite *sprite)
+static void HandleStartAffineAnim(struct Sprite *sprite)
 {
     sprite->oam.affineMode = 3;
-    sprite->affineAnims = gSpriteAffineAnimTable_860AD68;
+    sprite->affineAnims = sSpriteAffineAnimTable_860AD68;
 
-    if (gUnknown_03001274 == TRUE)
+    if (sUnknown_03001274 == TRUE)
         InitSpriteAffineAnim(sprite);
 
     if (!sprite->data[1])
@@ -980,7 +998,7 @@ void HandleStartAffineAnim(struct Sprite *sprite)
     sprite->affineAnimPaused = 1;
 }
 
-void HandleSetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
+static void HandleSetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rotation)
 {
     if (!sprite->data[1])
     {
@@ -991,42 +1009,42 @@ void HandleSetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u16 rota
     SetAffineData(sprite, xScale, yScale, rotation);
 }
 
-void sub_817F70C(struct Sprite *sprite)
+static void sub_817F70C(struct Sprite *sprite)
 {
     if (!sprite->data[1])
         sprite->pos2.x *= -1;
 }
 
-bool32 sub_817F724(u8 id)
+static bool32 sub_817F724(u8 id)
 {
-    if (id >= 4)
+    if (id >= STRUCT_COUNT)
     {
         return FALSE;
     }
     else
     {
-        gUnknown_03001240[id].field_6 = 0;
-        gUnknown_03001240[id].field_0 = 0;
-        gUnknown_03001240[id].field_4 = 1;
-        gUnknown_03001240[id].field_2 = 0;
-        gUnknown_03001240[id].field_8 = 0;
+        sUnknown_03001240[id].field_6 = 0;
+        sUnknown_03001240[id].field_0 = 0;
+        sUnknown_03001240[id].field_4 = 1;
+        sUnknown_03001240[id].field_2 = 0;
+        sUnknown_03001240[id].field_8 = 0;
         return TRUE;
     }
 }
 
-u8 sub_817F758(void)
+static u8 sub_817F758(void)
 {
-    gUnknown_03001270 = (gUnknown_03001270 + 1) % 4;
-    sub_817F724(gUnknown_03001270);
-    return gUnknown_03001270;
+    sUnknown_03001270 = (sUnknown_03001270 + 1) % STRUCT_COUNT;
+    sub_817F724(sUnknown_03001270);
+    return sUnknown_03001270;
 }
 
-void sub_817F77C(struct Sprite *sprite)
+static void sub_817F77C(struct Sprite *sprite)
 {
     sprite->oam.affineMode = 1;
     CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
 
-    if (gUnknown_03001274 == TRUE)
+    if (sUnknown_03001274 == TRUE)
     {
         if (!sprite->data[1])
             sprite->hFlip = 1;
@@ -1039,14 +1057,14 @@ void sub_817F77C(struct Sprite *sprite)
     }
 }
 
-void pokemonanimfunc_01(struct Sprite *sprite)
+static void pokemonanimfunc_01(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         HandleStartAffineAnim(sprite);
 
     if (sprite->data[2] > 40)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
@@ -1062,7 +1080,7 @@ void pokemonanimfunc_01(struct Sprite *sprite)
     sprite->data[2]++;
 }
 
-void pokemonanimfunc_02(struct Sprite *sprite)
+static void pokemonanimfunc_02(struct Sprite *sprite)
 {
     if (sprite->data[2] > 40)
     {
@@ -1083,7 +1101,7 @@ void pokemonanimfunc_02(struct Sprite *sprite)
     sprite->data[2]++;
 }
 
-void sub_817F8FC(struct Sprite *sprite)
+static void sub_817F8FC(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
 
@@ -1101,14 +1119,14 @@ void sub_817F8FC(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_03(struct Sprite *sprite)
+static void pokemonanimfunc_03(struct Sprite *sprite)
 {
     sprite->data[0] = 40;
     sub_817F8FC(sprite);
     sprite->callback = sub_817F8FC;
 }
 
-void sub_817F978(struct Sprite *sprite)
+static void sub_817F978(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
 
@@ -1126,7 +1144,7 @@ void sub_817F978(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_04(struct Sprite *sprite)
+static void pokemonanimfunc_04(struct Sprite *sprite)
 {
     sprite->data[0] = 40;
     sub_817F978(sprite);
@@ -1134,7 +1152,7 @@ void pokemonanimfunc_04(struct Sprite *sprite)
 }
 
 #ifdef NONMATCHING
-void sub_817F9F4(struct Sprite *sprite)
+static void sub_817F9F4(struct Sprite *sprite)
 {
     s32 counter = sprite->data[2];
 
@@ -1166,7 +1184,7 @@ void sub_817F9F4(struct Sprite *sprite)
 
 #else
 __attribute__((naked))
-void sub_817F9F4(struct Sprite *sprite)
+static void sub_817F9F4(struct Sprite *sprite)
 {
     asm(".syntax unified\n\
         	push {r4,lr}\n\
@@ -1235,14 +1253,14 @@ _0817FA60:\n\
 
 #endif // NONMATCHING
 
-void pokemonanimfunc_1E(struct Sprite *sprite)
+static void pokemonanimfunc_1E(struct Sprite *sprite)
 {
     sprite->data[0] = 4;
     sub_817F9F4(sprite);
     sprite->callback = sub_817F9F4;
 }
 
-void pokemonanimfunc_06(struct Sprite *sprite)
+static void pokemonanimfunc_06(struct Sprite *sprite)
 {
     s32 counter = sprite->data[2];
 
@@ -1282,14 +1300,14 @@ void pokemonanimfunc_06(struct Sprite *sprite)
     sprite->data[2] += 12;
 }
 
-void pokemonanimfunc_09(struct Sprite *sprite)
+static void pokemonanimfunc_09(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         HandleStartAffineAnim(sprite);
 
     if (sprite->data[2] > 40)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
@@ -1314,7 +1332,7 @@ void pokemonanimfunc_09(struct Sprite *sprite)
     sprite->data[2]++;
 }
 
-static const s8 gUnknown_0860AD70[][3] =
+static const s8 sUnknown_0860AD70[][3] =
 {
     {-1, -1, 6},
     {2,   0, 6},
@@ -1328,16 +1346,16 @@ static const s8 gUnknown_0860AD70[][3] =
     {0,   0, 0},
 };
 
-void sub_817FC20(struct Sprite *sprite)
+static void sub_817FC20(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
 
     if (sprite->data[2] == 0)
         sprite->data[3] = 0;
 
-    if (gUnknown_0860AD70[sprite->data[3]][2] == sprite->data[2])
+    if (sUnknown_0860AD70[sprite->data[3]][2] == sprite->data[2])
     {
-        if (gUnknown_0860AD70[sprite->data[3]][2] == 0)
+        if (sUnknown_0860AD70[sprite->data[3]][2] == 0)
         {
             sprite->callback = SpriteCB_SetDummyOnAnimEnd;
         }
@@ -1348,26 +1366,26 @@ void sub_817FC20(struct Sprite *sprite)
         }
     }
 
-    if (gUnknown_0860AD70[sprite->data[3]][2] == 0)
+    if (sUnknown_0860AD70[sprite->data[3]][2] == 0)
     {
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
     {
-        sprite->pos2.x += gUnknown_0860AD70[sprite->data[3]][0];
-        sprite->pos2.y += gUnknown_0860AD70[sprite->data[3]][1];
+        sprite->pos2.x += sUnknown_0860AD70[sprite->data[3]][0];
+        sprite->pos2.y += sUnknown_0860AD70[sprite->data[3]][1];
         sprite->data[2]++;
         sub_817F70C(sprite);
     }
 }
 
-void pokemonanimfunc_0A(struct Sprite *sprite)
+static void pokemonanimfunc_0A(struct Sprite *sprite)
 {
     sub_817FC20(sprite);
     sprite->callback = sub_817FC20;
 }
 
-void sub_817FCDC(struct Sprite *sprite)
+static void sub_817FCDC(struct Sprite *sprite)
 {
     s32 counter = sprite->data[2];
 
@@ -1384,7 +1402,7 @@ void sub_817FCDC(struct Sprite *sprite)
     sprite->data[2] += sprite->data[0];
 }
 
-void pokemonanimfunc_0F(struct Sprite *sprite)
+static void pokemonanimfunc_0F(struct Sprite *sprite)
 {
     sprite->data[0] = 60;
     sprite->data[7] = 3;
@@ -1392,7 +1410,7 @@ void pokemonanimfunc_0F(struct Sprite *sprite)
     sprite->callback = sub_817FCDC;
 }
 
-void sub_817FD44(struct Sprite *sprite)
+static void sub_817FD44(struct Sprite *sprite)
 {
     s32 counter = sprite->data[2];
 
@@ -1409,14 +1427,14 @@ void sub_817FD44(struct Sprite *sprite)
     sprite->data[2] += sprite->data[0];
 }
 
-void pokemonanimfunc_10(struct Sprite *sprite)
+static void pokemonanimfunc_10(struct Sprite *sprite)
 {
     sprite->data[0] = 60;
     sub_817FD44(sprite);
     sprite->callback = sub_817FD44;
 }
 
-void pokemonanimfunc_11(struct Sprite *sprite)
+static void pokemonanimfunc_11(struct Sprite *sprite)
 {
     if (sprite->data[2] > 512)
     {
@@ -1444,30 +1462,30 @@ void pokemonanimfunc_11(struct Sprite *sprite)
     sprite->data[2] += 9;
 }
 
-void sub_817FE30(struct Sprite *sprite)
+static void sub_817FE30(struct Sprite *sprite)
 {
     s16 id = sprite->data[0];
 
-    if (gUnknown_03001240[id].field_0 != 0)
+    if (sUnknown_03001240[id].field_0 != 0)
     {
-        gUnknown_03001240[id].field_0--;
+        sUnknown_03001240[id].field_0--;
     }
     else
     {
-        if (sprite->data[2] == 0 && gUnknown_03001240[id].field_8 == 0)
+        if (sprite->data[2] == 0 && sUnknown_03001240[id].field_8 == 0)
         {
             HandleStartAffineAnim(sprite);
-            gUnknown_03001240[id].field_8++;
+            sUnknown_03001240[id].field_8++;
         }
 
-        if (sprite->data[2] > gUnknown_03001240[id].field_6)
+        if (sprite->data[2] > sUnknown_03001240[id].field_6)
         {
-            HandleSetAffineData(sprite, 0x100, 0x100, 0);
+            HandleSetAffineData(sprite, 256, 256, 0);
 
-            if (gUnknown_03001240[id].field_4 > 1)
+            if (sUnknown_03001240[id].field_4 > 1)
             {
-                gUnknown_03001240[id].field_4--;
-                gUnknown_03001240[id].field_0 = 10;
+                sUnknown_03001240[id].field_4--;
+                sUnknown_03001240[id].field_0 = 10;
                 sprite->data[2] = 0;
             }
             else
@@ -1479,62 +1497,62 @@ void sub_817FE30(struct Sprite *sprite)
         else
         {
             sprite->data[6] = Sin(sprite->data[2] % 256, 4096);
-            HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[6]);
+            HandleSetAffineData(sprite, 256, 256, sprite->data[6]);
         }
 
         sprite->data[2] += 16;
     }
 }
 
-void pokemonanimfunc_12(struct Sprite *sprite)
+static void pokemonanimfunc_12(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_6 = 512;
-    gUnknown_03001240[id].field_0 = 0;
+    sUnknown_03001240[id].field_6 = 512;
+    sUnknown_03001240[id].field_0 = 0;
     sub_817FE30(sprite);
     sprite->callback = sub_817FE30;
 }
 
-void sub_817FF3C(struct Sprite *sprite)
+static void sub_817FF3C(struct Sprite *sprite)
 {
     u8 id = sprite->data[0];
 
     if (sprite->data[2] == 0)
         HandleStartAffineAnim(sprite);
 
-    if (sprite->data[2] > gUnknown_03001240[id].field_0)
+    if (sprite->data[2] > sUnknown_03001240[id].field_0)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
     {
-        sprite->data[6] = (65536 / gUnknown_03001240[id].field_8) * sprite->data[2];
-        HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[6]);
+        sprite->data[6] = (65536 / sUnknown_03001240[id].field_8) * sprite->data[2];
+        HandleSetAffineData(sprite, 256, 256, sprite->data[6]);
     }
 
     sprite->data[2]++;
 }
 
-void pokemonanimfunc_1F(struct Sprite *sprite)
+static void pokemonanimfunc_1F(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_0 = 60;
-    gUnknown_03001240[id].field_8 = 20;
+    sUnknown_03001240[id].field_0 = 60;
+    sUnknown_03001240[id].field_8 = 20;
     sub_817FF3C(sprite);
     sprite->callback = sub_817FF3C;
 }
 
-void sub_817FFF0(struct Sprite *sprite)
+static void sub_817FFF0(struct Sprite *sprite)
 {
     u8 id = sprite->data[0];
 
     sub_817F70C(sprite);
 
-    if (sprite->data[2] > gUnknown_03001240[id].field_6)
+    if (sprite->data[2] > sUnknown_03001240[id].field_6)
     {
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
@@ -1544,26 +1562,26 @@ void sub_817FFF0(struct Sprite *sprite)
     {
         s16 index = (sprite->data[2] + 192) % 256;
 
-        sprite->pos2.x = -(Cos(index, gUnknown_03001240[id].field_8 * 2));
-        sprite->pos2.y = Sin(index, gUnknown_03001240[id].field_8) + gUnknown_03001240[id].field_8;
+        sprite->pos2.x = -(Cos(index, sUnknown_03001240[id].field_8 * 2));
+        sprite->pos2.y = Sin(index, sUnknown_03001240[id].field_8) + sUnknown_03001240[id].field_8;
     }
 
-    sprite->data[2] += gUnknown_03001240[id].field_2;
+    sprite->data[2] += sUnknown_03001240[id].field_2;
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_14(struct Sprite *sprite)
+static void pokemonanimfunc_14(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_6 = 512;
-    gUnknown_03001240[id].field_8 = 6;
-    gUnknown_03001240[id].field_2 = 24;
+    sUnknown_03001240[id].field_6 = 512;
+    sUnknown_03001240[id].field_8 = 6;
+    sUnknown_03001240[id].field_2 = 24;
     sub_817FFF0(sprite);
     sprite->callback = sub_817FFF0;
 }
 
-void pokemonanimfunc_15(struct Sprite *sprite)
+static void pokemonanimfunc_15(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -1582,7 +1600,7 @@ void pokemonanimfunc_15(struct Sprite *sprite)
     sprite->data[2]++;
 }
 
-void pokemonanimfunc_16(struct Sprite *sprite)
+static void pokemonanimfunc_16(struct Sprite *sprite)
 {
     s16 index1 = 0, index2 = 0;
 
@@ -1591,7 +1609,7 @@ void pokemonanimfunc_16(struct Sprite *sprite)
 
     if (sprite->data[2] > 40)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
@@ -1617,7 +1635,7 @@ void pokemonanimfunc_16(struct Sprite *sprite)
     sprite->data[2]++;
 }
 
-void pokemonanimfunc_17(struct Sprite *sprite)
+static void pokemonanimfunc_17(struct Sprite *sprite)
 {
     s16 posY = 0, index1 = 0, index2 = 0;
 
@@ -1626,7 +1644,7 @@ void pokemonanimfunc_17(struct Sprite *sprite)
 
     if (sprite->data[2] > 40)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
         sprite->pos2.y = posY;
@@ -1658,12 +1676,12 @@ void pokemonanimfunc_17(struct Sprite *sprite)
     sprite->data[2]++;
 }
 
-void sub_818031C(struct Sprite *sprite)
+static void sub_818031C(struct Sprite *sprite)
 {
     u8 index = sprite->data[2];
     u8 var7 = sprite->data[6];
-    u8 var5 = gUnknown_0860AA80[sprite->data[5]][0];
-    u8 var6 = gUnknown_0860AA80[sprite->data[5]][1];
+    u8 var5 = sUnknown_0860AA80[sprite->data[5]][0];
+    u8 var6 = sUnknown_0860AA80[sprite->data[5]][1];
     u8 amplitude = 0;
 
     if (var5 != 0xFE)
@@ -1693,14 +1711,14 @@ void sub_818031C(struct Sprite *sprite)
     }
 }
 
-void pokemonanimfunc_19(struct Sprite *sprite)
+static void pokemonanimfunc_19(struct Sprite *sprite)
 {
     sprite->data[0] = 48;
     sub_818031C(sprite);
     sprite->callback = sub_818031C;
 }
 
-void pokemonanimfunc_1A(struct Sprite *sprite)
+static void pokemonanimfunc_1A(struct Sprite *sprite)
 {
     u8 counter = 0;
 
@@ -1712,7 +1730,7 @@ void pokemonanimfunc_1A(struct Sprite *sprite)
 
     if (sprite->data[2] > 35)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
         sprite->pos2.x = 0;
@@ -1722,25 +1740,25 @@ void pokemonanimfunc_1A(struct Sprite *sprite)
         s16 index = ((counter - 10) * 128) / 20;
 
         if (counter < 10)
-            HandleSetAffineData(sprite, 0x100, 0x100, counter / 2 * 512);
+            HandleSetAffineData(sprite, 256, 256, counter / 2 * 512);
         else if (counter >= 10 && counter <= 29)
             sprite->pos2.x = -(Sin(index, 5));
         else
-            HandleSetAffineData(sprite, 0x100, 0x100, (35 - counter) / 2 * 1024);
+            HandleSetAffineData(sprite, 256, 256, (35 - counter) / 2 * 1024);
     }
 
     sprite->data[2]++;
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_1B(struct Sprite *sprite)
+static void pokemonanimfunc_1B(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         HandleStartAffineAnim(sprite);
 
     if (sprite->data[2] > 100)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->pos2.y = 0;
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1749,13 +1767,13 @@ void pokemonanimfunc_1B(struct Sprite *sprite)
     {
         s16 index = (sprite->data[2] * 256) / 100;
         sprite->pos2.y = Sin(index, 10);
-        HandleSetAffineData(sprite, 0x100, 0x100, Sin(index, 3276));
+        HandleSetAffineData(sprite, 256, 256, Sin(index, 3276));
     }
 
     sprite->data[2]++;
 }
 
-void sub_81804F8(struct Sprite *sprite)
+static void sub_81804F8(struct Sprite *sprite)
 {
     s32 var = 0;
     s16 index = 0;
@@ -1765,7 +1783,7 @@ void sub_81804F8(struct Sprite *sprite)
 
     if (sprite->data[2] > 100)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->pos2.y = 0;
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1776,20 +1794,20 @@ void sub_81804F8(struct Sprite *sprite)
         var = (sprite->data[2] * 512) / 100;
         var &= 0xFF;
         sprite->pos2.y = Sin(index, sprite->data[0]);
-        HandleSetAffineData(sprite, 0x100, 0x100, Sin(var, 3276));
+        HandleSetAffineData(sprite, 256, 256, Sin(var, 3276));
     }
 
     sprite->data[2]++;
 }
 
-void pokemonanimfunc_1C(struct Sprite *sprite)
+static void pokemonanimfunc_1C(struct Sprite *sprite)
 {
     sprite->data[0] = 10;
     sub_81804F8(sprite);
     sprite->callback = sub_81804F8;
 }
 
-void sub_81805B0(struct Sprite *sprite)
+static void sub_81805B0(struct Sprite *sprite)
 {
     s32 var = 0;
     s16 index = 0;
@@ -1799,7 +1817,7 @@ void sub_81805B0(struct Sprite *sprite)
 
     if (sprite->data[2] > 100)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->pos2.y = 0;
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1810,20 +1828,20 @@ void sub_81805B0(struct Sprite *sprite)
         var = (sprite->data[2] * 512) / 100;
         var &= 0xFF;
         sprite->pos2.y = -(Sin(index / 2, sprite->data[0] * 2));
-        HandleSetAffineData(sprite, 0x100, 0x100, Sin(var, 3276));
+        HandleSetAffineData(sprite, 256, 256, Sin(var, 3276));
     }
 
     sprite->data[2]++;
 }
 
-void pokemonanimfunc_18(struct Sprite *sprite)
+static void pokemonanimfunc_18(struct Sprite *sprite)
 {
     sprite->data[0] = 5;
     sub_81805B0(sprite);
     sprite->callback = sub_81805B0;
 }
 
-void pokemonanimfunc_1D(struct Sprite *sprite)
+static void pokemonanimfunc_1D(struct Sprite *sprite)
 {
     s32 var;
     s16 index = 0;
@@ -1836,7 +1854,7 @@ void pokemonanimfunc_1D(struct Sprite *sprite)
 
     if (sprite->data[2] > 100)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->pos2.x = 0;
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1849,14 +1867,14 @@ void pokemonanimfunc_1D(struct Sprite *sprite)
         var = (sprite->data[2] * 512) / toDiv;
         var &= 0xFF;
         sprite->pos2.x = Sin(index, 8);
-        HandleSetAffineData(sprite, 0x100, 0x100, Sin(var, 3276));
+        HandleSetAffineData(sprite, 256, 256, Sin(var, 3276));
     }
 
     sprite->data[2]++;
     sub_817F70C(sprite);
 }
 
-void sub_8180714(struct Sprite *sprite)
+static void sub_8180714(struct Sprite *sprite)
 {
     s16 posY = 0;
 
@@ -1870,7 +1888,7 @@ void sub_8180714(struct Sprite *sprite)
 
     if (sprite->data[2] > sprite->data[0] * 3)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->pos2.y = 0;
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1885,7 +1903,7 @@ void sub_8180714(struct Sprite *sprite)
             posY = (256 - yScale) / 8;
 
         sprite->pos2.y = -(Sin(sprite->data[3], 10)) - posY;
-        HandleSetAffineData(sprite, 0x100 - Sin(sprite->data[4], 32), yScale, 0);
+        HandleSetAffineData(sprite, 256 - Sin(sprite->data[4], 32), yScale, 0);
         sprite->data[2]++;
         sprite->data[4] = (sprite->data[4] + 128 / sprite->data[0]) & 0xFF;
     }
@@ -1893,20 +1911,20 @@ void sub_8180714(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_00(struct Sprite *sprite)
+static void pokemonanimfunc_00(struct Sprite *sprite)
 {
     sprite->data[0] = 16;
     sub_8180714(sprite);
     sprite->callback = sub_8180714;
 }
 
-void sub_8180828(struct Sprite *sprite)
+static void sub_8180828(struct Sprite *sprite)
 {
     s16 posY = 0;
 
     if (sprite->data[2] > (128 / sprite->data[6]) * sprite->data[7])
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->pos2.y = 0;
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -1925,7 +1943,7 @@ void sub_8180828(struct Sprite *sprite)
     }
 }
 
-void pokemonanimfunc_13(struct Sprite *sprite)
+static void pokemonanimfunc_13(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -1937,7 +1955,7 @@ void pokemonanimfunc_13(struct Sprite *sprite)
     sub_8180828(sprite);
 }
 
-static const s8 gUnknown_0860AD8E[][8][3] =
+static const s8 sUnknown_0860AD8E[][8][3] =
 {
     {
         {0,  8, 8},
@@ -1961,7 +1979,7 @@ static const s8 gUnknown_0860AD8E[][8][3] =
     },
 };
 
-void sub_8180900(struct Sprite *sprite)
+static void sub_8180900(struct Sprite *sprite)
 {
     s16 var;
     u8 structId;
@@ -1972,10 +1990,10 @@ void sub_8180900(struct Sprite *sprite)
 
     sub_817F70C(sprite);
     structId = sprite->data[0];
-    var = gUnknown_03001240[structId].field_6;
-    r9 = gUnknown_0860AD8E[gUnknown_03001240[structId].field_8][sprite->data[4]][0];
-    r10 = gUnknown_0860AD8E[gUnknown_03001240[structId].field_8][sprite->data[4]][1] - r9;
-    arrId = gUnknown_03001240[structId].field_8;
+    var = sUnknown_03001240[structId].field_6;
+    r9 = sUnknown_0860AD8E[sUnknown_03001240[structId].field_8][sprite->data[4]][0];
+    r10 = sUnknown_0860AD8E[sUnknown_03001240[structId].field_8][sprite->data[4]][1] - r9;
+    arrId = sUnknown_03001240[structId].field_8;
     r7 = sprite->data[3];
 
     if (sprite->data[2] == 0)
@@ -1984,9 +2002,9 @@ void sub_8180900(struct Sprite *sprite)
         sprite->data[2]++;
     }
 
-    if (gUnknown_0860AD8E[arrId][sprite->data[4]][2] == 0)
+    if (sUnknown_0860AD8E[arrId][sprite->data[4]][2] == 0)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
         sub_817F77C(sprite);
@@ -1996,13 +2014,13 @@ void sub_8180900(struct Sprite *sprite)
     {
         u16 rotation;
 
-        sprite->pos2.y = -(Sin(r7 * 128 / gUnknown_0860AD8E[arrId][sprite->data[4]][2], 10));
-        sprite->pos2.x = (r10 * r7 / gUnknown_0860AD8E[arrId][sprite->data[4]][2]) + r9;
+        sprite->pos2.y = -(Sin(r7 * 128 / sUnknown_0860AD8E[arrId][sprite->data[4]][2], 10));
+        sprite->pos2.x = (r10 * r7 / sUnknown_0860AD8E[arrId][sprite->data[4]][2]) + r9;
 
         rotation = -(var * sprite->pos2.x) / 8;
-        HandleSetAffineData(sprite, 0x100, 0x100, rotation);
+        HandleSetAffineData(sprite, 256, 256, rotation);
 
-        if (r7 == gUnknown_0860AD8E[arrId][sprite->data[4]][2])
+        if (r7 == sUnknown_0860AD8E[arrId][sprite->data[4]][2])
         {
             sprite->data[4]++;
             sprite->data[3] = 0;
@@ -2016,16 +2034,16 @@ void sub_8180900(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_05(struct Sprite *sprite)
+static void pokemonanimfunc_05(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
-    gUnknown_03001240[id].field_6 = 4096;
-    gUnknown_03001240[id].field_8 = sprite->data[6];
+    sUnknown_03001240[id].field_6 = 4096;
+    sUnknown_03001240[id].field_8 = sprite->data[6];
     sub_8180900(sprite);
     sprite->callback = sub_8180900;
 }
 
-void pokemonanimfunc_20(struct Sprite *sprite)
+static void pokemonanimfunc_20(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -2044,7 +2062,7 @@ void pokemonanimfunc_20(struct Sprite *sprite)
     sprite->data[2] += 2;
 }
 
-void pokemonanimfunc_21(struct Sprite *sprite)
+static void pokemonanimfunc_21(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -2063,7 +2081,7 @@ void pokemonanimfunc_21(struct Sprite *sprite)
     sprite->data[2] += 2;
 }
 
-void pokemonanimfunc_22(struct Sprite *sprite)
+static void pokemonanimfunc_22(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -2082,7 +2100,7 @@ void pokemonanimfunc_22(struct Sprite *sprite)
     sprite->data[2] += 2;
 }
 
-void pokemonanimfunc_23(struct Sprite *sprite)
+static void pokemonanimfunc_23(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -2101,7 +2119,7 @@ void pokemonanimfunc_23(struct Sprite *sprite)
     sprite->data[2] += 2;
 }
 
-void pokemonanimfunc_24(struct Sprite *sprite)
+static void pokemonanimfunc_24(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
@@ -2120,19 +2138,19 @@ void pokemonanimfunc_24(struct Sprite *sprite)
     sprite->data[2] += 2;
 }
 
-void sub_8180CB4(struct Sprite *sprite);
-void sub_8180CE8(struct Sprite *sprite);
-void sub_8180D44(struct Sprite *sprite);
-void sub_8180DC0(struct Sprite *sprite);
-void sub_8180E28(struct Sprite *sprite);
+static void sub_8180CB4(struct Sprite *sprite);
+static void sub_8180CE8(struct Sprite *sprite);
+static void sub_8180D44(struct Sprite *sprite);
+static void sub_8180DC0(struct Sprite *sprite);
+static void sub_8180E28(struct Sprite *sprite);
 
-void pokemonanimfunc_25(struct Sprite *sprite)
+static void pokemonanimfunc_25(struct Sprite *sprite)
 {
     HandleStartAffineAnim(sprite);
     sprite->callback = sub_8180CB4;
 }
 
-void sub_8180CB4(struct Sprite *sprite)
+static void sub_8180CB4(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (++sprite->pos2.x > 7)
@@ -2144,7 +2162,7 @@ void sub_8180CB4(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8180CE8(struct Sprite *sprite)
+static void sub_8180CE8(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
 
@@ -2172,7 +2190,7 @@ void sub_8180CE8(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8180D44(struct Sprite *sprite)
+static void sub_8180D44(struct Sprite *sprite)
 {
     u8 rotation;
 
@@ -2184,7 +2202,7 @@ void sub_8180D44(struct Sprite *sprite)
     if (++sprite->data[5] > sprite->data[6])
         sprite->data[5] = sprite->data[6];
 
-    HandleSetAffineData(sprite, 0x100, 0x100, rotation * 256);
+    HandleSetAffineData(sprite, 256, 256, rotation * 256);
 
     if (sprite->pos2.x < -8)
     {
@@ -2198,7 +2216,7 @@ void sub_8180D44(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8180DC0(struct Sprite *sprite)
+static void sub_8180DC0(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
 
@@ -2208,7 +2226,7 @@ void sub_8180DC0(struct Sprite *sprite)
         if (sprite->data[2] < 0)
             sprite->data[2] = 0;
 
-        HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[2] << 8);
+        HandleSetAffineData(sprite, 256, 256, sprite->data[2] << 8);
         if (sprite->data[2] == 0)
             sprite->callback = sub_8180E28;
     }
@@ -2222,7 +2240,7 @@ void sub_8180DC0(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8180E28(struct Sprite *sprite)
+static void sub_8180E28(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
 
@@ -2237,18 +2255,18 @@ void sub_8180E28(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8180E78(struct Sprite *sprite);
-void sub_8180ED0(struct Sprite *sprite);
-void sub_8180F2C(struct Sprite *sprite);
+static void sub_8180E78(struct Sprite *sprite);
+static void sub_8180ED0(struct Sprite *sprite);
+static void sub_8180F2C(struct Sprite *sprite);
 
-void pokemonanimfunc_26(struct Sprite *sprite)
+static void pokemonanimfunc_26(struct Sprite *sprite)
 {
     HandleStartAffineAnim(sprite);
     sprite->data[3] = 0;
     sprite->callback = sub_8180E78;
 }
 
-void sub_8180E78(struct Sprite *sprite)
+static void sub_8180E78(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->pos2.x++;
@@ -2267,7 +2285,7 @@ void sub_8180E78(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8180ED0(struct Sprite *sprite)
+static void sub_8180ED0(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->pos2.x = Cos(sprite->data[4], 16) - 8;
@@ -2286,7 +2304,7 @@ void sub_8180ED0(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8180F2C(struct Sprite *sprite)
+static void sub_8180F2C(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
 
@@ -2302,7 +2320,7 @@ void sub_8180F2C(struct Sprite *sprite)
         sprite->pos2.y = -(Sin(sprite->data[2], 5)) + 4;
         sprite->data[2] -= 4;
         rotation = sprite->data[2] - 32;
-        HandleSetAffineData(sprite, 0x100, 0x100, rotation * 512);
+        HandleSetAffineData(sprite, 256, 256, rotation * 512);
 
         if (sprite->data[2] <= 32)
         {
@@ -2316,7 +2334,7 @@ void sub_8180F2C(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_27(struct Sprite *sprite)
+static void pokemonanimfunc_27(struct Sprite *sprite)
 {
     if (sprite->data[3] > 0)
     {
@@ -2335,17 +2353,17 @@ void pokemonanimfunc_27(struct Sprite *sprite)
     }
 }
 
-void sub_8181024(struct Sprite *sprite);
-void sub_8181068(struct Sprite *sprite);
-void sub_81810C4(struct Sprite *sprite);
+static void sub_8181024(struct Sprite *sprite);
+static void sub_8181068(struct Sprite *sprite);
+static void sub_81810C4(struct Sprite *sprite);
 
-void pokemonanimfunc_28(struct Sprite *sprite)
+static void pokemonanimfunc_28(struct Sprite *sprite)
 {
     HandleStartAffineAnim(sprite);
     sprite->callback = sub_8181024;
 }
 
-void sub_8181024(struct Sprite *sprite)
+static void sub_8181024(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->pos2.x--;
@@ -2362,7 +2380,7 @@ void sub_8181024(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8181068(struct Sprite *sprite)
+static void sub_8181068(struct Sprite *sprite)
 {
     u32 rotation;
 
@@ -2371,7 +2389,7 @@ void sub_8181068(struct Sprite *sprite)
     sprite->pos2.x = Cos(sprite->data[2], 22);
     sprite->pos2.y = -(Sin(sprite->data[2], 22));
     rotation = sprite->data[2] - 32;
-    HandleSetAffineData(sprite, 0x100, 0x100, rotation * 512);
+    HandleSetAffineData(sprite, 256, 256, rotation * 512);
 
     if (sprite->data[2] <= 32)
         sprite->callback = sub_81810C4;
@@ -2379,7 +2397,7 @@ void sub_8181068(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_81810C4(struct Sprite *sprite)
+static void sub_81810C4(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->pos2.x--;
@@ -2394,17 +2412,17 @@ void sub_81810C4(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8181110(struct Sprite *sprite);
-void sub_8181144(struct Sprite *sprite);
-void sub_81811A4(struct Sprite *sprite);
+static void sub_8181110(struct Sprite *sprite);
+static void sub_8181144(struct Sprite *sprite);
+static void sub_81811A4(struct Sprite *sprite);
 
-void pokemonanimfunc_29(struct Sprite *sprite)
+static void pokemonanimfunc_29(struct Sprite *sprite)
 {
     HandleStartAffineAnim(sprite);
     sprite->callback = sub_8181110;
 }
 
-void sub_8181110(struct Sprite *sprite)
+static void sub_8181110(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->pos2.x++;
@@ -2419,7 +2437,7 @@ void sub_8181110(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8181144(struct Sprite *sprite)
+static void sub_8181144(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->data[2] += 16;
@@ -2437,11 +2455,11 @@ void sub_8181144(struct Sprite *sprite)
         sprite->pos2.y += 2;
     }
 
-    HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[2] << 8);
+    HandleSetAffineData(sprite, 256, 256, sprite->data[2] << 8);
     sub_817F70C(sprite);
 }
 
-void sub_81811A4(struct Sprite *sprite)
+static void sub_81811A4(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->pos2.x++;
@@ -2458,21 +2476,21 @@ void sub_81811A4(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8181214(struct Sprite *sprite);
+static void sub_8181214(struct Sprite *sprite);
 
-void pokemonanimfunc_2A(struct Sprite *sprite)
+static void pokemonanimfunc_2A(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
-    gUnknown_03001240[id].field_2 = 2;
+    sUnknown_03001240[id].field_2 = 2;
     sub_8181214(sprite);
     sprite->callback = sub_8181214;
 }
 
-void sub_8181214(struct Sprite *sprite)
+static void sub_8181214(struct Sprite *sprite)
 {
-    if (gUnknown_03001240[sprite->data[0]].field_0 != 0)
+    if (sUnknown_03001240[sprite->data[0]].field_0 != 0)
     {
-        gUnknown_03001240[sprite->data[0]].field_0--;
+        sUnknown_03001240[sprite->data[0]].field_0--;
     }
     else
     {
@@ -2481,7 +2499,7 @@ void sub_8181214(struct Sprite *sprite)
         {
             sprite->data[2]++;
             HandleStartAffineAnim(sprite);
-            sprite->data[7] = gUnknown_03001240[sprite->data[0]].field_2;
+            sprite->data[7] = sUnknown_03001240[sprite->data[0]].field_2;
             sprite->data[3] = -1;
             sprite->data[4] = -1;
             sprite->data[5] = 0;
@@ -2508,12 +2526,12 @@ void sub_8181214(struct Sprite *sprite)
         {
             sprite->pos2.x = 0;
             sprite->pos2.y = 0;
-            if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+            if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
             {
-                gUnknown_03001240[sprite->data[0]].field_4--;
+                sUnknown_03001240[sprite->data[0]].field_4--;
                 sprite->data[5] = 0;
                 sprite->data[6] = 0;
-                gUnknown_03001240[sprite->data[0]].field_0 = 10;
+                sUnknown_03001240[sprite->data[0]].field_0 = 10;
             }
             else
             {
@@ -2522,14 +2540,14 @@ void sub_8181214(struct Sprite *sprite)
             }
         }
 
-        HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[6] << 8);
+        HandleSetAffineData(sprite, 256, 256, sprite->data[6] << 8);
         sub_817F70C(sprite);
     }
 }
 
-void sub_8181370(struct Sprite *sprite);
+static void sub_8181370(struct Sprite *sprite);
 
-void pokemonanimfunc_2B(struct Sprite *sprite)
+static void pokemonanimfunc_2B(struct Sprite *sprite)
 {
     HandleStartAffineAnim(sprite);
     sprite->data[6] = 0;
@@ -2537,7 +2555,7 @@ void pokemonanimfunc_2B(struct Sprite *sprite)
     sprite->callback = sub_8181370;
 }
 
-void sub_8181370(struct Sprite *sprite)
+static void sub_8181370(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->data[6] += 4;
@@ -2545,12 +2563,12 @@ void sub_8181370(struct Sprite *sprite)
     sprite->pos2.y = -(Sin((sprite->data[6] * 2) & 0xFF, 8));
     if (sprite->data[6] > 192 && sprite->data[7] == 1)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->data[7]++;
     }
     else if (sprite->data[6] > 64 && sprite->data[7] == 0)
     {
-        HandleSetAffineData(sprite, -0x100, 0x100, 0);
+        HandleSetAffineData(sprite, -256, 256, 0);
         sprite->data[7]++;
     }
 
@@ -2558,14 +2576,14 @@ void sub_8181370(struct Sprite *sprite)
     {
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_2C(struct Sprite *sprite)
+static void pokemonanimfunc_2C(struct Sprite *sprite)
 {
     if (++sprite->data[2] == 1)
     {
@@ -2575,7 +2593,7 @@ void pokemonanimfunc_2C(struct Sprite *sprite)
         sprite->data[4] = 0;
     }
 
-    if (gUnknown_0860AA64[sprite->data[6]][1] == 0xFF)
+    if (sUnknown_0860AA64[sprite->data[6]][1] == 0xFF)
     {
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
@@ -2583,7 +2601,7 @@ void pokemonanimfunc_2C(struct Sprite *sprite)
     {
         if (sprite->data[4] == 1)
         {
-            if (gUnknown_0860AA64[sprite->data[6]][0] != 0)
+            if (sUnknown_0860AA64[sprite->data[6]][0] != 0)
                 BlendPalette(sprite->data[7], 0x10, 0x10, 0x3FF);
             else
                 BlendPalette(sprite->data[7], 0x10, 0, 0x3FF);
@@ -2591,7 +2609,7 @@ void pokemonanimfunc_2C(struct Sprite *sprite)
             sprite->data[4] = 0;
         }
 
-        if (gUnknown_0860AA64[sprite->data[6]][1] == sprite->data[5])
+        if (sUnknown_0860AA64[sprite->data[6]][1] == sprite->data[5])
         {
             sprite->data[4] = 1;
             sprite->data[5] = 0;
@@ -2604,19 +2622,19 @@ void pokemonanimfunc_2C(struct Sprite *sprite)
     }
 }
 
-void sub_81814D4(struct Sprite *sprite)
+static void sub_81814D4(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         HandleStartAffineAnim(sprite);
 
     sub_817F70C(sprite);
-    if (sprite->data[2] > gUnknown_03001240[sprite->data[0]].field_8)
+    if (sprite->data[2] > sUnknown_03001240[sprite->data[0]].field_8)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->pos2.x = 0;
-        if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+        if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
         {
-            gUnknown_03001240[sprite->data[0]].field_4--;
+            sUnknown_03001240[sprite->data[0]].field_4--;
             sprite->data[2] = 0;
         }
         else
@@ -2627,36 +2645,36 @@ void sub_81814D4(struct Sprite *sprite)
     }
     else
     {
-        s16 index = (sprite->data[2] * 256) / gUnknown_03001240[sprite->data[0]].field_8;
+        s16 index = (sprite->data[2] * 256) / sUnknown_03001240[sprite->data[0]].field_8;
         sprite->pos2.x = -(Sin(index, 10));
-        HandleSetAffineData(sprite, 0x100, 0x100, Sin(index, 3276));
+        HandleSetAffineData(sprite, 256, 256, Sin(index, 3276));
     }
 
     sprite->data[2]++;
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_2D(struct Sprite *sprite)
+static void pokemonanimfunc_2D(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
-    gUnknown_03001240[id].field_8 = 50;
+    sUnknown_03001240[id].field_8 = 50;
     sub_81814D4(sprite);
     sprite->callback = sub_81814D4;
 }
 
-void sub_81815D4(struct Sprite *sprite)
+static void sub_81815D4(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         HandleStartAffineAnim(sprite);
 
     sub_817F70C(sprite);
-    if (sprite->data[2] > gUnknown_03001240[sprite->data[0]].field_8)
+    if (sprite->data[2] > sUnknown_03001240[sprite->data[0]].field_8)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->pos2.x = 0;
-        if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+        if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
         {
-            gUnknown_03001240[sprite->data[0]].field_4--;
+            sUnknown_03001240[sprite->data[0]].field_4--;
             sprite->data[2] = 0;
         }
         else
@@ -2667,28 +2685,28 @@ void sub_81815D4(struct Sprite *sprite)
     }
     else
     {
-        s16 index = (sprite->data[2] * 256) / gUnknown_03001240[sprite->data[0]].field_8;
+        s16 index = (sprite->data[2] * 256) / sUnknown_03001240[sprite->data[0]].field_8;
         sprite->pos2.x = -(Sin(index, 10));
-        HandleSetAffineData(sprite, 0x100, 0x100, -(Sin(index, 3276)));
+        HandleSetAffineData(sprite, 256, 256, -(Sin(index, 3276)));
     }
 
     sprite->data[2]++;
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_2E(struct Sprite *sprite)
+static void pokemonanimfunc_2E(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
-    gUnknown_03001240[id].field_8 = 50;
+    sUnknown_03001240[id].field_8 = 50;
     sub_81815D4(sprite);
     sprite->callback = sub_81815D4;
 }
 
-void sub_8181708(struct Sprite *sprite);
-void sub_8181770(struct Sprite *sprite);
-void sub_8181794(struct Sprite *sprite);
+static void sub_8181708(struct Sprite *sprite);
+static void sub_8181770(struct Sprite *sprite);
+static void sub_8181794(struct Sprite *sprite);
 
-void pokemonanimfunc_2F(struct Sprite *sprite)
+static void pokemonanimfunc_2F(struct Sprite *sprite)
 {
     HandleStartAffineAnim(sprite);
     sprite->data[6] = -(14 * sprite->centerToCornerVecX / 10);
@@ -2696,7 +2714,7 @@ void pokemonanimfunc_2F(struct Sprite *sprite)
     sprite->callback = sub_8181708;
 }
 
-void sub_8181708(struct Sprite *sprite)
+static void sub_8181708(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->data[7]--;
@@ -2704,7 +2722,7 @@ void sub_8181708(struct Sprite *sprite)
 
     sprite->pos2.y = -(Sin(sprite->data[7], sprite->data[6] += 0)); // dummy += 0 is needed to match
 
-    HandleSetAffineData(sprite, 0x100, 0x100, (sprite->data[7] - 128) << 8);
+    HandleSetAffineData(sprite, 256, 256, (sprite->data[7] - 128) << 8);
     if (sprite->data[7] <= 120)
     {
         sprite->data[7] = 120;
@@ -2715,7 +2733,7 @@ void sub_8181708(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8181770(struct Sprite *sprite)
+static void sub_8181770(struct Sprite *sprite)
 {
     if (sprite->data[3] == 20)
     {
@@ -2726,7 +2744,7 @@ void sub_8181770(struct Sprite *sprite)
     sprite->data[3]++;
 }
 
-void sub_8181794(struct Sprite *sprite)
+static void sub_8181794(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->data[7] += 2;
@@ -2734,12 +2752,12 @@ void sub_8181794(struct Sprite *sprite)
 
     sprite->pos2.y = -(Sin(sprite->data[7], sprite->data[6] += 0)); // dummy += 0 is needed to match
 
-    HandleSetAffineData(sprite, 0x100, 0x100, (sprite->data[7] - 128) << 8);
+    HandleSetAffineData(sprite, 256, 256, (sprite->data[7] - 128) << 8);
     if (sprite->data[7] >= 128)
     {
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->data[2] = 0;
         sub_817F77C(sprite);
         sprite->callback = pokemonanimfunc_10;
@@ -2748,11 +2766,11 @@ void sub_8181794(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8181810(struct Sprite *sprite)
+static void sub_8181810(struct Sprite *sprite)
 {
-    if (gUnknown_03001240[sprite->data[0]].field_0 != 0)
+    if (sUnknown_03001240[sprite->data[0]].field_0 != 0)
     {
-        gUnknown_03001240[sprite->data[0]].field_0--;
+        sUnknown_03001240[sprite->data[0]].field_0--;
     }
     else
     {
@@ -2769,7 +2787,7 @@ void sub_8181810(struct Sprite *sprite)
             sprite->data[7] = Sin(sprite->data[4], 256);
             sprite->pos2.y = Sin(sprite->data[4], 16);
             sprite->data[6] = Sin(sprite->data[4], 32);
-            HandleSetAffineData(sprite, 0x100 - sprite->data[6], 0x100 + sprite->data[7], 0);
+            HandleSetAffineData(sprite, 256 - sprite->data[6], 256 + sprite->data[7], 0);
             if (sprite->data[4] == 128)
             {
                 sprite->data[4] = 0;
@@ -2781,38 +2799,38 @@ void sub_8181810(struct Sprite *sprite)
             sprite->data[7] = Sin(sprite->data[4], 32);
             sprite->pos2.y = -(Sin(sprite->data[4], 8));
             sprite->data[6] = Sin(sprite->data[4], 128);
-            HandleSetAffineData(sprite, 0x100 + sprite->data[6], 0x100 - sprite->data[7], 0);
+            HandleSetAffineData(sprite, 256 + sprite->data[6], 256 - sprite->data[7], 0);
             if (sprite->data[4] == 128)
             {
-                if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+                if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
                 {
-                    gUnknown_03001240[sprite->data[0]].field_4--;
-                    gUnknown_03001240[sprite->data[0]].field_0 = 10;
+                    sUnknown_03001240[sprite->data[0]].field_4--;
+                    sUnknown_03001240[sprite->data[0]].field_0 = 10;
                     sprite->data[4] = 0;
                     sprite->data[5] = 0;
                 }
                 else
                 {
-                    HandleSetAffineData(sprite, 0x100, 0x100, 0);
+                    HandleSetAffineData(sprite, 256, 256, 0);
                     sub_817F77C(sprite);
                     sprite->callback = SpriteCB_SetDummyOnAnimEnd;
                 }
             }
         }
 
-        sprite->data[4] += gUnknown_03001240[sprite->data[0]].field_6;
+        sprite->data[4] += sUnknown_03001240[sprite->data[0]].field_6;
     }
 }
 
-void pokemonanimfunc_30(struct Sprite *sprite)
+static void pokemonanimfunc_30(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
-    gUnknown_03001240[id].field_6 = 4;
+    sUnknown_03001240[id].field_6 = 4;
     sub_8181810(sprite);
     sprite->callback = sub_8181810;
 }
 
-void pokemonanimfunc_31(struct Sprite *sprite)
+static void pokemonanimfunc_31(struct Sprite *sprite)
 {
     s32 counter = sprite->data[2];
     sub_817F70C(sprite);
@@ -2847,25 +2865,25 @@ void pokemonanimfunc_31(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8181ABC(struct Sprite *sprite);
-void sub_8181B4C(struct Sprite *sprite);
-void sub_8181C2C(struct Sprite *sprite);
+static void sub_8181ABC(struct Sprite *sprite);
+static void sub_8181B4C(struct Sprite *sprite);
+static void sub_8181C2C(struct Sprite *sprite);
 
-void pokemonanimfunc_32(struct Sprite *sprite)
+static void pokemonanimfunc_32(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
-    gUnknown_03001240[id].field_8 = -1;
+    sUnknown_03001240[id].field_8 = -1;
     HandleStartAffineAnim(sprite);
     sprite->data[3] = 0;
     sub_8181ABC(sprite);
     sprite->callback = sub_8181ABC;
 }
 
-void sub_8181ABC(struct Sprite *sprite)
+static void sub_8181ABC(struct Sprite *sprite)
 {
-    if (gUnknown_03001240[sprite->data[0]].field_0 != 0)
+    if (sUnknown_03001240[sprite->data[0]].field_0 != 0)
     {
-        gUnknown_03001240[sprite->data[0]].field_0--;
+        sUnknown_03001240[sprite->data[0]].field_0--;
     }
     else
     {
@@ -2880,7 +2898,7 @@ void sub_8181ABC(struct Sprite *sprite)
         }
         else
         {
-            s32 var = 8 * gUnknown_03001240[sprite->data[0]].field_8;
+            s32 var = 8 * sUnknown_03001240[sprite->data[0]].field_8;
             sprite->pos2.x = var * (counter % 128) / 128;
             sprite->pos2.y = -(Sin(counter % 128, 8));
             sprite->data[2] += 12;
@@ -2890,12 +2908,12 @@ void sub_8181ABC(struct Sprite *sprite)
     }
 }
 
-void sub_8181B4C(struct Sprite *sprite)
+static void sub_8181B4C(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] > 48)
     {
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->pos2.y = 0;
         sprite->data[2] = 0;
         sprite->callback = sub_8181C2C;
@@ -2907,7 +2925,7 @@ void sub_8181B4C(struct Sprite *sprite)
         if (sprite->data[2] >= 16 && sprite->data[2] <= 31)
         {
             sprite->data[3] += 8;
-            sprite->pos2.x -= gUnknown_03001240[sprite->data[0]].field_8;
+            sprite->pos2.x -= sUnknown_03001240[sprite->data[0]].field_8;
         }
 
         yDelta = 0;
@@ -2924,7 +2942,7 @@ void sub_8181B4C(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8181C2C(struct Sprite *sprite)
+static void sub_8181C2C(struct Sprite *sprite)
 {
     s32 counter;
 
@@ -2932,10 +2950,10 @@ void sub_8181C2C(struct Sprite *sprite)
     counter = sprite->data[2];
     if (counter > 128)
     {
-        if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+        if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
         {
-            gUnknown_03001240[sprite->data[0]].field_4--;
-            gUnknown_03001240[sprite->data[0]].field_0 = 10;
+            sUnknown_03001240[sprite->data[0]].field_4--;
+            sUnknown_03001240[sprite->data[0]].field_0 = 10;
             sprite->data[3] = 0;
             sprite->data[2] = 0;
             sprite->data[4] = 0;
@@ -2952,9 +2970,9 @@ void sub_8181C2C(struct Sprite *sprite)
     }
     else
     {
-        register s32 var asm("r4") = gUnknown_03001240[sprite->data[0]].field_8;
+        register s32 var asm("r4") = sUnknown_03001240[sprite->data[0]].field_8;
 
-        sprite->pos2.x = (var << 3) * (counter % 128) / 128 - (gUnknown_03001240[sprite->data[0]].field_8 * 8);
+        sprite->pos2.x = (var << 3) * (counter % 128) / 128 - (sUnknown_03001240[sprite->data[0]].field_8 * 8);
         sprite->pos2.y = -(Sin(counter % 128, 8));
     }
 
@@ -2962,7 +2980,7 @@ void sub_8181C2C(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8181CE8(struct Sprite *sprite)
+static void sub_8181CE8(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -2975,10 +2993,10 @@ void sub_8181CE8(struct Sprite *sprite)
     {
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
-        if (gUnknown_03001240[sprite->data[0]].field_4 > 1)
+        HandleSetAffineData(sprite, 256, 256, 0);
+        if (sUnknown_03001240[sprite->data[0]].field_4 > 1)
         {
-            gUnknown_03001240[sprite->data[0]].field_4--;
+            sUnknown_03001240[sprite->data[0]].field_4--;
             sprite->data[2] = 0;
             sprite->data[7] = 0;
         }
@@ -2996,21 +3014,21 @@ void sub_8181CE8(struct Sprite *sprite)
 
         sprite->pos2.x = -(Sin(sprite->data[7], 16));
         rotation = Sin(sprite->data[7], 32);
-        HandleSetAffineData(sprite, 0x100, 0x100, rotation << 8);
-        sprite->data[7] += gUnknown_03001240[sprite->data[0]].field_6;
+        HandleSetAffineData(sprite, 256, 256, rotation << 8);
+        sprite->data[7] += sUnknown_03001240[sprite->data[0]].field_6;
         sub_817F70C(sprite);
     }
 }
 
-void pokemonanimfunc_33(struct Sprite *sprite)
+static void pokemonanimfunc_33(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
-    gUnknown_03001240[id].field_6 = 4;
+    sUnknown_03001240[id].field_6 = 4;
     sub_8181CE8(sprite);
     sprite->callback = sub_8181CE8;
 }
 
-void pokemonanimfunc_34(struct Sprite *sprite)
+static void pokemonanimfunc_34(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -3023,7 +3041,7 @@ void pokemonanimfunc_34(struct Sprite *sprite)
     {
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
         sub_817F70C(sprite);
@@ -3035,13 +3053,13 @@ void pokemonanimfunc_34(struct Sprite *sprite)
         sprite->pos2.x = -(Sin(sprite->data[7], 16));
         sprite->pos2.y = -(Sin(sprite->data[7] % 128, 16));
         rotation = Sin(sprite->data[7], 32);
-        HandleSetAffineData(sprite, 0x100, 0x100, rotation << 8);
+        HandleSetAffineData(sprite, 256, 256, rotation << 8);
         sprite->data[7] += 8;
         sub_817F70C(sprite);
     }
 }
 
-void pokemonanimfunc_35(struct Sprite *sprite)
+static void pokemonanimfunc_35(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         sprite->data[7] = 0;
@@ -3065,18 +3083,18 @@ void pokemonanimfunc_35(struct Sprite *sprite)
     }
 }
 
-void sub_8181F14(struct Sprite *sprite);
-void sub_8181F50(struct Sprite *sprite);
-void sub_8181FC0(struct Sprite *sprite);
+static void sub_8181F14(struct Sprite *sprite);
+static void sub_8181F50(struct Sprite *sprite);
+static void sub_8181FC0(struct Sprite *sprite);
 
-void pokemonanimfunc_36(struct Sprite *sprite)
+static void pokemonanimfunc_36(struct Sprite *sprite)
 {
     HandleStartAffineAnim(sprite);
     sprite->data[7] = 0;
     sprite->callback = sub_8181F14;
 }
 
-void sub_8181F14(struct Sprite *sprite)
+static void sub_8181F14(struct Sprite *sprite)
 {
     if (sprite->data[7] > 31)
     {
@@ -3089,10 +3107,10 @@ void sub_8181F14(struct Sprite *sprite)
         sprite->data[7] += 4;
     }
 
-    HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[7] << 8);
+    HandleSetAffineData(sprite, 256, 256, sprite->data[7] << 8);
 }
 
-void sub_8181F50(struct Sprite *sprite)
+static void sub_8181F50(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] > 512)
@@ -3110,7 +3128,7 @@ void sub_8181F50(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_8181FC0(struct Sprite *sprite)
+static void sub_8181FC0(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->data[7] -= 2;
@@ -3126,11 +3144,11 @@ void sub_8181FC0(struct Sprite *sprite)
         sprite->pos2.x = -(Sin(sprite->data[7] * 2, 16));
     }
 
-    HandleSetAffineData(sprite, 0x100, 0x100, sprite->data[7] << 8);
+    HandleSetAffineData(sprite, 256, 256, sprite->data[7] << 8);
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_37(struct Sprite *sprite)
+static void pokemonanimfunc_37(struct Sprite *sprite)
 {
     u16 rotation;
 
@@ -3158,16 +3176,16 @@ void pokemonanimfunc_37(struct Sprite *sprite)
     }
 
     rotation = Sin(sprite->data[7] % 128, 16);
-    HandleSetAffineData(sprite, 0x100, 0x100, rotation << 8);
+    HandleSetAffineData(sprite, 256, 256, rotation << 8);
     sub_817F70C(sprite);
 }
 
-void sub_81820FC(struct Sprite *sprite);
-void sub_818216C(struct Sprite *sprite);
-void sub_81821CC(struct Sprite *sprite);
-void sub_8182248(struct Sprite *sprite);
+static void sub_81820FC(struct Sprite *sprite);
+static void sub_818216C(struct Sprite *sprite);
+static void sub_81821CC(struct Sprite *sprite);
+static void sub_8182248(struct Sprite *sprite);
 
-void pokemonanimfunc_38(struct Sprite *sprite)
+static void pokemonanimfunc_38(struct Sprite *sprite)
 {
     HandleStartAffineAnim(sprite);
     sprite->data[7] = 0;
@@ -3175,7 +3193,7 @@ void pokemonanimfunc_38(struct Sprite *sprite)
     sprite->callback = sub_81820FC;
 }
 
-void sub_81820FC(struct Sprite *sprite)
+static void sub_81820FC(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[7] > 24)
@@ -3193,11 +3211,11 @@ void sub_81820FC(struct Sprite *sprite)
         sprite->pos2.y = -(Sin(sprite->data[7], 8));
     }
 
-    HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+    HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
     sub_817F70C(sprite);
 }
 
-void sub_818216C(struct Sprite *sprite)
+static void sub_818216C(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[7] > 32)
@@ -3212,11 +3230,11 @@ void sub_818216C(struct Sprite *sprite)
         sprite->pos2.y = -(Sin(sprite->data[7], 8));
     }
 
-    HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+    HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
     sub_817F70C(sprite);
 }
 
-void sub_81821CC(struct Sprite *sprite)
+static void sub_81821CC(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     sprite->data[7] += (sprite->data[6] * 4);
@@ -3234,11 +3252,11 @@ void sub_81821CC(struct Sprite *sprite)
         sprite->data[5]++;
     }
 
-    HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+    HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
     sub_817F70C(sprite);
 }
 
-void sub_8182248(struct Sprite *sprite)
+static void sub_8182248(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[7] <= 0)
@@ -3254,11 +3272,11 @@ void sub_8182248(struct Sprite *sprite)
         sprite->pos2.y = -(Sin(sprite->data[7], 8));
     }
 
-    HandleSetAffineData(sprite, 0x100, 0x100, -(sprite->data[7]) << 8);
+    HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_39(struct Sprite *sprite)
+static void pokemonanimfunc_39(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] > 40)
@@ -3290,7 +3308,7 @@ void pokemonanimfunc_39(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_3A(struct Sprite *sprite)
+static void pokemonanimfunc_3A(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] == 0)
@@ -3309,7 +3327,7 @@ void pokemonanimfunc_3A(struct Sprite *sprite)
         {
             s16 scale = (8 * sprite->data[6]) / 20;
             scale = Sin(sprite->data[7] - scale, 64);
-            HandleSetAffineData(sprite, 0x100 - scale, 0x100 - scale, 0);
+            HandleSetAffineData(sprite, 256 - scale, 256 - scale, 0);
         }
     }
     else
@@ -3321,7 +3339,7 @@ void pokemonanimfunc_3A(struct Sprite *sprite)
             if (sprite->data[7] > 63)
             {
                 sprite->data[7] = 64;
-                HandleSetAffineData(sprite, 0x100, 0x100, 0);
+                HandleSetAffineData(sprite, 256, 256, 0);
                 sub_817F77C(sprite);
                 sprite->callback = SpriteCB_SetDummyOnAnimEnd;
             }
@@ -3352,13 +3370,13 @@ void pokemonanimfunc_3A(struct Sprite *sprite)
         }
 
         sprite->data[7] += 2;
-        HandleSetAffineData(sprite, 0x100 - var, 0x100 - var, 0);
+        HandleSetAffineData(sprite, 256 - var, 256 - var, 0);
     }
 
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_3B(struct Sprite *sprite)
+static void pokemonanimfunc_3B(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -3370,7 +3388,7 @@ void pokemonanimfunc_3B(struct Sprite *sprite)
     if (sprite->data[7] > 512)
     {
         sprite->pos2.y = 0;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
@@ -3381,11 +3399,11 @@ void pokemonanimfunc_3B(struct Sprite *sprite)
         sprite->pos2.y = Sin(sprite->data[7] % 256, 8);
         sprite->data[7] += 8;
         yScale = Sin(sprite->data[7] % 128, 96);
-        HandleSetAffineData(sprite, 0x100, yScale + 0x100, 0);
+        HandleSetAffineData(sprite, 256, yScale + 256, 0);
     }
 }
 
-void pokemonanimfunc_3C(struct Sprite *sprite)
+static void pokemonanimfunc_3C(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -3397,7 +3415,7 @@ void pokemonanimfunc_3C(struct Sprite *sprite)
     if (sprite->data[7] > 256)
     {
         sprite->pos2.y = 0;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
@@ -3408,22 +3426,22 @@ void pokemonanimfunc_3C(struct Sprite *sprite)
         sprite->pos2.y = Sin(sprite->data[7], 16);
         sprite->data[7] += 4;
         yScale = Sin((sprite->data[7] % 64) * 2, 128);
-        HandleSetAffineData(sprite, 0x100, yScale + 0x100, 0);
+        HandleSetAffineData(sprite, 256, yScale + 256, 0);
     }
 }
 
-void sub_81825F8(struct Sprite *sprite);
-void sub_8182648(struct Sprite *sprite);
-void sub_81826F8(struct Sprite *sprite);
+static void sub_81825F8(struct Sprite *sprite);
+static void sub_8182648(struct Sprite *sprite);
+static void sub_81826F8(struct Sprite *sprite);
 
-void pokemonanimfunc_3D(struct Sprite *sprite)
+static void pokemonanimfunc_3D(struct Sprite *sprite)
 {
     HandleStartAffineAnim(sprite);
     sprite->callback = sub_81825F8;
     sprite->data[7] = 0;
 }
 
-void sub_81825F8(struct Sprite *sprite)
+static void sub_81825F8(struct Sprite *sprite)
 {
     s16 yScale;
 
@@ -3440,10 +3458,10 @@ void sub_81825F8(struct Sprite *sprite)
         yScale = Sin(sprite->data[7], 128);
     }
 
-    HandleSetAffineData(sprite, 0x100, 0x100 + yScale, 0);
+    HandleSetAffineData(sprite, 256, 256 + yScale, 0);
 }
 
-void sub_8182648(struct Sprite *sprite)
+static void sub_8182648(struct Sprite *sprite)
 {
     s16 yScale;
 
@@ -3473,7 +3491,7 @@ void sub_8182648(struct Sprite *sprite)
         yScale = Cos((index * 2) + sprite->data[7], 128) * sign;
     }
 
-    HandleSetAffineData(sprite, 0x100, 0x100 + yScale, 0);
+    HandleSetAffineData(sprite, 256, 256 + yScale, 0);
     if (sprite->data[6] == 3)
     {
         sprite->data[7] = 0;
@@ -3481,7 +3499,7 @@ void sub_8182648(struct Sprite *sprite)
     }
 }
 
-void sub_81826F8(struct Sprite *sprite)
+static void sub_81826F8(struct Sprite *sprite)
 {
     s16 yScale;
 
@@ -3493,20 +3511,20 @@ void sub_81826F8(struct Sprite *sprite)
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
         sprite->pos2.y = 0;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
     }
 
-    HandleSetAffineData(sprite, 0x100, 0x100 + yScale, 0);
+    HandleSetAffineData(sprite, 256, 256 + yScale, 0);
 }
 
-void sub_8182764(struct Sprite *sprite)
+static void sub_8182764(struct Sprite *sprite)
 {
     if (sprite->data[7] > sprite->data[5])
     {
         sprite->pos2.x = 0;
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
     }
     else
     {
@@ -3515,11 +3533,11 @@ void sub_8182764(struct Sprite *sprite)
         sprite->pos2.x = Sin(sprite->data[7] % 256, sprite->data[4]);
         sprite->data[7] += sprite->data[6];
         xScale = Sin(sprite->data[7] % 128, 96);
-        HandleSetAffineData(sprite, 0x100 + xScale, 0x100, 0);
+        HandleSetAffineData(sprite, 256 + xScale, 256, 0);
     }
 }
 
-void pokemonanimfunc_3E(struct Sprite *sprite)
+static void pokemonanimfunc_3E(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -3534,14 +3552,14 @@ void pokemonanimfunc_3E(struct Sprite *sprite)
     sub_8182764(sprite);
 }
 
-void sub_8182830(struct Sprite *sprite)
+static void sub_8182830(struct Sprite *sprite)
 {
     if (sprite->data[7] > sprite->data[5])
     {
         sprite->pos2.x = 0;
         sub_817F77C(sprite);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
     }
     else
     {
@@ -3550,11 +3568,11 @@ void sub_8182830(struct Sprite *sprite)
         sprite->pos2.x = Sin(sprite->data[7] % 256, sprite->data[4]);
         sprite->data[7] += sprite->data[6];
         xScale = Sin((sprite->data[7] % 64) * 2, 128);
-        HandleSetAffineData(sprite, 0x100 + xScale, 0x100, 0);
+        HandleSetAffineData(sprite, 256 + xScale, 256, 0);
     }
 }
 
-void pokemonanimfunc_3F(struct Sprite *sprite)
+static void pokemonanimfunc_3F(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -3569,7 +3587,7 @@ void pokemonanimfunc_3F(struct Sprite *sprite)
     sub_8182830(sprite);
 }
 
-void pokemonanimfunc_40(struct Sprite *sprite)
+static void pokemonanimfunc_40(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] == 0)
@@ -3583,7 +3601,7 @@ void pokemonanimfunc_40(struct Sprite *sprite)
     {
         sprite->pos2.x = 0;
         sub_817F77C(sprite);
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
@@ -3593,13 +3611,13 @@ void pokemonanimfunc_40(struct Sprite *sprite)
         sprite->pos2.x = Sin(sprite->data[7] % 256, 8);
         sprite->data[7] += 8;
         scale = Sin(sprite->data[7] % 128, 96);
-        HandleSetAffineData(sprite, 0x100 + scale, 0x100 + scale, 0);
+        HandleSetAffineData(sprite, 256 + scale, 256 + scale, 0);
     }
 
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_41(struct Sprite *sprite)
+static void pokemonanimfunc_41(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] == 0)
@@ -3613,7 +3631,7 @@ void pokemonanimfunc_41(struct Sprite *sprite)
     {
         sprite->pos2.x = 0;
         sub_817F77C(sprite);
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
@@ -3623,13 +3641,13 @@ void pokemonanimfunc_41(struct Sprite *sprite)
         sprite->pos2.x = -(Sin((sprite->data[7] % 256) / 2, 16));
         sprite->data[7] += 8;
         scale = -(Sin((sprite->data[7] % 256) / 2, 64));
-        HandleSetAffineData(sprite, 0x100 + scale, 0x100 + scale, 0);
+        HandleSetAffineData(sprite, 256 + scale, 256 + scale, 0);
     }
 
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_42(struct Sprite *sprite)
+static void pokemonanimfunc_42(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] == 0)
@@ -3643,7 +3661,7 @@ void pokemonanimfunc_42(struct Sprite *sprite)
     {
         sprite->pos2.x = 0;
         sub_817F77C(sprite);
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
@@ -3653,13 +3671,13 @@ void pokemonanimfunc_42(struct Sprite *sprite)
         sprite->pos2.x = -(Sin(sprite->data[7] % 256 , 8));
         sprite->data[7] += 8;
         scale = Sin((sprite->data[7] % 256) / 2, 96);
-        HandleSetAffineData(sprite, 0x100 + scale, 0x100 + scale, 0);
+        HandleSetAffineData(sprite, 256 + scale, 256 + scale, 0);
     }
 
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_43(struct Sprite *sprite)
+static void pokemonanimfunc_43(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] > 2048)
@@ -3693,7 +3711,7 @@ void pokemonanimfunc_43(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_44(struct Sprite *sprite)
+static void pokemonanimfunc_44(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] == 0)
@@ -3750,50 +3768,50 @@ void pokemonanimfunc_44(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_45(struct Sprite *sprite)
+static void pokemonanimfunc_45(struct Sprite *sprite)
 {
     sprite->data[0] = 32;
     sub_8180714(sprite);
     sprite->callback = sub_8180714;
 }
 
-void pokemonanimfunc_46(struct Sprite *sprite)
+static void pokemonanimfunc_46(struct Sprite *sprite)
 {
     sprite->data[0] = 80;
     sub_817F8FC(sprite);
     sprite->callback = sub_817F8FC;
 }
 
-void pokemonanimfunc_47(struct Sprite *sprite)
+static void pokemonanimfunc_47(struct Sprite *sprite)
 {
     sprite->data[0] = 80;
     sub_817F978(sprite);
     sprite->callback = sub_817F978;
 }
 
-void pokemonanimfunc_48(struct Sprite *sprite)
+static void pokemonanimfunc_48(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_6 = 2048;
-    gUnknown_03001240[id].field_8 = sprite->data[6];
+    sUnknown_03001240[id].field_6 = 2048;
+    sUnknown_03001240[id].field_8 = sprite->data[6];
     sub_8180900(sprite);
     sprite->callback = sub_8180900;
 }
 
-void pokemonanimfunc_49(struct Sprite *sprite)
+static void pokemonanimfunc_49(struct Sprite *sprite)
 {
     sprite->data[6] = 1;
     pokemonanimfunc_05(sprite);
 }
 
-void pokemonanimfunc_4A(struct Sprite *sprite)
+static void pokemonanimfunc_4A(struct Sprite *sprite)
 {
     sprite->data[6] = 1;
     pokemonanimfunc_48(sprite);
 }
 
-void pokemonanimfunc_4B(struct Sprite *sprite)
+static void pokemonanimfunc_4B(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
         sprite->data[0] = 0;
@@ -3809,7 +3827,7 @@ void pokemonanimfunc_4B(struct Sprite *sprite)
     }
 }
 
-void pokemonanimfunc_4C(struct Sprite *sprite)
+static void pokemonanimfunc_4C(struct Sprite *sprite)
 {
     sprite->data[0] = 30;
     sprite->data[7] = 3;
@@ -3817,156 +3835,156 @@ void pokemonanimfunc_4C(struct Sprite *sprite)
     sprite->callback = sub_817FCDC;
 }
 
-void pokemonanimfunc_4D(struct Sprite *sprite)
+static void pokemonanimfunc_4D(struct Sprite *sprite)
 {
     sprite->data[0] = 30;
     sub_817FD44(sprite);
     sprite->callback = sub_817FD44;
 }
 
-void pokemonanimfunc_4E(struct Sprite *sprite)
+static void pokemonanimfunc_4E(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_6 = 1024;
-    gUnknown_03001240[id].field_0 = 0;
-    gUnknown_03001240[id].field_4 = 2;
+    sUnknown_03001240[id].field_6 = 1024;
+    sUnknown_03001240[id].field_0 = 0;
+    sUnknown_03001240[id].field_4 = 2;
     sub_817FE30(sprite);
     sprite->callback = sub_817FE30;
 }
 
-void pokemonanimfunc_4F(struct Sprite *sprite)
+static void pokemonanimfunc_4F(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_6 = 512;
-    gUnknown_03001240[id].field_8 = 3;
-    gUnknown_03001240[id].field_2 = 12;
+    sUnknown_03001240[id].field_6 = 512;
+    sUnknown_03001240[id].field_8 = 3;
+    sUnknown_03001240[id].field_2 = 12;
     sub_817FFF0(sprite);
     sprite->callback = sub_817FFF0;
 }
 
-void pokemonanimfunc_50(struct Sprite *sprite)
+static void pokemonanimfunc_50(struct Sprite *sprite)
 {
     sprite->data[0] = 24;
     sub_818031C(sprite);
     sprite->callback = sub_818031C;
 }
 
-void pokemonanimfunc_51(struct Sprite *sprite)
+static void pokemonanimfunc_51(struct Sprite *sprite)
 {
     sprite->data[0] = 5;
     sub_81804F8(sprite);
     sprite->callback = sub_81804F8;
 }
 
-void pokemonanimfunc_52(struct Sprite *sprite)
+static void pokemonanimfunc_52(struct Sprite *sprite)
 {
     sprite->data[0] = 3;
     sub_817F9F4(sprite);
     sprite->callback = sub_817F9F4;
 }
 
-void pokemonanimfunc_53(struct Sprite *sprite)
+static void pokemonanimfunc_53(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_0 = 60;
-    gUnknown_03001240[id].field_8 = 30;
+    sUnknown_03001240[id].field_0 = 60;
+    sUnknown_03001240[id].field_8 = 30;
     sub_817FF3C(sprite);
     sprite->callback = sub_817FF3C;
 }
 
-void pokemonanimfunc_54(struct Sprite *sprite)
+static void pokemonanimfunc_54(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_2 = 1;
-    gUnknown_03001240[id].field_4 = 2;
+    sUnknown_03001240[id].field_2 = 1;
+    sUnknown_03001240[id].field_4 = 2;
     sub_8181214(sprite);
     sprite->callback = sub_8181214;
 }
 
-void pokemonanimfunc_55(struct Sprite *sprite)
+static void pokemonanimfunc_55(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_6 = 4;
-    gUnknown_03001240[id].field_4 = 2;
+    sUnknown_03001240[id].field_6 = 4;
+    sUnknown_03001240[id].field_4 = 2;
     sub_8181810(sprite);
     sprite->callback = sub_8181810;
 }
 
-void pokemonanimfunc_56(struct Sprite *sprite)
+static void pokemonanimfunc_56(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_8 = 1;
-    gUnknown_03001240[id].field_4 = 2;
+    sUnknown_03001240[id].field_8 = 1;
+    sUnknown_03001240[id].field_4 = 2;
     HandleStartAffineAnim(sprite);
     sprite->data[3] = 0;
     sub_8181ABC(sprite);
     sprite->callback = sub_8181ABC;
 }
 
-void pokemonanimfunc_07(struct Sprite *sprite)
+static void pokemonanimfunc_07(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_6 = 2;
+    sUnknown_03001240[id].field_6 = 2;
     sub_8181CE8(sprite);
     sprite->callback = sub_8181CE8;
 }
 
-void pokemonanimfunc_08(struct Sprite *sprite)
+static void pokemonanimfunc_08(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_6 = 4;
-    gUnknown_03001240[id].field_4 = 2;
+    sUnknown_03001240[id].field_6 = 4;
+    sUnknown_03001240[id].field_4 = 2;
     sub_8181CE8(sprite);
     sprite->callback = sub_8181CE8;
 }
 
-void pokemonanimfunc_0B(struct Sprite *sprite)
+static void pokemonanimfunc_0B(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_8 = 100;
+    sUnknown_03001240[id].field_8 = 100;
     sub_81814D4(sprite);
     sprite->callback = sub_81814D4;
 }
 
-void pokemonanimfunc_0C(struct Sprite *sprite)
+static void pokemonanimfunc_0C(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_8 = 50;
-    gUnknown_03001240[id].field_4 = 2;
+    sUnknown_03001240[id].field_8 = 50;
+    sUnknown_03001240[id].field_4 = 2;
     sub_81814D4(sprite);
     sprite->callback = sub_81814D4;
 }
 
-void pokemonanimfunc_0D(struct Sprite *sprite)
+static void pokemonanimfunc_0D(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_8 = 100;
+    sUnknown_03001240[id].field_8 = 100;
     sub_81815D4(sprite);
     sprite->callback = sub_81815D4;
 }
 
-void pokemonanimfunc_0E(struct Sprite *sprite)
+static void pokemonanimfunc_0E(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_8 = 50;
-    gUnknown_03001240[id].field_4 = 2;
+    sUnknown_03001240[id].field_8 = 50;
+    sUnknown_03001240[id].field_4 = 2;
     sub_81815D4(sprite);
     sprite->callback = sub_81815D4;
 }
 
-void sub_8183140(struct Sprite *sprite)
+static void sub_8183140(struct Sprite *sprite)
 {
     s32 counter = sprite->data[2];
     if (counter > 2304)
@@ -3982,7 +4000,7 @@ void sub_8183140(struct Sprite *sprite)
     sprite->data[2] += sprite->data[0];
 }
 
-void pokemonanimfunc_57(struct Sprite *sprite)
+static void pokemonanimfunc_57(struct Sprite *sprite)
 {
     sprite->data[0] = 60;
     sprite->data[7] = 3;
@@ -3990,7 +4008,7 @@ void pokemonanimfunc_57(struct Sprite *sprite)
     sprite->callback = sub_8183140;
 }
 
-void pokemonanimfunc_58(struct Sprite *sprite)
+static void pokemonanimfunc_58(struct Sprite *sprite)
 {
     sprite->data[0] = 30;
     sprite->data[7] = 3;
@@ -3998,7 +4016,7 @@ void pokemonanimfunc_58(struct Sprite *sprite)
     sprite->callback = sub_8183140;
 }
 
-void pokemonanimfunc_59(struct Sprite *sprite)
+static void pokemonanimfunc_59(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] > 2048)
@@ -4032,7 +4050,7 @@ void pokemonanimfunc_59(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void sub_81832C8(struct Sprite *sprite)
+static void sub_81832C8(struct Sprite *sprite)
 {
     s16 index1 = 0, index2 = 0;
 
@@ -4040,7 +4058,7 @@ void sub_81832C8(struct Sprite *sprite)
     {
         sprite->pos2.y = 0;
         sprite->data[5] = 0;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         if (sprite->data[4] <= 1)
         {
             sub_817F77C(sprite);
@@ -4067,18 +4085,18 @@ void sub_81832C8(struct Sprite *sprite)
         }
 
         if (sprite->data[1] == 0)
-            xScale = -0x100 - Sin(index2, 16);
+            xScale = -256 - Sin(index2, 16);
         else
-            xScale = 0x100 + Sin(index2, 16);
+            xScale = 256 + Sin(index2, 16);
 
         amplitude = sprite->data[3];
-        yScale = 0x100 - Sin(index2, amplitude) - Sin(index1, amplitude / 5);
+        yScale = 256 - Sin(index2, amplitude) - Sin(index1, amplitude / 5);
         SetAffineData(sprite, xScale, yScale, 0);
         sprite->data[5]++;
     }
 }
 
-void pokemonanimfunc_5A(struct Sprite *sprite)
+static void pokemonanimfunc_5A(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4094,14 +4112,14 @@ void pokemonanimfunc_5A(struct Sprite *sprite)
     sub_81832C8(sprite);
 }
 
-void sub_8183418(struct Sprite *sprite)
+static void sub_8183418(struct Sprite *sprite)
 {
     s16 index1 = 0, index2;
 
     if (sprite->data[5] > sprite->data[6])
     {
         sprite->data[5] = 0;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         if (sprite->data[4] <= 1)
         {
             sub_817F77C(sprite);
@@ -4130,16 +4148,16 @@ void sub_8183418(struct Sprite *sprite)
         amplitude = sprite->data[3];
 
         if (sprite->data[1] == 0)
-            xScale = -0x100 + Sin(index2, amplitude) + Sin(index1, amplitude / 5 * 2);
+            xScale = -256 + Sin(index2, amplitude) + Sin(index1, amplitude / 5 * 2);
         else
-            xScale = 0x100 - Sin(index2, amplitude) - Sin(index1, amplitude / 5 * 2);
+            xScale = 256 - Sin(index2, amplitude) - Sin(index1, amplitude / 5 * 2);
 
-        SetAffineData(sprite, xScale, 0x100, 0);
+        SetAffineData(sprite, xScale, 256, 0);
         sprite->data[5]++;
     }
 }
 
-void pokemonanimfunc_5B(struct Sprite *sprite)
+static void pokemonanimfunc_5B(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4155,19 +4173,19 @@ void pokemonanimfunc_5B(struct Sprite *sprite)
     sub_8183418(sprite);
 }
 
-void sub_8183574(struct Sprite *sprite)
+static void sub_8183574(struct Sprite *sprite)
 {
     u8 var6, var7;
     u8 var8 = sprite->data[2];
     u8 var9 = sprite->data[6];
-    u8 var5 = gUnknown_0860AA80[sprite->data[5]][0];
+    u8 var5 = sUnknown_0860AA80[sprite->data[5]][0];
     u8 var2 = var5;
     if (var5 != 0xFF)
         var5 = sprite->data[7];
     else
         var5 = 0xFF; // needed to match
 
-    var6 = gUnknown_0860AA80[sprite->data[5]][1];
+    var6 = sUnknown_0860AA80[sprite->data[5]][1];
     var7 = 0;
     if (var2 != 0xFE)
         var7 = (var6 - var9) * var5 / var6;
@@ -4193,7 +4211,7 @@ void sub_8183574(struct Sprite *sprite)
     }
 }
 
-void pokemonanimfunc_5C(struct Sprite *sprite)
+static void pokemonanimfunc_5C(struct Sprite *sprite)
 {
     sprite->data[0] = 40;
     sprite->data[7] = 6;
@@ -4201,7 +4219,7 @@ void pokemonanimfunc_5C(struct Sprite *sprite)
     sprite->callback = sub_8183574;
 }
 
-void pokemonanimfunc_5D(struct Sprite *sprite)
+static void pokemonanimfunc_5D(struct Sprite *sprite)
 {
     sprite->data[0] = 70;
     sprite->data[7] = 6;
@@ -4209,14 +4227,14 @@ void pokemonanimfunc_5D(struct Sprite *sprite)
     sprite->callback = sub_817FCDC;
 }
 
-void pokemonanimfunc_5E(struct Sprite *sprite)
+static void pokemonanimfunc_5E(struct Sprite *sprite)
 {
     sprite->data[0] = 20;
     sub_817F8FC(sprite);
     sprite->callback = sub_817F8FC;
 }
 
-void pokemonanimfunc_5F(struct Sprite *sprite)
+static void pokemonanimfunc_5F(struct Sprite *sprite)
 {
     if (sprite->data[2] > 40)
     {
@@ -4237,7 +4255,7 @@ void pokemonanimfunc_5F(struct Sprite *sprite)
     sprite->data[2]++;
 }
 
-void pokemonanimfunc_60(struct Sprite *sprite)
+static void pokemonanimfunc_60(struct Sprite *sprite)
 {
     if (sprite->data[2] > 40)
     {
@@ -4258,7 +4276,7 @@ void pokemonanimfunc_60(struct Sprite *sprite)
     sprite->data[2]++;
 }
 
-void pokemonanimfunc_61(struct Sprite *sprite)
+static void pokemonanimfunc_61(struct Sprite *sprite)
 {
     sprite->data[0] = 70;
     sprite->data[7] = 6;
@@ -4266,7 +4284,7 @@ void pokemonanimfunc_61(struct Sprite *sprite)
     sprite->callback = sub_8183140;
 }
 
-void pokemonanimfunc_62(struct Sprite *sprite)
+static void pokemonanimfunc_62(struct Sprite *sprite)
 {
     sprite->data[0] = 24;
     sprite->data[7] = 6;
@@ -4274,7 +4292,7 @@ void pokemonanimfunc_62(struct Sprite *sprite)
     sprite->callback = sub_8183574;
 }
 
-void pokemonanimfunc_63(struct Sprite *sprite)
+static void pokemonanimfunc_63(struct Sprite *sprite)
 {
     sprite->data[0] = 56;
     sprite->data[7] = 9;
@@ -4282,25 +4300,25 @@ void pokemonanimfunc_63(struct Sprite *sprite)
     sprite->callback = sub_8183574;
 }
 
-void pokemonanimfunc_64(struct Sprite *sprite)
+static void pokemonanimfunc_64(struct Sprite *sprite)
 {
     u8 id = sprite->data[0] = sub_817F758();
 
-    gUnknown_03001240[id].field_6 = 1024;
-    gUnknown_03001240[id].field_8 = 6;
-    gUnknown_03001240[id].field_2 = 24;
+    sUnknown_03001240[id].field_6 = 1024;
+    sUnknown_03001240[id].field_8 = 6;
+    sUnknown_03001240[id].field_2 = 24;
     sub_817FFF0(sprite);
     sprite->callback = sub_817FFF0;
 }
 
-void sub_81837DC(struct Sprite *sprite)
+static void sub_81837DC(struct Sprite *sprite)
 {
     s16 index1 = 0, index2 = 0;
     if (sprite->data[5] > sprite->data[6])
     {
         sprite->pos2.y = 0;
         sprite->data[5] = 0;
-        HandleSetAffineData(sprite, 0x100, 0x100, 0);
+        HandleSetAffineData(sprite, 256, 256, 0);
         if (sprite->data[4] <= 1)
         {
             sub_817F77C(sprite);
@@ -4329,17 +4347,17 @@ void sub_81837DC(struct Sprite *sprite)
         amplitude = sprite->data[3];
 
         if (sprite->data[1] == 0)
-            xScale = Sin(index2, amplitude) + (Sin(index1, amplitude / 5 * 2) - 0x100);
+            xScale = Sin(index2, amplitude) + (Sin(index1, amplitude / 5 * 2) - 256);
         else
-            xScale = 0x100 - Sin(index1, amplitude / 5 * 2) - Sin(index2, amplitude);
+            xScale = 256 - Sin(index1, amplitude / 5 * 2) - Sin(index2, amplitude);
 
-        yScale = 0x100 - Sin(index1, amplitude / 5) - Sin(index2, amplitude);
+        yScale = 256 - Sin(index1, amplitude / 5) - Sin(index2, amplitude);
         SetAffineData(sprite, xScale, yScale, 0);
         sprite->data[5]++;
     }
 }
 
-void pokemonanimfunc_65(struct Sprite *sprite)
+static void pokemonanimfunc_65(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4355,7 +4373,7 @@ void pokemonanimfunc_65(struct Sprite *sprite)
     sub_81837DC(sprite);
 }
 
-void pokemonanimfunc_66(struct Sprite *sprite)
+static void pokemonanimfunc_66(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] > 2048)
@@ -4389,7 +4407,7 @@ void pokemonanimfunc_66(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_67(struct Sprite *sprite)
+static void pokemonanimfunc_67(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] > 2048)
@@ -4423,7 +4441,7 @@ void pokemonanimfunc_67(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-static const s8 gUnknown_0860ADBE[][3] =
+static const s8 sUnknown_0860ADBE[][3] =
 {
 //   x    y   timer
     {1,   1, 12},
@@ -4432,19 +4450,19 @@ static const s8 gUnknown_0860ADBE[][3] =
     {0,  0,  0}
 };
 
-void sub_8183B4C(struct Sprite *sprite)
+static void sub_8183B4C(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] == 0)
         sprite->data[3] = 0;
 
-    if (gUnknown_0860ADBE[sprite->data[3]][2] / sprite->data[5] == sprite->data[2])
+    if (sUnknown_0860ADBE[sprite->data[3]][2] / sprite->data[5] == sprite->data[2])
     {
         sprite->data[3]++;
         sprite->data[2] = 0;
     }
 
-    if (gUnknown_0860ADBE[sprite->data[3]][2] / sprite->data[5] == 0)
+    if (sUnknown_0860ADBE[sprite->data[3]][2] / sprite->data[5] == 0)
     {
         if (--sprite->data[6] == 0)
             sprite->callback = SpriteCB_SetDummyOnAnimEnd;
@@ -4454,14 +4472,14 @@ void sub_8183B4C(struct Sprite *sprite)
     else
     {
         s32 amplitude = sprite->data[5];
-        sprite->pos2.x += (gUnknown_0860ADBE[sprite->data[3]][0] * amplitude);
-        sprite->pos2.y += (gUnknown_0860ADBE[sprite->data[3]][1] * sprite->data[5]); // what's the point of the var if you're not reusing it?
+        sprite->pos2.x += (sUnknown_0860ADBE[sprite->data[3]][0] * amplitude);
+        sprite->pos2.y += (sUnknown_0860ADBE[sprite->data[3]][1] * sprite->data[5]); // what's the point of the var if you're not reusing it?
         sprite->data[2]++;
         sub_817F70C(sprite);
     }
 }
 
-void pokemonanimfunc_68(struct Sprite *sprite)
+static void pokemonanimfunc_68(struct Sprite *sprite)
 {
     sprite->data[5] = 1;
     sprite->data[6] = 1;
@@ -4469,7 +4487,7 @@ void pokemonanimfunc_68(struct Sprite *sprite)
     sprite->callback = sub_8183B4C;
 }
 
-void pokemonanimfunc_69(struct Sprite *sprite)
+static void pokemonanimfunc_69(struct Sprite *sprite)
 {
     sprite->data[5] = 2;
     sprite->data[6] = 1;
@@ -4477,7 +4495,7 @@ void pokemonanimfunc_69(struct Sprite *sprite)
     sprite->callback = sub_8183B4C;
 }
 
-void pokemonanimfunc_6A(struct Sprite *sprite)
+static void pokemonanimfunc_6A(struct Sprite *sprite)
 {
     sprite->data[5] = 2;
     sprite->data[6] = 2;
@@ -4485,7 +4503,7 @@ void pokemonanimfunc_6A(struct Sprite *sprite)
     sprite->callback = sub_8183B4C;
 }
 
-void sub_8183C6C(struct Sprite *sprite)
+static void sub_8183C6C(struct Sprite *sprite)
 {
     if (sprite->data[7] > 255)
     {
@@ -4493,7 +4511,7 @@ void sub_8183C6C(struct Sprite *sprite)
         {
             sub_817F77C(sprite);
             sprite->callback = SpriteCB_SetDummyOnAnimEnd;
-            HandleSetAffineData(sprite, 0x100, 0x100, 0);
+            HandleSetAffineData(sprite, 256, 256, 0);
         }
         else
         {
@@ -4510,11 +4528,11 @@ void sub_8183C6C(struct Sprite *sprite)
             sprite->data[7] = 256;
 
         scale = Sin(sprite->data[7] / 2, 64);
-        HandleSetAffineData(sprite, 0x100 - scale, 0x100 - scale, 0);
+        HandleSetAffineData(sprite, 256 - scale, 256 - scale, 0);
     }
 }
 
-void pokemonanimfunc_6B(struct Sprite *sprite)
+static void pokemonanimfunc_6B(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] == 0)
@@ -4530,7 +4548,7 @@ void pokemonanimfunc_6B(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_6C(struct Sprite *sprite)
+static void pokemonanimfunc_6C(struct Sprite *sprite)
 {
     sub_817F70C(sprite);
     if (sprite->data[2] == 0)
@@ -4546,7 +4564,7 @@ void pokemonanimfunc_6C(struct Sprite *sprite)
     sub_817F70C(sprite);
 }
 
-void pokemonanimfunc_6D(struct Sprite *sprite)
+static void pokemonanimfunc_6D(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4561,7 +4579,7 @@ void pokemonanimfunc_6D(struct Sprite *sprite)
     sub_8182764(sprite);
 }
 
-void pokemonanimfunc_6E(struct Sprite *sprite)
+static void pokemonanimfunc_6E(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4576,7 +4594,7 @@ void pokemonanimfunc_6E(struct Sprite *sprite)
     sub_8182764(sprite);
 }
 
-void pokemonanimfunc_6F(struct Sprite *sprite)
+static void pokemonanimfunc_6F(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4591,7 +4609,7 @@ void pokemonanimfunc_6F(struct Sprite *sprite)
     sub_8182830(sprite);
 }
 
-void pokemonanimfunc_70(struct Sprite *sprite)
+static void pokemonanimfunc_70(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4606,7 +4624,7 @@ void pokemonanimfunc_70(struct Sprite *sprite)
     sub_8182830(sprite);
 }
 
-void pokemonanimfunc_71(struct Sprite *sprite)
+static void pokemonanimfunc_71(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4618,7 +4636,7 @@ void pokemonanimfunc_71(struct Sprite *sprite)
     sub_8180828(sprite);
 }
 
-void pokemonanimfunc_72(struct Sprite *sprite)
+static void pokemonanimfunc_72(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4630,7 +4648,7 @@ void pokemonanimfunc_72(struct Sprite *sprite)
     sub_8180828(sprite);
 }
 
-void pokemonanimfunc_73(struct Sprite *sprite)
+static void pokemonanimfunc_73(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4645,7 +4663,7 @@ void pokemonanimfunc_73(struct Sprite *sprite)
     sub_81832C8(sprite);
 }
 
-void pokemonanimfunc_74(struct Sprite *sprite)
+static void pokemonanimfunc_74(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4660,7 +4678,7 @@ void pokemonanimfunc_74(struct Sprite *sprite)
     sub_81832C8(sprite);
 }
 
-void pokemonanimfunc_75(struct Sprite *sprite)
+static void pokemonanimfunc_75(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4676,7 +4694,7 @@ void pokemonanimfunc_75(struct Sprite *sprite)
     sub_8183418(sprite);
 }
 
-void pokemonanimfunc_76(struct Sprite *sprite)
+static void pokemonanimfunc_76(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4692,7 +4710,7 @@ void pokemonanimfunc_76(struct Sprite *sprite)
     sub_8183418(sprite);
 }
 
-void pokemonanimfunc_77(struct Sprite *sprite)
+static void pokemonanimfunc_77(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4708,7 +4726,7 @@ void pokemonanimfunc_77(struct Sprite *sprite)
     sub_81837DC(sprite);
 }
 
-void pokemonanimfunc_78(struct Sprite *sprite)
+static void pokemonanimfunc_78(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4724,7 +4742,7 @@ void pokemonanimfunc_78(struct Sprite *sprite)
     sub_81837DC(sprite);
 }
 
-void sub_8183FA8(struct Sprite *sprite)
+static void sub_8183FA8(struct Sprite *sprite)
 {
     if (sprite->data[7] > 255)
     {
@@ -4752,7 +4770,7 @@ void sub_8183FA8(struct Sprite *sprite)
     }
 }
 
-void pokemonanimfunc_79(struct Sprite *sprite)
+static void pokemonanimfunc_79(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4767,7 +4785,7 @@ void pokemonanimfunc_79(struct Sprite *sprite)
     sub_8183FA8(sprite);
 }
 
-void pokemonanimfunc_7A(struct Sprite *sprite)
+static void pokemonanimfunc_7A(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4782,7 +4800,7 @@ void pokemonanimfunc_7A(struct Sprite *sprite)
     sub_8183FA8(sprite);
 }
 
-void pokemonanimfunc_7B(struct Sprite *sprite)
+static void pokemonanimfunc_7B(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
@@ -4796,3 +4814,844 @@ void pokemonanimfunc_7B(struct Sprite *sprite)
 
     sub_8183FA8(sprite);
 }
+
+static void sub_81840C4(struct Sprite *sprite)
+{
+    if (sprite->data[7] > 256)
+    {
+        if (sprite->data[6] <= sprite->data[4])
+        {
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+        }
+        else
+        {
+            sprite->data[4]++;
+            sprite->data[7] = 0;
+        }
+
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        s16 posX;
+
+        if (sprite->data[7] > 159)
+        {
+            if (sprite->data[7] > 256)
+                sprite->data[7] = 256;
+
+            sprite->pos2.y = -(Sin(sprite->data[7] % 256, 8));
+        }
+        else if (sprite->data[7] > 95)
+        {
+            sprite->pos2.y = Sin(96, 6) - Sin((sprite->data[7] - 96) * 2, 4);
+        }
+        else
+        {
+            sprite->pos2.y = Sin(sprite->data[7], 6);
+        }
+
+        posX = -(Sin(sprite->data[7] / 2, sprite->data[5]));
+        if (sprite->data[4] % 2 == 0)
+            posX *= -1;
+
+        sprite->pos2.x = posX;
+        sprite->data[7] += sprite->data[3];
+    }
+}
+
+static void pokemonanimfunc_7C(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        sprite->data[6] = 2;
+        sprite->data[7] = 0;
+        sprite->data[5] = 16;
+        sprite->data[4] = 1;
+        sprite->data[3] = 4;
+    }
+
+    sub_81840C4(sprite);
+}
+
+static void pokemonanimfunc_7D(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        sprite->data[6] = 2;
+        sprite->data[7] = 0;
+        sprite->data[5] = 16;
+        sprite->data[4] = 1;
+        sprite->data[3] = 6;
+    }
+
+    sub_81840C4(sprite);
+}
+
+static void pokemonanimfunc_7E(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        sprite->data[6] = 3;
+        sprite->data[7] = 0;
+        sprite->data[5] = 16;
+        sprite->data[4] = 1;
+        sprite->data[3] = 8;
+    }
+
+    sub_81840C4(sprite);
+}
+
+static void pokemonanimfunc_7F(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        sprite->data[6] = 1;
+        sprite->data[7] = 0;
+        sprite->data[5] = 4;
+        sprite->data[4] = 6;
+        sprite->data[3] = 4;
+    }
+
+    sub_8183FA8(sprite);
+}
+
+static void pokemonanimfunc_80(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        sprite->data[6] = 1;
+        sprite->data[7] = 0;
+        sprite->data[5] = 4;
+        sprite->data[4] = 6;
+        sprite->data[3] = 6;
+    }
+
+    sub_8183FA8(sprite);
+}
+
+static void pokemonanimfunc_81(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[2] = 1;
+        sprite->data[6] = 2;
+        sprite->data[7] = 0;
+        sprite->data[5] = 4;
+        sprite->data[4] = 6;
+        sprite->data[3] = 8;
+    }
+
+    sub_8183FA8(sprite);
+}
+
+static void sub_8184290(struct Sprite *sprite)
+{
+    u16 index = Sin((sprite->data[2] * 128) / sprite->data[7], sprite->data[5]);
+    sprite->data[6] = -(index << 8);
+    sub_817F3F0(sprite, index, sprite->data[4], 0);
+    HandleSetAffineData(sprite, 256, 256, sprite->data[6]);
+}
+
+static void pokemonanimfunc_82(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[7] = 60;
+        sprite->data[5] = 8;
+        sprite->data[4] = -32;
+        sprite->data[3] = 1;
+        sprite->data[0] = 0;
+    }
+
+    if (sprite->data[2] > sprite->data[7])
+    {
+        HandleSetAffineData(sprite, 256, 256, 0);
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        sprite->data[0]++;
+        if (sprite->data[3] <= sprite->data[0])
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+            return;
+        }
+        else
+        {
+            sprite->data[2] = 0;
+        }
+    }
+    else
+    {
+        sub_8184290(sprite);
+    }
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_83(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[7] = 90;
+        sprite->data[5] = 8;
+        sprite->data[4] = -32;
+        sprite->data[3] = 1;
+        sprite->data[0] = 0;
+    }
+
+    if (sprite->data[2] > sprite->data[7])
+    {
+        HandleSetAffineData(sprite, 256, 256, 0);
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        sprite->data[0]++;
+        if (sprite->data[3] <= sprite->data[0])
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+            return;
+        }
+        else
+        {
+            sprite->data[2] = 0;
+        }
+    }
+    else
+    {
+        sub_8184290(sprite);
+    }
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_84(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->data[7] = 30;
+        sprite->data[5] = 8;
+        sprite->data[4] = -32;
+        sprite->data[3] = 2;
+        sprite->data[0] = 0;
+    }
+
+    if (sprite->data[2] > sprite->data[7])
+    {
+        HandleSetAffineData(sprite, 256, 256, 0);
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        sprite->data[0]++;
+        if (sprite->data[3] <= sprite->data[0])
+        {
+            sub_817F77C(sprite);
+            sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+            return;
+        }
+        else
+        {
+            sprite->data[2] = 0;
+        }
+    }
+    else
+    {
+        sub_8184290(sprite);
+    }
+
+    sprite->data[2]++;
+}
+
+static void sub_8184468(struct Sprite *sprite)
+{
+    if (sprite->data[2] > sprite->data[7])
+    {
+        sprite->pos2.y = 0;
+        HandleSetAffineData(sprite, 256, 256, 0);
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        u8 posY_unsigned;
+        s8 posY_signed;
+        s32 posY;
+        s16 index = (u16)(sprite->data[2] % sprite->data[6] * 256) / sprite->data[6] % 256;
+        if (sprite->data[2] % 2 == 0)
+        {
+            sprite->data[4] = Sin(index, 32) + 256;
+            sprite->data[5] = Sin(index, 32) + 256;
+            posY_unsigned = Sin(index, 32);
+            posY_signed = posY_unsigned;
+        }
+        else
+        {
+            sprite->data[4] = Sin(index, 8) + 256;
+            sprite->data[5] = Sin(index, 8) + 256;
+            posY_unsigned = Sin(index, 8);
+            posY_signed = posY_unsigned;
+        }
+
+        posY = posY_signed;
+        if (posY < 0)
+            posY += 7;
+        sprite->pos2.y = (u32)(posY) >> 3;
+        HandleSetAffineData(sprite, sprite->data[4], sprite->data[5], 0);
+    }
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_85(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->pos2.y += 2;
+        sprite->data[6] = 40;
+        sprite->data[7] = 80;
+    }
+
+    sub_8184468(sprite);
+}
+
+static void pokemonanimfunc_86(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->pos2.y += 2;
+        sprite->data[6] = 40;
+        sprite->data[7] = 40;
+    }
+
+    sub_8184468(sprite);
+}
+
+static void pokemonanimfunc_87(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        HandleStartAffineAnim(sprite);
+        sprite->pos2.y += 2;
+        sprite->data[6] = 80;
+        sprite->data[7] = 80;
+    }
+
+    sub_8184468(sprite);
+}
+
+static void sub_8184610(struct Sprite *sprite);
+static void sub_8184640(struct Sprite *sprite);
+static void sub_8184678(struct Sprite *sprite);
+static void sub_81846B8(struct Sprite *sprite);
+
+static void sub_81845D4(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->pos2.x -= sprite->data[2];
+    if (sprite->pos2.x <= -sprite->data[6])
+    {
+        sprite->pos2.x = -sprite->data[6];
+        sprite->data[7] = 2;
+        sprite->callback = sub_8184610;
+    }
+
+    sub_817F70C(sprite);
+}
+
+static void sub_8184610(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->pos2.x += sprite->data[7];
+    sprite->data[7]++;
+    if (sprite->pos2.x >= 0)
+        sprite->callback = sub_8184640;
+
+    sub_817F70C(sprite);
+}
+
+static void sub_8184640(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->pos2.x += sprite->data[7];
+    sprite->data[7]++;
+    if (sprite->pos2.x > sprite->data[6])
+    {
+        sprite->pos2.x = sprite->data[6];
+        sprite->callback = sub_8184678;
+    }
+
+    sub_817F70C(sprite);
+}
+
+static void sub_8184678(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    if (sprite->data[3] >= sprite->data[5])
+    {
+        sprite->callback = sub_81846B8;
+    }
+    else
+    {
+        sprite->pos2.x += sprite->data[4];
+        sprite->data[4] *= -1;
+        sprite->data[3]++;
+    }
+
+    sub_817F70C(sprite);
+}
+
+static void sub_81846B8(struct Sprite *sprite)
+{
+    sub_817F70C(sprite);
+    sprite->pos2.x -= 2;
+    if (sprite->pos2.x <= 0)
+    {
+        sprite->pos2.x = 0;
+        sub_817F77C(sprite);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+
+    sub_817F70C(sprite);
+}
+
+static void pokemonanimfunc_88(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->data[7] = 4;
+    sprite->data[6] = 12;
+    sprite->data[5] = 16;
+    sprite->data[4] = 4;
+    sprite->data[3] = 0;
+    sprite->data[2] = 2;
+    sprite->callback = sub_81845D4;
+}
+
+static void pokemonanimfunc_89(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->data[7] = 2;
+    sprite->data[6] = 8;
+    sprite->data[5] = 12;
+    sprite->data[4] = 2;
+    sprite->data[3] = 0;
+    sprite->data[2] = 1;
+    sprite->callback = sub_81845D4;
+}
+
+static void pokemonanimfunc_8A(struct Sprite *sprite)
+{
+    HandleStartAffineAnim(sprite);
+    sprite->data[7] = 0;
+    sprite->data[6] = 6;
+    sprite->data[5] = 6;
+    sprite->data[4] = 2;
+    sprite->data[3] = 0;
+    sprite->data[2] = 1;
+    sprite->callback = sub_81845D4;
+}
+
+static void sub_8184770(struct Sprite *sprite)
+{
+    sprite->pos2.x = sprite->data[1];
+    if (sprite->data[0] > 1)
+    {
+        sprite->data[1] *= -1;
+        sprite->data[0] = 0;
+    }
+    else
+    {
+        sprite->data[0]++;
+    }
+}
+
+struct YellowBlendStruct
+{
+    u8 field_0;
+    u8 field_1;
+};
+
+static const struct YellowBlendStruct sUnknown_0860ADCC[] =
+{
+    {0, 1},
+    {1, 2},
+    {0, 15},
+    {1, 1},
+    {0, 15},
+    {1, 1},
+    {0, 15},
+    {1, 1},
+    {0, 1},
+    {1, 1},
+    {0, 1},
+    {1, 1},
+    {0, 1},
+    {1, 1},
+    {0, 1},
+    {1, 1},
+    {0, 1},
+    {1, 1},
+    {0, 1},
+    {0, 0xFF}
+};
+
+static const struct YellowBlendStruct sUnknown_0860AE1C[] =
+{
+    {0, 5},
+    {1, 1},
+    {0, 15},
+    {1, 4},
+    {0, 2},
+    {1, 2},
+    {0, 2},
+    {1, 2},
+    {0, 2},
+    {1, 2},
+    {0, 2},
+    {1, 2},
+    {0, 2},
+    {0, 0xFF}
+};
+
+static const struct YellowBlendStruct sUnknown_0860AE54[] =
+{
+    {0, 1},
+    {1, 1},
+    {0, 20},
+    {1, 1},
+    {0, 20},
+    {1, 1},
+    {0, 20},
+    {1, 1},
+    {0, 1},
+    {0, 0xFF}
+};
+
+static const struct YellowBlendStruct *const sUnknown_0860AE7C[] =
+{
+    sUnknown_0860ADCC,
+    sUnknown_0860AE1C,
+    sUnknown_0860AE54
+};
+
+static void BackAnimBlendYellow(struct Sprite *sprite)
+{
+    const struct YellowBlendStruct *array = sUnknown_0860AE7C[sprite->data[3]];
+    sub_8184770(sprite);
+    if (array[sprite->data[6]].field_1 == 0xFF)
+    {
+        sprite->pos2.x = 0;
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        if (sprite->data[4] == 1)
+        {
+            if (array[sprite->data[6]].field_0 != 0)
+                BlendPalette(sprite->data[7], 0x10, 0x10, 0x3FF);
+            else
+                BlendPalette(sprite->data[7], 0x10, 0, 0x3FF);
+
+            sprite->data[4] = 0;
+        }
+
+        if (array[sprite->data[6]].field_1 == sprite->data[5])
+        {
+            sprite->data[4] = 1;
+            sprite->data[5] = 0;
+            sprite->data[6]++;
+        }
+        else
+        {
+            sprite->data[5]++;
+        }
+    }
+}
+
+static void pokemonanimfunc_8B(struct Sprite *sprite)
+{
+    if (++sprite->data[2] == 1)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[6] = 0;
+        sprite->data[5] = 0;
+        sprite->data[4] = 0;
+        sprite->data[3] = 0;
+    }
+
+    BackAnimBlendYellow(sprite);
+}
+
+static void pokemonanimfunc_8C(struct Sprite *sprite)
+{
+    if (++sprite->data[2] == 1)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[6] = 0;
+        sprite->data[5] = 0;
+        sprite->data[4] = 0;
+        sprite->data[3] = 1;
+    }
+
+    BackAnimBlendYellow(sprite);
+}
+
+static void pokemonanimfunc_8D(struct Sprite *sprite)
+{
+    if (++sprite->data[2] == 1)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[6] = 0;
+        sprite->data[5] = 0;
+        sprite->data[4] = 0;
+        sprite->data[3] = 2;
+    }
+
+    BackAnimBlendYellow(sprite);
+}
+
+static const u16 sUnknown_0860AE88[] =
+{
+    0x1F, 0x3E0, 0x7C00, 0x0
+};
+
+static void BackAnimBlend(struct Sprite *sprite)
+{
+    if (sprite->data[2] > 127)
+    {
+        BlendPalette(sprite->data[7], 0x10, 0, 0x1F);
+        sprite->callback = SpriteCB_SetDummyOnAnimEnd;
+    }
+    else
+    {
+        sprite->data[6] = Sin(sprite->data[2], 12);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], sUnknown_0860AE88[sprite->data[1]]);
+    }
+}
+
+static void sub_8184934(struct Sprite *sprite)
+{
+    if (sprite->data[3] < sprite->data[4])
+    {
+        sub_817F70C(sprite);
+        if (sprite->data[5] > sprite->data[0])
+        {
+            if (++sprite->data[3] < sprite->data[4])
+                sprite->data[5] = 0;
+
+            sprite->pos2.x = 0;
+        }
+        else
+        {
+            s8 sign = 1 - (sprite->data[3] % 2 * 2);
+            sprite->pos2.x = sign * Sin((sprite->data[5] * 384 / sprite->data[0]) % 256, 6);
+            sprite->data[5]++;
+        }
+
+        sub_817F70C(sprite);
+    }
+}
+
+static void pokemonanimfunc_8E(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[0] = 10;
+        sprite->data[5] = 0;
+        sprite->data[4] = 2;
+        sprite->data[3] = 0;
+        sprite->data[1] = 0;
+    }
+
+    if (sprite->data[2] % 2 == 0)
+        BackAnimBlend(sprite);
+
+    if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+        sub_8184934(sprite);
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_8F(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[0] = 20;
+        sprite->data[5] = 0;
+        sprite->data[4] = 1;
+        sprite->data[3] = 0;
+        sprite->data[1] = 0;
+    }
+
+    if (sprite->data[2] % 2 == 0)
+        BackAnimBlend(sprite);
+
+    if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+        sub_8184934(sprite);
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_90(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[0] = 80;
+        sprite->data[5] = 0;
+        sprite->data[4] = 1;
+        sprite->data[3] = 0;
+        sprite->data[1] = 0;
+    }
+
+    if (sprite->data[2] % 2 == 0)
+        BackAnimBlend(sprite);
+
+    if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+        sub_8184934(sprite);
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_91(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[0] = 10;
+        sprite->data[5] = 0;
+        sprite->data[4] = 2;
+        sprite->data[3] = 0;
+        sprite->data[1] = 1;
+    }
+
+    if (sprite->data[2] % 2 == 0)
+        BackAnimBlend(sprite);
+
+    if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+        sub_8184934(sprite);
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_92(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[0] = 20;
+        sprite->data[5] = 0;
+        sprite->data[4] = 1;
+        sprite->data[3] = 0;
+        sprite->data[1] = 1;
+    }
+
+    if (sprite->data[2] % 2 == 0)
+        BackAnimBlend(sprite);
+
+    if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+        sub_8184934(sprite);
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_93(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[0] = 80;
+        sprite->data[5] = 0;
+        sprite->data[4] = 1;
+        sprite->data[3] = 0;
+        sprite->data[1] = 1;
+    }
+
+    if (sprite->data[2] % 2 == 0)
+        BackAnimBlend(sprite);
+
+    if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+        sub_8184934(sprite);
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_94(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[0] = 10;
+        sprite->data[5] = 0;
+        sprite->data[4] = 2;
+        sprite->data[3] = 0;
+        sprite->data[1] = 2;
+    }
+
+    if (sprite->data[2] % 2 == 0)
+        BackAnimBlend(sprite);
+
+    if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+        sub_8184934(sprite);
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_95(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[0] = 20;
+        sprite->data[5] = 0;
+        sprite->data[4] = 1;
+        sprite->data[3] = 0;
+        sprite->data[1] = 2;
+    }
+
+    if (sprite->data[2] % 2 == 0)
+        BackAnimBlend(sprite);
+
+    if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+        sub_8184934(sprite);
+
+    sprite->data[2]++;
+}
+
+static void pokemonanimfunc_96(struct Sprite *sprite)
+{
+    if (sprite->data[2] == 0)
+    {
+        sprite->data[7] = (sprite->oam.paletteNum * 16) + 256;
+        sprite->data[0] = 80;
+        sprite->data[5] = 0;
+        sprite->data[4] = 1;
+        sprite->data[3] = 0;
+        sprite->data[1] = 2;
+    }
+
+    if (sprite->data[2] % 2 == 0)
+        BackAnimBlend(sprite);
+
+    if (sprite->data[2] >= (128 - sprite->data[0] * sprite->data[4]) / 2)
+        sub_8184934(sprite);
+
+    sprite->data[2]++;
+}
+
+static void SpriteCB_SetDummyOnAnimEnd(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+        sprite->callback = SpriteCallbackDummy;
+}
-- 
cgit v1.2.3


From 78728ae454b6c184b69f4a8c145f32904d406f19 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 29 Jan 2018 14:36:13 +0100
Subject: add rgb constants

---
 src/battle_interface.c  | 15 ++++++++-------
 src/palette.c           |  1 +
 src/pokemon_animation.c | 49 +++++++++++++++++++++++++------------------------
 3 files changed, 34 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/battle_interface.c b/src/battle_interface.c
index 6a6bf00a2..da6f97942 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -20,6 +20,7 @@
 #include "international_string_util.h"
 #include "safari_zone.h"
 #include "battle_anim.h"
+#include "constants/rgb.h"
 
 struct TestingBar
 {
@@ -555,13 +556,13 @@ enum
     PAL_STATUS_BRN
 };
 
-static const u16 sStatusIconPalettes[] =
+static const u16 sStatusIconColors[] =
 {
-    0x6198, // PAL_STATUS_PSN
-    0xEF7, // PAL_STATUS_PAR
-    0x4694, // PAL_STATUS_SLP
-    0x72D1, // PAL_STATUS_FRZ
-    0x29DC // PAL_STATUS_BRN
+    RGB(24, 12, 24), // PAL_STATUS_PSN
+    RGB(23, 23, 3), // PAL_STATUS_PAR
+    RGB(20, 20, 17), // PAL_STATUS_SLP
+    RGB(17, 22, 28), // PAL_STATUS_FRZ
+    RGB(28, 14, 10) // PAL_STATUS_BRN
 };
 
 static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2
@@ -2071,7 +2072,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
     pltAdder = gSprites[healthboxSpriteId].oam.paletteNum * 16;
     pltAdder += bank + 12;
 
-    FillPalette(sStatusIconPalettes[statusPalId], pltAdder + 0x100, 2);
+    FillPalette(sStatusIconColors[statusPalId], pltAdder + 0x100, 2);
     CpuCopy16(gPlttBufferUnfaded + 0x100 + pltAdder, (void*)(OBJ_PLTT + pltAdder * 2), 2);
     CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * 32), 96);
     if (IsDoubleBattle() == TRUE || GetBankSide(bank) == SIDE_OPPONENT)
diff --git a/src/palette.c b/src/palette.c
index d7b6ad479..cc2046b14 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -4,6 +4,7 @@
 #include "decompress.h"
 #include "gpu_regs.h"
 #include "task.h"
+#include "constants/rgb.h"
 
 enum
 {
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index c8fcff93a..2bd4e3ef9 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -5,6 +5,7 @@
 #include "trig.h"
 #include "task.h"
 #include "blend_palette.h"
+#include "constants/rgb.h"
 
 struct UnkAnimStruct
 {
@@ -903,7 +904,7 @@ static void Task_HandleMonAnimation(u8 taskId)
         sprite->data[1] = 1;
         sprite->data[0] = 0;
 
-        for (i = 2; i < 8; i++)
+        for (i = 2; i < ARRAY_COUNT(sprite->data); i++)
             sprite->data[i] = 0;
 
         sprite->callback = sMonAnimFunctions[gTasks[taskId].tAnimId];
@@ -1588,13 +1589,13 @@ static void pokemonanimfunc_15(struct Sprite *sprite)
 
     if (sprite->data[2] > 128)
     {
-        BlendPalette(sprite->data[7], 0x10, 0, 0);
+        BlendPalette(sprite->data[7], 0x10, 0, RGB_BLACK);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
     {
         sprite->data[6] = Sin(sprite->data[2], 16);
-        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], RGB_BLACK);
     }
 
     sprite->data[2]++;
@@ -2050,13 +2051,13 @@ static void pokemonanimfunc_20(struct Sprite *sprite)
 
     if (sprite->data[2] > 128)
     {
-        BlendPalette(sprite->data[7], 0x10, 0, 0x2DF);
+        BlendPalette(sprite->data[7], 0x10, 0, RGB(31, 22, 0));
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
     {
         sprite->data[6] = Sin(sprite->data[2], 12);
-        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0x2DF);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], RGB(31, 22, 0));
     }
 
     sprite->data[2] += 2;
@@ -2069,13 +2070,13 @@ static void pokemonanimfunc_21(struct Sprite *sprite)
 
     if (sprite->data[2] > 128)
     {
-        BlendPalette(sprite->data[7], 0x10, 0, 0x1F);
+        BlendPalette(sprite->data[7], 0x10, 0, RGB_RED);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
     {
         sprite->data[6] = Sin(sprite->data[2], 12);
-        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0x1F);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], RGB_RED);
     }
 
     sprite->data[2] += 2;
@@ -2088,13 +2089,13 @@ static void pokemonanimfunc_22(struct Sprite *sprite)
 
     if (sprite->data[2] > 128)
     {
-        BlendPalette(sprite->data[7], 0x10, 0, 0x7C00);
+        BlendPalette(sprite->data[7], 0x10, 0, RGB_BLUE);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
     {
         sprite->data[6] = Sin(sprite->data[2], 12);
-        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0x7C00);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], RGB_BLUE);
     }
 
     sprite->data[2] += 2;
@@ -2107,13 +2108,13 @@ static void pokemonanimfunc_23(struct Sprite *sprite)
 
     if (sprite->data[2] > 128)
     {
-        BlendPalette(sprite->data[7], 0x10, 0, 0x3FF);
+        BlendPalette(sprite->data[7], 0x10, 0, RGB_YELLOW);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
     {
         sprite->data[6] = Sin(sprite->data[2], 12);
-        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0x3FF);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], RGB_YELLOW);
     }
 
     sprite->data[2] += 2;
@@ -2126,13 +2127,13 @@ static void pokemonanimfunc_24(struct Sprite *sprite)
 
     if (sprite->data[2] > 128)
     {
-        BlendPalette(sprite->data[7], 0x10, 0, 0x6018);
+        BlendPalette(sprite->data[7], 0x10, 0, RGB(24, 0, 24));
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
     {
         sprite->data[6] = Sin(sprite->data[2], 12);
-        BlendPalette(sprite->data[7], 0x10, sprite->data[6], 0x6018);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], RGB(24, 0, 24));
     }
 
     sprite->data[2] += 2;
@@ -2602,9 +2603,9 @@ static void pokemonanimfunc_2C(struct Sprite *sprite)
         if (sprite->data[4] == 1)
         {
             if (sUnknown_0860AA64[sprite->data[6]][0] != 0)
-                BlendPalette(sprite->data[7], 0x10, 0x10, 0x3FF);
+                BlendPalette(sprite->data[7], 0x10, 0x10, RGB_YELLOW);
             else
-                BlendPalette(sprite->data[7], 0x10, 0, 0x3FF);
+                BlendPalette(sprite->data[7], 0x10, 0, RGB_YELLOW);
 
             sprite->data[4] = 0;
         }
@@ -5357,9 +5358,9 @@ static void BackAnimBlendYellow(struct Sprite *sprite)
         if (sprite->data[4] == 1)
         {
             if (array[sprite->data[6]].field_0 != 0)
-                BlendPalette(sprite->data[7], 0x10, 0x10, 0x3FF);
+                BlendPalette(sprite->data[7], 0x10, 0x10, RGB_YELLOW);
             else
-                BlendPalette(sprite->data[7], 0x10, 0, 0x3FF);
+                BlendPalette(sprite->data[7], 0x10, 0, RGB_YELLOW);
 
             sprite->data[4] = 0;
         }
@@ -5419,22 +5420,22 @@ static void pokemonanimfunc_8D(struct Sprite *sprite)
     BackAnimBlendYellow(sprite);
 }
 
-static const u16 sUnknown_0860AE88[] =
-{
-    0x1F, 0x3E0, 0x7C00, 0x0
-};
-
 static void BackAnimBlend(struct Sprite *sprite)
 {
+    static const u16 sColors[] =
+    {
+        RGB_RED, RGB_GREEN, RGB_BLUE, RGB_BLACK
+    };
+
     if (sprite->data[2] > 127)
     {
-        BlendPalette(sprite->data[7], 0x10, 0, 0x1F);
+        BlendPalette(sprite->data[7], 0x10, 0, RGB_RED);
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
     else
     {
         sprite->data[6] = Sin(sprite->data[2], 12);
-        BlendPalette(sprite->data[7], 0x10, sprite->data[6], sUnknown_0860AE88[sprite->data[1]]);
+        BlendPalette(sprite->data[7], 0x10, sprite->data[6], sColors[sprite->data[1]]);
     }
 }
 
-- 
cgit v1.2.3


From d728124a7b51d5db257d58ae9b47a5285c696748 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 29 Jan 2018 15:55:34 +0100
Subject: decompile time events

---
 src/time_events.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 src/time_events.c

(limited to 'src')

diff --git a/src/time_events.c b/src/time_events.c
new file mode 100644
index 000000000..1f169a5c6
--- /dev/null
+++ b/src/time_events.c
@@ -0,0 +1,118 @@
+#include "global.h"
+#include "time_events.h"
+#include "event_data.h"
+#include "field_weather.h"
+#include "pokemon.h"
+#include "random.h"
+#include "overworld.h"
+#include "rtc.h"
+#include "script.h"
+#include "task.h"
+
+static u32 GetMirageRnd(void)
+{
+    u32 hi = VarGet(VAR_MIRAGE_RND_H);
+    u32 lo = VarGet(VAR_MIRAGE_RND_L);
+    return (hi << 16) | lo;
+}
+
+static void SetMirageRnd(u32 rnd)
+{
+    VarSet(VAR_MIRAGE_RND_H, rnd >> 16);
+    VarSet(VAR_MIRAGE_RND_L, rnd);
+}
+
+// unused
+void InitMirageRnd(void)
+{
+    SetMirageRnd((Random() << 16) | Random());
+}
+
+void UpdateMirageRnd(u16 days)
+{
+    s32 rnd = GetMirageRnd();
+    while (days)
+    {
+        rnd = 1103515245 * rnd + 12345;
+        days--;
+    }
+    SetMirageRnd(rnd);
+}
+
+bool8 IsMirageIslandPresent(void)
+{
+    u16 rnd = GetMirageRnd() >> 16;
+    int i;
+
+    for (i = 0; i < PARTY_SIZE; i++)
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) && (GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY) & 0xFFFF) == rnd)
+            return TRUE;
+
+    return FALSE;
+}
+
+void UpdateShoalTideFlag(void)
+{
+    static const u8 tide[] =
+    {
+        1, // 00
+        1, // 01
+        1, // 02
+        0, // 03
+        0, // 04
+        0, // 05
+        0, // 06
+        0, // 07
+        0, // 08
+        1, // 09
+        1, // 10
+        1, // 11
+        1, // 12
+        1, // 13
+        1, // 14
+        0, // 15
+        0, // 16
+        0, // 17
+        0, // 18
+        0, // 19
+        0, // 20
+        1, // 21
+        1, // 22
+        1, // 23
+    };
+
+    if (is_light_level_1_2_3_5_or_6(get_map_light_from_warp0()))
+    {
+        RtcCalcLocalTime();
+        if (tide[gLocalTime.hours])
+            FlagSet(FLAG_SYS_SHOAL_TIDE);
+        else
+            FlagClear(FLAG_SYS_SHOAL_TIDE);
+    }
+}
+
+static void Task_WaitWeather(u8 taskId)
+{
+    if (IsWeatherChangeComplete())
+    {
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+    }
+}
+
+void WaitWeather(void)
+{
+    CreateTask(Task_WaitWeather, 80);
+}
+
+void InitBirchState(void)
+{
+    *GetVarPointer(VAR_BIRCH_STATE) = 0;
+}
+
+void UpdateBirchState(u16 days)
+{
+    u16 *state = GetVarPointer(VAR_BIRCH_STATE);
+    *state += days;
+    *state %= 7;
+}
-- 
cgit v1.2.3


From 76fc1d1c129fa1aa01bd51d44ba1aa780f69f9cf Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 29 Jan 2018 16:25:09 +0100
Subject: make time events compile

---
 src/decoration.c  | 10 +++++-----
 src/egg_hatch.c   |  4 ++--
 src/scrcmd.c      | 10 +++++-----
 src/secret_base.c |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/decoration.c b/src/decoration.c
index a9777c86f..68a455285 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -529,7 +529,7 @@ void SecretBasePC_PutAway(u8 taskId)
     {
         sub_8126A58(0);
         sub_8197434(0, 0);
-        fade_screen(1, 0);
+        FadeScreen(1, 0);
         gTasks[taskId].data[2] = 0;
         gTasks[taskId].func = sub_8129ABC;
     }
@@ -1247,7 +1247,7 @@ void sub_8127F68(u8 taskId)
     {
         if (sub_8127F38() == TRUE)
         {
-            fade_screen(1, 0);
+            FadeScreen(1, 0);
             gTasks[taskId].data[2] = 0;
             gTasks[taskId].func = sub_8128060;
         }
@@ -1661,7 +1661,7 @@ void sub_8128BA0(u8 taskId)
 
 void sub_8128BBC(u8 taskId)
 {
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = c1_overworld_prev_quest;
 }
@@ -2635,7 +2635,7 @@ void sub_812A1A0(u8 taskId)
 
 void sub_812A1C0(u8 taskId)
 {
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = sub_81298EC;
 }
@@ -2654,7 +2654,7 @@ void sub_812A210(u8 taskId)
 
 void sub_812A22C(u8 taskId)
 {
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = sub_812A25C;
 }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 435886638..e8f22e903 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -61,7 +61,7 @@ extern u8 sav1_map_get_name(void);
 extern s8 ProcessMenuInputNoWrap_(void);
 extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8);
 extern void sub_806A068(u16, u8);
-extern void fade_screen(u8, u8);
+extern void FadeScreen(u8, u8);
 extern void overworld_free_bg_tilemaps(void);
 extern void sub_80AF168(void);
 extern void AllocateMonSpritesGfx(void);
@@ -465,7 +465,7 @@ void EggHatch(void)
 {
     ScriptContext2_Enable();
     CreateTask(Task_EggHatch, 10);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
 }
 
 static void Task_EggHatch(u8 taskID)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 0557cd95e..1768f0d4c 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -638,7 +638,7 @@ static bool8 IsPaletteNotActive(void)
 
 bool8 ScrCmd_fadescreen(struct ScriptContext *ctx)
 {
-    fade_screen(ScriptReadByte(ctx), 0);
+    FadeScreen(ScriptReadByte(ctx), 0);
     SetupNativeScript(ctx, IsPaletteNotActive);
     return TRUE;
 }
@@ -648,7 +648,7 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx)
     u8 mode = ScriptReadByte(ctx);
     u8 speed = ScriptReadByte(ctx);
 
-    fade_screen(mode, speed);
+    FadeScreen(mode, speed);
     SetupNativeScript(ctx, IsPaletteNotActive);
     return TRUE;
 }
@@ -662,12 +662,12 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
         case 1:
         default:
             CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE);
-            fade_screen(mode, 0);
+            FadeScreen(mode, 0);
             break;
         case 0:
         case 2:
             CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE);
-            fade_screen(mode, 0);
+            FadeScreen(mode, 0);
             break;
     }
 
@@ -726,7 +726,7 @@ bool8 ScrCmd_setweather(struct ScriptContext *ctx)
 
 bool8 ScrCmd_resetweather(struct ScriptContext *ctx)
 {
-    sub_80AEDBC();
+    SetSav1WeatherFromCurrMapHeader();
     return FALSE;
 }
 
diff --git a/src/secret_base.c b/src/secret_base.c
index bf6bec1f8..61c2511b7 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -394,7 +394,7 @@ void sub_80E8FD0(u8 taskId)
 void sub_80E9068(void)
 {
     CreateTask(sub_80E8FD0, 0);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
 
@@ -451,7 +451,7 @@ void sub_80E916C(u8 taskId)
 void sub_80E91F8(void)
 {
     CreateTask(sub_80E916C, 0);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
 }
 
 bool8 CurrentMapIsSecretBase(void)
@@ -651,7 +651,7 @@ void sub_80E96A4(u8 taskId)
 void sub_80E9728(void)
 {
     CreateTask(sub_80E96A4, 0);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
 }
 
 void sub_80E9744(void)
-- 
cgit v1.2.3


From e6fb626c1fddb2f696b26219156d2591867295e7 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 29 Jan 2018 16:46:56 +0100
Subject: decompile_coord_event_weather

---
 src/coord_event_weather.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 src/coord_event_weather.c

(limited to 'src')

diff --git a/src/coord_event_weather.c b/src/coord_event_weather.c
new file mode 100644
index 000000000..60b87fa30
--- /dev/null
+++ b/src/coord_event_weather.c
@@ -0,0 +1,119 @@
+#include "global.h"
+#include "constants/weather.h"
+#include "coord_event_weather.h"
+#include "field_weather.h"
+
+struct CoordEventWeather
+{
+    u8 coordEventWeather;
+    void (*func)(void);
+};
+
+static void CoordEventWeather_Clouds(void);
+static void CoordEventWeather_Sunny(void);
+static void CoordEventWeather_LightRain(void);
+static void CoordEventWeather_Snow(void);
+static void CoordEventWeather_Thunderstorm(void);
+static void CoordEventWeather_Fog(void);
+static void CoordEventWeather_DiagonalFog(void);
+static void CoordEventWeather_Ash(void);
+static void CoordEventWeather_Sandstorm(void);
+static void CoordEventWeather_Dark(void);
+static void CoordEventWeather_Drought(void);
+static void CoordEventWeather_Route119Cycle(void);
+static void CoordEventWeather_Route123Cycle(void);
+
+static const struct CoordEventWeather sCoordEventWeatherFuncs[] =
+{
+    { COORD_EVENT_WEATHER_CLOUDS, CoordEventWeather_Clouds },
+    { COORD_EVENT_WEATHER_SUNNY, CoordEventWeather_Sunny },
+    { COORD_EVENT_WEATHER_RAIN_LIGHT, CoordEventWeather_LightRain },
+    { COORD_EVENT_WEATHER_SNOW, CoordEventWeather_Snow },
+    { COORD_EVENT_WEATHER_RAIN_MED, CoordEventWeather_Thunderstorm },
+    { COORD_EVENT_WEATHER_FOG_1, CoordEventWeather_Fog },
+    { COORD_EVENT_WEATHER_FOG_2, CoordEventWeather_DiagonalFog },
+    { COORD_EVENT_WEATHER_ASH, CoordEventWeather_Ash },
+    { COORD_EVENT_WEATHER_SANDSTORM, CoordEventWeather_Sandstorm },
+    { COORD_EVENT_WEATHER_SHADE, CoordEventWeather_Dark },
+    { COORD_EVENT_WEATHER_DROUGHT, CoordEventWeather_Drought },
+    { COORD_EVENT_WEATHER_ROUTE119_CYCLE, CoordEventWeather_Route119Cycle },
+    { COORD_EVENT_WEATHER_ROUTE123_CYCLE, CoordEventWeather_Route123Cycle },
+};
+
+static void CoordEventWeather_Clouds(void)
+{
+    SetWeather(WEATHER_CLOUDS);
+}
+
+static void CoordEventWeather_Sunny(void)
+{
+    SetWeather(WEATHER_SUNNY);
+}
+
+static void CoordEventWeather_LightRain(void)
+{
+    SetWeather(WEATHER_RAIN_LIGHT);
+}
+
+static void CoordEventWeather_Snow(void)
+{
+    SetWeather(WEATHER_SNOW);
+}
+
+static void CoordEventWeather_Thunderstorm(void)
+{
+    SetWeather(WEATHER_RAIN_MED);
+}
+
+static void CoordEventWeather_Fog(void)
+{
+    SetWeather(WEATHER_FOG_1);
+}
+
+static void CoordEventWeather_DiagonalFog(void)
+{
+    SetWeather(WEATHER_FOG_2);
+}
+
+static void CoordEventWeather_Ash(void)
+{
+    SetWeather(WEATHER_ASH);
+}
+
+static void CoordEventWeather_Sandstorm(void)
+{
+    SetWeather(WEATHER_SANDSTORM);
+}
+
+static void CoordEventWeather_Dark(void)
+{
+    SetWeather(WEATHER_SHADE);
+}
+
+static void CoordEventWeather_Drought(void)
+{
+    SetWeather(WEATHER_DROUGHT);
+}
+
+static void CoordEventWeather_Route119Cycle(void)
+{
+    SetWeather(WEATHER_ROUTE119_CYCLE);
+}
+
+static void CoordEventWeather_Route123Cycle(void)
+{
+    SetWeather(WEATHER_ROUTE123_CYCLE);
+}
+
+void DoCoordEventWeather(u8 coordEventWeather)
+{
+    u8 i;
+    for (i = 0; i < ARRAY_COUNT(sCoordEventWeatherFuncs); i++)
+    {
+        if (sCoordEventWeatherFuncs[i].coordEventWeather == coordEventWeather)
+        {
+            sCoordEventWeatherFuncs[i].func();
+            return;
+        }
+    }
+}
-- 
cgit v1.2.3


From db3ecf5012612ed08aab55f4a8993afea74a4216 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 29 Jan 2018 17:47:12 +0100
Subject: decompile scanline effect

---
 src/battle_2.c             |  45 +++-----
 src/battle_transition.c    | 258 ++++++++++++++++++++++----------------------
 src/berry_fix_program.c    |   2 +-
 src/diploma.c              |   2 +-
 src/evolution_scene.c      |   6 +-
 src/hall_of_fame.c         |   2 +-
 src/mail.c                 |   2 +-
 src/option_menu.c          |   2 +-
 src/pokeblock.c            |   2 +-
 src/reshow_battle_screen.c |   6 +-
 src/scanline_effect.c      | 262 +++++++++++++++++++++++++++++++++++++++++++++
 src/use_pokeblock.c        |   4 +-
 src/wallclock.c            |   2 +-
 13 files changed, 422 insertions(+), 173 deletions(-)
 create mode 100644 src/scanline_effect.c

(limited to 'src')

diff --git a/src/battle_2.c b/src/battle_2.c
index 61e39b39f..4ff2bd19a 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -4,7 +4,7 @@
 #include "main.h"
 #include "load_save.h"
 #include "gpu_regs.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "battle_setup.h"
 #include "battle_scripts.h"
 #include "pokemon.h"
@@ -46,13 +46,6 @@
 #include "battle_string_ids.h"
 #include "data2.h"
 
-struct UnknownStruct6
-{
-    u16 unk0[0xA0];
-    u8 fillerA0[0x640];
-    u16 unk780[0xA0];
-};
-
 struct UnknownPokemonStruct2
 {
     /*0x00*/ u16 species;
@@ -90,8 +83,6 @@ extern void (*gBattleMainFunc)(void);
 extern void (*gCB2_AfterEvolution)(void);
 extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for?
 extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
-extern u8 gUnknown_02039B28[]; // possibly a struct?
-extern struct UnknownStruct6 gUnknown_02038C28; // todo: identify & document
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern u8 gDecompressionBuffer[];
@@ -162,6 +153,7 @@ extern const u8 * const gBattlescriptsForBallThrow[];
 extern const u8 * const gBattlescriptsForRunningByItem[];
 extern const u8 * const gBattlescriptsForUsingItem[];
 extern const u8 * const gBattlescriptsForSafariActions[];
+extern const struct ScanlineEffectParams gUnknown_0831AC70;
 
 // strings
 extern const u8 gText_LinkStandby3[];
@@ -180,7 +172,7 @@ extern const u8 gText_Confusion[];
 extern const u8 gText_Love[];
 
 // functions
-extern void dp12_8087EA4(void);
+extern void ScanlineEffect_Clear(void);
 extern void sub_80356D0(void);
 extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower
 extern void sub_8166188(void); // battle tower, sets link battle mons level but why?
@@ -383,24 +375,21 @@ static void CB2_InitBattleInternal(void)
     else
     {
         gBattle_WIN0V = 0x5051;
-        dp12_8087EA4();
+        ScanlineEffect_Clear();
 
         for (i = 0; i < 80; i++)
         {
-            gUnknown_02038C28.unk0[i] = 0xF0;
-            gUnknown_02038C28.unk780[i] = 0xF0;
+            gScanlineEffectRegBuffers[0][i] = 0xF0;
+            gScanlineEffectRegBuffers[1][i] = 0xF0;
         }
         for (i = 80; i < 160; i++)
         {
-            #ifndef NONMATCHING
-                asm(""::"r"(i)); // needed to match
-            #endif // NONMATCHING
-
-            gUnknown_02038C28.unk0[i] = 0xFF10;
-            gUnknown_02038C28.unk780[i] = 0xFF10;
+            asm(""::"r"(i));
+            gScanlineEffectRegBuffers[0][i] = 0xFF10;
+            gScanlineEffectRegBuffers[1][i] = 0xFF10;
         }
 
-        sub_80BA038(gUnknown_0831AC70);
+        ScanlineEffect_SetParams(gUnknown_0831AC70);
     }
 
     ResetPaletteFade();
@@ -1596,7 +1585,7 @@ void BattleMainCB2(void)
 static void FreeRestoreBattleData(void)
 {
     gMain.callback1 = gPreBattleCallback1;
-    gUnknown_02039B28[0x15] = 3;
+    gScanlineEffect.state = 3;
     gMain.inBattle = 0;
     ZeroEnemyPartyMons();
     m4aSongNumStop(0x5A);
@@ -1814,7 +1803,7 @@ void VBlankCB_Battle(void)
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
-    sub_80BA0A8();
+    ScanlineEffect_InitHBlankDmaTransfer();
 }
 
 void nullsub_17(void)
@@ -1952,18 +1941,18 @@ void sub_8038D64(void)
         SetGpuReg(REG_OFFSET_WINOUT, 0);
         gBattle_WIN0H = 0xF0;
         gBattle_WIN0V = 0x5051;
-        dp12_8087EA4();
+        ScanlineEffect_Clear();
 
         for (i = 0; i < 80; i++)
         {
-            gUnknown_02038C28.unk0[i] = 0xF0;
-            gUnknown_02038C28.unk780[i] = 0xF0;
+            gScanlineEffectRegBuffers[0][i] = 0xF0;
+            gScanlineEffectRegBuffers[1][i] = 0xF0;
         }
         for (i = 80; i < 160; i++)
         {
             asm(""::"r"(i));  // Needed to stop the compiler from optimizing out the loop counter
-            gUnknown_02038C28.unk0[i] = 0xFF10;
-            gUnknown_02038C28.unk780[i] = 0xFF10;
+            gScanlineEffectRegBuffers[0][i] = 0xFF10;
+            gScanlineEffectRegBuffers[1][i] = 0xFF10;
         }
 
         ResetPaletteFade();
diff --git a/src/battle_transition.c b/src/battle_transition.c
index e003e0fce..0ff8cd903 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -14,7 +14,7 @@
 #include "constants/songs.h"
 #include "constants/trainers.h"
 #include "field_camera.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "malloc.h"
 #include "gpu_regs.h"
 #include "decompress.h"
@@ -56,8 +56,6 @@ struct StructRectangularSpiral
 typedef bool8 (*TransitionStateFunc)(struct Task *task);
 typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite);
 
-extern u16 gUnknown_020393A8[];
-extern u16 gUnknown_02038C28[][0x3C0];
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 
@@ -65,7 +63,7 @@ extern const struct OamData gFieldObjectBaseOam_32x32;
 
 extern void c2_exit_to_overworld_2_switch(void);
 extern void sub_80AC3D0(void);
-extern void dp12_8087EA4(void);
+extern void ScanlineEffect_Clear(void);
 
 // this file's functions
 static void LaunchBattleTransitionTask(u8 transitionId);
@@ -1110,9 +1108,9 @@ static void Phase2Task_Swirl(u8 taskId)
 static bool8 Phase2_Swirl_Func1(struct Task *task)
 {
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
     BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
-    sub_8149F98(gUnknown_020393A8, sTransitionStructPtr->field_14, 0, 2, 0, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_14, 0, 2, 0, 160);
 
     SetVBlankCallback(VBlankCB_Phase2_Swirl);
     SetHBlankCallback(HBlankCB_Phase2_Swirl);
@@ -1129,7 +1127,7 @@ static bool8 Phase2_Swirl_Func2(struct Task *task)
     task->tData1 += 4;
     task->tData2 += 8;
 
-    sub_8149F98(gUnknown_02038C28[0], sTransitionStructPtr->field_14, task->tData1, 2, task->tData2, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], sTransitionStructPtr->field_14, task->tData1, 2, task->tData2, 160);
 
     if (!gPaletteFade.active)
     {
@@ -1145,12 +1143,12 @@ static void VBlankCB_Phase2_Swirl(void)
 {
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320);
 }
 
 static void HBlankCB_Phase2_Swirl(void)
 {
-    u16 var = gUnknown_02038C28[1][REG_VCOUNT];
+    u16 var = gScanlineEffectRegBuffers[1][REG_VCOUNT];
     REG_BG1HOFS = var;
     REG_BG2HOFS = var;
     REG_BG3HOFS = var;
@@ -1164,10 +1162,10 @@ static void Phase2Task_Shuffle(u8 taskId)
 static bool8 Phase2_Shuffle_Func1(struct Task *task)
 {
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
-    memset(gUnknown_020393A8, sTransitionStructPtr->field_16, 0x140);
+    memset(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_16, 0x140);
 
     SetVBlankCallback(VBlankCB_Phase2_Shuffle);
     SetHBlankCallback(HBlankCB_Phase2_Shuffle);
@@ -1192,7 +1190,7 @@ static bool8 Phase2_Shuffle_Func2(struct Task *task)
     for (i = 0; i < 160; i++, r4 += 4224)
     {
         u16 var = r4 / 256;
-        gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3);
+        gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3);
     }
 
     if (!gPaletteFade.active)
@@ -1206,12 +1204,12 @@ static void VBlankCB_Phase2_Shuffle(void)
 {
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320);
 }
 
 static void HBlankCB_Phase2_Shuffle(void)
 {
-    u16 var = gUnknown_02038C28[1][REG_VCOUNT];
+    u16 var = gScanlineEffectRegBuffers[1][REG_VCOUNT];
     REG_BG1VOFS = var;
     REG_BG2VOFS = var;
     REG_BG3VOFS = var;
@@ -1257,7 +1255,7 @@ static void sub_814669C(struct Task *task)
     s32 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     task->tData1 = 16;
     task->tData2 = 0;
@@ -1272,7 +1270,7 @@ static void sub_814669C(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        gUnknown_02038C28[1][i] = 240;
+        gScanlineEffectRegBuffers[1][i] = 240;
     }
 
     SetVBlankCallback(VBlankCB0_Phase2_BigPokeball);
@@ -1351,7 +1349,7 @@ static bool8 Phase2_BigPokeball_Func2(struct Task *task)
             dst1[i * 32 + j] = *BigPokeballMap | 0xF000;
         }
     }
-    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return TRUE;
@@ -1363,7 +1361,7 @@ static bool8 Phase2_Aqua_Func2(struct Task *task)
 
     sub_8149F58(&dst1, &dst2);
     LZ77UnCompVram(sTeamAqua_Tilemap, dst1);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return FALSE;
@@ -1375,7 +1373,7 @@ static bool8 Phase2_Magma_Func2(struct Task *task)
 
     sub_8149F58(&dst1, &dst2);
     LZ77UnCompVram(sTeamMagma_Tilemap, dst1);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return FALSE;
@@ -1388,7 +1386,7 @@ static bool8 Phase2_Regice_Func2(struct Task *task)
     sub_8149F58(&dst1, &dst2);
     LoadPalette(gUnknown_085BC2B4, 0xF0, 0x20);
     CpuCopy16(gUnknown_085BC314, dst1, 0x500);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return FALSE;
@@ -1401,7 +1399,7 @@ static bool8 Phase2_Registeel_Func2(struct Task *task)
     sub_8149F58(&dst1, &dst2);
     LoadPalette(gUnknown_085BC2D4, 0xF0, 0x20);
     CpuCopy16(gUnknown_085BCB14, dst1, 0x500);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return FALSE;
@@ -1414,7 +1412,7 @@ static bool8 Phase2_Regirock_Func2(struct Task *task)
     sub_8149F58(&dst1, &dst2);
     LoadPalette(gUnknown_085BC2F4, 0xF0, 0x20);
     CpuCopy16(gUnknown_085BD314, dst1, 0x500);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 132, task->tData5, 160);
 
     task->tState++;
     return FALSE;
@@ -1499,7 +1497,7 @@ static bool8 Phase2_BigPokeball_Func3(struct Task *task)
     task->tData4 += 8;
     task->tData5 -= 256;
 
-    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5 >> 8, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 132, task->tData5 >> 8, 160);
 
     sTransitionStructPtr->VBlank_DMA++;
     return FALSE;
@@ -1519,7 +1517,7 @@ static bool8 Phase2_BigPokeball_Func4(struct Task *task)
     task->tData4 += 8;
     task->tData5 -= 256;
 
-    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5 >> 8, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 132, task->tData5 >> 8, 160);
 
     sTransitionStructPtr->VBlank_DMA++;
     return FALSE;
@@ -1531,7 +1529,7 @@ static bool8 Phase2_BigPokeball_Func5(struct Task *task)
     task->tData4 += 8;
     task->tData5 -= 256;
 
-    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 132, task->tData5 >> 8, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 132, task->tData5 >> 8, 160);
 
     if (task->tData5 <= 0)
     {
@@ -1577,7 +1575,7 @@ static bool8 Phase2_BigPokeball_Func6(struct Task *task)
         if (task->tData1 < 0)
             task->tData1 = 0;
     }
-    sub_814A014(gUnknown_02038C28[0], 120, 80, task->tData1);
+    sub_814A014(gScanlineEffectRegBuffers[0], 120, 80, task->tData1);
     if (task->tData1 == 0)
     {
         SetVBlankCallback(NULL);
@@ -1604,7 +1602,7 @@ static void Transition_BigPokeball_Vblank(void)
     DmaStop(0);
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320);
     REG_WININ = sTransitionStructPtr->WININ;
     REG_WINOUT = sTransitionStructPtr->WINOUT;
     REG_WIN0V = sTransitionStructPtr->WIN0V;
@@ -1615,13 +1613,13 @@ static void Transition_BigPokeball_Vblank(void)
 static void VBlankCB0_Phase2_BigPokeball(void)
 {
     Transition_BigPokeball_Vblank();
-    DmaSet(0, gUnknown_020393A8, &REG_BG0HOFS, 0xA2400001);
+    DmaSet(0, gScanlineEffectRegBuffers[1], &REG_BG0HOFS, 0xA2400001);
 }
 
 static void VBlankCB1_Phase2_BigPokeball(void)
 {
     Transition_BigPokeball_Vblank();
-    DmaSet(0, gUnknown_020393A8, &REG_WIN0H, 0xA2400001);
+    DmaSet(0, gScanlineEffectRegBuffers[1], &REG_WIN0H, 0xA2400001);
 }
 
 static void Phase2Task_PokeballsTrail(u8 taskId)
@@ -1741,7 +1739,7 @@ static bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task)
     u16 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     sTransitionStructPtr->WININ = 0;
     sTransitionStructPtr->WINOUT = 63;
@@ -1750,7 +1748,7 @@ static bool8 Phase2_Clockwise_BlackFade_Func1(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        gUnknown_020393A8[i] = 0xF3F4;
+        gScanlineEffectRegBuffers[1][i] = 0xF3F4;
     }
 
     SetVBlankCallback(VBlankCB_Phase2_Clockwise_BlackFade);
@@ -1767,7 +1765,7 @@ static bool8 Phase2_Clockwise_BlackFade_Func2(struct Task *task)
     sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], -1, 1, 1);
     do
     {
-        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (sTransitionStructPtr->data[2] + 1) | 0x7800;
+        gScanlineEffectRegBuffers[0][sTransitionStructPtr->data[3]] = (sTransitionStructPtr->data[2] + 1) | 0x7800;
     } while (!sub_814A228(sTransitionStructPtr->data, 1, 1));
 
     sTransitionStructPtr->data[4] += 16;
@@ -1795,7 +1793,7 @@ static bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task)
         r1 = 120, r3 = sTransitionStructPtr->data[2] + 1;
         if (sTransitionStructPtr->data[5] >= 80)
             r1 = sTransitionStructPtr->data[2], r3 = 240;
-        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (r3) | (r1 << 8);
+        gScanlineEffectRegBuffers[0][sTransitionStructPtr->data[3]] = (r3) | (r1 << 8);
         if (var != 0)
             break;
         var = sub_814A228(sTransitionStructPtr->data, 1, 1);
@@ -1811,7 +1809,7 @@ static bool8 Phase2_Clockwise_BlackFade_Func3(struct Task *task)
     {
         while (sTransitionStructPtr->data[3] < sTransitionStructPtr->data[5])
         {
-            gUnknown_02038C28[0][++sTransitionStructPtr->data[3]] = (r3) | (r1 << 8);
+            gScanlineEffectRegBuffers[0][++sTransitionStructPtr->data[3]] = (r3) | (r1 << 8);
         }
     }
 
@@ -1826,7 +1824,7 @@ static bool8 Phase2_Clockwise_BlackFade_Func4(struct Task *task)
     sub_814A1AC(sTransitionStructPtr->data, 120, 80, sTransitionStructPtr->data[4], 160, 1, 1);
     do
     {
-        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (sTransitionStructPtr->data[2] << 8) | 0xF0;
+        gScanlineEffectRegBuffers[0][sTransitionStructPtr->data[3]] = (sTransitionStructPtr->data[2] << 8) | 0xF0;
     } while (!sub_814A228(sTransitionStructPtr->data, 1, 1));
 
     sTransitionStructPtr->data[4] -= 16;
@@ -1851,12 +1849,12 @@ static bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task)
 
     while (1)
     {
-        r1 = (gUnknown_02038C28[0][sTransitionStructPtr->data[3]]) & 0xFF;
+        r1 = (gScanlineEffectRegBuffers[0][sTransitionStructPtr->data[3]]) & 0xFF;
         r2 = sTransitionStructPtr->data[2];
         if (sTransitionStructPtr->data[5] <= 80)
             r2 = 120, r1 = sTransitionStructPtr->data[2];
         var4 = (r1) | (r2 << 8);
-        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = var4;
+        gScanlineEffectRegBuffers[0][sTransitionStructPtr->data[3]] = var4;
         if (var != 0)
             break;
         var = sub_814A228(sTransitionStructPtr->data, 1, 1);
@@ -1872,7 +1870,7 @@ static bool8 Phase2_Clockwise_BlackFade_Func5(struct Task *task)
     {
         while (sTransitionStructPtr->data[3] > sTransitionStructPtr->data[5])
         {
-            gUnknown_02038C28[0][--sTransitionStructPtr->data[3]] = (r1) | (r2 << 8);
+            gScanlineEffectRegBuffers[0][--sTransitionStructPtr->data[3]] = (r1) | (r2 << 8);
         }
     }
 
@@ -1892,7 +1890,7 @@ static bool8 Phase2_Clockwise_BlackFade_Func6(struct Task *task)
         r2 = 120, r3 = sTransitionStructPtr->data[2];
         if (sTransitionStructPtr->data[2] >= 120)
             r2 = 0, r3 = 240;
-        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (r3) | (r2 << 8);
+        gScanlineEffectRegBuffers[0][sTransitionStructPtr->data[3]] = (r3) | (r2 << 8);
 
     } while (!sub_814A228(sTransitionStructPtr->data, 1, 1));
 
@@ -1917,12 +1915,12 @@ static void VBlankCB_Phase2_Clockwise_BlackFade(void)
     DmaStop(0);
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA != 0)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320);
     REG_WININ = sTransitionStructPtr->WININ;
     REG_WINOUT = sTransitionStructPtr->WINOUT;
     REG_WIN0V = sTransitionStructPtr->WIN0V;
-    REG_WIN0H = gUnknown_02038C28[1][0];
-    DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
+    REG_WIN0H = gScanlineEffectRegBuffers[1][0];
+    DmaSet(0, gScanlineEffectRegBuffers[1], &REG_WIN0H, 0xA2400001);
 }
 
 static void Phase2Task_Ripple(u8 taskId)
@@ -1935,11 +1933,11 @@ static bool8 Phase2_Ripple_Func1(struct Task *task)
     u8 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     for (i = 0; i < 160; i++)
     {
-        gUnknown_020393A8[i] = sTransitionStructPtr->field_16;
+        gScanlineEffectRegBuffers[1][i] = sTransitionStructPtr->field_16;
     }
 
     SetVBlankCallback(VBlankCB_Phase2_Ripple);
@@ -1971,7 +1969,7 @@ static bool8 Phase2_Ripple_Func2(struct Task *task)
         // todo: fix the asm
         s16 var = r4 >> 8;
         asm("");
-        gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3);
+        gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3);
     }
 
     if (++task->tData3 == 81)
@@ -1991,12 +1989,12 @@ static void VBlankCB_Phase2_Ripple(void)
 {
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320);
 }
 
 static void HBlankCB_Phase2_Ripple(void)
 {
-    u16 var = gUnknown_02038C28[1][REG_VCOUNT];
+    u16 var = gScanlineEffectRegBuffers[1][REG_VCOUNT];
     REG_BG1VOFS = var;
     REG_BG2VOFS = var;
     REG_BG3VOFS = var;
@@ -2012,7 +2010,7 @@ static bool8 Phase2_Wave_Func1(struct Task *task)
     u8 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     sTransitionStructPtr->WININ = 63;
     sTransitionStructPtr->WINOUT = 0;
@@ -2021,7 +2019,7 @@ static bool8 Phase2_Wave_Func1(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        gUnknown_02038C28[1][i] = 242;
+        gScanlineEffectRegBuffers[1][i] = 242;
     }
 
     SetVBlankCallback(VBlankCB_Phase2_Wave);
@@ -2037,7 +2035,7 @@ static bool8 Phase2_Wave_Func2(struct Task *task)
     bool8 nextFunc;
 
     sTransitionStructPtr->VBlank_DMA = FALSE;
-    toStore = gUnknown_02038C28[0];
+    toStore = gScanlineEffectRegBuffers[0];
     r5 = task->tData2;
     task->tData2 += 16;
     task->tData1 += 8;
@@ -2073,11 +2071,11 @@ static void VBlankCB_Phase2_Wave(void)
     DmaStop(0);
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA != 0)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320);
     REG_WININ = sTransitionStructPtr->WININ;
     REG_WINOUT = sTransitionStructPtr->WINOUT;
     REG_WIN0V = sTransitionStructPtr->WIN0V;
-    DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
+    DmaSet(0, gScanlineEffectRegBuffers[1], &REG_WIN0H, 0xA2400001);
 }
 
 static void Phase2Task_Sydney(u8 taskId)
@@ -2120,7 +2118,7 @@ static bool8 Phase2_Mugshot_Func1(struct Task *task)
     u8 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
     Mugshots_CreateOpponentPlayerSprites(task);
 
     task->tData1 = 0;
@@ -2132,7 +2130,7 @@ static bool8 Phase2_Mugshot_Func1(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        gUnknown_02038C28[1][i] = 0xF0F1;
+        gScanlineEffectRegBuffers[1][i] = 0xF0F1;
     }
 
     SetVBlankCallback(VBlankCB0_Phase2_Mugshots);
@@ -2177,7 +2175,7 @@ static bool8 Phase2_Mugshot_Func3(struct Task *task)
 
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
-    toStore = gUnknown_02038C28[0];
+    toStore = gScanlineEffectRegBuffers[0];
     r5 = task->tData1;
     task->tData1 += 0x10;
 
@@ -2223,7 +2221,7 @@ static bool8 Phase2_Mugshot_Func4(struct Task *task)
 
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
-    for (i = 0, toStore = gUnknown_02038C28[0]; i < 160; i++, toStore++)
+    for (i = 0, toStore = gScanlineEffectRegBuffers[0]; i < 160; i++, toStore++)
     {
         *toStore = 0xF0;
     }
@@ -2266,8 +2264,8 @@ static bool8 Phase2_Mugshot_Func6(struct Task *task)
         sTransitionStructPtr->VBlank_DMA = FALSE;
         SetVBlankCallback(NULL);
         DmaStop(0);
-        memset(gUnknown_02038C28[0], 0, 0x140);
-        memset(gUnknown_02038C28[1], 0, 0x140);
+        memset(gScanlineEffectRegBuffers[0], 0, 0x140);
+        memset(gScanlineEffectRegBuffers[1], 0, 0x140);
         SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
         SetGpuReg(REG_OFFSET_BLDY, 0);
         task->tState++;
@@ -2300,15 +2298,15 @@ static bool8 Phase2_Mugshot_Func7(struct Task *task)
         {
             s16 index1 = 0x50 - i;
             s16 index2 = 0x50 + i;
-            if (gUnknown_02038C28[0][index1] <= 15)
+            if (gScanlineEffectRegBuffers[0][index1] <= 15)
             {
                 r6 = TRUE;
-                gUnknown_02038C28[0][index1]++;
+                gScanlineEffectRegBuffers[0][index1]++;
             }
-            if (gUnknown_02038C28[0][index2] <= 15)
+            if (gScanlineEffectRegBuffers[0][index2] <= 15)
             {
                 r6 = TRUE;
-                gUnknown_02038C28[0][index2]++;
+                gScanlineEffectRegBuffers[0][index2]++;
             }
         }
     }
@@ -2336,7 +2334,7 @@ static bool8 Phase2_Mugshot_Func9(struct Task *task)
     sTransitionStructPtr->VBlank_DMA = FALSE;
 
     task->tData3++;
-    memset(gUnknown_02038C28[0], task->tData3, 0x140);
+    memset(gScanlineEffectRegBuffers[0], task->tData3, 0x140);
     if (task->tData3 > 15)
         task->tState++;
 
@@ -2357,12 +2355,12 @@ static void VBlankCB0_Phase2_Mugshots(void)
     DmaStop(0);
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA != 0)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320);
     REG_BG0VOFS = sTransitionStructPtr->BG0VOFS;
     REG_WININ = sTransitionStructPtr->WININ;
     REG_WINOUT = sTransitionStructPtr->WINOUT;
     REG_WIN0V = sTransitionStructPtr->WIN0V;
-    DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
+    DmaSet(0, gScanlineEffectRegBuffers[1], &REG_WIN0H, 0xA2400001);
 }
 
 static void VBlankCB1_Phase2_Mugshots(void)
@@ -2370,9 +2368,9 @@ static void VBlankCB1_Phase2_Mugshots(void)
     DmaStop(0);
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA != 0)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320);
     REG_BLDCNT = sTransitionStructPtr->BLDCNT;
-    DmaSet(0, gUnknown_02038C28[1], &REG_BLDY, 0xA2400001);
+    DmaSet(0, gScanlineEffectRegBuffers[1], &REG_BLDY, 0xA2400001);
 }
 
 static void HBlankCB_Phase2_Mugshots(void)
@@ -2500,7 +2498,7 @@ static bool8 Phase2_Slice_Func1(struct Task *task)
     u16 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     task->tData2 = 256;
     task->tData3 = 1;
@@ -2511,8 +2509,8 @@ static bool8 Phase2_Slice_Func1(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        gUnknown_02038C28[1][i] = sTransitionStructPtr->field_14;
-        gUnknown_02038C28[1][160 + i] = 0xF0;
+        gScanlineEffectRegBuffers[1][i] = sTransitionStructPtr->field_14;
+        gScanlineEffectRegBuffers[1][160 + i] = 0xF0;
     }
 
     EnableInterrupts(INTR_FLAG_HBLANK);
@@ -2541,8 +2539,8 @@ static bool8 Phase2_Slice_Func2(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        u16 *storeLoc1 = &gUnknown_02038C28[0][i];
-        u16 *storeLoc2 = &gUnknown_02038C28[0][i + 160];
+        u16 *storeLoc1 = &gScanlineEffectRegBuffers[0][i];
+        u16 *storeLoc2 = &gScanlineEffectRegBuffers[0][i + 160];
         if (i & 1)
         {
             *storeLoc1 = sTransitionStructPtr->field_14 + task->tData1;
@@ -2578,15 +2576,15 @@ static void VBlankCB_Phase2_Slice(void)
     REG_WINOUT = sTransitionStructPtr->WINOUT;
     REG_WIN0V = sTransitionStructPtr->WIN0V;
     if (sTransitionStructPtr->VBlank_DMA)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 640);
-    DmaSet(0, &gUnknown_02038C28[1][160], &REG_WIN0H, 0xA2400001);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 640);
+    DmaSet(0, &gScanlineEffectRegBuffers[1][160], &REG_WIN0H, 0xA2400001);
 }
 
 static void HBlankCB_Phase2_Slice(void)
 {
     if (REG_VCOUNT < 160)
     {
-        u16 var = gUnknown_02038C28[1][REG_VCOUNT];
+        u16 var = gScanlineEffectRegBuffers[1][REG_VCOUNT];
         REG_BG1HOFS = var;
         REG_BG2HOFS = var;
         REG_BG3HOFS = var;
@@ -2603,7 +2601,7 @@ static bool8 Phase2_ShredSplit_Func1(struct Task *task)
     u16 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     sTransitionStructPtr->WININ = 63;
     sTransitionStructPtr->WINOUT = 0;
@@ -2611,13 +2609,13 @@ static bool8 Phase2_ShredSplit_Func1(struct Task *task)
 
     for (i = 0; i < 0xA0; i++)
     {
-        gUnknown_02038C28[1][i] = sTransitionStructPtr->field_14;
-        gUnknown_02038C28[1][0xA0 + i] = 0xF0;
-        gUnknown_02038C28[0][i] = sTransitionStructPtr->field_14;
-        gUnknown_02038C28[0][0xA0 + i] = 0xF0;
-        gUnknown_02038C28[0][0x140 + i] = 0;
-        gUnknown_02038C28[0][0x1E0 + i] = 0x100;
-        gUnknown_02038C28[0][0x280 + i] = 1;
+        gScanlineEffectRegBuffers[1][i] = sTransitionStructPtr->field_14;
+        gScanlineEffectRegBuffers[1][0xA0 + i] = 0xF0;
+        gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_14;
+        gScanlineEffectRegBuffers[0][0xA0 + i] = 0xF0;
+        gScanlineEffectRegBuffers[0][0x140 + i] = 0;
+        gScanlineEffectRegBuffers[0][0x1E0 + i] = 0x100;
+        gScanlineEffectRegBuffers[0][0x280 + i] = 1;
     }
 
     task->tData4 = 0;
@@ -2657,9 +2655,9 @@ static bool8 Phase2_ShredSplit_Func2(struct Task *task)
                 unkVar = (arr1[j]) + (arr2[k] * -(i) * 2);
                 if (unkVar >= 0 && (unkVar != 79 || j != 1))
                 {
-                    ptr4 = &gUnknown_02038C28[0][unkVar + 320];
-                    ptr3 = &gUnknown_02038C28[0][unkVar + 480];
-                    ptr1 = &gUnknown_02038C28[0][unkVar + 640];
+                    ptr4 = &gScanlineEffectRegBuffers[0][unkVar + 320];
+                    ptr3 = &gScanlineEffectRegBuffers[0][unkVar + 480];
+                    ptr1 = &gScanlineEffectRegBuffers[0][unkVar + 640];
                     if (*ptr4 > 0xEF)
                     {
                         *ptr4 = 0xF0;
@@ -2673,8 +2671,8 @@ static bool8 Phase2_ShredSplit_Func2(struct Task *task)
                         if (*ptr3 <= 0xFFF)
                             *ptr3 += *ptr1;
                     }
-                    ptr2 = &gUnknown_02038C28[0][unkVar];
-                    ptr3 = &gUnknown_02038C28[0][unkVar + 160];
+                    ptr2 = &gScanlineEffectRegBuffers[0][unkVar];
+                    ptr3 = &gScanlineEffectRegBuffers[0][unkVar + 160];
                     *ptr2 = sTransitionStructPtr->field_14 + *ptr4;
                     *ptr3 = 0xF0 - *ptr4;
 
@@ -2691,9 +2689,9 @@ static bool8 Phase2_ShredSplit_Func2(struct Task *task)
                 unkVar = (arr1[j] + 1) + (arr2[k] * -(i) * 2);
                 if (unkVar <= 160 && (unkVar != 80 || j != 1))
                 {
-                    ptr4 = &gUnknown_02038C28[0][unkVar + 320];
-                    ptr3 = &gUnknown_02038C28[0][unkVar + 480];
-                    ptr1 = &gUnknown_02038C28[0][unkVar + 640];
+                    ptr4 = &gScanlineEffectRegBuffers[0][unkVar + 320];
+                    ptr3 = &gScanlineEffectRegBuffers[0][unkVar + 480];
+                    ptr1 = &gScanlineEffectRegBuffers[0][unkVar + 640];
                     if (*ptr4 > 0xEF)
                     {
                         *ptr4 = 0xF0;
@@ -2707,8 +2705,8 @@ static bool8 Phase2_ShredSplit_Func2(struct Task *task)
                         if (*ptr3 <= 0xFFF)
                             *ptr3 += *ptr1;
                     }
-                    ptr2 = &gUnknown_02038C28[0][unkVar];
-                    ptr3 = &gUnknown_02038C28[0][unkVar + 160];
+                    ptr2 = &gScanlineEffectRegBuffers[0][unkVar];
+                    ptr3 = &gScanlineEffectRegBuffers[0][unkVar + 160];
                     *ptr2 = sTransitionStructPtr->field_14 - *ptr4;
                     *ptr3 = (*ptr4 << 8) | (0xF1);
 
@@ -2732,7 +2730,7 @@ static bool8 Phase2_ShredSplit_Func2(struct Task *task)
 
 // This function never increments the state counter, because the loop condition
 // is always false, resulting in the game being stuck in an infinite loop.
-// It's possible this transition is only partially 
+// It's possible this transition is only partially
 // done and the second part was left out.
 static bool8 Phase2_ShredSplit_Func3(struct Task *task)
 {
@@ -2742,7 +2740,7 @@ static bool8 Phase2_ShredSplit_Func3(struct Task *task)
 
     for (i = 0; i < 0xA0; i++)
     {
-        if (gUnknown_02038C28[1][i] != 0xF0 && gUnknown_02038C28[1][i] != checkVar2)
+        if (gScanlineEffectRegBuffers[1][i] != 0xF0 && gScanlineEffectRegBuffers[1][i] != checkVar2)
             done = FALSE; // a break statement should be put here
     }
 
@@ -2775,7 +2773,7 @@ static bool8 Phase2_Blackhole_Func1(struct Task *task)
     s32 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     sTransitionStructPtr->WININ = 0;
     sTransitionStructPtr->WINOUT = 63;
@@ -2784,7 +2782,7 @@ static bool8 Phase2_Blackhole_Func1(struct Task *task)
 
     for (i = 0; i < 0xA0; i++)
     {
-        gUnknown_02038C28[1][i] = 0;
+        gScanlineEffectRegBuffers[1][i] = 0;
     }
 
     SetVBlankCallback(VBlankCB1_Phase2_BigPokeball);
@@ -2814,7 +2812,7 @@ static bool8 Phase2_Blackhole1_Func3(struct Task *task)
             task->tData1 += (task->tData2 >> 8);
         if (task->tData1 > 0xA0)
             task->tData1 = 0xA0;
-        sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->tData1);
+        sub_814A014(gScanlineEffectRegBuffers[0], 0x78, 0x50, task->tData1);
         if (task->tData1 == 0xA0)
         {
             task->tFuncState = 1;
@@ -2840,7 +2838,7 @@ static bool8 Phase2_Blackhole1_Func2(struct Task *task)
     }
     task->tData1 += gUnknown_085C8C80[task->tData6];
     task->tData6 = (task->tData6 + 1) % 2;
-    sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->tData1);
+    sub_814A014(gScanlineEffectRegBuffers[0], 0x78, 0x50, task->tData1);
     if (task->tData1 < 9)
     {
         task->tState++;
@@ -2866,7 +2864,7 @@ static bool8 Phase2_Blackhole2_Func2(struct Task *task)
     if (task->tData1 > 0xA0)
         task->tData1 = 0xA0;
 
-    sub_814A014(gUnknown_02038C28[0], 0x78, 0x50, task->tData1);
+    sub_814A014(gScanlineEffectRegBuffers[0], 0x78, 0x50, task->tData1);
     if (task->tData1 == 0xA0)
     {
         DmaStop(0);
@@ -3113,7 +3111,7 @@ static bool8 Phase2_Rayquaza_Func3(struct Task *task)
     u16 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     SetGpuReg(REG_OFFSET_BG0CNT, 0x9A08);
     sub_8149F58(&dst1, &dst2);
@@ -3126,8 +3124,8 @@ static bool8 Phase2_Rayquaza_Func3(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        gUnknown_02038C28[0][i] = 0;
-        gUnknown_02038C28[1][i] = 0x100;
+        gScanlineEffectRegBuffers[0][i] = 0;
+        gScanlineEffectRegBuffers[1][i] = 0x100;
     }
 
     SetVBlankCallback(VBlankCB_Phase2_Rayquaza);
@@ -3212,7 +3210,7 @@ static bool8 Phase2_Rayquaza_Func9(struct Task *task)
 
         for (i = 0; i < 160; i++)
         {
-            gUnknown_02038C28[1][i] = 0;
+            gScanlineEffectRegBuffers[1][i] = 0;
         }
 
         SetVBlankCallback(VBlankCB1_Phase2_BigPokeball);
@@ -3233,11 +3231,11 @@ static void VBlankCB_Phase2_Rayquaza(void)
     VBlankCB_BattleTransition();
 
     if (sTransitionStructPtr->field_20 == 0)
-        dmaSrc = gUnknown_02038C28[0];
+        dmaSrc = gScanlineEffectRegBuffers[0];
     else if (sTransitionStructPtr->field_20 == 1)
-        dmaSrc = gUnknown_02038C28[1];
+        dmaSrc = gScanlineEffectRegBuffers[1];
     else
-        dmaSrc = gUnknown_02038C28[0];
+        dmaSrc = gScanlineEffectRegBuffers[0];
 
     DmaSet(0, dmaSrc, &REG_BG0VOFS, 0xA2400001);
 }
@@ -3252,7 +3250,7 @@ static bool8 Phase2_WhiteFade_Func1(struct Task *task)
     u16 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     sTransitionStructPtr->BLDCNT = 0xBF;
     sTransitionStructPtr->BLDY = 0;
@@ -3262,8 +3260,8 @@ static bool8 Phase2_WhiteFade_Func1(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        gUnknown_02038C28[1][i] = 0;
-        gUnknown_02038C28[1][i + 160] = 0xF0;
+        gScanlineEffectRegBuffers[1][i] = 0;
+        gScanlineEffectRegBuffers[1][i + 160] = 0xF0;
     }
 
     EnableInterrupts(INTR_FLAG_HBLANK);
@@ -3343,8 +3341,8 @@ static void VBlankCB0_Phase2_WhiteFade(void)
     REG_WINOUT = sTransitionStructPtr->WINOUT;
     REG_WIN0V = sTransitionStructPtr->WIN0V;
     if (sTransitionStructPtr->VBlank_DMA)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 640);
-    DmaSet(0, &gUnknown_02038C28[1][160], &REG_WIN0H, 0xA2400001);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 640);
+    DmaSet(0, &gScanlineEffectRegBuffers[1][160], &REG_WIN0H, 0xA2400001);
 }
 
 static void VBlankCB1_Phase2_WhiteFade(void)
@@ -3360,7 +3358,7 @@ static void VBlankCB1_Phase2_WhiteFade(void)
 
 static void HBlankCB_Phase2_WhiteFade(void)
 {
-    REG_BLDY = gUnknown_02038C28[1][REG_VCOUNT];
+    REG_BLDY = gScanlineEffectRegBuffers[1][REG_VCOUNT];
 }
 
 static void sub_8149864(struct Sprite *sprite)
@@ -3374,8 +3372,8 @@ static void sub_8149864(struct Sprite *sprite)
     else
     {
         u16 i;
-        u16* ptr1 = &gUnknown_02038C28[0][sprite->pos1.y];
-        u16* ptr2 = &gUnknown_02038C28[0][sprite->pos1.y + 160];
+        u16* ptr1 = &gScanlineEffectRegBuffers[0][sprite->pos1.y];
+        u16* ptr2 = &gScanlineEffectRegBuffers[0][sprite->pos1.y + 160];
         for (i = 0; i < 20; i++)
         {
             ptr1[i] = sprite->data[0] >> 8;
@@ -3465,7 +3463,7 @@ static bool8 Phase2_Shards_Func1(struct Task *task)
     u16 i;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
 
     sTransitionStructPtr->WININ = 0x3F;
     sTransitionStructPtr->WINOUT = 0;
@@ -3473,10 +3471,10 @@ static bool8 Phase2_Shards_Func1(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        gUnknown_02038C28[0][i] = 0xF0;
+        gScanlineEffectRegBuffers[0][i] = 0xF0;
     }
 
-    CpuSet(gUnknown_02038C28[0], gUnknown_02038C28[1], 0xA0);
+    CpuSet(gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 0xA0);
     SetVBlankCallback(VBlankCB_Phase2_Shards);
 
     task->tState++;
@@ -3505,8 +3503,8 @@ static bool8 Phase2_Shards_Func3(struct Task *task)
 
     for (i = 0, nextFunc = FALSE; i < 16; i++)
     {
-        s16 r3 = gUnknown_02038C28[0][sTransitionStructPtr->data[3]] >> 8;
-        s16 r4 = gUnknown_02038C28[0][sTransitionStructPtr->data[3]] & 0xFF;
+        s16 r3 = gScanlineEffectRegBuffers[0][sTransitionStructPtr->data[3]] >> 8;
+        s16 r4 = gScanlineEffectRegBuffers[0][sTransitionStructPtr->data[3]] & 0xFF;
         if (task->tData2 == 0)
         {
             if (r3 < sTransitionStructPtr->data[2])
@@ -3521,7 +3519,7 @@ static bool8 Phase2_Shards_Func3(struct Task *task)
             if (r4 <= r3)
                 r4 = r3;
         }
-        gUnknown_02038C28[0][sTransitionStructPtr->data[3]] = (r4) | (r3 << 8);
+        gScanlineEffectRegBuffers[0][sTransitionStructPtr->data[3]] = (r4) | (r3 << 8);
         if (nextFunc)
         {
             task->tState++;
@@ -3568,12 +3566,12 @@ static void VBlankCB_Phase2_Shards(void)
     DmaStop(0);
     VBlankCB_BattleTransition();
     if (sTransitionStructPtr->VBlank_DMA)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320);
     REG_WININ = sTransitionStructPtr->WININ;
     REG_WINOUT = sTransitionStructPtr->WINOUT;
     REG_WIN0V = sTransitionStructPtr->WIN0V;
-    REG_WIN0H = gUnknown_02038C28[1][0];
-    DmaSet(0, gUnknown_02038C28[1], &REG_WIN0H, 0xA2400001);
+    REG_WIN0H = gScanlineEffectRegBuffers[1][0];
+    DmaSet(0, gScanlineEffectRegBuffers[1], &REG_WIN0H, 0xA2400001);
 }
 
 // sub-task for phase2
@@ -3875,7 +3873,7 @@ static bool8 Phase2_29_Func2(struct Task *task)
 
     sub_8149F58(&dst1, &dst2);
     LZ77UnCompVram(gUnknown_085C828C, dst1);
-    sub_8149F98(gUnknown_02038C28[0], 0, task->tData4, 0x84, task->tData5, 160);
+    sub_8149F98(gScanlineEffectRegBuffers[0], 0, task->tData4, 0x84, task->tData5, 160);
 
     task->tState++;
     return TRUE;
@@ -3896,7 +3894,7 @@ static bool8 Phase2_30_Func1(struct Task *task)
     u16 *dst1, *dst2;
 
     sub_8149F08();
-    dp12_8087EA4();
+    ScanlineEffect_Clear();
     ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_WIN1_ON);
     task->tData2 = 0x2000;
     task->tData1 = 0x7FFF;
@@ -3934,7 +3932,7 @@ static bool8 Phase2_30_Func3(struct Task *task)
 
     for (i = 0; i < 160; i++)
     {
-        gUnknown_02038C28[1][i] = sTransitionStructPtr->field_16;
+        gScanlineEffectRegBuffers[1][i] = sTransitionStructPtr->field_16;
     }
 
     SetVBlankCallback(VBlankCB_Phase2_30);
@@ -3980,7 +3978,7 @@ static bool8 Phase2_30_Func4(struct Task *task)
     {
         s16 index = var6 / 256;
         asm("");
-        gUnknown_02038C28[0][i] = sTransitionStructPtr->field_16 + Sin(index, amplitude);
+        gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index, amplitude);
     }
 
     if (++task->tData3 == 101)
@@ -4004,12 +4002,12 @@ static void VBlankCB_Phase2_30(void)
     REG_BLDALPHA = sTransitionStructPtr->BLDALPHA;
 
     if (sTransitionStructPtr->VBlank_DMA)
-        DmaCopy16(3, gUnknown_02038C28[0], gUnknown_02038C28[1], 320);
+        DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320);
 }
 
 static void HBlankCB_Phase2_30(void)
 {
-    u16 var = gUnknown_02038C28[1][REG_VCOUNT];
+    u16 var = gScanlineEffectRegBuffers[1][REG_VCOUNT];
     REG_BG0VOFS = var;
 }
 
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index f487489d4..7b968a221 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -6,7 +6,7 @@
 #include "main.h"
 #include "sprite.h"
 #include "task.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "window.h"
 #include "text.h"
 #include "menu.h"
diff --git a/src/diploma.c b/src/diploma.c
index 24e5e9727..89447c5ba 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -3,7 +3,7 @@
 #include "palette.h"
 #include "main.h"
 #include "gpu_regs.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "task.h"
 #include "malloc.h"
 #include "decompress.h"
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 5dfc36cb2..cbd37be52 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -11,7 +11,7 @@
 #include "pokemon.h"
 #include "string_util.h"
 #include "battle.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "decompress.h"
 #include "m4a.h"
 #include "menu.h"
@@ -1367,7 +1367,7 @@ static void VBlankCB_EvolutionScene(void)
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
-    sub_80BA0A8();
+    ScanlineEffect_InitHBlankDmaTransfer();
 }
 
 static void VBlankCB_TradeEvolutionScene(void)
@@ -1384,7 +1384,7 @@ static void VBlankCB_TradeEvolutionScene(void)
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
-    sub_80BA0A8();
+    ScanlineEffect_InitHBlankDmaTransfer();
 }
 
 static void sub_813FDEC(u8 taskId)
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 5390814eb..62d2b39a4 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -20,7 +20,7 @@
 #include "string_util.h"
 #include "m4a.h"
 #include "international_string_util.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "trig.h"
 #include "random.h"
 #include "event_data.h"
diff --git a/src/mail.c b/src/mail.c
index c3cbe4a3c..ac263ac67 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -4,7 +4,7 @@
 #include "main.h"
 #include "overworld.h"
 #include "task.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "palette.h"
 #include "text.h"
 #include "menu.h"
diff --git a/src/option_menu.c b/src/option_menu.c
index 7f92756ab..cbbe14b77 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -2,7 +2,7 @@
 #include "option_menu.h"
 #include "main.h"
 #include "menu.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "palette.h"
 #include "sprite.h"
 #include "task.h"
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 1a4ce3155..472b030e0 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -14,7 +14,7 @@
 #include "battle.h"
 #include "battle_controllers.h"
 #include "palette.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "list_menu.h"
 #include "gpu_regs.h"
 #include "decompress.h"
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 3df2ff151..a4bb4a728 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -3,7 +3,7 @@
 #include "battle.h"
 #include "palette.h"
 #include "main.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "text.h"
 #include "gpu_regs.h"
 #include "bg.h"
@@ -34,7 +34,7 @@ extern struct SpriteTemplate gUnknown_0202499C;
 
 extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
 
-extern void dp12_8087EA4(void);
+extern void ScanlineEffect_Clear(void);
 extern void sub_8035658(void);
 extern bool8 IsDoubleBattle(void);
 extern u8 GetSubstituteSpriteDefault_Y(u8 bank);
@@ -72,7 +72,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
     switch (gBattleScripting.reshowMainState)
     {
     case 0:
-        dp12_8087EA4();
+        ScanlineEffect_Clear();
         sub_8035658();
         SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0);
         SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0);
diff --git a/src/scanline_effect.c b/src/scanline_effect.c
new file mode 100644
index 000000000..148e053fc
--- /dev/null
+++ b/src/scanline_effect.c
@@ -0,0 +1,262 @@
+#include "global.h"
+#include "data2.h"
+#include "task.h"
+#include "trig.h"
+#include "scanline_effect.h"
+
+static void CopyValue16Bit(void);
+static void CopyValue32Bit(void);
+
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG0_X;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG2_X;
+extern u16 gBattle_BG2_Y;
+extern u16 gBattle_BG3_X;
+extern u16 gBattle_BG3_Y;
+
+// EWRAM vars
+
+// Per-scanline register values.
+// This is double buffered so that it can be safely written to at any time
+// without overwriting the buffer that the DMA is currently reading
+EWRAM_DATA u16 gScanlineEffectRegBuffers[2][0x3C0] = {0};
+
+EWRAM_DATA struct ScanlineEffect gScanlineEffect = {0};
+EWRAM_DATA static bool8 sShouldStopWaveTask = FALSE;
+
+void ScanlineEffect_Stop(void)
+{
+    gScanlineEffect.state = 0;
+    DmaStop(0);
+    if (gScanlineEffect.waveTaskId != 0xFF)
+    {
+        DestroyTask(gScanlineEffect.waveTaskId);
+        gScanlineEffect.waveTaskId = 0xFF;
+    }
+}
+
+void ScanlineEffect_Clear(void)
+{
+    CpuFill16(0, gScanlineEffectRegBuffers, sizeof(gScanlineEffectRegBuffers));
+    gScanlineEffect.dmaSrcBuffers[0] = NULL;
+    gScanlineEffect.dmaSrcBuffers[1] = NULL;
+    gScanlineEffect.dmaDest = NULL;
+    gScanlineEffect.dmaControl = 0;
+    gScanlineEffect.srcBuffer = 0;
+    gScanlineEffect.state = 0;
+    gScanlineEffect.unused16 = 0;
+    gScanlineEffect.unused17 = 0;
+    gScanlineEffect.waveTaskId = 0xFF;
+}
+
+void ScanlineEffect_SetParams(struct ScanlineEffectParams params)
+{
+    if (params.dmaControl == SCANLINE_EFFECT_DMACNT_16BIT)  // 16-bit
+    {
+        // Set the DMA src to the value for the second scanline because the
+        // first DMA transfer occurs in HBlank *after* the first scanline is drawn
+        gScanlineEffect.dmaSrcBuffers[0] = (u16 *)gScanlineEffectRegBuffers[0] + 1;
+        gScanlineEffect.dmaSrcBuffers[1] = (u16 *)gScanlineEffectRegBuffers[1] + 1;
+        gScanlineEffect.setFirstScanlineReg = CopyValue16Bit;
+    }
+    else  // assume 32-bit
+    {
+        // Set the DMA src to the value for the second scanline because the
+        // first DMA transfer occurs in HBlank *after* the first scanline is drawn
+        gScanlineEffect.dmaSrcBuffers[0] = (u32 *)gScanlineEffectRegBuffers[0] + 1;
+        gScanlineEffect.dmaSrcBuffers[1] = (u32 *)gScanlineEffectRegBuffers[1] + 1;
+        gScanlineEffect.setFirstScanlineReg = CopyValue32Bit;
+    }
+
+    gScanlineEffect.dmaControl = params.dmaControl;
+    gScanlineEffect.dmaDest    = params.dmaDest;
+    gScanlineEffect.state      = params.initState;
+    gScanlineEffect.unused16   = params.unused9;
+    gScanlineEffect.unused17   = params.unused9;
+}
+
+void ScanlineEffect_InitHBlankDmaTransfer(void)
+{
+    if (gScanlineEffect.state == 0)
+    {
+        return;
+    }
+    else if (gScanlineEffect.state == 3)
+    {
+        gScanlineEffect.state = 0;
+        DmaStop(0);
+        sShouldStopWaveTask = TRUE;
+    }
+    else
+    {
+        DmaStop(0);
+        // Set DMA to copy to dest register on each HBlank for the next frame.
+        // The HBlank DMA transfers do not occurr during VBlank, so the transfer
+        // will begin on the HBlank after the first scanline
+        DmaSet(0, gScanlineEffect.dmaSrcBuffers[gScanlineEffect.srcBuffer], gScanlineEffect.dmaDest, gScanlineEffect.dmaControl);
+        // Manually set the reg for the first scanline
+        gScanlineEffect.setFirstScanlineReg();
+        // Swap current buffer
+        gScanlineEffect.srcBuffer ^= 1;
+    }
+}
+
+// These two functions are used to copy the register for the first scanline,
+// depending whether it is a 16-bit register or a 32-bit register.
+
+static void CopyValue16Bit(void)
+{
+    u16 *dest = (u16 *)gScanlineEffect.dmaDest;
+    u16 *src = (u16 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer];
+
+    *dest = *src;
+}
+
+static void CopyValue32Bit(void)
+{
+    u32 *dest = (u32 *)gScanlineEffect.dmaDest;
+    u32 *src = (u32 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer];
+
+    *dest = *src;
+}
+
+#define tStartLine            data[0]
+#define tEndLine              data[1]
+#define tWaveLength           data[2]
+#define tSrcBufferOffset      data[3]
+#define tFramesUntilMove      data[4]
+#define tDelayInterval        data[5]
+#define tRegOffset            data[6]
+#define tApplyBattleBgOffsets data[7]
+
+static void TaskFunc_UpdateWavePerFrame(u8 taskId)
+{
+    int value = 0;
+    int i;
+    int offset;
+
+    if (sShouldStopWaveTask)
+    {
+        DestroyTask(taskId);
+        gScanlineEffect.waveTaskId = 0xFF;
+    }
+    else
+    {
+        if (gTasks[taskId].tApplyBattleBgOffsets)
+        {
+            switch (gTasks[taskId].tRegOffset)
+            {
+            case SCANLINE_EFFECT_REG_BG0HOFS:
+                value = gBattle_BG0_X;
+                break;
+            case SCANLINE_EFFECT_REG_BG0VOFS:
+                value = gBattle_BG0_Y;
+                break;
+            case SCANLINE_EFFECT_REG_BG1HOFS:
+                value = gBattle_BG1_X;
+                break;
+            case SCANLINE_EFFECT_REG_BG1VOFS:
+                value = gBattle_BG1_Y;
+                break;
+            case SCANLINE_EFFECT_REG_BG2HOFS:
+                value = gBattle_BG2_X;
+                break;
+            case SCANLINE_EFFECT_REG_BG2VOFS:
+                value = gBattle_BG2_Y;
+                break;
+            case SCANLINE_EFFECT_REG_BG3HOFS:
+                value = gBattle_BG3_X;
+                break;
+            case SCANLINE_EFFECT_REG_BG3VOFS:
+                value = gBattle_BG3_Y;
+                break;
+            }
+        }
+        if (gTasks[taskId].tFramesUntilMove != 0)
+        {
+            gTasks[taskId].tFramesUntilMove--;
+            offset = gTasks[taskId].tSrcBufferOffset + 320;
+            for (i = gTasks[taskId].tStartLine; i < gTasks[taskId].tEndLine; i++)
+            {
+                gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gScanlineEffectRegBuffers[0][offset] + value;
+                offset++;
+            }
+        }
+        else
+        {
+            gTasks[taskId].tFramesUntilMove = gTasks[taskId].tDelayInterval;
+            offset = gTasks[taskId].tSrcBufferOffset + 320;
+            for (i = gTasks[taskId].tStartLine; i < gTasks[taskId].tEndLine; i++)
+            {
+                gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gScanlineEffectRegBuffers[0][offset] + value;
+                offset++;
+            }
+
+            // increment src buffer offset
+            gTasks[taskId].tSrcBufferOffset++;
+            if (gTasks[taskId].tSrcBufferOffset == gTasks[taskId].tWaveLength)
+                gTasks[taskId].tSrcBufferOffset = 0;
+        }
+    }
+}
+
+static void GenerateWave(u16 *buffer, u8 frequency, u8 amplitude, u8 unused)
+{
+    u16 i = 0;
+    u8 theta = 0;
+
+    while (i < 256)
+    {
+        buffer[i] = (gSineTable[theta] * amplitude) / 256;
+        theta += frequency;
+        i++;
+    }
+}
+
+// Initializes a background "wave" effect that affects scanlines startLine (inclusive) to endLine (exclusive).
+// 'frequency' and 'amplitude' control the frequency and amplitude of the wave.
+// 'delayInterval' controls how fast the wave travels up the screen. The wave will shift upwards one scanline every 'delayInterval'+1 frames.
+// 'regOffset' is the offset of the video register to modify.
+u8 ScanlineEffect_InitWave(u8 startLine, u8 endLine, u8 frequency, u8 amplitude, u8 delayInterval, u8 regOffset, bool8 applyBattleBgOffsets)
+{
+    int i;
+    int offset;
+    struct ScanlineEffectParams params;
+    u8 taskId;
+
+    ScanlineEffect_Clear();
+
+    params.dmaDest = (void *)(REG_ADDR_BG0HOFS + regOffset);
+    params.dmaControl = SCANLINE_EFFECT_DMACNT_16BIT;
+    params.initState = 1;
+    params.unused9 = 0;
+    ScanlineEffect_SetParams(params);
+
+    taskId = CreateTask(TaskFunc_UpdateWavePerFrame, 0);
+
+    gTasks[taskId].tStartLine            = startLine;
+    gTasks[taskId].tEndLine              = endLine;
+    gTasks[taskId].tWaveLength           = 256 / frequency;
+    gTasks[taskId].tSrcBufferOffset      = 0;
+    gTasks[taskId].tFramesUntilMove      = delayInterval;
+    gTasks[taskId].tDelayInterval        = delayInterval;
+    gTasks[taskId].tRegOffset            = regOffset;
+    gTasks[taskId].tApplyBattleBgOffsets = applyBattleBgOffsets;
+
+    gScanlineEffect.waveTaskId = taskId;
+    sShouldStopWaveTask = FALSE;
+
+    GenerateWave(&gScanlineEffectRegBuffers[0][320], frequency, amplitude, endLine - startLine);
+
+    offset = 320;
+    for (i = startLine; i < endLine; i++)
+    {
+        gScanlineEffectRegBuffers[0][i] = gScanlineEffectRegBuffers[0][offset];
+        gScanlineEffectRegBuffers[1][i] = gScanlineEffectRegBuffers[0][offset];
+        offset++;
+    }
+
+    return taskId;
+}
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 12f475c93..c8898d08f 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -4,7 +4,7 @@
 #include "malloc.h"
 #include "palette.h"
 #include "pokenav.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "text.h"
 #include "bg.h"
 #include "window.h"
@@ -131,7 +131,7 @@ void sub_8166340(void)
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
     sub_81D2108(gUnknown_0203BCAC->field_7C58);
-    sub_80BA0A8();
+    ScanlineEffect_InitHBlankDmaTransfer();
 }
 
 void sub_816636C(void (*func)(void))
diff --git a/src/wallclock.c b/src/wallclock.c
index dbea24b4c..f15bbbc27 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -12,7 +12,7 @@
 #include "window.h"
 #include "text_window.h"
 #include "menu.h"
-#include "unknown_task.h"
+#include "scanline_effect.h"
 #include "task.h"
 #include "strings.h"
 #include "sound.h"
-- 
cgit v1.2.3


From 42bfa15ae0669979958883a8fdaa76b72c30011a Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 29 Jan 2018 15:49:28 -0500
Subject: decompile more of field_map_obj_helpers.c

---
 src/field_map_obj_helpers.c | 180 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 167 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index 1247a7cd7..b0f7442f4 100755
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -1,15 +1,22 @@
 #include "global.h"
 #include "field_ground_effect.h"
 #include "field_map_obj.h"
+#include "field_effect.h"
 
-typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
+extern void sub_8097D68(struct Sprite *sprite);
 
-extern const s8 gUnknown_0850E7BA[];
-extern const s8 gUnknown_0850E772[];
+typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
 
+extern const struct Coords16 gUnknown_0850DB7C[4];
 extern s16 gUnknown_0850E768[];
 extern SpriteStepFunc *const gUnknown_0850E754[];
-extern const struct Coords16 gUnknown_0850DB7C[4];
+extern const s8 gUnknown_0850E772[];
+extern const s8 gUnknown_0850E7BA[];
+extern const s8 *const gUnknown_0850E834[];
+extern s16 gUnknown_0850E840[];
+extern u8 gUnknown_0850E846[];
+extern s16 gUnknown_0850E84A[];
+extern u8 gUnknown_0850E850[];
 
 bool8 FreezeMapObject(struct MapObject *mapObject)
 {
@@ -192,10 +199,6 @@ bool8 sub_8097758(struct Sprite *sprite)
     return result;
 }
 
-extern const s8 *const gUnknown_0850E834[];
-extern s16 gUnknown_0850E840[];
-extern u8 gUnknown_0850E846[];
-
 s16 sub_8097820(s16 a1, u8 a2)
 {
     return gUnknown_0850E834[a2][a1];
@@ -238,9 +241,6 @@ u8 sub_809785C(struct Sprite *sprite)
     return v2;
 }
 
-extern s16 gUnknown_0850E84A[];
-extern u8 gUnknown_0850E850[];
-
 u8 sub_80978E4(struct Sprite *sprite)
 {
     s16 v5[3];
@@ -328,8 +328,6 @@ void sub_80979D4(struct Sprite *sprite, bool8 invisible)
         sprite->invisible = 1;
 }
 
-extern void sub_8097D68(struct Sprite *sprite);
-
 void sub_8097AC8(struct Sprite *sprite)
 {
     sub_8097D68(sprite);
@@ -369,3 +367,159 @@ void sub_8097B78(u8 var1, u8 var2)
     if(spriteId != MAX_SPRITES)
         StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(var2));
 }
+
+void sub_8097BB4(u8 var1, u8 var2)
+{
+    int spriteId = sub_8097B2C(var1);
+
+    if(spriteId != MAX_SPRITES)
+    {
+        struct Sprite *sprite = &gSprites[spriteId];
+        const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(var2);
+        u16 tileNum = sprite->oam.tileNum;
+
+        sprite->oam = *gfxInfo->oam;
+        sprite->oam.tileNum = tileNum;
+        sprite->oam.paletteNum = gfxInfo->paletteSlot;
+        sprite->images = gfxInfo->images;
+
+        if(gfxInfo->subspriteTables == NULL)
+        {
+            sprite->subspriteTables = NULL;
+            sprite->subspriteTableNum = 0;
+            sprite->subspriteMode = 0;
+        }
+        else
+        {
+            SetSubspriteTables(sprite, gfxInfo->subspriteTables);
+            sprite->subspriteMode = 2;
+        }
+        StartSpriteAnim(sprite, 0);
+    }
+}
+
+void sub_8097C44(u8 var, bool32 var2)
+{
+    u8 spriteId = sub_8097B2C(var);
+
+    if(spriteId == MAX_SPRITES)
+        return;
+
+    if(var2)
+        gSprites[spriteId].data[2] = 1;
+    else
+        gSprites[spriteId].data[2] = 0;
+}
+
+bool32 sub_8097C8C(u8 var)
+{
+    u8 spriteId = sub_8097B2C(var);
+
+    if(spriteId == MAX_SPRITES)
+        return FALSE;
+
+    return (gSprites[spriteId].data[2] == TRUE);
+}
+
+void sub_8097CC4(u8 var1, u8 var2)
+{
+    u8 spriteId = sub_8097B2C(var1);
+
+    if(spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].data[3] = var2;
+        gSprites[spriteId].data[4] = 0;
+    }
+}
+
+void sub_8097CF4(struct Sprite *sprite)
+{
+    switch(sprite->data[4])
+    {
+        case 0:
+            sprite->pos2.y = 0;
+            sprite->data[4]++;
+        case 1:
+            sprite->pos2.y -= 8;
+            if(sprite->pos2.y == -160)
+            {
+                sprite->pos2.y = 0;
+                sprite->data[2] = 1;
+                sprite->data[3] = 0;
+                sprite->data[4] = 0;
+            }
+    }
+}
+
+void sub_8097D30(struct Sprite *sprite)
+{
+    switch(sprite->data[4])
+    {
+        case 0:
+            sprite->pos2.y = -160;
+            sprite->data[4]++;
+        case 1:
+            sprite->pos2.y += 8;
+            if(sprite->pos2.y == 0)
+            {
+                sprite->data[3] = 0;
+                sprite->data[4] = 0;
+            }
+    }
+}
+
+void sub_8097D68(struct Sprite *sprite)
+{
+    switch(sprite->data[3])
+    {
+        case 1:
+            sub_8097D30(sprite);
+            break;
+        case 2:
+            sub_8097CF4(sprite);
+            break;
+        case 0:
+            break;
+        default:
+            sprite->data[3] = 0;
+            break;
+    }
+}
+
+bool32 sub_8097D9C(u8 var)
+{
+    u8 spriteId = sub_8097B2C(var);
+
+    if(spriteId == MAX_SPRITES)
+        return FALSE;
+
+    if(gSprites[spriteId].data[3] != FALSE)
+        return TRUE;
+
+    return FALSE;
+}
+
+u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject)
+{
+    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    return FieldEffectStart(fieldEffectId);
+}
+
+void DoShadowFieldEffect(struct MapObject *mapObject)
+{
+    if (!mapObject->mapobj_bit_22)
+    {
+        mapObject->mapobj_bit_22 = 1;
+        oe_exec_and_other_stuff(FLDEFF_SHADOW, mapObject);
+    }
+}
+
+void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    gFieldEffectArguments[0] = sprite->pos1.x;
+    gFieldEffectArguments[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
+    gFieldEffectArguments[2] = 151;
+    gFieldEffectArguments[3] = 3;
+    FieldEffectStart(FLDEFF_RIPPLE);
+}
-- 
cgit v1.2.3


From 3793152bc3666043764689af9821ef15da1243ae Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Mon, 29 Jan 2018 17:26:36 -0600
Subject: More work on menu

---
 src/dma3_manager.c |   2 +-
 src/menu.c         | 275 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 274 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/dma3_manager.c b/src/dma3_manager.c
index 3832c3663..28df9d932 100644
--- a/src/dma3_manager.c
+++ b/src/dma3_manager.c
@@ -204,7 +204,7 @@ s16 RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode)
     return -1;  // no free DMA request was found
 }
 
-int CheckForSpaceForDma3Request(s16 index)
+s16 CheckForSpaceForDma3Request(s16 index)
 {
     int i = 0;
 
diff --git a/src/menu.c b/src/menu.c
index 02e650ef2..b5ff565fe 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -8,6 +8,9 @@
 #include "main.h"
 #include "sound.h"
 #include "menu_helpers.h"
+#include "malloc.h"
+#include "task.h"
+#include "dma3.h"
 
 struct SomeUnkStruct
 {
@@ -37,6 +40,9 @@ extern EWRAM_DATA u16 gUnknown_0203CD9C;
 extern EWRAM_DATA u8 gUnknown_0203CD9E;
 extern EWRAM_DATA u8 gUnknown_0203CD9F;
 extern EWRAM_DATA u8 gUnknown_0203CDA0;
+extern EWRAM_DATA bool8 gUnknown_0203CDA4[4];
+extern EWRAM_DATA u16 gUnknown_0203CDA8;
+extern EWRAM_DATA void *gUnknown_0203CDAC[0x20];
 
 const u16 gUnknown_0860F0B0[] = INCBIN_U16("graphics/interface/860F0B0.gbapal");
 const u8 gUnknown_0860F0D0[] = { 15, 1, 2 };
@@ -81,6 +87,7 @@ extern u8 MoveMenuCursor(s8);
 extern u8 sub_8199134(s8, s8);
 extern void sub_8199F74(u8, u8, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8, u8);
 extern void sub_8198C78(void);
+extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
 
 void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextSubPrinter *, u16))
 {
@@ -716,7 +723,7 @@ u16 sub_8198AA4(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16
     return AddWindow(&template);
 }
 
-void sub_8198AF8(struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16 baseTileNum, u8 paletteNum, u8 initialCursorPos)
+void sub_8198AF8(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16 baseTileNum, u8 paletteNum, u8 initialCursorPos)
 {
     struct TextSubPrinter printer;
     
@@ -742,7 +749,7 @@ void sub_8198AF8(struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16
     sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, 1), 2, initialCursorPos);
 }
 
-void sub_8198C34(struct WindowTemplate *window, u8 fontId, u16 baseTileNum, u8 paletteNum)
+void sub_8198C34(const struct WindowTemplate *window, u8 fontId, u16 baseTileNum, u8 paletteNum)
 {
     sub_8198AF8(window, fontId, 0, 1, baseTileNum, paletteNum, 0);
 }
@@ -1180,3 +1187,267 @@ void sub_81995E4(u8 windowId, u8 itemCount, const struct MenuAction *strs, const
     
     CopyWindowToVram(windowId, 2);
 }
+
+void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 paletteNum, u8 initialCursorPos)
+{
+    struct TextSubPrinter printer;
+    
+    gUnknown_0203CD9F = AddWindow(window);
+    SetWindowBorderStyle(gUnknown_0203CD9F, TRUE, baseTileNum, paletteNum);
+    
+    printer.current_text_offset = gText_YesNo;
+    printer.windowId = gUnknown_0203CD9F;
+    printer.fontId = 1;
+    printer.x = 8;
+    printer.y = 1;
+    printer.currentX = printer.x;
+    printer.currentY = printer.y;
+    printer.fgColor = GetFontAttribute(1, 5);
+    printer.bgColor = GetFontAttribute(1, 6);
+    printer.shadowColor = GetFontAttribute(1, 7);
+    printer.fontColor_l = GetFontAttribute(1, 4);
+    printer.letterSpacing = 0;
+    printer.lineSpacing = 0;
+    
+    AddTextPrinter(&printer, 0xFF, 0);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(gUnknown_0203CD9F, 2, initialCursorPos);
+}
+
+void sub_81997AC(u8 windowId, u8 a4, u8 a6, u8 a7, const struct MenuAction *strs)
+{
+    u32 i;
+    u32 j;
+    for (i = 0; i < a7; i++)
+    {
+        for (j = 0; j < a6; j++)
+        {
+            PrintTextOnWindow(windowId, 1, strs[(i * a6) + j].text, (a4 * j) + 8, (i * 16) + 1, 0xFF, NULL);
+        }
+    }
+    CopyWindowToVram(windowId, 2);
+}
+
+void sub_819983C(u8 windowId, u8 a4, u8 itemCount, u8 itemCount2, const struct MenuAction *strs, const u8 *a8)
+{
+    u8 i;
+    u8 j;
+    struct TextSubPrinter printer;
+    
+    printer.windowId = windowId;
+    printer.fontId = 1;
+    printer.fgColor = GetFontAttribute(1, 5);
+    printer.bgColor = GetFontAttribute(1, 6);
+    printer.shadowColor = GetFontAttribute(1, 7);
+    printer.fontColor_l = GetFontAttribute(1, 4);
+    printer.letterSpacing = 0;
+    printer.lineSpacing = 0;
+    
+    for (i = 0; i < itemCount2; i++)
+    {
+        for (j = 0; j < itemCount; j++)
+        {
+            printer.current_text_offset = strs[a8[(itemCount * i) + j]].text;
+            printer.x = (a4 * j) + 8;
+            printer.y = (16 * i) + 1;
+            printer.currentX = printer.x;
+            printer.currentY = printer.y;
+            AddTextPrinter(&printer, 0xFF, 0);
+        }
+    }
+    
+    CopyWindowToVram(windowId, 2);
+}
+
+u8 sub_8199944(u8 windowId, u8 optionWidth, u8 horizontalCount, u8 verticalCount, u8 initialCursorPos)
+{
+    s32 pos;
+    
+    gUnknown_0203CD90.left = 0;
+    gUnknown_0203CD90.top = 1;
+    gUnknown_0203CD90.minCursorPos = 0;
+    gUnknown_0203CD90.maxCursorPos = (horizontalCount * verticalCount) - 1;
+    gUnknown_0203CD90.windowId = windowId;
+    gUnknown_0203CD90.fontId = 1;
+    gUnknown_0203CD90.optionWidth = optionWidth;
+    gUnknown_0203CD90.optionHeight = 16;
+    gUnknown_0203CD90.horizontalCount = horizontalCount;
+    gUnknown_0203CD90.verticalCount = verticalCount;
+    
+    pos = initialCursorPos;
+    
+    if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
+        gUnknown_0203CD90.cursorPos = 0;
+    else
+        gUnknown_0203CD90.cursorPos = pos;
+    
+    sub_8199134(0, 0);
+    return gUnknown_0203CD90.cursorPos;
+}
+
+void clear_scheduled_bg_copies_to_vram(void)
+{
+    memset(gUnknown_0203CDA4, 0, sizeof(gUnknown_0203CDA4));
+}
+
+void schedule_bg_copy_tilemap_to_vram(u8 bgId)
+{
+    gUnknown_0203CDA4[bgId] = TRUE;
+}
+
+void do_scheduled_bg_tilemap_copies_to_vram(void)
+{
+    if (gUnknown_0203CDA4[0] == TRUE)
+    {
+        CopyBgTilemapBufferToVram(0);
+        gUnknown_0203CDA4[0] = FALSE;
+    }
+    if (gUnknown_0203CDA4[1] == TRUE)
+    {
+        CopyBgTilemapBufferToVram(1);
+        gUnknown_0203CDA4[1] = FALSE;
+    }
+    if (gUnknown_0203CDA4[2] == TRUE)
+    {
+        CopyBgTilemapBufferToVram(2);
+        gUnknown_0203CDA4[2] = FALSE;
+    }
+    if (gUnknown_0203CDA4[3] == TRUE)
+    {
+        CopyBgTilemapBufferToVram(3);
+        gUnknown_0203CDA4[3] = FALSE;
+    }
+}
+
+void reset_temp_tile_data_buffers(void)
+{
+    int i;
+    for (i = 0; i < (s32)ARRAY_COUNT(gUnknown_0203CDAC); i++)
+    {
+        gUnknown_0203CDAC[i] = NULL;
+    }
+    gUnknown_0203CDA8 = 0;
+}
+
+bool8 free_temp_tile_data_buffers_if_possible(void)
+{
+    int i;
+    
+    if (!IsDma3ManagerBusyWithBgCopy())
+    {
+        if (gUnknown_0203CDA8)
+        {
+            for (i = 0; i < gUnknown_0203CDA8; i++)
+            {
+                FREE_AND_SET_NULL(gUnknown_0203CDAC[i]);
+            }
+            gUnknown_0203CDA8 = 0;
+        }
+        return FALSE;
+    }
+    else
+    {
+        return TRUE;
+    }
+}
+
+void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode)
+{
+    int sizeOut;
+    if (gUnknown_0203CDA8 < ARRAY_COUNT(gUnknown_0203CDAC))
+    {
+        void *ptr = malloc_and_decompress(src, &sizeOut);
+        if (!size)
+            size = sizeOut;
+        if (ptr)
+        {
+            copy_decompressed_tile_data_to_vram(bgId, ptr, size, offset, mode);
+            gUnknown_0203CDAC[gUnknown_0203CDA8++] = ptr;
+        }
+        return ptr;
+    }
+    return NULL;
+}
+
+void copy_decompressed_tile_data_to_vram_autofree(u8 bgId, const void *src, int size, u16 offset, u8 mode)
+{
+    int sizeOut;
+    void *ptr = malloc_and_decompress(src, &sizeOut);
+    if (!size)
+        size = sizeOut;
+    if (ptr)
+    {
+        u8 taskId = CreateTask(task_free_buf_after_copying_tile_data_to_vram, 0);
+        gTasks[taskId].data[0] = copy_decompressed_tile_data_to_vram(bgId, ptr, size, offset, mode);
+        SetWordTaskArg(taskId, 1, (u32)ptr);
+    }
+}
+
+void task_free_buf_after_copying_tile_data_to_vram(u8 taskId)
+{
+    if (!CheckForSpaceForDma3Request(gTasks[taskId].data[0]))
+    {
+        Free((void *)GetWordTaskArg(taskId, 1));
+        DestroyTask(taskId);
+    }
+}
+
+void *malloc_and_decompress(const void *src, int *size)
+{
+    void *ptr;
+    u8 *sizeAsBytes = (u8 *)size;
+    u8 *srcAsBytes = (u8 *)src;
+    
+    sizeAsBytes[0] = srcAsBytes[1];
+    sizeAsBytes[1] = srcAsBytes[2];
+    sizeAsBytes[2] = srcAsBytes[3];
+    sizeAsBytes[3] = 0;
+    
+    ptr = Alloc(*size);
+    if (ptr)
+        LZ77UnCompWram(src, ptr);
+    return ptr;
+}
+
+u16 copy_decompressed_tile_data_to_vram(u8 bgId, const void *src, u16 size, u16 offset, u8 mode)
+{
+    switch (mode)
+    {
+        case 0:
+            return LoadBgTiles(bgId, src, size, offset);
+        case 1:
+            return LoadBgTilemap(bgId, src, size, offset);
+        default:
+            return -1;
+    }
+}
+
+void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette)
+{
+    u8 i;
+    u8 j;
+    u16 *ptr = GetBgTilemapBuffer(bgId);
+    
+    for (i = top; i < top + height; i++)
+    {
+        for (j = left; j < left + width; j++)
+        {
+            ptr[(i * 32) + j] = (ptr[(i * 32) + j] & 0xFFF) | (palette << 12);
+        }
+    }
+}
+
+void sub_8199CBC(u8 bgId, void *dest, u8 left, u8 top, u8 width, u8 height)
+{
+    u8 i;
+    u8 j;
+    u16 *ptr = GetBgTilemapBuffer(bgId);
+    u16 *destAsU16 = dest;
+    
+    for (i = 0; i < height; i++)
+    {
+        for (j = 0; j < width; j++)
+        {
+            destAsU16[(i * height) + j] = ptr[(i * height) + j];
+        }
+    }
+}
-- 
cgit v1.2.3


From a75c476d57a8ffad9bebc7524c698cc2d5738d2a Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 30 Jan 2018 13:13:07 -0600
Subject: Get RenderText a bit closer (thanks Egg)

---
 src/text.c | 545 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 270 insertions(+), 275 deletions(-)

(limited to 'src')

diff --git a/src/text.c b/src/text.c
index 6be46b7b1..936f96798 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2054,300 +2054,295 @@ void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *c
 #ifdef NONMATCHING
 u16 RenderText(struct TextPrinter *textPrinter)
 {
-    struct TextPrinterSubStruct* r4 = &textPrinter->sub_union.sub;
-    int temp;
-    int r4two;
-    int jpnvar;
-    u8* tempTwo;
-    u16 songId;
-    int dummy;
-    u8 dummyTwo;
-    
+    struct TextPrinterSubStruct *r4 = &textPrinter->sub_union.sub;
+    u16 currChar;
+    s32 width;
+
     switch (textPrinter->state) // _080057C4
     {
-        case 0: // _080057F0
-            if ((gMain.heldKeys & (A_BUTTON | B_BUTTON)) && r4->font_type_upper)
-                textPrinter->delayCounter = 0;
-            if (textPrinter->delayCounter && textPrinter->text_speed) //_0800580A
+    case 0: // _080057F0
+        if ((gMain.heldKeys & (A_BUTTON | B_BUTTON)) && r4->font_type_upper)
+            textPrinter->delayCounter = 0;
+
+        if (textPrinter->delayCounter && textPrinter->text_speed) //_0800580A
+        {
+            textPrinter->delayCounter--;
+            if (gTextFlags.flag_0 && (gMain.newKeys & (A_BUTTON | B_BUTTON)))
             {
-                textPrinter->delayCounter--;
-                if (gTextFlags.flag_0 && (gMain.newKeys & (A_BUTTON | B_BUTTON)))
-                {
-                    r4->font_type_upper = 1;
-                    textPrinter->delayCounter = 0;
-                }
-                return 3;
+                r4->font_type_upper = 1;
+                textPrinter->delayCounter = 0;
             }
-            else // _0800584C
+            return 3;
+        }
+
+        if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED) && gTextFlags.flag_2)
+            textPrinter->delayCounter = 3;
+        else
+            textPrinter->delayCounter = textPrinter->text_speed;
+
+        currChar = *textPrinter->subPrinter.current_text_offset;
+        textPrinter->subPrinter.current_text_offset++;
+
+        switch (currChar) //_0800588A
+        {
+        case 0xF8+6: //_080058B8
+            textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
+            textPrinter->subPrinter.currentY += (gFonts[textPrinter->subPrinter.fontId].maxLetterHeight + textPrinter->subPrinter.lineSpacing);
+            return 2;
+        case 0xF8+5: //_080058DC
+            textPrinter->subPrinter.current_text_offset++;
+            return 2;
+        case 0xF8+4: //_080058E0
+            currChar = *textPrinter->subPrinter.current_text_offset;
+            textPrinter->subPrinter.current_text_offset++;
+            switch (currChar) // _080058F0
             {
-                if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED) && gTextFlags.flag_2)
-                    textPrinter->delayCounter = 3;
-                else
-                    textPrinter->delayCounter = textPrinter->text_speed;
-                temp = *textPrinter->subPrinter.current_text_offset;
+            case 1: // _08005960
+                textPrinter->subPrinter.fontColor_h = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                return 2;
+            case 2: // _08005982
+                textPrinter->subPrinter.bgColor = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                return 2;
+            case 3: // _080059A6
+                textPrinter->subPrinter.shadowColor = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                return 2;
+            case 4: // _080059C0
+                textPrinter->subPrinter.fontColor_h = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                textPrinter->subPrinter.bgColor = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                textPrinter->subPrinter.shadowColor = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
+                return 2;
+            case 5: // _08005A0E
+                textPrinter->subPrinter.current_text_offset++;
+                return 2;
+            case 6: //_08005A12
+                r4->font_type = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                return 2;
+            case 7: // _08005A0A
+                return 2;
+            case 8: // _08005A2A
+                textPrinter->delayCounter = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                textPrinter->state = 6;
+                return 2;
+            case 9: // _08005A3A
+                textPrinter->state = 1;
+                if (gTextFlags.flag_2)
+                    r4->frames_visible_counter = 0;
+                return 3;
+            case 10: // _08005A58
+                textPrinter->state = 5;
+                return 3;
+            case 11: // _08005A5C
+                currChar = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                currChar |= *textPrinter->subPrinter.current_text_offset << 8;
                 textPrinter->subPrinter.current_text_offset++;
-                switch (temp) //_0800588A
+                PlayBGM(currChar);
+                return 2;
+            case 16: // _08005A76
+                currChar = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                currChar |= (*textPrinter->subPrinter.current_text_offset << 8);
+                textPrinter->subPrinter.current_text_offset++;
+                PlaySE(currChar);
+                return 2;
+            case 13: // _08005A90
+                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x + *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                return 2;
+            case 14: // _08005A98
+                textPrinter->subPrinter.currentY = textPrinter->subPrinter.y + *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                return 2;
+            case 15: // _08005AA4
+                FillWindowPixelBuffer(textPrinter->subPrinter.windowId, textPrinter->subPrinter.bgColor | textPrinter->subPrinter.bgColor << 4);
+                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
+                textPrinter->subPrinter.currentY = textPrinter->subPrinter.y;
+                return 2;
+            case 23: // _08005ABE
+                m4aMPlayStop(&gMPlayInfo_BGM);
+                return 2;
+            case 24: // _08005ACC
+                m4aMPlayContinue(&gMPlayInfo_BGM);
+                return 2;
+            case 17: // _08005AD8
+                width = *textPrinter->subPrinter.current_text_offset;
+                textPrinter->subPrinter.current_text_offset++;
+                if (width > 0)
                 {
-                    case 0xF8+6: //_080058B8
-                        textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
-                        textPrinter->subPrinter.currentY += (gFonts[textPrinter->subPrinter.fontId].maxLetterHeight + textPrinter->subPrinter.lineSpacing);
-                        return 2;
-                    case 0xF8+5: //_080058DC
-                        textPrinter->subPrinter.current_text_offset++;
-                        return 2;
-                    case 0xF8+4: //_080058E0
-                        temp = *textPrinter->subPrinter.current_text_offset;
-                        textPrinter->subPrinter.current_text_offset++;
-                        switch (temp) // _080058F0
-                        {
-                            
-                            case 1: // _08005960
-                                textPrinter->subPrinter.fontColor_h = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
-                                return 2;
-                            case 2: // _08005982
-                                textPrinter->subPrinter.bgColor = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
-                                return 2;
-                            case 3: // _080059A6
-                                textPrinter->subPrinter.shadowColor = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
-                                return 2;
-                            case 4: // _080059C0
-                                textPrinter->subPrinter.fontColor_h = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                textPrinter->subPrinter.bgColor = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                textPrinter->subPrinter.shadowColor = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fontColor_h, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
-                                return 2;
-                            case 5: // _08005A0E
-                                textPrinter->subPrinter.current_text_offset++;
-                                return 2;
-                            case 6: //_08005A12
-                                r4->font_type = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                return 2;
-                            case 7: // _08005A0A
-                                return 2;
-                            case 8: // _08005A2A
-                                textPrinter->delayCounter = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                textPrinter->state = 6;
-                                return 2;
-                            case 9: // _08005A3A
-                                textPrinter->state = 1;
-                                if (gTextFlags.flag_2)
-                                    r4->frames_visible_counter = 0;
-                                return 3;
-                            case 10: // _08005A58
-                                textPrinter->state = 5;
-                                return 3;
-                            case 11: // _08005A5C
-                                songId = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                songId |= *textPrinter->subPrinter.current_text_offset << 8;
-                                textPrinter->subPrinter.current_text_offset++;
-                                PlayBGM(songId);
-                                return 2;
-                            case 16: // _08005A76
-                                songId = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                songId |= (*textPrinter->subPrinter.current_text_offset << 8);
-                                textPrinter->subPrinter.current_text_offset++;
-                                PlaySE(songId);
-                                return 2;
-                            case 13: // _08005A90
-                                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x + *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                return 2;
-                            case 14: // _08005A98
-                                textPrinter->subPrinter.currentY = textPrinter->subPrinter.y + *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                return 2;
-                            case 15: // _08005AA4
-                                FillWindowPixelBuffer(textPrinter->subPrinter.windowId, textPrinter->subPrinter.bgColor | textPrinter->subPrinter.bgColor << 4);
-                                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
-                                textPrinter->subPrinter.currentY = textPrinter->subPrinter.y;
-                                return 2;
-                            case 23: // _08005ABE
-                                m4aMPlayStop(&gMPlayInfo_BGM);
-                                return 2;
-                            case 24: // _08005ACC
-                                m4aMPlayContinue(&gMPlayInfo_BGM);
-                                return 2;
-                            case 17: // _08005AD8
-                                temp = *textPrinter->subPrinter.current_text_offset;
-                                textPrinter->subPrinter.current_text_offset++;
-                                if (temp > 0)
-                                {
-                                    ClearTextSpan(textPrinter, temp);
-                                    textPrinter->subPrinter.currentX += temp;
-                                    return 0;
-                                }
-                                return 2;
-                            case 18: // _08005AF2
-                                textPrinter->subPrinter.currentX = *textPrinter->subPrinter.current_text_offset + textPrinter->subPrinter.x;
-                                textPrinter->subPrinter.current_text_offset++;
-                                return 2;
-                            case 19: // _08005B02
-                                temp = *textPrinter->subPrinter.current_text_offset;
-                                temp += textPrinter->subPrinter.x;
-                                textPrinter->subPrinter.current_text_offset++;
-                                r4two = temp - textPrinter->subPrinter.currentX;
-                                if (temp - textPrinter->subPrinter.currentX > 0)
-                                {
-                                    ClearTextSpan(textPrinter, r4two);
-                                    textPrinter->subPrinter.currentX += r4two;
-                                    return 0;
-                                }
-                                return 2;
-                            case 20: // _08005B26
-                                textPrinter->minLetterSpacing = *textPrinter->subPrinter.current_text_offset++;
-                                return 2;
-                            case 21: // _08005B36
-                                textPrinter->japanese = 1;
-                                return 2;
-                            case 22: // _08005B3E
-                                textPrinter->japanese = 0;
-                                return 2;
-                            case 12: // _08005B5A
-                                dummyTwo = *textPrinter->subPrinter.current_text_offset;
-                                dummy = 0x100;
-                                temp = dummy | dummyTwo;
-                                textPrinter->subPrinter.current_text_offset++;
-                                break;
-                        }
-                        break;
-                    case 0xF8+3: // _08005B48
-                        textPrinter->state = 2;
-                        TextPrinterInitDownArrowCounters(textPrinter);
-                        return 3;
-                    case 0xF8+2: // _08005B4C
-                        textPrinter->state = 3;
-                        TextPrinterInitDownArrowCounters(textPrinter);
-                        return 3;
-                    case 0xF8+1: // _08005B5A
-                        dummyTwo = *textPrinter->subPrinter.current_text_offset;
-                        dummy = 0x100;
-                        temp = dummy | dummyTwo;
-                        textPrinter->subPrinter.current_text_offset++;
-                        break;
-                    case 0xF8+0: // _08005B6C
-                        temp = *textPrinter->subPrinter.current_text_offset;
-                        textPrinter->subPrinter.current_text_offset++;
-                        gUnknown_03002F90[0x80] = DrawKeypadIcon(textPrinter->subPrinter.windowId, temp, textPrinter->subPrinter.currentX, textPrinter->subPrinter.currentY);
-                        textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80] +  textPrinter->subPrinter.letterSpacing;
-                        return 0;
-                    case 0xF8+7: // _08005D6C
-                        return 1;
+                    ClearTextSpan(textPrinter, width);
+                    textPrinter->subPrinter.currentX += width;
+                    return 0;
                 }
-                
-            }
-            switch (r4->font_type) // _08005B90
-            {
-                case 0: // _08005BCC
-                    jpnvar =  textPrinter->japanese;
-                    DecompressGlyphFont0(temp, jpnvar);
-                    break;
-                case 1: // _08005BDA
-                    jpnvar =  textPrinter->japanese;
-                    DecompressGlyphFont1(temp, jpnvar);
-                    break;
-                case 2:
-                case 3:
-                case 4:
-                case 5: // _08005BE8
-                    jpnvar =  textPrinter->japanese;
-                    DecompressGlyphFont2(temp, jpnvar);
-                    break;
-                case 7: // _08005BF6
-                    jpnvar =  textPrinter->japanese;
-                    DecompressGlyphFont7(temp, jpnvar);
-                    break;
-                case 8: // _08005C04
-                    jpnvar =  textPrinter->japanese;
-                    DecompressGlyphFont8(temp, jpnvar);
-                    break;
-                case 6: // _08005C10
-                    break;
-            }
-            CopyGlyphToWindow(textPrinter); // _08005C10
-            if (textPrinter->minLetterSpacing) 
-            {
-                textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80];
-                r4two = textPrinter->minLetterSpacing - gUnknown_03002F90[0x80];
-                if (r4two > 0)
+                return 2;
+            case 18: // _08005AF2
+                textPrinter->subPrinter.currentX = *textPrinter->subPrinter.current_text_offset + textPrinter->subPrinter.x;
+                textPrinter->subPrinter.current_text_offset++;
+                return 2;
+            case 19: // _08005B02
                 {
-                    ClearTextSpan(textPrinter, r4two);
-                    textPrinter->subPrinter.currentX += r4two;
+                    s32 widthHelper = *textPrinter->subPrinter.current_text_offset;
+                    widthHelper += textPrinter->subPrinter.x;
+                    textPrinter->subPrinter.current_text_offset++;
+                    width = widthHelper - textPrinter->subPrinter.currentX;
+                    if (width > 0)
+                    {
+                        ClearTextSpan(textPrinter, width);
+                        textPrinter->subPrinter.currentX += width;
+                        return 0;
+                    }
                 }
+                return 2;
+            case 20: // _08005B26
+                textPrinter->minLetterSpacing = *textPrinter->subPrinter.current_text_offset++;
+                return 2;
+            case 21: // _08005B36
+                textPrinter->japanese = 1;
+                return 2;
+            case 22: // _08005B3E
+                textPrinter->japanese = 0;
+                return 2;
+            case 12: // _08005B5A
+                currChar = *textPrinter->subPrinter.current_text_offset | 0x100;
+                textPrinter->subPrinter.current_text_offset++;
+                break;
             }
-            else // _08005C48
-            {
-                if (textPrinter->japanese)
-                    textPrinter->subPrinter.currentX += (gUnknown_03002F90[0x80] + textPrinter->subPrinter.letterSpacing);
-                else
-                    textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80];
-            }
-            return 0;
-        case 1: // _08005C78
-            if (TextPrinterWait(textPrinter))
-                textPrinter->state = 0;
+            break;
+
+        case 0xF8+3: // _08005B48
+            textPrinter->state = 2;
+            TextPrinterInitDownArrowCounters(textPrinter);
             return 3;
-        case 2: // _08005C8C
-            if (TextPrinterWaitWithDownArrow(textPrinter))
-            {
-                FillWindowPixelBuffer(textPrinter->subPrinter.windowId, (textPrinter->subPrinter.bgColor << 4) | textPrinter->subPrinter.bgColor);
-                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
-                textPrinter->subPrinter.currentY = textPrinter->subPrinter.y;
-                textPrinter->state = 0;
-            }
+        case 0xF8+2: // _08005B4C
+            textPrinter->state = 3;
+            TextPrinterInitDownArrowCounters(textPrinter);
             return 3;
-        case 3: // _08005CB8
-            if (TextPrinterWaitWithDownArrow(textPrinter))
+        case 0xF8+1: // _08005B5A
+            currChar = *textPrinter->subPrinter.current_text_offset | 0x100;
+            textPrinter->subPrinter.current_text_offset++;
+            break;
+        case 0xF8+0: // _08005B6C
+            currChar = *textPrinter->subPrinter.current_text_offset;
+            textPrinter->subPrinter.current_text_offset++;
+            gUnknown_03002F90[0x80] = DrawKeypadIcon(textPrinter->subPrinter.windowId, currChar, textPrinter->subPrinter.currentX, textPrinter->subPrinter.currentY);
+            textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80] + textPrinter->subPrinter.letterSpacing;
+            return 0;
+        case 0xF8+7: // _08005D6C
+            return 1;
+        }
+
+        switch (r4->font_type) // _08005B90
+        {
+        case 0: // _08005BCC
+            DecompressGlyphFont0(currChar, textPrinter->japanese);
+            break;
+        case 1: // _08005BDA
+            DecompressGlyphFont1(currChar, textPrinter->japanese);
+            break;
+        case 2:
+        case 3:
+        case 4:
+        case 5: // _08005BE8
+            DecompressGlyphFont2(currChar, textPrinter->japanese);
+            break;
+        case 7: // _08005BF6
+            DecompressGlyphFont7(currChar, textPrinter->japanese);
+            break;
+        case 8: // _08005C04
+            DecompressGlyphFont8(currChar, textPrinter->japanese);
+            break;
+        case 6: // _08005C10
+            break;
+        }
+
+        CopyGlyphToWindow(textPrinter); // _08005C10
+
+        if (textPrinter->minLetterSpacing)
+        {
+            textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80];
+            width = textPrinter->minLetterSpacing - gUnknown_03002F90[0x80];
+            if (width > 0)
             {
-                TextPrinterClearDownArrow(textPrinter);
-                textPrinter->scrollDistance = gFonts[textPrinter->subPrinter.fontId].maxLetterHeight + textPrinter->subPrinter.lineSpacing;
-                textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
-                textPrinter->state = 4;
+                ClearTextSpan(textPrinter, width);
+                textPrinter->subPrinter.currentX += width;
             }
-            return 3;
-        case 4: // _08005CF0
-            if (textPrinter->scrollDistance)
+        }
+        else // _08005C48
+        {
+            if (textPrinter->japanese)
+                textPrinter->subPrinter.currentX += (gUnknown_03002F90[0x80] + textPrinter->subPrinter.letterSpacing);
+            else
+                textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80];
+        }
+
+        return 0;
+    case 1: // _08005C78
+        if (TextPrinterWait(textPrinter))
+            textPrinter->state = 0;
+        return 3;
+    case 2: // _08005C8C
+        if (TextPrinterWaitWithDownArrow(textPrinter))
+        {
+            FillWindowPixelBuffer(textPrinter->subPrinter.windowId, (textPrinter->subPrinter.bgColor << 4) | textPrinter->subPrinter.bgColor);
+            textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
+            textPrinter->subPrinter.currentY = textPrinter->subPrinter.y;
+            textPrinter->state = 0;
+        }
+        return 3;
+    case 3: // _08005CB8
+        if (TextPrinterWaitWithDownArrow(textPrinter))
+        {
+            TextPrinterClearDownArrow(textPrinter);
+            textPrinter->scrollDistance = gFonts[textPrinter->subPrinter.fontId].maxLetterHeight + textPrinter->subPrinter.lineSpacing;
+            textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
+            textPrinter->state = 4;
+        }
+        return 3;
+    case 4: // _08005CF0
+        if (textPrinter->scrollDistance)
+        {
+            int scrollSpeed = sub_8197964();
+            int speed = gWindowVerticalScrollSpeeds[scrollSpeed];
+            if (textPrinter->scrollDistance < speed)
             {
-                int scrollSpeed = sub_8197964();
-                int r4two = gWindowVerticalScrollSpeeds[scrollSpeed];
-                if (textPrinter->scrollDistance < r4two)
-                {
-                    ScrollWindow(textPrinter->subPrinter.windowId, 0, textPrinter->scrollDistance, textPrinter->subPrinter.bgColor << 4 | textPrinter->subPrinter.bgColor);
-                    textPrinter->scrollDistance = 0;
-                }
-                else
-                {
-                    ScrollWindow(textPrinter->subPrinter.windowId, 0, (int)r4two, textPrinter->subPrinter.bgColor << 4 | textPrinter->subPrinter.bgColor);
-                    textPrinter->scrollDistance -= r4two;
-                }
-                CopyWindowToVram(textPrinter->subPrinter.windowId, 2);
+                ScrollWindow(textPrinter->subPrinter.windowId, 0, textPrinter->scrollDistance, textPrinter->subPrinter.bgColor << 4 | textPrinter->subPrinter.bgColor);
+                textPrinter->scrollDistance = 0;
             }
             else
-                textPrinter->state = 0;
-            return 3;
-        case 5: // _08005D48
-            if (!IsSEPlaying())
-                textPrinter->state = 0;
-            return 3;
-        case 6: // _08005D5A
-            if (textPrinter->delayCounter != 0)
-                textPrinter->delayCounter--;
-            else
-                textPrinter->state = 0;
-            return 3;
+            {
+                ScrollWindow(textPrinter->subPrinter.windowId, 0, speed, textPrinter->subPrinter.bgColor << 4 | textPrinter->subPrinter.bgColor);
+                textPrinter->scrollDistance -= speed;
+            }
+            CopyWindowToVram(textPrinter->subPrinter.windowId, 2);
+        }
+        else
+        {
+            textPrinter->state = 0;
+        }
+        return 3;
+    case 5: // _08005D48
+        if (!IsSEPlaying())
+            textPrinter->state = 0;
+        return 3;
+    case 6: // _08005D5A
+        if (textPrinter->delayCounter != 0)
+            textPrinter->delayCounter--;
+        else
+            textPrinter->state = 0;
+        return 3;
     }
+
     return 1;
 }
 #else
-- 
cgit v1.2.3


From f0cc705d35820fa6673200ace50aa67e5832f3f8 Mon Sep 17 00:00:00 2001
From: golem galvanize <golemgalvanize@github.com>
Date: Tue, 30 Jan 2018 17:16:41 -0500
Subject: fixes

---
 src/field_message_box.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/field_message_box.c b/src/field_message_box.c
index fc51bc588..ea80b2ea9 100755
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -1,19 +1,11 @@
 #include "global.h"
+#include "new_menu_helpers.h"
 #include "string.h"
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
 
-extern void sub_81973A4(void);
-extern void sub_81973C4(u8, u8);
-extern u16 sub_8197224(void);
-extern int sub_8196094(void);
-extern void sub_8196080(u8*);
-extern void AddTextPrinterForMessage(u8);
-extern void sub_8197434(u8, u8);
-extern void sub_81973FC(u8, u8);
-
-extern u8 gUnknown_020375BC;
+u8 gUnknown_020375BC = 0;
 
 void textbox_fdecode_auto_and_task_add(u8*, int);
 void textbox_auto_and_task_add(void);
-- 
cgit v1.2.3


From 741b8adf9a43989182ff3648bf14e3236d4b5ce9 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 30 Jan 2018 23:23:35 +0100
Subject: decompile mystery event menu

---
 src/battle_controllers.c |   6 +-
 src/mystery_event_menu.c | 303 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 306 insertions(+), 3 deletions(-)
 create mode 100644 src/mystery_event_menu.c

(limited to 'src')

diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index c6d47e71e..c28b6ef3b 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -64,7 +64,7 @@ void HandleLinkBattleSetup(void)
         if (gLinkVSyncDisabled)
             sub_800B488();
         if (!gReceivedRemoteLinkPlayers)
-            sub_8009734();
+            OpenLink();
         CreateTask(task00_08081A90, 0);
         CreateTasksForSendRecvLinkBuffers();
     }
@@ -793,9 +793,9 @@ static void Task_HandleSendLinkBuffersData(u8 taskId)
             else
                 var = (gBattleTypeFlags & BATTLE_TYPE_MULTI) ? 4 : 2;
 
-            if (sub_800ABAC() >= var)
+            if (GetLinkPlayerCount_2() >= var)
             {
-                if (sub_800ABBC())
+                if (IsLinkMaster())
                 {
                     sub_800A620();
                     gTasks[taskId].data[11]++;
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
new file mode 100644
index 000000000..0478f50cd
--- /dev/null
+++ b/src/mystery_event_menu.c
@@ -0,0 +1,303 @@
+#include "global.h"
+#include "mystery_event_menu.h"
+#include "link.h"
+#include "main.h"
+#include "menu.h"
+#include "mystery_event_script.h"
+#include "palette.h"
+#include "save.h"
+#include "constants/songs.h"
+#include "sound.h"
+#include "sprite.h"
+#include "string_util.h"
+#include "strings.h"
+#include "task.h"
+#include "text.h"
+#include "bg.h"
+#include "window.h"
+#include "gpu_regs.h"
+#include "text_window.h"
+#include "new_menu_helpers.h"
+#include "decompress.h"
+
+// this file's functions
+static void CB2_MysteryEventMenu(void);
+static void PrintMysteryMenuText(u8 windowId, const u8 *text, u8 x, u8 y, s32 speed);
+
+// EWRAM vars
+static EWRAM_DATA u8 sUnknown_0203BCF8 = 0; // set but unused
+
+// const rom data
+static const struct BgTemplate sBgTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    }
+};
+
+static const struct WindowTemplate sWindowTemplates[] =
+{
+    {0, 4, 15, 22, 4, 14, 20},
+    {0, 7, 6, 16, 4, 14, 0x6C},
+    DUMMY_WIN_TEMPLATE
+};
+
+// code
+static void VBlankCB(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+static bool8 CheckLanguageMatch(void)
+{
+    return (gLinkPlayers[0].language == gLinkPlayers[1].language);
+}
+
+void CB2_InitMysteryEventMenu(void)
+{
+    ResetSpriteData();
+    FreeAllSpritePalettes();
+    ResetTasks();
+    SetVBlankCallback(VBlankCB);
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates));
+    if (InitWindows(sWindowTemplates))
+    {
+        s32 i;
+
+        DeactivateAllTextPrinters();
+        for (i = 0; i < 2; i++)
+            FillWindowPixelBuffer(i, 0);
+
+        FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
+        sub_809882C(0, 1u, 0xD0u);
+        sub_81978B0(0xE0);
+        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON);
+        SetGpuReg(REG_OFFSET_BLDCNT, 0);
+        CreateTask(Task_DestroySelf, 0);
+        StopMapMusic();
+        RunTasks();
+        AnimateSprites();
+        BuildOamBuffer();
+        RunTextPrinters();
+        UpdatePaletteFade();
+        FillPalette(0, 0, 2);
+        SetMainCallback2(CB2_MysteryEventMenu);
+    }
+}
+
+static bool8 GetEventLoadMessage(u8 *dest, u32 status)
+{
+    bool8 retVal = TRUE;
+
+    if (status == 0)
+    {
+        StringCopy(dest, gText_EventSafelyLoaded);
+        retVal = FALSE;
+    }
+
+    if (status == 2)
+        retVal = FALSE;
+
+    if (status == 1)
+        StringCopy(dest, gText_LoadErrorEndingSession);
+
+    return retVal;
+}
+
+static void CB2_MysteryEventMenu(void)
+{
+    switch (gMain.state)
+    {
+    case 0:
+        SetWindowBorderStyle(0, 1, 1, 0xD);
+        PutWindowTilemap(0);
+        CopyWindowToVram(0, 3);
+        ShowBg(0);
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        gMain.state++;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+            PrintMysteryMenuText(0, gText_LinkStandby2, 1, 2, 1);
+            gMain.state++;
+        }
+        break;
+    case 2:
+        if (!IsTextPrinterActive(0))
+        {
+            gMain.state++;
+            gLinkType = 21761;
+            OpenLink();
+        }
+        break;
+    case 3:
+        if ((gLinkStatus & 0x20) && (gLinkStatus & 0x1C) > 4)
+        {
+            PlaySE(SE_PIN);
+            PrintMysteryMenuText(0, gText_PressAToLoadEvent, 1, 2, 1);
+            gMain.state++;
+        }
+        if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            CloseLink();
+            gMain.state = 15;
+        }
+        break;
+    case 4:
+        if (!IsTextPrinterActive(0))
+            gMain.state++;
+        break;
+    case 5:
+        if (GetLinkPlayerCount_2() == 2)
+        {
+            if (gMain.newKeys & A_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                sub_800A620();
+                SetWindowBorderStyle(1, 1, 1, 0xD);
+                PrintMysteryMenuText(1, gText_LoadingEvent, 1, 2, 0);
+                PutWindowTilemap(1);
+                CopyWindowToVram(1, 3);
+                gMain.state++;
+            }
+            else if (gMain.newKeys & B_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                CloseLink();
+                gMain.state = 15;
+            }
+        }
+        else
+        {
+            GetEventLoadMessage(gStringVar4, 1);
+            PrintMysteryMenuText(0, gStringVar4, 1, 2, 1);
+            gMain.state = 13;
+        }
+        break;
+    case 6:
+        if (IsLinkConnectionEstablished())
+        {
+            if (gReceivedRemoteLinkPlayers != 0)
+            {
+                if (sub_800A0C8(2, 2) == 3)
+                {
+                    sub_800AC34();
+                    GetEventLoadMessage(gStringVar4, 1);
+                    PrintMysteryMenuText(0, gStringVar4, 1, 2, 1);
+                    gMain.state = 13;
+                }
+                else if (CheckLanguageMatch())
+                {
+                    PrintMysteryMenuText(0, gText_DontRemoveCableTurnOff, 1, 2, 1);
+                    gMain.state++;
+                }
+                else
+                {
+                    CloseLink();
+                    GetEventLoadMessage(gStringVar4, 1);
+                    PrintMysteryMenuText(0, gStringVar4, 1, 2, 1);
+                    gMain.state = 13;
+                }
+            }
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            CloseLink();
+            gMain.state = 15;
+        }
+        break;
+    case 7:
+        if (!IsTextPrinterActive(0))
+            gMain.state++;
+        break;
+    case 8:
+        if (GetBlockReceivedStatus())
+        {
+            ResetBlockReceivedFlags();
+            gMain.state++;
+        }
+        break;
+    case 9:
+        gMain.state++;
+        break;
+    case 10:
+        sub_800AC34();
+        gMain.state++;
+        break;
+    case 11:
+        if (gReceivedRemoteLinkPlayers == 0)
+        {
+            u16 unkVal = RunMysteryEventScript(gDecompressionBuffer);
+            CpuFill32(0, gDecompressionBuffer, 0x7D4);
+            if (!GetEventLoadMessage(gStringVar4, unkVal))
+                TrySavingData(NORMAL_SAVE);
+            gMain.state++;
+        }
+        break;
+    case 12:
+        PrintMysteryMenuText(0, gStringVar4, 1, 2, 1);
+        gMain.state++;
+        break;
+    case 13:
+        if (!IsTextPrinterActive(0))
+        {
+            gMain.state++;
+            sUnknown_0203BCF8 = 0;
+        }
+        break;
+    case 14:
+        if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            gMain.state++;
+        }
+        break;
+    case 15:
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        gMain.state++;
+        break;
+    case 16:
+        if (!gPaletteFade.active)
+            DoSoftReset();
+        break;
+    }
+
+    if (gLinkStatus & 0x40 && !IsLinkMaster())
+    {
+        CloseLink();
+        GetEventLoadMessage(gStringVar4, 1);
+        PrintMysteryMenuText(0, gStringVar4, 1, 2, 1);
+        gMain.state = 13;
+    }
+
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    RunTextPrinters();
+    UpdatePaletteFade();
+}
+
+static void PrintMysteryMenuText(u8 windowId, const u8 *text, u8 x, u8 y, s32 speed)
+{
+    struct TextColor textColor;
+    u8 letterSpacing = 0;
+    u8 lineSpacing = 1;
+    textColor.fgColor = 1;
+    textColor.bgColor = 2;
+    textColor.shadowColor = 3;
+
+    FillWindowPixelBuffer(windowId, (textColor.fgColor) | (textColor.fgColor << 4));
+    AddTextPrinterParameterized2(windowId, 1, x, y, letterSpacing, lineSpacing, &textColor, speed, text);
+}
-- 
cgit v1.2.3


From 6453b884338f070c6626e84ca591db7f71dcb3ad Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 30 Jan 2018 18:19:41 -0500
Subject: finish decompiling field_map_obj_helpers.c

---
 src/field_map_obj_helpers.c | 319 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 319 insertions(+)

(limited to 'src')

diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index b0f7442f4..a9c6dcc5c 100755
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -2,8 +2,13 @@
 #include "field_ground_effect.h"
 #include "field_map_obj.h"
 #include "field_effect.h"
+#include "map_obj_8097404.h"
+#include "malloc.h"
+#include "task.h"
+#include "util.h"
 
 extern void sub_8097D68(struct Sprite *sprite);
+extern void sub_8097FE4(u8);
 
 typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
 
@@ -523,3 +528,317 @@ void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite)
     gFieldEffectArguments[3] = 3;
     FieldEffectStart(FLDEFF_RIPPLE);
 }
+
+#ifdef NONMATCHING
+bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    bool32 ableToStore = FALSE;
+    if (gUnknown_020375B8 == NULL)
+    {
+        gUnknown_020375B8 = AllocZeroed(0x14);
+        gUnknown_020375B8[0] = mapObject->localId;
+        gUnknown_020375B8[16] = 1;
+        ableToStore = TRUE;
+    }
+    else
+    {
+        u8 i;
+        u8 firstFreeSlot;
+        bool32 found;
+        for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++)
+        {
+            if (firstFreeSlot == 16 && gUnknown_020375B8[i] == 0)
+                firstFreeSlot = i;
+            
+            if (gUnknown_020375B8[i] == mapObject->localId)
+            {
+                found = TRUE;
+                break;
+            }
+        }
+        
+        if (!found && firstFreeSlot != 16)
+        {
+            gUnknown_020375B8[firstFreeSlot] = mapObject->localId;
+            gUnknown_020375B8[16]++;
+            ableToStore = TRUE; // the nonmatching problem is that ableToStore == TRUE isnt being merged with the above ableToStore = TRUE assignment.
+        }
+    }
+    
+    if (ableToStore == TRUE)
+    {
+        mapObject->mapobj_bit_12 = TRUE;
+        mapObject->mapobj_bit_9 = TRUE;
+    }
+    
+    sprite->data[2] = 1;
+    return TRUE;
+}
+#else
+__attribute__((naked))
+bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    adds r4, r0, 0\n\
+    mov r8, r1\n\
+    movs r0, 0\n\
+    mov r12, r0\n\
+    ldr r0, =gUnknown_020375B8\n\
+    ldr r1, [r0]\n\
+    adds r6, r0, 0\n\
+    cmp r1, 0\n\
+    bne _08097E80\n\
+    movs r0, 0x14\n\
+    bl AllocZeroed\n\
+    str r0, [r6]\n\
+    ldrb r1, [r4, 0x8]\n\
+    strb r1, [r0]\n\
+    ldr r1, [r6]\n\
+    movs r0, 0x1\n\
+    strb r0, [r1, 0x10]\n\
+    b _08097ECC\n\
+    .pool\n\
+_08097E80:\n\
+    movs r2, 0x10\n\
+    movs r5, 0\n\
+    movs r1, 0\n\
+    adds r3, r6, 0\n\
+    b _08097E90\n\
+_08097E8A:\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+_08097E90:\n\
+    cmp r1, 0xF\n\
+    bhi _08097EB2\n\
+    cmp r2, 0x10\n\
+    bne _08097EA4\n\
+    ldr r0, [r3]\n\
+    adds r0, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08097EA4\n\
+    adds r2, r1, 0\n\
+_08097EA4:\n\
+    ldr r0, [r3]\n\
+    adds r0, r1\n\
+    ldrb r0, [r0]\n\
+    ldrb r7, [r4, 0x8]\n\
+    cmp r0, r7\n\
+    bne _08097E8A\n\
+    movs r5, 0x1\n\
+_08097EB2:\n\
+    cmp r5, 0\n\
+    bne _08097ECE\n\
+    cmp r2, 0x10\n\
+    beq _08097ECE\n\
+    ldr r0, [r6]\n\
+    adds r0, r2\n\
+    ldrb r1, [r4, 0x8]\n\
+    strb r1, [r0]\n\
+    ldr r1, [r6]\n\
+    ldrb r0, [r1, 0x10]\n\
+    adds r0, 0x1\n\
+    strb r0, [r1, 0x10]\n\
+    movs r0, 0x1\n\
+_08097ECC:\n\
+    mov r12, r0\n\
+_08097ECE:\n\
+    mov r1, r12\n\
+    cmp r1, 0x1\n\
+    bne _08097EE0\n\
+    ldrb r0, [r4, 0x1]\n\
+    movs r1, 0x10\n\
+    orrs r0, r1\n\
+    movs r1, 0x2\n\
+    orrs r0, r1\n\
+    strb r0, [r4, 0x1]\n\
+_08097EE0:\n\
+    movs r0, 0x1\n\
+    mov r7, r8\n\
+    strh r0, [r7, 0x32]\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .syntax divided");
+}
+#endif
+
+// this function is very similar to the above one and I don't want to decompile this one until the above is matching.
+__attribute__((naked))
+bool32 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    adds r6, r0, 0\n\
+    mov r8, r1\n\
+    movs r0, 0x1\n\
+    strh r0, [r1, 0x32]\n\
+    ldr r5, =gUnknown_020375B8\n\
+    ldr r0, [r5]\n\
+    cmp r0, 0\n\
+    beq _08097F68\n\
+    movs r7, 0\n\
+    adds r0, r6, 0\n\
+    bl sub_8097F78\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+    cmp r1, 0x10\n\
+    beq _08097F28\n\
+    ldr r0, [r5]\n\
+    adds r0, r1\n\
+    movs r1, 0\n\
+    strb r1, [r0]\n\
+    ldr r1, [r5]\n\
+    ldrb r0, [r1, 0x10]\n\
+    subs r0, 0x1\n\
+    strb r0, [r1, 0x10]\n\
+    movs r7, 0x1\n\
+_08097F28:\n\
+    ldr r0, [r5]\n\
+    ldrb r4, [r0, 0x10]\n\
+    cmp r4, 0\n\
+    bne _08097F36\n\
+    bl Free\n\
+    str r4, [r5]\n\
+_08097F36:\n\
+    cmp r7, 0x1\n\
+    bne _08097F68\n\
+    ldrb r0, [r6, 0x5]\n\
+    bl GetFieldObjectGraphicsInfo\n\
+    ldrb r1, [r0, 0xC]\n\
+    lsls r1, 25\n\
+    lsrs r1, 31\n\
+    lsls r1, 4\n\
+    ldrb r2, [r6, 0x1]\n\
+    movs r0, 0x11\n\
+    negs r0, r0\n\
+    ands r0, r2\n\
+    orrs r0, r1\n\
+    movs r1, 0x3\n\
+    negs r1, r1\n\
+    ands r0, r1\n\
+    strb r0, [r6, 0x1]\n\
+    mov r2, r8\n\
+    adds r2, 0x2C\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0x41\n\
+    negs r0, r0\n\
+    ands r0, r1\n\
+    strb r0, [r2]\n\
+_08097F68:\n\
+    movs r0, 0x1\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .pool\n\
+    .syntax divided");
+}
+
+u8 sub_8097F78(struct MapObject *mapObject)
+{
+    u8 i;
+
+    for(i = 0; i < 0x10; i++)
+    {
+        if(gUnknown_020375B8[i] == mapObject->localId)
+            return i;
+    }
+    return 0x10;
+}
+
+void sub_8097FA4(struct MapObject *mapObject)
+{
+    u8 taskId = CreateTask(sub_8097FE4, 0xFF);
+    struct Task *task = &gTasks[taskId];
+
+    StoreWordInTwoHalfwords(&task->data[0], (u32)mapObject);
+    mapObject->mapobj_unk_1B = taskId;
+    task->data[3] = 0xFFFF;
+}
+
+void sub_8097FE4(u8 taskId)
+{
+    struct MapObject *mapObject;
+    struct Sprite *sprite;
+    struct Task *task = &gTasks[taskId];
+
+    LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&mapObject); // load the map object pointer.
+    sprite = &gSprites[mapObject->spriteId];
+
+    if(!(task->data[2] & 0x3))
+        sprite->pos2.y += task->data[3];
+
+    if(!(task->data[2] & 0xF))
+        task->data[3] = -task->data[3];
+
+    task->data[2]++;
+}
+
+void sub_8098044(u8 taskId)
+{
+    u32 word;
+    struct Task *task = &gTasks[taskId];
+
+    LoadWordFromTwoHalfwords(&task->data[0], &word); // huh??? why does it load a word that never gets used???
+    DestroyTask(taskId);
+}
+
+void sub_8098074(u8 var1, u8 var2)
+{
+    u8 i;
+
+    for(i = 0; i < 0x10; i++)
+    {
+        if(i != var1 && i != var2 &&
+            gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
+                FreezeMapObject(&gMapObjects[i]);
+    }
+}
+
+bool32 sub_80980C0(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sprite->pos2.y = 0;
+    sprite->data[2]++;
+    return FALSE;
+}
+
+bool32 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sprite->pos2.y -= 8;
+
+    if(sprite->pos2.y == -160)
+        sprite->data[2]++;
+    return FALSE;
+}
+
+bool32 sub_80980F4(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sprite->pos2.y = -160;
+    sprite->data[2]++;
+    return FALSE;
+}
+
+bool32 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sprite->pos2.y += 8;
+
+    if(!sprite->pos2.y)
+        sprite->data[2]++;
+    return FALSE;
+}
+
+// though this function returns FALSE without doing anything, this header is required due to being in an array of functions which needs it.
+bool32 sub_8098124(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    return TRUE;
+}
-- 
cgit v1.2.3


From 536a338ff9aac796c542b3bb01a822c2a28df0a5 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 30 Jan 2018 18:22:56 -0500
Subject: cleanup

---
 src/field_map_obj_helpers.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index a9c6dcc5c..27f1de479 100755
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -43,7 +43,7 @@ bool8 FreezeMapObject(struct MapObject *mapObject)
 void FreezeMapObjects(void)
 {
     u8 i;
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
         if (gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
             FreezeMapObject(&gMapObjects[i]);
 }
@@ -51,7 +51,7 @@ void FreezeMapObjects(void)
 void FreezeMapObjectsExceptOne(u8 a1)
 {
     u8 i;
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
         if (i != a1 && gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
             FreezeMapObject(&gMapObjects[i]);
 }
@@ -69,7 +69,7 @@ void npc_sync_anim_pause_bits(struct MapObject *mapObject)
 void UnfreezeMapObjects(void)
 {
     u8 i;
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
         if (gMapObjects[i].active)
             npc_sync_anim_pause_bits(&gMapObjects[i]);
 }
@@ -748,12 +748,12 @@ u8 sub_8097F78(struct MapObject *mapObject)
 {
     u8 i;
 
-    for(i = 0; i < 0x10; i++)
+    for(i = 0; i < MAP_OBJECTS_COUNT; i++)
     {
         if(gUnknown_020375B8[i] == mapObject->localId)
             return i;
     }
-    return 0x10;
+    return MAP_OBJECTS_COUNT;
 }
 
 void sub_8097FA4(struct MapObject *mapObject)
@@ -797,7 +797,7 @@ void sub_8098074(u8 var1, u8 var2)
 {
     u8 i;
 
-    for(i = 0; i < 0x10; i++)
+    for(i = 0; i < MAP_OBJECTS_COUNT; i++)
     {
         if(i != var1 && i != var2 &&
             gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
@@ -837,7 +837,7 @@ bool32 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-// though this function returns FALSE without doing anything, this header is required due to being in an array of functions which needs it.
+// though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it.
 bool32 sub_8098124(struct MapObject *mapObject, struct Sprite *sprite)
 {
     return TRUE;
-- 
cgit v1.2.3


From 05bd37bf469638c5f918733d074ec930af3f6508 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 30 Jan 2018 18:30:59 -0500
Subject: rename header

---
 src/field_map_obj.c         | 2 +-
 src/field_map_obj_helpers.c | 2 +-
 src/item_use.c              | 2 +-
 src/trainer_see.c           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index df80494b3..906eff4b7 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -14,7 +14,7 @@
 #include "rom_818CFC8.h"
 #include "rom_81BE66C.h"
 #include "field_ground_effect.h"
-#include "map_obj_8097404.h"
+#include "field_map_obj_helpers.h"
 #include "mauville_old_man.h"
 #include "metatile_behavior.h"
 #include "field_effect.h"
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index 27f1de479..ed578ad61 100755
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -2,7 +2,7 @@
 #include "field_ground_effect.h"
 #include "field_map_obj.h"
 #include "field_effect.h"
-#include "map_obj_8097404.h"
+#include "field_map_obj_helpers.h"
 #include "malloc.h"
 #include "task.h"
 #include "util.h"
diff --git a/src/item_use.c b/src/item_use.c
index 4c7276bb8..8fe705a50 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -15,7 +15,7 @@
 #include "field_screen.h"
 #include "field_weather.h"
 #include "item.h"
-#include "map_obj_8097404.h"
+#include "field_map_obj_helpers.h"
 #include "mail.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 38773ec50..7706da703 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -6,7 +6,7 @@
 #include "field_effect.h"
 #include "field_map_obj.h"
 #include "field_player_avatar.h"
-#include "map_obj_8097404.h"
+#include "field_map_obj_helpers.h"
 #include "pokenav.h"
 #include "task.h"
 #include "util.h"
-- 
cgit v1.2.3


From d5d62c9d4ddb047ad11129127102c63d54be6e54 Mon Sep 17 00:00:00 2001
From: golem galvanize <golemgalvanize@github.com>
Date: Tue, 30 Jan 2018 19:28:38 -0500
Subject: fix ewram

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

(limited to 'src')

diff --git a/src/field_message_box.c b/src/field_message_box.c
index ea80b2ea9..9570040eb 100755
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -5,7 +5,7 @@
 #include "task.h"
 #include "text.h"
 
-u8 gUnknown_020375BC = 0;
+EWRAM_DATA u8 gUnknown_020375BC = 0;
 
 void textbox_fdecode_auto_and_task_add(u8*, int);
 void textbox_auto_and_task_add(void);
-- 
cgit v1.2.3


From 3ff5db0b69a56fe916c156bc97d7753b570a12d7 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 30 Jan 2018 21:17:36 -0500
Subject: forward declarations

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

(limited to 'src')

diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index ed578ad61..1e0e9b66b 100755
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -7,9 +7,6 @@
 #include "task.h"
 #include "util.h"
 
-extern void sub_8097D68(struct Sprite *sprite);
-extern void sub_8097FE4(u8);
-
 typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
 
 extern const struct Coords16 gUnknown_0850DB7C[4];
@@ -23,6 +20,9 @@ extern u8 gUnknown_0850E846[];
 extern s16 gUnknown_0850E84A[];
 extern u8 gUnknown_0850E850[];
 
+void sub_8097D68(struct Sprite *sprite);
+void sub_8097FE4(u8);
+
 bool8 FreezeMapObject(struct MapObject *mapObject)
 {
     if (mapObject->mapobj_bit_6 || mapObject->mapobj_bit_8)
-- 
cgit v1.2.3


From db6185275eeacef224ed76dfc733f912cb5350b7 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 31 Jan 2018 13:05:36 +0100
Subject: start decompiling rayquaza scene

---
 src/rayquaza_scene.c | 406 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 389 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index ce8747395..72aeab94e 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -1,15 +1,19 @@
 #include "global.h"
+#include "rayquaza_scene.h"
 #include "sprite.h"
 #include "task.h"
 #include "graphics.h"
 #include "bg.h"
-
-struct UnkRayquazaStruct
-{
-    u32 field_0;
-    u32 field_4;
-    u32 field_8;
-};
+#include "main.h"
+#include "malloc.h"
+#include "palette.h"
+#include "scanline_effect.h"
+#include "menu.h"
+#include "menu_helpers.h"
+#include "gpu_regs.h"
+#include "decompress.h"
+#include "sound.h"
+#include "constants/songs.h"
 
 // this file's functions
 void sub_81D7134(u8 taskId);
@@ -17,21 +21,21 @@ void sub_81D7F4C(u8 taskId);
 void sub_81D84EC(u8 taskId);
 void sub_81D8980(u8 taskId);
 void sub_81D8DB4(u8 taskId);
-void sub_81D6800(u8 taskId);
+void Task_EndAfterFadeScreen(u8 taskId);
 
 void sub_81D8260(struct Sprite *sprite);
 void sub_81D961C(struct Sprite *sprite);
 
 // const rom data
-const TaskFunc gUnknown_0862A6A0[] =
+const TaskFunc sTasksForAnimations[] =
 {
-    sub_81D7134,
-    sub_81D7134,
-    sub_81D7F4C,
-    sub_81D84EC,
-    sub_81D8980,
-    sub_81D8DB4,
-    sub_81D6800
+    sub_81D7134, // RAY_ANIM_DUO_FIGHT_PRE
+    sub_81D7134, // RAY_ANIM_DUO_FIGHT
+    sub_81D7F4C, // RAY_ANIM_TAKES_FLIGHT
+    sub_81D84EC, // RAY_ANIM_DESCENDS
+    sub_81D8980, // RAY_ANIM_CHARGES
+    sub_81D8DB4, // RAY_ANIM_CHACES_AWAY
+    Task_EndAfterFadeScreen // RAY_ANIM_END
 };
 
 static const struct OamData sOamData_862A6BC =
@@ -372,7 +376,12 @@ const struct SpriteTemplate gUnknown_0862A864 =
     .callback = SpriteCallbackDummy,
 };
 
-const struct UnkRayquazaStruct gUnknown_0862A87C = {0x4000014, 0xA2600001, 1};
+const struct ScanlineEffectParams gUnknown_0862A87C =
+{
+    .dmaDest = (vu16 *)REG_ADDR_BG1HOFS,
+    .dmaControl = 0xA2600001,
+    .initState = 1
+};
 
 const struct BgTemplate gUnknown_0862A888[] =
 {
@@ -1162,3 +1171,366 @@ const struct BgTemplate gUnknown_0862AD08[] =
     }
 };
 
+struct RaySceneStruct
+{
+    MainCallback callback;
+    u8 tilemapBuffers[3][0x800];
+    u8 field_1804[0x800];
+    u16 field_2004;
+    u8 animId;
+    bool8 onlyOneAnim;
+};
+
+extern struct RaySceneStruct *sRayScene;
+
+// this file's functions
+void sub_81D6774(void);
+void sub_81D67D0(void);
+void sub_81D750C(void);
+void sub_81D7438(void);
+void sub_81D7480(void);
+void sub_81D74C8(void);
+void sub_81D75B4(u8 taskId, s8 palDelay);
+void sub_81D6A20(struct Sprite *sprite);
+void sub_81D6D20(struct Sprite *sprite);
+void sub_81D7228(u8 taskId);
+void sub_81D736C(u8 taskId);
+u8 sub_81D7664(void);
+u8 sub_81D78BC(void);
+
+// code
+void sub_81D6720(u8 animId, bool8 onlyOneAnim, MainCallback callback)
+{
+    sRayScene = AllocZeroed(0x2018);
+    sRayScene->animId = animId;
+    sRayScene->callback = callback;
+    sRayScene->onlyOneAnim = onlyOneAnim;
+    SetMainCallback2(sub_81D6774);
+}
+
+void sub_81D6774(void)
+{
+    SetVBlankHBlankCallbacksToNull();
+    clear_scheduled_bg_copies_to_vram();
+    ScanlineEffect_Stop();
+    FreeAllSpritePalettes();
+    ResetPaletteFade();
+    ResetSpriteData();
+    ResetTasks();
+    FillPalette(0, 0xF0, 0x20);
+    CreateTask(sTasksForAnimations[sRayScene->animId], 0);
+    SetMainCallback2(sub_81D67D0);
+}
+
+void sub_81D67D0(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    do_scheduled_bg_tilemap_copies_to_vram();
+    UpdatePaletteFade();
+}
+
+void sub_81D67EC(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void Task_EndAfterFadeScreen(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        SetMainCallback2(sRayScene->callback);
+        Free(sRayScene);
+        DestroyTask(taskId);
+    }
+}
+
+void Task_SetNextAnim(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        if (sRayScene->onlyOneAnim == TRUE)
+        {
+            gTasks[taskId].func = Task_EndAfterFadeScreen;
+        }
+        else
+        {
+            sRayScene->animId++;
+            sRayScene->field_2004 = 0;
+            gTasks[taskId].func = sTasksForAnimations[sRayScene->animId];
+        }
+    }
+}
+
+void sub_81D68C8(void)
+{
+    SetGpuReg(REG_OFFSET_WININ, 0x3F);
+    SetGpuReg(REG_OFFSET_WINOUT, 0);
+    SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
+    SetGpuReg(REG_OFFSET_WIN0V, 0x1888);
+    gPlttBufferUnfaded[0] = 0;
+    gPlttBufferFaded[0] = 0;
+}
+
+void sub_81D6904(void)
+{
+    SetGpuReg(REG_OFFSET_WININ, 0x3F);
+    SetGpuReg(REG_OFFSET_WINOUT, 0x3F);
+}
+
+void sub_81D691C(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    sub_81D750C();
+    if (!gPaletteFade.active)
+    {
+        s16 counter = data[0];
+        if (counter == 64)
+        {
+            sub_81D7438();
+        }
+        else if (counter == 144)
+        {
+            sub_81D7480();
+        }
+        else
+        {
+            switch (counter)
+            {
+            case 328:
+                sub_81D75B4(taskId, 0);
+                return;
+            case 148:
+                sub_81D74C8();
+                break;
+            }
+        }
+
+        data[0]++;
+    }
+}
+
+u8 sub_81D6984(void)
+{
+    u8 spriteId;
+    s16 *data;
+
+    spriteId = CreateSprite(&gUnknown_0862A72C, 88, 72, 3);
+    gSprites[spriteId].callback = sub_81D6A20;
+    data = gSprites[spriteId].data;
+    data[0] = CreateSprite(&gUnknown_0862A72C, 56, 104, 3);
+    data[1] = CreateSprite(&gUnknown_0862A750, 75, 101, 0);
+    data[2] = CreateSprite(&gUnknown_0862A774, 109, 114, 1);
+    StartSpriteAnim(&gSprites[data[0]], 1);
+    return spriteId;
+}
+
+void sub_81D6A20(struct Sprite *sprite)
+{
+    s16 *data = sprite->data;
+    data[5]++;
+    data[5] &= 0x1F;
+    if (data[5] == 0 && sprite->pos1.x != 72)
+    {
+        sprite->pos1.x--;
+        gSprites[sprite->data[0]].pos1.x--;
+        gSprites[data[1]].pos1.x--;
+        gSprites[data[2]].pos1.x--;
+    }
+
+    switch (sprite->animCmdIndex)
+    {
+    case 0:
+        gSprites[data[1]].pos2.x = 0;
+        gSprites[data[1]].pos2.y = 0;
+        gSprites[data[2]].pos2.x = 0;
+        gSprites[data[2]].pos2.y = 0;
+        break;
+    case 1:
+    case 3:
+        gSprites[data[1]].pos2.x = -1;
+        gSprites[data[1]].pos2.y = 0;
+        gSprites[data[2]].pos2.x = -1;
+        gSprites[data[2]].pos2.y = 0;
+        break;
+    case 2:
+        gSprites[data[1]].pos2.x = -1;
+        gSprites[data[1]].pos2.y = 1;
+        gSprites[data[2]].pos2.x = -2;
+        gSprites[data[2]].pos2.y = 1;
+        break;
+    }
+}
+
+u8 sub_81D6B7C(void)
+{
+    u8 spriteId;
+    s16 *data;
+
+    spriteId = CreateSprite(&gUnknown_0862A81C, 136, 96, 1);
+    gSprites[spriteId].callback = sub_81D6D20;
+    data = gSprites[spriteId].data;
+
+    data[0] = CreateSprite(&gUnknown_0862A81C, 168, 96, 1) << 8;
+    data[0] |= CreateSprite(&gUnknown_0862A81C, 136, 112, 1);
+    data[1] = CreateSprite(&gUnknown_0862A81C, 168, 112, 1) << 8;
+    data[1] |= CreateSprite(&gUnknown_0862A81C, 136, 128, 1);
+    data[2] = CreateSprite(&gUnknown_0862A81C, 168, 128, 1) << 8;
+    data[2] |= CreateSprite(&gUnknown_0862A81C, 104, 128, 2);
+    data[3] = CreateSprite(&gUnknown_0862A81C, 136, 128, 2) << 8;
+    data[3] |= CreateSprite(&gUnknown_0862A81C, 184, 128, 0);
+    data[4] = CreateSprite(&gUnknown_0862A84C, 208, 132, 0) << 8;
+    data[4] |= CreateSprite(&gUnknown_0862A864, 200, 120, 1);
+
+    StartSpriteAnim(&gSprites[data[0] >> 8], 1);
+    StartSpriteAnim(&gSprites[data[0] & 0xFF], 2);
+    StartSpriteAnim(&gSprites[data[1] >> 8], 3);
+    StartSpriteAnim(&gSprites[data[1] & 0xFF], 4);
+    StartSpriteAnim(&gSprites[data[2] >> 8], 5);
+    StartSpriteAnim(&gSprites[data[2] & 0xFF], 6);
+    StartSpriteAnim(&gSprites[data[3] >> 8], 7);
+    StartSpriteAnim(&gSprites[data[3] & 0xFF], 8);
+
+    return spriteId;
+}
+
+void sub_81D6D20(struct Sprite *sprite)
+{
+    s16 *data = sprite->data;
+    data[5]++;
+    data[5] &= 0x1F;
+    if (data[5] == 0 && sprite->pos1.x != 152)
+    {
+        sprite->pos1.x++;
+        gSprites[sprite->data[0] >> 8].pos1.x++;
+        gSprites[sprite->data[0] & 0xFF].pos1.x++;
+        gSprites[data[1] >> 8].pos1.x++;
+        gSprites[data[1] & 0xFF].pos1.x++;
+        gSprites[data[2] >> 8].pos1.x++;
+        gSprites[data[2] & 0xFF].pos1.x++;
+        gSprites[data[3] >> 8].pos1.x++;
+        gSprites[data[3] & 0xFF].pos1.x++;
+        gSprites[data[4] >> 8].pos1.x++;
+        gSprites[data[4] & 0xFF].pos1.x++;
+    }
+
+    switch (gSprites[data[2] & 0xFF].animCmdIndex)
+    {
+    case 0:
+        sprite->pos2.y = 0;
+        gSprites[data[0] >> 8].pos2.y = 0;
+        gSprites[data[0] & 0xFF].pos2.y = 0;
+        gSprites[data[1] >> 8].pos2.y = 0;
+        gSprites[data[1] & 0xFF].pos2.y = 0;
+        gSprites[data[2] >> 8].pos2.y = 0;
+        gSprites[data[2] & 0xFF].pos2.y = 0;
+        gSprites[data[3] >> 8].pos2.y = 0;
+        gSprites[data[3] & 0xFF].pos2.y = 0;
+        gSprites[data[4] >> 8].pos2.y = 0;
+        gSprites[data[4] & 0xFF].pos2.y = 0;
+        break;
+    case 1:
+    case 3:
+        sprite->pos2.y = 1;
+        gSprites[data[0] >> 8].pos2.y = 1;
+        gSprites[data[0] & 0xFF].pos2.y = 1;
+        gSprites[data[1] >> 8].pos2.y = 1;
+        gSprites[data[1] & 0xFF].pos2.y = 1;
+        gSprites[data[2] >> 8].pos2.y = 1;
+        gSprites[data[2] & 0xFF].pos2.y = 1;
+        gSprites[data[3] >> 8].pos2.y = 1;
+        gSprites[data[3] & 0xFF].pos2.y = 1;
+        gSprites[data[4] >> 8].pos2.y = 1;
+        gSprites[data[4] & 0xFF].pos2.y = 1;
+        break;
+    case 2:
+        sprite->pos2.y = 2;
+        gSprites[data[0] >> 8].pos2.y = 2;
+        gSprites[data[0] & 0xFF].pos2.y = 2;
+        gSprites[data[1] >> 8].pos2.y = 2;
+        gSprites[data[1] & 0xFF].pos2.y = 2;
+        gSprites[data[2] >> 8].pos2.y = 2;
+        gSprites[data[4] & 0xFF].pos2.y = 2;
+        break;
+    }
+}
+
+void sub_81D6FD0(void)
+{
+    sub_81D67EC();
+    ScanlineEffect_InitHBlankDmaTransfer();
+}
+
+void sub_81D6FE0(void)
+{
+    ResetVramOamAndBgCntRegs();
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_0862A888, 3);
+    SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]);
+    SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]);
+    SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]);
+    ResetAllBgsCoordinates();
+    schedule_bg_copy_tilemap_to_vram(0);
+    schedule_bg_copy_tilemap_to_vram(1);
+    schedule_bg_copy_tilemap_to_vram(2);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+    ShowBg(0);
+    ShowBg(1);
+    ShowBg(2);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+}
+
+void sub_81D706C(void)
+{
+    reset_temp_tile_data_buffers();
+    decompress_and_copy_tile_data_to_vram(0, gRaySceneClouds_Gfx, 0, 0, 0);
+    while (free_temp_tile_data_buffers_if_possible());
+
+    LZDecompressWram(gRaySceneClouds2_Tilemap, sRayScene->tilemapBuffers[0]);
+    LZDecompressWram(gRaySceneClouds1_Tilemap, sRayScene->tilemapBuffers[1]);
+    LZDecompressWram(gRaySceneClouds3_Tilemap, sRayScene->tilemapBuffers[2]);
+    LoadCompressedPalette(gRaySceneClouds_Pal, 0, 0x40);
+    LoadCompressedObjectPic(&gUnknown_0862A8C4);
+    LoadCompressedObjectPic(&gUnknown_0862A8F8);
+    LoadCompressedObjectPic(&gUnknown_0862A924);
+    LoadCompressedObjectPic(&gUnknown_0862A9D4);
+    LoadCompressedObjectPic(&gUnknown_0862AA14);
+    LoadCompressedObjectPic(&gUnknown_0862AA34);
+    LoadCompressedObjectPalette(&gUnknown_0862A8CC);
+    LoadCompressedObjectPalette(&gUnknown_0862A9DC);
+}
+
+void sub_81D7134(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    ScanlineEffect_Clear();
+    sub_81D6FE0();
+    sub_81D706C();
+    CpuFastFill16(0, gScanlineEffectRegBuffers, sizeof(gScanlineEffectRegBuffers));
+    ScanlineEffect_SetParams(gUnknown_0862A87C);
+    data[0] = 0;
+    data[1] = CreateTask(sub_81D7228, 0);
+    if (sRayScene->animId == RAY_ANIM_DUO_FIGHT_PRE)
+    {
+        data[2] = sub_81D6984();
+        data[3] = sub_81D6B7C();
+        gTasks[taskId].func = sub_81D691C;
+    }
+    else
+    {
+        data[2] = sub_81D7664();
+        data[3] = sub_81D78BC();
+        gTasks[taskId].func = sub_81D736C;
+        StopMapMusic();
+    }
+
+    BlendPalettes(-1, 0x10, 0);
+    BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+    SetVBlankCallback(sub_81D6FD0);
+    PlaySE(SE_T_OOAME);
+}
-- 
cgit v1.2.3


From 78bd2b0849f357f0d2fbbb8e1e69e50d630dd9b0 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Wed, 31 Jan 2018 15:26:57 -0500
Subject: move save rodata to source and use saveblock chunk macros

---
 src/save.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/save.c b/src/save.c
index 023ca6870..138ec7cce 100644
--- a/src/save.c
+++ b/src/save.c
@@ -4,13 +4,67 @@
 #include "constants/game_stat.h"
 #include "task.h"
 
+// for the chunk declarations
+extern struct SaveBlock2 gSaveblock2;
+extern struct SaveBlock1 gSaveblock1;
+extern struct PokemonStorage gPokemonStorage;
+
 extern struct SaveSectionLocation gRamSaveSectionLocations[0xE];
 extern u8 gDecompressionBuffer[];
 extern u32 gFlashMemoryPresent;
 extern u16 gUnknown_03006294;
 extern bool8 gSoftResetDisabled;
 
-extern const struct SaveSectionOffsets gSaveSectionOffsets[0xE];
+// Divide save blocks into individual chunks to be written to flash sectors
+
+// Each 4 KiB flash sector contains 3968 bytes of actual data followed by a 128 byte footer
+#define SECTOR_DATA_SIZE 3968
+#define SECTOR_FOOTER_SIZE 128
+
+/*
+ * Sector Layout:
+ * 
+ * Sectors 0 - 13:      Save Slot 1
+ * Sectors 14 - 27:     Save Slot 2
+ * Sectors 28 - 29:     Hall of Fame
+ * Sectors 30 - 31:     e-Reader battle tower data, maybe? (note: depreciated in Emerald US)
+ * 
+ * There are two save slots for saving the player's game data. We alternate between
+ * them each time the game is saved, so that if the current save slot is corrupt,
+ * we can load the previous one. We also rotate the sectors in each save slot
+ * so that the same data is not always being written to the same sector. This
+ * might be done to reduce wear on the flash memory, but I'm not sure, since all
+ * 14 sectors get written anyway.
+ */
+
+// (u8 *)structure was removed from the first statement of the macro in Emerald.
+// This is because malloc is used to allocate addresses so storing the raw
+// addresses should not be done in the offsets information. 
+#define SAVEBLOCK_CHUNK(structure, chunkNum)                                \
+{                                                                           \
+    chunkNum * SECTOR_DATA_SIZE,                                            \
+    min(sizeof(structure) - chunkNum * SECTOR_DATA_SIZE, SECTOR_DATA_SIZE)  \
+}                                                                           \
+
+const struct SaveSectionOffsets gSaveSectionOffsets[] =
+{
+    SAVEBLOCK_CHUNK(gSaveblock2, 0),
+
+    SAVEBLOCK_CHUNK(gSaveblock1, 0),
+    SAVEBLOCK_CHUNK(gSaveblock1, 1),
+    SAVEBLOCK_CHUNK(gSaveblock1, 2),
+    SAVEBLOCK_CHUNK(gSaveblock1, 3),
+
+    SAVEBLOCK_CHUNK(gPokemonStorage, 0),
+    SAVEBLOCK_CHUNK(gPokemonStorage, 1),
+    SAVEBLOCK_CHUNK(gPokemonStorage, 2),
+    SAVEBLOCK_CHUNK(gPokemonStorage, 3),
+    SAVEBLOCK_CHUNK(gPokemonStorage, 4),
+    SAVEBLOCK_CHUNK(gPokemonStorage, 5),
+    SAVEBLOCK_CHUNK(gPokemonStorage, 6),
+    SAVEBLOCK_CHUNK(gPokemonStorage, 7),
+    SAVEBLOCK_CHUNK(gPokemonStorage, 8),
+};
 
 extern void DoSaveFailedScreen(u8); // save_failed_screen
 extern void LoadSerializedGame(void); // load_save
-- 
cgit v1.2.3


From a998cba4f03b34c147acb78d4b70766a50346afe Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Wed, 31 Jan 2018 15:53:38 -0500
Subject: depreciate depreciate

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

(limited to 'src')

diff --git a/src/save.c b/src/save.c
index 138ec7cce..0c35c3795 100644
--- a/src/save.c
+++ b/src/save.c
@@ -27,7 +27,7 @@ extern bool8 gSoftResetDisabled;
  * Sectors 0 - 13:      Save Slot 1
  * Sectors 14 - 27:     Save Slot 2
  * Sectors 28 - 29:     Hall of Fame
- * Sectors 30 - 31:     e-Reader battle tower data, maybe? (note: depreciated in Emerald US)
+ * Sectors 30 - 31:     e-Reader battle tower data, maybe? (note: deprecated in Emerald US)
  * 
  * There are two save slots for saving the player's game data. We alternate between
  * them each time the game is saved, so that if the current save slot is corrupt,
-- 
cgit v1.2.3


From eb6aed50e56f36ce416f7ecc8edfacea1da61bf1 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <Diegoisawesome@users.noreply.github.com>
Date: Wed, 31 Jan 2018 16:12:46 -0600
Subject: Update save.c with recorded battle sector

---
 src/save.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/save.c b/src/save.c
index 0c35c3795..8d77e801a 100644
--- a/src/save.c
+++ b/src/save.c
@@ -27,7 +27,8 @@ extern bool8 gSoftResetDisabled;
  * Sectors 0 - 13:      Save Slot 1
  * Sectors 14 - 27:     Save Slot 2
  * Sectors 28 - 29:     Hall of Fame
- * Sectors 30 - 31:     e-Reader battle tower data, maybe? (note: deprecated in Emerald US)
+ * Sector 30:           e-Reader/Mystery Gift Stuff (note: e-Reader is deprecated in Emerald US)
+ * Sector 31:           Recorded Battle
  * 
  * There are two save slots for saving the player's game data. We alternate between
  * them each time the game is saved, so that if the current save slot is corrupt,
-- 
cgit v1.2.3


From 68146af07cfc5103120a41837765c9d668114f74 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 1 Feb 2018 11:17:07 +0100
Subject: more ray scene work

---
 src/rayquaza_scene.c | 918 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 915 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 72aeab94e..44c4d86f4 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -14,6 +14,8 @@
 #include "decompress.h"
 #include "sound.h"
 #include "constants/songs.h"
+#include "constants/rgb.h"
+#include "random.h"
 
 // this file's functions
 void sub_81D7134(u8 taskId);
@@ -21,6 +23,12 @@ void sub_81D7F4C(u8 taskId);
 void sub_81D84EC(u8 taskId);
 void sub_81D8980(u8 taskId);
 void sub_81D8DB4(u8 taskId);
+void sub_81D857C(u8 taskId);
+void sub_81D8684(u8 taskId);
+void sub_81D89E0(u8 taskId);
+void sub_81D8AD8(u8 taskId);
+void sub_81D8B2C(u8 taskId);
+void sub_81D8BEC(u8 taskId);
 void Task_EndAfterFadeScreen(u8 taskId);
 
 void sub_81D8260(struct Sprite *sprite);
@@ -1174,11 +1182,12 @@ const struct BgTemplate gUnknown_0862AD08[] =
 struct RaySceneStruct
 {
     MainCallback callback;
-    u8 tilemapBuffers[3][0x800];
-    u8 field_1804[0x800];
+    u8 tilemapBuffers[4][0x800];
     u16 field_2004;
     u8 animId;
     bool8 onlyOneAnim;
+    s16 field_2008;
+    s16 field_200A;
 };
 
 extern struct RaySceneStruct *sRayScene;
@@ -1190,13 +1199,25 @@ void sub_81D750C(void);
 void sub_81D7438(void);
 void sub_81D7480(void);
 void sub_81D74C8(void);
+void sub_81D8BB4(void);
 void sub_81D75B4(u8 taskId, s8 palDelay);
 void sub_81D6A20(struct Sprite *sprite);
 void sub_81D6D20(struct Sprite *sprite);
+void sub_81D7860(struct Sprite *sprite);
+void sub_81D7D14(struct Sprite *sprite);
+void sub_81D7700(struct Sprite *sprite);
+void sub_81D7A60(struct Sprite *sprite);
+void sub_81D874C(struct Sprite *sprite);
 void sub_81D7228(u8 taskId);
 void sub_81D736C(u8 taskId);
+void sub_81D752C(u8 taskId);
+void sub_81D7600(u8 taskId);
+void sub_81D7FC0(u8 taskId);
+void sub_81D81A4(u8 taskId);
+void sub_81D8164(u8 taskId);
 u8 sub_81D7664(void);
 u8 sub_81D78BC(void);
+u8 sub_81D86CC(void);
 
 // code
 void sub_81D6720(u8 animId, bool8 onlyOneAnim, MainCallback callback)
@@ -1470,7 +1491,7 @@ void sub_81D6FE0(void)
 {
     ResetVramOamAndBgCntRegs();
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_0862A888, 3);
+    InitBgsFromTemplates(0, gUnknown_0862A888, ARRAY_COUNT(gUnknown_0862A888));
     SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]);
     SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]);
     SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]);
@@ -1534,3 +1555,894 @@ void sub_81D7134(u8 taskId)
     SetVBlankCallback(sub_81D6FD0);
     PlaySE(SE_T_OOAME);
 }
+
+void sub_81D7228(u8 taskId)
+{
+    s16 i;
+    u16 *data = gTasks[taskId].data;
+
+    for (i = 24; i < 92; i++)
+    {
+        if (i <= 47)
+        {
+            gScanlineEffectRegBuffers[0][i] = data[0] >> 8;
+            gScanlineEffectRegBuffers[1][i] = data[0] >> 8;
+        }
+        else if (i <= 63)
+        {
+            gScanlineEffectRegBuffers[0][i] = data[1] >> 8;
+            gScanlineEffectRegBuffers[1][i] = data[1] >> 8;
+        }
+        else if (i <= 75)
+        {
+            gScanlineEffectRegBuffers[0][i] = data[2] >> 8;
+            gScanlineEffectRegBuffers[1][i] = data[2] >> 8;
+        }
+        else if (i <= 83)
+        {
+            gScanlineEffectRegBuffers[0][i] = data[3] >> 8;
+            gScanlineEffectRegBuffers[1][i] = data[3] >> 8;
+        }
+        else if (i <= 87)
+        {
+            gScanlineEffectRegBuffers[0][i] = data[4] >> 8;
+            gScanlineEffectRegBuffers[1][i] = data[4] >> 8;
+        }
+        else
+        {
+            gScanlineEffectRegBuffers[0][i] = data[5] >> 8;
+            gScanlineEffectRegBuffers[1][i] = data[5] >> 8;
+        }
+    }
+
+    if (sRayScene->animId == RAY_ANIM_DUO_FIGHT_PRE)
+    {
+        data[0] += 448;
+        data[1] += 384;
+        data[2] += 320;
+        data[3] += 256;
+        data[4] += 192;
+        data[5] += 128;
+    }
+    else
+    {
+        data[0] += 768;
+        data[1] += 640;
+        data[2] += 512;
+        data[3] += 384;
+        data[4] += 256;
+        data[5] += 128;
+    }
+}
+
+void sub_81D736C(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    sub_81D750C();
+    if (!gPaletteFade.active)
+    {
+        s16 counter = data[0];
+        if (counter == 32 || counter == 112)
+        {
+            sub_81D7438();
+        }
+        else if (counter == 216)
+        {
+            sub_81D7480();
+        }
+        else if (counter == 220)
+        {
+            sub_81D74C8();
+        }
+        else
+        {
+            switch (counter)
+            {
+            case 412:
+                sub_81D75B4(taskId, 2);
+                return;
+            case 380:
+                SetGpuReg(REG_OFFSET_BLDCNT, 0x244);
+                gTasks[data[1]].func = sub_81D752C;
+                gTasks[data[1]].data[0] = 0;
+                gTasks[data[1]].data[2] = data[2];
+                gTasks[data[1]].data[3] = data[3];
+                ScanlineEffect_Stop();
+                break;
+            }
+        }
+
+        data[0]++;
+    }
+}
+
+void sub_81D7438(void)
+{
+    PlaySE(SE_T_KAMI);
+    sub_80A2C44(0x7FFF, 0, 0x10, 0, -1, 0, 0);
+    sub_80A2C44(0xFFFF0000, 0, 0x10, 0, 0, 0, 1);
+}
+
+void sub_81D7480(void)
+{
+    PlaySE(SE_T_KAMI);
+    sub_80A2C44(0x7FFF, 0, 0x10, 0x10, -1, 0, 0);
+    sub_80A2C44(0xFFFF0000, 0, 0x10, 0x10, 0, 0, 1);
+}
+
+void sub_81D74C8(void)
+{
+    sub_80A2C44(0x7FFF, 4, 0x10, 0, -1, 0, 0);
+    sub_80A2C44(0xFFFF0000, 4, 0x10, 0, 0, 0, 1);
+}
+
+void sub_81D750C(void)
+{
+    ChangeBgX(2, 0x400, 1);
+    ChangeBgY(2, 0x800, 2);
+}
+
+void sub_81D752C(u8 taskId)
+{
+    u16 bgY;
+    s16 *data = gTasks[taskId].data;
+    sub_81D7860(&gSprites[data[2]]);
+    sub_81D7D14(&gSprites[data[3]]);
+
+    bgY = GetBgY(1);
+    if (GetBgY(1) == 0 || bgY > 0x8000)
+        ChangeBgY(1, 0x400, 2);
+
+    if (data[0] != 16)
+    {
+        data[0]++;
+        SetGpuReg(REG_OFFSET_BLDALPHA, (data[0] << 8) | (16 - data[0]));
+    }
+}
+
+void sub_81D75B4(u8 taskId, s8 palDelay)
+{
+    PlaySE(SE_T_OOAME_E);
+    BeginNormalPaletteFade(-1, palDelay, 0, 0x10, 0);
+    gTasks[taskId].func = sub_81D7600;
+}
+
+void sub_81D7600(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    sub_81D750C();
+    if (!gPaletteFade.active)
+    {
+        DestroyTask(data[1]);
+        ChangeBgY(1, 0, 0);
+        SetVBlankCallback(NULL);
+        ScanlineEffect_Stop();
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        data[0] = 0;
+        gTasks[taskId].func = Task_SetNextAnim;
+    }
+}
+
+u8 sub_81D7664(void)
+{
+    u8 spriteId;
+    s16 *data;
+
+    spriteId = CreateSprite(&gUnknown_0862A8D4, 98, 72, 3);
+    gSprites[spriteId].callback = sub_81D7700;
+    data = gSprites[spriteId].data;
+    data[0] = CreateSprite(&gUnknown_0862A8D4, 66, 104, 3);
+    data[1] = CreateSprite(&gUnknown_0862A900, 85, 101, 0);
+    data[2] = CreateSprite(&gUnknown_0862A92C, 119, 114, 1);
+    StartSpriteAnim(&gSprites[data[0]], 1);
+    return spriteId;
+}
+
+void sub_81D7700(struct Sprite *sprite)
+{
+    s16 *data = sprite->data;
+    data[5]++;
+    data[5] &= 0xF;
+    if (!(data[5] & 7) && sprite->pos1.x != 72)
+    {
+        sprite->pos1.x--;
+        gSprites[sprite->data[0]].pos1.x--;
+        gSprites[data[1]].pos1.x--;
+        gSprites[data[2]].pos1.x--;
+    }
+
+    switch (sprite->animCmdIndex)
+    {
+    case 0:
+        gSprites[data[1]].pos2.x = 0;
+        gSprites[data[1]].pos2.y = 0;
+        gSprites[data[2]].pos2.x = 0;
+        gSprites[data[2]].pos2.y = 0;
+        break;
+    case 1:
+    case 3:
+        gSprites[data[1]].pos2.x = -1;
+        gSprites[data[1]].pos2.y = 0;
+        gSprites[data[2]].pos2.x = -1;
+        gSprites[data[2]].pos2.y = 0;
+        break;
+    case 2:
+        gSprites[data[1]].pos2.x = -1;
+        gSprites[data[1]].pos2.y = 1;
+        gSprites[data[2]].pos2.x = -2;
+        gSprites[data[2]].pos2.y = 1;
+        break;
+    }
+}
+
+void sub_81D7860(struct Sprite *sprite)
+{
+    s16 *data = sprite->data;
+    if (sprite->pos1.y <= 160)
+    {
+        sprite->pos1.y += 8;
+        gSprites[sprite->data[0]].pos1.y += 8;
+        gSprites[data[1]].pos1.y += 8;
+        gSprites[data[2]].pos1.y += 8;
+    }
+}
+
+u8 sub_81D78BC(void)
+{
+    u8 spriteId;
+    s16 *data;
+
+    spriteId = CreateSprite(&gUnknown_0862A9E4, 126, 96, 1);
+    gSprites[spriteId].callback = sub_81D7A60;
+    data = gSprites[spriteId].data;
+
+    data[0] = CreateSprite(&gUnknown_0862A9E4, 158, 96, 1) << 8;
+    data[0] |= CreateSprite(&gUnknown_0862A9E4, 126, 112, 1);
+    data[1] = CreateSprite(&gUnknown_0862A9E4, 158, 112, 1) << 8;
+    data[1] |= CreateSprite(&gUnknown_0862A9E4, 126, 128, 1);
+    data[2] = CreateSprite(&gUnknown_0862A9E4, 158, 128, 1) << 8;
+    data[2] |= CreateSprite(&gUnknown_0862A9E4, 94, 128, 2);
+    data[3] = CreateSprite(&gUnknown_0862A9E4, 126, 128, 2) << 8;
+    data[3] |= CreateSprite(&gUnknown_0862A9E4, 174, 128, 0);
+    data[4] = CreateSprite(&gUnknown_0862AA1C, 198, 132, 0) << 8;
+    data[4] |= CreateSprite(&gUnknown_0862AA3C, 190, 120, 1);
+
+    StartSpriteAnim(&gSprites[data[0] >> 8], 1);
+    StartSpriteAnim(&gSprites[data[0] & 0xFF], 2);
+    StartSpriteAnim(&gSprites[data[1] >> 8], 3);
+    StartSpriteAnim(&gSprites[data[1] & 0xFF], 4);
+    StartSpriteAnim(&gSprites[data[2] >> 8], 5);
+    StartSpriteAnim(&gSprites[data[2] & 0xFF], 6);
+    StartSpriteAnim(&gSprites[data[3] >> 8], 7);
+    StartSpriteAnim(&gSprites[data[3] & 0xFF], 8);
+
+    return spriteId;
+}
+
+void sub_81D7A60(struct Sprite *sprite)
+{
+    s16 *data = sprite->data;
+    data[5]++;
+    data[5] &= 0xF;
+    if (!(data[5] & 7) && sprite->pos1.x != 152)
+    {
+        sprite->pos1.x++;
+        gSprites[sprite->data[0] >> 8].pos1.x++;
+        gSprites[sprite->data[0] & 0xFF].pos1.x++;
+        gSprites[data[1] >> 8].pos1.x++;
+        gSprites[data[1] & 0xFF].pos1.x++;
+        gSprites[data[2] >> 8].pos1.x++;
+        gSprites[data[2] & 0xFF].pos1.x++;
+        gSprites[data[3] >> 8].pos1.x++;
+        gSprites[data[3] & 0xFF].pos1.x++;
+        gSprites[data[4] >> 8].pos1.x++;
+        gSprites[data[4] & 0xFF].pos1.x++;
+    }
+
+    switch (gSprites[data[2] & 0xFF].animCmdIndex)
+    {
+    case 0:
+        sprite->pos2.y = 0;
+        gSprites[data[0] >> 8].pos2.y = 0;
+        gSprites[data[0] & 0xFF].pos2.y = 0;
+        gSprites[data[1] >> 8].pos2.y = 0;
+        gSprites[data[1] & 0xFF].pos2.y = 0;
+        gSprites[data[2] >> 8].pos2.y = 0;
+        gSprites[data[2] & 0xFF].pos2.y = 0;
+        gSprites[data[3] >> 8].pos2.y = 0;
+        gSprites[data[3] & 0xFF].pos2.y = 0;
+        gSprites[data[4] >> 8].pos2.y = 0;
+        gSprites[data[4] & 0xFF].pos2.y = 0;
+        break;
+    case 1:
+    case 3:
+        sprite->pos2.y = 1;
+        gSprites[data[0] >> 8].pos2.y = 1;
+        gSprites[data[0] & 0xFF].pos2.y = 1;
+        gSprites[data[1] >> 8].pos2.y = 1;
+        gSprites[data[1] & 0xFF].pos2.y = 1;
+        gSprites[data[2] >> 8].pos2.y = 1;
+        gSprites[data[2] & 0xFF].pos2.y = 1;
+        gSprites[data[3] >> 8].pos2.y = 1;
+        gSprites[data[3] & 0xFF].pos2.y = 1;
+        gSprites[data[4] >> 8].pos2.y = 1;
+        gSprites[data[4] & 0xFF].pos2.y = 1;
+        break;
+    case 2:
+        sprite->pos2.y = 2;
+        gSprites[data[0] >> 8].pos2.y = 2;
+        gSprites[data[0] & 0xFF].pos2.y = 2;
+        gSprites[data[1] >> 8].pos2.y = 2;
+        gSprites[data[1] & 0xFF].pos2.y = 2;
+        gSprites[data[2] >> 8].pos2.y = 2;
+        gSprites[data[4] & 0xFF].pos2.y = 2;
+        break;
+    }
+}
+
+void sub_81D7D14(struct Sprite *sprite)
+{
+    s16 *data = sprite->data;
+    if (sprite->pos1.y <= 160)
+    {
+        sprite->pos1.y += 8;
+        gSprites[sprite->data[0] >> 8].pos1.y += 8;
+        gSprites[sprite->data[0] & 0xFF].pos1.y += 8;
+        gSprites[data[1] >> 8].pos1.y += 8;
+        gSprites[data[1] & 0xFF].pos1.y += 8;
+        gSprites[data[2] >> 8].pos1.y += 8;
+        gSprites[data[2] & 0xFF].pos1.y += 8;
+        gSprites[data[3] >> 8].pos1.y += 8;
+        gSprites[data[3] & 0xFF].pos1.y += 8;
+        gSprites[data[4] >> 8].pos1.y += 8;
+        gSprites[data[4] & 0xFF].pos1.y += 8;
+    }
+}
+
+void sub_81D7E10(void)
+{
+    ResetVramOamAndBgCntRegs();
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(1, gUnknown_0862AA54, ARRAY_COUNT(gUnknown_0862AA54));
+    SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]);
+    SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]);
+    SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]);
+    ResetAllBgsCoordinates();
+    schedule_bg_copy_tilemap_to_vram(0);
+    schedule_bg_copy_tilemap_to_vram(1);
+    schedule_bg_copy_tilemap_to_vram(2);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+    ShowBg(0);
+    ShowBg(1);
+    ShowBg(2);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+}
+
+void sub_81D7E9C(void)
+{
+    reset_temp_tile_data_buffers();
+    decompress_and_copy_tile_data_to_vram(0, gRaySceneClouds_Gfx, 0, 0, 0);
+    decompress_and_copy_tile_data_to_vram(1, gRaySceneOvercast_Gfx, 0, 0, 0);
+    decompress_and_copy_tile_data_to_vram(2, gRaySceneRayquaza_Gfx, 0, 0, 0);
+    while (free_temp_tile_data_buffers_if_possible());
+
+    LZDecompressWram(gRaySceneClouds2_Tilemap, sRayScene->tilemapBuffers[0]);
+    LZDecompressWram(gRaySceneOvercast_Tilemap, sRayScene->tilemapBuffers[1]);
+    LZDecompressWram(gRaySceneRayquaza_Tilemap, sRayScene->tilemapBuffers[2]);
+    LoadCompressedPalette(gRaySceneRayquaza_Pal, 0, 0x40);
+    LoadCompressedObjectPic(&gUnknown_0862AA90);
+    LoadCompressedObjectPalette(&gUnknown_0862AA98);
+}
+
+void sub_81D7F4C(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    PlayNewMapMusic(MUS_REKKUU_KOURIN);
+    sub_81D7E10();
+    sub_81D7E9C();
+    SetGpuReg(REG_OFFSET_BLDCNT, 0x250);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0x808);
+    BlendPalettes(-1, 0x10, 0);
+    SetVBlankCallback(sub_81D67EC);
+    CreateTask(sub_81D81A4, 0);
+    data[0] = 0;
+    data[1] = 0;
+    gTasks[taskId].func = sub_81D7FC0;
+}
+
+void sub_81D7FC0(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    switch (data[0])
+    {
+    case 0:
+        if (data[1] == 8)
+        {
+            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+            data[2] = 0;
+            data[3] = 30;
+            data[4] = 0;
+            data[5] = 7;
+            data[1] = 0;
+            data[0]++;
+        }
+        else
+        {
+            data[1]++;
+        }
+        break;
+    case 1:
+        data[2] += data[3];
+        data[4] += data[5];
+        if (data[3] > 3)
+            data[3] -= 3;
+        if (data[5] != 0)
+            data[5]--;
+        if (data[2] > 255)
+        {
+            data[2] = 256;
+            data[3] = 0;
+            data[6] = 12;
+            data[7] = -1;
+            data[1] = 0;
+            data[0]++;
+        }
+        SetBgAffine(2, 0x7800, 0x1800, 0x78, data[4] + 32, data[2], data[2], 0);
+        break;
+    case 2:
+        data[1]++;
+        SetBgAffine(2, 0x7800, 0x1800, 0x78, data[4] + 32 + (data[6] >> 2), data[2], data[2], 0);
+        data[6] += data[7];
+        if (data[6] == 12 || data[6] == -12)
+        {
+            data[7] *= -1;
+            if (data[1] > 295)
+            {
+                data[0]++;
+                BeginNormalPaletteFade(-1, 6, 0, 0x10, 0);
+            }
+        }
+        break;
+    case 3:
+        data[2] += 16;
+        SetBgAffine(2, 0x7800, 0x1800, 0x78, data[4] + 32, data[2], data[2], 0);
+        sub_81D8164(taskId);
+        break;
+    }
+}
+
+void sub_81D8164(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        SetVBlankCallback(NULL);
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        gTasks[taskId].func = Task_SetNextAnim;
+    }
+}
+
+void sub_81D81A4(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    if ((data[1] & 3) == 0)
+    {
+        u8 spriteId = CreateSprite(&gUnknown_0862AAA0,
+                                   (gUnknown_0862AAB8[data[0]][0] * 4) + 120,
+                                   (gUnknown_0862AAB8[data[0]][1] * 4) + 80,
+                                   0);
+        gSprites[spriteId].data[0] = (s8)(data[0]);
+        gSprites[spriteId].oam.objMode = 1;
+        gSprites[spriteId].oam.affineMode = 3;
+        gSprites[spriteId].oam.priority = 2;
+        InitSpriteAffineAnim(&gSprites[spriteId]);
+        if (data[0] == 9)
+        {
+            DestroyTask(taskId);
+            return;
+        }
+        else
+        {
+            data[0]++;
+        }
+    }
+
+    data[1]++;
+}
+
+void sub_81D8260(struct Sprite *sprite)
+{
+    if (sprite->data[1] == 0)
+    {
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+    }
+    else
+    {
+        sprite->pos2.x += gUnknown_0862AAB8[sprite->data[0]][0];
+        sprite->pos2.y += gUnknown_0862AAB8[sprite->data[0]][1];
+    }
+
+    sprite->data[1]++;
+    sprite->data[1] &= 0xF;
+}
+
+void sub_81D82B0(void)
+{
+    ResetVramOamAndBgCntRegs();
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_0862AACC, ARRAY_COUNT(gUnknown_0862AACC));
+    SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]);
+    SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]);
+    SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]);
+    SetBgTilemapBuffer(3, sRayScene->tilemapBuffers[3]);
+    ResetAllBgsCoordinates();
+    schedule_bg_copy_tilemap_to_vram(0);
+    schedule_bg_copy_tilemap_to_vram(1);
+    schedule_bg_copy_tilemap_to_vram(2);
+    schedule_bg_copy_tilemap_to_vram(3);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+    ShowBg(0);
+    ShowBg(1);
+    ShowBg(2);
+    ShowBg(3);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+}
+
+void sub_81D8358(void)
+{
+    reset_temp_tile_data_buffers();
+    decompress_and_copy_tile_data_to_vram(0, gRaySceneRayquazaLight_Gfx, 0, 0, 0);
+    decompress_and_copy_tile_data_to_vram(1, gRaySceneOvercast2_Gfx, 0, 0, 0);
+    while (free_temp_tile_data_buffers_if_possible());
+
+    LZDecompressWram(gRaySceneRayquazaLight_Tilemap, sRayScene->tilemapBuffers[0]);
+    LZDecompressWram(gRaySceneOvercast2_Tilemap, sRayScene->tilemapBuffers[3]);
+    CpuFastFill16(0, sRayScene->tilemapBuffers[2], 0x800);
+    CpuFastCopy(sRayScene->tilemapBuffers[3], sRayScene->tilemapBuffers[1], 0x800);
+    CpuFastFill16(0, &sRayScene->tilemapBuffers[1][0x100], 0x340);
+
+    LoadCompressedPalette(gRaySceneOvercast2_Pal, 0, 0x40);
+    gPlttBufferUnfaded[0] = RGB_WHITE;
+    gPlttBufferFaded[0] = RGB_WHITE;
+    LoadCompressedObjectPic(&gUnknown_0862AAFC);
+    LoadCompressedObjectPic(&gUnknown_0862AB04);
+    LoadCompressedObjectPalette(&gUnknown_0862AB0C);
+}
+
+void sub_81D844C(void)
+{
+    u16 VCOUNT = GetGpuReg(REG_OFFSET_VCOUNT);
+    if (VCOUNT >= 24 && VCOUNT <= 135 && VCOUNT - 24 <= sRayScene->field_2008)
+        REG_BLDALPHA = 0xD08;
+    else
+        REG_BLDALPHA = 0x1000;
+
+    if (VCOUNT == 0)
+    {
+        if (sRayScene->field_2008 <= 0x1FFF)
+        {
+            if (sRayScene->field_2008 <= 39)
+                sRayScene->field_2008 += 4;
+            else if (sRayScene->field_2008 <= 79)
+                sRayScene->field_2008 += 2;
+            else
+                sRayScene->field_2008 += 1;
+        }
+
+        sRayScene->field_200A++;
+    }
+}
+
+void sub_81D84EC(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    sub_81D82B0();
+    sub_81D8358();
+    SetGpuRegBits(REG_OFFSET_BLDCNT, 0x1E41);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000);
+    BlendPalettes(-1, 0x10, 0);
+    SetVBlankCallback(sub_81D67EC);
+    sRayScene->field_2008 = 0;
+    sRayScene->field_200A = 0;
+    data[0] = 0;
+    data[1] = 0;
+    data[2] = 0;
+    data[3] = 0;
+    data[4] = 0x1000;
+    gTasks[taskId].func = sub_81D857C;
+}
+
+void sub_81D857C(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    switch (data[0])
+    {
+    case 0:
+        if (data[1] == 8)
+        {
+            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+            data[1] = 0;
+            data[0]++;
+        }
+        else
+        {
+            data[1]++;
+        }
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+            if (data[1] == 10)
+            {
+                data[1] = 0;
+                data[0]++;
+                SetHBlankCallback(sub_81D844C);
+                EnableInterrupts(INTR_FLAG_HBLANK | INTR_FLAG_VBLANK);
+            }
+            else
+            {
+                data[1]++;
+            }
+        }
+        break;
+    case 2:
+        if (data[1] == 80)
+        {
+            data[1] = 0;
+            data[0]++;
+            sub_81D86CC();
+        }
+        else
+        {
+            data[1]++;
+        }
+        break;
+    case 3:
+        if (++data[1] == 368)
+        {
+            data[1] = 0;
+            data[0]++;
+        }
+        break;
+    case 4:
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        gTasks[taskId].func = sub_81D8684;
+        break;
+    }
+}
+
+void sub_81D8684(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        SetVBlankCallback(NULL);
+        SetHBlankCallback(NULL);
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        gTasks[taskId].func = Task_SetNextAnim;
+    }
+}
+
+u8 sub_81D86CC(void)
+{
+    u8 spriteId = CreateSprite(&gUnknown_0862AB14, 160, 0, 0);
+    s16 *data = gSprites[spriteId].data;
+    data[0] = CreateSprite(&gUnknown_0862AB2C, 184, -48, 0);
+    gSprites[spriteId].callback = sub_81D874C;
+    gSprites[spriteId].oam.priority = 3;
+    gSprites[data[0]].oam.priority = 3;
+    return spriteId;
+}
+
+void sub_81D874C(struct Sprite *sprite)
+{
+    s16 *data = sprite->data;
+    s16 counter = data[2];
+    if (counter == 0)
+    {
+        data[3] = 12;
+        data[4] = 8;
+    }
+    else if (counter == 256)
+    {
+        data[3] = 9;
+        data[4] = 7;
+    }
+    else if (counter == 268)
+    {
+        data[3] = 8;
+        data[4] = 6;
+    }
+    else if (counter == 280)
+    {
+        data[3] = 7;
+        data[4] = 5;
+    }
+    else if (counter == 292)
+    {
+        data[3] = 6;
+        data[4] = 4;
+    }
+    else if (counter == 304)
+    {
+        data[3] = 5;
+        data[4] = 3;
+    }
+    else if (counter == 320)
+    {
+        data[3] = 4;
+        data[4] = 2;
+    }
+
+    if (data[2] % data[3] == 0)
+    {
+        sprite->pos2.x--;
+        gSprites[data[0]].pos2.x--;
+    }
+    if (data[2] % data[4] == 0)
+    {
+        sprite->pos2.y++;
+        gSprites[data[0]].pos2.y++;
+    }
+
+    data[2]++;
+}
+
+void sub_81D8828(void)
+{
+    ResetVramOamAndBgCntRegs();
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_0862AB44, ARRAY_COUNT(gUnknown_0862AB44));
+    SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]);
+    SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]);
+    SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]);
+    SetBgTilemapBuffer(3, sRayScene->tilemapBuffers[3]);
+    ResetAllBgsCoordinates();
+    schedule_bg_copy_tilemap_to_vram(0);
+    schedule_bg_copy_tilemap_to_vram(1);
+    schedule_bg_copy_tilemap_to_vram(2);
+    schedule_bg_copy_tilemap_to_vram(3);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_WIN0_ON);
+    ShowBg(0);
+    ShowBg(1);
+    ShowBg(2);
+    ShowBg(3);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+}
+
+void sub_81D88D0(void)
+{
+    reset_temp_tile_data_buffers();
+    decompress_and_copy_tile_data_to_vram(1, gRaySceneRayquazaChase_Gfx, 0, 0, 0);
+    decompress_and_copy_tile_data_to_vram(2, gRaySceneChaseStreaks_Gfx, 0, 0, 0);
+    decompress_and_copy_tile_data_to_vram(3, gRaySceneChaseBg_Gfx, 0, 0, 0);
+    while (free_temp_tile_data_buffers_if_possible());
+
+    LZDecompressWram(gRayChaseRayquazaChase2_Tilemap, sRayScene->tilemapBuffers[0]);
+    LZDecompressWram(gRayChaseRayquazaChase_Tilemap, sRayScene->tilemapBuffers[1]);
+    LZDecompressWram(gRaySceneChaseStreaks_Tilemap, sRayScene->tilemapBuffers[2]);
+    LZDecompressWram(gRaySceneChaseBg_Tilemap, sRayScene->tilemapBuffers[3]);
+    LoadCompressedPalette(gRaySceneChase_Pal, 0, 0x80);
+}
+
+void sub_81D8980(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    sub_81D8828();
+    sub_81D88D0();
+    sub_81D68C8();
+    BlendPalettes(-1, 0x10, 0);
+    SetVBlankCallback(sub_81D67EC);
+    data[0] = 0;
+    data[1] = 0;
+    data[2] = CreateTask(sub_81D8AD8, 0);
+    gTasks[taskId].func = sub_81D89E0;
+}
+
+void sub_81D89E0(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    sub_81D8BB4();
+    if ((data[3] & 7) == 0 && data[0] <= 1 && data[1] <= 89)
+        PlaySE(SE_OP_BASYU);
+
+    data[3]++;
+    switch (data[0])
+    {
+    case 0:
+        if (data[1] == 8)
+        {
+            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+            data[1] = 0;
+            data[0]++;
+        }
+        else
+        {
+            data[1]++;
+        }
+        break;
+    case 1:
+        if (data[1] == 127)
+        {
+            data[1] = 0;
+            data[0]++;
+            gTasks[data[2]].func = sub_81D8B2C;
+        }
+        else
+        {
+            data[1]++;
+        }
+        break;
+    case 2:
+        if (data[1] == 12)
+        {
+            data[1] = 0;
+            data[0]++;
+        }
+        else
+        {
+            data[1]++;
+        }
+        break;
+    case 3:
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        gTasks[taskId].func = sub_81D8BEC;
+        break;
+    }
+}
+
+void sub_81D8AD8(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    if ((data[15] & 3) == 0)
+    {
+        ChangeBgX(1, (Random() % 8 - 4) << 8, 0);
+        ChangeBgY(1, (Random() % 8 - 4) << 8, 0);
+    }
+
+    data[15]++;
+}
+
+void sub_81D8B2C(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    if (data[0] == 0)
+    {
+        ChangeBgX(1, 0, 0);
+        ChangeBgY(1, 0, 0);
+        data[0]++;
+        data[1] = 10;
+        data[2] = -1;
+    }
+    else if (data[0] == 1)
+    {
+        ChangeBgX(1, data[1] << 8, 2);
+        ChangeBgY(1, data[1] << 8, 1);
+        data[1] += data[2];
+        if (data[1] == -10)
+            data[2] *= -1;
+    }
+}
+
+void sub_81D8BB4(void)
+{
+    ChangeBgX(2, 0x400, 2);
+    ChangeBgY(2, 0x400, 1);
+    ChangeBgX(0, 0x800, 2);
+    ChangeBgY(0, 0x800, 1);
+}
+
+void sub_81D8BEC(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    sub_81D8BB4();
+    if (!gPaletteFade.active)
+    {
+        SetVBlankCallback(NULL);
+        sub_81D6904();
+        DestroyTask(data[2]);
+        gTasks[taskId].func = Task_SetNextAnim;
+    }
+}
-- 
cgit v1.2.3


From b6974978359be5b0605523f761990bb89919e193 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 1 Feb 2018 14:47:41 +0100
Subject: ray scene is decompiled

---
 src/rayquaza_scene.c | 920 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 702 insertions(+), 218 deletions(-)

(limited to 'src')

diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 44c4d86f4..e32655578 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -14,28 +14,80 @@
 #include "decompress.h"
 #include "sound.h"
 #include "constants/songs.h"
+#include "constants/species.h"
 #include "constants/rgb.h"
 #include "random.h"
 
+struct RaySceneStruct
+{
+    MainCallback callback;
+    u8 tilemapBuffers[4][0x800];
+    u16 field_2004; // set but unused
+    u8 animId;
+    bool8 onlyOneAnim;
+    s16 field_2008;
+    s16 field_200A;
+    u8 unusedFields[12]; // completely unused
+};
+
+// EWRAM vars
+static EWRAM_DATA struct RaySceneStruct *sRayScene = NULL;
+
 // this file's functions
-void sub_81D7134(u8 taskId);
-void sub_81D7F4C(u8 taskId);
-void sub_81D84EC(u8 taskId);
-void sub_81D8980(u8 taskId);
-void sub_81D8DB4(u8 taskId);
-void sub_81D857C(u8 taskId);
-void sub_81D8684(u8 taskId);
-void sub_81D89E0(u8 taskId);
-void sub_81D8AD8(u8 taskId);
-void sub_81D8B2C(u8 taskId);
-void sub_81D8BEC(u8 taskId);
-void Task_EndAfterFadeScreen(u8 taskId);
-
-void sub_81D8260(struct Sprite *sprite);
-void sub_81D961C(struct Sprite *sprite);
+static void sub_81D7134(u8 taskId);
+static void sub_81D7F4C(u8 taskId);
+static void sub_81D84EC(u8 taskId);
+static void sub_81D8980(u8 taskId);
+static void sub_81D8DB4(u8 taskId);
+static void sub_81D857C(u8 taskId);
+static void sub_81D8684(u8 taskId);
+static void sub_81D89E0(u8 taskId);
+static void sub_81D8AD8(u8 taskId);
+static void sub_81D8B2C(u8 taskId);
+static void sub_81D8BEC(u8 taskId);
+static void sub_81D8E80(u8 taskId);
+static void sub_81D8FB0(u8 taskId);
+static void sub_81D7228(u8 taskId);
+static void sub_81D736C(u8 taskId);
+static void sub_81D752C(u8 taskId);
+static void sub_81D7600(u8 taskId);
+static void sub_81D7FC0(u8 taskId);
+static void sub_81D81A4(u8 taskId);
+static void sub_81D8164(u8 taskId);
+static void sub_81D94D4(u8 taskId);
+static void sub_81D93D8(u8 taskId);
+static void sub_81D9034(u8 taskId);
+static void sub_81D90A8(u8 taskId);
+static void sub_81D98B4(u8 taskId);
+static void Task_EndAfterFadeScreen(u8 taskId);
+static void sub_81D6774(void);
+static void sub_81D67D0(void);
+static void sub_81D750C(void);
+static void sub_81D7438(void);
+static void sub_81D7480(void);
+static void sub_81D74C8(void);
+static void sub_81D8BB4(void);
+static void sub_81D6A20(struct Sprite *sprite);
+static void sub_81D6D20(struct Sprite *sprite);
+static void sub_81D7860(struct Sprite *sprite);
+static void sub_81D7D14(struct Sprite *sprite);
+static void sub_81D7700(struct Sprite *sprite);
+static void sub_81D7A60(struct Sprite *sprite);
+static void sub_81D874C(struct Sprite *sprite);
+static void sub_81D9338(struct Sprite *sprite);
+static void sub_81D9420(struct Sprite *sprite);
+static void sub_81D8260(struct Sprite *sprite);
+static void sub_81D961C(struct Sprite *sprite);
+static void sub_81D97E0(struct Sprite *sprite);
+static void sub_81D9528(struct Sprite *sprite);
+static u8 sub_81D7664(void);
+static u8 sub_81D78BC(void);
+static u8 sub_81D86CC(void);
+static void sub_81D75B4(u8 taskId, s8 palDelay);
+static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y);
 
 // const rom data
-const TaskFunc sTasksForAnimations[] =
+static const TaskFunc sTasksForAnimations[] =
 {
     sub_81D7134, // RAY_ANIM_DUO_FIGHT_PRE
     sub_81D7134, // RAY_ANIM_DUO_FIGHT
@@ -206,7 +258,7 @@ static const union AnimCmd *const sSpriteAnimTable_862A724[] =
     sSpriteAnim_862A710
 };
 
-const struct SpriteTemplate gUnknown_0862A72C =
+static const struct SpriteTemplate sUnknown_0862A72C =
 {
     .tileTag = 30505,
     .paletteTag = 30505,
@@ -228,7 +280,7 @@ static const union AnimCmd *const sSpriteAnimTable_862A74C[] =
     sSpriteAnim_862A744
 };
 
-const struct SpriteTemplate gUnknown_0862A750 =
+static const struct SpriteTemplate sUnknown_0862A750 =
 {
     .tileTag = 30506,
     .paletteTag = 30505,
@@ -250,7 +302,7 @@ static const union AnimCmd *const sSpriteAnimTable_862A770[] =
     sSpriteAnim_862A768
 };
 
-const struct SpriteTemplate gUnknown_0862A774 =
+static const struct SpriteTemplate sUnknown_0862A774 =
 {
     .tileTag = 30507,
     .paletteTag = 30505,
@@ -337,7 +389,7 @@ static const union AnimCmd *const sSpriteAnimTable_862A7F8[] =
     sSpriteAnim_862A7E4
 };
 
-const struct SpriteTemplate gUnknown_0862A81C =
+static const struct SpriteTemplate sUnknown_0862A81C =
 {
     .tileTag = 30508,
     .paletteTag = 30508,
@@ -362,7 +414,7 @@ static const union AnimCmd *const sSpriteAnimTable_862A848[] =
     sSpriteAnim_862A834
 };
 
-const struct SpriteTemplate gUnknown_0862A84C =
+static const struct SpriteTemplate sUnknown_0862A84C =
 {
     .tileTag = 30509,
     .paletteTag = 30508,
@@ -373,7 +425,7 @@ const struct SpriteTemplate gUnknown_0862A84C =
     .callback = SpriteCallbackDummy,
 };
 
-const struct SpriteTemplate gUnknown_0862A864 =
+static const struct SpriteTemplate sUnknown_0862A864 =
 {
     .tileTag = 30510,
     .paletteTag = 30508,
@@ -384,14 +436,14 @@ const struct SpriteTemplate gUnknown_0862A864 =
     .callback = SpriteCallbackDummy,
 };
 
-const struct ScanlineEffectParams gUnknown_0862A87C =
+static const struct ScanlineEffectParams sUnknown_0862A87C =
 {
     .dmaDest = (vu16 *)REG_ADDR_BG1HOFS,
     .dmaControl = 0xA2600001,
     .initState = 1
 };
 
-const struct BgTemplate gUnknown_0862A888[] =
+static const struct BgTemplate sUnknown_0862A888[] =
 {
     {
         .bg = 0,
@@ -446,17 +498,17 @@ static const union AnimCmd *const sSpriteAnimTable_862A8BC[] =
     sSpriteAnim_862A8A8
 };
 
-const struct CompressedSpriteSheet gUnknown_0862A8C4 =
+static const struct CompressedSpriteSheet sUnknown_0862A8C4 =
 {
     gRaySceneGroudon_Gfx, 0x3000, 30505
 };
 
-const struct CompressedSpritePalette gUnknown_0862A8CC =
+static const struct CompressedSpritePalette sUnknown_0862A8CC =
 {
     gRaySceneGroudon_Pal, 30505
 };
 
-const struct SpriteTemplate gUnknown_0862A8D4 =
+static const struct SpriteTemplate sUnknown_0862A8D4 =
 {
     .tileTag = 30505,
     .paletteTag = 30505,
@@ -478,12 +530,12 @@ static const union AnimCmd *const sSpriteAnimTable_862A8F4[] =
     sSpriteAnim_862A8EC
 };
 
-const struct CompressedSpriteSheet gUnknown_0862A8F8 =
+static const struct CompressedSpriteSheet sUnknown_0862A8F8 =
 {
     gRaySceneGroudon2_Gfx, 0x200, 30506
 };
 
-const struct SpriteTemplate gUnknown_0862A900 =
+static const struct SpriteTemplate sUnknown_0862A900 =
 {
     .tileTag = 30506,
     .paletteTag = 30505,
@@ -505,12 +557,12 @@ static const union AnimCmd *const sSpriteAnimTable_862A920[] =
     sSpriteAnim_862A918
 };
 
-const struct CompressedSpriteSheet gUnknown_0862A924 =
+static const struct CompressedSpriteSheet sUnknown_0862A924 =
 {
     gRaySceneGroudon3_Gfx, 0x400, 30507
 };
 
-const struct SpriteTemplate gUnknown_0862A92C =
+static const struct SpriteTemplate sUnknown_0862A92C =
 {
     .tileTag = 30507,
     .paletteTag = 30505,
@@ -597,17 +649,17 @@ static const union AnimCmd *const sSpriteAnimTable_862A9B0[] =
     sSpriteAnim_862A99C
 };
 
-const struct CompressedSpriteSheet gUnknown_0862A9D4 =
+static const struct CompressedSpriteSheet sUnknown_0862A9D4 =
 {
     gRaySceneKyogre_Gfx, 0xF00, 30508
 };
 
-const struct CompressedSpritePalette gUnknown_0862A9DC =
+static const struct CompressedSpritePalette sUnknown_0862A9DC =
 {
     gRaySceneKyogre_Pal, 30508
 };
 
-const struct SpriteTemplate gUnknown_0862A9E4 =
+static const struct SpriteTemplate sUnknown_0862A9E4 =
 {
     .tileTag = 30508,
     .paletteTag = 30508,
@@ -632,12 +684,12 @@ static const union AnimCmd *const sSpriteAnimTable_862AA10[] =
     sSpriteAnim_862A9FC
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AA14 =
+static const struct CompressedSpriteSheet sUnknown_0862AA14 =
 {
     gRaySceneKyogre2_Gfx, 0xC0, 30509
 };
 
-const struct SpriteTemplate gUnknown_0862AA1C =
+static const struct SpriteTemplate sUnknown_0862AA1C =
 {
     .tileTag = 30509,
     .paletteTag = 30508,
@@ -648,12 +700,12 @@ const struct SpriteTemplate gUnknown_0862AA1C =
     .callback = SpriteCallbackDummy,
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AA34 =
+static const struct CompressedSpriteSheet sUnknown_0862AA34 =
 {
     gRaySceneKyogre3_Gfx, 0x200, 30510
 };
 
-const struct SpriteTemplate gUnknown_0862AA3C =
+static const struct SpriteTemplate sUnknown_0862AA3C =
 {
     .tileTag = 30510,
     .paletteTag = 30508,
@@ -664,7 +716,7 @@ const struct SpriteTemplate gUnknown_0862AA3C =
     .callback = SpriteCallbackDummy,
 };
 
-const struct BgTemplate gUnknown_0862AA54[] =
+static const struct BgTemplate sUnknown_0862AA54[] =
 {
     {
         .bg = 0,
@@ -719,17 +771,17 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_862AA8C[] =
     sSpriteAffineAnim_862AA6C
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AA90 =
+static const struct CompressedSpriteSheet sUnknown_0862AA90 =
 {
     gRaySceneSmoke_Gfx, 0x100, 30555
 };
 
-const struct CompressedSpritePalette gUnknown_0862AA98 =
+static const struct CompressedSpritePalette sUnknown_0862AA98 =
 {
     gRaySceneSmoke_Pal, 30555
 };
 
-const struct SpriteTemplate gUnknown_0862AAA0 =
+static const struct SpriteTemplate sUnknown_0862AAA0 =
 {
     .tileTag = 30555,
     .paletteTag = 30555,
@@ -740,7 +792,7 @@ const struct SpriteTemplate gUnknown_0862AAA0 =
     .callback = sub_81D8260,
 };
 
-const s8 gUnknown_0862AAB8[][2] =
+static const s8 sUnknown_0862AAB8[][2] =
 {
     {-1,    5},
     {-3,    -4},
@@ -754,7 +806,7 @@ const s8 gUnknown_0862AAB8[][2] =
     {9,     1}
 };
 
-const struct BgTemplate gUnknown_0862AACC[] =
+static const struct BgTemplate sUnknown_0862AACC[] =
 {
     {
         .bg = 0,
@@ -818,22 +870,22 @@ static const union AnimCmd *const sSpriteAnimTable_862AAF8[] =
     sSpriteAnim_862AAEC
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AAFC =
+static const struct CompressedSpriteSheet sUnknown_0862AAFC =
 {
     gRaySceneRayquazaFly1_Gfx, 0x1000, 30556
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AB04 =
+static const struct CompressedSpriteSheet sUnknown_0862AB04 =
 {
     gRaySceneRayquazaTail_Gfx, 0x200, 30557
 };
 
-const struct CompressedSpritePalette gUnknown_0862AB0C =
+static const struct CompressedSpritePalette sUnknown_0862AB0C =
 {
     gRaySceneRayquaza_Pal, 30556
 };
 
-const struct SpriteTemplate gUnknown_0862AB14 =
+static const struct SpriteTemplate sUnknown_0862AB14 =
 {
     .tileTag = 30556,
     .paletteTag = 30556,
@@ -844,7 +896,7 @@ const struct SpriteTemplate gUnknown_0862AB14 =
     .callback = SpriteCallbackDummy,
 };
 
-const struct SpriteTemplate gUnknown_0862AB2C =
+static const struct SpriteTemplate sUnknown_0862AB2C =
 {
     .tileTag = 30557,
     .paletteTag = 30556,
@@ -855,7 +907,7 @@ const struct SpriteTemplate gUnknown_0862AB2C =
     .callback = SpriteCallbackDummy,
 };
 
-const struct BgTemplate gUnknown_0862AB44[] =
+static const struct BgTemplate sUnknown_0862AB44[] =
 {
     {
         .bg = 0,
@@ -1032,57 +1084,57 @@ static const union AnimCmd *const sSpriteAnimTable_862AC24[] =
     sSpriteAnim_862AC08
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AC28 =
+static const struct CompressedSpriteSheet sUnknown_0862AC28 =
 {
     gRaySceneGroudonLeft_Gfx, 0x1800, 30565
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AC30 =
+static const struct CompressedSpriteSheet sUnknown_0862AC30 =
 {
     gRaySceneGroudonTail_Gfx, 0x80, 30566
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AC38 =
+static const struct CompressedSpriteSheet sUnknown_0862AC38 =
 {
     gRaySceneKyogreRight_Gfx, 0x600, 30568
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AC40 =
+static const struct CompressedSpriteSheet sUnknown_0862AC40 =
 {
     gRaySceneRayquazaHover_Gfx, 0x2000, 30569
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AC48 =
+static const struct CompressedSpriteSheet sUnknown_0862AC48 =
 {
     gRaySceneRayquazaFlyIn_Gfx, 0x800, 30570
 };
 
-const struct CompressedSpriteSheet gUnknown_0862AC50 =
+static const struct CompressedSpriteSheet sUnknown_0862AC50 =
 {
     gRaySceneSplash_Gfx, 0x300, 30571
 };
 
-const struct CompressedSpritePalette gUnknown_0862AC58 =
+static const struct CompressedSpritePalette sUnknown_0862AC58 =
 {
     gRaySceneGroudonLeft_Pal, 30565
 };
 
-const struct CompressedSpritePalette gUnknown_0862AC60 =
+static const struct CompressedSpritePalette sUnknown_0862AC60 =
 {
     gRaySceneKyogreRight_Pal, 30568
 };
 
-const struct CompressedSpritePalette gUnknown_0862AC68 =
+static const struct CompressedSpritePalette sUnknown_0862AC68 =
 {
     gRaySceneRayquazaHover_Pal, 30569
 };
 
-const struct CompressedSpritePalette gUnknown_0862AC70 =
+static const struct CompressedSpritePalette sUnknown_0862AC70 =
 {
     gRaySceneSplash_Pal, 30571
 };
 
-const struct SpriteTemplate gUnknown_0862AC78 =
+static const struct SpriteTemplate sUnknown_0862AC78 =
 {
     .tileTag = 30565,
     .paletteTag = 30565,
@@ -1093,7 +1145,7 @@ const struct SpriteTemplate gUnknown_0862AC78 =
     .callback = SpriteCallbackDummy,
 };
 
-const struct SpriteTemplate gUnknown_0862AC90 =
+static const struct SpriteTemplate sUnknown_0862AC90 =
 {
     .tileTag = 30566,
     .paletteTag = 30565,
@@ -1104,7 +1156,7 @@ const struct SpriteTemplate gUnknown_0862AC90 =
     .callback = SpriteCallbackDummy,
 };
 
-const struct SpriteTemplate gUnknown_0862ACA8 =
+static const struct SpriteTemplate sUnknown_0862ACA8 =
 {
     .tileTag = 30568,
     .paletteTag = 30568,
@@ -1115,7 +1167,7 @@ const struct SpriteTemplate gUnknown_0862ACA8 =
     .callback = SpriteCallbackDummy,
 };
 
-const struct SpriteTemplate gUnknown_0862ACC0 =
+static const struct SpriteTemplate sUnknown_0862ACC0 =
 {
     .tileTag = 30569,
     .paletteTag = 30569,
@@ -1126,7 +1178,7 @@ const struct SpriteTemplate gUnknown_0862ACC0 =
     .callback = sub_81D961C,
 };
 
-const struct SpriteTemplate gUnknown_0862ACD8 =
+static const struct SpriteTemplate sUnknown_0862ACD8 =
 {
     .tileTag = 30570,
     .paletteTag = 30569,
@@ -1137,7 +1189,7 @@ const struct SpriteTemplate gUnknown_0862ACD8 =
     .callback = SpriteCallbackDummy,
 };
 
-const struct SpriteTemplate gUnknown_0862ACF0 =
+static const struct SpriteTemplate sUnknown_0862ACF0 =
 {
     .tileTag = 30571,
     .paletteTag = 30571,
@@ -1148,7 +1200,7 @@ const struct SpriteTemplate gUnknown_0862ACF0 =
     .callback = SpriteCallbackDummy,
 };
 
-const struct BgTemplate gUnknown_0862AD08[] =
+static const struct BgTemplate sUnknown_0862AD08[] =
 {
     {
         .bg = 0,
@@ -1179,57 +1231,17 @@ const struct BgTemplate gUnknown_0862AD08[] =
     }
 };
 
-struct RaySceneStruct
-{
-    MainCallback callback;
-    u8 tilemapBuffers[4][0x800];
-    u16 field_2004;
-    u8 animId;
-    bool8 onlyOneAnim;
-    s16 field_2008;
-    s16 field_200A;
-};
-
-extern struct RaySceneStruct *sRayScene;
-
-// this file's functions
-void sub_81D6774(void);
-void sub_81D67D0(void);
-void sub_81D750C(void);
-void sub_81D7438(void);
-void sub_81D7480(void);
-void sub_81D74C8(void);
-void sub_81D8BB4(void);
-void sub_81D75B4(u8 taskId, s8 palDelay);
-void sub_81D6A20(struct Sprite *sprite);
-void sub_81D6D20(struct Sprite *sprite);
-void sub_81D7860(struct Sprite *sprite);
-void sub_81D7D14(struct Sprite *sprite);
-void sub_81D7700(struct Sprite *sprite);
-void sub_81D7A60(struct Sprite *sprite);
-void sub_81D874C(struct Sprite *sprite);
-void sub_81D7228(u8 taskId);
-void sub_81D736C(u8 taskId);
-void sub_81D752C(u8 taskId);
-void sub_81D7600(u8 taskId);
-void sub_81D7FC0(u8 taskId);
-void sub_81D81A4(u8 taskId);
-void sub_81D8164(u8 taskId);
-u8 sub_81D7664(void);
-u8 sub_81D78BC(void);
-u8 sub_81D86CC(void);
-
 // code
-void sub_81D6720(u8 animId, bool8 onlyOneAnim, MainCallback callback)
+void DoRayquazaScene(u8 animId, bool8 onlyOneAnim, void (*callback)(void))
 {
-    sRayScene = AllocZeroed(0x2018);
+    sRayScene = AllocZeroed(sizeof(*sRayScene));
     sRayScene->animId = animId;
     sRayScene->callback = callback;
     sRayScene->onlyOneAnim = onlyOneAnim;
     SetMainCallback2(sub_81D6774);
 }
 
-void sub_81D6774(void)
+static void sub_81D6774(void)
 {
     SetVBlankHBlankCallbacksToNull();
     clear_scheduled_bg_copies_to_vram();
@@ -1243,7 +1255,7 @@ void sub_81D6774(void)
     SetMainCallback2(sub_81D67D0);
 }
 
-void sub_81D67D0(void)
+static void sub_81D67D0(void)
 {
     RunTasks();
     AnimateSprites();
@@ -1252,14 +1264,14 @@ void sub_81D67D0(void)
     UpdatePaletteFade();
 }
 
-void sub_81D67EC(void)
+static void sub_81D67EC(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void Task_EndAfterFadeScreen(u8 taskId)
+static void Task_EndAfterFadeScreen(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -1271,7 +1283,7 @@ void Task_EndAfterFadeScreen(u8 taskId)
     }
 }
 
-void Task_SetNextAnim(u8 taskId)
+static void Task_SetNextAnim(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -1288,7 +1300,7 @@ void Task_SetNextAnim(u8 taskId)
     }
 }
 
-void sub_81D68C8(void)
+static void sub_81D68C8(void)
 {
     SetGpuReg(REG_OFFSET_WININ, 0x3F);
     SetGpuReg(REG_OFFSET_WINOUT, 0);
@@ -1298,13 +1310,13 @@ void sub_81D68C8(void)
     gPlttBufferFaded[0] = 0;
 }
 
-void sub_81D6904(void)
+static void sub_81D6904(void)
 {
     SetGpuReg(REG_OFFSET_WININ, 0x3F);
     SetGpuReg(REG_OFFSET_WINOUT, 0x3F);
 }
 
-void sub_81D691C(u8 taskId)
+static void sub_81D691C(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D750C();
@@ -1336,22 +1348,22 @@ void sub_81D691C(u8 taskId)
     }
 }
 
-u8 sub_81D6984(void)
+static u8 sub_81D6984(void)
 {
     u8 spriteId;
     s16 *data;
 
-    spriteId = CreateSprite(&gUnknown_0862A72C, 88, 72, 3);
+    spriteId = CreateSprite(&sUnknown_0862A72C, 88, 72, 3);
     gSprites[spriteId].callback = sub_81D6A20;
     data = gSprites[spriteId].data;
-    data[0] = CreateSprite(&gUnknown_0862A72C, 56, 104, 3);
-    data[1] = CreateSprite(&gUnknown_0862A750, 75, 101, 0);
-    data[2] = CreateSprite(&gUnknown_0862A774, 109, 114, 1);
+    data[0] = CreateSprite(&sUnknown_0862A72C, 56, 104, 3);
+    data[1] = CreateSprite(&sUnknown_0862A750, 75, 101, 0);
+    data[2] = CreateSprite(&sUnknown_0862A774, 109, 114, 1);
     StartSpriteAnim(&gSprites[data[0]], 1);
     return spriteId;
 }
 
-void sub_81D6A20(struct Sprite *sprite)
+static void sub_81D6A20(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
     data[5]++;
@@ -1388,25 +1400,25 @@ void sub_81D6A20(struct Sprite *sprite)
     }
 }
 
-u8 sub_81D6B7C(void)
+static u8 sub_81D6B7C(void)
 {
     u8 spriteId;
     s16 *data;
 
-    spriteId = CreateSprite(&gUnknown_0862A81C, 136, 96, 1);
+    spriteId = CreateSprite(&sUnknown_0862A81C, 136, 96, 1);
     gSprites[spriteId].callback = sub_81D6D20;
     data = gSprites[spriteId].data;
 
-    data[0] = CreateSprite(&gUnknown_0862A81C, 168, 96, 1) << 8;
-    data[0] |= CreateSprite(&gUnknown_0862A81C, 136, 112, 1);
-    data[1] = CreateSprite(&gUnknown_0862A81C, 168, 112, 1) << 8;
-    data[1] |= CreateSprite(&gUnknown_0862A81C, 136, 128, 1);
-    data[2] = CreateSprite(&gUnknown_0862A81C, 168, 128, 1) << 8;
-    data[2] |= CreateSprite(&gUnknown_0862A81C, 104, 128, 2);
-    data[3] = CreateSprite(&gUnknown_0862A81C, 136, 128, 2) << 8;
-    data[3] |= CreateSprite(&gUnknown_0862A81C, 184, 128, 0);
-    data[4] = CreateSprite(&gUnknown_0862A84C, 208, 132, 0) << 8;
-    data[4] |= CreateSprite(&gUnknown_0862A864, 200, 120, 1);
+    data[0] = CreateSprite(&sUnknown_0862A81C, 168, 96, 1) << 8;
+    data[0] |= CreateSprite(&sUnknown_0862A81C, 136, 112, 1);
+    data[1] = CreateSprite(&sUnknown_0862A81C, 168, 112, 1) << 8;
+    data[1] |= CreateSprite(&sUnknown_0862A81C, 136, 128, 1);
+    data[2] = CreateSprite(&sUnknown_0862A81C, 168, 128, 1) << 8;
+    data[2] |= CreateSprite(&sUnknown_0862A81C, 104, 128, 2);
+    data[3] = CreateSprite(&sUnknown_0862A81C, 136, 128, 2) << 8;
+    data[3] |= CreateSprite(&sUnknown_0862A81C, 184, 128, 0);
+    data[4] = CreateSprite(&sUnknown_0862A84C, 208, 132, 0) << 8;
+    data[4] |= CreateSprite(&sUnknown_0862A864, 200, 120, 1);
 
     StartSpriteAnim(&gSprites[data[0] >> 8], 1);
     StartSpriteAnim(&gSprites[data[0] & 0xFF], 2);
@@ -1420,7 +1432,7 @@ u8 sub_81D6B7C(void)
     return spriteId;
 }
 
-void sub_81D6D20(struct Sprite *sprite)
+static void sub_81D6D20(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
     data[5]++;
@@ -1481,17 +1493,17 @@ void sub_81D6D20(struct Sprite *sprite)
     }
 }
 
-void sub_81D6FD0(void)
+static void sub_81D6FD0(void)
 {
     sub_81D67EC();
     ScanlineEffect_InitHBlankDmaTransfer();
 }
 
-void sub_81D6FE0(void)
+static void sub_81D6FE0(void)
 {
     ResetVramOamAndBgCntRegs();
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_0862A888, ARRAY_COUNT(gUnknown_0862A888));
+    InitBgsFromTemplates(0, sUnknown_0862A888, ARRAY_COUNT(sUnknown_0862A888));
     SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]);
     SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]);
     SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]);
@@ -1506,7 +1518,7 @@ void sub_81D6FE0(void)
     SetGpuReg(REG_OFFSET_BLDCNT, 0);
 }
 
-void sub_81D706C(void)
+static void sub_81D706C(void)
 {
     reset_temp_tile_data_buffers();
     decompress_and_copy_tile_data_to_vram(0, gRaySceneClouds_Gfx, 0, 0, 0);
@@ -1516,24 +1528,24 @@ void sub_81D706C(void)
     LZDecompressWram(gRaySceneClouds1_Tilemap, sRayScene->tilemapBuffers[1]);
     LZDecompressWram(gRaySceneClouds3_Tilemap, sRayScene->tilemapBuffers[2]);
     LoadCompressedPalette(gRaySceneClouds_Pal, 0, 0x40);
-    LoadCompressedObjectPic(&gUnknown_0862A8C4);
-    LoadCompressedObjectPic(&gUnknown_0862A8F8);
-    LoadCompressedObjectPic(&gUnknown_0862A924);
-    LoadCompressedObjectPic(&gUnknown_0862A9D4);
-    LoadCompressedObjectPic(&gUnknown_0862AA14);
-    LoadCompressedObjectPic(&gUnknown_0862AA34);
-    LoadCompressedObjectPalette(&gUnknown_0862A8CC);
-    LoadCompressedObjectPalette(&gUnknown_0862A9DC);
+    LoadCompressedObjectPic(&sUnknown_0862A8C4);
+    LoadCompressedObjectPic(&sUnknown_0862A8F8);
+    LoadCompressedObjectPic(&sUnknown_0862A924);
+    LoadCompressedObjectPic(&sUnknown_0862A9D4);
+    LoadCompressedObjectPic(&sUnknown_0862AA14);
+    LoadCompressedObjectPic(&sUnknown_0862AA34);
+    LoadCompressedObjectPalette(&sUnknown_0862A8CC);
+    LoadCompressedObjectPalette(&sUnknown_0862A9DC);
 }
 
-void sub_81D7134(u8 taskId)
+static void sub_81D7134(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     ScanlineEffect_Clear();
     sub_81D6FE0();
     sub_81D706C();
     CpuFastFill16(0, gScanlineEffectRegBuffers, sizeof(gScanlineEffectRegBuffers));
-    ScanlineEffect_SetParams(gUnknown_0862A87C);
+    ScanlineEffect_SetParams(sUnknown_0862A87C);
     data[0] = 0;
     data[1] = CreateTask(sub_81D7228, 0);
     if (sRayScene->animId == RAY_ANIM_DUO_FIGHT_PRE)
@@ -1556,7 +1568,7 @@ void sub_81D7134(u8 taskId)
     PlaySE(SE_T_OOAME);
 }
 
-void sub_81D7228(u8 taskId)
+static void sub_81D7228(u8 taskId)
 {
     s16 i;
     u16 *data = gTasks[taskId].data;
@@ -1615,7 +1627,7 @@ void sub_81D7228(u8 taskId)
     }
 }
 
-void sub_81D736C(u8 taskId)
+static void sub_81D736C(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D750C();
@@ -1656,33 +1668,33 @@ void sub_81D736C(u8 taskId)
     }
 }
 
-void sub_81D7438(void)
+static void sub_81D7438(void)
 {
     PlaySE(SE_T_KAMI);
     sub_80A2C44(0x7FFF, 0, 0x10, 0, -1, 0, 0);
     sub_80A2C44(0xFFFF0000, 0, 0x10, 0, 0, 0, 1);
 }
 
-void sub_81D7480(void)
+static void sub_81D7480(void)
 {
     PlaySE(SE_T_KAMI);
     sub_80A2C44(0x7FFF, 0, 0x10, 0x10, -1, 0, 0);
     sub_80A2C44(0xFFFF0000, 0, 0x10, 0x10, 0, 0, 1);
 }
 
-void sub_81D74C8(void)
+static void sub_81D74C8(void)
 {
     sub_80A2C44(0x7FFF, 4, 0x10, 0, -1, 0, 0);
     sub_80A2C44(0xFFFF0000, 4, 0x10, 0, 0, 0, 1);
 }
 
-void sub_81D750C(void)
+static void sub_81D750C(void)
 {
     ChangeBgX(2, 0x400, 1);
     ChangeBgY(2, 0x800, 2);
 }
 
-void sub_81D752C(u8 taskId)
+static void sub_81D752C(u8 taskId)
 {
     u16 bgY;
     s16 *data = gTasks[taskId].data;
@@ -1700,14 +1712,14 @@ void sub_81D752C(u8 taskId)
     }
 }
 
-void sub_81D75B4(u8 taskId, s8 palDelay)
+static void sub_81D75B4(u8 taskId, s8 palDelay)
 {
     PlaySE(SE_T_OOAME_E);
     BeginNormalPaletteFade(-1, palDelay, 0, 0x10, 0);
     gTasks[taskId].func = sub_81D7600;
 }
 
-void sub_81D7600(u8 taskId)
+static void sub_81D7600(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D750C();
@@ -1724,22 +1736,22 @@ void sub_81D7600(u8 taskId)
     }
 }
 
-u8 sub_81D7664(void)
+static u8 sub_81D7664(void)
 {
     u8 spriteId;
     s16 *data;
 
-    spriteId = CreateSprite(&gUnknown_0862A8D4, 98, 72, 3);
+    spriteId = CreateSprite(&sUnknown_0862A8D4, 98, 72, 3);
     gSprites[spriteId].callback = sub_81D7700;
     data = gSprites[spriteId].data;
-    data[0] = CreateSprite(&gUnknown_0862A8D4, 66, 104, 3);
-    data[1] = CreateSprite(&gUnknown_0862A900, 85, 101, 0);
-    data[2] = CreateSprite(&gUnknown_0862A92C, 119, 114, 1);
+    data[0] = CreateSprite(&sUnknown_0862A8D4, 66, 104, 3);
+    data[1] = CreateSprite(&sUnknown_0862A900, 85, 101, 0);
+    data[2] = CreateSprite(&sUnknown_0862A92C, 119, 114, 1);
     StartSpriteAnim(&gSprites[data[0]], 1);
     return spriteId;
 }
 
-void sub_81D7700(struct Sprite *sprite)
+static void sub_81D7700(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
     data[5]++;
@@ -1776,7 +1788,7 @@ void sub_81D7700(struct Sprite *sprite)
     }
 }
 
-void sub_81D7860(struct Sprite *sprite)
+static void sub_81D7860(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
     if (sprite->pos1.y <= 160)
@@ -1788,25 +1800,25 @@ void sub_81D7860(struct Sprite *sprite)
     }
 }
 
-u8 sub_81D78BC(void)
+static u8 sub_81D78BC(void)
 {
     u8 spriteId;
     s16 *data;
 
-    spriteId = CreateSprite(&gUnknown_0862A9E4, 126, 96, 1);
+    spriteId = CreateSprite(&sUnknown_0862A9E4, 126, 96, 1);
     gSprites[spriteId].callback = sub_81D7A60;
     data = gSprites[spriteId].data;
 
-    data[0] = CreateSprite(&gUnknown_0862A9E4, 158, 96, 1) << 8;
-    data[0] |= CreateSprite(&gUnknown_0862A9E4, 126, 112, 1);
-    data[1] = CreateSprite(&gUnknown_0862A9E4, 158, 112, 1) << 8;
-    data[1] |= CreateSprite(&gUnknown_0862A9E4, 126, 128, 1);
-    data[2] = CreateSprite(&gUnknown_0862A9E4, 158, 128, 1) << 8;
-    data[2] |= CreateSprite(&gUnknown_0862A9E4, 94, 128, 2);
-    data[3] = CreateSprite(&gUnknown_0862A9E4, 126, 128, 2) << 8;
-    data[3] |= CreateSprite(&gUnknown_0862A9E4, 174, 128, 0);
-    data[4] = CreateSprite(&gUnknown_0862AA1C, 198, 132, 0) << 8;
-    data[4] |= CreateSprite(&gUnknown_0862AA3C, 190, 120, 1);
+    data[0] = CreateSprite(&sUnknown_0862A9E4, 158, 96, 1) << 8;
+    data[0] |= CreateSprite(&sUnknown_0862A9E4, 126, 112, 1);
+    data[1] = CreateSprite(&sUnknown_0862A9E4, 158, 112, 1) << 8;
+    data[1] |= CreateSprite(&sUnknown_0862A9E4, 126, 128, 1);
+    data[2] = CreateSprite(&sUnknown_0862A9E4, 158, 128, 1) << 8;
+    data[2] |= CreateSprite(&sUnknown_0862A9E4, 94, 128, 2);
+    data[3] = CreateSprite(&sUnknown_0862A9E4, 126, 128, 2) << 8;
+    data[3] |= CreateSprite(&sUnknown_0862A9E4, 174, 128, 0);
+    data[4] = CreateSprite(&sUnknown_0862AA1C, 198, 132, 0) << 8;
+    data[4] |= CreateSprite(&sUnknown_0862AA3C, 190, 120, 1);
 
     StartSpriteAnim(&gSprites[data[0] >> 8], 1);
     StartSpriteAnim(&gSprites[data[0] & 0xFF], 2);
@@ -1820,7 +1832,7 @@ u8 sub_81D78BC(void)
     return spriteId;
 }
 
-void sub_81D7A60(struct Sprite *sprite)
+static void sub_81D7A60(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
     data[5]++;
@@ -1881,7 +1893,7 @@ void sub_81D7A60(struct Sprite *sprite)
     }
 }
 
-void sub_81D7D14(struct Sprite *sprite)
+static void sub_81D7D14(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
     if (sprite->pos1.y <= 160)
@@ -1900,11 +1912,11 @@ void sub_81D7D14(struct Sprite *sprite)
     }
 }
 
-void sub_81D7E10(void)
+static void sub_81D7E10(void)
 {
     ResetVramOamAndBgCntRegs();
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(1, gUnknown_0862AA54, ARRAY_COUNT(gUnknown_0862AA54));
+    InitBgsFromTemplates(1, sUnknown_0862AA54, ARRAY_COUNT(sUnknown_0862AA54));
     SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]);
     SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]);
     SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]);
@@ -1919,7 +1931,7 @@ void sub_81D7E10(void)
     SetGpuReg(REG_OFFSET_BLDCNT, 0);
 }
 
-void sub_81D7E9C(void)
+static void sub_81D7E9C(void)
 {
     reset_temp_tile_data_buffers();
     decompress_and_copy_tile_data_to_vram(0, gRaySceneClouds_Gfx, 0, 0, 0);
@@ -1931,11 +1943,11 @@ void sub_81D7E9C(void)
     LZDecompressWram(gRaySceneOvercast_Tilemap, sRayScene->tilemapBuffers[1]);
     LZDecompressWram(gRaySceneRayquaza_Tilemap, sRayScene->tilemapBuffers[2]);
     LoadCompressedPalette(gRaySceneRayquaza_Pal, 0, 0x40);
-    LoadCompressedObjectPic(&gUnknown_0862AA90);
-    LoadCompressedObjectPalette(&gUnknown_0862AA98);
+    LoadCompressedObjectPic(&sUnknown_0862AA90);
+    LoadCompressedObjectPalette(&sUnknown_0862AA98);
 }
 
-void sub_81D7F4C(u8 taskId)
+static void sub_81D7F4C(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     PlayNewMapMusic(MUS_REKKUU_KOURIN);
@@ -1951,7 +1963,7 @@ void sub_81D7F4C(u8 taskId)
     gTasks[taskId].func = sub_81D7FC0;
 }
 
-void sub_81D7FC0(u8 taskId)
+static void sub_81D7FC0(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     switch (data[0])
@@ -2012,7 +2024,7 @@ void sub_81D7FC0(u8 taskId)
     }
 }
 
-void sub_81D8164(u8 taskId)
+static void sub_81D8164(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -2023,14 +2035,14 @@ void sub_81D8164(u8 taskId)
     }
 }
 
-void sub_81D81A4(u8 taskId)
+static void sub_81D81A4(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     if ((data[1] & 3) == 0)
     {
-        u8 spriteId = CreateSprite(&gUnknown_0862AAA0,
-                                   (gUnknown_0862AAB8[data[0]][0] * 4) + 120,
-                                   (gUnknown_0862AAB8[data[0]][1] * 4) + 80,
+        u8 spriteId = CreateSprite(&sUnknown_0862AAA0,
+                                   (sUnknown_0862AAB8[data[0]][0] * 4) + 120,
+                                   (sUnknown_0862AAB8[data[0]][1] * 4) + 80,
                                    0);
         gSprites[spriteId].data[0] = (s8)(data[0]);
         gSprites[spriteId].oam.objMode = 1;
@@ -2051,7 +2063,7 @@ void sub_81D81A4(u8 taskId)
     data[1]++;
 }
 
-void sub_81D8260(struct Sprite *sprite)
+static void sub_81D8260(struct Sprite *sprite)
 {
     if (sprite->data[1] == 0)
     {
@@ -2060,19 +2072,19 @@ void sub_81D8260(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos2.x += gUnknown_0862AAB8[sprite->data[0]][0];
-        sprite->pos2.y += gUnknown_0862AAB8[sprite->data[0]][1];
+        sprite->pos2.x += sUnknown_0862AAB8[sprite->data[0]][0];
+        sprite->pos2.y += sUnknown_0862AAB8[sprite->data[0]][1];
     }
 
     sprite->data[1]++;
     sprite->data[1] &= 0xF;
 }
 
-void sub_81D82B0(void)
+static void sub_81D82B0(void)
 {
     ResetVramOamAndBgCntRegs();
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_0862AACC, ARRAY_COUNT(gUnknown_0862AACC));
+    InitBgsFromTemplates(0, sUnknown_0862AACC, ARRAY_COUNT(sUnknown_0862AACC));
     SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]);
     SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]);
     SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]);
@@ -2090,7 +2102,7 @@ void sub_81D82B0(void)
     SetGpuReg(REG_OFFSET_BLDCNT, 0);
 }
 
-void sub_81D8358(void)
+static void sub_81D8358(void)
 {
     reset_temp_tile_data_buffers();
     decompress_and_copy_tile_data_to_vram(0, gRaySceneRayquazaLight_Gfx, 0, 0, 0);
@@ -2106,12 +2118,12 @@ void sub_81D8358(void)
     LoadCompressedPalette(gRaySceneOvercast2_Pal, 0, 0x40);
     gPlttBufferUnfaded[0] = RGB_WHITE;
     gPlttBufferFaded[0] = RGB_WHITE;
-    LoadCompressedObjectPic(&gUnknown_0862AAFC);
-    LoadCompressedObjectPic(&gUnknown_0862AB04);
-    LoadCompressedObjectPalette(&gUnknown_0862AB0C);
+    LoadCompressedObjectPic(&sUnknown_0862AAFC);
+    LoadCompressedObjectPic(&sUnknown_0862AB04);
+    LoadCompressedObjectPalette(&sUnknown_0862AB0C);
 }
 
-void sub_81D844C(void)
+static void sub_81D844C(void)
 {
     u16 VCOUNT = GetGpuReg(REG_OFFSET_VCOUNT);
     if (VCOUNT >= 24 && VCOUNT <= 135 && VCOUNT - 24 <= sRayScene->field_2008)
@@ -2135,7 +2147,7 @@ void sub_81D844C(void)
     }
 }
 
-void sub_81D84EC(u8 taskId)
+static void sub_81D84EC(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D82B0();
@@ -2154,7 +2166,7 @@ void sub_81D84EC(u8 taskId)
     gTasks[taskId].func = sub_81D857C;
 }
 
-void sub_81D857C(u8 taskId)
+static void sub_81D857C(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     switch (data[0])
@@ -2213,7 +2225,7 @@ void sub_81D857C(u8 taskId)
     }
 }
 
-void sub_81D8684(u8 taskId)
+static void sub_81D8684(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -2225,18 +2237,18 @@ void sub_81D8684(u8 taskId)
     }
 }
 
-u8 sub_81D86CC(void)
+static u8 sub_81D86CC(void)
 {
-    u8 spriteId = CreateSprite(&gUnknown_0862AB14, 160, 0, 0);
+    u8 spriteId = CreateSprite(&sUnknown_0862AB14, 160, 0, 0);
     s16 *data = gSprites[spriteId].data;
-    data[0] = CreateSprite(&gUnknown_0862AB2C, 184, -48, 0);
+    data[0] = CreateSprite(&sUnknown_0862AB2C, 184, -48, 0);
     gSprites[spriteId].callback = sub_81D874C;
     gSprites[spriteId].oam.priority = 3;
     gSprites[data[0]].oam.priority = 3;
     return spriteId;
 }
 
-void sub_81D874C(struct Sprite *sprite)
+static void sub_81D874C(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
     s16 counter = data[2];
@@ -2290,11 +2302,11 @@ void sub_81D874C(struct Sprite *sprite)
     data[2]++;
 }
 
-void sub_81D8828(void)
+static void sub_81D8828(void)
 {
     ResetVramOamAndBgCntRegs();
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_0862AB44, ARRAY_COUNT(gUnknown_0862AB44));
+    InitBgsFromTemplates(0, sUnknown_0862AB44, ARRAY_COUNT(sUnknown_0862AB44));
     SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]);
     SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]);
     SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]);
@@ -2312,7 +2324,7 @@ void sub_81D8828(void)
     SetGpuReg(REG_OFFSET_BLDCNT, 0);
 }
 
-void sub_81D88D0(void)
+static void sub_81D88D0(void)
 {
     reset_temp_tile_data_buffers();
     decompress_and_copy_tile_data_to_vram(1, gRaySceneRayquazaChase_Gfx, 0, 0, 0);
@@ -2327,7 +2339,7 @@ void sub_81D88D0(void)
     LoadCompressedPalette(gRaySceneChase_Pal, 0, 0x80);
 }
 
-void sub_81D8980(u8 taskId)
+static void sub_81D8980(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D8828();
@@ -2341,7 +2353,7 @@ void sub_81D8980(u8 taskId)
     gTasks[taskId].func = sub_81D89E0;
 }
 
-void sub_81D89E0(u8 taskId)
+static void sub_81D89E0(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D8BB4();
@@ -2393,7 +2405,7 @@ void sub_81D89E0(u8 taskId)
     }
 }
 
-void sub_81D8AD8(u8 taskId)
+static void sub_81D8AD8(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     if ((data[15] & 3) == 0)
@@ -2405,7 +2417,7 @@ void sub_81D8AD8(u8 taskId)
     data[15]++;
 }
 
-void sub_81D8B2C(u8 taskId)
+static void sub_81D8B2C(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     if (data[0] == 0)
@@ -2426,7 +2438,7 @@ void sub_81D8B2C(u8 taskId)
     }
 }
 
-void sub_81D8BB4(void)
+static void sub_81D8BB4(void)
 {
     ChangeBgX(2, 0x400, 2);
     ChangeBgY(2, 0x400, 1);
@@ -2434,7 +2446,7 @@ void sub_81D8BB4(void)
     ChangeBgY(0, 0x800, 1);
 }
 
-void sub_81D8BEC(u8 taskId)
+static void sub_81D8BEC(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D8BB4();
@@ -2446,3 +2458,475 @@ void sub_81D8BEC(u8 taskId)
         gTasks[taskId].func = Task_SetNextAnim;
     }
 }
+
+static void sub_81D8C38(void)
+{
+    ResetVramOamAndBgCntRegs();
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(1, sUnknown_0862AD08, ARRAY_COUNT(sUnknown_0862AD08));
+    SetBgTilemapBuffer(0, sRayScene->tilemapBuffers[0]);
+    SetBgTilemapBuffer(1, sRayScene->tilemapBuffers[1]);
+    SetBgTilemapBuffer(2, sRayScene->tilemapBuffers[2]);
+    ResetAllBgsCoordinates();
+    schedule_bg_copy_tilemap_to_vram(0);
+    schedule_bg_copy_tilemap_to_vram(1);
+    schedule_bg_copy_tilemap_to_vram(2);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_WIN0_ON);
+    ShowBg(0);
+    ShowBg(1);
+    ShowBg(2);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+}
+
+static void sub_81D8CC4(void)
+{
+    reset_temp_tile_data_buffers();
+    decompress_and_copy_tile_data_to_vram(2, gRaySceneHushRing_Gfx, 0, 0, 0);
+    decompress_and_copy_tile_data_to_vram(0, gRaySceneHushBg_Gfx, 0, 0, 0);
+    while (free_temp_tile_data_buffers_if_possible());
+
+    LZDecompressWram(gRaySceneHushRing_Tilemap, sRayScene->tilemapBuffers[1]);
+    LZDecompressWram(gRaySceneHushBg_Tilemap, sRayScene->tilemapBuffers[0]);
+    LZDecompressWram(gRaySceneHushRing_Map, sRayScene->tilemapBuffers[2]);
+    LoadCompressedPalette(gRaySceneHushBg_Pal, 0, 0x60);
+    LoadCompressedObjectPic(&sUnknown_0862AC28);
+    LoadCompressedObjectPic(&sUnknown_0862AC30);
+    LoadCompressedObjectPic(&sUnknown_0862AC38);
+    LoadCompressedObjectPic(&sUnknown_0862AC40);
+    LoadCompressedObjectPic(&sUnknown_0862AC48);
+    LoadCompressedObjectPic(&sUnknown_0862AC50);
+    LoadCompressedObjectPalette(&sUnknown_0862AC58);
+    LoadCompressedObjectPalette(&sUnknown_0862AC60);
+    LoadCompressedObjectPalette(&sUnknown_0862AC68);
+    LoadCompressedObjectPalette(&sUnknown_0862AC70);
+}
+
+static void sub_81D8DB4(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    sub_81D8C38();
+    sub_81D8CC4();
+    sub_81D68C8();
+    ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0x241);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0xE09);
+    BlendPalettes(-1, 0x10, 0);
+    SetVBlankCallback(sub_81D67EC);
+    data[0] = 0;
+    data[1] = 0;
+    gTasks[taskId].func = sub_81D8E80;
+    data[2] = CreateTask(sub_81D8FB0, 0);
+    gTasks[data[2]].data[0] = 0;
+    gTasks[data[2]].data[1] = 0;
+    gTasks[data[2]].data[2] = 0;
+    gTasks[data[2]].data[3] = 1;
+    gTasks[data[2]].data[4] = 1;
+}
+
+static void sub_81D8E80(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    switch (data[0])
+    {
+    case 0:
+        if (data[1] == 8)
+        {
+            sub_81D90A8(taskId);
+            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+            data[1] = 0;
+            data[0]++;
+        }
+        else
+        {
+            data[1]++;
+        }
+        break;
+    case 1:
+        if (gSprites[data[5]].callback == sub_81D97E0)
+        {
+            if (data[1] == 64)
+            {
+                sub_81D94D4(taskId);
+                sub_81D93D8(taskId);
+                data[1] = 0;
+                data[0]++;
+            }
+            else
+            {
+                data[1]++;
+            }
+        }
+        break;
+    case 2:
+        if (data[1] == 448)
+        {
+            data[1] = 0;
+            data[0]++;
+        }
+        else
+        {
+            data[1]++;
+            if (data[1] % 144 == 0)
+            {
+                sub_80A2C44(0xFFFE, 0, 0x10, 0, -1, 0, 0);
+                sub_80A2C44(0xFFFF0000, 0, 0x10, 0, 0, 0, 1);
+            }
+        }
+        break;
+    case 3:
+        BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
+        gTasks[taskId].func = sub_81D9034;
+        break;
+    }
+}
+
+static void sub_81D8FB0(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    if ((data[0] & 0xF) == 0)
+    {
+        SetGpuReg(REG_OFFSET_BLDALPHA, ((data[1] + 14) << 8 & 0x1F00) | ((data[2] + 9) & 0xF));
+        data[1] -= data[3];
+        data[2] += data[4];
+        if (data[1] == -3 || data[1] == 0)
+            data[3] *= -1;
+        if (data[2] == 3 || data[2] == 0)
+            data[4] *= -1;
+    }
+
+    data[0]++;
+}
+
+static void sub_81D9034(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    if (!gPaletteFade.active)
+    {
+        StopMapMusic();
+        if (data[1] == 0)
+        {
+            SetVBlankCallback(NULL);
+            sub_81D6904();
+            ResetSpriteData();
+            FreeAllSpritePalettes();
+            DestroyTask(data[2]);
+        }
+
+        if (data[1] == 32)
+        {
+            data[1] = 0;
+            gTasks[taskId].func = Task_SetNextAnim;
+        }
+        else
+        {
+            data[1]++;
+        }
+    }
+}
+
+static void sub_81D90A8(u8 taskId)
+{
+    s16 *taskData, *spriteData;
+
+    taskData = gTasks[taskId].data;
+
+    taskData[3] = CreateSprite(&sUnknown_0862AC78, 64, 120, 0);
+    spriteData = gSprites[taskData[3]].data;
+    spriteData[0] = CreateSprite(&sUnknown_0862AC90, 16, 130, 0);
+    gSprites[taskData[3]].oam.priority = 1;
+    gSprites[spriteData[0]].oam.priority = 1;
+
+    taskData[4] = CreateSprite(&sUnknown_0862ACA8, 160, 128, 1);
+    spriteData = gSprites[taskData[4]].data;
+    spriteData[0] = CreateSprite(&sUnknown_0862ACA8, 192, 128, 1);
+    spriteData[1] = CreateSprite(&sUnknown_0862ACA8, 224, 128, 1);
+    gSprites[taskData[4]].oam.priority = 1;
+    gSprites[spriteData[0]].oam.priority = 1;
+    gSprites[spriteData[1]].oam.priority = 1;
+    StartSpriteAnim(&gSprites[spriteData[0]], 1);
+    StartSpriteAnim(&gSprites[spriteData[1]], 2);
+
+    taskData[5] = CreateSprite(&sUnknown_0862ACC0, 120, -65, 0);
+    spriteData = gSprites[taskData[5]].data;
+    spriteData[0] = CreateSprite(&sUnknown_0862ACD8, 120, -113, 0);
+    gSprites[taskData[5]].oam.priority = 1;
+    gSprites[spriteData[0]].oam.priority = 1;
+}
+
+static void sub_81D9274(u8 taskId)
+{
+    s16 *taskData = gTasks[taskId].data;
+
+    gSprites[taskData[3]].callback = sub_81D9338;
+    gSprites[taskData[3]].data[4] = 0;
+    gSprites[taskData[3]].data[5] = 0;
+    gSprites[taskData[3]].data[6] = 4;
+    gSprites[taskData[3]].data[7] = 0;
+
+    gSprites[taskData[4]].callback = sub_81D9338;
+    gSprites[taskData[4]].data[4] = 0;
+    gSprites[taskData[4]].data[5] = 0;
+    gSprites[taskData[4]].data[6] = 4;
+    gSprites[taskData[4]].data[7] = 1;
+}
+
+static void sub_81D9338(struct Sprite *sprite)
+{
+    if ((sprite->data[4] & 7) == 0)
+    {
+        if (sprite->data[7] == 0)
+        {
+            sprite->pos1.x -= sprite->data[6];
+            gSprites[sprite->data[0]].pos1.x -= sprite->data[6];
+        }
+        else
+        {
+            sprite->pos1.x += sprite->data[6];
+            gSprites[sprite->data[0]].pos1.x += sprite->data[6];
+            gSprites[sprite->data[1]].pos1.x += sprite->data[6];
+        }
+
+        sprite->data[5]++;
+        sprite->data[6] -= sprite->data[5];
+        if (sprite->data[5] == 3)
+        {
+            sprite->data[4] = 0;
+            sprite->data[5] = 0;
+            sprite->data[6] = 0;
+            sprite->callback = SpriteCallbackDummy;
+            return;
+        }
+    }
+
+    sprite->data[4]++;
+}
+
+static void sub_81D93D8(u8 taskId)
+{
+    s16 *taskData = gTasks[taskId].data;
+    gSprites[taskData[3]].callback = sub_81D9420;
+    StartSpriteAnim(&gSprites[taskData[3]], 1);
+}
+
+static void sub_81D9420(struct Sprite *sprite)
+{
+    switch (sprite->animCmdIndex)
+    {
+    case 0:
+    case 2:
+        if (sprite->animDelayCounter % 12 == 0)
+        {
+            sprite->pos1.x -= 2;
+            gSprites[sprite->data[0]].pos1.x -=2;
+        }
+        gSprites[sprite->data[0]].pos2.y = 0;
+        break;
+    case 1:
+    case 3:
+        gSprites[sprite->data[0]].pos2.y = -2;
+        if ((sprite->animDelayCounter & 15) == 0)
+        {
+            sprite->pos1.y++;
+            gSprites[sprite->data[0]].pos1.y++;
+        }
+        break;
+    }
+}
+
+static void sub_81D94D4(u8 taskId)
+{
+    s16 *taskData, *spriteData;
+
+    taskData = gTasks[taskId].data;
+    spriteData = gSprites[taskData[4]].data;
+
+    gSprites[taskData[4]].callback = sub_81D9528;
+    gSprites[spriteData[0]].callback = sub_81D9528;
+    gSprites[spriteData[1]].callback = sub_81D9528;
+}
+
+static void sub_81D9528(struct Sprite *sprite)
+{
+    if ((sprite->data[4] & 3) == 0)
+    {
+        if (sprite->pos2.x == 1)
+            sprite->pos2.x = -1;
+        else
+            sprite->pos2.x = 1;
+    }
+    if (sprite->data[5] == 128)
+    {
+        sprite->data[7] = CreateSprite(&sUnknown_0862ACF0, 152, 132, 0);
+        gSprites[sprite->data[7]].oam.priority = 1;
+        sprite->data[7] = CreateSprite(&sUnknown_0862ACF0, 224, 132, 0);
+        gSprites[sprite->data[7]].oam.priority = 1;
+        gSprites[sprite->data[7]].hFlip = 1;
+        sprite->data[5]++;
+    }
+    if (sprite->data[5] > 127)
+    {
+        if (sprite->pos2.y != 32)
+        {
+            sprite->data[6]++;
+            sprite->pos2.y = sprite->data[6] >> 4;
+        }
+    }
+    else
+    {
+        sprite->data[5]++;
+    }
+
+    if (sprite->data[4] % 64 == 0)
+        PlaySE(SE_W250);
+
+    sprite->data[4]++;
+}
+
+static void sub_81D961C(struct Sprite *sprite)
+{
+    s16 counter = sprite->data[7];
+    if (counter <= 64)
+    {
+        sprite->pos2.y += 2;
+        gSprites[sprite->data[0]].pos2.y += 2;
+        if (sprite->data[7] == 64)
+        {
+            sub_81D9868(sprite, 1, 0, -48);
+            sprite->data[4] = 5;
+            sprite->data[5] = -1;
+            gSprites[sprite->data[0]].data[4] = 3;
+            gSprites[sprite->data[0]].data[5] = 5;
+        }
+    }
+    else if (counter <= 111)
+    {
+        sub_81D97E0(sprite);
+        if (sprite->data[4] == 0)
+            PlaySE(SE_BT_START);
+        if (sprite->data[4] == -3)
+            sub_81D9868(sprite, 2, 48, 16);
+    }
+    else if (counter == 112)
+    {
+        gSprites[sprite->data[0]].data[4] = 7;
+        gSprites[sprite->data[0]].data[5] = 3;
+        sub_81D97E0(sprite);
+    }
+    else if (counter <= 327)
+    {
+        sub_81D97E0(sprite);
+    }
+    else if (counter == 328)
+    {
+        sub_81D97E0(sprite);
+        sub_81D9868(sprite, 3, 48, 16);
+        sprite->pos2.x = 1;
+        gSprites[sprite->data[0]].pos2.x = 1;
+        PlayCry1(SPECIES_RAYQUAZA, 0);
+        CreateTask(sub_81D98B4, 0);
+    }
+    else
+    {
+        switch (counter)
+        {
+        case 376:
+            sprite->pos2.x = 0;
+            gSprites[sprite->data[0]].pos2.x = 0;
+            sub_81D97E0(sprite);
+            sub_81D9868(sprite, 2, 48, 16);
+            sprite->callback = sub_81D97E0;
+            return;
+        case 352:
+            sub_81D9274(FindTaskIdByFunc(sub_81D8E80));
+            break;
+        }
+    }
+
+    if (sprite->data[7] > 328 && (sprite->data[7] & 1) == 0)
+    {
+        sprite->pos2.x *= -1;
+        gSprites[sprite->data[0]].pos2.x = sprite->pos2.x;
+    }
+
+    sprite->data[7]++;
+}
+
+static void sub_81D97E0(struct Sprite *sprite)
+{
+    struct Sprite *sprite2 = &gSprites[sprite->data[0]];
+    if (!(sprite->data[6] & sprite2->data[4]))
+    {
+        sprite->pos2.y += sprite->data[4];
+        gSprites[sprite->data[0]].pos2.y += sprite->data[4];
+        sprite->data[4] += sprite->data[5];
+        if (sprite->data[4] >= sprite2->data[5] || sprite->data[4] <= -sprite2->data[5])
+        {
+            if (sprite->data[4] > sprite2->data[5])
+                sprite->data[4] = sprite2->data[5];
+            else if (sprite->data[4] < -sprite2->data[5])
+                sprite->data[4] = -sprite2->data[5];
+
+            sprite->data[5] *= -1;
+        }
+    }
+
+    sprite->data[6]++;
+}
+
+static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y)
+{
+    struct Sprite *sprite2 = &gSprites[sprite->data[0]];
+
+    sprite2->pos1.x = sprite->pos1.x + x;
+    sprite2->pos1.y = sprite->pos1.y + y;
+
+    sprite2->pos2.x = sprite->pos2.x;
+    sprite2->pos2.y = sprite->pos2.y;
+
+    StartSpriteAnim(sprite, animNum);
+    StartSpriteAnim(sprite2, animNum);
+}
+
+static void sub_81D98B4(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    switch (data[0])
+    {
+    case 0:
+        SetBgAffine(2, 0x4000, 0x4000, 0x78, 0x40, 0x100, 0x100, 0);
+        SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
+        data[4] = 16;
+        data[0]++;
+        break;
+    case 1:
+        if (data[5] == 8)
+            PlaySE(SE_JIDO_DOA);
+        if (data[2] == 2)
+        {
+            data[0]++;
+        }
+        else
+        {
+            data[1] += data[4];
+            data[5]++;
+            if (data[3] % 3 == 0 && data[4] != 4)
+                data[4] -= 2;
+
+            data[3]++;
+            SetBgAffine(2, 0x4000, 0x4000, 0x78, 0x40, 0x100 - data[1], 0x100 - data[1], 0);
+            if (data[1] > 255)
+            {
+                data[1] = 0;
+                data[3] = 0;
+                data[5] = 0;
+                data[4] = 16;
+                data[2]++;
+            }
+        }
+        break;
+    case 2:
+        ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
+        DestroyTask(taskId);
+        break;
+    }
+}
-- 
cgit v1.2.3


From 9976e21f6a7175a0f31bec39ab8e35c05cd5946b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 1 Feb 2018 14:53:27 +0100
Subject: give some names ray scene

---
 src/rayquaza_scene.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index e32655578..0b97c7986 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -34,11 +34,11 @@ struct RaySceneStruct
 static EWRAM_DATA struct RaySceneStruct *sRayScene = NULL;
 
 // this file's functions
-static void sub_81D7134(u8 taskId);
-static void sub_81D7F4C(u8 taskId);
-static void sub_81D84EC(u8 taskId);
-static void sub_81D8980(u8 taskId);
-static void sub_81D8DB4(u8 taskId);
+static void Task_DuoFightAnim(u8 taskId);
+static void Task_RayTakesFlightAnim(u8 taskId);
+static void Task_RayDescendsAnim(u8 taskId);
+static void Task_RayChargesAnim(u8 taskId);
+static void Task_RayChasesAwayAnim(u8 taskId);
 static void sub_81D857C(u8 taskId);
 static void sub_81D8684(u8 taskId);
 static void sub_81D89E0(u8 taskId);
@@ -89,12 +89,12 @@ static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y);
 // const rom data
 static const TaskFunc sTasksForAnimations[] =
 {
-    sub_81D7134, // RAY_ANIM_DUO_FIGHT_PRE
-    sub_81D7134, // RAY_ANIM_DUO_FIGHT
-    sub_81D7F4C, // RAY_ANIM_TAKES_FLIGHT
-    sub_81D84EC, // RAY_ANIM_DESCENDS
-    sub_81D8980, // RAY_ANIM_CHARGES
-    sub_81D8DB4, // RAY_ANIM_CHACES_AWAY
+    Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT_PRE
+    Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT
+    Task_RayTakesFlightAnim, // RAY_ANIM_TAKES_FLIGHT
+    Task_RayDescendsAnim, // RAY_ANIM_DESCENDS
+    Task_RayChargesAnim, // RAY_ANIM_CHARGES
+    Task_RayChasesAwayAnim, // RAY_ANIM_CHACES_AWAY
     Task_EndAfterFadeScreen // RAY_ANIM_END
 };
 
@@ -1538,7 +1538,7 @@ static void sub_81D706C(void)
     LoadCompressedObjectPalette(&sUnknown_0862A9DC);
 }
 
-static void sub_81D7134(u8 taskId)
+static void Task_DuoFightAnim(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     ScanlineEffect_Clear();
@@ -1947,7 +1947,7 @@ static void sub_81D7E9C(void)
     LoadCompressedObjectPalette(&sUnknown_0862AA98);
 }
 
-static void sub_81D7F4C(u8 taskId)
+static void Task_RayTakesFlightAnim(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     PlayNewMapMusic(MUS_REKKUU_KOURIN);
@@ -2147,7 +2147,7 @@ static void sub_81D844C(void)
     }
 }
 
-static void sub_81D84EC(u8 taskId)
+static void Task_RayDescendsAnim(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D82B0();
@@ -2339,7 +2339,7 @@ static void sub_81D88D0(void)
     LoadCompressedPalette(gRaySceneChase_Pal, 0, 0x80);
 }
 
-static void sub_81D8980(u8 taskId)
+static void Task_RayChargesAnim(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D8828();
@@ -2501,7 +2501,7 @@ static void sub_81D8CC4(void)
     LoadCompressedObjectPalette(&sUnknown_0862AC70);
 }
 
-static void sub_81D8DB4(u8 taskId)
+static void Task_RayChasesAwayAnim(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D8C38();
-- 
cgit v1.2.3


From be08cc06f289374e9dd1e5a86fdf73d217360a91 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 1 Feb 2018 15:32:12 +0100
Subject: more function names in ray scene

---
 src/rayquaza_scene.c | 62 ++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 0b97c7986..05a015078 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -40,28 +40,28 @@ static void Task_RayDescendsAnim(u8 taskId);
 static void Task_RayChargesAnim(u8 taskId);
 static void Task_RayChasesAwayAnim(u8 taskId);
 static void sub_81D857C(u8 taskId);
-static void sub_81D8684(u8 taskId);
+static void Task_RayDescendsEnd(u8 taskId);
 static void sub_81D89E0(u8 taskId);
 static void sub_81D8AD8(u8 taskId);
 static void sub_81D8B2C(u8 taskId);
-static void sub_81D8BEC(u8 taskId);
+static void Task_RayChargesEnd(u8 taskId);
 static void sub_81D8E80(u8 taskId);
 static void sub_81D8FB0(u8 taskId);
 static void sub_81D7228(u8 taskId);
 static void sub_81D736C(u8 taskId);
 static void sub_81D752C(u8 taskId);
-static void sub_81D7600(u8 taskId);
+static void Task_DuoFightEnd(u8 taskId);
 static void sub_81D7FC0(u8 taskId);
 static void sub_81D81A4(u8 taskId);
-static void sub_81D8164(u8 taskId);
+static void Task_RayTakesFlightEnd(u8 taskId);
 static void sub_81D94D4(u8 taskId);
 static void sub_81D93D8(u8 taskId);
-static void sub_81D9034(u8 taskId);
+static void Task_RayChasesAwayEnd(u8 taskId);
 static void sub_81D90A8(u8 taskId);
 static void sub_81D98B4(u8 taskId);
 static void Task_EndAfterFadeScreen(u8 taskId);
-static void sub_81D6774(void);
-static void sub_81D67D0(void);
+static void CB2_InitRayquazaScene(void);
+static void CB2_RayquazaScene(void);
 static void sub_81D750C(void);
 static void sub_81D7438(void);
 static void sub_81D7480(void);
@@ -83,7 +83,7 @@ static void sub_81D9528(struct Sprite *sprite);
 static u8 sub_81D7664(void);
 static u8 sub_81D78BC(void);
 static u8 sub_81D86CC(void);
-static void sub_81D75B4(u8 taskId, s8 palDelay);
+static void DuoFightEnd(u8 taskId, s8 palDelay);
 static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y);
 
 // const rom data
@@ -1238,10 +1238,10 @@ void DoRayquazaScene(u8 animId, bool8 onlyOneAnim, void (*callback)(void))
     sRayScene->animId = animId;
     sRayScene->callback = callback;
     sRayScene->onlyOneAnim = onlyOneAnim;
-    SetMainCallback2(sub_81D6774);
+    SetMainCallback2(CB2_InitRayquazaScene);
 }
 
-static void sub_81D6774(void)
+static void CB2_InitRayquazaScene(void)
 {
     SetVBlankHBlankCallbacksToNull();
     clear_scheduled_bg_copies_to_vram();
@@ -1252,10 +1252,10 @@ static void sub_81D6774(void)
     ResetTasks();
     FillPalette(0, 0xF0, 0x20);
     CreateTask(sTasksForAnimations[sRayScene->animId], 0);
-    SetMainCallback2(sub_81D67D0);
+    SetMainCallback2(CB2_RayquazaScene);
 }
 
-static void sub_81D67D0(void)
+static void CB2_RayquazaScene(void)
 {
     RunTasks();
     AnimateSprites();
@@ -1264,7 +1264,7 @@ static void sub_81D67D0(void)
     UpdatePaletteFade();
 }
 
-static void sub_81D67EC(void)
+static void VblankCB_RayquazaScene(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
@@ -1336,7 +1336,7 @@ static void sub_81D691C(u8 taskId)
             switch (counter)
             {
             case 328:
-                sub_81D75B4(taskId, 0);
+                DuoFightEnd(taskId, 0);
                 return;
             case 148:
                 sub_81D74C8();
@@ -1495,7 +1495,7 @@ static void sub_81D6D20(struct Sprite *sprite)
 
 static void sub_81D6FD0(void)
 {
-    sub_81D67EC();
+    VblankCB_RayquazaScene();
     ScanlineEffect_InitHBlankDmaTransfer();
 }
 
@@ -1651,7 +1651,7 @@ static void sub_81D736C(u8 taskId)
             switch (counter)
             {
             case 412:
-                sub_81D75B4(taskId, 2);
+                DuoFightEnd(taskId, 2);
                 return;
             case 380:
                 SetGpuReg(REG_OFFSET_BLDCNT, 0x244);
@@ -1712,14 +1712,14 @@ static void sub_81D752C(u8 taskId)
     }
 }
 
-static void sub_81D75B4(u8 taskId, s8 palDelay)
+static void DuoFightEnd(u8 taskId, s8 palDelay)
 {
     PlaySE(SE_T_OOAME_E);
     BeginNormalPaletteFade(-1, palDelay, 0, 0x10, 0);
-    gTasks[taskId].func = sub_81D7600;
+    gTasks[taskId].func = Task_DuoFightEnd;
 }
 
-static void sub_81D7600(u8 taskId)
+static void Task_DuoFightEnd(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D750C();
@@ -1956,7 +1956,7 @@ static void Task_RayTakesFlightAnim(u8 taskId)
     SetGpuReg(REG_OFFSET_BLDCNT, 0x250);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0x808);
     BlendPalettes(-1, 0x10, 0);
-    SetVBlankCallback(sub_81D67EC);
+    SetVBlankCallback(VblankCB_RayquazaScene);
     CreateTask(sub_81D81A4, 0);
     data[0] = 0;
     data[1] = 0;
@@ -2019,12 +2019,12 @@ static void sub_81D7FC0(u8 taskId)
     case 3:
         data[2] += 16;
         SetBgAffine(2, 0x7800, 0x1800, 0x78, data[4] + 32, data[2], data[2], 0);
-        sub_81D8164(taskId);
+        Task_RayTakesFlightEnd(taskId);
         break;
     }
 }
 
-static void sub_81D8164(u8 taskId)
+static void Task_RayTakesFlightEnd(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -2155,7 +2155,7 @@ static void Task_RayDescendsAnim(u8 taskId)
     SetGpuRegBits(REG_OFFSET_BLDCNT, 0x1E41);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000);
     BlendPalettes(-1, 0x10, 0);
-    SetVBlankCallback(sub_81D67EC);
+    SetVBlankCallback(VblankCB_RayquazaScene);
     sRayScene->field_2008 = 0;
     sRayScene->field_200A = 0;
     data[0] = 0;
@@ -2220,12 +2220,12 @@ static void sub_81D857C(u8 taskId)
         break;
     case 4:
         BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-        gTasks[taskId].func = sub_81D8684;
+        gTasks[taskId].func = Task_RayDescendsEnd;
         break;
     }
 }
 
-static void sub_81D8684(u8 taskId)
+static void Task_RayDescendsEnd(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -2346,7 +2346,7 @@ static void Task_RayChargesAnim(u8 taskId)
     sub_81D88D0();
     sub_81D68C8();
     BlendPalettes(-1, 0x10, 0);
-    SetVBlankCallback(sub_81D67EC);
+    SetVBlankCallback(VblankCB_RayquazaScene);
     data[0] = 0;
     data[1] = 0;
     data[2] = CreateTask(sub_81D8AD8, 0);
@@ -2400,7 +2400,7 @@ static void sub_81D89E0(u8 taskId)
         break;
     case 3:
         BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-        gTasks[taskId].func = sub_81D8BEC;
+        gTasks[taskId].func = Task_RayChargesEnd;
         break;
     }
 }
@@ -2446,7 +2446,7 @@ static void sub_81D8BB4(void)
     ChangeBgY(0, 0x800, 1);
 }
 
-static void sub_81D8BEC(u8 taskId)
+static void Task_RayChargesEnd(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D8BB4();
@@ -2511,7 +2511,7 @@ static void Task_RayChasesAwayAnim(u8 taskId)
     SetGpuReg(REG_OFFSET_BLDCNT, 0x241);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0xE09);
     BlendPalettes(-1, 0x10, 0);
-    SetVBlankCallback(sub_81D67EC);
+    SetVBlankCallback(VblankCB_RayquazaScene);
     data[0] = 0;
     data[1] = 0;
     gTasks[taskId].func = sub_81D8E80;
@@ -2575,7 +2575,7 @@ static void sub_81D8E80(u8 taskId)
         break;
     case 3:
         BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
-        gTasks[taskId].func = sub_81D9034;
+        gTasks[taskId].func = Task_RayChasesAwayEnd;
         break;
     }
 }
@@ -2597,7 +2597,7 @@ static void sub_81D8FB0(u8 taskId)
     data[0]++;
 }
 
-static void sub_81D9034(u8 taskId)
+static void Task_RayChasesAwayEnd(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     if (!gPaletteFade.active)
-- 
cgit v1.2.3


From af068e74ad55b2c6feb638c790f1f9f0c792f74c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 1 Feb 2018 23:39:53 +0100
Subject: more function names in ray scene

---
 src/rayquaza_scene.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 05a015078..e2701cd99 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -39,19 +39,19 @@ static void Task_RayTakesFlightAnim(u8 taskId);
 static void Task_RayDescendsAnim(u8 taskId);
 static void Task_RayChargesAnim(u8 taskId);
 static void Task_RayChasesAwayAnim(u8 taskId);
-static void sub_81D857C(u8 taskId);
+static void Task_HandleRayDescends(u8 taskId);
 static void Task_RayDescendsEnd(u8 taskId);
-static void sub_81D89E0(u8 taskId);
+static void Task_HandleRayCharges(u8 taskId);
 static void sub_81D8AD8(u8 taskId);
 static void sub_81D8B2C(u8 taskId);
 static void Task_RayChargesEnd(u8 taskId);
-static void sub_81D8E80(u8 taskId);
+static void Task_HandleRayChasesAway(u8 taskId);
 static void sub_81D8FB0(u8 taskId);
 static void sub_81D7228(u8 taskId);
-static void sub_81D736C(u8 taskId);
+static void Task_HandleDuoFight(u8 taskId);
 static void sub_81D752C(u8 taskId);
 static void Task_DuoFightEnd(u8 taskId);
-static void sub_81D7FC0(u8 taskId);
+static void Task_HandleRayTakesFlight(u8 taskId);
 static void sub_81D81A4(u8 taskId);
 static void Task_RayTakesFlightEnd(u8 taskId);
 static void sub_81D94D4(u8 taskId);
@@ -1316,7 +1316,7 @@ static void sub_81D6904(void)
     SetGpuReg(REG_OFFSET_WINOUT, 0x3F);
 }
 
-static void sub_81D691C(u8 taskId)
+static void Task_HandleDuoFightPre(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D750C();
@@ -1493,7 +1493,7 @@ static void sub_81D6D20(struct Sprite *sprite)
     }
 }
 
-static void sub_81D6FD0(void)
+static void VblankCB_DuoFight(void)
 {
     VblankCB_RayquazaScene();
     ScanlineEffect_InitHBlankDmaTransfer();
@@ -1552,19 +1552,19 @@ static void Task_DuoFightAnim(u8 taskId)
     {
         data[2] = sub_81D6984();
         data[3] = sub_81D6B7C();
-        gTasks[taskId].func = sub_81D691C;
+        gTasks[taskId].func = Task_HandleDuoFightPre;
     }
     else
     {
         data[2] = sub_81D7664();
         data[3] = sub_81D78BC();
-        gTasks[taskId].func = sub_81D736C;
+        gTasks[taskId].func = Task_HandleDuoFight;
         StopMapMusic();
     }
 
     BlendPalettes(-1, 0x10, 0);
     BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
-    SetVBlankCallback(sub_81D6FD0);
+    SetVBlankCallback(VblankCB_DuoFight);
     PlaySE(SE_T_OOAME);
 }
 
@@ -1627,7 +1627,7 @@ static void sub_81D7228(u8 taskId)
     }
 }
 
-static void sub_81D736C(u8 taskId)
+static void Task_HandleDuoFight(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D750C();
@@ -1960,10 +1960,10 @@ static void Task_RayTakesFlightAnim(u8 taskId)
     CreateTask(sub_81D81A4, 0);
     data[0] = 0;
     data[1] = 0;
-    gTasks[taskId].func = sub_81D7FC0;
+    gTasks[taskId].func = Task_HandleRayTakesFlight;
 }
 
-static void sub_81D7FC0(u8 taskId)
+static void Task_HandleRayTakesFlight(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     switch (data[0])
@@ -2163,10 +2163,10 @@ static void Task_RayDescendsAnim(u8 taskId)
     data[2] = 0;
     data[3] = 0;
     data[4] = 0x1000;
-    gTasks[taskId].func = sub_81D857C;
+    gTasks[taskId].func = Task_HandleRayDescends;
 }
 
-static void sub_81D857C(u8 taskId)
+static void Task_HandleRayDescends(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     switch (data[0])
@@ -2350,10 +2350,10 @@ static void Task_RayChargesAnim(u8 taskId)
     data[0] = 0;
     data[1] = 0;
     data[2] = CreateTask(sub_81D8AD8, 0);
-    gTasks[taskId].func = sub_81D89E0;
+    gTasks[taskId].func = Task_HandleRayCharges;
 }
 
-static void sub_81D89E0(u8 taskId)
+static void Task_HandleRayCharges(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     sub_81D8BB4();
@@ -2514,7 +2514,7 @@ static void Task_RayChasesAwayAnim(u8 taskId)
     SetVBlankCallback(VblankCB_RayquazaScene);
     data[0] = 0;
     data[1] = 0;
-    gTasks[taskId].func = sub_81D8E80;
+    gTasks[taskId].func = Task_HandleRayChasesAway;
     data[2] = CreateTask(sub_81D8FB0, 0);
     gTasks[data[2]].data[0] = 0;
     gTasks[data[2]].data[1] = 0;
@@ -2523,7 +2523,7 @@ static void Task_RayChasesAwayAnim(u8 taskId)
     gTasks[data[2]].data[4] = 1;
 }
 
-static void sub_81D8E80(u8 taskId)
+static void Task_HandleRayChasesAway(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
     switch (data[0])
@@ -2837,7 +2837,7 @@ static void sub_81D961C(struct Sprite *sprite)
             sprite->callback = sub_81D97E0;
             return;
         case 352:
-            sub_81D9274(FindTaskIdByFunc(sub_81D8E80));
+            sub_81D9274(FindTaskIdByFunc(Task_HandleRayChasesAway));
             break;
         }
     }
-- 
cgit v1.2.3


From 14d2caaf8dbaaaad4850407a6ec9396bb8769bab Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 2 Feb 2018 12:32:12 +0100
Subject: start decompiling berry tag screen

---
 src/berry_tag_screen.c | 412 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 412 insertions(+)
 create mode 100644 src/berry_tag_screen.c

(limited to 'src')

diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
new file mode 100644
index 000000000..365fd5120
--- /dev/null
+++ b/src/berry_tag_screen.c
@@ -0,0 +1,412 @@
+#include "global.h"
+#include "berry_tag_screen.h"
+#include "berry.h"
+#include "decompress.h"
+#include "field_map_obj.h"
+#include "item_menu.h"
+#include "constants/items.h"
+#include "item_use.h"
+#include "main.h"
+#include "menu.h"
+#include "text.h"
+#include "window.h"
+#include "task.h"
+#include "menu_helpers.h"
+#include "palette.h"
+#include "overworld.h"
+#include "constants/songs.h"
+#include "sound.h"
+#include "sprite.h"
+#include "string_util.h"
+#include "strings.h"
+#include "bg.h"
+#include "malloc.h"
+#include "scanline_effect.h"
+#include "gpu_regs.h"
+#include "graphics.h"
+#include "item_menu_icons.h"
+#include "decompress.h"
+#include "international_string_util.h"
+
+// const rom data
+const struct BgTemplate gUnknown_085EFCF0[] =
+{
+  {
+      .bg = 0,
+      .charBaseIndex = 0,
+      .mapBaseIndex = 31,
+      .screenSize = 0,
+      .paletteMode = 0,
+      .priority = 0,
+      .baseTile = 0
+  },
+  {
+      .bg = 1,
+      .charBaseIndex = 0,
+      .mapBaseIndex = 30,
+      .screenSize = 0,
+      .paletteMode = 0,
+      .priority = 1,
+      .baseTile = 0
+  },
+  {
+      .bg = 2,
+      .charBaseIndex = 0,
+      .mapBaseIndex = 29,
+      .screenSize = 0,
+      .paletteMode = 0,
+      .priority = 2,
+      .baseTile = 0
+  },
+  {
+      .bg = 3,
+      .charBaseIndex = 0,
+      .mapBaseIndex = 28,
+      .screenSize = 0,
+      .paletteMode = 0,
+      .priority = 3,
+      .baseTile = 0
+  }
+};
+
+const u16 gUnknown_085EFD00[] = INCBIN_U16("graphics/interface/berry_tag_screen.gbapal");
+
+const struct TextColor gUnknown_085EFD20[] =
+{
+    {0, 2, 3},
+    {15, 14, 13}
+};
+
+const struct WindowTemplate gUnknown_085EFD28[] =
+{
+    {0x01, 0x0b, 0x04, 0x08, 0x02, 0x0f, 0x0045},
+    {0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055},
+    {0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d},
+    {0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101},
+    DUMMY_WIN_TEMPLATE
+};
+
+const u8 *const gBerryFirmnessStringPointers[] =
+{
+    gBerryFirmnessString_VerySoft,
+    gBerryFirmnessString_Soft,
+    gBerryFirmnessString_Hard,
+    gBerryFirmnessString_VeryHard,
+    gBerryFirmnessString_SuperHard
+};
+
+// this file's functions
+void sub_8177C84(void);
+void sub_8177E14(void);
+void sub_8178008(void);
+void sub_8178090(void);
+void sub_81780F4(void);
+void sub_8178338(void);
+void sub_817839C(void);
+void sub_8178404(void);
+void sub_8178110(void);
+void sub_8178174(void);
+void sub_8178250(void);
+void sub_81782D0(void);
+void sub_8178304(void);
+bool8 sub_8177CB0(void);
+bool8 sub_8177E88(void);
+void sub_8178654(u8 taskId);
+
+// code
+struct BerryTagScreenStruct
+{
+    u16 tilemapBuffers[3][0x400];
+    u16 berryId;
+    u8 berrySpriteId;
+    u16 field_1804;
+    u16 field_1806;
+    u16 field_1808;
+};
+
+extern struct BerryTagScreenStruct *sBerryTag;
+
+void sub_8177C14(void)
+{
+    sBerryTag = AllocZeroed(0x180C);
+    sBerryTag->berryId = ItemIdToBerryType(gSpecialVar_ItemId);
+    SetMainCallback2(sub_8177C84);
+}
+
+void sub_8177C54(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    do_scheduled_bg_tilemap_copies_to_vram();
+    UpdatePaletteFade();
+}
+
+void sub_8177C70(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_8177C84(void)
+{
+    while (1)
+    {
+        if (sub_81221EC() == TRUE)
+            break;
+        if (sub_8177CB0() == TRUE)
+            break;
+        if (sub_81221AC() == TRUE)
+            break;
+    }
+}
+
+bool8 sub_8177CB0(void)
+{
+    switch (gMain.state)
+    {
+    case 0:
+        SetVBlankHBlankCallbacksToNull();
+        ResetVramOamAndBgCntRegs();
+        clear_scheduled_bg_copies_to_vram();
+        gMain.state++;
+        break;
+    case 1:
+        ScanlineEffect_Stop();
+        gMain.state++;
+        break;
+    case 2:
+        ResetPaletteFade();
+        gPaletteFade.bufferTransferDisabled = 1;
+        gMain.state++;
+        break;
+    case 3:
+        ResetSpriteData();
+        gMain.state++;
+        break;
+    case 4:
+        FreeAllSpritePalettes();
+        gMain.state++;
+        break;
+    case 5:
+        if (!sub_81221AC())
+            ResetTasks();
+        gMain.state++;
+        break;
+    case 6:
+        sub_8177E14();
+        sBerryTag->field_1808 = 0;
+        gMain.state++;
+        break;
+    case 7:
+        if (sub_8177E88())
+            gMain.state++;
+        break;
+    case 8:
+        sub_8178008();
+        gMain.state++;
+        break;
+    case 9:
+        sub_8178090();
+        gMain.state++;
+        break;
+    case 10:
+        sub_81780F4();
+        gMain.state++;
+        break;
+    case 11:
+        sub_8178338();
+        gMain.state++;
+        break;
+    case 12:
+        sub_817839C();
+        sub_8178404();
+        gMain.state++;
+        break;
+    case 13:
+        CreateTask(sub_8178654, 0);
+        gMain.state++;
+        break;
+    case 14:
+        BlendPalettes(-1, 0x10, 0);
+        gMain.state++;
+        break;
+    case 15:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        gPaletteFade.bufferTransferDisabled = 0;
+        gMain.state++;
+        break;
+    default: // done
+        SetVBlankCallback(sub_8177C70);
+        SetMainCallback2(sub_8177C54);
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+void sub_8177E14(void)
+{
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, gUnknown_085EFCF0, ARRAY_COUNT(gUnknown_085EFCF0));
+    SetBgTilemapBuffer(2, sBerryTag->tilemapBuffers[0]);
+    SetBgTilemapBuffer(3, sBerryTag->tilemapBuffers[1]);
+    ResetAllBgsCoordinates();
+    schedule_bg_copy_tilemap_to_vram(2);
+    schedule_bg_copy_tilemap_to_vram(3);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+    ShowBg(0);
+    ShowBg(1);
+    ShowBg(2);
+    ShowBg(3);
+}
+
+bool8 sub_8177E88(void)
+{
+    u16 i;
+
+    switch (sBerryTag->field_1808)
+    {
+    case 0:
+        reset_temp_tile_data_buffers();
+        decompress_and_copy_tile_data_to_vram(2, gUnknown_08D9BB44, 0, 0, 0);
+        sBerryTag->field_1808++;
+        break;
+    case 1:
+        if (free_temp_tile_data_buffers_if_possible() != TRUE)
+        {
+            LZDecompressWram(gUnknown_08D9BF98, sBerryTag->tilemapBuffers[0]);
+            sBerryTag->field_1808++;
+        }
+        break;
+    case 2:
+        LZDecompressWram(gUnknown_08D9C13C, sBerryTag->tilemapBuffers[2]);
+        sBerryTag->field_1808++;
+        break;
+    case 3:
+        if (gSaveBlock2Ptr->playerGender == MALE)
+        {
+            for (i = 0; i < ARRAY_COUNT(sBerryTag->tilemapBuffers[1]); i++)
+                sBerryTag->tilemapBuffers[1][i] = 0x4042;
+        }
+        else
+        {
+            for (i = 0; i < ARRAY_COUNT(sBerryTag->tilemapBuffers[1]); i++)
+                sBerryTag->tilemapBuffers[1][i] = 0x5042;
+        }
+        sBerryTag->field_1808++;
+        break;
+    case 4:
+        LoadCompressedPalette(gUnknown_08D9BEF0, 0, 0xC0);
+        sBerryTag->field_1808++;
+        break;
+    case 5:
+        LoadCompressedObjectPic(&gUnknown_0857FDEC);
+        sBerryTag->field_1808++;
+        break;
+    default:
+        LoadCompressedObjectPalette(&gUnknown_0857FDF4);
+        return TRUE; // done
+    }
+
+    return FALSE;
+}
+
+void sub_8178008(void)
+{
+    u16 i;
+
+    InitWindows(gUnknown_085EFD28);
+    DeactivateAllTextPrinters();
+    LoadPalette(gUnknown_085EFD00, 0xF0, 0x20);
+    for (i = 0; i < ARRAY_COUNT(gUnknown_085EFD28) - 1; i++)
+        PutWindowTilemap(i);
+    schedule_bg_copy_tilemap_to_vram(0);
+    schedule_bg_copy_tilemap_to_vram(1);
+}
+
+void sub_817804C(u8 windowId, const u8 *text, u8 x, u8 y, s32 speed, u8 colorStructId)
+{
+    AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, &gUnknown_085EFD20[colorStructId], speed, text);
+}
+
+void sub_8178090(void)
+{
+    memcpy(GetBgTilemapBuffer(0), sBerryTag->tilemapBuffers[2], sizeof(sBerryTag->tilemapBuffers[2]));
+    FillWindowPixelBuffer(3, 0xFF);
+    sub_817804C(3, gText_BerryTag, GetStringCenterAlignXOffset(1, gText_BerryTag, 0x40), 1, 0, 1);
+    PutWindowTilemap(3);
+    schedule_bg_copy_tilemap_to_vram(0);
+}
+
+void sub_81780F4(void)
+{
+    sub_8178110();
+    sub_8178174();
+    sub_8178250();
+    sub_81782D0();
+    sub_8178304();
+}
+
+void sub_8178110(void)
+{
+    const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
+    ConvertIntToDecimalStringN(gStringVar1, sBerryTag->berryId, 2, 2);
+    StringCopy(gStringVar2, berry->name);
+    StringExpandPlaceholders(gStringVar4, gText_UnkF908Var1Var2);
+    sub_817804C(0, gStringVar4, 0, 1, 0, 0);
+}
+
+void sub_8178174(void)
+{
+    const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
+    PrintTextOnWindow(1, 1, gText_SizeSlash, 0, 1, TEXT_SPEED_FF, NULL);
+    if (berry->size != 0)
+    {
+        u32 inches, fraction;
+
+        inches = 1000 * berry->size / 254;
+        if (inches % 10 > 4)
+            inches += 10;
+        fraction = (inches % 100) / 10;
+        inches /= 100;
+
+        ConvertIntToDecimalStringN(gStringVar1, inches, 0, 2);
+        ConvertIntToDecimalStringN(gStringVar2, fraction, 0, 2);
+        StringExpandPlaceholders(gStringVar4, gText_Var1DotVar2);
+        PrintTextOnWindow(1, 1, gStringVar4, 0x28, 1, 0, NULL);
+    }
+    else
+    {
+        PrintTextOnWindow(1, 1, gText_ThreeMarks, 0x28, 1, 0, NULL);
+    }
+}
+
+void sub_8178250(void)
+{
+    const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
+    PrintTextOnWindow(1, 1, gText_FirmSlash, 0, 0x11, TEXT_SPEED_FF, NULL);
+    if (berry->firmness != 0)
+        PrintTextOnWindow(1, 1, gBerryFirmnessStringPointers[berry->firmness - 1], 0x28, 0x11, 0, NULL);
+    else
+        PrintTextOnWindow(1, 1, gText_ThreeMarks, 0x28, 0x11, 0, NULL);
+}
+
+void sub_81782D0(void)
+{
+    const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
+    PrintTextOnWindow(2, 1, berry->description1, 0, 1, 0, NULL);
+}
+
+void sub_8178304(void)
+{
+    const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
+    PrintTextOnWindow(2, 1, berry->description2, 0, 0x11, 0, NULL);
+}
+
+void sub_8178338(void)
+{
+    sBerryTag->berrySpriteId = CreateBerryTagSprite(sBerryTag->berryId - 1, 56, 64);
+}
-- 
cgit v1.2.3


From ebc8af50f10ac6b8bcaf5215a72e6219d053f732 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 2 Feb 2018 14:03:48 +0100
Subject: decompile berry tag screen

---
 src/berry_tag_screen.c | 311 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 271 insertions(+), 40 deletions(-)

(limited to 'src')

diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 365fd5120..9b921be08 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -5,6 +5,7 @@
 #include "field_map_obj.h"
 #include "item_menu.h"
 #include "constants/items.h"
+#include "item.h"
 #include "item_use.h"
 #include "main.h"
 #include "menu.h"
@@ -29,7 +30,7 @@
 #include "international_string_util.h"
 
 // const rom data
-const struct BgTemplate gUnknown_085EFCF0[] =
+static const struct BgTemplate gUnknown_085EFCF0[] =
 {
   {
       .bg = 0,
@@ -69,15 +70,15 @@ const struct BgTemplate gUnknown_085EFCF0[] =
   }
 };
 
-const u16 gUnknown_085EFD00[] = INCBIN_U16("graphics/interface/berry_tag_screen.gbapal");
+static const u16 gUnknown_085EFD00[] = INCBIN_U16("graphics/interface/berry_tag_screen.gbapal");
 
-const struct TextColor gUnknown_085EFD20[] =
+static const struct TextColor gUnknown_085EFD20[] =
 {
     {0, 2, 3},
     {15, 14, 13}
 };
 
-const struct WindowTemplate gUnknown_085EFD28[] =
+static const struct WindowTemplate gUnknown_085EFD28[] =
 {
     {0x01, 0x0b, 0x04, 0x08, 0x02, 0x0f, 0x0045},
     {0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055},
@@ -86,7 +87,7 @@ const struct WindowTemplate gUnknown_085EFD28[] =
     DUMMY_WIN_TEMPLATE
 };
 
-const u8 *const gBerryFirmnessStringPointers[] =
+static const u8 *const gBerryFirmnessStringPointers[] =
 {
     gBerryFirmnessString_VerySoft,
     gBerryFirmnessString_Soft,
@@ -96,22 +97,26 @@ const u8 *const gBerryFirmnessStringPointers[] =
 };
 
 // this file's functions
-void sub_8177C84(void);
-void sub_8177E14(void);
-void sub_8178008(void);
-void sub_8178090(void);
-void sub_81780F4(void);
-void sub_8178338(void);
-void sub_817839C(void);
-void sub_8178404(void);
-void sub_8178110(void);
-void sub_8178174(void);
-void sub_8178250(void);
-void sub_81782D0(void);
-void sub_8178304(void);
-bool8 sub_8177CB0(void);
-bool8 sub_8177E88(void);
-void sub_8178654(u8 taskId);
+static void sub_8177C84(void);
+static void sub_8177E14(void);
+static void sub_8178008(void);
+static void sub_8178090(void);
+static void sub_81780F4(void);
+static void sub_8178338(void);
+static void sub_817839C(void);
+static void sub_8178404(void);
+static void sub_8178110(void);
+static void sub_8178174(void);
+static void sub_8178250(void);
+static void sub_81782D0(void);
+static void sub_8178304(void);
+static bool8 sub_8177CB0(void);
+static bool8 sub_8177E88(void);
+static void sub_8178654(u8 taskId);
+static void sub_8178610(u8 taskId);
+static void sub_81787AC(u8 taskId);
+static void sub_81786AC(u8 taskId, s8 toMove);
+static void sub_8178728(s8 toMove);
 
 // code
 struct BerryTagScreenStruct
@@ -119,21 +124,20 @@ struct BerryTagScreenStruct
     u16 tilemapBuffers[3][0x400];
     u16 berryId;
     u8 berrySpriteId;
-    u16 field_1804;
-    u16 field_1806;
+    u8 flavorCircleIds[FLAVOR_COUNT];
     u16 field_1808;
 };
 
 extern struct BerryTagScreenStruct *sBerryTag;
 
-void sub_8177C14(void)
+void DoBerryTagScreen(void)
 {
     sBerryTag = AllocZeroed(0x180C);
     sBerryTag->berryId = ItemIdToBerryType(gSpecialVar_ItemId);
     SetMainCallback2(sub_8177C84);
 }
 
-void sub_8177C54(void)
+static void sub_8177C54(void)
 {
     RunTasks();
     AnimateSprites();
@@ -142,14 +146,14 @@ void sub_8177C54(void)
     UpdatePaletteFade();
 }
 
-void sub_8177C70(void)
+static void sub_8177C70(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-void sub_8177C84(void)
+static void sub_8177C84(void)
 {
     while (1)
     {
@@ -162,7 +166,7 @@ void sub_8177C84(void)
     }
 }
 
-bool8 sub_8177CB0(void)
+static bool8 sub_8177CB0(void)
 {
     switch (gMain.state)
     {
@@ -246,7 +250,7 @@ bool8 sub_8177CB0(void)
     return FALSE;
 }
 
-void sub_8177E14(void)
+static void sub_8177E14(void)
 {
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, gUnknown_085EFCF0, ARRAY_COUNT(gUnknown_085EFCF0));
@@ -263,7 +267,7 @@ void sub_8177E14(void)
     ShowBg(3);
 }
 
-bool8 sub_8177E88(void)
+static bool8 sub_8177E88(void)
 {
     u16 i;
 
@@ -314,7 +318,7 @@ bool8 sub_8177E88(void)
     return FALSE;
 }
 
-void sub_8178008(void)
+static void sub_8178008(void)
 {
     u16 i;
 
@@ -327,12 +331,12 @@ void sub_8178008(void)
     schedule_bg_copy_tilemap_to_vram(1);
 }
 
-void sub_817804C(u8 windowId, const u8 *text, u8 x, u8 y, s32 speed, u8 colorStructId)
+static void sub_817804C(u8 windowId, const u8 *text, u8 x, u8 y, s32 speed, u8 colorStructId)
 {
     AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, &gUnknown_085EFD20[colorStructId], speed, text);
 }
 
-void sub_8178090(void)
+static void sub_8178090(void)
 {
     memcpy(GetBgTilemapBuffer(0), sBerryTag->tilemapBuffers[2], sizeof(sBerryTag->tilemapBuffers[2]));
     FillWindowPixelBuffer(3, 0xFF);
@@ -341,7 +345,7 @@ void sub_8178090(void)
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
-void sub_81780F4(void)
+static void sub_81780F4(void)
 {
     sub_8178110();
     sub_8178174();
@@ -350,7 +354,7 @@ void sub_81780F4(void)
     sub_8178304();
 }
 
-void sub_8178110(void)
+static void sub_8178110(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
     ConvertIntToDecimalStringN(gStringVar1, sBerryTag->berryId, 2, 2);
@@ -359,7 +363,7 @@ void sub_8178110(void)
     sub_817804C(0, gStringVar4, 0, 1, 0, 0);
 }
 
-void sub_8178174(void)
+static void sub_8178174(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
     PrintTextOnWindow(1, 1, gText_SizeSlash, 0, 1, TEXT_SPEED_FF, NULL);
@@ -384,7 +388,7 @@ void sub_8178174(void)
     }
 }
 
-void sub_8178250(void)
+static void sub_8178250(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
     PrintTextOnWindow(1, 1, gText_FirmSlash, 0, 0x11, TEXT_SPEED_FF, NULL);
@@ -394,19 +398,246 @@ void sub_8178250(void)
         PrintTextOnWindow(1, 1, gText_ThreeMarks, 0x28, 0x11, 0, NULL);
 }
 
-void sub_81782D0(void)
+static void sub_81782D0(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
     PrintTextOnWindow(2, 1, berry->description1, 0, 1, 0, NULL);
 }
 
-void sub_8178304(void)
+static void sub_8178304(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
     PrintTextOnWindow(2, 1, berry->description2, 0, 0x11, 0, NULL);
 }
 
-void sub_8178338(void)
+static void sub_8178338(void)
 {
     sBerryTag->berrySpriteId = CreateBerryTagSprite(sBerryTag->berryId - 1, 56, 64);
 }
+
+static void sub_817836C(void)
+{
+    DestroySprite(&gSprites[sBerryTag->berrySpriteId]);
+    FreeBerryTagSpritePalette();
+}
+
+static void sub_817839C(void)
+{
+    sBerryTag->flavorCircleIds[FLAVOR_SPICY] = CreateBerryFlavorCircleSprite(64);
+    sBerryTag->flavorCircleIds[FLAVOR_DRY] = CreateBerryFlavorCircleSprite(104);
+    sBerryTag->flavorCircleIds[FLAVOR_SWEET] = CreateBerryFlavorCircleSprite(144);
+    sBerryTag->flavorCircleIds[FLAVOR_BITTER] = CreateBerryFlavorCircleSprite(184);
+    sBerryTag->flavorCircleIds[FLAVOR_SOUR] = CreateBerryFlavorCircleSprite(224);
+}
+
+static void sub_8178404(void)
+{
+    const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
+
+    if (berry->spicy)
+        gSprites[sBerryTag->flavorCircleIds[FLAVOR_SPICY]].invisible = 0;
+    else
+        gSprites[sBerryTag->flavorCircleIds[FLAVOR_SPICY]].invisible = 1;
+
+    if (berry->dry)
+        gSprites[sBerryTag->flavorCircleIds[FLAVOR_DRY]].invisible = 0;
+    else
+        gSprites[sBerryTag->flavorCircleIds[FLAVOR_DRY]].invisible = 1;
+
+    if (berry->sweet)
+        gSprites[sBerryTag->flavorCircleIds[FLAVOR_SWEET]].invisible = 0;
+    else
+        gSprites[sBerryTag->flavorCircleIds[FLAVOR_SWEET]].invisible = 1;
+
+    if (berry->bitter)
+        gSprites[sBerryTag->flavorCircleIds[FLAVOR_BITTER]].invisible = 0;
+    else
+        gSprites[sBerryTag->flavorCircleIds[FLAVOR_BITTER]].invisible = 1;
+
+    if (berry->sour)
+        gSprites[sBerryTag->flavorCircleIds[FLAVOR_SOUR]].invisible = 0;
+    else
+        gSprites[sBerryTag->flavorCircleIds[FLAVOR_SOUR]].invisible = 1;
+}
+
+static void sub_8178594(void)
+{
+    u16 i;
+
+    for (i = 0; i < FLAVOR_COUNT; i++)
+        DestroySprite(&gSprites[sBerryTag->flavorCircleIds[i]]);
+}
+
+static void sub_81785D0(u8 taskId)
+{
+    PlaySE(SE_SELECT);
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskId].func = sub_8178610;
+}
+
+static void sub_8178610(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_817836C();
+        sub_8178594();
+        Free(sBerryTag);
+        FreeAllWindowBuffers();
+        SetMainCallback2(bag_menu_mail_related);
+        DestroyTask(taskId);
+    }
+}
+
+static void sub_8178654(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        u16 arrowKeys = gMain.newAndRepeatedKeys & DPAD_ANY;
+        if (arrowKeys == DPAD_UP)
+            sub_81786AC(taskId, -1);
+        else if (arrowKeys == DPAD_DOWN)
+            sub_81786AC(taskId, 1);
+        else if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+            sub_81785D0(taskId);
+    }
+}
+
+static void sub_81786AC(u8 taskId, s8 toMove)
+{
+    s16 *data = gTasks[taskId].data;
+    s16 currPocketPosition = gUnknown_0203CE58.unk12[3] + gUnknown_0203CE58.unk8[3];
+    u32 newPocketPosition = currPocketPosition + toMove;
+    if (newPocketPosition < 46 && BagGetItemIdByPocketPosition(BAG_BERRIES, newPocketPosition) != 0)
+    {
+        if (toMove < 0)
+            data[1] = 2;
+        else
+            data[1] = 1;
+
+        data[0] = 0;
+        PlaySE(SE_SELECT);
+        sub_8178728(toMove);
+        gTasks[taskId].func = sub_81787AC;
+    }
+}
+
+static void sub_8178728(s8 toMove)
+{
+    u16 *scrollPos = &gUnknown_0203CE58.unk12[3];
+    u16 *cursorPos = &gUnknown_0203CE58.unk8[3];
+    if (toMove > 0)
+    {
+        if (*cursorPos < 4 || BagGetItemIdByPocketPosition(BAG_BERRIES, *scrollPos + 8) == 0)
+            *cursorPos += toMove;
+        else
+            *scrollPos += toMove;
+    }
+    else
+    {
+        if (*cursorPos > 3 || *scrollPos == 0)
+            *cursorPos += toMove;
+        else
+            *scrollPos += toMove;
+    }
+
+    sBerryTag->berryId = ItemIdToBerryType(BagGetItemIdByPocketPosition(BAG_BERRIES, *scrollPos + *cursorPos));
+}
+
+static void sub_81787AC(u8 taskId)
+{
+    u16 i;
+    s16 posY;
+    s16 *data = gTasks[taskId].data;
+    data[0] += 0x10;
+    data[0] &= 0xFF;
+
+    if (data[1] == 1)
+    {
+        switch (data[0])
+        {
+        case 0x30:
+            FillWindowPixelBuffer(0, 0);
+            break;
+        case 0x40:
+            sub_8178110();
+            break;
+        case 0x50:
+            sub_817836C();
+            sub_8178338();
+            break;
+        case 0x60:
+            FillWindowPixelBuffer(1, 0);
+            break;
+        case 0x70:
+            sub_8178174();
+            break;
+        case 0x80:
+            sub_8178250();
+            break;
+        case 0x90:
+            sub_8178404();
+            break;
+        case 0xA0:
+            FillWindowPixelBuffer(2, 0);
+            break;
+        case 0xB0:
+            sub_81782D0();
+            break;
+        case 0xC0:
+            sub_8178304();
+            break;
+        }
+    }
+    else
+    {
+        switch (data[0])
+        {
+        case 0x30:
+            FillWindowPixelBuffer(2, 0);
+            break;
+        case 0x40:
+            sub_8178304();
+            break;
+        case 0x50:
+            sub_81782D0();
+            break;
+        case 0x60:
+            sub_8178404();
+            break;
+        case 0x70:
+            FillWindowPixelBuffer(1, 0);
+            break;
+        case 0x80:
+            sub_8178250();
+            break;
+        case 0x90:
+            sub_8178174();
+            break;
+        case 0xA0:
+            sub_817836C();
+            sub_8178338();
+            break;
+        case 0xB0:
+            FillWindowPixelBuffer(0, 0);
+            break;
+        case 0xC0:
+            sub_8178110();
+            break;
+        }
+    }
+
+    if (data[1] == 1)
+        posY = -data[0];
+    else
+        posY = data[0];
+
+    gSprites[sBerryTag->berrySpriteId].pos2.y = posY;
+    for (i = 0; i < FLAVOR_COUNT; i++)
+        gSprites[sBerryTag->flavorCircleIds[i]].pos2.y = posY;
+
+    ChangeBgY(1, 0x1000, data[1]);
+    ChangeBgY(2, 0x1000, data[1]);
+
+    if (data[0] == 0)
+        gTasks[taskId].func = sub_8178654;
+}
-- 
cgit v1.2.3


From b6437b8d80bfeab60467812ae09128d615dc0588 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 2 Feb 2018 14:41:56 +0100
Subject: document berry tag screen

---
 src/berry_tag_screen.c | 280 +++++++++++++++++++++++++------------------------
 1 file changed, 145 insertions(+), 135 deletions(-)

(limited to 'src')

diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 9b921be08..1e029bece 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -29,8 +29,29 @@
 #include "decompress.h"
 #include "international_string_util.h"
 
+// There are 4 windows used in berry tag screen.
+enum
+{
+    WIN_BERRY_NAME,
+    WIN_SIZE_FIRM,
+    WIN_DESC,
+    WIN_BERRY_TAG
+};
+
+struct BerryTagScreenStruct
+{
+    u16 tilemapBuffers[3][0x400];
+    u16 berryId;
+    u8 berrySpriteId;
+    u8 flavorCircleIds[FLAVOR_COUNT];
+    u16 gfxState;
+};
+
+// EWRAM vars
+static EWRAM_DATA struct BerryTagScreenStruct *sBerryTag = NULL;
+
 // const rom data
-static const struct BgTemplate gUnknown_085EFCF0[] =
+static const struct BgTemplate sBackgroundTemplates[] =
 {
   {
       .bg = 0,
@@ -70,24 +91,24 @@ static const struct BgTemplate gUnknown_085EFCF0[] =
   }
 };
 
-static const u16 gUnknown_085EFD00[] = INCBIN_U16("graphics/interface/berry_tag_screen.gbapal");
+static const u16 sFontPalette[] = INCBIN_U16("graphics/interface/berry_tag_screen.gbapal");
 
-static const struct TextColor gUnknown_085EFD20[] =
+static const struct TextColor sTextColors[] =
 {
     {0, 2, 3},
     {15, 14, 13}
 };
 
-static const struct WindowTemplate gUnknown_085EFD28[] =
+static const struct WindowTemplate sWindowTemplates[] =
 {
-    {0x01, 0x0b, 0x04, 0x08, 0x02, 0x0f, 0x0045},
-    {0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055},
-    {0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d},
-    {0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101},
+    {0x01, 0x0b, 0x04, 0x08, 0x02, 0x0f, 0x0045}, // WIN_BERRY_NAME
+    {0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055}, // WIN_SIZE_FIRM
+    {0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d}, // WIN_DESC
+    {0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101}, // WIN_BERRY_TAG
     DUMMY_WIN_TEMPLATE
 };
 
-static const u8 *const gBerryFirmnessStringPointers[] =
+static const u8 *const sBerryFirmnessStrings[] =
 {
     gBerryFirmnessString_VerySoft,
     gBerryFirmnessString_Soft,
@@ -97,47 +118,36 @@ static const u8 *const gBerryFirmnessStringPointers[] =
 };
 
 // this file's functions
-static void sub_8177C84(void);
-static void sub_8177E14(void);
-static void sub_8178008(void);
-static void sub_8178090(void);
-static void sub_81780F4(void);
-static void sub_8178338(void);
-static void sub_817839C(void);
-static void sub_8178404(void);
-static void sub_8178110(void);
-static void sub_8178174(void);
-static void sub_8178250(void);
-static void sub_81782D0(void);
-static void sub_8178304(void);
-static bool8 sub_8177CB0(void);
-static bool8 sub_8177E88(void);
-static void sub_8178654(u8 taskId);
-static void sub_8178610(u8 taskId);
-static void sub_81787AC(u8 taskId);
-static void sub_81786AC(u8 taskId, s8 toMove);
-static void sub_8178728(s8 toMove);
+static void CB2_InitBerryTagScreen(void);
+static void HandleInitBackgrounds(void);
+static void HandleInitWindows(void);
+static void AddBerryTagTextToBg0(void);
+static void PrintAllBerryData(void);
+static void CreateBerrySprite(void);
+static void CreateFlavorCircleSprites(void);
+static void SetFlavorCirclesVisiblity(void);
+static void PrintBerryNumberAndName(void);
+static void PrintBerrySize(void);
+static void PrintBerryFirmness(void);
+static void PrintBerryDescription1(void);
+static void PrintBerryDescription2(void);
+static bool8 InitBerryTagScreen(void);
+static bool8 LoadBerryTagGfx(void);
+static void Task_HandleInput(u8 taskId);
+static void Task_CloseBerryTagScreen(u8 taskId);
+static void Task_DisplayAnotherBerry(u8 taskId);
+static void TryChangeDisplayedBerry(u8 taskId, s8 toMove);
+static void HandleBagCursorPositionChange(s8 toMove);
 
 // code
-struct BerryTagScreenStruct
-{
-    u16 tilemapBuffers[3][0x400];
-    u16 berryId;
-    u8 berrySpriteId;
-    u8 flavorCircleIds[FLAVOR_COUNT];
-    u16 field_1808;
-};
-
-extern struct BerryTagScreenStruct *sBerryTag;
-
 void DoBerryTagScreen(void)
 {
-    sBerryTag = AllocZeroed(0x180C);
+    sBerryTag = AllocZeroed(sizeof(*sBerryTag));
     sBerryTag->berryId = ItemIdToBerryType(gSpecialVar_ItemId);
-    SetMainCallback2(sub_8177C84);
+    SetMainCallback2(CB2_InitBerryTagScreen);
 }
 
-static void sub_8177C54(void)
+static void CB2_BerryTagScreen(void)
 {
     RunTasks();
     AnimateSprites();
@@ -146,27 +156,27 @@ static void sub_8177C54(void)
     UpdatePaletteFade();
 }
 
-static void sub_8177C70(void)
+static void VblankCB(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
     TransferPlttBuffer();
 }
 
-static void sub_8177C84(void)
+static void CB2_InitBerryTagScreen(void)
 {
     while (1)
     {
         if (sub_81221EC() == TRUE)
             break;
-        if (sub_8177CB0() == TRUE)
+        if (InitBerryTagScreen() == TRUE)
             break;
         if (sub_81221AC() == TRUE)
             break;
     }
 }
 
-static bool8 sub_8177CB0(void)
+static bool8 InitBerryTagScreen(void)
 {
     switch (gMain.state)
     {
@@ -199,37 +209,37 @@ static bool8 sub_8177CB0(void)
         gMain.state++;
         break;
     case 6:
-        sub_8177E14();
-        sBerryTag->field_1808 = 0;
+        HandleInitBackgrounds();
+        sBerryTag->gfxState = 0;
         gMain.state++;
         break;
     case 7:
-        if (sub_8177E88())
+        if (LoadBerryTagGfx())
             gMain.state++;
         break;
     case 8:
-        sub_8178008();
+        HandleInitWindows();
         gMain.state++;
         break;
     case 9:
-        sub_8178090();
+        AddBerryTagTextToBg0();
         gMain.state++;
         break;
     case 10:
-        sub_81780F4();
+        PrintAllBerryData();
         gMain.state++;
         break;
     case 11:
-        sub_8178338();
+        CreateBerrySprite();
         gMain.state++;
         break;
     case 12:
-        sub_817839C();
-        sub_8178404();
+        CreateFlavorCircleSprites();
+        SetFlavorCirclesVisiblity();
         gMain.state++;
         break;
     case 13:
-        CreateTask(sub_8178654, 0);
+        CreateTask(Task_HandleInput, 0);
         gMain.state++;
         break;
     case 14:
@@ -242,18 +252,18 @@ static bool8 sub_8177CB0(void)
         gMain.state++;
         break;
     default: // done
-        SetVBlankCallback(sub_8177C70);
-        SetMainCallback2(sub_8177C54);
+        SetVBlankCallback(VblankCB);
+        SetMainCallback2(CB2_BerryTagScreen);
         return TRUE;
     }
 
     return FALSE;
 }
 
-static void sub_8177E14(void)
+static void HandleInitBackgrounds(void)
 {
     ResetBgsAndClearDma3BusyFlags(0);
-    InitBgsFromTemplates(0, gUnknown_085EFCF0, ARRAY_COUNT(gUnknown_085EFCF0));
+    InitBgsFromTemplates(0, sBackgroundTemplates, ARRAY_COUNT(sBackgroundTemplates));
     SetBgTilemapBuffer(2, sBerryTag->tilemapBuffers[0]);
     SetBgTilemapBuffer(3, sBerryTag->tilemapBuffers[1]);
     ResetAllBgsCoordinates();
@@ -267,27 +277,27 @@ static void sub_8177E14(void)
     ShowBg(3);
 }
 
-static bool8 sub_8177E88(void)
+static bool8 LoadBerryTagGfx(void)
 {
     u16 i;
 
-    switch (sBerryTag->field_1808)
+    switch (sBerryTag->gfxState)
     {
     case 0:
         reset_temp_tile_data_buffers();
         decompress_and_copy_tile_data_to_vram(2, gUnknown_08D9BB44, 0, 0, 0);
-        sBerryTag->field_1808++;
+        sBerryTag->gfxState++;
         break;
     case 1:
         if (free_temp_tile_data_buffers_if_possible() != TRUE)
         {
             LZDecompressWram(gUnknown_08D9BF98, sBerryTag->tilemapBuffers[0]);
-            sBerryTag->field_1808++;
+            sBerryTag->gfxState++;
         }
         break;
     case 2:
         LZDecompressWram(gUnknown_08D9C13C, sBerryTag->tilemapBuffers[2]);
-        sBerryTag->field_1808++;
+        sBerryTag->gfxState++;
         break;
     case 3:
         if (gSaveBlock2Ptr->playerGender == MALE)
@@ -300,15 +310,15 @@ static bool8 sub_8177E88(void)
             for (i = 0; i < ARRAY_COUNT(sBerryTag->tilemapBuffers[1]); i++)
                 sBerryTag->tilemapBuffers[1][i] = 0x5042;
         }
-        sBerryTag->field_1808++;
+        sBerryTag->gfxState++;
         break;
     case 4:
         LoadCompressedPalette(gUnknown_08D9BEF0, 0, 0xC0);
-        sBerryTag->field_1808++;
+        sBerryTag->gfxState++;
         break;
     case 5:
         LoadCompressedObjectPic(&gUnknown_0857FDEC);
-        sBerryTag->field_1808++;
+        sBerryTag->gfxState++;
         break;
     default:
         LoadCompressedObjectPalette(&gUnknown_0857FDF4);
@@ -318,55 +328,55 @@ static bool8 sub_8177E88(void)
     return FALSE;
 }
 
-static void sub_8178008(void)
+static void HandleInitWindows(void)
 {
     u16 i;
 
-    InitWindows(gUnknown_085EFD28);
+    InitWindows(sWindowTemplates);
     DeactivateAllTextPrinters();
-    LoadPalette(gUnknown_085EFD00, 0xF0, 0x20);
-    for (i = 0; i < ARRAY_COUNT(gUnknown_085EFD28) - 1; i++)
+    LoadPalette(sFontPalette, 0xF0, 0x20);
+    for (i = 0; i < ARRAY_COUNT(sWindowTemplates) - 1; i++)
         PutWindowTilemap(i);
     schedule_bg_copy_tilemap_to_vram(0);
     schedule_bg_copy_tilemap_to_vram(1);
 }
 
-static void sub_817804C(u8 windowId, const u8 *text, u8 x, u8 y, s32 speed, u8 colorStructId)
+static void PrintTextInBerryTagScreen(u8 windowId, const u8 *text, u8 x, u8 y, s32 speed, u8 colorStructId)
 {
-    AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, &gUnknown_085EFD20[colorStructId], speed, text);
+    AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, &sTextColors[colorStructId], speed, text);
 }
 
-static void sub_8178090(void)
+static void AddBerryTagTextToBg0(void)
 {
     memcpy(GetBgTilemapBuffer(0), sBerryTag->tilemapBuffers[2], sizeof(sBerryTag->tilemapBuffers[2]));
-    FillWindowPixelBuffer(3, 0xFF);
-    sub_817804C(3, gText_BerryTag, GetStringCenterAlignXOffset(1, gText_BerryTag, 0x40), 1, 0, 1);
-    PutWindowTilemap(3);
+    FillWindowPixelBuffer(WIN_BERRY_TAG, 0xFF);
+    PrintTextInBerryTagScreen(WIN_BERRY_TAG, gText_BerryTag, GetStringCenterAlignXOffset(1, gText_BerryTag, 0x40), 1, 0, 1);
+    PutWindowTilemap(WIN_BERRY_TAG);
     schedule_bg_copy_tilemap_to_vram(0);
 }
 
-static void sub_81780F4(void)
+static void PrintAllBerryData(void)
 {
-    sub_8178110();
-    sub_8178174();
-    sub_8178250();
-    sub_81782D0();
-    sub_8178304();
+    PrintBerryNumberAndName();
+    PrintBerrySize();
+    PrintBerryFirmness();
+    PrintBerryDescription1();
+    PrintBerryDescription2();
 }
 
-static void sub_8178110(void)
+static void PrintBerryNumberAndName(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
     ConvertIntToDecimalStringN(gStringVar1, sBerryTag->berryId, 2, 2);
     StringCopy(gStringVar2, berry->name);
     StringExpandPlaceholders(gStringVar4, gText_UnkF908Var1Var2);
-    sub_817804C(0, gStringVar4, 0, 1, 0, 0);
+    PrintTextInBerryTagScreen(WIN_BERRY_NAME, gStringVar4, 0, 1, 0, 0);
 }
 
-static void sub_8178174(void)
+static void PrintBerrySize(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
-    PrintTextOnWindow(1, 1, gText_SizeSlash, 0, 1, TEXT_SPEED_FF, NULL);
+    PrintTextOnWindow(WIN_SIZE_FIRM, 1, gText_SizeSlash, 0, 1, TEXT_SPEED_FF, NULL);
     if (berry->size != 0)
     {
         u32 inches, fraction;
@@ -380,48 +390,48 @@ static void sub_8178174(void)
         ConvertIntToDecimalStringN(gStringVar1, inches, 0, 2);
         ConvertIntToDecimalStringN(gStringVar2, fraction, 0, 2);
         StringExpandPlaceholders(gStringVar4, gText_Var1DotVar2);
-        PrintTextOnWindow(1, 1, gStringVar4, 0x28, 1, 0, NULL);
+        PrintTextOnWindow(WIN_SIZE_FIRM, 1, gStringVar4, 0x28, 1, 0, NULL);
     }
     else
     {
-        PrintTextOnWindow(1, 1, gText_ThreeMarks, 0x28, 1, 0, NULL);
+        PrintTextOnWindow(WIN_SIZE_FIRM, 1, gText_ThreeMarks, 0x28, 1, 0, NULL);
     }
 }
 
-static void sub_8178250(void)
+static void PrintBerryFirmness(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
-    PrintTextOnWindow(1, 1, gText_FirmSlash, 0, 0x11, TEXT_SPEED_FF, NULL);
+    PrintTextOnWindow(WIN_SIZE_FIRM, 1, gText_FirmSlash, 0, 0x11, TEXT_SPEED_FF, NULL);
     if (berry->firmness != 0)
-        PrintTextOnWindow(1, 1, gBerryFirmnessStringPointers[berry->firmness - 1], 0x28, 0x11, 0, NULL);
+        PrintTextOnWindow(WIN_SIZE_FIRM, 1, sBerryFirmnessStrings[berry->firmness - 1], 0x28, 0x11, 0, NULL);
     else
-        PrintTextOnWindow(1, 1, gText_ThreeMarks, 0x28, 0x11, 0, NULL);
+        PrintTextOnWindow(WIN_SIZE_FIRM, 1, gText_ThreeMarks, 0x28, 0x11, 0, NULL);
 }
 
-static void sub_81782D0(void)
+static void PrintBerryDescription1(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
-    PrintTextOnWindow(2, 1, berry->description1, 0, 1, 0, NULL);
+    PrintTextOnWindow(WIN_DESC, 1, berry->description1, 0, 1, 0, NULL);
 }
 
-static void sub_8178304(void)
+static void PrintBerryDescription2(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
-    PrintTextOnWindow(2, 1, berry->description2, 0, 0x11, 0, NULL);
+    PrintTextOnWindow(WIN_DESC, 1, berry->description2, 0, 0x11, 0, NULL);
 }
 
-static void sub_8178338(void)
+static void CreateBerrySprite(void)
 {
     sBerryTag->berrySpriteId = CreateBerryTagSprite(sBerryTag->berryId - 1, 56, 64);
 }
 
-static void sub_817836C(void)
+static void DestroyBerrySprite(void)
 {
     DestroySprite(&gSprites[sBerryTag->berrySpriteId]);
     FreeBerryTagSpritePalette();
 }
 
-static void sub_817839C(void)
+static void CreateFlavorCircleSprites(void)
 {
     sBerryTag->flavorCircleIds[FLAVOR_SPICY] = CreateBerryFlavorCircleSprite(64);
     sBerryTag->flavorCircleIds[FLAVOR_DRY] = CreateBerryFlavorCircleSprite(104);
@@ -430,7 +440,7 @@ static void sub_817839C(void)
     sBerryTag->flavorCircleIds[FLAVOR_SOUR] = CreateBerryFlavorCircleSprite(224);
 }
 
-static void sub_8178404(void)
+static void SetFlavorCirclesVisiblity(void)
 {
     const struct Berry *berry = GetBerryInfo(sBerryTag->berryId);
 
@@ -460,7 +470,7 @@ static void sub_8178404(void)
         gSprites[sBerryTag->flavorCircleIds[FLAVOR_SOUR]].invisible = 1;
 }
 
-static void sub_8178594(void)
+static void DestroyFlavorCircleSprites(void)
 {
     u16 i;
 
@@ -468,19 +478,19 @@ static void sub_8178594(void)
         DestroySprite(&gSprites[sBerryTag->flavorCircleIds[i]]);
 }
 
-static void sub_81785D0(u8 taskId)
+static void PrepareToCloseBerryTagScreen(u8 taskId)
 {
     PlaySE(SE_SELECT);
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-    gTasks[taskId].func = sub_8178610;
+    gTasks[taskId].func = Task_CloseBerryTagScreen;
 }
 
-static void sub_8178610(u8 taskId)
+static void Task_CloseBerryTagScreen(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        sub_817836C();
-        sub_8178594();
+        DestroyBerrySprite();
+        DestroyFlavorCircleSprites();
         Free(sBerryTag);
         FreeAllWindowBuffers();
         SetMainCallback2(bag_menu_mail_related);
@@ -488,21 +498,21 @@ static void sub_8178610(u8 taskId)
     }
 }
 
-static void sub_8178654(u8 taskId)
+static void Task_HandleInput(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
         u16 arrowKeys = gMain.newAndRepeatedKeys & DPAD_ANY;
         if (arrowKeys == DPAD_UP)
-            sub_81786AC(taskId, -1);
+            TryChangeDisplayedBerry(taskId, -1);
         else if (arrowKeys == DPAD_DOWN)
-            sub_81786AC(taskId, 1);
+            TryChangeDisplayedBerry(taskId, 1);
         else if (gMain.newKeys & (A_BUTTON | B_BUTTON))
-            sub_81785D0(taskId);
+            PrepareToCloseBerryTagScreen(taskId);
     }
 }
 
-static void sub_81786AC(u8 taskId, s8 toMove)
+static void TryChangeDisplayedBerry(u8 taskId, s8 toMove)
 {
     s16 *data = gTasks[taskId].data;
     s16 currPocketPosition = gUnknown_0203CE58.unk12[3] + gUnknown_0203CE58.unk8[3];
@@ -516,12 +526,12 @@ static void sub_81786AC(u8 taskId, s8 toMove)
 
         data[0] = 0;
         PlaySE(SE_SELECT);
-        sub_8178728(toMove);
-        gTasks[taskId].func = sub_81787AC;
+        HandleBagCursorPositionChange(toMove);
+        gTasks[taskId].func = Task_DisplayAnotherBerry;
     }
 }
 
-static void sub_8178728(s8 toMove)
+static void HandleBagCursorPositionChange(s8 toMove)
 {
     u16 *scrollPos = &gUnknown_0203CE58.unk12[3];
     u16 *cursorPos = &gUnknown_0203CE58.unk8[3];
@@ -543,7 +553,7 @@ static void sub_8178728(s8 toMove)
     sBerryTag->berryId = ItemIdToBerryType(BagGetItemIdByPocketPosition(BAG_BERRIES, *scrollPos + *cursorPos));
 }
 
-static void sub_81787AC(u8 taskId)
+static void Task_DisplayAnotherBerry(u8 taskId)
 {
     u16 i;
     s16 posY;
@@ -559,32 +569,32 @@ static void sub_81787AC(u8 taskId)
             FillWindowPixelBuffer(0, 0);
             break;
         case 0x40:
-            sub_8178110();
+            PrintBerryNumberAndName();
             break;
         case 0x50:
-            sub_817836C();
-            sub_8178338();
+            DestroyBerrySprite();
+            CreateBerrySprite();
             break;
         case 0x60:
             FillWindowPixelBuffer(1, 0);
             break;
         case 0x70:
-            sub_8178174();
+            PrintBerrySize();
             break;
         case 0x80:
-            sub_8178250();
+            PrintBerryFirmness();
             break;
         case 0x90:
-            sub_8178404();
+            SetFlavorCirclesVisiblity();
             break;
         case 0xA0:
             FillWindowPixelBuffer(2, 0);
             break;
         case 0xB0:
-            sub_81782D0();
+            PrintBerryDescription1();
             break;
         case 0xC0:
-            sub_8178304();
+            PrintBerryDescription2();
             break;
         }
     }
@@ -596,32 +606,32 @@ static void sub_81787AC(u8 taskId)
             FillWindowPixelBuffer(2, 0);
             break;
         case 0x40:
-            sub_8178304();
+            PrintBerryDescription2();
             break;
         case 0x50:
-            sub_81782D0();
+            PrintBerryDescription1();
             break;
         case 0x60:
-            sub_8178404();
+            SetFlavorCirclesVisiblity();
             break;
         case 0x70:
             FillWindowPixelBuffer(1, 0);
             break;
         case 0x80:
-            sub_8178250();
+            PrintBerryFirmness();
             break;
         case 0x90:
-            sub_8178174();
+            PrintBerrySize();
             break;
         case 0xA0:
-            sub_817836C();
-            sub_8178338();
+            DestroyBerrySprite();
+            CreateBerrySprite();
             break;
         case 0xB0:
             FillWindowPixelBuffer(0, 0);
             break;
         case 0xC0:
-            sub_8178110();
+            PrintBerryNumberAndName();
             break;
         }
     }
@@ -639,5 +649,5 @@ static void sub_81787AC(u8 taskId)
     ChangeBgY(2, 0x1000, data[1]);
 
     if (data[0] == 0)
-        gTasks[taskId].func = sub_8178654;
+        gTasks[taskId].func = Task_HandleInput;
 }
-- 
cgit v1.2.3


From e13eacda39cc01ff0f1b9f8e39374956a8f3f136 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 2 Feb 2018 16:06:20 +0100
Subject: decompile item icon

---
 src/decoration.c |   8 +--
 src/item_icon.c  | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+), 4 deletions(-)
 create mode 100644 src/item_icon.c

(limited to 'src')

diff --git a/src/decoration.c b/src/decoration.c
index 68a455285..68dcb26fb 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -2013,9 +2013,9 @@ u8 AddDecorationIconObjectFromIconTable(u16 tilesTag, u16 paletteTag, u8 decor)
     {
         return MAX_SPRITES;
     }
-    LZDecompressWram(GetDecorationIconPicOrPalette(decor, 0), gUnknown_0203CEBC);
-    CopyItemIconPicTo4x4Buffer(gUnknown_0203CEBC, gUnknown_0203CEC0);
-    sheet.data = gUnknown_0203CEC0;
+    LZDecompressWram(GetDecorationIconPicOrPalette(decor, 0), gItemIconDecompressionBuffer);
+    CopyItemIconPicTo4x4Buffer(gItemIconDecompressionBuffer, gItemIcon4x4Buffer);
+    sheet.data = gItemIcon4x4Buffer;
     sheet.size = 0x200;
     sheet.tag = tilesTag;
     LoadSpriteSheet(&sheet);
@@ -2023,7 +2023,7 @@ u8 AddDecorationIconObjectFromIconTable(u16 tilesTag, u16 paletteTag, u8 decor)
     palette.tag = paletteTag;
     LoadCompressedObjectPalette(&palette);
     template = malloc(sizeof(struct SpriteTemplate));
-    *template = gUnknown_08614FF4;
+    *template = gItemIconSpriteTemplate;
     template->tileTag = tilesTag;
     template->paletteTag = paletteTag;
     spriteId = CreateSprite(template, 0, 0, 0);
diff --git a/src/item_icon.c b/src/item_icon.c
new file mode 100644
index 000000000..4aaad9c31
--- /dev/null
+++ b/src/item_icon.c
@@ -0,0 +1,169 @@
+#include "global.h"
+#include "item_icon.h"
+#include "malloc.h"
+#include "sprite.h"
+#include "decompress.h"
+#include "constants/items.h"
+
+// EWRAM vars
+EWRAM_DATA void *gItemIconDecompressionBuffer = NULL;
+EWRAM_DATA void *gItemIcon4x4Buffer = NULL;
+
+// const rom data
+extern const void *const gItemIconTable[][2]; // todo: move to C file
+
+static const struct OamData sOamData_ItemIcon =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 2,
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 2,
+    .affineParam = 0
+};
+
+static const union AnimCmd sSpriteAnim_ItemIcon[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_ItemIcon[] =
+{
+    sSpriteAnim_ItemIcon
+};
+
+const struct SpriteTemplate gItemIconSpriteTemplate =
+{
+    .tileTag = 0,
+    .paletteTag = 0,
+    .oam = &sOamData_ItemIcon,
+    .anims = sSpriteAnimTable_ItemIcon,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+// code
+bool8 AllocItemIconTemporaryBuffers(void)
+{
+    gItemIconDecompressionBuffer = gItemIconDecompressionBuffer; // needed to match
+    gItemIconDecompressionBuffer = Alloc(0x120);
+    if (gItemIconDecompressionBuffer == NULL)
+        return FALSE;
+
+    gItemIcon4x4Buffer = gItemIcon4x4Buffer; // needed to match
+    gItemIcon4x4Buffer = AllocZeroed(0x200);
+    if (gItemIcon4x4Buffer == NULL)
+    {
+        Free(gItemIconDecompressionBuffer);
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+void FreeItemIconTemporaryBuffers(void)
+{
+    Free(gItemIconDecompressionBuffer);
+    Free(gItemIcon4x4Buffer);
+}
+
+void CopyItemIconPicTo4x4Buffer(const void *src, void *dest)
+{
+    u8 i;
+
+    for (i = 0; i < 3; i++)
+        CpuCopy16(src + i * 96, dest + i * 128, 0x60);
+}
+
+u8 AddItemIconSprite(u16 tilesTag, u16 paletteTag, u16 itemId)
+{
+    if (!AllocItemIconTemporaryBuffers())
+    {
+        return MAX_SPRITES;
+    }
+    else
+    {
+        u8 spriteId;
+        struct SpriteSheet spriteSheet;
+        struct CompressedSpritePalette spritePalette;
+        struct SpriteTemplate *spriteTemplate;
+
+        LZDecompressWram(GetItemIconPicOrPalette(itemId, 0), gItemIconDecompressionBuffer);
+        CopyItemIconPicTo4x4Buffer(gItemIconDecompressionBuffer, gItemIcon4x4Buffer);
+        spriteSheet.data = gItemIcon4x4Buffer;
+        spriteSheet.size = 0x200;
+        spriteSheet.tag = tilesTag;
+        LoadSpriteSheet(&spriteSheet);
+
+        spritePalette.data = GetItemIconPicOrPalette(itemId, 1);
+        spritePalette.tag = paletteTag;
+        LoadCompressedObjectPalette(&spritePalette);
+
+        spriteTemplate = Alloc(sizeof(*spriteTemplate));
+        CpuCopy16(&gItemIconSpriteTemplate, spriteTemplate, sizeof(*spriteTemplate));
+        spriteTemplate->tileTag = tilesTag;
+        spriteTemplate->paletteTag = paletteTag;
+        spriteId = CreateSprite(spriteTemplate, 0, 0, 0);
+
+        FreeItemIconTemporaryBuffers();
+        Free(spriteTemplate);
+
+        return spriteId;
+    }
+}
+
+u8 AddCustomItemIconSprite(struct SpriteTemplate *customSpriteTemplate, u16 tilesTag, u16 paletteTag, u16 itemId)
+{
+    if (!AllocItemIconTemporaryBuffers())
+    {
+        return MAX_SPRITES;
+    }
+    else
+    {
+        u8 spriteId;
+        struct SpriteSheet spriteSheet;
+        struct CompressedSpritePalette spritePalette;
+        struct SpriteTemplate *spriteTemplate;
+
+        LZDecompressWram(GetItemIconPicOrPalette(itemId, 0), gItemIconDecompressionBuffer);
+        CopyItemIconPicTo4x4Buffer(gItemIconDecompressionBuffer, gItemIcon4x4Buffer);
+        spriteSheet.data = gItemIcon4x4Buffer;
+        spriteSheet.size = 0x200;
+        spriteSheet.tag = tilesTag;
+        LoadSpriteSheet(&spriteSheet);
+
+        spritePalette.data = GetItemIconPicOrPalette(itemId, 1);
+        spritePalette.tag = paletteTag;
+        LoadCompressedObjectPalette(&spritePalette);
+
+        spriteTemplate = Alloc(sizeof(*spriteTemplate));
+        CpuCopy16(customSpriteTemplate, spriteTemplate, sizeof(*spriteTemplate));
+        spriteTemplate->tileTag = tilesTag;
+        spriteTemplate->paletteTag = paletteTag;
+        spriteId = CreateSprite(spriteTemplate, 0, 0, 0);
+
+        FreeItemIconTemporaryBuffers();
+        Free(spriteTemplate);
+
+        return spriteId;
+    }
+}
+
+const void *GetItemIconPicOrPalette(u16 itemId, u8 which)
+{
+    if (itemId == 0xFFFF)
+        itemId = ITEM_FIELD_ARROW;
+    else if (itemId > ITEM_LAST_ID)
+        itemId = 0;
+
+    return gItemIconTable[itemId][which];
+}
-- 
cgit v1.2.3


From 27452ca822f6e4096cfc1545c8192ebdd06cdf06 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 2 Feb 2018 19:00:01 +0100
Subject: decompile rtc reset screen

---
 src/reset_rtc_screen.c | 640 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/start_menu.c       |   7 +
 2 files changed, 647 insertions(+)
 create mode 100644 src/reset_rtc_screen.c

(limited to 'src')

diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
new file mode 100644
index 000000000..16cc72166
--- /dev/null
+++ b/src/reset_rtc_screen.c
@@ -0,0 +1,640 @@
+#include "global.h"
+#include "reset_rtc_screen.h"
+#include "event_data.h"
+#include "main.h"
+#include "menu.h"
+#include "palette.h"
+#include "rtc.h"
+#include "save.h"
+#include "sprite.h"
+#include "constants/songs.h"
+#include "sound.h"
+#include "string_util.h"
+#include "strings.h"
+#include "task.h"
+#include "text.h"
+#include "scanline_effect.h"
+#include "bg.h"
+#include "window.h"
+#include "gpu_regs.h"
+#include "new_menu_helpers.h"
+
+struct ResetRtcStruct
+{
+    /*0x0*/ u8 dataIndex;
+    /*0x2*/ u16 minVal;
+    /*0x4*/ u16 maxVal;
+    /*0x6*/ u8 left;
+    /*0x7*/ u8 right;
+    /*0x8*/ u8 unk8;
+};
+
+// this file's functions
+static void CB2_ResetRtcScreen(void);
+static void VBlankCB(void);
+static void Task_ResetRtcScreen(u8 taskId);
+static void sub_809F048(void);
+
+// const rom data
+static const struct BgTemplate sBackgroundTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    }
+};
+
+static const struct WindowTemplate sUnknown_08510408[] =
+{
+    {0x00, 0x01, 0x01, 0x13, 0x09, 0x0f, 0x0155},
+    {0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x00e9},
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sUnknown_08510420 = {0x00, 0x04, 0x09, 0x15, 0x02, 0x0f, 0x00bf};
+
+static const struct ResetRtcStruct sUnknown_08510428[5] =
+{
+    {
+        .dataIndex = 3,
+        .minVal = 1,
+        .maxVal = 9999,
+        .left = 0,
+        .right = 2,
+        .unk8 = 0,
+    },
+    {
+        .dataIndex = 4,
+        .minVal = 0,
+        .maxVal = 23,
+        .left = 1,
+        .right = 3,
+        .unk8 = 0,
+    },
+    {
+        .dataIndex = 5,
+        .minVal = 0,
+        .maxVal = 59,
+        .left = 2,
+        .right = 4,
+        .unk8 = 0,
+    },
+    {
+        .dataIndex = 6,
+        .minVal = 0,
+        .maxVal = 59,
+        .left = 3,
+        .right = 5,
+        .unk8 = 0,
+    },
+    {
+        .dataIndex = 7,
+        .minVal = 0,
+        .maxVal = 0,
+        .left = 4,
+        .right = 0,
+        .unk8 = 6,
+    },
+};
+
+static const struct OamData sOamData_08510464 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const u8 sResetRtcScreen_DownArrowGfx[] = INCBIN_U8("graphics/misc/reset_rtc_screen_downarrow.4bpp");
+static const u8 sResetRtcScreen_RightArrowGfx[] = INCBIN_U8("graphics/misc/reset_rtc_screen_rightarrow.4bpp");
+static const u16 sResetRtcScreen_ArrowPal[] = INCBIN_U16("graphics/misc/reset_rtc_screen_arrow.gbapal");
+
+static const struct SpriteFrameImage sSpriteImageTable_85104B4[] =
+{
+    obj_frame_tiles(sResetRtcScreen_DownArrowGfx),
+    obj_frame_tiles(sResetRtcScreen_RightArrowGfx)
+};
+
+static const struct SpritePalette sSpritePalette_Arrow =
+{
+    sResetRtcScreen_ArrowPal, 0x1000
+};
+
+static const union AnimCmd sSpriteAnim_85104CC[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sSpriteAnim_85104D4[] =
+{
+    ANIMCMD_FRAME(0, 158, .vFlip = TRUE),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd sSpriteAnim_85104DC[] =
+{
+    ANIMCMD_FRAME(1, 30),
+    ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd *const sSpriteAnimTable_85104E4[] =
+{
+    sSpriteAnim_85104CC,
+    sSpriteAnim_85104D4,
+    sSpriteAnim_85104DC,
+};
+
+static const struct SpriteTemplate sSpriteTemplate_85104F0 =
+{
+    .tileTag = 0xFFFF,
+    .paletteTag = 0x1000,
+    .oam = &sOamData_08510464,
+    .anims = sSpriteAnimTable_85104E4,
+    .images = sSpriteImageTable_85104B4,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+// code
+static void SpriteCB_ResetRtcCusor0(struct Sprite *sprite)
+{
+    int state = gTasks[sprite->data[0]].data[2];
+    if (state != sprite->data[1])
+    {
+        sprite->data[1] = state;
+        switch (state)
+        {
+        case 1:
+            sprite->invisible = FALSE;
+            sprite->animNum = 1;
+            sprite->animDelayCounter = 0;
+            sprite->pos1.x = 53;
+            sprite->pos1.y = 68;
+            break;
+        case 2:
+            sprite->invisible = FALSE;
+            sprite->animNum = 1;
+            sprite->animDelayCounter = 0;
+            sprite->pos1.x = 86;
+            sprite->pos1.y = 68;
+            break;
+        case 3:
+            sprite->invisible = FALSE;
+            sprite->animNum = 1;
+            sprite->animDelayCounter = 0;
+            sprite->pos1.x = 101;
+            sprite->pos1.y = 68;
+            break;
+        case 4:
+            sprite->invisible = FALSE;
+            sprite->animNum = 1;
+            sprite->animDelayCounter = 0;
+            sprite->pos1.x = 116;
+            sprite->pos1.y = 68;
+            break;
+        case 5:
+            sprite->invisible = FALSE;
+            sprite->animNum = 2;
+            sprite->animDelayCounter = 0;
+            sprite->pos1.x = 153;
+            sprite->pos1.y = 80;
+            break;
+        case 6:
+            DestroySprite(sprite);
+            break;
+        }
+    }
+}
+
+static void SpriteCB_ResetRtcCusor1(struct Sprite *sprite)
+{
+    int state = gTasks[sprite->data[0]].data[2];
+    if (state != sprite->data[1])
+    {
+        sprite->data[1] = state;
+        switch (state)
+        {
+        case 1:
+            sprite->invisible = FALSE;
+            sprite->animNum = 0;
+            sprite->animDelayCounter = 0;
+            sprite->pos1.x = 53;
+            sprite->pos1.y = 92;
+            break;
+        case 2:
+            sprite->invisible = FALSE;
+            sprite->animNum = 0;
+            sprite->animDelayCounter = 0;
+            sprite->pos1.x = 86;
+            sprite->pos1.y = 92;
+            break;
+        case 3:
+            sprite->invisible = FALSE;
+            sprite->animNum = 0;
+            sprite->animDelayCounter = 0;
+            sprite->pos1.x = 101;
+            sprite->pos1.y = 92;
+            break;
+        case 4:
+            sprite->invisible = FALSE;
+            sprite->animNum = 0;
+            sprite->animDelayCounter = 0;
+            sprite->pos1.x = 116;
+            sprite->pos1.y = 92;
+            break;
+        case 5:
+            sprite->invisible = TRUE;
+            break;
+        case 6:
+            DestroySprite(sprite);
+            break;
+        }
+    }
+}
+
+static void CreateCursor(u8 taskId)
+{
+    u32 spriteId;
+
+    LoadSpritePalette(&sSpritePalette_Arrow);
+
+    spriteId = CreateSpriteAtEnd(&sSpriteTemplate_85104F0, 53, 68, 0);
+    gSprites[spriteId].callback = SpriteCB_ResetRtcCusor0;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = -1;
+
+    spriteId = CreateSpriteAtEnd(&sSpriteTemplate_85104F0, 53, 68, 0);
+    gSprites[spriteId].callback = SpriteCB_ResetRtcCusor1;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = -1;
+}
+
+static void FreeCursorPalette(void)
+{
+    FreeSpritePaletteByTag(sSpritePalette_Arrow.tag);
+}
+
+static void HideChooseTimeWindow(u8 windowId)
+{
+    sub_8198070(windowId, FALSE);
+    RemoveWindow(windowId);
+    schedule_bg_copy_tilemap_to_vram(0);
+}
+
+static void PrintTime(u8 windowId, u8 x, u8 y, u16 days, u8 hours, u8 minutes, u8 seconds)
+{
+    u8 *dest = gStringVar4;
+
+    ConvertIntToDecimalStringN(gStringVar1, days, 1, 4);
+    dest = StringCopy(dest, gStringVar1);
+    dest = StringCopy(dest, gText_Day);
+
+    ConvertIntToDecimalStringN(gStringVar1, hours, 1, 3);
+    dest = StringCopy(dest, gStringVar1);
+    dest = StringCopy(dest, gText_Colon3);
+
+    ConvertIntToDecimalStringN(gStringVar1, minutes, 2, 2);
+    dest = StringCopy(dest, gStringVar1);
+    dest = StringCopy(dest, gText_Colon3);
+
+    ConvertIntToDecimalStringN(gStringVar1, seconds, 2, 2);
+    dest = StringCopy(dest, gStringVar1);
+
+    PrintTextOnWindow(windowId, 1, gStringVar4, x, y, TEXT_SPEED_FF, NULL);
+}
+
+static void ShowChooseTimeWindow(u8 windowId, u16 days, u8 hours, u8 minutes, u8 seconds)
+{
+    SetWindowBorderStyle(windowId, FALSE, 0x214, 0xE);
+    PrintTime(windowId, 0, 1, days, hours, minutes, seconds);
+    PrintTextOnWindow(windowId, 1, gText_Confirm2, 126, 1, 0, NULL);
+    schedule_bg_copy_tilemap_to_vram(0);
+}
+
+static bool32 MoveTimeUpDown(s16 *val, int minVal, int maxVal, u16 keys)
+{
+    if (keys & DPAD_DOWN)
+    {
+        (*val)--;
+        if (*val < minVal)
+            *val = maxVal;
+    }
+    else if (keys & DPAD_UP)
+    {
+        (*val)++;
+        if (*val > maxVal)
+            *val = minVal;
+    }
+    else if (keys & DPAD_LEFT)
+    {
+        *val -= 10;
+        if (*val < minVal)
+            *val = maxVal;
+    }
+    else if (keys & DPAD_RIGHT)
+    {
+        *val += 10;
+        if (*val > maxVal)
+            *val = minVal;
+    }
+    else
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+static void Task_ResetRtc_3(u8 taskId)
+{
+    gTasks[taskId].data[0] = 1;
+}
+
+static void Task_ResetRtc_2(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    HideChooseTimeWindow(data[8]);
+    FreeCursorPalette();
+    gTasks[taskId].func = Task_ResetRtc_3;
+}
+
+static void Task_ResetRtc_1(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    u8 selection = data[2];
+    const struct ResetRtcStruct *selectionInfo = &sUnknown_08510428[selection - 1];
+
+    if (gMain.newKeys & B_BUTTON)
+    {
+        gTasks[taskId].func = Task_ResetRtc_2;
+        data[1] = 0;
+        data[2] = 6;
+        PlaySE(SE_SELECT);
+        return;
+    }
+
+    if (gMain.newKeys & DPAD_RIGHT)
+    {
+        if (selectionInfo->right)
+        {
+            data[2] = selectionInfo->right;
+            PlaySE(SE_SELECT);
+            return;
+        }
+    }
+
+    if (gMain.newKeys & DPAD_LEFT)
+    {
+        if (selectionInfo->left)
+        {
+            data[2] = selectionInfo->left;
+            PlaySE(SE_SELECT);
+            return;
+        }
+    }
+
+    if (selection == 5)
+    {
+        if (gMain.newKeys & A_BUTTON)
+        {
+            gLocalTime.days = data[3];
+            gLocalTime.hours = data[4];
+            gLocalTime.minutes = data[5];
+            gLocalTime.seconds = data[6];
+            PlaySE(SE_SELECT);
+            gTasks[taskId].func = Task_ResetRtc_2;
+            data[1] = 1;
+            data[2] = 6;
+        }
+    }
+    else if (MoveTimeUpDown(&data[selectionInfo->dataIndex], selectionInfo->minVal, selectionInfo->maxVal, gMain.newAndRepeatedKeys & (DPAD_UP | DPAD_DOWN)))
+    {
+        PlaySE(SE_SELECT);
+        PrintTime(data[8], 0, 1, data[3], data[4], data[5], data[6]);
+        CopyWindowToVram(data[8], 2);
+    }
+}
+
+static void Task_ResetRtc_0(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    data[0] = 0;
+    data[3] = gLocalTime.days;
+    data[4] = gLocalTime.hours;
+    data[5] = gLocalTime.minutes;
+    data[6] = gLocalTime.seconds;
+    data[8] = AddWindow(&sUnknown_08510420);
+    ShowChooseTimeWindow(data[8], data[3], data[4], data[5], data[6]);
+    CreateCursor(taskId);
+    data[2] = 2;
+    gTasks[taskId].func = Task_ResetRtc_1;
+}
+
+void CB2_InitResetRtcScreen(void)
+{
+    SetGpuReg(REG_OFFSET_DISPCNT, 0);
+    SetVBlankCallback(NULL);
+    DmaClear16(3, PLTT, PLTT_SIZE);
+    DmaFillLarge16(3, 0, (u8 *)VRAM, 0x18000, 0x1000);
+    ResetOamRange(0, 128);
+    LoadOam();
+    ScanlineEffect_Stop();
+    ScanlineEffect_Clear();
+    ResetSpriteData();
+    ResetTasks();
+    ResetPaletteFade();
+    sub_809F048();
+    SetVBlankCallback(VBlankCB);
+    SetMainCallback2(CB2_ResetRtcScreen);
+    CreateTask(Task_ResetRtcScreen, 80);
+}
+
+static void sub_809F048(void)
+{
+    clear_scheduled_bg_copies_to_vram();
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, sBackgroundTemplates, ARRAY_COUNT(sBackgroundTemplates));
+    schedule_bg_copy_tilemap_to_vram(0);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+    ShowBg(0);
+    InitWindows(sUnknown_08510408);
+    DeactivateAllTextPrinters();
+    sub_81973A4();
+}
+
+static void CB2_ResetRtcScreen(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    do_scheduled_bg_tilemap_copies_to_vram();
+    UpdatePaletteFade();
+}
+
+static void VBlankCB(void)
+{
+    ProcessSpriteCopyRequests();
+    LoadOam();
+    TransferPlttBuffer();
+}
+
+static void ShowMessage(const u8 *str)
+{
+    sub_8197B1C(1, FALSE, 0x200, 0xF);
+    PrintTextOnWindow(1, 1, str, 0, 1, 0, NULL);
+    schedule_bg_copy_tilemap_to_vram(0);
+}
+
+static void Task_ShowResetRtcPrompt(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    switch (data[0])
+    {
+    case 0:
+        SetWindowBorderStyle(0, FALSE, 0x214, 0xE);
+        PrintTextOnWindow(0, 1, gText_PresentTime, 0, 1, TEXT_SPEED_FF, 0);
+        PrintTime(
+            0,
+            0,
+            17,
+            gLocalTime.days,
+            gLocalTime.hours,
+            gLocalTime.minutes,
+            gLocalTime.seconds);
+        PrintTextOnWindow(0, 1, gText_PreviousTime, 0, 33, TEXT_SPEED_FF, 0);
+        PrintTime(
+            0,
+            0,
+            49,
+            gSaveBlock2Ptr->lastBerryTreeUpdate.days,
+            gSaveBlock2Ptr->lastBerryTreeUpdate.hours,
+            gSaveBlock2Ptr->lastBerryTreeUpdate.minutes,
+            gSaveBlock2Ptr->lastBerryTreeUpdate.seconds);
+        ShowMessage(gText_ResetRTCConfirmCancel);
+        CopyWindowToVram(0, 2);
+        schedule_bg_copy_tilemap_to_vram(0);
+        data[0]++;
+    case 1:
+        if (gMain.newKeys & B_BUTTON)
+        {
+            DestroyTask(taskId);
+            DoSoftReset();
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            DestroyTask(taskId);
+        }
+        break;
+    }
+}
+
+static void Task_ResetRtcScreen(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+
+    switch (data[0])
+    {
+    case 0:
+        BeginNormalPaletteFade(-1, 1, 0x10, 0, 0xFFFF);
+        data[0] = 1;
+        break;
+    case 1:
+        if (!gPaletteFade.active)
+        {
+            if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
+            {
+                ShowMessage(gText_NoSaveFileCantSetTime);
+                data[0] = 5;
+            }
+            else
+            {
+                RtcCalcLocalTime();
+                data[1] = CreateTask(Task_ShowResetRtcPrompt, 80);
+                data[0] = 2;
+            }
+        }
+        break;
+    case 2:
+        if (gTasks[data[1]].isActive != TRUE)
+        {
+            sub_8198070(0, FALSE);
+            ShowMessage(gText_PleaseResetTime);
+            gLocalTime = gSaveBlock2Ptr->lastBerryTreeUpdate;
+            data[1] = CreateTask(Task_ResetRtc_0, 80);
+            data[0] = 3;
+        }
+        break;
+    case 3:
+        if (gTasks[data[1]].data[0])
+        {
+            if (!gTasks[data[1]].data[1])
+            {
+                DestroyTask(data[1]);
+                data[0] = 2;
+            }
+            else
+            {
+                DestroyTask(data[1]);
+                RtcReset();
+                RtcCalcLocalTimeOffset(
+                    gLocalTime.days,
+                    gLocalTime.hours,
+                    gLocalTime.minutes,
+                    gLocalTime.seconds);
+                gSaveBlock2Ptr->lastBerryTreeUpdate = gLocalTime;
+                VarSet(VAR_DAYS, gLocalTime.days);
+                DisableResetRTC();
+                ShowMessage(gText_ClockHasBeenReset);
+                data[0] = 4;
+            }
+        }
+        break;
+    case 4:
+        if (TrySavingData(0) == 1)
+        {
+            ShowMessage(gText_SaveCompleted);
+            PlaySE(SE_PINPON);
+        }
+        else
+        {
+            ShowMessage(gText_SaveFailed);
+            PlaySE(SE_BOO);
+        }
+        data[0] = 5;
+    case 5:
+        if (gMain.newKeys & A_BUTTON)
+        {
+            BeginNormalPaletteFade(-1, 1, 0, 0x10, 0xFFFF);
+            data[0] = 6;
+        }
+        else
+        {
+            break;
+        }
+    case 6:
+        if (!gPaletteFade.active)
+        {
+            DestroyTask(taskId);
+            FreeAllWindowBuffers();
+            DoSoftReset();
+        }
+    }
+}
diff --git a/src/start_menu.c b/src/start_menu.c
index a820cd992..7671a3e22 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -120,6 +120,13 @@ const struct WindowTemplate gUnknown_085105AC[] =
 const struct WindowTemplate gUnknown_085105BC = {0, 1, 1, 0xE, 0xA, 0xF, 8};
 
 // code
+void SetDexPokemonPokenavFlags(void) // unused
+{
+    FlagSet(FLAG_SYS_POKEDEX_GET);
+    FlagSet(FLAG_SYS_POKEMON_GET);
+    FlagSet(FLAG_SYS_POKENAV_GET);
+}
+
 void BuildStartMenuActions(void)
 {
     sNumStartMenuActions = 0;
-- 
cgit v1.2.3


From 0c60ffe22ae1335be4dd24c22215eff1f95ab57e Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 4 Feb 2018 16:11:00 +0100
Subject: decompile title screen

---
 src/berry_fix_program.c |   2 +-
 src/title_screen.c      | 783 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 784 insertions(+), 1 deletion(-)
 create mode 100644 src/title_screen.c

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 7b968a221..8b1cd6a37 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -133,7 +133,7 @@ extern const u8 gMultiBootProgram_BerryGlitchFix_End[];
 
 // .text
 
-void InitBerryFixProgram(void)
+void CB2_InitBerryFixProgram(void)
 {
     DisableInterrupts(0xFFFF);
     EnableInterrupts(0x0001);
diff --git a/src/title_screen.c b/src/title_screen.c
new file mode 100644
index 000000000..4e25c8152
--- /dev/null
+++ b/src/title_screen.c
@@ -0,0 +1,783 @@
+#include "global.h"
+#include "title_screen.h"
+#include "sprite.h"
+#include "gba/m4a_internal.h"
+#include "clear_save_data_menu.h"
+#include "decompress.h"
+#include "event_data.h"
+#include "intro.h"
+#include "m4a.h"
+#include "main.h"
+#include "main_menu.h"
+#include "palette.h"
+#include "reset_rtc_screen.h"
+#include "berry_fix_program.h"
+#include "sound.h"
+#include "sprite.h"
+#include "task.h"
+#include "scanline_effect.h"
+#include "gpu_regs.h"
+#include "trig.h"
+#include "constants/rgb.h"
+
+#define VERSION_BANNER_SHAPE 1
+#define VERSION_BANNER_RIGHT_TILEOFFSET 64
+#define VERSION_BANNER_BYTES 0x1000
+#define VERSION_BANNER_LEFT_X 98
+#define VERSION_BANNER_RIGHT_X 162
+#define VERSION_BANNER_Y 2
+#define VERSION_BANNER_Y_GOAL 66
+#define START_BANNER_X 128
+
+#define CLEAR_SAVE_BUTTON_COMBO (B_BUTTON | SELECT_BUTTON | DPAD_UP)
+#define RESET_RTC_BUTTON_COMBO (B_BUTTON | SELECT_BUTTON | DPAD_LEFT)
+#define BERRY_UPDATE_BUTTON_COMBO (B_BUTTON | SELECT_BUTTON)
+#define A_B_START_SELECT (A_BUTTON | B_BUTTON | START_BUTTON | SELECT_BUTTON)
+
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG1_Y;
+
+extern const u8 gTitleScreenEmeraldVersionGfx[];
+extern const u8 gTitleScreenPressStartGfx[];
+extern const u8 gTitleScreenPokemonLogoGfx[];
+extern const u8 gUnknown_08DE0644[];
+extern const u8 gUnknown_08DDE458[];
+extern const u16 gTitleScreenBgPalettes[];
+extern const u16 gTitleScreenPressStartPal[];
+extern const u16 gTitleScreenEmeraldVersionPal[];
+
+// this file's functions
+static void MainCB2(void);
+static void Task_TitleScreenPhase1(u8);
+static void Task_TitleScreenPhase2(u8);
+static void Task_TitleScreenPhase3(u8);
+static void CB2_GoToMainMenu(void);
+static void CB2_GoToClearSaveDataScreen(void);
+static void CB2_GoToResetRtcScreen(void);
+static void CB2_GoToBerryFixScreen(void);
+static void CB2_GoToCopyrightScreen(void);
+static void UpdateLegendaryMarkingColor(u8);
+
+static void SpriteCB_VersionBannerLeft(struct Sprite *sprite);
+static void SpriteCB_VersionBannerRight(struct Sprite *sprite);
+static void SpriteCB_PressStartCopyrightBanner(struct Sprite *sprite);
+static void SpriteCB_PokemonLogoShine(struct Sprite *sprite);
+
+// const rom data
+static const u16 sUnusedUnknownPal[] = INCBIN_U16("graphics/title_screen/unk_853EF78.gbapal");
+
+static const u8 sTitleScreenRayquazaGfx[] = INCBIN_U8("graphics/title_screen/rayquaza.4bpp.lz");
+static const u8 sTitleScreenRayquazaTilemap[] = INCBIN_U8("graphics/title_screen/rayquaza.bin.lz");
+static const u8 sTitleScreenLogoShineGfx[] = INCBIN_U8("graphics/title_screen/logo_shine.4bpp.lz");
+static const u8 sTitleScreenCloudsGfx[] = INCBIN_U8("graphics/title_screen/clouds.4bpp.lz");
+
+const u16 gUnknown_0853FF70[] =
+{
+	0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710,
+	0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10,
+	0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008,
+	0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000,
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+	0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
+};
+
+static const struct OamData sVersionBannerLeftOamData =
+{
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 1,
+    .shape = VERSION_BANNER_SHAPE,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const struct OamData sVersionBannerRightOamData =
+{
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 1,
+    .shape = VERSION_BANNER_SHAPE,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sVersionBannerLeftAnimSequence[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sVersionBannerRightAnimSequence[] =
+{
+    ANIMCMD_FRAME(VERSION_BANNER_RIGHT_TILEOFFSET, 30),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd *const sVersionBannerLeftAnimTable[] =
+{
+    sVersionBannerLeftAnimSequence,
+};
+
+static const union AnimCmd *const sVersionBannerRightAnimTable[] =
+{
+    sVersionBannerRightAnimSequence,
+};
+
+static const struct SpriteTemplate sVersionBannerLeftSpriteTemplate =
+{
+    .tileTag = 1000,
+    .paletteTag = 1000,
+    .oam = &sVersionBannerLeftOamData,
+    .anims = sVersionBannerLeftAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_VersionBannerLeft,
+};
+
+static const struct SpriteTemplate sVersionBannerRightSpriteTemplate =
+{
+    .tileTag = 1000,
+    .paletteTag = 1000,
+    .oam = &sVersionBannerRightOamData,
+    .anims = sVersionBannerRightAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_VersionBannerRight,
+};
+
+static const struct CompressedSpriteSheet sSpriteSheet_EmeraldVersion[] =
+{
+    {gTitleScreenEmeraldVersionGfx, VERSION_BANNER_BYTES, 1000},
+    {NULL},
+};
+
+static const struct OamData sOamData_CopyrightBanner =
+{
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sCopyrightBannerAnim0[] =
+{
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_END,
+};
+static const union AnimCmd sCopyrightBannerAnim1[] =
+{
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_END,
+};
+static const union AnimCmd sCopyrightBannerAnim2[] =
+{
+    ANIMCMD_FRAME(9, 4),
+    ANIMCMD_END,
+};
+static const union AnimCmd sCopyrightBannerAnim3[] =
+{
+    ANIMCMD_FRAME(13, 4),
+    ANIMCMD_END,
+};
+static const union AnimCmd sCopyrightBannerAnim4[] =
+{
+    ANIMCMD_FRAME(17, 4),
+    ANIMCMD_END,
+};
+static const union AnimCmd sCopyrightBannerAnim5[] =
+{
+    ANIMCMD_FRAME(21, 4),
+    ANIMCMD_END,
+};
+static const union AnimCmd sCopyrightBannerAnim6[] =
+{
+    ANIMCMD_FRAME(25, 4),
+    ANIMCMD_END,
+};
+static const union AnimCmd sCopyrightBannerAnim7[] =
+{
+    ANIMCMD_FRAME(29, 4),
+    ANIMCMD_END,
+};
+static const union AnimCmd sCopyrightBannerAnim8[] =
+{
+    ANIMCMD_FRAME(33, 4),
+    ANIMCMD_END,
+};
+static const union AnimCmd sCopyrightBannerAnim9[] =
+{
+    ANIMCMD_FRAME(37, 4),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd *const sStartCopyrightBannerAnimTable[] =
+{
+    sCopyrightBannerAnim0,
+    sCopyrightBannerAnim1,
+    sCopyrightBannerAnim2,
+    sCopyrightBannerAnim3,
+    sCopyrightBannerAnim4,
+    sCopyrightBannerAnim5,
+    sCopyrightBannerAnim6,
+    sCopyrightBannerAnim7,
+    sCopyrightBannerAnim8,
+    sCopyrightBannerAnim9,
+};
+
+static const struct SpriteTemplate sStartCopyrightBannerSpriteTemplate =
+{
+    .tileTag = 1001,
+    .paletteTag = 1001,
+    .oam = &sOamData_CopyrightBanner,
+    .anims = sStartCopyrightBannerAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_PressStartCopyrightBanner,
+};
+
+static const struct CompressedSpriteSheet sSpriteSheet_PressStart[] =
+{
+    {gTitleScreenPressStartGfx, 0x520, 1001},
+    {NULL},
+};
+
+static const struct SpritePalette sSpritePalette_PressStart[] =
+{
+    {gTitleScreenPressStartPal, 1001},
+    {NULL},
+};
+
+static const struct OamData sPokemonLogoShineOamData =
+{
+    .y = 160,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sPokemonLogoShineAnimSequence[] =
+{
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd *const sPokemonLogoShineAnimTable[] =
+{
+    sPokemonLogoShineAnimSequence,
+};
+
+static const struct SpriteTemplate sPokemonLogoShineSpriteTemplate =
+{
+    .tileTag = 1002,
+    .paletteTag = 1001,
+    .oam = &sPokemonLogoShineOamData,
+    .anims = sPokemonLogoShineAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_PokemonLogoShine,
+};
+
+static const struct CompressedSpriteSheet sPokemonLogoShineSpriteSheet[] =
+{
+    {sTitleScreenLogoShineGfx, 0x800, 1002},
+    {NULL},
+};
+
+// code
+static void SpriteCB_VersionBannerLeft(struct Sprite *sprite)
+{
+    if (gTasks[sprite->data[1]].data[1] != 0)
+    {
+        sprite->oam.objMode = 0;
+        sprite->pos1.y = VERSION_BANNER_Y_GOAL;
+    }
+    else
+    {
+        if (sprite->pos1.y != VERSION_BANNER_Y_GOAL)
+            sprite->pos1.y++;
+        if (sprite->data[0] != 0)
+            sprite->data[0]--;
+        SetGpuReg(REG_OFFSET_BLDALPHA, gUnknown_0853FF70[sprite->data[0]]);
+    }
+}
+
+static void SpriteCB_VersionBannerRight(struct Sprite *sprite)
+{
+    if (gTasks[sprite->data[1]].data[1] != 0)
+    {
+        sprite->oam.objMode = 0;
+        sprite->pos1.y = VERSION_BANNER_Y_GOAL;
+    }
+    else
+    {
+        if (sprite->pos1.y != VERSION_BANNER_Y_GOAL)
+            sprite->pos1.y++;
+    }
+}
+
+static void SpriteCB_PressStartCopyrightBanner(struct Sprite *sprite)
+{
+    if (sprite->data[0] == 1)
+    {
+        sprite->data[1]++;
+        // Alternate between hidden and shown every 16th frame
+        if (sprite->data[1] & 0x10)
+            sprite->invisible = FALSE;
+        else
+            sprite->invisible = TRUE;
+    }
+    else
+    {
+        sprite->invisible = FALSE;
+    }
+}
+
+static void CreatePressStartBanner(s16 x, s16 y)
+{
+    u8 i;
+    u8 spriteId;
+
+    x -= 64;
+    for (i = 0; i < 5; i++, x += 32)
+    {
+        spriteId = CreateSprite(&sStartCopyrightBannerSpriteTemplate, x, y, 0);
+        StartSpriteAnim(&gSprites[spriteId], i);
+        gSprites[spriteId].data[0] = 1;
+    }
+}
+
+static void CreateCopyrightBanner(s16 x, s16 y)
+{
+    u8 i;
+    u8 spriteId;
+
+    x -= 64;
+    for (i = 0; i < 5; i++, x += 32)
+    {
+        spriteId = CreateSprite(&sStartCopyrightBannerSpriteTemplate, x, y, 0);
+        StartSpriteAnim(&gSprites[spriteId], i + 5);
+    }
+}
+
+static void SpriteCB_PokemonLogoShine(struct Sprite *sprite)
+{
+    if (sprite->pos1.x < 272)
+    {
+        if (sprite->data[0]) // Flash background
+        {
+            u16 backgroundColor;
+
+            if (sprite->pos1.x < DISPLAY_WIDTH / 2)
+            {
+                // Brighten background color
+                if (sprite->data[1] < 31)
+                    sprite->data[1]++;
+                if (sprite->data[1] < 31)
+                    sprite->data[1]++;
+            }
+            else
+            {
+                // Darken background color
+                if (sprite->data[1] != 0)
+                    sprite->data[1]--;
+                if (sprite->data[1] != 0)
+                    sprite->data[1]--;
+            }
+
+            backgroundColor = _RGB(sprite->data[1], sprite->data[1], sprite->data[1]);
+            if (sprite->pos1.x == DISPLAY_WIDTH / 2 + 12
+                || sprite->pos1.x == DISPLAY_WIDTH / 2 + 16
+                || sprite->pos1.x == DISPLAY_WIDTH / 2 + 20
+                || sprite->pos1.x == DISPLAY_WIDTH / 2 + 24)
+                gPlttBufferFaded[0] = RGB(24, 31, 12);
+            else
+                gPlttBufferFaded[0] = backgroundColor;
+        }
+        sprite->pos1.x += 4;
+    }
+    else
+    {
+        gPlttBufferFaded[0] = RGB_BLACK;
+        DestroySprite(sprite);
+    }
+}
+
+static void SpriteCB_PokemonLogoShine2(struct Sprite *sprite)
+{
+    if (sprite->pos1.x < 272)
+        sprite->pos1.x += 8;
+    else
+        DestroySprite(sprite);
+}
+
+static void StartPokemonLogoShine(u8 flashBg)
+{
+    u8 spriteId;
+
+    switch (flashBg)
+    {
+    case 0:
+    case 2:
+        spriteId = CreateSprite(&sPokemonLogoShineSpriteTemplate, 0, 68, 0);
+        gSprites[spriteId].oam.objMode = 2;
+        gSprites[spriteId].data[0] = flashBg;
+        break;
+    case 1:
+        spriteId = CreateSprite(&sPokemonLogoShineSpriteTemplate, 0, 68, 0);
+        gSprites[spriteId].oam.objMode = 2;
+        gSprites[spriteId].data[0] = flashBg;
+        gSprites[spriteId].invisible = TRUE;
+
+        spriteId = CreateSprite(&sPokemonLogoShineSpriteTemplate, 0, 68, 0);
+        gSprites[spriteId].callback = SpriteCB_PokemonLogoShine2;
+        gSprites[spriteId].oam.objMode = 2;
+
+        spriteId = CreateSprite(&sPokemonLogoShineSpriteTemplate, -80, 68, 0);
+        gSprites[spriteId].callback = SpriteCB_PokemonLogoShine2;
+        gSprites[spriteId].oam.objMode = 2;
+        break;
+    }
+}
+
+static void VBlankCB(void)
+{
+    ScanlineEffect_InitHBlankDmaTransfer();
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
+}
+
+#define tCounter data[0]
+#define tSkipToNext data[1]
+
+void CB2_InitTitleScreen(void)
+{
+    switch (gMain.state)
+    {
+    default:
+    case 0:
+        SetVBlankCallback(NULL);
+        SetGpuReg(REG_OFFSET_BLDCNT, 0);
+        SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+        SetGpuReg(REG_OFFSET_BLDY, 0);
+        *((u16 *)PLTT) = RGB_WHITE;
+        SetGpuReg(REG_OFFSET_DISPCNT, 0);
+        SetGpuReg(REG_OFFSET_BG2CNT, 0);
+        SetGpuReg(REG_OFFSET_BG1CNT, 0);
+        SetGpuReg(REG_OFFSET_BG0CNT, 0);
+        SetGpuReg(REG_OFFSET_BG2HOFS, 0);
+        SetGpuReg(REG_OFFSET_BG2VOFS, 0);
+        SetGpuReg(REG_OFFSET_BG1HOFS, 0);
+        SetGpuReg(REG_OFFSET_BG1VOFS, 0);
+        SetGpuReg(REG_OFFSET_BG0HOFS, 0);
+        SetGpuReg(REG_OFFSET_BG0VOFS, 0);
+        DmaFill16(3, 0, (void *)VRAM, VRAM_SIZE);
+        DmaFill32(3, 0, (void *)OAM, OAM_SIZE);
+        DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2);
+        ResetPaletteFade();
+        gMain.state = 1;
+        break;
+    case 1:
+        LZ77UnCompVram(gTitleScreenPokemonLogoGfx, (void *)VRAM);
+        LZ77UnCompVram(gUnknown_08DE0644, (void *)(VRAM + 0x4800));
+        LoadPalette(gTitleScreenBgPalettes, 0, 0x1E0);
+        LZ77UnCompVram(sTitleScreenRayquazaGfx, (void *)(VRAM + 0x8000));
+        LZ77UnCompVram(sTitleScreenRayquazaTilemap, (void *)(VRAM + 0xD000));
+        LZ77UnCompVram(sTitleScreenCloudsGfx, (void *)(VRAM + 0xC000));
+        LZ77UnCompVram(gUnknown_08DDE458, (void *)(VRAM + 0xD800));
+        ScanlineEffect_Stop();
+        ResetTasks();
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        gReservedSpritePaletteCount = 9;
+        LoadCompressedObjectPic(&sSpriteSheet_EmeraldVersion[0]);
+        LoadCompressedObjectPic(&sSpriteSheet_PressStart[0]);
+        LoadCompressedObjectPic(&sPokemonLogoShineSpriteSheet[0]);
+        LoadPalette(gTitleScreenEmeraldVersionPal, 0x100, 0x20);
+        LoadSpritePalette(&sSpritePalette_PressStart[0]);
+        gMain.state = 2;
+        break;
+    case 2:
+    {
+        u8 taskId = CreateTask(Task_TitleScreenPhase1, 0);
+
+        gTasks[taskId].tCounter = 256;
+        gTasks[taskId].tSkipToNext = FALSE;
+        gTasks[taskId].data[2] = -16;
+        gTasks[taskId].data[3] = -32;
+        gMain.state = 3;
+        break;
+    }
+    case 3:
+        BeginNormalPaletteFade(-1, 1, 0x10, 0, 0xFFFF);
+        SetVBlankCallback(VBlankCB);
+        gMain.state = 4;
+        break;
+    case 4:
+        sub_816F2A8(0x78, 0x50, 0x100, 0);
+        SetGpuReg(REG_OFFSET_BG2X_L, -29 * 256);
+        SetGpuReg(REG_OFFSET_BG2X_H, -1);
+        SetGpuReg(REG_OFFSET_BG2Y_L, -32 * 256);
+        SetGpuReg(REG_OFFSET_BG2Y_H, -1);
+        SetGpuReg(REG_OFFSET_WIN0H, 0);
+        SetGpuReg(REG_OFFSET_WIN0V, 0);
+        SetGpuReg(REG_OFFSET_WIN1H, 0);
+        SetGpuReg(REG_OFFSET_WIN1V, 0);
+        SetGpuReg(REG_OFFSET_WININ, 0x1F1F);
+        SetGpuReg(REG_OFFSET_WINOUT, 0x3F1F);
+        SetGpuReg(REG_OFFSET_BLDCNT, 0x84);
+        SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+        SetGpuReg(REG_OFFSET_BLDY, 0xC);
+        SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(26) | BGCNT_16COLOR | BGCNT_TXT256x256);
+        SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(3) | BGCNT_SCREENBASE(27) | BGCNT_16COLOR | BGCNT_TXT256x256);
+        SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(9) | BGCNT_256COLOR | BGCNT_AFF256x256);
+        EnableInterrupts(INTR_FLAG_VBLANK);
+        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_1
+                                    | DISPCNT_OBJ_1D_MAP
+                                    | DISPCNT_BG2_ON
+                                    | DISPCNT_OBJ_ON
+                                    | DISPCNT_WIN0_ON
+                                    | DISPCNT_OBJWIN_ON);
+        m4aSongNumStart(0x19D);
+        gMain.state = 5;
+        break;
+    case 5:
+        if (!UpdatePaletteFade())
+        {
+            StartPokemonLogoShine(0);
+            ScanlineEffect_InitWave(0, DISPLAY_HEIGHT, 4, 4, 0, SCANLINE_EFFECT_REG_BG1HOFS, TRUE);
+            SetMainCallback2(MainCB2);
+        }
+        break;
+    }
+}
+
+static void MainCB2(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+// Shine the Pokemon logo two more times, and fade in the version banner
+static void Task_TitleScreenPhase1(u8 taskId)
+{
+    // Skip to next phase when A, B, Start, or Select is pressed
+    if ((gMain.newKeys & A_B_START_SELECT) || gTasks[taskId].data[1] != 0)
+    {
+        gTasks[taskId].tSkipToNext = TRUE;
+        gTasks[taskId].tCounter = 0;
+    }
+
+    if (gTasks[taskId].tCounter != 0)
+    {
+        u16 frameNum = gTasks[taskId].tCounter;
+        if (frameNum == 176)
+            StartPokemonLogoShine(1);
+        else if (frameNum == 64)
+            StartPokemonLogoShine(2);
+
+        gTasks[taskId].tCounter--;
+    }
+    else
+    {
+        u8 spriteId;
+
+        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON);
+        SetGpuReg(REG_OFFSET_WININ, 0);
+        SetGpuReg(REG_OFFSET_WINOUT, 0);
+        SetGpuReg(REG_OFFSET_BLDCNT, 0x3F50);
+        SetGpuReg(REG_OFFSET_BLDALPHA, 0x10);
+        SetGpuReg(REG_OFFSET_BLDY, 0);
+
+        // Create left side of version banner
+        spriteId = CreateSprite(&sVersionBannerLeftSpriteTemplate, VERSION_BANNER_LEFT_X, VERSION_BANNER_Y, 0);
+        gSprites[spriteId].data[0] = 64;
+        gSprites[spriteId].data[1] = taskId;
+
+        // Create right side of version banner
+        spriteId = CreateSprite(&sVersionBannerRightSpriteTemplate, VERSION_BANNER_RIGHT_X, VERSION_BANNER_Y, 0);
+        gSprites[spriteId].data[1] = taskId;
+
+        gTasks[taskId].tCounter = 144;
+        gTasks[taskId].func = Task_TitleScreenPhase2;
+    }
+}
+
+// Create "Press Start" and copyright banners, and slide Pokemon logo up
+static void Task_TitleScreenPhase2(u8 taskId)
+{
+    u32 yPos;
+
+    // Skip to next phase when A, B, Start, or Select is pressed
+    if ((gMain.newKeys & A_B_START_SELECT) || gTasks[taskId].tSkipToNext)
+    {
+        gTasks[taskId].tSkipToNext = TRUE;
+        gTasks[taskId].tCounter = 0;
+    }
+
+    if (gTasks[taskId].tCounter != 0)
+    {
+        gTasks[taskId].tCounter--;
+    }
+    else
+    {
+        gTasks[taskId].tSkipToNext = TRUE;
+        SetGpuReg(REG_OFFSET_BLDCNT, 0x2142);
+        SetGpuReg(REG_OFFSET_BLDALPHA, 0xF06);
+        SetGpuReg(REG_OFFSET_BLDY, 0);
+        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_1
+                                    | DISPCNT_OBJ_1D_MAP
+                                    | DISPCNT_BG0_ON
+                                    | DISPCNT_BG1_ON
+                                    | DISPCNT_BG2_ON
+                                    | DISPCNT_OBJ_ON);
+        CreatePressStartBanner(START_BANNER_X, 108);
+        CreateCopyrightBanner(START_BANNER_X, 148);
+        gTasks[taskId].data[4] = 0;
+        gTasks[taskId].func = Task_TitleScreenPhase3;
+    }
+
+    if (!(gTasks[taskId].tCounter & 3) && gTasks[taskId].data[2] != 0)
+        gTasks[taskId].data[2]++;
+    if (!(gTasks[taskId].tCounter & 1) && gTasks[taskId].data[3] != 0)
+        gTasks[taskId].data[3]++;
+
+    // Slide Pokemon logo up
+    yPos = gTasks[taskId].data[3] * 256;
+    SetGpuReg(REG_OFFSET_BG2Y_L, yPos);
+    SetGpuReg(REG_OFFSET_BG2Y_H, yPos / 0x10000);
+
+    gTasks[taskId].data[5] = 15;
+    gTasks[taskId].data[6] = 6;
+}
+
+// Show Rayquaza silhouette and process main title screen input
+static void Task_TitleScreenPhase3(u8 taskId)
+{
+    if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & START_BUTTON))
+    {
+        FadeOutBGM(4);
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xFFFF);
+        SetMainCallback2(CB2_GoToMainMenu);
+    }
+    else if ((gMain.heldKeys & CLEAR_SAVE_BUTTON_COMBO) == CLEAR_SAVE_BUTTON_COMBO)
+    {
+        SetMainCallback2(CB2_GoToClearSaveDataScreen);
+    }
+    else if ((gMain.heldKeys & RESET_RTC_BUTTON_COMBO) == RESET_RTC_BUTTON_COMBO
+      && CanResetRTC() == TRUE)
+    {
+        FadeOutBGM(4);
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        SetMainCallback2(CB2_GoToResetRtcScreen);
+    }
+    else if ((gMain.heldKeys & BERRY_UPDATE_BUTTON_COMBO) == BERRY_UPDATE_BUTTON_COMBO)
+    {
+        FadeOutBGM(4);
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+        SetMainCallback2(CB2_GoToBerryFixScreen);
+    }
+    else
+    {
+        SetGpuReg(REG_OFFSET_BG2Y_L, 0);
+        SetGpuReg(REG_OFFSET_BG2Y_H, 0);
+        gTasks[taskId].tCounter++;
+        if (gTasks[taskId].tCounter & 1)
+        {
+            gTasks[taskId].data[4]++;
+            gBattle_BG1_Y = gTasks[taskId].data[4] / 2;
+            gBattle_BG1_X = 0;
+        }
+        UpdateLegendaryMarkingColor(gTasks[taskId].tCounter);
+        if ((gMPlayInfo_BGM.status & 0xFFFF) == 0)
+        {
+            BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xFFFF);
+            SetMainCallback2(CB2_GoToCopyrightScreen);
+        }
+    }
+}
+
+static void CB2_GoToMainMenu(void)
+{
+    if (!UpdatePaletteFade())
+        SetMainCallback2(CB2_InitMainMenu);
+}
+
+static void CB2_GoToCopyrightScreen(void)
+{
+    if (!UpdatePaletteFade())
+        SetMainCallback2(CB2_InitCopyrightScreenAfterTitleScreen);
+}
+
+static void CB2_GoToClearSaveDataScreen(void)
+{
+    if (!UpdatePaletteFade())
+        SetMainCallback2(CB2_InitClearSaveDataScreen);
+}
+
+static void CB2_GoToResetRtcScreen(void)
+{
+    if (!UpdatePaletteFade())
+        SetMainCallback2(CB2_InitResetRtcScreen);
+}
+
+static void CB2_GoToBerryFixScreen(void)
+{
+    if (!UpdatePaletteFade())
+    {
+        m4aMPlayAllStop();
+        SetMainCallback2(CB2_InitBerryFixProgram);
+    }
+}
+
+static void UpdateLegendaryMarkingColor(u8 frameNum)
+{
+    if ((frameNum % 4) == 0) // Change color every 4th frame
+    {
+        s32 intensity = Cos(frameNum, 128) + 128;
+        s32 r = 31 - ((intensity * 32 - intensity) / 256);
+        s32 g = 31 - (intensity * 22 / 256);
+        s32 b = 12;
+
+        u16 color = RGB(r, g, b);
+        LoadPalette(&color, 0xEF, sizeof(color));
+   }
+}
-- 
cgit v1.2.3


From ae8e89a10ddfb736afc23a2477c20b6897b0313d Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 5 Feb 2018 17:39:26 +0100
Subject: move some pokemon data to c

---
 src/battle_controller_link_opponent.c | 18 +++++------
 src/battle_dome_cards.c               |  6 ++--
 src/battle_script_commands.c          |  6 ++--
 src/daycare.c                         |  4 +--
 src/evolution_scene.c                 | 29 ++++++++---------
 src/item_use.c                        |  8 ++---
 src/pokemon_1.c                       | 59 +++++++++++++++++++++++++++++++++--
 src/pokemon_2.c                       |  8 ++---
 src/pokemon_3.c                       | 58 +++++++++++++++++-----------------
 9 files changed, 126 insertions(+), 70 deletions(-)

(limited to 'src')

diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index cb510bb5b..d4cdb7968 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -58,7 +58,7 @@ extern u16 gTrainerBattleOpponent_B;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct BattleMove gBattleMoves[];
-extern const u8 gUnknown_0831F578[];
+extern const u8 gFacilityClassToPicIndex[];
 
 extern void sub_8172EF0(u8 bank, struct Pokemon *mon);
 extern void sub_806A068(u16, u8);
@@ -1280,17 +1280,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
             || (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_LEAF_GREEN)
             {
                 if (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender != 0)
-                    trainerPicId = gUnknown_0831F578[0x4F];
+                    trainerPicId = gFacilityClassToPicIndex[0x4F];
                 else
-                    trainerPicId = gUnknown_0831F578[0x4E];
+                    trainerPicId = gFacilityClassToPicIndex[0x4E];
             }
             else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_RUBY
                      || (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_SAPPHIRE)
             {
                 if (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender != 0)
-                    trainerPicId = gUnknown_0831F578[0x51];
+                    trainerPicId = gFacilityClassToPicIndex[0x51];
                 else
-                    trainerPicId = gUnknown_0831F578[0x50];
+                    trainerPicId = gFacilityClassToPicIndex[0x50];
             }
             else
             {
@@ -1309,17 +1309,17 @@ static void LinkOpponentHandleDrawTrainerPic(void)
                  || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN)
         {
             if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
-                trainerPicId = gUnknown_0831F578[0x4F];
+                trainerPicId = gFacilityClassToPicIndex[0x4F];
             else
-                trainerPicId = gUnknown_0831F578[0x4E];
+                trainerPicId = gFacilityClassToPicIndex[0x4E];
         }
         else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_RUBY
                  || (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_SAPPHIRE)
         {
             if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
-                trainerPicId = gUnknown_0831F578[0x51];
+                trainerPicId = gFacilityClassToPicIndex[0x51];
             else
-                trainerPicId = gUnknown_0831F578[0x50];
+                trainerPicId = gFacilityClassToPicIndex[0x50];
         }
         else
         {
diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index d549856f2..076a4d342 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -19,7 +19,7 @@ extern const union AffineAnimCmd *const gUnknown_082FF694[];
 extern const union AnimCmd *const gUnknown_082FF70C[];
 extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[NUM_SPECIES];
 extern const union AnimCmd *const *const gUnknown_0830536C[];
-extern const u8 gUnknown_0831F578[];
+extern const u8 gFacilityClassToPicIndex[];
 
 // Static type declarations
 
@@ -421,9 +421,9 @@ u8 sub_818D97C(u8 a0, u8 a1)
         switch (a0)
         {
             default:
-                return gUnknown_0831F578[0x3F];
+                return gFacilityClassToPicIndex[0x3F];
             case 0:
-                return gUnknown_0831F578[0x3C];
+                return gFacilityClassToPicIndex[0x3C];
         }
     }
     return a0;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c7976fc2a..b4cdcc61b 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -956,11 +956,11 @@ static const u16 sRarePickupItems[] =
 	ITEM_FULL_RESTORE,
 	ITEM_ETHER,
 	ITEM_WHITE_HERB,
-	ITEM_TM44,
+	ITEM_TM44_REST,
 	ITEM_ELIXIR,
-	ITEM_TM01,
+	ITEM_TM01_FOCUS_PUNCH,
 	ITEM_LEFTOVERS,
-	ITEM_TM26,
+	ITEM_TM26_EARTHQUAKE,
 };
 
 static const u8 sPickupProbabilities[] =
diff --git a/src/daycare.c b/src/daycare.c
index 59ee562bd..346241a42 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -413,7 +413,7 @@ static u16 GetEggSpecies(u16 species)
         {
             for (k = 0; k < EVOS_PER_MON; k++)
             {
-                if (gEvolutionTable[j].evolutions[k].targetSpecies == species)
+                if (gEvolutionTable[j][k].targetSpecies == species)
                 {
                     species = j;
                     found = TRUE;
@@ -694,7 +694,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
         {
             for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++)
             {
-                if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01 + j) && CanMonLearnTMHM(egg, j))
+                if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j))
                 {
                     if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff)
                         DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index cbd37be52..ec99fb030 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -113,7 +113,7 @@ static const u16 sUnknown_085B5884[] = INCBIN_U16("graphics/evolution_scene/tran
 
 static const u8 Text_ShedinjaJapaneseName[] = _("ヌケニン");
 
-static const u8 sUnknown_085B58C9[][4] = 
+static const u8 sUnknown_085B58C9[][4] =
 {
     { 0x00, 0x0C, 0x01, 0x06 },
     { 0x0D, 0x24, 0x05, 0x02 },
@@ -575,16 +575,16 @@ static void CB2_TradeEvolutionSceneUpdate(void)
 static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
 {
     u32 data = 0;
-    if (gEvolutionTable[preEvoSpecies].evolutions[0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < 6)
+    if (gEvolutionTable[preEvoSpecies][0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < 6)
     {
         s32 i;
-        struct Pokemon* Shedinja = &gPlayerParty[gPlayerPartyCount];
-        const struct EvolutionData* evoTable;
-        const struct EvolutionData* evos;
+        struct Pokemon* shedinja = &gPlayerParty[gPlayerPartyCount];
+        const struct Evolution *evos;
+        const struct Evolution *evos2;
 
         CopyMon(&gPlayerParty[gPlayerPartyCount], mon, sizeof(struct Pokemon));
-        SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, (&gEvolutionTable[preEvoSpecies].evolutions[1].targetSpecies));
-        SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_NICKNAME, (gSpeciesNames[gEvolutionTable[preEvoSpecies].evolutions[1].targetSpecies]));
+        SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, (&gEvolutionTable[preEvoSpecies][1].targetSpecies));
+        SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_NICKNAME, (gSpeciesNames[gEvolutionTable[preEvoSpecies][1].targetSpecies]));
         SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_HELD_ITEM, (&data));
         SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MARKINGS, (&data));
         SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_10, (&data));
@@ -602,15 +602,16 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
         CalculatePlayerPartyCount();
 
         // can't match it otherwise, ehh
-        evoTable = gEvolutionTable;
-        evos = evoTable + preEvoSpecies;
-        GetSetPokedexFlag(SpeciesToNationalPokedexNum(evos->evolutions[1].targetSpecies), FLAG_SET_SEEN);
-        GetSetPokedexFlag(SpeciesToNationalPokedexNum(evos->evolutions[1].targetSpecies), FLAG_SET_CAUGHT);
+        evos2 = gEvolutionTable[0];
+        evos = evos2 + EVOS_PER_MON * preEvoSpecies;
 
-        if (GetMonData(Shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA
-            && GetMonData(Shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE
+        GetSetPokedexFlag(SpeciesToNationalPokedexNum(evos[1].targetSpecies), FLAG_SET_SEEN);
+        GetSetPokedexFlag(SpeciesToNationalPokedexNum(evos[1].targetSpecies), FLAG_SET_CAUGHT);
+
+        if (GetMonData(shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA
+            && GetMonData(shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE
             && GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NINJASK)
-                SetMonData(Shedinja, MON_DATA_NICKNAME, Text_ShedinjaJapaneseName);
+                SetMonData(shedinja, MON_DATA_NICKNAME, Text_ShedinjaJapaneseName);
     }
 }
 
diff --git a/src/item_use.c b/src/item_use.c
index 8fe705a50..81a9fadf4 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -379,12 +379,12 @@ bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId)
             newDistanceX = distanceX - x;
             distanceY = (u16)events->bgEvents[i].y + 7;
             newDistanceY = distanceY - y;
-            
+
             if ((u16)(newDistanceX + 7) < 15 && (newDistanceY >= -5) && (newDistanceY < 6))
                 sub_80FD8E0(taskId, newDistanceX, newDistanceY);
         }
     }
-    
+
     sub_80FD7C8(taskId);
     if (gTasks[taskId].data[2] == TRUE)
         return TRUE;
@@ -929,7 +929,7 @@ void ItemUseOutOfBattle_RareCandy(u8 taskId)
 
 void ItemUseOutOfBattle_TMHM(u8 taskId)
 {
-    if (gSpecialVar_ItemId >= ITEM_HM01)
+    if (gSpecialVar_ItemId >= ITEM_HM01_CUT)
         DisplayItemMessage(taskId, 1, gText_BootedUpHM, sub_80FDF90); // HM
     else
         DisplayItemMessage(taskId, 1, gText_BootedUpTM, sub_80FDF90); // TM
@@ -992,7 +992,7 @@ void ItemUseOutOfBattle_Repel(u8 taskId)
 void sub_80FE124(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    
+
     if (++data[8] > 7)
     {
         data[8] = 0;
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index 98a35454f..26d66162f 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -2,7 +2,11 @@
 #include "pokemon.h"
 #include "random.h"
 #include "main.h"
+#include "constants/species.h"
+#include "constants/abilities.h"
 #include "constants/items.h"
+#include "constants/trainers.h"
+#include "constants/moves.h"
 #include "string_util.h"
 #include "text.h"
 
@@ -14,6 +18,57 @@
 
 extern u8 sav1_map_get_name(void);
 
+// const rom data
+const struct SpindaSpot gSpindaSpotGraphics[] =
+{
+    {16, 7, INCBIN_U16("graphics/spinda_spots/spot_0.bin")},
+    {40, 8, INCBIN_U16("graphics/spinda_spots/spot_1.bin")},
+    {22, 25, INCBIN_U16("graphics/spinda_spots/spot_2.bin")},
+    {34, 26, INCBIN_U16("graphics/spinda_spots/spot_3.bin")}
+};
+
+#include "data/pokemon/item_effects.h"
+
+const s8 gNatureStatTable[][5] =
+{
+    // Atk Def Spd Sp.Atk Sp.Def
+    {    0,  0,  0,     0,     0}, // Hardy
+    {   +1, -1,  0,     0,     0}, // Lonely
+    {   +1,  0, -1,     0,     0}, // Brave
+    {   +1,  0,  0,    -1,     0}, // Adamant
+    {   +1,  0,  0,     0,    -1}, // Naughty
+    {   -1, +1,  0,     0,     0}, // Bold
+    {    0,  0,  0,     0,     0}, // Docile
+    {    0, +1, -1,     0,     0}, // Relaxed
+    {    0, +1,  0,    -1,     0}, // Impish
+    {    0, +1,  0,     0,    -1}, // Lax
+    {   -1,  0, +1,     0,     0}, // Timid
+    {    0, -1, +1,     0,     0}, // Hasty
+    {    0,  0,  0,     0,     0}, // Serious
+    {    0,  0, +1,    -1,     0}, // Jolly
+    {    0,  0, +1,     0,    -1}, // Naive
+    {   -1,  0,  0,    +1,     0}, // Modest
+    {    0, -1,  0,    +1,     0}, // Mild
+    {    0,  0, -1,    +1,     0}, // Quiet
+    {    0,  0,  0,     0,     0}, // Bashful
+    {    0,  0,  0,    +1,    -1}, // Rash
+    {   -1,  0,  0,     0,    +1}, // Calm
+    {    0, -1,  0,     0,    +1}, // Gentle
+    {    0,  0, -1,     0,    +1}, // Sassy
+    {    0,  0,  0,    -1,    +1}, // Careful
+    {    0,  0,  0,     0,     0}, // Quirky
+};
+
+#include "data/pokemon/tmhm_learnsets.h"
+#include "data/pokemon/trainer_class_lookups.h"
+#include "data/pokemon/cry_ids.h"
+#include "data/pokemon/experience_tables.h"
+#include "data/pokemon/base_stats.h"
+#include "data/pokemon/level_up_learnsets.h"
+#include "data/pokemon/evolution.h"
+#include "data/pokemon/level_up_learnset_pointers.h"
+
+// code
 void ZeroBoxMonData(struct BoxPokemon *boxMon)
 {
     u8 *raw = (u8 *)boxMon;
@@ -43,14 +98,14 @@ void ZeroMonData(struct Pokemon *mon)
 void ZeroPlayerPartyMons(void)
 {
     s32 i;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
         ZeroMonData(&gPlayerParty[i]);
 }
 
 void ZeroEnemyPartyMons(void)
 {
     s32 i;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
         ZeroMonData(&gEnemyParty[i]);
 }
 
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index db176e025..67d82fa82 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -1222,20 +1222,20 @@ void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord)
     }
 }
 
-extern const u8 gUnknown_0831F578[];
-extern const u8 gTrainerClassToNameIndex[];
+extern const u8 gFacilityClassToPicIndex[];
+extern const u8 gFacilityClassToTrainerClass[];
 extern const u8 gSecretBaseTrainerClasses[][5];
 
 u8 GetSecretBaseTrainerPicIndex(void)
 {
     u8 trainerClass = gSecretBaseTrainerClasses[gBattleResources->secretBase->gender][gBattleResources->secretBase->trainerId[0] % 5];
-    return gUnknown_0831F578[trainerClass];
+    return gFacilityClassToPicIndex[trainerClass];
 }
 
 u8 GetSecretBaseTrainerNameIndex(void)
 {
     u8 trainerClass = gSecretBaseTrainerClasses[gBattleResources->secretBase->gender][gBattleResources->secretBase->trainerId[0] % 5];
-    return gTrainerClassToNameIndex[trainerClass];
+    return gFacilityClassToTrainerClass[trainerClass];
 }
 
 bool8 IsPlayerPartyAndPokemonStorageFull(void)
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 7ffb2f36a..1816c4a15 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -301,56 +301,56 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem)
 
         for (i = 0; i < 5; i++)
         {
-            switch (gEvolutionTable[species].evolutions[i].method)
+            switch (gEvolutionTable[species][i].method)
             {
             case EVO_FRIENDSHIP:
                 if (friendship >= 220)
-                    targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                    targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_FRIENDSHIP_DAY:
                 RtcCalcLocalTime();
                 if (gLocalTime.hours >= 12 && gLocalTime.hours < 24 && friendship >= 220)
-                    targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                    targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_FRIENDSHIP_NIGHT:
                 RtcCalcLocalTime();
                 if (gLocalTime.hours >= 0 && gLocalTime.hours < 12 && friendship >= 220)
-                    targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                    targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_LEVEL:
-                if (gEvolutionTable[species].evolutions[i].param <= level)
-                    targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                if (gEvolutionTable[species][i].param <= level)
+                    targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_LEVEL_ATK_GT_DEF:
-                if (gEvolutionTable[species].evolutions[i].param <= level)
+                if (gEvolutionTable[species][i].param <= level)
                     if (GetMonData(mon, MON_DATA_ATK, 0) > GetMonData(mon, MON_DATA_DEF, 0))
-                        targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                        targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_LEVEL_ATK_EQ_DEF:
-                if (gEvolutionTable[species].evolutions[i].param <= level)
+                if (gEvolutionTable[species][i].param <= level)
                     if (GetMonData(mon, MON_DATA_ATK, 0) == GetMonData(mon, MON_DATA_DEF, 0))
-                        targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                        targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_LEVEL_ATK_LT_DEF:
-                if (gEvolutionTable[species].evolutions[i].param <= level)
+                if (gEvolutionTable[species][i].param <= level)
                     if (GetMonData(mon, MON_DATA_ATK, 0) < GetMonData(mon, MON_DATA_DEF, 0))
-                        targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                        targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_LEVEL_SILCOON:
-                if (gEvolutionTable[species].evolutions[i].param <= level && (upperPersonality % 10) <= 4)
-                    targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                if (gEvolutionTable[species][i].param <= level && (upperPersonality % 10) <= 4)
+                    targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_LEVEL_CASCOON:
-                if (gEvolutionTable[species].evolutions[i].param <= level && (upperPersonality % 10) > 4)
-                    targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                if (gEvolutionTable[species][i].param <= level && (upperPersonality % 10) > 4)
+                    targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_LEVEL_NINJASK:
-                if (gEvolutionTable[species].evolutions[i].param <= level)
-                    targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                if (gEvolutionTable[species][i].param <= level)
+                    targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_BEAUTY:
-                if (gEvolutionTable[species].evolutions[i].param <= beauty)
-                    targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                if (gEvolutionTable[species][i].param <= beauty)
+                    targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             }
         }
@@ -358,17 +358,17 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem)
     case 1:
         for (i = 0; i < 5; i++)
         {
-            switch (gEvolutionTable[species].evolutions[i].method)
+            switch (gEvolutionTable[species][i].method)
             {
             case EVO_TRADE:
-                targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             case EVO_TRADE_ITEM:
-                if (gEvolutionTable[species].evolutions[i].param == heldItem)
+                if (gEvolutionTable[species][i].param == heldItem)
                 {
                     heldItem = 0;
                     SetMonData(mon, MON_DATA_HELD_ITEM, (u8 *)&heldItem);
-                    targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                    targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 }
                 break;
             }
@@ -378,10 +378,10 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem)
     case 3:
         for (i = 0; i < 5; i++)
         {
-            if (gEvolutionTable[species].evolutions[i].method == EVO_ITEM
-             && gEvolutionTable[species].evolutions[i].param == evolutionItem)
+            if (gEvolutionTable[species][i].method == EVO_ITEM
+             && gEvolutionTable[species][i].param == evolutionItem)
             {
-                targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies;
+                targetSpecies = gEvolutionTable[species][i].targetSpecies;
                 break;
             }
         }
@@ -1652,11 +1652,11 @@ u8 sub_806EF84(u8 arg0, u8 arg1)
     return i;
 }
 
-extern const u8 gUnknown_0831F578[];
+extern const u8 gFacilityClassToPicIndex[];
 
 u16 sub_806EFF0(u16 arg0)
 {
-    return gUnknown_0831F578[arg0];
+    return gFacilityClassToPicIndex[arg0];
 }
 
 u16 PlayerGenderToFrontTrainerPicId(u8 playerGender)
-- 
cgit v1.2.3


From e6eae224fc417eae336aaa90bb3650b3b67cfc3f Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 5 Feb 2018 17:56:28 +0100
Subject: mon ewram data to c

---
 src/pokemon_1.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index 26d66162f..cafd86c07 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -18,7 +18,18 @@
 
 extern u8 sav1_map_get_name(void);
 
+// EWRAM vars
+EWRAM_DATA u8 sLearningMoveTableID = 0;
+EWRAM_DATA u8 gPlayerPartyCount = 0;
+EWRAM_DATA u8 gEnemyPartyCount = 0;
+EWRAM_DATA struct Pokemon gPlayerParty[PARTY_SIZE] = {0};
+EWRAM_DATA struct Pokemon gEnemyParty[PARTY_SIZE] = {0};
+
 // const rom data
+const u16 gSpeciesToHoennPokedexNum[] = {203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 156, 157, 112, 113, 227, 228, 229, 230, 231, 232, 233, 234, 153, 154, 138, 139, 63, 64, 88, 89, 90, 235, 236, 237, 238, 239, 240, 241, 242, 158, 159, 243, 244, 245, 246, 247, 248, 249, 39, 40, 41, 73, 74, 75, 250, 251, 252, 66, 67, 57, 58, 59, 253, 254, 255, 256, 82, 83, 257, 92, 93, 258, 259, 106, 107, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 84, 85, 270, 271, 272, 273, 274, 275, 276, 108, 109, 169, 170, 277, 278, 279, 184, 185, 50, 51, 143, 144, 280, 281, 282, 283, 284, 167, 285, 52, 53, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 65, 181, 182, 155, 324, 137, 325, 326, 162, 163, 327, 328, 329, 91, 55, 56, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 161, 164, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 168, 357, 358, 359, 103, 104, 360, 361, 180, 362, 363, 364, 365, 115, 366, 367, 186, 165, 166, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 42, 43, 44, 25, 26, 34, 35, 114, 27, 28, 32, 33, 99, 100, 61, 62, 145, 131, 132, 60, 105, 68, 127, 128, 183, 129, 130, 140, 141, 97, 98, 116, 117, 118, 48, 49, 78, 79, 101, 102, 173, 174, 175, 119, 120, 171, 172, 125, 126, 54, 110, 111, 80, 81, 69, 76, 77, 121, 122, 160, 148, 149, 94, 36, 37, 38, 95, 96, 150, 45, 46, 47, 176, 177, 178, 152, 146, 147, 124, 123, 179, 70, 71, 72, 142, 86, 87, 133, 134, 135, 136, 29, 30, 31, 187, 188, 189, 190, 191, 192, 193, 194, 195, 198, 199, 200, 196, 197, 201, 202, 151};
+const u16 gSpeciesToNationalPokedexNum[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 290, 291, 292, 276, 277, 285, 286, 327, 278, 279, 283, 284, 320, 321, 300, 301, 352, 343, 344, 299, 324, 302, 339, 340, 370, 341, 342, 349, 350, 318, 319, 328, 329, 330, 296, 297, 309, 310, 322, 323, 363, 364, 365, 331, 332, 361, 362, 337, 338, 298, 325, 326, 311, 312, 303, 307, 308, 333, 334, 360, 355, 356, 315, 287, 288, 289, 316, 317, 357, 293, 294, 295, 366, 367, 368, 359, 353, 354, 336, 335, 369, 304, 305, 306, 351, 313, 314, 345, 346, 347, 348, 280, 281, 282, 371, 372, 373, 374, 375, 376, 377, 378, 379, 382, 383, 384, 380, 381, 385, 386, 358};
+const u16 gHoennToNationalOrder[] = {252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 63, 64, 65, 290, 291, 292, 293, 294, 295, 296, 297, 118, 119, 129, 130, 298, 183, 184, 74, 75, 76, 299, 300, 301, 41, 42, 169, 72, 73, 302, 303, 304, 305, 306, 66, 67, 68, 307, 308, 309, 310, 311, 312, 81, 82, 100, 101, 313, 314, 43, 44, 45, 182, 84, 85, 315, 316, 317, 318, 319, 320, 321, 322, 323, 218, 219, 324, 88, 89, 109, 110, 325, 326, 27, 28, 327, 227, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 174, 39, 40, 349, 350, 351, 120, 121, 352, 353, 354, 355, 356, 357, 358, 359, 37, 38, 172, 25, 26, 54, 55, 360, 202, 177, 178, 203, 231, 232, 127, 214, 111, 112, 361, 362, 363, 364, 365, 366, 367, 368, 369, 222, 170, 171, 370, 116, 117, 230, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 46, 47, 48, 49, 50, 51, 52, 53, 56, 57, 58, 59, 60, 61, 62, 69, 70, 71, 77, 78, 79, 80, 83, 86, 87, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 102, 103, 104, 105, 106, 107, 108, 113, 114, 115, 122, 123, 124, 125, 126, 128, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 173, 175, 176, 179, 180, 181, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 215, 216, 217, 220, 221, 223, 224, 225, 226, 228, 229, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411};
+
 const struct SpindaSpot gSpindaSpotGraphics[] =
 {
     {16, 7, INCBIN_U16("graphics/spinda_spots/spot_0.bin")},
-- 
cgit v1.2.3


From 541fef5368c334559cba946f61ab3fe08bf1575b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 5 Feb 2018 22:27:29 +0100
Subject: move wild data to C

---
 src/wild_encounter.c | 4565 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 4558 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 705c4416c..279b6e672 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -19,16 +19,12 @@
 #include "link.h"
 #include "script.h"
 #include "constants/items.h"
+#include "constants/maps.h"
 
 extern const u8 EventScript_RepelWoreOff[];
 
 #define NUM_FEEBAS_SPOTS    6
 
-extern const u16 gRoute119WaterTileData[];
-extern const struct WildPokemonHeader gBattlePikeWildMonHeaders[];
-extern const struct WildPokemonHeader gBattlePyramidWildMonHeaders[];
-extern const struct WildPokemon gWildFeebasRoute119Data;
-
 extern u8 GetBattlePikeWildMonHeaderId(void);
 extern bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate);
 extern void GenerateBattlePyramidWildMon(void);
@@ -44,9 +40,4564 @@ static void ApplyCleanseTagEncounterRateMod(u32 *encRate);
 static bool8 TryGetAbilityInfluencedWildMonIndex(const struct WildPokemon *wildMon, u8 type, u8 ability, u8 *monIndex);
 static bool8 IsAbilityAllowingEncounter(u8 level);
 
-EWRAM_DATA u8 sWildEncountersDisabled = 0;
-EWRAM_DATA u32 sFeebasRngValue = 0;
+// EWRAM vars
+EWRAM_DATA static u8 sWildEncountersDisabled = 0;
+EWRAM_DATA static u32 sFeebasRngValue = 0;
+
+// const rom data
+const struct WildPokemon gRoute101_LandMons[] =
+{
+	{2, 2, SPECIES_WURMPLE},
+	{2, 2, SPECIES_POOCHYENA},
+	{2, 2, SPECIES_WURMPLE},
+	{3, 3, SPECIES_WURMPLE},
+	{3, 3, SPECIES_POOCHYENA},
+	{3, 3, SPECIES_POOCHYENA},
+	{3, 3, SPECIES_WURMPLE},
+	{3, 3, SPECIES_POOCHYENA},
+	{2, 2, SPECIES_ZIGZAGOON},
+	{2, 2, SPECIES_ZIGZAGOON},
+	{3, 3, SPECIES_ZIGZAGOON},
+	{3, 3, SPECIES_ZIGZAGOON},
+};
+
+const struct WildPokemonInfo gRoute101_LandMonsInfo = {20, gRoute101_LandMons};
+
+const struct WildPokemon gRoute102_LandMons[] =
+{
+	{3, 3, SPECIES_POOCHYENA},
+	{3, 3, SPECIES_WURMPLE},
+	{4, 4, SPECIES_POOCHYENA},
+	{4, 4, SPECIES_WURMPLE},
+	{3, 3, SPECIES_LOTAD},
+	{4, 4, SPECIES_LOTAD},
+	{3, 3, SPECIES_ZIGZAGOON},
+	{3, 3, SPECIES_ZIGZAGOON},
+	{4, 4, SPECIES_ZIGZAGOON},
+	{4, 4, SPECIES_RALTS},
+	{4, 4, SPECIES_ZIGZAGOON},
+	{3, 3, SPECIES_SEEDOT},
+};
+
+const struct WildPokemonInfo gRoute102_LandMonsInfo = {20, gRoute102_LandMons};
+
+const struct WildPokemon gRoute102_WaterMons[] =
+{
+	{20, 30, SPECIES_MARILL},
+	{10, 20, SPECIES_MARILL},
+	{30, 35, SPECIES_MARILL},
+	{5, 10, SPECIES_MARILL},
+	{20, 30, SPECIES_GOLDEEN},
+};
+
+const struct WildPokemonInfo gRoute102_WaterMonsInfo = {4, gRoute102_WaterMons};
+
+const struct WildPokemon gRoute102_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_CORPHISH},
+	{25, 30, SPECIES_CORPHISH},
+	{30, 35, SPECIES_CORPHISH},
+	{20, 25, SPECIES_CORPHISH},
+	{35, 40, SPECIES_CORPHISH},
+	{40, 45, SPECIES_CORPHISH},
+};
+
+const struct WildPokemonInfo gRoute102_FishingMonsInfo = {30, gRoute102_FishingMons};
+
+const struct WildPokemon gRoute103_LandMons[] =
+{
+	{2, 2, SPECIES_POOCHYENA},
+	{3, 3, SPECIES_POOCHYENA},
+	{3, 3, SPECIES_POOCHYENA},
+	{4, 4, SPECIES_POOCHYENA},
+	{2, 2, SPECIES_WINGULL},
+	{3, 3, SPECIES_ZIGZAGOON},
+	{3, 3, SPECIES_ZIGZAGOON},
+	{4, 4, SPECIES_ZIGZAGOON},
+	{3, 3, SPECIES_WINGULL},
+	{3, 3, SPECIES_WINGULL},
+	{2, 2, SPECIES_WINGULL},
+	{4, 4, SPECIES_WINGULL},
+};
+
+const struct WildPokemonInfo gRoute103_LandMonsInfo = {20, gRoute103_LandMons};
+
+const struct WildPokemon gRoute103_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute103_WaterMonsInfo = {4, gRoute103_WaterMons};
+
+const struct WildPokemon gRoute103_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute103_FishingMonsInfo = {30, gRoute103_FishingMons};
+
+const struct WildPokemon gRoute104_LandMons[] =
+{
+	{4, 4, SPECIES_POOCHYENA},
+	{4, 4, SPECIES_WURMPLE},
+	{5, 5, SPECIES_POOCHYENA},
+	{5, 5, SPECIES_MARILL},
+	{4, 4, SPECIES_MARILL},
+	{5, 5, SPECIES_POOCHYENA},
+	{4, 4, SPECIES_TAILLOW},
+	{5, 5, SPECIES_TAILLOW},
+	{4, 4, SPECIES_WINGULL},
+	{4, 4, SPECIES_WINGULL},
+	{3, 3, SPECIES_WINGULL},
+	{5, 5, SPECIES_WINGULL},
+};
+
+const struct WildPokemonInfo gRoute104_LandMonsInfo = {20, gRoute104_LandMons};
+
+const struct WildPokemon gRoute104_WaterMons[] =
+{
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute104_WaterMonsInfo = {4, gRoute104_WaterMons};
+
+const struct WildPokemon gRoute104_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_MAGIKARP},
+	{25, 30, SPECIES_MAGIKARP},
+	{30, 35, SPECIES_MAGIKARP},
+	{20, 25, SPECIES_MAGIKARP},
+	{35, 40, SPECIES_MAGIKARP},
+	{40, 45, SPECIES_MAGIKARP},
+};
+
+const struct WildPokemonInfo gRoute104_FishingMonsInfo = {30, gRoute104_FishingMons};
+
+const struct WildPokemon gRoute105_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute105_WaterMonsInfo = {4, gRoute105_WaterMons};
+
+const struct WildPokemon gRoute105_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute105_FishingMonsInfo = {30, gRoute105_FishingMons};
+
+const struct WildPokemon gRoute110_LandMons[] =
+{
+	{12, 12, SPECIES_POOCHYENA},
+	{12, 12, SPECIES_ELECTRIKE},
+	{12, 12, SPECIES_GULPIN},
+	{13, 13, SPECIES_ELECTRIKE},
+	{13, 13, SPECIES_MINUN},
+	{13, 13, SPECIES_ODDISH},
+	{13, 13, SPECIES_MINUN},
+	{13, 13, SPECIES_GULPIN},
+	{12, 12, SPECIES_WINGULL},
+	{12, 12, SPECIES_WINGULL},
+	{12, 12, SPECIES_PLUSLE},
+	{13, 13, SPECIES_PLUSLE},
+};
+
+const struct WildPokemonInfo gRoute110_LandMonsInfo = {20, gRoute110_LandMons};
+
+const struct WildPokemon gRoute110_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute110_WaterMonsInfo = {4, gRoute110_WaterMons};
+
+const struct WildPokemon gRoute110_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute110_FishingMonsInfo = {30, gRoute110_FishingMons};
+
+const struct WildPokemon gRoute111_LandMons[] =
+{
+	{20, 20, SPECIES_SANDSHREW},
+	{20, 20, SPECIES_TRAPINCH},
+	{21, 21, SPECIES_SANDSHREW},
+	{21, 21, SPECIES_TRAPINCH},
+	{19, 19, SPECIES_BALTOY},
+	{21, 21, SPECIES_BALTOY},
+	{19, 19, SPECIES_SANDSHREW},
+	{19, 19, SPECIES_TRAPINCH},
+	{20, 20, SPECIES_BALTOY},
+	{20, 20, SPECIES_CACNEA},
+	{22, 22, SPECIES_CACNEA},
+	{22, 22, SPECIES_CACNEA},
+};
+
+const struct WildPokemonInfo gRoute111_LandMonsInfo = {10, gRoute111_LandMons};
+
+const struct WildPokemon gRoute111_WaterMons[] =
+{
+	{20, 30, SPECIES_MARILL},
+	{10, 20, SPECIES_MARILL},
+	{30, 35, SPECIES_MARILL},
+	{5, 10, SPECIES_MARILL},
+	{20, 30, SPECIES_GOLDEEN},
+};
+
+const struct WildPokemonInfo gRoute111_WaterMonsInfo = {4, gRoute111_WaterMons};
+
+const struct WildPokemon gRoute111_RockSmashMons[] =
+{
+	{10, 15, SPECIES_GEODUDE},
+	{5, 10, SPECIES_GEODUDE},
+	{15, 20, SPECIES_GEODUDE},
+	{15, 20, SPECIES_GEODUDE},
+	{15, 20, SPECIES_GEODUDE},
+};
+
+const struct WildPokemonInfo gRoute111_RockSmashMonsInfo = {20, gRoute111_RockSmashMons};
+
+const struct WildPokemon gRoute111_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_BARBOACH},
+	{25, 30, SPECIES_BARBOACH},
+	{30, 35, SPECIES_BARBOACH},
+	{20, 25, SPECIES_BARBOACH},
+	{35, 40, SPECIES_BARBOACH},
+	{40, 45, SPECIES_BARBOACH},
+};
+
+const struct WildPokemonInfo gRoute111_FishingMonsInfo = {30, gRoute111_FishingMons};
+
+const struct WildPokemon gRoute112_LandMons[] =
+{
+	{15, 15, SPECIES_NUMEL},
+	{15, 15, SPECIES_NUMEL},
+	{15, 15, SPECIES_MARILL},
+	{14, 14, SPECIES_NUMEL},
+	{14, 14, SPECIES_NUMEL},
+	{14, 14, SPECIES_MARILL},
+	{16, 16, SPECIES_NUMEL},
+	{16, 16, SPECIES_MARILL},
+	{16, 16, SPECIES_NUMEL},
+	{16, 16, SPECIES_NUMEL},
+	{16, 16, SPECIES_NUMEL},
+	{16, 16, SPECIES_NUMEL},
+};
+
+const struct WildPokemonInfo gRoute112_LandMonsInfo = {20, gRoute112_LandMons};
+
+const struct WildPokemon gRoute113_LandMons[] =
+{
+	{15, 15, SPECIES_SPINDA},
+	{15, 15, SPECIES_SPINDA},
+	{15, 15, SPECIES_SLUGMA},
+	{14, 14, SPECIES_SPINDA},
+	{14, 14, SPECIES_SPINDA},
+	{14, 14, SPECIES_SLUGMA},
+	{16, 16, SPECIES_SPINDA},
+	{16, 16, SPECIES_SLUGMA},
+	{16, 16, SPECIES_SPINDA},
+	{16, 16, SPECIES_SKARMORY},
+	{16, 16, SPECIES_SPINDA},
+	{16, 16, SPECIES_SKARMORY},
+};
+
+const struct WildPokemonInfo gRoute113_LandMonsInfo = {20, gRoute113_LandMons};
+
+const struct WildPokemon gRoute114_LandMons[] =
+{
+	{16, 16, SPECIES_SWABLU},
+	{16, 16, SPECIES_LOTAD},
+	{17, 17, SPECIES_SWABLU},
+	{15, 15, SPECIES_SWABLU},
+	{15, 15, SPECIES_LOTAD},
+	{16, 16, SPECIES_LOMBRE},
+	{16, 16, SPECIES_LOMBRE},
+	{18, 18, SPECIES_LOMBRE},
+	{17, 17, SPECIES_SEVIPER},
+	{15, 15, SPECIES_SEVIPER},
+	{17, 17, SPECIES_SEVIPER},
+	{15, 15, SPECIES_NUZLEAF},
+};
+
+const struct WildPokemonInfo gRoute114_LandMonsInfo = {20, gRoute114_LandMons};
+
+const struct WildPokemon gRoute114_WaterMons[] =
+{
+	{20, 30, SPECIES_MARILL},
+	{10, 20, SPECIES_MARILL},
+	{30, 35, SPECIES_MARILL},
+	{5, 10, SPECIES_MARILL},
+	{20, 30, SPECIES_GOLDEEN},
+};
+
+const struct WildPokemonInfo gRoute114_WaterMonsInfo = {4, gRoute114_WaterMons};
+
+const struct WildPokemon gRoute114_RockSmashMons[] =
+{
+	{10, 15, SPECIES_GEODUDE},
+	{5, 10, SPECIES_GEODUDE},
+	{15, 20, SPECIES_GEODUDE},
+	{15, 20, SPECIES_GEODUDE},
+	{15, 20, SPECIES_GEODUDE},
+};
+
+const struct WildPokemonInfo gRoute114_RockSmashMonsInfo = {20, gRoute114_RockSmashMons};
+
+const struct WildPokemon gRoute114_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_BARBOACH},
+	{25, 30, SPECIES_BARBOACH},
+	{30, 35, SPECIES_BARBOACH},
+	{20, 25, SPECIES_BARBOACH},
+	{35, 40, SPECIES_BARBOACH},
+	{40, 45, SPECIES_BARBOACH},
+};
+
+const struct WildPokemonInfo gRoute114_FishingMonsInfo = {30, gRoute114_FishingMons};
+
+const struct WildPokemon gRoute116_LandMons[] =
+{
+	{6, 6, SPECIES_POOCHYENA},
+	{6, 6, SPECIES_WHISMUR},
+	{6, 6, SPECIES_NINCADA},
+	{7, 7, SPECIES_ABRA},
+	{7, 7, SPECIES_NINCADA},
+	{6, 6, SPECIES_TAILLOW},
+	{7, 7, SPECIES_TAILLOW},
+	{8, 8, SPECIES_TAILLOW},
+	{7, 7, SPECIES_POOCHYENA},
+	{8, 8, SPECIES_POOCHYENA},
+	{7, 7, SPECIES_SKITTY},
+	{8, 8, SPECIES_SKITTY},
+};
+
+const struct WildPokemonInfo gRoute116_LandMonsInfo = {20, gRoute116_LandMons};
+
+const struct WildPokemon gRoute117_LandMons[] =
+{
+	{13, 13, SPECIES_POOCHYENA},
+	{13, 13, SPECIES_ODDISH},
+	{14, 14, SPECIES_POOCHYENA},
+	{14, 14, SPECIES_ODDISH},
+	{13, 13, SPECIES_MARILL},
+	{13, 13, SPECIES_ODDISH},
+	{13, 13, SPECIES_ILLUMISE},
+	{13, 13, SPECIES_ILLUMISE},
+	{14, 14, SPECIES_ILLUMISE},
+	{14, 14, SPECIES_ILLUMISE},
+	{13, 13, SPECIES_VOLBEAT},
+	{13, 13, SPECIES_SEEDOT},
+};
+
+const struct WildPokemonInfo gRoute117_LandMonsInfo = {20, gRoute117_LandMons};
+
+const struct WildPokemon gRoute117_WaterMons[] =
+{
+	{20, 30, SPECIES_MARILL},
+	{10, 20, SPECIES_MARILL},
+	{30, 35, SPECIES_MARILL},
+	{5, 10, SPECIES_MARILL},
+	{20, 30, SPECIES_GOLDEEN},
+};
+
+const struct WildPokemonInfo gRoute117_WaterMonsInfo = {4, gRoute117_WaterMons};
+
+const struct WildPokemon gRoute117_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_CORPHISH},
+	{25, 30, SPECIES_CORPHISH},
+	{30, 35, SPECIES_CORPHISH},
+	{20, 25, SPECIES_CORPHISH},
+	{35, 40, SPECIES_CORPHISH},
+	{40, 45, SPECIES_CORPHISH},
+};
+
+const struct WildPokemonInfo gRoute117_FishingMonsInfo = {30, gRoute117_FishingMons};
+
+const struct WildPokemon gRoute118_LandMons[] =
+{
+	{24, 24, SPECIES_ZIGZAGOON},
+	{24, 24, SPECIES_ELECTRIKE},
+	{26, 26, SPECIES_ZIGZAGOON},
+	{26, 26, SPECIES_ELECTRIKE},
+	{26, 26, SPECIES_LINOONE},
+	{26, 26, SPECIES_MANECTRIC},
+	{25, 25, SPECIES_WINGULL},
+	{25, 25, SPECIES_WINGULL},
+	{26, 26, SPECIES_WINGULL},
+	{26, 26, SPECIES_WINGULL},
+	{27, 27, SPECIES_WINGULL},
+	{25, 25, SPECIES_KECLEON},
+};
+
+const struct WildPokemonInfo gRoute118_LandMonsInfo = {20, gRoute118_LandMons};
+
+const struct WildPokemon gRoute118_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute118_WaterMonsInfo = {4, gRoute118_WaterMons};
+
+const struct WildPokemon gRoute118_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_CARVANHA},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_CARVANHA},
+	{20, 25, SPECIES_CARVANHA},
+	{35, 40, SPECIES_CARVANHA},
+	{40, 45, SPECIES_CARVANHA},
+};
+
+const struct WildPokemonInfo gRoute118_FishingMonsInfo = {30, gRoute118_FishingMons};
+
+const struct WildPokemon gRoute124_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute124_WaterMonsInfo = {4, gRoute124_WaterMons};
+
+const struct WildPokemon gRoute124_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute124_FishingMonsInfo = {30, gRoute124_FishingMons};
+
+const struct WildPokemon gPetalburgWoods_LandMons[] =
+{
+	{5, 5, SPECIES_POOCHYENA},
+	{5, 5, SPECIES_WURMPLE},
+	{5, 5, SPECIES_SHROOMISH},
+	{6, 6, SPECIES_POOCHYENA},
+	{5, 5, SPECIES_SILCOON},
+	{5, 5, SPECIES_CASCOON},
+	{6, 6, SPECIES_WURMPLE},
+	{6, 6, SPECIES_SHROOMISH},
+	{5, 5, SPECIES_TAILLOW},
+	{5, 5, SPECIES_SLAKOTH},
+	{6, 6, SPECIES_TAILLOW},
+	{6, 6, SPECIES_SLAKOTH},
+};
+
+const struct WildPokemonInfo gPetalburgWoods_LandMonsInfo = {20, gPetalburgWoods_LandMons};
+
+const struct WildPokemon gRusturfTunnel_LandMons[] =
+{
+	{6, 6, SPECIES_WHISMUR},
+	{7, 7, SPECIES_WHISMUR},
+	{6, 6, SPECIES_WHISMUR},
+	{6, 6, SPECIES_WHISMUR},
+	{7, 7, SPECIES_WHISMUR},
+	{7, 7, SPECIES_WHISMUR},
+	{5, 5, SPECIES_WHISMUR},
+	{8, 8, SPECIES_WHISMUR},
+	{5, 5, SPECIES_WHISMUR},
+	{8, 8, SPECIES_WHISMUR},
+	{5, 5, SPECIES_WHISMUR},
+	{8, 8, SPECIES_WHISMUR},
+};
+
+const struct WildPokemonInfo gRusturfTunnel_LandMonsInfo = {10, gRusturfTunnel_LandMons};
+
+const struct WildPokemon gGraniteCave_1F_LandMons[] =
+{
+	{7, 7, SPECIES_ZUBAT},
+	{8, 8, SPECIES_MAKUHITA},
+	{7, 7, SPECIES_MAKUHITA},
+	{8, 8, SPECIES_ZUBAT},
+	{9, 9, SPECIES_MAKUHITA},
+	{8, 8, SPECIES_ABRA},
+	{10, 10, SPECIES_MAKUHITA},
+	{6, 6, SPECIES_MAKUHITA},
+	{7, 7, SPECIES_GEODUDE},
+	{8, 8, SPECIES_GEODUDE},
+	{6, 6, SPECIES_GEODUDE},
+	{9, 9, SPECIES_GEODUDE},
+};
+
+const struct WildPokemonInfo gGraniteCave_1F_LandMonsInfo = {10, gGraniteCave_1F_LandMons};
+
+const struct WildPokemon gGraniteCave_B1F_LandMons[] =
+{
+	{9, 9, SPECIES_ZUBAT},
+	{10, 10, SPECIES_ARON},
+	{9, 9, SPECIES_ARON},
+	{11, 11, SPECIES_ARON},
+	{10, 10, SPECIES_ZUBAT},
+	{9, 9, SPECIES_ABRA},
+	{10, 10, SPECIES_MAKUHITA},
+	{11, 11, SPECIES_MAKUHITA},
+	{10, 10, SPECIES_SABLEYE},
+	{10, 10, SPECIES_SABLEYE},
+	{9, 9, SPECIES_SABLEYE},
+	{11, 11, SPECIES_SABLEYE},
+};
+
+const struct WildPokemonInfo gGraniteCave_B1F_LandMonsInfo = {10, gGraniteCave_B1F_LandMons};
+
+const struct WildPokemon gMtPyre_1F_LandMons[] =
+{
+	{27, 27, SPECIES_SHUPPET},
+	{28, 28, SPECIES_SHUPPET},
+	{26, 26, SPECIES_SHUPPET},
+	{25, 25, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+	{23, 23, SPECIES_SHUPPET},
+	{22, 22, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+};
+
+const struct WildPokemonInfo gMtPyre_1F_LandMonsInfo = {10, gMtPyre_1F_LandMons};
+
+const struct WildPokemon gVictoryRoad_1F_LandMons[] =
+{
+	{40, 40, SPECIES_GOLBAT},
+	{40, 40, SPECIES_HARIYAMA},
+	{40, 40, SPECIES_LAIRON},
+	{40, 40, SPECIES_LOUDRED},
+	{36, 36, SPECIES_ZUBAT},
+	{36, 36, SPECIES_MAKUHITA},
+	{38, 38, SPECIES_GOLBAT},
+	{38, 38, SPECIES_HARIYAMA},
+	{36, 36, SPECIES_ARON},
+	{36, 36, SPECIES_WHISMUR},
+	{36, 36, SPECIES_ARON},
+	{36, 36, SPECIES_WHISMUR},
+};
+
+const struct WildPokemonInfo gVictoryRoad_1F_LandMonsInfo = {10, gVictoryRoad_1F_LandMons};
+
+const struct WildPokemon gSafariZone_South_LandMons[] =
+{
+	{25, 25, SPECIES_ODDISH},
+	{27, 27, SPECIES_ODDISH},
+	{25, 25, SPECIES_GIRAFARIG},
+	{27, 27, SPECIES_GIRAFARIG},
+	{25, 25, SPECIES_NATU},
+	{25, 25, SPECIES_DODUO},
+	{25, 25, SPECIES_GLOOM},
+	{27, 27, SPECIES_WOBBUFFET},
+	{25, 25, SPECIES_PIKACHU},
+	{27, 27, SPECIES_WOBBUFFET},
+	{27, 27, SPECIES_PIKACHU},
+	{29, 29, SPECIES_WOBBUFFET},
+};
+
+const struct WildPokemonInfo gSafariZone_South_LandMonsInfo = {25, gSafariZone_South_LandMons};
+
+const struct WildPokemon gUnderwater2_WaterMons[] =
+{
+	{20, 30, SPECIES_CLAMPERL},
+	{20, 30, SPECIES_CHINCHOU},
+	{30, 35, SPECIES_CLAMPERL},
+	{30, 35, SPECIES_RELICANTH},
+	{30, 35, SPECIES_RELICANTH},
+};
+
+const struct WildPokemonInfo gUnderwater2_WaterMonsInfo = {4, gUnderwater2_WaterMons};
+
+const struct WildPokemon gAbandonedShip_Rooms_B1F_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_TENTACOOL},
+	{30, 35, SPECIES_TENTACRUEL},
+};
+
+const struct WildPokemonInfo gAbandonedShip_Rooms_B1F_WaterMonsInfo = {4, gAbandonedShip_Rooms_B1F_WaterMons};
+
+const struct WildPokemon gAbandonedShip_Rooms_B1F_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_TENTACOOL},
+	{25, 30, SPECIES_TENTACOOL},
+	{30, 35, SPECIES_TENTACOOL},
+	{30, 35, SPECIES_TENTACRUEL},
+	{25, 30, SPECIES_TENTACRUEL},
+	{20, 25, SPECIES_TENTACRUEL},
+};
+
+const struct WildPokemonInfo gAbandonedShip_Rooms_B1F_FishingMonsInfo = {20, gAbandonedShip_Rooms_B1F_FishingMons};
+
+const struct WildPokemon gGraniteCave_B2F_LandMons[] =
+{
+	{10, 10, SPECIES_ZUBAT},
+	{11, 11, SPECIES_ARON},
+	{10, 10, SPECIES_ARON},
+	{11, 11, SPECIES_ZUBAT},
+	{12, 12, SPECIES_ARON},
+	{10, 10, SPECIES_ABRA},
+	{10, 10, SPECIES_SABLEYE},
+	{11, 11, SPECIES_SABLEYE},
+	{12, 12, SPECIES_SABLEYE},
+	{10, 10, SPECIES_SABLEYE},
+	{12, 12, SPECIES_SABLEYE},
+	{10, 10, SPECIES_SABLEYE},
+};
+
+const struct WildPokemonInfo gGraniteCave_B2F_LandMonsInfo = {10, gGraniteCave_B2F_LandMons};
+
+const struct WildPokemon gGraniteCave_B2F_RockSmashMons[] =
+{
+	{10, 15, SPECIES_GEODUDE},
+	{10, 20, SPECIES_NOSEPASS},
+	{5, 10, SPECIES_GEODUDE},
+	{15, 20, SPECIES_GEODUDE},
+	{15, 20, SPECIES_GEODUDE},
+};
+
+const struct WildPokemonInfo gGraniteCave_B2F_RockSmashMonsInfo = {20, gGraniteCave_B2F_RockSmashMons};
+
+const struct WildPokemon gFieryPath_LandMons[] =
+{
+	{15, 15, SPECIES_NUMEL},
+	{15, 15, SPECIES_KOFFING},
+	{16, 16, SPECIES_NUMEL},
+	{15, 15, SPECIES_MACHOP},
+	{15, 15, SPECIES_TORKOAL},
+	{15, 15, SPECIES_SLUGMA},
+	{16, 16, SPECIES_KOFFING},
+	{16, 16, SPECIES_MACHOP},
+	{14, 14, SPECIES_TORKOAL},
+	{16, 16, SPECIES_TORKOAL},
+	{14, 14, SPECIES_GRIMER},
+	{14, 14, SPECIES_GRIMER},
+};
+
+const struct WildPokemonInfo gFieryPath_LandMonsInfo = {10, gFieryPath_LandMons};
+
+const struct WildPokemon gMeteorFalls_B1F_2R_LandMons[] =
+{
+	{33, 33, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{30, 30, SPECIES_BAGON},
+	{35, 35, SPECIES_SOLROCK},
+	{35, 35, SPECIES_BAGON},
+	{37, 37, SPECIES_SOLROCK},
+	{25, 25, SPECIES_BAGON},
+	{39, 39, SPECIES_SOLROCK},
+	{38, 38, SPECIES_GOLBAT},
+	{40, 40, SPECIES_GOLBAT},
+	{38, 38, SPECIES_GOLBAT},
+	{40, 40, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gMeteorFalls_B1F_2R_LandMonsInfo = {10, gMeteorFalls_B1F_2R_LandMons};
+
+const struct WildPokemon gMeteorFalls_B1F_2R_WaterMons[] =
+{
+	{30, 35, SPECIES_GOLBAT},
+	{30, 35, SPECIES_GOLBAT},
+	{25, 35, SPECIES_SOLROCK},
+	{15, 25, SPECIES_SOLROCK},
+	{5, 15, SPECIES_SOLROCK},
+};
+
+const struct WildPokemonInfo gMeteorFalls_B1F_2R_WaterMonsInfo = {4, gMeteorFalls_B1F_2R_WaterMons};
+
+const struct WildPokemon gMeteorFalls_B1F_2R_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_BARBOACH},
+	{25, 30, SPECIES_BARBOACH},
+	{30, 35, SPECIES_BARBOACH},
+	{30, 35, SPECIES_WHISCASH},
+	{35, 40, SPECIES_WHISCASH},
+	{40, 45, SPECIES_WHISCASH},
+};
+
+const struct WildPokemonInfo gMeteorFalls_B1F_2R_FishingMonsInfo = {30, gMeteorFalls_B1F_2R_FishingMons};
+
+const struct WildPokemon gJaggedPass_LandMons[] =
+{
+	{21, 21, SPECIES_NUMEL},
+	{21, 21, SPECIES_NUMEL},
+	{21, 21, SPECIES_MACHOP},
+	{20, 20, SPECIES_NUMEL},
+	{20, 20, SPECIES_SPOINK},
+	{20, 20, SPECIES_MACHOP},
+	{21, 21, SPECIES_SPOINK},
+	{22, 22, SPECIES_MACHOP},
+	{22, 22, SPECIES_NUMEL},
+	{22, 22, SPECIES_SPOINK},
+	{22, 22, SPECIES_NUMEL},
+	{22, 22, SPECIES_SPOINK},
+};
+
+const struct WildPokemonInfo gJaggedPass_LandMonsInfo = {20, gJaggedPass_LandMons};
+
+const struct WildPokemon gRoute106_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute106_WaterMonsInfo = {4, gRoute106_WaterMons};
+
+const struct WildPokemon gRoute106_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute106_FishingMonsInfo = {30, gRoute106_FishingMons};
+
+const struct WildPokemon gRoute107_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute107_WaterMonsInfo = {4, gRoute107_WaterMons};
+
+const struct WildPokemon gRoute107_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute107_FishingMonsInfo = {30, gRoute107_FishingMons};
+
+const struct WildPokemon gRoute108_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute108_WaterMonsInfo = {4, gRoute108_WaterMons};
+
+const struct WildPokemon gRoute108_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute108_FishingMonsInfo = {30, gRoute108_FishingMons};
+
+const struct WildPokemon gRoute109_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute109_WaterMonsInfo = {4, gRoute109_WaterMons};
+
+const struct WildPokemon gRoute109_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute109_FishingMonsInfo = {30, gRoute109_FishingMons};
+
+const struct WildPokemon gRoute115_LandMons[] =
+{
+	{23, 23, SPECIES_SWABLU},
+	{23, 23, SPECIES_TAILLOW},
+	{25, 25, SPECIES_SWABLU},
+	{24, 24, SPECIES_TAILLOW},
+	{25, 25, SPECIES_TAILLOW},
+	{25, 25, SPECIES_SWELLOW},
+	{24, 24, SPECIES_JIGGLYPUFF},
+	{25, 25, SPECIES_JIGGLYPUFF},
+	{24, 24, SPECIES_WINGULL},
+	{24, 24, SPECIES_WINGULL},
+	{26, 26, SPECIES_WINGULL},
+	{25, 25, SPECIES_WINGULL},
+};
+
+const struct WildPokemonInfo gRoute115_LandMonsInfo = {20, gRoute115_LandMons};
+
+const struct WildPokemon gRoute115_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute115_WaterMonsInfo = {4, gRoute115_WaterMons};
+
+const struct WildPokemon gRoute115_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute115_FishingMonsInfo = {30, gRoute115_FishingMons};
+
+const struct WildPokemon gNewMauville_Inside_LandMons[] =
+{
+	{24, 24, SPECIES_VOLTORB},
+	{24, 24, SPECIES_MAGNEMITE},
+	{25, 25, SPECIES_VOLTORB},
+	{25, 25, SPECIES_MAGNEMITE},
+	{23, 23, SPECIES_VOLTORB},
+	{23, 23, SPECIES_MAGNEMITE},
+	{26, 26, SPECIES_VOLTORB},
+	{26, 26, SPECIES_MAGNEMITE},
+	{22, 22, SPECIES_VOLTORB},
+	{22, 22, SPECIES_MAGNEMITE},
+	{26, 26, SPECIES_ELECTRODE},
+	{26, 26, SPECIES_MAGNETON},
+};
+
+const struct WildPokemonInfo gNewMauville_Inside_LandMonsInfo = {10, gNewMauville_Inside_LandMons};
+
+const struct WildPokemon gRoute119_LandMons[] =
+{
+	{25, 25, SPECIES_ZIGZAGOON},
+	{25, 25, SPECIES_LINOONE},
+	{27, 27, SPECIES_ZIGZAGOON},
+	{25, 25, SPECIES_ODDISH},
+	{27, 27, SPECIES_LINOONE},
+	{26, 26, SPECIES_ODDISH},
+	{27, 27, SPECIES_ODDISH},
+	{24, 24, SPECIES_ODDISH},
+	{25, 25, SPECIES_TROPIUS},
+	{26, 26, SPECIES_TROPIUS},
+	{27, 27, SPECIES_TROPIUS},
+	{25, 25, SPECIES_KECLEON},
+};
+
+const struct WildPokemonInfo gRoute119_LandMonsInfo = {15, gRoute119_LandMons};
+
+const struct WildPokemon gRoute119_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute119_WaterMonsInfo = {4, gRoute119_WaterMons};
+
+const struct WildPokemon gRoute119_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_CARVANHA},
+	{25, 30, SPECIES_CARVANHA},
+	{30, 35, SPECIES_CARVANHA},
+	{20, 25, SPECIES_CARVANHA},
+	{35, 40, SPECIES_CARVANHA},
+	{40, 45, SPECIES_CARVANHA},
+};
+
+const struct WildPokemonInfo gRoute119_FishingMonsInfo = {30, gRoute119_FishingMons};
+
+const struct WildPokemon gRoute120_LandMons[] =
+{
+	{25, 25, SPECIES_POOCHYENA},
+	{25, 25, SPECIES_MIGHTYENA},
+	{27, 27, SPECIES_MIGHTYENA},
+	{25, 25, SPECIES_ODDISH},
+	{25, 25, SPECIES_MARILL},
+	{26, 26, SPECIES_ODDISH},
+	{27, 27, SPECIES_ODDISH},
+	{27, 27, SPECIES_MARILL},
+	{25, 25, SPECIES_ABSOL},
+	{27, 27, SPECIES_ABSOL},
+	{25, 25, SPECIES_KECLEON},
+	{25, 25, SPECIES_SEEDOT},
+};
+
+const struct WildPokemonInfo gRoute120_LandMonsInfo = {20, gRoute120_LandMons};
+
+const struct WildPokemon gRoute120_WaterMons[] =
+{
+	{20, 30, SPECIES_MARILL},
+	{10, 20, SPECIES_MARILL},
+	{30, 35, SPECIES_MARILL},
+	{5, 10, SPECIES_MARILL},
+	{20, 30, SPECIES_GOLDEEN},
+};
+
+const struct WildPokemonInfo gRoute120_WaterMonsInfo = {4, gRoute120_WaterMons};
+
+const struct WildPokemon gRoute120_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_BARBOACH},
+	{25, 30, SPECIES_BARBOACH},
+	{30, 35, SPECIES_BARBOACH},
+	{20, 25, SPECIES_BARBOACH},
+	{35, 40, SPECIES_BARBOACH},
+	{40, 45, SPECIES_BARBOACH},
+};
+
+const struct WildPokemonInfo gRoute120_FishingMonsInfo = {30, gRoute120_FishingMons};
+
+const struct WildPokemon gRoute121_LandMons[] =
+{
+	{26, 26, SPECIES_POOCHYENA},
+	{26, 26, SPECIES_SHUPPET},
+	{26, 26, SPECIES_MIGHTYENA},
+	{28, 28, SPECIES_SHUPPET},
+	{28, 28, SPECIES_MIGHTYENA},
+	{26, 26, SPECIES_ODDISH},
+	{28, 28, SPECIES_ODDISH},
+	{28, 28, SPECIES_GLOOM},
+	{26, 26, SPECIES_WINGULL},
+	{27, 27, SPECIES_WINGULL},
+	{28, 28, SPECIES_WINGULL},
+	{25, 25, SPECIES_KECLEON},
+};
+
+const struct WildPokemonInfo gRoute121_LandMonsInfo = {20, gRoute121_LandMons};
+
+const struct WildPokemon gRoute121_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute121_WaterMonsInfo = {4, gRoute121_WaterMons};
+
+const struct WildPokemon gRoute121_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute121_FishingMonsInfo = {30, gRoute121_FishingMons};
+
+const struct WildPokemon gRoute122_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute122_WaterMonsInfo = {4, gRoute122_WaterMons};
+
+const struct WildPokemon gRoute122_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute122_FishingMonsInfo = {30, gRoute122_FishingMons};
+
+const struct WildPokemon gRoute123_LandMons[] =
+{
+	{26, 26, SPECIES_POOCHYENA},
+	{26, 26, SPECIES_SHUPPET},
+	{26, 26, SPECIES_MIGHTYENA},
+	{28, 28, SPECIES_SHUPPET},
+	{28, 28, SPECIES_MIGHTYENA},
+	{26, 26, SPECIES_ODDISH},
+	{28, 28, SPECIES_ODDISH},
+	{28, 28, SPECIES_GLOOM},
+	{26, 26, SPECIES_WINGULL},
+	{27, 27, SPECIES_WINGULL},
+	{28, 28, SPECIES_WINGULL},
+	{25, 25, SPECIES_KECLEON},
+};
+
+const struct WildPokemonInfo gRoute123_LandMonsInfo = {20, gRoute123_LandMons};
+
+const struct WildPokemon gRoute123_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute123_WaterMonsInfo = {4, gRoute123_WaterMons};
+
+const struct WildPokemon gRoute123_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute123_FishingMonsInfo = {30, gRoute123_FishingMons};
+
+const struct WildPokemon gMtPyre_2F_LandMons[] =
+{
+	{27, 27, SPECIES_SHUPPET},
+	{28, 28, SPECIES_SHUPPET},
+	{26, 26, SPECIES_SHUPPET},
+	{25, 25, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+	{23, 23, SPECIES_SHUPPET},
+	{22, 22, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+};
+
+const struct WildPokemonInfo gMtPyre_2F_LandMonsInfo = {10, gMtPyre_2F_LandMons};
+
+const struct WildPokemon gMtPyre_3F_LandMons[] =
+{
+	{27, 27, SPECIES_SHUPPET},
+	{28, 28, SPECIES_SHUPPET},
+	{26, 26, SPECIES_SHUPPET},
+	{25, 25, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+	{23, 23, SPECIES_SHUPPET},
+	{22, 22, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+};
+
+const struct WildPokemonInfo gMtPyre_3F_LandMonsInfo = {10, gMtPyre_3F_LandMons};
+
+const struct WildPokemon gMtPyre_4F_LandMons[] =
+{
+	{27, 27, SPECIES_SHUPPET},
+	{28, 28, SPECIES_SHUPPET},
+	{26, 26, SPECIES_SHUPPET},
+	{25, 25, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+	{23, 23, SPECIES_SHUPPET},
+	{22, 22, SPECIES_SHUPPET},
+	{27, 27, SPECIES_DUSKULL},
+	{27, 27, SPECIES_DUSKULL},
+	{25, 25, SPECIES_DUSKULL},
+	{29, 29, SPECIES_DUSKULL},
+};
+
+const struct WildPokemonInfo gMtPyre_4F_LandMonsInfo = {10, gMtPyre_4F_LandMons};
+
+const struct WildPokemon gMtPyre_5F_LandMons[] =
+{
+	{27, 27, SPECIES_SHUPPET},
+	{28, 28, SPECIES_SHUPPET},
+	{26, 26, SPECIES_SHUPPET},
+	{25, 25, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+	{23, 23, SPECIES_SHUPPET},
+	{22, 22, SPECIES_SHUPPET},
+	{27, 27, SPECIES_DUSKULL},
+	{27, 27, SPECIES_DUSKULL},
+	{25, 25, SPECIES_DUSKULL},
+	{29, 29, SPECIES_DUSKULL},
+};
+
+const struct WildPokemonInfo gMtPyre_5F_LandMonsInfo = {10, gMtPyre_5F_LandMons};
+
+const struct WildPokemon gMtPyre_6F_LandMons[] =
+{
+	{27, 27, SPECIES_SHUPPET},
+	{28, 28, SPECIES_SHUPPET},
+	{26, 26, SPECIES_SHUPPET},
+	{25, 25, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+	{23, 23, SPECIES_SHUPPET},
+	{22, 22, SPECIES_SHUPPET},
+	{27, 27, SPECIES_DUSKULL},
+	{27, 27, SPECIES_DUSKULL},
+	{25, 25, SPECIES_DUSKULL},
+	{29, 29, SPECIES_DUSKULL},
+};
+
+const struct WildPokemonInfo gMtPyre_6F_LandMonsInfo = {10, gMtPyre_6F_LandMons};
+
+const struct WildPokemon gMtPyre_Exterior_LandMons[] =
+{
+	{27, 27, SPECIES_SHUPPET},
+	{27, 27, SPECIES_SHUPPET},
+	{28, 28, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{29, 29, SPECIES_VULPIX},
+	{27, 27, SPECIES_VULPIX},
+	{29, 29, SPECIES_VULPIX},
+	{25, 25, SPECIES_VULPIX},
+	{27, 27, SPECIES_WINGULL},
+	{27, 27, SPECIES_WINGULL},
+	{26, 26, SPECIES_WINGULL},
+	{28, 28, SPECIES_WINGULL},
+};
+
+const struct WildPokemonInfo gMtPyre_Exterior_LandMonsInfo = {10, gMtPyre_Exterior_LandMons};
+
+const struct WildPokemon gMtPyre_Summit_LandMons[] =
+{
+	{28, 28, SPECIES_SHUPPET},
+	{29, 29, SPECIES_SHUPPET},
+	{27, 27, SPECIES_SHUPPET},
+	{26, 26, SPECIES_SHUPPET},
+	{30, 30, SPECIES_SHUPPET},
+	{25, 25, SPECIES_SHUPPET},
+	{24, 24, SPECIES_SHUPPET},
+	{28, 28, SPECIES_DUSKULL},
+	{26, 26, SPECIES_DUSKULL},
+	{30, 30, SPECIES_DUSKULL},
+	{28, 28, SPECIES_CHIMECHO},
+	{28, 28, SPECIES_CHIMECHO},
+};
+
+const struct WildPokemonInfo gMtPyre_Summit_LandMonsInfo = {10, gMtPyre_Summit_LandMons};
+
+const struct WildPokemon gGraniteCave_StevensRoom_LandMons[] =
+{
+	{7, 7, SPECIES_ZUBAT},
+	{8, 8, SPECIES_MAKUHITA},
+	{7, 7, SPECIES_MAKUHITA},
+	{8, 8, SPECIES_ZUBAT},
+	{9, 9, SPECIES_MAKUHITA},
+	{8, 8, SPECIES_ABRA},
+	{10, 10, SPECIES_MAKUHITA},
+	{6, 6, SPECIES_MAKUHITA},
+	{7, 7, SPECIES_ARON},
+	{8, 8, SPECIES_ARON},
+	{7, 7, SPECIES_ARON},
+	{8, 8, SPECIES_ARON},
+};
+
+const struct WildPokemonInfo gGraniteCave_StevensRoom_LandMonsInfo = {10, gGraniteCave_StevensRoom_LandMons};
+
+const struct WildPokemon gRoute125_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute125_WaterMonsInfo = {4, gRoute125_WaterMons};
+
+const struct WildPokemon gRoute125_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute125_FishingMonsInfo = {30, gRoute125_FishingMons};
+
+const struct WildPokemon gRoute126_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute126_WaterMonsInfo = {4, gRoute126_WaterMons};
+
+const struct WildPokemon gRoute126_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute126_FishingMonsInfo = {30, gRoute126_FishingMons};
+
+const struct WildPokemon gRoute127_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute127_WaterMonsInfo = {4, gRoute127_WaterMons};
+
+const struct WildPokemon gRoute127_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute127_FishingMonsInfo = {30, gRoute127_FishingMons};
+
+const struct WildPokemon gRoute128_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute128_WaterMonsInfo = {4, gRoute128_WaterMons};
+
+const struct WildPokemon gRoute128_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_LUVDISC},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_LUVDISC},
+	{30, 35, SPECIES_WAILMER},
+	{30, 35, SPECIES_CORSOLA},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute128_FishingMonsInfo = {30, gRoute128_FishingMons};
+
+const struct WildPokemon gRoute129_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_WAILORD},
+};
+
+const struct WildPokemonInfo gRoute129_WaterMonsInfo = {4, gRoute129_WaterMons};
+
+const struct WildPokemon gRoute129_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute129_FishingMonsInfo = {30, gRoute129_FishingMons};
+
+const struct WildPokemon gRoute130_LandMons[] =
+{
+	{30, 30, SPECIES_WYNAUT},
+	{35, 35, SPECIES_WYNAUT},
+	{25, 25, SPECIES_WYNAUT},
+	{40, 40, SPECIES_WYNAUT},
+	{20, 20, SPECIES_WYNAUT},
+	{45, 45, SPECIES_WYNAUT},
+	{15, 15, SPECIES_WYNAUT},
+	{50, 50, SPECIES_WYNAUT},
+	{10, 10, SPECIES_WYNAUT},
+	{5, 5, SPECIES_WYNAUT},
+	{10, 10, SPECIES_WYNAUT},
+	{5, 5, SPECIES_WYNAUT},
+};
+
+const struct WildPokemonInfo gRoute130_LandMonsInfo = {20, gRoute130_LandMons};
+
+const struct WildPokemon gRoute130_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute130_WaterMonsInfo = {4, gRoute130_WaterMons};
+
+const struct WildPokemon gRoute130_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute130_FishingMonsInfo = {30, gRoute130_FishingMons};
+
+const struct WildPokemon gRoute131_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute131_WaterMonsInfo = {4, gRoute131_WaterMons};
+
+const struct WildPokemon gRoute131_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute131_FishingMonsInfo = {30, gRoute131_FishingMons};
+
+const struct WildPokemon gRoute132_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute132_WaterMonsInfo = {4, gRoute132_WaterMons};
+
+const struct WildPokemon gRoute132_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_HORSEA},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute132_FishingMonsInfo = {30, gRoute132_FishingMons};
+
+const struct WildPokemon gRoute133_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute133_WaterMonsInfo = {4, gRoute133_WaterMons};
+
+const struct WildPokemon gRoute133_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_HORSEA},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute133_FishingMonsInfo = {30, gRoute133_FishingMons};
+
+const struct WildPokemon gRoute134_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gRoute134_WaterMonsInfo = {4, gRoute134_WaterMons};
+
+const struct WildPokemon gRoute134_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_HORSEA},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gRoute134_FishingMonsInfo = {30, gRoute134_FishingMons};
+
+const struct WildPokemon gAbandonedShip_HiddenFloorCorridors_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_TENTACOOL},
+	{30, 35, SPECIES_TENTACRUEL},
+};
+
+const struct WildPokemonInfo gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo = {4, gAbandonedShip_HiddenFloorCorridors_WaterMons};
+
+const struct WildPokemon gAbandonedShip_HiddenFloorCorridors_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_TENTACOOL},
+	{25, 30, SPECIES_TENTACOOL},
+	{30, 35, SPECIES_TENTACOOL},
+	{30, 35, SPECIES_TENTACRUEL},
+	{25, 30, SPECIES_TENTACRUEL},
+	{20, 25, SPECIES_TENTACRUEL},
+};
+
+const struct WildPokemonInfo gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo = {20, gAbandonedShip_HiddenFloorCorridors_FishingMons};
+
+const struct WildPokemon gSeafloorCavern_Room1_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{33, 33, SPECIES_ZUBAT},
+	{28, 28, SPECIES_ZUBAT},
+	{29, 29, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{35, 35, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room1_LandMonsInfo = {4, gSeafloorCavern_Room1_LandMons};
+
+const struct WildPokemon gSeafloorCavern_Room2_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{33, 33, SPECIES_ZUBAT},
+	{28, 28, SPECIES_ZUBAT},
+	{29, 29, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{35, 35, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room2_LandMonsInfo = {4, gSeafloorCavern_Room2_LandMons};
+
+const struct WildPokemon gSeafloorCavern_Room3_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{33, 33, SPECIES_ZUBAT},
+	{28, 28, SPECIES_ZUBAT},
+	{29, 29, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{35, 35, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room3_LandMonsInfo = {4, gSeafloorCavern_Room3_LandMons};
+
+const struct WildPokemon gSeafloorCavern_Room4_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{33, 33, SPECIES_ZUBAT},
+	{28, 28, SPECIES_ZUBAT},
+	{29, 29, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{35, 35, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room4_LandMonsInfo = {4, gSeafloorCavern_Room4_LandMons};
+
+const struct WildPokemon gSeafloorCavern_Room5_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{33, 33, SPECIES_ZUBAT},
+	{28, 28, SPECIES_ZUBAT},
+	{29, 29, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{35, 35, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room5_LandMonsInfo = {4, gSeafloorCavern_Room5_LandMons};
+
+const struct WildPokemon gSeafloorCavern_Room6_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{33, 33, SPECIES_ZUBAT},
+	{28, 28, SPECIES_ZUBAT},
+	{29, 29, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{35, 35, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room6_LandMonsInfo = {4, gSeafloorCavern_Room6_LandMons};
+
+const struct WildPokemon gSeafloorCavern_Room6_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_ZUBAT},
+	{30, 35, SPECIES_ZUBAT},
+	{30, 35, SPECIES_GOLBAT},
+	{30, 35, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room6_WaterMonsInfo = {4, gSeafloorCavern_Room6_WaterMons};
+
+const struct WildPokemon gSeafloorCavern_Room6_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room6_FishingMonsInfo = {10, gSeafloorCavern_Room6_FishingMons};
+
+const struct WildPokemon gSeafloorCavern_Room7_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{33, 33, SPECIES_ZUBAT},
+	{28, 28, SPECIES_ZUBAT},
+	{29, 29, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{35, 35, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room7_LandMonsInfo = {4, gSeafloorCavern_Room7_LandMons};
+
+const struct WildPokemon gSeafloorCavern_Room7_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_ZUBAT},
+	{30, 35, SPECIES_ZUBAT},
+	{30, 35, SPECIES_GOLBAT},
+	{30, 35, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room7_WaterMonsInfo = {4, gSeafloorCavern_Room7_WaterMons};
+
+const struct WildPokemon gSeafloorCavern_Room7_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room7_FishingMonsInfo = {10, gSeafloorCavern_Room7_FishingMons};
+
+const struct WildPokemon gSeafloorCavern_Room8_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{33, 33, SPECIES_ZUBAT},
+	{28, 28, SPECIES_ZUBAT},
+	{29, 29, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{35, 35, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Room8_LandMonsInfo = {4, gSeafloorCavern_Room8_LandMons};
+
+const struct WildPokemon gSeafloorCavern_Entrance_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_ZUBAT},
+	{30, 35, SPECIES_ZUBAT},
+	{30, 35, SPECIES_GOLBAT},
+	{30, 35, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Entrance_WaterMonsInfo = {4, gSeafloorCavern_Entrance_WaterMons};
+
+const struct WildPokemon gSeafloorCavern_Entrance_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gSeafloorCavern_Entrance_FishingMonsInfo = {10, gSeafloorCavern_Entrance_FishingMons};
+
+const struct WildPokemon gCaveOfOrigin_Entrance_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{33, 33, SPECIES_ZUBAT},
+	{28, 28, SPECIES_ZUBAT},
+	{29, 29, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{35, 35, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gCaveOfOrigin_Entrance_LandMonsInfo = {4, gCaveOfOrigin_Entrance_LandMons};
+
+const struct WildPokemon gCaveOfOrigin_1F_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{30, 30, SPECIES_SABLEYE},
+	{32, 32, SPECIES_SABLEYE},
+	{34, 34, SPECIES_SABLEYE},
+	{33, 33, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gCaveOfOrigin_1F_LandMonsInfo = {4, gCaveOfOrigin_1F_LandMons};
+
+const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap1_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{30, 30, SPECIES_SABLEYE},
+	{32, 32, SPECIES_SABLEYE},
+	{34, 34, SPECIES_SABLEYE},
+	{33, 33, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap1_LandMons};
+
+const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap2_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{30, 30, SPECIES_SABLEYE},
+	{32, 32, SPECIES_SABLEYE},
+	{34, 34, SPECIES_SABLEYE},
+	{33, 33, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap2_LandMons};
+
+const struct WildPokemon gCaveOfOrigin_UnusedRubySapphireMap3_LandMons[] =
+{
+	{30, 30, SPECIES_ZUBAT},
+	{31, 31, SPECIES_ZUBAT},
+	{32, 32, SPECIES_ZUBAT},
+	{30, 30, SPECIES_SABLEYE},
+	{32, 32, SPECIES_SABLEYE},
+	{34, 34, SPECIES_SABLEYE},
+	{33, 33, SPECIES_ZUBAT},
+	{34, 34, SPECIES_ZUBAT},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{36, 36, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo = {4, gCaveOfOrigin_UnusedRubySapphireMap3_LandMons};
+
+const struct WildPokemon gNewMauville_Entrance_LandMons[] =
+{
+	{24, 24, SPECIES_VOLTORB},
+	{24, 24, SPECIES_MAGNEMITE},
+	{25, 25, SPECIES_VOLTORB},
+	{25, 25, SPECIES_MAGNEMITE},
+	{23, 23, SPECIES_VOLTORB},
+	{23, 23, SPECIES_MAGNEMITE},
+	{26, 26, SPECIES_VOLTORB},
+	{26, 26, SPECIES_MAGNEMITE},
+	{22, 22, SPECIES_VOLTORB},
+	{22, 22, SPECIES_MAGNEMITE},
+	{22, 22, SPECIES_VOLTORB},
+	{22, 22, SPECIES_MAGNEMITE},
+};
+
+const struct WildPokemonInfo gNewMauville_Entrance_LandMonsInfo = {10, gNewMauville_Entrance_LandMons};
+
+const struct WildPokemon gSafariZone_Southwest_LandMons[] =
+{
+	{25, 25, SPECIES_ODDISH},
+	{27, 27, SPECIES_ODDISH},
+	{25, 25, SPECIES_GIRAFARIG},
+	{27, 27, SPECIES_GIRAFARIG},
+	{25, 25, SPECIES_NATU},
+	{27, 27, SPECIES_DODUO},
+	{25, 25, SPECIES_GLOOM},
+	{27, 27, SPECIES_WOBBUFFET},
+	{25, 25, SPECIES_PIKACHU},
+	{27, 27, SPECIES_WOBBUFFET},
+	{27, 27, SPECIES_PIKACHU},
+	{29, 29, SPECIES_WOBBUFFET},
+};
+
+const struct WildPokemonInfo gSafariZone_Southwest_LandMonsInfo = {25, gSafariZone_Southwest_LandMons};
+
+const struct WildPokemon gSafariZone_Southwest_WaterMons[] =
+{
+	{20, 30, SPECIES_PSYDUCK},
+	{20, 30, SPECIES_PSYDUCK},
+	{30, 35, SPECIES_PSYDUCK},
+	{30, 35, SPECIES_PSYDUCK},
+	{30, 35, SPECIES_PSYDUCK},
+};
+
+const struct WildPokemonInfo gSafariZone_Southwest_WaterMonsInfo = {9, gSafariZone_Southwest_WaterMons};
+
+const struct WildPokemon gSafariZone_Southwest_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 25, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_GOLDEEN},
+	{25, 30, SPECIES_GOLDEEN},
+	{30, 35, SPECIES_GOLDEEN},
+	{30, 35, SPECIES_SEAKING},
+	{35, 40, SPECIES_SEAKING},
+	{25, 30, SPECIES_SEAKING},
+};
+
+const struct WildPokemonInfo gSafariZone_Southwest_FishingMonsInfo = {35, gSafariZone_Southwest_FishingMons};
+
+const struct WildPokemon gSafariZone_North_LandMons[] =
+{
+	{27, 27, SPECIES_PHANPY},
+	{27, 27, SPECIES_ODDISH},
+	{29, 29, SPECIES_PHANPY},
+	{29, 29, SPECIES_ODDISH},
+	{27, 27, SPECIES_NATU},
+	{29, 29, SPECIES_GLOOM},
+	{31, 31, SPECIES_GLOOM},
+	{29, 29, SPECIES_NATU},
+	{29, 29, SPECIES_XATU},
+	{27, 27, SPECIES_HERACROSS},
+	{31, 31, SPECIES_XATU},
+	{29, 29, SPECIES_HERACROSS},
+};
+
+const struct WildPokemonInfo gSafariZone_North_LandMonsInfo = {25, gSafariZone_North_LandMons};
+
+const struct WildPokemon gSafariZone_North_RockSmashMons[] =
+{
+	{10, 15, SPECIES_GEODUDE},
+	{5, 10, SPECIES_GEODUDE},
+	{15, 20, SPECIES_GEODUDE},
+	{20, 25, SPECIES_GEODUDE},
+	{25, 30, SPECIES_GEODUDE},
+};
+
+const struct WildPokemonInfo gSafariZone_North_RockSmashMonsInfo = {25, gSafariZone_North_RockSmashMons};
+
+const struct WildPokemon gSafariZone_Northwest_LandMons[] =
+{
+	{27, 27, SPECIES_RHYHORN},
+	{27, 27, SPECIES_ODDISH},
+	{29, 29, SPECIES_RHYHORN},
+	{29, 29, SPECIES_ODDISH},
+	{27, 27, SPECIES_DODUO},
+	{29, 29, SPECIES_GLOOM},
+	{31, 31, SPECIES_GLOOM},
+	{29, 29, SPECIES_DODUO},
+	{29, 29, SPECIES_DODRIO},
+	{27, 27, SPECIES_PINSIR},
+	{31, 31, SPECIES_DODRIO},
+	{29, 29, SPECIES_PINSIR},
+};
+
+const struct WildPokemonInfo gSafariZone_Northwest_LandMonsInfo = {25, gSafariZone_Northwest_LandMons};
+
+const struct WildPokemon gSafariZone_Northwest_WaterMons[] =
+{
+	{20, 30, SPECIES_PSYDUCK},
+	{20, 30, SPECIES_PSYDUCK},
+	{30, 35, SPECIES_PSYDUCK},
+	{30, 35, SPECIES_GOLDUCK},
+	{25, 40, SPECIES_GOLDUCK},
+};
+
+const struct WildPokemonInfo gSafariZone_Northwest_WaterMonsInfo = {9, gSafariZone_Northwest_WaterMons};
+
+const struct WildPokemon gSafariZone_Northwest_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 25, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_GOLDEEN},
+	{25, 30, SPECIES_GOLDEEN},
+	{30, 35, SPECIES_GOLDEEN},
+	{30, 35, SPECIES_SEAKING},
+	{35, 40, SPECIES_SEAKING},
+	{25, 30, SPECIES_SEAKING},
+};
+
+const struct WildPokemonInfo gSafariZone_Northwest_FishingMonsInfo = {35, gSafariZone_Northwest_FishingMons};
+
+const struct WildPokemon gVictoryRoad_B1F_LandMons[] =
+{
+	{40, 40, SPECIES_GOLBAT},
+	{40, 40, SPECIES_HARIYAMA},
+	{40, 40, SPECIES_LAIRON},
+	{40, 40, SPECIES_LAIRON},
+	{38, 38, SPECIES_GOLBAT},
+	{38, 38, SPECIES_HARIYAMA},
+	{42, 42, SPECIES_GOLBAT},
+	{42, 42, SPECIES_HARIYAMA},
+	{42, 42, SPECIES_LAIRON},
+	{38, 38, SPECIES_MAWILE},
+	{42, 42, SPECIES_LAIRON},
+	{38, 38, SPECIES_MAWILE},
+};
+
+const struct WildPokemonInfo gVictoryRoad_B1F_LandMonsInfo = {10, gVictoryRoad_B1F_LandMons};
+
+const struct WildPokemon gVictoryRoad_B1F_RockSmashMons[] =
+{
+	{30, 40, SPECIES_GRAVELER},
+	{30, 40, SPECIES_GEODUDE},
+	{35, 40, SPECIES_GRAVELER},
+	{35, 40, SPECIES_GRAVELER},
+	{35, 40, SPECIES_GRAVELER},
+};
+
+const struct WildPokemonInfo gVictoryRoad_B1F_RockSmashMonsInfo = {20, gVictoryRoad_B1F_RockSmashMons};
+
+const struct WildPokemon gVictoryRoad_B2F_LandMons[] =
+{
+	{40, 40, SPECIES_GOLBAT},
+	{40, 40, SPECIES_SABLEYE},
+	{40, 40, SPECIES_LAIRON},
+	{40, 40, SPECIES_LAIRON},
+	{42, 42, SPECIES_GOLBAT},
+	{42, 42, SPECIES_SABLEYE},
+	{44, 44, SPECIES_GOLBAT},
+	{44, 44, SPECIES_SABLEYE},
+	{42, 42, SPECIES_LAIRON},
+	{42, 42, SPECIES_MAWILE},
+	{44, 44, SPECIES_LAIRON},
+	{44, 44, SPECIES_MAWILE},
+};
+
+const struct WildPokemonInfo gVictoryRoad_B2F_LandMonsInfo = {10, gVictoryRoad_B2F_LandMons};
+
+const struct WildPokemon gVictoryRoad_B2F_WaterMons[] =
+{
+	{30, 35, SPECIES_GOLBAT},
+	{25, 30, SPECIES_GOLBAT},
+	{35, 40, SPECIES_GOLBAT},
+	{35, 40, SPECIES_GOLBAT},
+	{35, 40, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gVictoryRoad_B2F_WaterMonsInfo = {4, gVictoryRoad_B2F_WaterMons};
+
+const struct WildPokemon gVictoryRoad_B2F_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_BARBOACH},
+	{25, 30, SPECIES_BARBOACH},
+	{30, 35, SPECIES_BARBOACH},
+	{30, 35, SPECIES_WHISCASH},
+	{35, 40, SPECIES_WHISCASH},
+	{40, 45, SPECIES_WHISCASH},
+};
+
+const struct WildPokemonInfo gVictoryRoad_B2F_FishingMonsInfo = {30, gVictoryRoad_B2F_FishingMons};
+
+const struct WildPokemon gMeteorFalls_1F_1R_LandMons[] =
+{
+	{16, 16, SPECIES_ZUBAT},
+	{17, 17, SPECIES_ZUBAT},
+	{18, 18, SPECIES_ZUBAT},
+	{15, 15, SPECIES_ZUBAT},
+	{14, 14, SPECIES_ZUBAT},
+	{16, 16, SPECIES_SOLROCK},
+	{18, 18, SPECIES_SOLROCK},
+	{14, 14, SPECIES_SOLROCK},
+	{19, 19, SPECIES_ZUBAT},
+	{20, 20, SPECIES_ZUBAT},
+	{19, 19, SPECIES_ZUBAT},
+	{20, 20, SPECIES_ZUBAT},
+};
+
+const struct WildPokemonInfo gMeteorFalls_1F_1R_LandMonsInfo = {10, gMeteorFalls_1F_1R_LandMons};
+
+const struct WildPokemon gMeteorFalls_1F_1R_WaterMons[] =
+{
+	{5, 35, SPECIES_ZUBAT},
+	{30, 35, SPECIES_ZUBAT},
+	{25, 35, SPECIES_SOLROCK},
+	{15, 25, SPECIES_SOLROCK},
+	{5, 15, SPECIES_SOLROCK},
+};
+
+const struct WildPokemonInfo gMeteorFalls_1F_1R_WaterMonsInfo = {4, gMeteorFalls_1F_1R_WaterMons};
+
+const struct WildPokemon gMeteorFalls_1F_1R_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_BARBOACH},
+	{25, 30, SPECIES_BARBOACH},
+	{30, 35, SPECIES_BARBOACH},
+	{20, 25, SPECIES_BARBOACH},
+	{35, 40, SPECIES_BARBOACH},
+	{40, 45, SPECIES_BARBOACH},
+};
+
+const struct WildPokemonInfo gMeteorFalls_1F_1R_FishingMonsInfo = {30, gMeteorFalls_1F_1R_FishingMons};
+
+const struct WildPokemon gMeteorFalls_1F_2R_LandMons[] =
+{
+	{33, 33, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{35, 35, SPECIES_SOLROCK},
+	{33, 33, SPECIES_SOLROCK},
+	{37, 37, SPECIES_SOLROCK},
+	{35, 35, SPECIES_GOLBAT},
+	{39, 39, SPECIES_SOLROCK},
+	{38, 38, SPECIES_GOLBAT},
+	{40, 40, SPECIES_GOLBAT},
+	{38, 38, SPECIES_GOLBAT},
+	{40, 40, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gMeteorFalls_1F_2R_LandMonsInfo = {10, gMeteorFalls_1F_2R_LandMons};
+
+const struct WildPokemon gMeteorFalls_1F_2R_WaterMons[] =
+{
+	{30, 35, SPECIES_GOLBAT},
+	{30, 35, SPECIES_GOLBAT},
+	{25, 35, SPECIES_SOLROCK},
+	{15, 25, SPECIES_SOLROCK},
+	{5, 15, SPECIES_SOLROCK},
+};
+
+const struct WildPokemonInfo gMeteorFalls_1F_2R_WaterMonsInfo = {4, gMeteorFalls_1F_2R_WaterMons};
+
+const struct WildPokemon gMeteorFalls_1F_2R_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_BARBOACH},
+	{25, 30, SPECIES_BARBOACH},
+	{30, 35, SPECIES_BARBOACH},
+	{30, 35, SPECIES_WHISCASH},
+	{35, 40, SPECIES_WHISCASH},
+	{40, 45, SPECIES_WHISCASH},
+};
+
+const struct WildPokemonInfo gMeteorFalls_1F_2R_FishingMonsInfo = {30, gMeteorFalls_1F_2R_FishingMons};
+
+const struct WildPokemon gMeteorFalls_B1F_1R_LandMons[] =
+{
+	{33, 33, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{35, 35, SPECIES_SOLROCK},
+	{33, 33, SPECIES_SOLROCK},
+	{37, 37, SPECIES_SOLROCK},
+	{35, 35, SPECIES_GOLBAT},
+	{39, 39, SPECIES_SOLROCK},
+	{38, 38, SPECIES_GOLBAT},
+	{40, 40, SPECIES_GOLBAT},
+	{38, 38, SPECIES_GOLBAT},
+	{40, 40, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gMeteorFalls_B1F_1R_LandMonsInfo = {10, gMeteorFalls_B1F_1R_LandMons};
+
+const struct WildPokemon gMeteorFalls_B1F_1R_WaterMons[] =
+{
+	{30, 35, SPECIES_GOLBAT},
+	{30, 35, SPECIES_GOLBAT},
+	{25, 35, SPECIES_SOLROCK},
+	{15, 25, SPECIES_SOLROCK},
+	{5, 15, SPECIES_SOLROCK},
+};
+
+const struct WildPokemonInfo gMeteorFalls_B1F_1R_WaterMonsInfo = {4, gMeteorFalls_B1F_1R_WaterMons};
+
+const struct WildPokemon gMeteorFalls_B1F_1R_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_BARBOACH},
+	{25, 30, SPECIES_BARBOACH},
+	{30, 35, SPECIES_BARBOACH},
+	{30, 35, SPECIES_WHISCASH},
+	{35, 40, SPECIES_WHISCASH},
+	{40, 45, SPECIES_WHISCASH},
+};
+
+const struct WildPokemonInfo gMeteorFalls_B1F_1R_FishingMonsInfo = {30, gMeteorFalls_B1F_1R_FishingMons};
+
+const struct WildPokemon gShoalCave_LowTideStairsRoom_LandMons[] =
+{
+	{26, 26, SPECIES_ZUBAT},
+	{26, 26, SPECIES_SPHEAL},
+	{28, 28, SPECIES_ZUBAT},
+	{28, 28, SPECIES_SPHEAL},
+	{30, 30, SPECIES_ZUBAT},
+	{30, 30, SPECIES_SPHEAL},
+	{32, 32, SPECIES_ZUBAT},
+	{32, 32, SPECIES_SPHEAL},
+	{32, 32, SPECIES_GOLBAT},
+	{32, 32, SPECIES_SPHEAL},
+	{32, 32, SPECIES_GOLBAT},
+	{32, 32, SPECIES_SPHEAL},
+};
+
+const struct WildPokemonInfo gShoalCave_LowTideStairsRoom_LandMonsInfo = {10, gShoalCave_LowTideStairsRoom_LandMons};
+
+const struct WildPokemon gShoalCave_LowTideLowerRoom_LandMons[] =
+{
+	{26, 26, SPECIES_ZUBAT},
+	{26, 26, SPECIES_SPHEAL},
+	{28, 28, SPECIES_ZUBAT},
+	{28, 28, SPECIES_SPHEAL},
+	{30, 30, SPECIES_ZUBAT},
+	{30, 30, SPECIES_SPHEAL},
+	{32, 32, SPECIES_ZUBAT},
+	{32, 32, SPECIES_SPHEAL},
+	{32, 32, SPECIES_GOLBAT},
+	{32, 32, SPECIES_SPHEAL},
+	{32, 32, SPECIES_GOLBAT},
+	{32, 32, SPECIES_SPHEAL},
+};
+
+const struct WildPokemonInfo gShoalCave_LowTideLowerRoom_LandMonsInfo = {10, gShoalCave_LowTideLowerRoom_LandMons};
+
+const struct WildPokemon gShoalCave_LowTideInnerRoom_LandMons[] =
+{
+	{26, 26, SPECIES_ZUBAT},
+	{26, 26, SPECIES_SPHEAL},
+	{28, 28, SPECIES_ZUBAT},
+	{28, 28, SPECIES_SPHEAL},
+	{30, 30, SPECIES_ZUBAT},
+	{30, 30, SPECIES_SPHEAL},
+	{32, 32, SPECIES_ZUBAT},
+	{32, 32, SPECIES_SPHEAL},
+	{32, 32, SPECIES_GOLBAT},
+	{32, 32, SPECIES_SPHEAL},
+	{32, 32, SPECIES_GOLBAT},
+	{32, 32, SPECIES_SPHEAL},
+};
+
+const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_LandMonsInfo = {10, gShoalCave_LowTideInnerRoom_LandMons};
+
+const struct WildPokemon gShoalCave_LowTideInnerRoom_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_ZUBAT},
+	{25, 30, SPECIES_SPHEAL},
+	{25, 30, SPECIES_SPHEAL},
+	{25, 35, SPECIES_SPHEAL},
+};
+
+const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_WaterMonsInfo = {4, gShoalCave_LowTideInnerRoom_WaterMons};
+
+const struct WildPokemon gShoalCave_LowTideInnerRoom_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gShoalCave_LowTideInnerRoom_FishingMonsInfo = {10, gShoalCave_LowTideInnerRoom_FishingMons};
+
+const struct WildPokemon gShoalCave_LowTideEntranceRoom_LandMons[] =
+{
+	{26, 26, SPECIES_ZUBAT},
+	{26, 26, SPECIES_SPHEAL},
+	{28, 28, SPECIES_ZUBAT},
+	{28, 28, SPECIES_SPHEAL},
+	{30, 30, SPECIES_ZUBAT},
+	{30, 30, SPECIES_SPHEAL},
+	{32, 32, SPECIES_ZUBAT},
+	{32, 32, SPECIES_SPHEAL},
+	{32, 32, SPECIES_GOLBAT},
+	{32, 32, SPECIES_SPHEAL},
+	{32, 32, SPECIES_GOLBAT},
+	{32, 32, SPECIES_SPHEAL},
+};
+
+const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_LandMonsInfo = {10, gShoalCave_LowTideEntranceRoom_LandMons};
+
+const struct WildPokemon gShoalCave_LowTideEntranceRoom_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{5, 35, SPECIES_ZUBAT},
+	{25, 30, SPECIES_SPHEAL},
+	{25, 30, SPECIES_SPHEAL},
+	{25, 35, SPECIES_SPHEAL},
+};
+
+const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_WaterMonsInfo = {4, gShoalCave_LowTideEntranceRoom_WaterMons};
+
+const struct WildPokemon gShoalCave_LowTideEntranceRoom_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gShoalCave_LowTideEntranceRoom_FishingMonsInfo = {10, gShoalCave_LowTideEntranceRoom_FishingMons};
+
+const struct WildPokemon gLilycoveCity_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gLilycoveCity_WaterMonsInfo = {4, gLilycoveCity_WaterMons};
+
+const struct WildPokemon gLilycoveCity_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_STARYU},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gLilycoveCity_FishingMonsInfo = {10, gLilycoveCity_FishingMons};
+
+const struct WildPokemon gDewfordTown_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gDewfordTown_WaterMonsInfo = {4, gDewfordTown_WaterMons};
+
+const struct WildPokemon gDewfordTown_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gDewfordTown_FishingMonsInfo = {10, gDewfordTown_FishingMons};
+
+const struct WildPokemon gSlateportCity_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gSlateportCity_WaterMonsInfo = {4, gSlateportCity_WaterMons};
+
+const struct WildPokemon gSlateportCity_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_WAILMER},
+	{20, 25, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gSlateportCity_FishingMonsInfo = {10, gSlateportCity_FishingMons};
+
+const struct WildPokemon gMossdeepCity_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gMossdeepCity_WaterMonsInfo = {4, gMossdeepCity_WaterMons};
+
+const struct WildPokemon gMossdeepCity_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gMossdeepCity_FishingMonsInfo = {10, gMossdeepCity_FishingMons};
+
+const struct WildPokemon gPacifidlogTown_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gPacifidlogTown_WaterMonsInfo = {4, gPacifidlogTown_WaterMons};
+
+const struct WildPokemon gPacifidlogTown_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_SHARPEDO},
+	{30, 35, SPECIES_WAILMER},
+	{25, 30, SPECIES_WAILMER},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gPacifidlogTown_FishingMonsInfo = {10, gPacifidlogTown_FishingMons};
+
+const struct WildPokemon gEverGrandeCity_WaterMons[] =
+{
+	{5, 35, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_WINGULL},
+	{15, 25, SPECIES_WINGULL},
+	{25, 30, SPECIES_PELIPPER},
+	{25, 30, SPECIES_PELIPPER},
+};
+
+const struct WildPokemonInfo gEverGrandeCity_WaterMonsInfo = {4, gEverGrandeCity_WaterMons};
+
+const struct WildPokemon gEverGrandeCity_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_LUVDISC},
+	{10, 30, SPECIES_WAILMER},
+	{30, 35, SPECIES_LUVDISC},
+	{30, 35, SPECIES_WAILMER},
+	{30, 35, SPECIES_CORSOLA},
+	{35, 40, SPECIES_WAILMER},
+	{40, 45, SPECIES_WAILMER},
+};
+
+const struct WildPokemonInfo gEverGrandeCity_FishingMonsInfo = {10, gEverGrandeCity_FishingMons};
+
+const struct WildPokemon gPetalburgCity_WaterMons[] =
+{
+	{20, 30, SPECIES_MARILL},
+	{10, 20, SPECIES_MARILL},
+	{30, 35, SPECIES_MARILL},
+	{5, 10, SPECIES_MARILL},
+	{5, 10, SPECIES_MARILL},
+};
+
+const struct WildPokemonInfo gPetalburgCity_WaterMonsInfo = {1, gPetalburgCity_WaterMons};
+
+const struct WildPokemon gPetalburgCity_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_GOLDEEN},
+	{10, 30, SPECIES_CORPHISH},
+	{25, 30, SPECIES_CORPHISH},
+	{30, 35, SPECIES_CORPHISH},
+	{20, 25, SPECIES_CORPHISH},
+	{35, 40, SPECIES_CORPHISH},
+	{40, 45, SPECIES_CORPHISH},
+};
+
+const struct WildPokemonInfo gPetalburgCity_FishingMonsInfo = {10, gPetalburgCity_FishingMons};
+
+const struct WildPokemon gUnderwater1_WaterMons[] =
+{
+	{20, 30, SPECIES_CLAMPERL},
+	{20, 30, SPECIES_CHINCHOU},
+	{30, 35, SPECIES_CLAMPERL},
+	{30, 35, SPECIES_RELICANTH},
+	{30, 35, SPECIES_RELICANTH},
+};
+
+const struct WildPokemonInfo gUnderwater1_WaterMonsInfo = {4, gUnderwater1_WaterMons};
+
+const struct WildPokemon gShoalCave_LowTideIceRoom_LandMons[] =
+{
+	{26, 26, SPECIES_ZUBAT},
+	{26, 26, SPECIES_SPHEAL},
+	{28, 28, SPECIES_ZUBAT},
+	{28, 28, SPECIES_SPHEAL},
+	{30, 30, SPECIES_ZUBAT},
+	{30, 30, SPECIES_SPHEAL},
+	{26, 26, SPECIES_SNORUNT},
+	{32, 32, SPECIES_SPHEAL},
+	{30, 30, SPECIES_GOLBAT},
+	{28, 28, SPECIES_SNORUNT},
+	{32, 32, SPECIES_GOLBAT},
+	{30, 30, SPECIES_SNORUNT},
+};
+
+const struct WildPokemonInfo gShoalCave_LowTideIceRoom_LandMonsInfo = {10, gShoalCave_LowTideIceRoom_LandMons};
+
+const struct WildPokemon gSkyPillar_1F_LandMons[] =
+{
+	{33, 33, SPECIES_SABLEYE},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{34, 34, SPECIES_SABLEYE},
+	{36, 36, SPECIES_CLAYDOL},
+	{37, 37, SPECIES_BANETTE},
+	{38, 38, SPECIES_BANETTE},
+	{36, 36, SPECIES_CLAYDOL},
+	{37, 37, SPECIES_CLAYDOL},
+	{38, 38, SPECIES_CLAYDOL},
+	{37, 37, SPECIES_CLAYDOL},
+	{38, 38, SPECIES_CLAYDOL},
+};
+
+const struct WildPokemonInfo gSkyPillar_1F_LandMonsInfo = {10, gSkyPillar_1F_LandMons};
+
+const struct WildPokemon gSootopolisCity_WaterMons[] =
+{
+	{5, 35, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_MAGIKARP},
+	{15, 25, SPECIES_MAGIKARP},
+	{25, 30, SPECIES_MAGIKARP},
+	{25, 30, SPECIES_MAGIKARP},
+};
+
+const struct WildPokemonInfo gSootopolisCity_WaterMonsInfo = {1, gSootopolisCity_WaterMons};
+
+const struct WildPokemon gSootopolisCity_FishingMons[] =
+{
+	{5, 10, SPECIES_MAGIKARP},
+	{5, 10, SPECIES_TENTACOOL},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_MAGIKARP},
+	{10, 30, SPECIES_MAGIKARP},
+	{30, 35, SPECIES_MAGIKARP},
+	{30, 35, SPECIES_MAGIKARP},
+	{35, 40, SPECIES_GYARADOS},
+	{35, 45, SPECIES_GYARADOS},
+	{5, 45, SPECIES_GYARADOS},
+};
+
+const struct WildPokemonInfo gSootopolisCity_FishingMonsInfo = {10, gSootopolisCity_FishingMons};
+
+const struct WildPokemon gSkyPillar_3F_LandMons[] =
+{
+	{33, 33, SPECIES_SABLEYE},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{34, 34, SPECIES_SABLEYE},
+	{36, 36, SPECIES_CLAYDOL},
+	{37, 37, SPECIES_BANETTE},
+	{38, 38, SPECIES_BANETTE},
+	{36, 36, SPECIES_CLAYDOL},
+	{37, 37, SPECIES_CLAYDOL},
+	{38, 38, SPECIES_CLAYDOL},
+	{37, 37, SPECIES_CLAYDOL},
+	{38, 38, SPECIES_CLAYDOL},
+};
+
+const struct WildPokemonInfo gSkyPillar_3F_LandMonsInfo = {10, gSkyPillar_3F_LandMons};
+
+const struct WildPokemon gSkyPillar_5F_LandMons[] =
+{
+	{33, 33, SPECIES_SABLEYE},
+	{34, 34, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{34, 34, SPECIES_SABLEYE},
+	{36, 36, SPECIES_CLAYDOL},
+	{37, 37, SPECIES_BANETTE},
+	{38, 38, SPECIES_BANETTE},
+	{36, 36, SPECIES_CLAYDOL},
+	{37, 37, SPECIES_CLAYDOL},
+	{38, 38, SPECIES_ALTARIA},
+	{39, 39, SPECIES_ALTARIA},
+	{39, 39, SPECIES_ALTARIA},
+};
+
+const struct WildPokemonInfo gSkyPillar_5F_LandMonsInfo = {10, gSkyPillar_5F_LandMons};
+
+const struct WildPokemon gSafariZone_Southeast_LandMons[] =
+{
+	{33, 33, SPECIES_SUNKERN},
+	{34, 34, SPECIES_MAREEP},
+	{35, 35, SPECIES_SUNKERN},
+	{36, 36, SPECIES_MAREEP},
+	{34, 34, SPECIES_AIPOM},
+	{33, 33, SPECIES_SPINARAK},
+	{35, 35, SPECIES_HOOTHOOT},
+	{34, 34, SPECIES_SNUBBULL},
+	{36, 36, SPECIES_STANTLER},
+	{37, 37, SPECIES_GLIGAR},
+	{39, 39, SPECIES_STANTLER},
+	{40, 40, SPECIES_GLIGAR},
+};
+
+const struct WildPokemonInfo gSafariZone_Southeast_LandMonsInfo = {25, gSafariZone_Southeast_LandMons};
+
+const struct WildPokemon gSafariZone_Southeast_WaterMons[] =
+{
+	{25, 30, SPECIES_WOOPER},
+	{25, 30, SPECIES_MARILL},
+	{25, 30, SPECIES_MARILL},
+	{30, 35, SPECIES_MARILL},
+	{35, 40, SPECIES_QUAGSIRE},
+};
+
+const struct WildPokemonInfo gSafariZone_Southeast_WaterMonsInfo = {9, gSafariZone_Southeast_WaterMons};
+
+const struct WildPokemon gSafariZone_Southeast_FishingMons[] =
+{
+	{25, 30, SPECIES_MAGIKARP},
+	{25, 30, SPECIES_GOLDEEN},
+	{25, 30, SPECIES_MAGIKARP},
+	{25, 30, SPECIES_GOLDEEN},
+	{30, 35, SPECIES_REMORAID},
+	{25, 30, SPECIES_GOLDEEN},
+	{25, 30, SPECIES_REMORAID},
+	{30, 35, SPECIES_REMORAID},
+	{30, 35, SPECIES_REMORAID},
+	{35, 40, SPECIES_OCTILLERY},
+};
+
+const struct WildPokemonInfo gSafariZone_Southeast_FishingMonsInfo = {35, gSafariZone_Southeast_FishingMons};
+
+const struct WildPokemon gSafariZone_Northeast_LandMons[] =
+{
+	{33, 33, SPECIES_AIPOM},
+	{34, 34, SPECIES_TEDDIURSA},
+	{35, 35, SPECIES_AIPOM},
+	{36, 36, SPECIES_TEDDIURSA},
+	{34, 34, SPECIES_SUNKERN},
+	{33, 33, SPECIES_LEDYBA},
+	{35, 35, SPECIES_HOOTHOOT},
+	{34, 34, SPECIES_PINECO},
+	{36, 36, SPECIES_HOUNDOUR},
+	{37, 37, SPECIES_MILTANK},
+	{39, 39, SPECIES_HOUNDOUR},
+	{40, 40, SPECIES_MILTANK},
+};
+
+const struct WildPokemonInfo gSafariZone_Northeast_LandMonsInfo = {25, gSafariZone_Northeast_LandMons};
+
+const struct WildPokemon gSafariZone_Northeast_RockSmashMons[] =
+{
+	{25, 30, SPECIES_SHUCKLE},
+	{20, 25, SPECIES_SHUCKLE},
+	{30, 35, SPECIES_SHUCKLE},
+	{30, 35, SPECIES_SHUCKLE},
+	{35, 40, SPECIES_SHUCKLE},
+};
+
+const struct WildPokemonInfo gSafariZone_Northeast_RockSmashMonsInfo = {25, gSafariZone_Northeast_RockSmashMons};
+
+const struct WildPokemon gMagmaHideout_1F_LandMons[] =
+{
+	{27, 27, SPECIES_GEODUDE},
+	{28, 28, SPECIES_TORKOAL},
+	{28, 28, SPECIES_GEODUDE},
+	{30, 30, SPECIES_TORKOAL},
+	{29, 29, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GRAVELER},
+	{30, 30, SPECIES_GRAVELER},
+	{31, 31, SPECIES_GRAVELER},
+	{32, 32, SPECIES_GRAVELER},
+	{33, 33, SPECIES_GRAVELER},
+};
+
+const struct WildPokemonInfo gMagmaHideout_1F_LandMonsInfo = {10, gMagmaHideout_1F_LandMons};
+
+const struct WildPokemon gMagmaHideout_2F_1R_LandMons[] =
+{
+	{27, 27, SPECIES_GEODUDE},
+	{28, 28, SPECIES_TORKOAL},
+	{28, 28, SPECIES_GEODUDE},
+	{30, 30, SPECIES_TORKOAL},
+	{29, 29, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GRAVELER},
+	{30, 30, SPECIES_GRAVELER},
+	{31, 31, SPECIES_GRAVELER},
+	{32, 32, SPECIES_GRAVELER},
+	{33, 33, SPECIES_GRAVELER},
+};
+
+const struct WildPokemonInfo gMagmaHideout_2F_1R_LandMonsInfo = {10, gMagmaHideout_2F_1R_LandMons};
+
+const struct WildPokemon gMagmaHideout_2F_2R_LandMons[] =
+{
+	{27, 27, SPECIES_GEODUDE},
+	{28, 28, SPECIES_TORKOAL},
+	{28, 28, SPECIES_GEODUDE},
+	{30, 30, SPECIES_TORKOAL},
+	{29, 29, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GRAVELER},
+	{30, 30, SPECIES_GRAVELER},
+	{31, 31, SPECIES_GRAVELER},
+	{32, 32, SPECIES_GRAVELER},
+	{33, 33, SPECIES_GRAVELER},
+};
+
+const struct WildPokemonInfo gMagmaHideout_2F_2R_LandMonsInfo = {10, gMagmaHideout_2F_2R_LandMons};
+
+const struct WildPokemon gMagmaHideout_3F_1R_LandMons[] =
+{
+	{27, 27, SPECIES_GEODUDE},
+	{28, 28, SPECIES_TORKOAL},
+	{28, 28, SPECIES_GEODUDE},
+	{30, 30, SPECIES_TORKOAL},
+	{29, 29, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GRAVELER},
+	{30, 30, SPECIES_GRAVELER},
+	{31, 31, SPECIES_GRAVELER},
+	{32, 32, SPECIES_GRAVELER},
+	{33, 33, SPECIES_GRAVELER},
+};
+
+const struct WildPokemonInfo gMagmaHideout_3F_1R_LandMonsInfo = {10, gMagmaHideout_3F_1R_LandMons};
+
+const struct WildPokemon gMagmaHideout_3F_2R_LandMons[] =
+{
+	{27, 27, SPECIES_GEODUDE},
+	{28, 28, SPECIES_TORKOAL},
+	{28, 28, SPECIES_GEODUDE},
+	{30, 30, SPECIES_TORKOAL},
+	{29, 29, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GRAVELER},
+	{30, 30, SPECIES_GRAVELER},
+	{31, 31, SPECIES_GRAVELER},
+	{32, 32, SPECIES_GRAVELER},
+	{33, 33, SPECIES_GRAVELER},
+};
+
+const struct WildPokemonInfo gMagmaHideout_3F_2R_LandMonsInfo = {10, gMagmaHideout_3F_2R_LandMons};
+
+const struct WildPokemon gMagmaHideout_4F_LandMons[] =
+{
+	{27, 27, SPECIES_GEODUDE},
+	{28, 28, SPECIES_TORKOAL},
+	{28, 28, SPECIES_GEODUDE},
+	{30, 30, SPECIES_TORKOAL},
+	{29, 29, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GRAVELER},
+	{30, 30, SPECIES_GRAVELER},
+	{31, 31, SPECIES_GRAVELER},
+	{32, 32, SPECIES_GRAVELER},
+	{33, 33, SPECIES_GRAVELER},
+};
+
+const struct WildPokemonInfo gMagmaHideout_4F_LandMonsInfo = {10, gMagmaHideout_4F_LandMons};
+
+const struct WildPokemon gMagmaHideout_3F_3R_LandMons[] =
+{
+	{27, 27, SPECIES_GEODUDE},
+	{28, 28, SPECIES_TORKOAL},
+	{28, 28, SPECIES_GEODUDE},
+	{30, 30, SPECIES_TORKOAL},
+	{29, 29, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GRAVELER},
+	{30, 30, SPECIES_GRAVELER},
+	{31, 31, SPECIES_GRAVELER},
+	{32, 32, SPECIES_GRAVELER},
+	{33, 33, SPECIES_GRAVELER},
+};
+
+const struct WildPokemonInfo gMagmaHideout_3F_3R_LandMonsInfo = {10, gMagmaHideout_3F_3R_LandMons};
+
+const struct WildPokemon gMagmaHideout_2F_3R_LandMons[] =
+{
+	{27, 27, SPECIES_GEODUDE},
+	{28, 28, SPECIES_TORKOAL},
+	{28, 28, SPECIES_GEODUDE},
+	{30, 30, SPECIES_TORKOAL},
+	{29, 29, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GEODUDE},
+	{30, 30, SPECIES_GRAVELER},
+	{30, 30, SPECIES_GRAVELER},
+	{31, 31, SPECIES_GRAVELER},
+	{32, 32, SPECIES_GRAVELER},
+	{33, 33, SPECIES_GRAVELER},
+};
+
+const struct WildPokemonInfo gMagmaHideout_2F_3R_LandMonsInfo = {10, gMagmaHideout_2F_3R_LandMons};
+
+const struct WildPokemon gMirageTower_1F_LandMons[] =
+{
+	{21, 21, SPECIES_SANDSHREW},
+	{21, 21, SPECIES_TRAPINCH},
+	{20, 20, SPECIES_SANDSHREW},
+	{20, 20, SPECIES_TRAPINCH},
+	{20, 20, SPECIES_SANDSHREW},
+	{20, 20, SPECIES_TRAPINCH},
+	{22, 22, SPECIES_SANDSHREW},
+	{22, 22, SPECIES_TRAPINCH},
+	{23, 23, SPECIES_SANDSHREW},
+	{23, 23, SPECIES_TRAPINCH},
+	{24, 24, SPECIES_SANDSHREW},
+	{24, 24, SPECIES_TRAPINCH},
+};
+
+const struct WildPokemonInfo gMirageTower_1F_LandMonsInfo = {10, gMirageTower_1F_LandMons};
+
+const struct WildPokemon gMirageTower_2F_LandMons[] =
+{
+	{21, 21, SPECIES_SANDSHREW},
+	{21, 21, SPECIES_TRAPINCH},
+	{20, 20, SPECIES_SANDSHREW},
+	{20, 20, SPECIES_TRAPINCH},
+	{20, 20, SPECIES_SANDSHREW},
+	{20, 20, SPECIES_TRAPINCH},
+	{22, 22, SPECIES_SANDSHREW},
+	{22, 22, SPECIES_TRAPINCH},
+	{23, 23, SPECIES_SANDSHREW},
+	{23, 23, SPECIES_TRAPINCH},
+	{24, 24, SPECIES_SANDSHREW},
+	{24, 24, SPECIES_TRAPINCH},
+};
+
+const struct WildPokemonInfo gMirageTower_2F_LandMonsInfo = {10, gMirageTower_2F_LandMons};
+
+const struct WildPokemon gMirageTower_3F_LandMons[] =
+{
+	{21, 21, SPECIES_SANDSHREW},
+	{21, 21, SPECIES_TRAPINCH},
+	{20, 20, SPECIES_SANDSHREW},
+	{20, 20, SPECIES_TRAPINCH},
+	{20, 20, SPECIES_SANDSHREW},
+	{20, 20, SPECIES_TRAPINCH},
+	{22, 22, SPECIES_SANDSHREW},
+	{22, 22, SPECIES_TRAPINCH},
+	{23, 23, SPECIES_SANDSHREW},
+	{23, 23, SPECIES_TRAPINCH},
+	{24, 24, SPECIES_SANDSHREW},
+	{24, 24, SPECIES_TRAPINCH},
+};
+
+const struct WildPokemonInfo gMirageTower_3F_LandMonsInfo = {10, gMirageTower_3F_LandMons};
+
+const struct WildPokemon gMirageTower_4F_LandMons[] =
+{
+	{21, 21, SPECIES_SANDSHREW},
+	{21, 21, SPECIES_TRAPINCH},
+	{20, 20, SPECIES_SANDSHREW},
+	{20, 20, SPECIES_TRAPINCH},
+	{20, 20, SPECIES_SANDSHREW},
+	{20, 20, SPECIES_TRAPINCH},
+	{22, 22, SPECIES_SANDSHREW},
+	{22, 22, SPECIES_TRAPINCH},
+	{23, 23, SPECIES_SANDSHREW},
+	{23, 23, SPECIES_TRAPINCH},
+	{24, 24, SPECIES_SANDSHREW},
+	{24, 24, SPECIES_TRAPINCH},
+};
+
+const struct WildPokemonInfo gMirageTower_4F_LandMonsInfo = {10, gMirageTower_4F_LandMons};
+
+const struct WildPokemon gDesertUnderpass_LandMons[] =
+{
+	{38, 38, SPECIES_DITTO},
+	{35, 35, SPECIES_WHISMUR},
+	{40, 40, SPECIES_DITTO},
+	{40, 40, SPECIES_LOUDRED},
+	{41, 41, SPECIES_DITTO},
+	{36, 36, SPECIES_WHISMUR},
+	{38, 38, SPECIES_LOUDRED},
+	{42, 42, SPECIES_DITTO},
+	{38, 38, SPECIES_WHISMUR},
+	{43, 43, SPECIES_DITTO},
+	{44, 44, SPECIES_LOUDRED},
+	{45, 45, SPECIES_DITTO},
+};
+
+const struct WildPokemonInfo gDesertUnderpass_LandMonsInfo = {10, gDesertUnderpass_LandMons};
+
+const struct WildPokemon gArtisanCave_B1F_LandMons[] =
+{
+	{40, 40, SPECIES_SMEARGLE},
+	{41, 41, SPECIES_SMEARGLE},
+	{42, 42, SPECIES_SMEARGLE},
+	{43, 43, SPECIES_SMEARGLE},
+	{44, 44, SPECIES_SMEARGLE},
+	{45, 45, SPECIES_SMEARGLE},
+	{46, 46, SPECIES_SMEARGLE},
+	{47, 47, SPECIES_SMEARGLE},
+	{48, 48, SPECIES_SMEARGLE},
+	{49, 49, SPECIES_SMEARGLE},
+	{50, 50, SPECIES_SMEARGLE},
+	{50, 50, SPECIES_SMEARGLE},
+};
+
+const struct WildPokemonInfo gArtisanCave_B1F_LandMonsInfo = {10, gArtisanCave_B1F_LandMons};
+
+const struct WildPokemon gArtisanCave_1F_LandMons[] =
+{
+	{40, 40, SPECIES_SMEARGLE},
+	{41, 41, SPECIES_SMEARGLE},
+	{42, 42, SPECIES_SMEARGLE},
+	{43, 43, SPECIES_SMEARGLE},
+	{44, 44, SPECIES_SMEARGLE},
+	{45, 45, SPECIES_SMEARGLE},
+	{46, 46, SPECIES_SMEARGLE},
+	{47, 47, SPECIES_SMEARGLE},
+	{48, 48, SPECIES_SMEARGLE},
+	{49, 49, SPECIES_SMEARGLE},
+	{50, 50, SPECIES_SMEARGLE},
+	{50, 50, SPECIES_SMEARGLE},
+};
+
+const struct WildPokemonInfo gArtisanCave_1F_LandMonsInfo = {10, gArtisanCave_1F_LandMons};
+
+const struct WildPokemon gAlteringCave1_LandMons[] =
+{
+	{10, 10, SPECIES_ZUBAT},
+	{12, 12, SPECIES_ZUBAT},
+	{8, 8, SPECIES_ZUBAT},
+	{14, 14, SPECIES_ZUBAT},
+	{10, 10, SPECIES_ZUBAT},
+	{12, 12, SPECIES_ZUBAT},
+	{16, 16, SPECIES_ZUBAT},
+	{6, 6, SPECIES_ZUBAT},
+	{8, 8, SPECIES_ZUBAT},
+	{14, 14, SPECIES_ZUBAT},
+	{8, 8, SPECIES_ZUBAT},
+	{14, 14, SPECIES_ZUBAT},
+};
+
+const struct WildPokemonInfo gAlteringCave1_LandMonsInfo = {7, gAlteringCave1_LandMons};
+
+const struct WildPokemon gAlteringCave2_LandMons[] =
+{
+	{7, 7, SPECIES_MAREEP},
+	{9, 9, SPECIES_MAREEP},
+	{5, 5, SPECIES_MAREEP},
+	{11, 11, SPECIES_MAREEP},
+	{7, 7, SPECIES_MAREEP},
+	{9, 9, SPECIES_MAREEP},
+	{13, 13, SPECIES_MAREEP},
+	{3, 3, SPECIES_MAREEP},
+	{5, 5, SPECIES_MAREEP},
+	{11, 11, SPECIES_MAREEP},
+	{5, 5, SPECIES_MAREEP},
+	{11, 11, SPECIES_MAREEP},
+};
+
+const struct WildPokemonInfo gAlteringCave2_LandMonsInfo = {7, gAlteringCave2_LandMons};
+
+const struct WildPokemon gAlteringCave3_LandMons[] =
+{
+	{23, 23, SPECIES_PINECO},
+	{25, 25, SPECIES_PINECO},
+	{22, 22, SPECIES_PINECO},
+	{27, 27, SPECIES_PINECO},
+	{23, 23, SPECIES_PINECO},
+	{25, 25, SPECIES_PINECO},
+	{29, 29, SPECIES_PINECO},
+	{19, 19, SPECIES_PINECO},
+	{21, 21, SPECIES_PINECO},
+	{27, 27, SPECIES_PINECO},
+	{21, 21, SPECIES_PINECO},
+	{27, 27, SPECIES_PINECO},
+};
+
+const struct WildPokemonInfo gAlteringCave3_LandMonsInfo = {7, gAlteringCave3_LandMons};
+
+const struct WildPokemon gAlteringCave4_LandMons[] =
+{
+	{16, 16, SPECIES_HOUNDOUR},
+	{18, 18, SPECIES_HOUNDOUR},
+	{14, 14, SPECIES_HOUNDOUR},
+	{20, 20, SPECIES_HOUNDOUR},
+	{16, 16, SPECIES_HOUNDOUR},
+	{18, 18, SPECIES_HOUNDOUR},
+	{22, 22, SPECIES_HOUNDOUR},
+	{12, 12, SPECIES_HOUNDOUR},
+	{14, 14, SPECIES_HOUNDOUR},
+	{20, 20, SPECIES_HOUNDOUR},
+	{14, 14, SPECIES_HOUNDOUR},
+	{20, 20, SPECIES_HOUNDOUR},
+};
+
+const struct WildPokemonInfo gAlteringCave4_LandMonsInfo = {7, gAlteringCave4_LandMons};
+
+const struct WildPokemon gAlteringCave5_LandMons[] =
+{
+	{10, 10, SPECIES_TEDDIURSA},
+	{12, 12, SPECIES_TEDDIURSA},
+	{8, 8, SPECIES_TEDDIURSA},
+	{14, 14, SPECIES_TEDDIURSA},
+	{10, 10, SPECIES_TEDDIURSA},
+	{12, 12, SPECIES_TEDDIURSA},
+	{16, 16, SPECIES_TEDDIURSA},
+	{6, 6, SPECIES_TEDDIURSA},
+	{8, 8, SPECIES_TEDDIURSA},
+	{14, 14, SPECIES_TEDDIURSA},
+	{8, 8, SPECIES_TEDDIURSA},
+	{14, 14, SPECIES_TEDDIURSA},
+};
+
+const struct WildPokemonInfo gAlteringCave5_LandMonsInfo = {7, gAlteringCave5_LandMons};
+
+const struct WildPokemon gAlteringCave6_LandMons[] =
+{
+	{22, 22, SPECIES_AIPOM},
+	{24, 24, SPECIES_AIPOM},
+	{20, 20, SPECIES_AIPOM},
+	{26, 26, SPECIES_AIPOM},
+	{22, 22, SPECIES_AIPOM},
+	{24, 24, SPECIES_AIPOM},
+	{28, 28, SPECIES_AIPOM},
+	{18, 18, SPECIES_AIPOM},
+	{20, 20, SPECIES_AIPOM},
+	{26, 26, SPECIES_AIPOM},
+	{20, 20, SPECIES_AIPOM},
+	{26, 26, SPECIES_AIPOM},
+};
+
+const struct WildPokemonInfo gAlteringCave6_LandMonsInfo = {7, gAlteringCave6_LandMons};
+
+const struct WildPokemon gAlteringCave7_LandMons[] =
+{
+	{22, 22, SPECIES_SHUCKLE},
+	{24, 24, SPECIES_SHUCKLE},
+	{20, 20, SPECIES_SHUCKLE},
+	{26, 26, SPECIES_SHUCKLE},
+	{22, 22, SPECIES_SHUCKLE},
+	{24, 24, SPECIES_SHUCKLE},
+	{28, 28, SPECIES_SHUCKLE},
+	{18, 18, SPECIES_SHUCKLE},
+	{20, 20, SPECIES_SHUCKLE},
+	{26, 26, SPECIES_SHUCKLE},
+	{20, 20, SPECIES_SHUCKLE},
+	{26, 26, SPECIES_SHUCKLE},
+};
+
+const struct WildPokemonInfo gAlteringCave7_LandMonsInfo = {7, gAlteringCave7_LandMons};
+
+const struct WildPokemon gAlteringCave8_LandMons[] =
+{
+	{22, 22, SPECIES_STANTLER},
+	{24, 24, SPECIES_STANTLER},
+	{20, 20, SPECIES_STANTLER},
+	{26, 26, SPECIES_STANTLER},
+	{22, 22, SPECIES_STANTLER},
+	{24, 24, SPECIES_STANTLER},
+	{28, 28, SPECIES_STANTLER},
+	{18, 18, SPECIES_STANTLER},
+	{20, 20, SPECIES_STANTLER},
+	{26, 26, SPECIES_STANTLER},
+	{20, 20, SPECIES_STANTLER},
+	{26, 26, SPECIES_STANTLER},
+};
+
+const struct WildPokemonInfo gAlteringCave8_LandMonsInfo = {7, gAlteringCave8_LandMons};
+
+const struct WildPokemon gAlteringCave9_LandMons[] =
+{
+	{22, 22, SPECIES_SMEARGLE},
+	{24, 24, SPECIES_SMEARGLE},
+	{20, 20, SPECIES_SMEARGLE},
+	{26, 26, SPECIES_SMEARGLE},
+	{22, 22, SPECIES_SMEARGLE},
+	{24, 24, SPECIES_SMEARGLE},
+	{28, 28, SPECIES_SMEARGLE},
+	{18, 18, SPECIES_SMEARGLE},
+	{20, 20, SPECIES_SMEARGLE},
+	{26, 26, SPECIES_SMEARGLE},
+	{20, 20, SPECIES_SMEARGLE},
+	{26, 26, SPECIES_SMEARGLE},
+};
+
+const struct WildPokemonInfo gAlteringCave9_LandMonsInfo = {7, gAlteringCave9_LandMons};
+
+const struct WildPokemon gMeteorFalls_StevensCave_LandMons[] =
+{
+	{33, 33, SPECIES_GOLBAT},
+	{35, 35, SPECIES_GOLBAT},
+	{33, 33, SPECIES_GOLBAT},
+	{35, 35, SPECIES_SOLROCK},
+	{33, 33, SPECIES_SOLROCK},
+	{37, 37, SPECIES_SOLROCK},
+	{35, 35, SPECIES_GOLBAT},
+	{39, 39, SPECIES_SOLROCK},
+	{38, 38, SPECIES_GOLBAT},
+	{40, 40, SPECIES_GOLBAT},
+	{38, 38, SPECIES_GOLBAT},
+	{40, 40, SPECIES_GOLBAT},
+};
+
+const struct WildPokemonInfo gMeteorFalls_StevensCave_LandMonsInfo = {10, gMeteorFalls_StevensCave_LandMons};
+
+const struct WildPokemonHeader gWildMonHeaders[] =
+{
+	{
+		.mapGroup = MAP_GROUP(ROUTE101),
+		.mapNum = MAP_NUM(ROUTE101),
+		.landMonsInfo = &gRoute101_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE102),
+		.mapNum = MAP_NUM(ROUTE102),
+		.landMonsInfo = &gRoute102_LandMonsInfo,
+		.waterMonsInfo = &gRoute102_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute102_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE103),
+		.mapNum = MAP_NUM(ROUTE103),
+		.landMonsInfo = &gRoute103_LandMonsInfo,
+		.waterMonsInfo = &gRoute103_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute103_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE104),
+		.mapNum = MAP_NUM(ROUTE104),
+		.landMonsInfo = &gRoute104_LandMonsInfo,
+		.waterMonsInfo = &gRoute104_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute104_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE105),
+		.mapNum = MAP_NUM(ROUTE105),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute105_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute105_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE110),
+		.mapNum = MAP_NUM(ROUTE110),
+		.landMonsInfo = &gRoute110_LandMonsInfo,
+		.waterMonsInfo = &gRoute110_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute110_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE111),
+		.mapNum = MAP_NUM(ROUTE111),
+		.landMonsInfo = &gRoute111_LandMonsInfo,
+		.waterMonsInfo = &gRoute111_WaterMonsInfo,
+		.rockSmashMonsInfo = &gRoute111_RockSmashMonsInfo,
+		.fishingMonsInfo = &gRoute111_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE112),
+		.mapNum = MAP_NUM(ROUTE112),
+		.landMonsInfo = &gRoute112_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE113),
+		.mapNum = MAP_NUM(ROUTE113),
+		.landMonsInfo = &gRoute113_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE114),
+		.mapNum = MAP_NUM(ROUTE114),
+		.landMonsInfo = &gRoute114_LandMonsInfo,
+		.waterMonsInfo = &gRoute114_WaterMonsInfo,
+		.rockSmashMonsInfo = &gRoute114_RockSmashMonsInfo,
+		.fishingMonsInfo = &gRoute114_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE116),
+		.mapNum = MAP_NUM(ROUTE116),
+		.landMonsInfo = &gRoute116_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE117),
+		.mapNum = MAP_NUM(ROUTE117),
+		.landMonsInfo = &gRoute117_LandMonsInfo,
+		.waterMonsInfo = &gRoute117_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute117_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE118),
+		.mapNum = MAP_NUM(ROUTE118),
+		.landMonsInfo = &gRoute118_LandMonsInfo,
+		.waterMonsInfo = &gRoute118_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute118_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE124),
+		.mapNum = MAP_NUM(ROUTE124),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute124_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute124_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(PETALBURG_WOODS),
+		.mapNum = MAP_NUM(PETALBURG_WOODS),
+		.landMonsInfo = &gPetalburgWoods_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(RUSTURF_TUNNEL),
+		.mapNum = MAP_NUM(RUSTURF_TUNNEL),
+		.landMonsInfo = &gRusturfTunnel_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(GRANITE_CAVE_1F),
+		.mapNum = MAP_NUM(GRANITE_CAVE_1F),
+		.landMonsInfo = &gGraniteCave_1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(GRANITE_CAVE_B1F),
+		.mapNum = MAP_NUM(GRANITE_CAVE_B1F),
+		.landMonsInfo = &gGraniteCave_B1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MT_PYRE_1F),
+		.mapNum = MAP_NUM(MT_PYRE_1F),
+		.landMonsInfo = &gMtPyre_1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(VICTORY_ROAD_1F),
+		.mapNum = MAP_NUM(VICTORY_ROAD_1F),
+		.landMonsInfo = &gVictoryRoad_1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST),
+		.mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST),
+		.landMonsInfo = &gSafariZone_South_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(UNDERWATER2),
+		.mapNum = MAP_NUM(UNDERWATER2),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gUnderwater2_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ABANDONED_SHIP_ROOMS_B1F),
+		.mapNum = MAP_NUM(ABANDONED_SHIP_ROOMS_B1F),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gAbandonedShip_Rooms_B1F_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gAbandonedShip_Rooms_B1F_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(GRANITE_CAVE_B2F),
+		.mapNum = MAP_NUM(GRANITE_CAVE_B2F),
+		.landMonsInfo = &gGraniteCave_B2F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = &gGraniteCave_B2F_RockSmashMonsInfo,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(FIERY_PATH),
+		.mapNum = MAP_NUM(FIERY_PATH),
+		.landMonsInfo = &gFieryPath_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(METEOR_FALLS_B1F_2R),
+		.mapNum = MAP_NUM(METEOR_FALLS_B1F_2R),
+		.landMonsInfo = &gMeteorFalls_B1F_2R_LandMonsInfo,
+		.waterMonsInfo = &gMeteorFalls_B1F_2R_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gMeteorFalls_B1F_2R_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(JAGGED_PASS),
+		.mapNum = MAP_NUM(JAGGED_PASS),
+		.landMonsInfo = &gJaggedPass_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE106),
+		.mapNum = MAP_NUM(ROUTE106),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute106_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute106_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE107),
+		.mapNum = MAP_NUM(ROUTE107),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute107_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute107_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE108),
+		.mapNum = MAP_NUM(ROUTE108),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute108_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute108_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE109),
+		.mapNum = MAP_NUM(ROUTE109),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute109_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute109_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE115),
+		.mapNum = MAP_NUM(ROUTE115),
+		.landMonsInfo = &gRoute115_LandMonsInfo,
+		.waterMonsInfo = &gRoute115_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute115_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(NEW_MAUVILLE_INSIDE),
+		.mapNum = MAP_NUM(NEW_MAUVILLE_INSIDE),
+		.landMonsInfo = &gNewMauville_Inside_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE119),
+		.mapNum = MAP_NUM(ROUTE119),
+		.landMonsInfo = &gRoute119_LandMonsInfo,
+		.waterMonsInfo = &gRoute119_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute119_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE120),
+		.mapNum = MAP_NUM(ROUTE120),
+		.landMonsInfo = &gRoute120_LandMonsInfo,
+		.waterMonsInfo = &gRoute120_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute120_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE121),
+		.mapNum = MAP_NUM(ROUTE121),
+		.landMonsInfo = &gRoute121_LandMonsInfo,
+		.waterMonsInfo = &gRoute121_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute121_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE122),
+		.mapNum = MAP_NUM(ROUTE122),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute122_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute122_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE123),
+		.mapNum = MAP_NUM(ROUTE123),
+		.landMonsInfo = &gRoute123_LandMonsInfo,
+		.waterMonsInfo = &gRoute123_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute123_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(MT_PYRE_2F),
+		.mapNum = MAP_NUM(MT_PYRE_2F),
+		.landMonsInfo = &gMtPyre_2F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MT_PYRE_3F),
+		.mapNum = MAP_NUM(MT_PYRE_3F),
+		.landMonsInfo = &gMtPyre_3F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MT_PYRE_4F),
+		.mapNum = MAP_NUM(MT_PYRE_4F),
+		.landMonsInfo = &gMtPyre_4F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MT_PYRE_5F),
+		.mapNum = MAP_NUM(MT_PYRE_5F),
+		.landMonsInfo = &gMtPyre_5F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MT_PYRE_6F),
+		.mapNum = MAP_NUM(MT_PYRE_6F),
+		.landMonsInfo = &gMtPyre_6F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MT_PYRE_EXTERIOR),
+		.mapNum = MAP_NUM(MT_PYRE_EXTERIOR),
+		.landMonsInfo = &gMtPyre_Exterior_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MT_PYRE_SUMMIT),
+		.mapNum = MAP_NUM(MT_PYRE_SUMMIT),
+		.landMonsInfo = &gMtPyre_Summit_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(GRANITE_CAVE_STEVENS_ROOM),
+		.mapNum = MAP_NUM(GRANITE_CAVE_STEVENS_ROOM),
+		.landMonsInfo = &gGraniteCave_StevensRoom_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE125),
+		.mapNum = MAP_NUM(ROUTE125),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute125_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute125_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE126),
+		.mapNum = MAP_NUM(ROUTE126),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute126_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute126_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE127),
+		.mapNum = MAP_NUM(ROUTE127),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute127_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute127_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE128),
+		.mapNum = MAP_NUM(ROUTE128),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute128_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute128_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE129),
+		.mapNum = MAP_NUM(ROUTE129),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute129_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute129_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE130),
+		.mapNum = MAP_NUM(ROUTE130),
+		.landMonsInfo = &gRoute130_LandMonsInfo,
+		.waterMonsInfo = &gRoute130_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute130_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE131),
+		.mapNum = MAP_NUM(ROUTE131),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute131_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute131_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE132),
+		.mapNum = MAP_NUM(ROUTE132),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute132_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute132_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE133),
+		.mapNum = MAP_NUM(ROUTE133),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute133_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute133_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ROUTE134),
+		.mapNum = MAP_NUM(ROUTE134),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gRoute134_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gRoute134_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS),
+		.mapNum = MAP_NUM(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gAbandonedShip_HiddenFloorCorridors_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gAbandonedShip_HiddenFloorCorridors_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM1),
+		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM1),
+		.landMonsInfo = &gSeafloorCavern_Room1_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM2),
+		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM2),
+		.landMonsInfo = &gSeafloorCavern_Room2_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM3),
+		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM3),
+		.landMonsInfo = &gSeafloorCavern_Room3_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM4),
+		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM4),
+		.landMonsInfo = &gSeafloorCavern_Room4_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM5),
+		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM5),
+		.landMonsInfo = &gSeafloorCavern_Room5_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM6),
+		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM6),
+		.landMonsInfo = &gSeafloorCavern_Room6_LandMonsInfo,
+		.waterMonsInfo = &gSeafloorCavern_Room6_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gSeafloorCavern_Room6_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM7),
+		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM7),
+		.landMonsInfo = &gSeafloorCavern_Room7_LandMonsInfo,
+		.waterMonsInfo = &gSeafloorCavern_Room7_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gSeafloorCavern_Room7_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM8),
+		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM8),
+		.landMonsInfo = &gSeafloorCavern_Room8_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ENTRANCE),
+		.mapNum = MAP_NUM(SEAFLOOR_CAVERN_ENTRANCE),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gSeafloorCavern_Entrance_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gSeafloorCavern_Entrance_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_ENTRANCE),
+		.mapNum = MAP_NUM(CAVE_OF_ORIGIN_ENTRANCE),
+		.landMonsInfo = &gCaveOfOrigin_Entrance_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_1F),
+		.mapNum = MAP_NUM(CAVE_OF_ORIGIN_1F),
+		.landMonsInfo = &gCaveOfOrigin_1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B1F),
+		.mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B1F),
+		.landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B2F),
+		.mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B2F),
+		.landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B3F),
+		.mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B3F),
+		.landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(NEW_MAUVILLE_ENTRANCE),
+		.mapNum = MAP_NUM(NEW_MAUVILLE_ENTRANCE),
+		.landMonsInfo = &gNewMauville_Entrance_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHWEST),
+		.mapNum = MAP_NUM(SAFARI_ZONE_SOUTHWEST),
+		.landMonsInfo = &gSafariZone_Southwest_LandMonsInfo,
+		.waterMonsInfo = &gSafariZone_Southwest_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST),
+		.mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST),
+		.landMonsInfo = &gSafariZone_North_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHWEST),
+		.mapNum = MAP_NUM(SAFARI_ZONE_NORTHWEST),
+		.landMonsInfo = &gSafariZone_Northwest_LandMonsInfo,
+		.waterMonsInfo = &gSafariZone_Northwest_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gSafariZone_Northwest_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(VICTORY_ROAD_B1F),
+		.mapNum = MAP_NUM(VICTORY_ROAD_B1F),
+		.landMonsInfo = &gVictoryRoad_B1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = &gVictoryRoad_B1F_RockSmashMonsInfo,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(VICTORY_ROAD_B2F),
+		.mapNum = MAP_NUM(VICTORY_ROAD_B2F),
+		.landMonsInfo = &gVictoryRoad_B2F_LandMonsInfo,
+		.waterMonsInfo = &gVictoryRoad_B2F_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gVictoryRoad_B2F_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(METEOR_FALLS_1F_1R),
+		.mapNum = MAP_NUM(METEOR_FALLS_1F_1R),
+		.landMonsInfo = &gMeteorFalls_1F_1R_LandMonsInfo,
+		.waterMonsInfo = &gMeteorFalls_1F_1R_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gMeteorFalls_1F_1R_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(METEOR_FALLS_1F_2R),
+		.mapNum = MAP_NUM(METEOR_FALLS_1F_2R),
+		.landMonsInfo = &gMeteorFalls_1F_2R_LandMonsInfo,
+		.waterMonsInfo = &gMeteorFalls_1F_2R_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gMeteorFalls_1F_2R_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(METEOR_FALLS_B1F_1R),
+		.mapNum = MAP_NUM(METEOR_FALLS_B1F_1R),
+		.landMonsInfo = &gMeteorFalls_B1F_1R_LandMonsInfo,
+		.waterMonsInfo = &gMeteorFalls_B1F_1R_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gMeteorFalls_B1F_1R_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM),
+		.mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM),
+		.landMonsInfo = &gShoalCave_LowTideStairsRoom_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM),
+		.mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM),
+		.landMonsInfo = &gShoalCave_LowTideLowerRoom_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_INNER_ROOM),
+		.mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_INNER_ROOM),
+		.landMonsInfo = &gShoalCave_LowTideInnerRoom_LandMonsInfo,
+		.waterMonsInfo = &gShoalCave_LowTideInnerRoom_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gShoalCave_LowTideInnerRoom_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM),
+		.mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM),
+		.landMonsInfo = &gShoalCave_LowTideEntranceRoom_LandMonsInfo,
+		.waterMonsInfo = &gShoalCave_LowTideEntranceRoom_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gShoalCave_LowTideEntranceRoom_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(LILYCOVE_CITY),
+		.mapNum = MAP_NUM(LILYCOVE_CITY),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gLilycoveCity_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gLilycoveCity_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(DEWFORD_TOWN),
+		.mapNum = MAP_NUM(DEWFORD_TOWN),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gDewfordTown_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gDewfordTown_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(SLATEPORT_CITY),
+		.mapNum = MAP_NUM(SLATEPORT_CITY),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gSlateportCity_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gSlateportCity_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(MOSSDEEP_CITY),
+		.mapNum = MAP_NUM(MOSSDEEP_CITY),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gMossdeepCity_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gMossdeepCity_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(PACIFIDLOG_TOWN),
+		.mapNum = MAP_NUM(PACIFIDLOG_TOWN),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gPacifidlogTown_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gPacifidlogTown_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(EVER_GRANDE_CITY),
+		.mapNum = MAP_NUM(EVER_GRANDE_CITY),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gEverGrandeCity_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gEverGrandeCity_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(PETALBURG_CITY),
+		.mapNum = MAP_NUM(PETALBURG_CITY),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gPetalburgCity_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gPetalburgCity_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(UNDERWATER1),
+		.mapNum = MAP_NUM(UNDERWATER1),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gUnderwater1_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ICE_ROOM),
+		.mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ICE_ROOM),
+		.landMonsInfo = &gShoalCave_LowTideIceRoom_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SKY_PILLAR_1F),
+		.mapNum = MAP_NUM(SKY_PILLAR_1F),
+		.landMonsInfo = &gSkyPillar_1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SOOTOPOLIS_CITY),
+		.mapNum = MAP_NUM(SOOTOPOLIS_CITY),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = &gSootopolisCity_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gSootopolisCity_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(SKY_PILLAR_3F),
+		.mapNum = MAP_NUM(SKY_PILLAR_3F),
+		.landMonsInfo = &gSkyPillar_3F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SKY_PILLAR_5F),
+		.mapNum = MAP_NUM(SKY_PILLAR_5F),
+		.landMonsInfo = &gSkyPillar_5F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(SAFARI_ZONE_EM_2),
+		.mapNum = MAP_NUM(SAFARI_ZONE_EM_2),
+		.landMonsInfo = &gSafariZone_Southeast_LandMonsInfo,
+		.waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo,
+	},
+	{
+		.mapGroup = MAP_GROUP(SAFARI_ZONE_EM_1),
+		.mapNum = MAP_NUM(SAFARI_ZONE_EM_1),
+		.landMonsInfo = &gSafariZone_Northeast_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_1F),
+		.mapNum = MAP_NUM(MAGMA_HIDEOUT_1F),
+		.landMonsInfo = &gMagmaHideout_1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_1R),
+		.mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_1R),
+		.landMonsInfo = &gMagmaHideout_2F_1R_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_2R),
+		.mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_2R),
+		.landMonsInfo = &gMagmaHideout_2F_2R_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_1R),
+		.mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_1R),
+		.landMonsInfo = &gMagmaHideout_3F_1R_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_2R),
+		.mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_2R),
+		.landMonsInfo = &gMagmaHideout_3F_2R_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_4F),
+		.mapNum = MAP_NUM(MAGMA_HIDEOUT_4F),
+		.landMonsInfo = &gMagmaHideout_4F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_3F_3R),
+		.mapNum = MAP_NUM(MAGMA_HIDEOUT_3F_3R),
+		.landMonsInfo = &gMagmaHideout_3F_3R_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MAGMA_HIDEOUT_2F_3R),
+		.mapNum = MAP_NUM(MAGMA_HIDEOUT_2F_3R),
+		.landMonsInfo = &gMagmaHideout_2F_3R_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MIRAGE_TOWER_1F),
+		.mapNum = MAP_NUM(MIRAGE_TOWER_1F),
+		.landMonsInfo = &gMirageTower_1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MIRAGE_TOWER_2F),
+		.mapNum = MAP_NUM(MIRAGE_TOWER_2F),
+		.landMonsInfo = &gMirageTower_2F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MIRAGE_TOWER_3F),
+		.mapNum = MAP_NUM(MIRAGE_TOWER_3F),
+		.landMonsInfo = &gMirageTower_3F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(MIRAGE_TOWER_4F),
+		.mapNum = MAP_NUM(MIRAGE_TOWER_4F),
+		.landMonsInfo = &gMirageTower_4F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(DESERT_UNDERPASS),
+		.mapNum = MAP_NUM(DESERT_UNDERPASS),
+		.landMonsInfo = &gDesertUnderpass_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ARTISAN_CAVE_B1F),
+		.mapNum = MAP_NUM(ARTISAN_CAVE_B1F),
+		.landMonsInfo = &gArtisanCave_B1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ARTISAN_CAVE_1F),
+		.mapNum = MAP_NUM(ARTISAN_CAVE_1F),
+		.landMonsInfo = &gArtisanCave_1F_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ALTERING_CAVE),
+		.mapNum = MAP_NUM(ALTERING_CAVE),
+		.landMonsInfo = &gAlteringCave1_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ALTERING_CAVE),
+		.mapNum = MAP_NUM(ALTERING_CAVE),
+		.landMonsInfo = &gAlteringCave2_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ALTERING_CAVE),
+		.mapNum = MAP_NUM(ALTERING_CAVE),
+		.landMonsInfo = &gAlteringCave3_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ALTERING_CAVE),
+		.mapNum = MAP_NUM(ALTERING_CAVE),
+		.landMonsInfo = &gAlteringCave4_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ALTERING_CAVE),
+		.mapNum = MAP_NUM(ALTERING_CAVE),
+		.landMonsInfo = &gAlteringCave5_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ALTERING_CAVE),
+		.mapNum = MAP_NUM(ALTERING_CAVE),
+		.landMonsInfo = &gAlteringCave6_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ALTERING_CAVE),
+		.mapNum = MAP_NUM(ALTERING_CAVE),
+		.landMonsInfo = &gAlteringCave7_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ALTERING_CAVE),
+		.mapNum = MAP_NUM(ALTERING_CAVE),
+		.landMonsInfo = &gAlteringCave8_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(ALTERING_CAVE),
+		.mapNum = MAP_NUM(ALTERING_CAVE),
+		.landMonsInfo = &gAlteringCave9_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(METEOR_FALLS_STEVENS_CAVE),
+		.mapNum = MAP_NUM(METEOR_FALLS_STEVENS_CAVE),
+		.landMonsInfo = &gMeteorFalls_StevensCave_LandMonsInfo,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = MAP_GROUP(UNDEFINED),
+		.mapNum = MAP_NUM(UNDEFINED),
+		.landMonsInfo = NULL,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+};
+
+const struct WildPokemon gBattlePyramidPlaceholders_1[] =
+{
+	{5, 5, SPECIES_BULBASAUR},
+	{5, 5, SPECIES_BULBASAUR},
+	{5, 5, SPECIES_BULBASAUR},
+	{5, 5, SPECIES_BULBASAUR},
+	{5, 5, SPECIES_IVYSAUR},
+	{5, 5, SPECIES_IVYSAUR},
+	{5, 5, SPECIES_VENUSAUR},
+	{5, 5, SPECIES_VENUSAUR},
+	{5, 5, SPECIES_VENUSAUR},
+	{5, 5, SPECIES_CHARMANDER},
+	{5, 5, SPECIES_VENUSAUR},
+	{5, 5, SPECIES_CHARMANDER},
+};
+
+const struct WildPokemonInfo gBattlePyramidPlaceholders_1Info = {4, gBattlePyramidPlaceholders_1};
+
+const struct WildPokemon gBattlePyramidPlaceholders_2[] =
+{
+	{5, 5, SPECIES_IVYSAUR},
+	{5, 5, SPECIES_IVYSAUR},
+	{5, 5, SPECIES_IVYSAUR},
+	{5, 5, SPECIES_IVYSAUR},
+	{5, 5, SPECIES_VENUSAUR},
+	{5, 5, SPECIES_VENUSAUR},
+	{5, 5, SPECIES_CHARMANDER},
+	{5, 5, SPECIES_CHARMANDER},
+	{5, 5, SPECIES_CHARMANDER},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMANDER},
+};
+
+const struct WildPokemonInfo gBattlePyramidPlaceholders_2Info = {4, gBattlePyramidPlaceholders_2};
+
+const struct WildPokemon gBattlePyramidPlaceholders_3[] =
+{
+	{5, 5, SPECIES_VENUSAUR},
+	{5, 5, SPECIES_VENUSAUR},
+	{5, 5, SPECIES_VENUSAUR},
+	{5, 5, SPECIES_VENUSAUR},
+	{5, 5, SPECIES_CHARMANDER},
+	{5, 5, SPECIES_CHARMANDER},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARIZARD},
+};
+
+const struct WildPokemonInfo gBattlePyramidPlaceholders_3Info = {4, gBattlePyramidPlaceholders_3};
+
+const struct WildPokemon gBattlePyramidPlaceholders_4[] =
+{
+	{5, 5, SPECIES_CHARMANDER},
+	{5, 5, SPECIES_CHARMANDER},
+	{5, 5, SPECIES_CHARMANDER},
+	{5, 5, SPECIES_CHARMANDER},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_SQUIRTLE},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_SQUIRTLE},
+};
+
+const struct WildPokemonInfo gBattlePyramidPlaceholders_4Info = {4, gBattlePyramidPlaceholders_4};
+
+const struct WildPokemon gBattlePyramidPlaceholders_5[] =
+{
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_SQUIRTLE},
+	{5, 5, SPECIES_SQUIRTLE},
+	{5, 5, SPECIES_SQUIRTLE},
+	{5, 5, SPECIES_WARTORTLE},
+	{5, 5, SPECIES_SQUIRTLE},
+	{5, 5, SPECIES_WARTORTLE},
+};
+
+const struct WildPokemonInfo gBattlePyramidPlaceholders_5Info = {4, gBattlePyramidPlaceholders_5};
+
+const struct WildPokemon gBattlePyramidPlaceholders_6[] =
+{
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_SQUIRTLE},
+	{5, 5, SPECIES_SQUIRTLE},
+	{5, 5, SPECIES_WARTORTLE},
+	{5, 5, SPECIES_WARTORTLE},
+	{5, 5, SPECIES_WARTORTLE},
+	{5, 5, SPECIES_WARTORTLE},
+	{5, 5, SPECIES_WARTORTLE},
+	{5, 5, SPECIES_WARTORTLE},
+};
+
+const struct WildPokemonInfo gBattlePyramidPlaceholders_6Info = {4, gBattlePyramidPlaceholders_6};
+
+const struct WildPokemon gBattlePyramidPlaceholders_7[] =
+{
+	{5, 5, SPECIES_WARTORTLE},
+	{5, 5, SPECIES_WARTORTLE},
+	{5, 5, SPECIES_SQUIRTLE},
+	{5, 5, SPECIES_SQUIRTLE},
+	{5, 5, SPECIES_SQUIRTLE},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_CHARIZARD},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMELEON},
+	{5, 5, SPECIES_CHARMELEON},
+};
+
+const struct WildPokemonInfo gBattlePyramidPlaceholders_7Info = {8, gBattlePyramidPlaceholders_7};
+
+const struct WildPokemonHeader gBattlePyramidWildMonHeaders[] =
+{
+	{
+		.mapGroup = 0,
+		.mapNum = 1,
+		.landMonsInfo = &gBattlePyramidPlaceholders_1Info,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 0,
+		.mapNum = 2,
+		.landMonsInfo = &gBattlePyramidPlaceholders_2Info,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 0,
+		.mapNum = 3,
+		.landMonsInfo = &gBattlePyramidPlaceholders_3Info,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 0,
+		.mapNum = 4,
+		.landMonsInfo = &gBattlePyramidPlaceholders_4Info,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 0,
+		.mapNum = 5,
+		.landMonsInfo = &gBattlePyramidPlaceholders_5Info,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 0,
+		.mapNum = 6,
+		.landMonsInfo = &gBattlePyramidPlaceholders_6Info,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 0,
+		.mapNum = 7,
+		.landMonsInfo = &gBattlePyramidPlaceholders_7Info,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 255,
+		.mapNum = 255,
+		.landMonsInfo = NULL,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+};
+
+const struct WildPokemon gBattlePikeMons_1[] =
+{
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+	{5, 5, SPECIES_DUSCLOPS},
+	{5, 5, SPECIES_DUSCLOPS},
+	{5, 5, SPECIES_DUSCLOPS},
+	{5, 5, SPECIES_DUSCLOPS},
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+	{5, 5, SPECIES_DUSCLOPS},
+	{5, 5, SPECIES_DUSCLOPS},
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+};
+
+const struct WildPokemonInfo gBattlePikeMonsInfo_1 = {10, gBattlePikeMons_1};
+
+const struct WildPokemon gBattlePikeMons_2[] =
+{
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+	{5, 5, SPECIES_ELECTRODE},
+	{5, 5, SPECIES_ELECTRODE},
+	{5, 5, SPECIES_ELECTRODE},
+	{5, 5, SPECIES_ELECTRODE},
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+	{5, 5, SPECIES_ELECTRODE},
+	{5, 5, SPECIES_ELECTRODE},
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+};
+
+const struct WildPokemonInfo gBattlePikeMonsInfo_2 = {10, gBattlePikeMons_2};
+
+const struct WildPokemon gBattlePikeMons_3[] =
+{
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+	{5, 5, SPECIES_BRELOOM},
+	{5, 5, SPECIES_BRELOOM},
+	{5, 5, SPECIES_BRELOOM},
+	{5, 5, SPECIES_BRELOOM},
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+	{5, 5, SPECIES_BRELOOM},
+	{5, 5, SPECIES_BRELOOM},
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+};
+
+const struct WildPokemonInfo gBattlePikeMonsInfo_3 = {10, gBattlePikeMons_3};
+
+const struct WildPokemon gBattlePikeMons_4[] =
+{
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+	{5, 5, SPECIES_WOBBUFFET},
+	{5, 5, SPECIES_WOBBUFFET},
+	{5, 5, SPECIES_WOBBUFFET},
+	{5, 5, SPECIES_WOBBUFFET},
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+	{5, 5, SPECIES_WOBBUFFET},
+	{5, 5, SPECIES_WOBBUFFET},
+	{5, 5, SPECIES_SEVIPER},
+	{5, 5, SPECIES_MILOTIC},
+};
+
+const struct WildPokemonInfo gBattlePikeMonsInfo_4 = {10, gBattlePikeMons_4};
+
+const struct WildPokemonHeader gBattlePikeWildMonHeaders[] =
+{
+	{
+		.mapGroup = 0,
+		.mapNum = 1,
+		.landMonsInfo = &gBattlePikeMonsInfo_1,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 0,
+		.mapNum = 2,
+		.landMonsInfo = &gBattlePikeMonsInfo_2,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 0,
+		.mapNum = 3,
+		.landMonsInfo = &gBattlePikeMonsInfo_3,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 0,
+		.mapNum = 4,
+		.landMonsInfo = &gBattlePikeMonsInfo_4,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+	{
+		.mapGroup = 255,
+		.mapNum = 255,
+		.landMonsInfo = NULL,
+		.waterMonsInfo = NULL,
+		.rockSmashMonsInfo = NULL,
+		.fishingMonsInfo = NULL,
+	},
+};
+
+const struct WildPokemon gWildFeebasRoute119Data = {20, 25, SPECIES_FEEBAS};
+
+const u16 gRoute119WaterTileData[] =
+{
+	0, 0x2D, 0,
+	0x2E, 0x5B, 0x83,
+	0x5C, 0x8B, 0x12A,
+};
 
+// code
 void DisableWildEncounters(bool8 disabled)
 {
     sWildEncountersDisabled = disabled;
-- 
cgit v1.2.3


From f78fa6aabfe3c7301eab7250ee2b152feec90b0e Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Mon, 5 Feb 2018 19:46:59 -0600
Subject: rename bank to battler

---
 src/battle_ai_script_commands.c           |  180 +-
 src/battle_ai_switch_items.c              |  274 +--
 src/battle_anim.c                         |   70 +-
 src/battle_bg.c                           |    2 +-
 src/battle_controller_link_opponent.c     |  770 ++++----
 src/battle_controller_link_partner.c      |  684 +++----
 src/battle_controller_opponent.c          |  784 ++++----
 src/battle_controller_player.c            | 1198 ++++++------
 src/battle_controller_player_partner.c    |  726 ++++----
 src/battle_controller_recorded_opponent.c |  730 ++++----
 src/battle_controller_recorded_player.c   |  752 ++++----
 src/battle_controller_safari.c            |  158 +-
 src/battle_controller_wally.c             |  472 ++---
 src/battle_controllers.c                  |  360 ++--
 src/battle_gfx_sfx_util.c                 |  162 +-
 src/battle_interface.c                    |   72 +-
 src/battle_main.c                         | 1224 ++++++------
 src/battle_message.c                      |   96 +-
 src/battle_script_commands.c              | 2868 ++++++++++++++---------------
 src/battle_util.c                         | 1212 ++++++------
 src/battle_util2.c                        |   20 +-
 src/pokeball.c                            |   46 +-
 src/pokemon_2.c                           |   36 +-
 src/pokemon_3.c                           |   16 +-
 src/recorded_battle.c                     |   50 +-
 src/reshow_battle_screen.c                |   40 +-
 26 files changed, 6501 insertions(+), 6501 deletions(-)

(limited to 'src')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 5dd9ecdc0..2ddc3fdfe 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -45,17 +45,17 @@ AI scripts.
 */
 
 extern u32 gBattleTypeFlags;
-extern u8 gActiveBank;
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u8 gActiveBattler;
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern u16 gCurrentMove;
-extern u8 gBankDefender;
-extern u8 gAbsentBankFlags;
-extern u16 gLastMoves[BATTLE_BANKS_COUNT];
+extern u8 gBattleDefender;
+extern u8 gAbsentBattlerFlags;
+extern u16 gLastMoves[MAX_BATTLERS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
-extern u32 gStatuses3[BATTLE_BANKS_COUNT];
+extern u32 gStatuses3[MAX_BATTLERS_COUNT];
 extern u16 gSideStatuses[2];
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
 extern u16 gDynamicBasePower;
 extern u8 gMoveResultFlags;
 extern s32 gBattleMoveDamage;
@@ -352,7 +352,7 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves)
         defaultScoreMoves >>= 1;
     }
 
-    moveLimitations = CheckMoveLimitations(gActiveBank, 0, 0xFF);
+    moveLimitations = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
 
     // ignore moves that aren't possible to use
     for (i = 0; i < 4; i++)
@@ -363,18 +363,18 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves)
         AI_THINKING_STRUCT->simulatedRNG[i] = 100 - (Random() % 16);
     }
     gBattleResources->AI_ScriptsStack->size = 0;
-    sBank_AI = gActiveBank;
+    sBank_AI = gActiveBattler;
     // decide a random target bank in doubles
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        gBankDefender = (Random() & BIT_MON) + (GetBankSide(gActiveBank) ^ BIT_SIDE);
-        if (gAbsentBankFlags & gBitTable[gBankDefender])
-            gBankDefender ^= BIT_MON;
+        gBattleDefender = (Random() & BIT_FLANK) + (GetBattlerSide(gActiveBattler) ^ BIT_SIDE);
+        if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
+            gBattleDefender ^= BIT_FLANK;
     }
     // in singles there's only one choice
     else
     {
-        gBankDefender = sBank_AI ^ BIT_SIDE;
+        gBattleDefender = sBank_AI ^ BIT_SIDE;
     }
 
     if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
@@ -491,7 +491,7 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
             else
                 BattleAI_SetupAIData(0xF);
 
-            gBankDefender = i;
+            gBattleDefender = i;
 
             if ((i & BIT_SIDE) != (sBank_AI & BIT_SIDE))
                 RecordLastUsedMoveByTarget();
@@ -542,7 +542,7 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
                 bestMovePointsForTarget[i] = mostViableMovesScores[0];
 
                 // don't use a move against ally if it has less than 100 pts
-                if (i == (sBank_AI ^ BIT_MON) && bestMovePointsForTarget[i] < 100)
+                if (i == (sBank_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100)
                 {
                     bestMovePointsForTarget[i] = -1;
                     mostViableMovesScores[0] = mostViableMovesScores[0]; // needed to match
@@ -573,8 +573,8 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
         }
     }
 
-    gBankDefender = mostViableTargetsArray[Random() % mostViableTargetsNo];
-    return actionOrMoveIndex[gBankDefender];
+    gBattleDefender = mostViableTargetsArray[Random() % mostViableTargetsNo];
+    return actionOrMoveIndex[gBattleDefender];
 }
 
 static void BattleAI_DoAIProcessing(void)
@@ -627,12 +627,12 @@ static void RecordLastUsedMoveByTarget(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleResources->battleHistory->usedMoves[gBankDefender].moves[i] == gLastMoves[gBankDefender])
+        if (gBattleResources->battleHistory->usedMoves[gBattleDefender].moves[i] == gLastMoves[gBattleDefender])
             break;
-        if (gBattleResources->battleHistory->usedMoves[gBankDefender].moves[i] != gLastMoves[gBankDefender]  // HACK: This redundant condition is a hack to make the asm match.
-         && gBattleResources->battleHistory->usedMoves[gBankDefender].moves[i] == 0)
+        if (gBattleResources->battleHistory->usedMoves[gBattleDefender].moves[i] != gLastMoves[gBattleDefender]  // HACK: This redundant condition is a hack to make the asm match.
+         && gBattleResources->battleHistory->usedMoves[gBattleDefender].moves[i] == 0)
         {
-            gBattleResources->battleHistory->usedMoves[gBankDefender].moves[i] = gLastMoves[gBankDefender];
+            gBattleResources->battleHistory->usedMoves[gBattleDefender].moves[i] = gLastMoves[gBattleDefender];
             break;
         }
     }
@@ -723,7 +723,7 @@ static void BattleAICmd_if_hp_less_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) < gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -738,7 +738,7 @@ static void BattleAICmd_if_hp_more_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) > gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -753,7 +753,7 @@ static void BattleAICmd_if_hp_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) == gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -768,7 +768,7 @@ static void BattleAICmd_if_hp_not_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) != gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -784,7 +784,7 @@ static void BattleAICmd_if_status(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -802,7 +802,7 @@ static void BattleAICmd_if_not_status(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -820,7 +820,7 @@ static void BattleAICmd_if_status2(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -838,7 +838,7 @@ static void BattleAICmd_if_not_status2(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -856,7 +856,7 @@ static void BattleAICmd_if_status3(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -874,7 +874,7 @@ static void BattleAICmd_if_not_status3(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -892,9 +892,9 @@ static void BattleAICmd_if_side_affecting(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
-    side = GET_BANK_SIDE(bank);
+    side = GET_BATTLER_SIDE(bank);
     status = AIScriptRead32(gAIScriptPtr + 2);
 
     if ((gSideStatuses[side] & status) != 0)
@@ -911,9 +911,9 @@ static void BattleAICmd_if_not_side_affecting(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
-    side = GET_BANK_SIDE(bank);
+    side = GET_BATTLER_SIDE(bank);
     status = AIScriptRead32(gAIScriptPtr + 2);
 
     if ((gSideStatuses[side] & status) == 0)
@@ -1126,13 +1126,13 @@ static void BattleAICmd_get_type(void)
         AI_THINKING_STRUCT->funcResult = gBattleMons[sBank_AI].type1;
         break;
     case AI_TYPE1_TARGET: // target primary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[gBankDefender].type1;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattleDefender].type1;
         break;
     case AI_TYPE2_USER: // AI user secondary type
         AI_THINKING_STRUCT->funcResult = gBattleMons[sBank_AI].type2;
         break;
     case AI_TYPE2_TARGET: // target secondary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[gBankDefender].type2;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattleDefender].type2;
         break;
     case AI_TYPE_MOVE: // type of move being pointed to
         AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].type;
@@ -1149,11 +1149,11 @@ static u8 BattleAI_GetWantedBank(u8 bank)
             return sBank_AI;
         case AI_TARGET:
         default:
-            return gBankDefender;
+            return gBattleDefender;
         case AI_USER_PARTNER:
-            return sBank_AI ^ BIT_MON;
+            return sBank_AI ^ BIT_FLANK;
         case AI_TARGET_PARTNER:
-            return gBankDefender ^ BIT_MON;
+            return gBattleDefender ^ BIT_FLANK;
     }
 }
 
@@ -1212,8 +1212,8 @@ static void BattleAICmd_get_how_powerful_move_is(void)
                 && gBattleMoves[gBattleMons[sBank_AI].moves[checkedMove]].power > 1)
             {
                 gCurrentMove = gBattleMons[sBank_AI].moves[checkedMove];
-                AI_CalcDmg(sBank_AI, gBankDefender);
-                TypeCalc(gCurrentMove, sBank_AI, gBankDefender);
+                AI_CalcDmg(sBank_AI, gBattleDefender);
+                TypeCalc(gCurrentMove, sBank_AI, gBattleDefender);
                 moveDmgs[checkedMove] = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[checkedMove] / 100;
                 if (moveDmgs[checkedMove] == 0)
                     moveDmgs[checkedMove] = 1;
@@ -1248,7 +1248,7 @@ static void BattleAICmd_get_last_used_bank_move(void)
     if (gAIScriptPtr[1] == AI_USER)
         AI_THINKING_STRUCT->funcResult = gLastMoves[sBank_AI];
     else
-        AI_THINKING_STRUCT->funcResult = gLastMoves[gBankDefender];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[gBattleDefender];
 
     gAIScriptPtr += 2;
 }
@@ -1271,7 +1271,7 @@ static void BattleAICmd_if_not_equal_(void) // same as if_not_equal
 
 static void BattleAICmd_if_user_goes(void)
 {
-    if (GetWhoStrikesFirst(sBank_AI, gBankDefender, TRUE) == gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(sBank_AI, gBattleDefender, TRUE) == gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1279,7 +1279,7 @@ static void BattleAICmd_if_user_goes(void)
 
 static void BattleAICmd_if_user_doesnt_go(void)
 {
-    if (GetWhoStrikesFirst(sBank_AI, gBankDefender, TRUE) != gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(sBank_AI, gBattleDefender, TRUE) != gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1305,9 +1305,9 @@ static void BattleAICmd_count_usable_party_mons(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
-    if (GetBankSide(bank) == SIDE_PLAYER)
+    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -1316,8 +1316,8 @@ static void BattleAICmd_count_usable_party_mons(void)
     {
         u32 position;
         bankOnField1 = gBattlePartyID[bank];
-        position = GetBankPosition(bank) ^ BIT_MON;
-        bankOnField2 = gBattlePartyID[GetBankByPosition(position)];
+        position = GetBattlerPosition(bank) ^ BIT_FLANK;
+        bankOnField2 = gBattlePartyID[GetBattlerAtPosition(position)];
     }
     else // in singles there's only one bank by side
     {
@@ -1358,9 +1358,9 @@ static void BattleAICmd_get_ability(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
-    if (gActiveBank != bank)
+    if (gActiveBattler != bank)
     {
         if (BATTLE_HISTORY->abilities[bank] != 0)
         {
@@ -1493,7 +1493,7 @@ static void BattleAICmd_get_highest_type_effectiveness(void)
 
         if (gCurrentMove)
         {
-            TypeCalc(gCurrentMove, sBank_AI, gBankDefender);
+            TypeCalc(gCurrentMove, sBank_AI, gBattleDefender);
 
             // reduce by 1/3.
             if (gBattleMoveDamage == 120)
@@ -1528,7 +1528,7 @@ static void BattleAICmd_if_type_effectiveness(void)
     gBattleMoveDamage = AI_EFFECTIVENESS_x1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
 
-    TypeCalc(gCurrentMove, sBank_AI, gBankDefender);
+    TypeCalc(gCurrentMove, sBank_AI, gBattleDefender);
 
     if (gBattleMoveDamage == 120)
         gBattleMoveDamage = AI_EFFECTIVENESS_x2;
@@ -1572,11 +1572,11 @@ static void BattleAICmd_if_status_in_party(void)
             bank = sBank_AI;
             break;
         default:
-            bank = gBankDefender;
+            bank = gBattleDefender;
             break;
     }
 
-    party = (GetBankSide(bank) == SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
+    party = (GetBattlerSide(bank) == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
 
     statusToCompareTo = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -1609,11 +1609,11 @@ static void BattleAICmd_if_status_not_in_party(void)
             bank = sBank_AI;
             break;
         default:
-            bank = gBankDefender;
+            bank = gBattleDefender;
             break;
     }
 
-    party = (GetBankSide(bank) == SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
+    party = (GetBattlerSide(bank) == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
 
     statusToCompareTo = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -1669,7 +1669,7 @@ static void BattleAICmd_if_stat_level_less_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] < gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1684,7 +1684,7 @@ static void BattleAICmd_if_stat_level_more_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] > gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1699,7 +1699,7 @@ static void BattleAICmd_if_stat_level_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] == gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1714,7 +1714,7 @@ static void BattleAICmd_if_stat_level_not_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] != gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1736,8 +1736,8 @@ static void BattleAICmd_if_can_faint(void)
     gMoveResultFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    AI_CalcDmg(sBank_AI, gBankDefender);
-    TypeCalc(gCurrentMove, sBank_AI, gBankDefender);
+    AI_CalcDmg(sBank_AI, gBattleDefender);
+    TypeCalc(gCurrentMove, sBank_AI, gBattleDefender);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
@@ -1745,7 +1745,7 @@ static void BattleAICmd_if_can_faint(void)
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
 
-    if (gBattleMons[gBankDefender].hp <= gBattleMoveDamage)
+    if (gBattleMons[gBattleDefender].hp <= gBattleMoveDamage)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -1765,14 +1765,14 @@ static void BattleAICmd_if_cant_faint(void)
     gMoveResultFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    AI_CalcDmg(sBank_AI, gBankDefender);
-    TypeCalc(gCurrentMove, sBank_AI, gBankDefender);
+    AI_CalcDmg(sBank_AI, gBattleDefender);
+    TypeCalc(gCurrentMove, sBank_AI, gBattleDefender);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
     // this macro is missing the damage 0 = 1 assumption.
 
-    if (gBattleMons[gBankDefender].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattleDefender].hp > gBattleMoveDamage)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -1802,7 +1802,7 @@ static void BattleAICmd_if_has_move(void)
                 return;
             }
         case AI_USER_PARTNER:
-            if (gBattleMons[sBank_AI ^ BIT_MON].hp == 0)
+            if (gBattleMons[sBank_AI ^ BIT_FLANK].hp == 0)
             {
                 gAIScriptPtr += 8;
                 return;
@@ -1811,7 +1811,7 @@ static void BattleAICmd_if_has_move(void)
             {
                 for (i = 0; i < 4; i++)
                 {
-                    if (gBattleMons[sBank_AI ^ BIT_MON].moves[i] == *movePtr)
+                    if (gBattleMons[sBank_AI ^ BIT_FLANK].moves[i] == *movePtr)
                         break;
                 }
             }
@@ -1829,7 +1829,7 @@ static void BattleAICmd_if_has_move(void)
         case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
-                if (BATTLE_HISTORY->usedMoves[gBankDefender].moves[i] == *movePtr)
+                if (BATTLE_HISTORY->usedMoves[gBattleDefender].moves[i] == *movePtr)
                     break;
             }
             if (i == 4)
@@ -1873,7 +1873,7 @@ static void BattleAICmd_if_doesnt_have_move(void)
         case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
-                if (BATTLE_HISTORY->usedMoves[gBankDefender].moves[i] == *movePtr)
+                if (BATTLE_HISTORY->usedMoves[gBattleDefender].moves[i] == *movePtr)
                     break;
             }
             if (i != 4)
@@ -1911,8 +1911,8 @@ static void BattleAICmd_if_has_move_with_effect(void)
     case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            // UB: checks sBank_AI instead of gBankDefender
-            if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBankDefender].moves[i]].effect == gAIScriptPtr[2])
+            // UB: checks sBank_AI instead of gBattleDefender
+            if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattleDefender].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i == 4)
@@ -1945,7 +1945,7 @@ static void BattleAICmd_if_doesnt_have_move_with_effect(void)
     case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            if (BATTLE_HISTORY->usedMoves[gBankDefender].moves[i] && gBattleMoves[BATTLE_HISTORY->usedMoves[gBankDefender].moves[i]].effect == gAIScriptPtr[2])
+            if (BATTLE_HISTORY->usedMoves[gBattleDefender].moves[i] && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattleDefender].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i != 4)
@@ -1963,7 +1963,7 @@ static void BattleAICmd_if_any_move_disabled_or_encored(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     if (gAIScriptPtr[2] == 0)
     {
@@ -1993,7 +1993,7 @@ static void BattleAICmd_if_curr_move_disabled_or_encored(void)
     switch (gAIScriptPtr[1])
     {
     case 0:
-        if (gDisableStructs[gActiveBank].disabledMove == AI_THINKING_STRUCT->moveConsidered)
+        if (gDisableStructs[gActiveBattler].disabledMove == AI_THINKING_STRUCT->moveConsidered)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2001,7 +2001,7 @@ static void BattleAICmd_if_curr_move_disabled_or_encored(void)
         gAIScriptPtr += 6;
         return;
     case 1:
-        if (gDisableStructs[gActiveBank].encoredMove == AI_THINKING_STRUCT->moveConsidered)
+        if (gDisableStructs[gActiveBattler].encoredMove == AI_THINKING_STRUCT->moveConsidered)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2041,9 +2041,9 @@ static void BattleAICmd_get_hold_effect(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
-    if (gActiveBank != bank)
+    if (gActiveBattler != bank)
         AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(BATTLE_HISTORY->itemEffects[bank]);
     else
         AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(gBattleMons[bank].item);
@@ -2079,7 +2079,7 @@ static void BattleAICmd_get_gender(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     AI_THINKING_STRUCT->funcResult = GetGenderFromSpeciesAndPersonality(gBattleMons[bank].species, gBattleMons[bank].personality);
 
@@ -2093,7 +2093,7 @@ static void BattleAICmd_is_first_turn_for(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].isFirstTurn;
 
@@ -2107,7 +2107,7 @@ static void BattleAICmd_get_stockpile_count(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].stockpileCounter;
 
@@ -2128,7 +2128,7 @@ static void BattleAICmd_get_used_held_item(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     // This is likely a leftover from Ruby's code and its ugly ewram access
     #ifdef NONMATCHING
@@ -2168,7 +2168,7 @@ static void BattleAICmd_get_protect_count(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBankDefender;
+        bank = gBattleDefender;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].protectUses;
 
@@ -2221,7 +2221,7 @@ static void BattleAICmd_if_level_cond(void)
     switch (gAIScriptPtr[1])
     {
     case 0: // greater than
-        if (gBattleMons[sBank_AI].level > gBattleMons[gBankDefender].level)
+        if (gBattleMons[sBank_AI].level > gBattleMons[gBattleDefender].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2229,7 +2229,7 @@ static void BattleAICmd_if_level_cond(void)
         gAIScriptPtr += 6;
         return;
     case 1: // less than
-        if (gBattleMons[sBank_AI].level < gBattleMons[gBankDefender].level)
+        if (gBattleMons[sBank_AI].level < gBattleMons[gBattleDefender].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2237,7 +2237,7 @@ static void BattleAICmd_if_level_cond(void)
         gAIScriptPtr += 6;
         return;
     case 2: // equal
-        if (gBattleMons[sBank_AI].level == gBattleMons[gBankDefender].level)
+        if (gBattleMons[sBank_AI].level == gBattleMons[gBattleDefender].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2249,7 +2249,7 @@ static void BattleAICmd_if_level_cond(void)
 
 static void BattleAICmd_if_target_taunted(void)
 {
-    if (gDisableStructs[gBankDefender].tauntTimer1 != 0)
+    if (gDisableStructs[gBattleDefender].tauntTimer1 != 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -2257,7 +2257,7 @@ static void BattleAICmd_if_target_taunted(void)
 
 static void BattleAICmd_if_target_not_taunted(void)
 {
-    if (gDisableStructs[gBankDefender].tauntTimer1 == 0)
+    if (gDisableStructs[gBattleDefender].tauntTimer1 == 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -2265,7 +2265,7 @@ static void BattleAICmd_if_target_not_taunted(void)
 
 static void BattleAICmd_if_target_is_ally(void)
 {
-    if ((sBank_AI & BIT_SIDE) == (gBankDefender & BIT_SIDE))
+    if ((sBank_AI & BIT_SIDE) == (gBattleDefender & BIT_SIDE))
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 60212f849..7d187559b 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -10,14 +10,14 @@
 #include "constants/items.h"
 #include "pokemon_item_effects.h"
 
-extern u8 gActiveBank;
-extern u8 gAbsentBankFlags;
+extern u8 gActiveBattler;
+extern u8 gAbsentBattlerFlags;
 extern u32 gBattleTypeFlags;
-extern u32 gStatuses3[BATTLE_BANKS_COUNT];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
-extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
+extern u32 gStatuses3[MAX_BATTLERS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gLastLandedMoves[MAX_BATTLERS_COUNT];
+extern u8 gLastHitBy[MAX_BATTLERS_COUNT];
 extern u16 gDynamicBasePower;
 extern u8 gMoveResultFlags;
 extern u8 gCritMultiplier;
@@ -35,10 +35,10 @@ static bool8 ShouldUseItem(void);
 
 static bool8 ShouldSwitchIfPerishSong(void)
 {
-    if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG
-        && gDisableStructs[gActiveBank].perishSongTimer1 == 0)
+    if (gStatuses3[gActiveBattler] & STATUS3_PERISH_SONG
+        && gDisableStructs[gActiveBattler].perishSongTimer1 == 0)
     {
-        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
+        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
@@ -60,15 +60,15 @@ static bool8 ShouldSwitchIfWonderGuard(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         return FALSE;
 
-    opposingPosition = B_POSITION_OPPOSITE(GetBankPosition(gActiveBank));
+    opposingPosition = B_POSITION_OPPOSITE(GetBattlerPosition(gActiveBattler));
 
-    if (gBattleMons[GetBankByPosition(opposingPosition)].ability != ABILITY_WONDER_GUARD)
+    if (gBattleMons[GetBattlerAtPosition(opposingPosition)].ability != ABILITY_WONDER_GUARD)
         return FALSE;
 
     // check if pokemon has a super effective move
-    for (opposingBank = GetBankByPosition(opposingPosition), i = 0; i < 4; i++)
+    for (opposingBank = GetBattlerAtPosition(opposingPosition), i = 0; i < 4; i++)
     {
-        move = gBattleMons[gActiveBank].moves[i];
+        move = gBattleMons[gActiveBattler].moves[i];
         if (move == MOVE_NONE)
             continue;
 
@@ -80,7 +80,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
     // get party information
     if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
     {
-        if ((gActiveBank & BIT_MON) == 0)
+        if ((gActiveBattler & BIT_FLANK) == 0)
             firstId = 0, lastId = 3;
         else
             firstId = 3, lastId = 6;
@@ -90,7 +90,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
         firstId = 0, lastId = 6;
     }
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -104,13 +104,13 @@ static bool8 ShouldSwitchIfWonderGuard(void)
             continue;
         if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             continue;
-        if (i == gBattlePartyID[gActiveBank])
+        if (i == gBattlePartyID[gActiveBattler])
             continue;
 
         GetMonData(&party[i], MON_DATA_SPECIES); // unused return value
         GetMonData(&party[i], MON_DATA_ALT_ABILITY); // unused return value
 
-        for (opposingBank = GetBankByPosition(opposingPosition), j = 0; j < 4; j++)
+        for (opposingBank = GetBattlerAtPosition(opposingPosition), j = 0; j < 4; j++)
         {
             move = GetMonData(&party[i], MON_DATA_MOVE1 + j);
             if (move == MOVE_NONE)
@@ -120,7 +120,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
             if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % 3 < 2)
             {
                 // we found a mon
-                *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
+                *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i;
                 EmitTwoReturnValues(1, ACTION_SWITCH, 0);
                 return TRUE;
             }
@@ -141,42 +141,42 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
 
     if (HasSuperEffectiveMoveAgainstOpponents(TRUE) && Random() % 3 != 0)
         return FALSE;
-    if (gLastLandedMoves[gActiveBank] == 0)
+    if (gLastLandedMoves[gActiveBattler] == 0)
         return FALSE;
-    if (gLastLandedMoves[gActiveBank] == 0xFFFF)
+    if (gLastLandedMoves[gActiveBattler] == 0xFFFF)
         return FALSE;
-    if (gBattleMoves[gLastLandedMoves[gActiveBank]].power == 0)
+    if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0)
         return FALSE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        bankIn1 = gActiveBank;
-        if (gAbsentBankFlags & gBitTable[GetBankByPosition(B_POSITION_PARTNER(GetBankPosition(gActiveBank)))])
-            bankIn2 = gActiveBank;
+        bankIn1 = gActiveBattler;
+        if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gActiveBattler)))])
+            bankIn2 = gActiveBattler;
         else
-            bankIn2 = GetBankByPosition(B_POSITION_PARTNER(GetBankPosition(gActiveBank)));
+            bankIn2 = GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gActiveBattler)));
     }
     else
     {
-        bankIn1 = gActiveBank;
-        bankIn2 = gActiveBank;
+        bankIn1 = gActiveBattler;
+        bankIn2 = gActiveBattler;
     }
 
-    if (gBattleMoves[gLastLandedMoves[gActiveBank]].type == TYPE_FIRE)
+    if (gBattleMoves[gLastLandedMoves[gActiveBattler]].type == TYPE_FIRE)
         absorbingTypeAbility = ABILITY_FLASH_FIRE;
-    else if (gBattleMoves[gLastLandedMoves[gActiveBank]].type == TYPE_WATER)
+    else if (gBattleMoves[gLastLandedMoves[gActiveBattler]].type == TYPE_WATER)
         absorbingTypeAbility = ABILITY_WATER_ABSORB;
-    else if (gBattleMoves[gLastLandedMoves[gActiveBank]].type == TYPE_ELECTRIC)
+    else if (gBattleMoves[gLastLandedMoves[gActiveBattler]].type == TYPE_ELECTRIC)
         absorbingTypeAbility = ABILITY_VOLT_ABSORB;
     else
         return FALSE;
 
-    if (gBattleMons[gActiveBank].ability == absorbingTypeAbility)
+    if (gBattleMons[gActiveBattler].ability == absorbingTypeAbility)
         return FALSE;
 
     if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
     {
-        if ((gActiveBank & BIT_MON) == 0)
+        if ((gActiveBattler & BIT_FLANK) == 0)
             firstId = 0, lastId = 3;
         else
             firstId = 3, lastId = 6;
@@ -186,7 +186,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
         firstId = 0, lastId = 6;
     }
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -220,7 +220,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
         if (absorbingTypeAbility == monAbility && Random() & 1)
         {
             // we found a mon
-            *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
+            *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i;
             EmitTwoReturnValues(1, ACTION_SWITCH, 0);
             return TRUE;
         }
@@ -231,22 +231,22 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
 
 static bool8 ShouldSwitchIfNaturalCure(void)
 {
-    if (!(gBattleMons[gActiveBank].status1 & STATUS1_SLEEP))
+    if (!(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP))
         return FALSE;
-    if (gBattleMons[gActiveBank].ability != ABILITY_NATURAL_CURE)
+    if (gBattleMons[gActiveBattler].ability != ABILITY_NATURAL_CURE)
         return FALSE;
-    if (gBattleMons[gActiveBank].hp < gBattleMons[gActiveBank].maxHP / 2)
+    if (gBattleMons[gActiveBattler].hp < gBattleMons[gActiveBattler].maxHP / 2)
         return FALSE;
 
-    if ((gLastLandedMoves[gActiveBank] == 0 || gLastLandedMoves[gActiveBank] == 0xFFFF) && Random() & 1)
+    if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1)
     {
-        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
+        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
-    else if (gBattleMoves[gLastLandedMoves[gActiveBank]].power == 0 && Random() & 1)
+    else if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0 && Random() & 1)
     {
-        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
+        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
@@ -257,7 +257,7 @@ static bool8 ShouldSwitchIfNaturalCure(void)
         return TRUE;
     if (Random() & 1)
     {
-        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
+        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
         EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
@@ -273,14 +273,14 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
     u8 moveFlags;
     u16 move;
 
-    opposingPosition = B_POSITION_OPPOSITE(GetBankPosition(gActiveBank));
-    opposingBank = GetBankByPosition(opposingPosition);
+    opposingPosition = B_POSITION_OPPOSITE(GetBattlerPosition(gActiveBattler));
+    opposingBank = GetBattlerAtPosition(opposingPosition);
 
-    if (!(gAbsentBankFlags & gBitTable[opposingBank]))
+    if (!(gAbsentBattlerFlags & gBitTable[opposingBank]))
     {
         for (i = 0; i < 4; i++)
         {
-            move = gBattleMons[gActiveBank].moves[i];
+            move = gBattleMons[gActiveBattler].moves[i];
             if (move == MOVE_NONE)
                 continue;
 
@@ -297,13 +297,13 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         return FALSE;
 
-    opposingBank = GetBankByPosition(B_POSITION_PARTNER(opposingPosition));
+    opposingBank = GetBattlerAtPosition(B_POSITION_PARTNER(opposingPosition));
 
-    if (!(gAbsentBankFlags & gBitTable[opposingBank]))
+    if (!(gAbsentBattlerFlags & gBitTable[opposingBank]))
     {
         for (i = 0; i < 4; i++)
         {
-            move = gBattleMons[gActiveBank].moves[i];
+            move = gBattleMons[gActiveBattler].moves[i];
             if (move == MOVE_NONE)
                 continue;
 
@@ -328,8 +328,8 @@ static bool8 AreStatsRaised(void)
 
     for (i = 0; i < BATTLE_STATS_NO; i++)
     {
-        if (gBattleMons[gActiveBank].statStages[i] > 6)
-            buffedStatsValue += gBattleMons[gActiveBank].statStages[i] - 6;
+        if (gBattleMons[gActiveBattler].statStages[i] > 6)
+            buffedStatsValue += gBattleMons[gActiveBattler].statStages[i] - 6;
     }
 
     return (buffedStatsValue > 3);
@@ -345,32 +345,32 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
     u16 move;
     u8 moveFlags;
 
-    if (gLastLandedMoves[gActiveBank] == 0)
+    if (gLastLandedMoves[gActiveBattler] == 0)
         return FALSE;
-    if (gLastLandedMoves[gActiveBank] == 0xFFFF)
+    if (gLastLandedMoves[gActiveBattler] == 0xFFFF)
         return FALSE;
-    if (gLastHitBy[gActiveBank] == 0xFF)
+    if (gLastHitBy[gActiveBattler] == 0xFF)
         return FALSE;
-    if (gBattleMoves[gLastLandedMoves[gActiveBank]].power == 0)
+    if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0)
         return FALSE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        bankIn1 = gActiveBank;
-        if (gAbsentBankFlags & gBitTable[GetBankByPosition(B_POSITION_PARTNER(GetBankPosition(gActiveBank)))])
-            bankIn2 = gActiveBank;
+        bankIn1 = gActiveBattler;
+        if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gActiveBattler)))])
+            bankIn2 = gActiveBattler;
         else
-            bankIn2 = GetBankByPosition(B_POSITION_PARTNER(GetBankPosition(gActiveBank)));
+            bankIn2 = GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gActiveBattler)));
     }
     else
     {
-        bankIn1 = gActiveBank;
-        bankIn2 = gActiveBank;
+        bankIn1 = gActiveBattler;
+        bankIn2 = gActiveBattler;
     }
 
     if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
     {
-        if ((gActiveBank & BIT_MON) == 0)
+        if ((gActiveBattler & BIT_FLANK) == 0)
             firstId = 0, lastId = 3;
         else
             firstId = 3, lastId = 6;
@@ -380,7 +380,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
         firstId = 0, lastId = 6;
     }
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -411,10 +411,10 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
         else
             monAbility = gBaseStats[species].ability1;
 
-        moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBank], species, monAbility);
+        moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBattler], species, monAbility);
         if (moveFlags & flags)
         {
-            bankIn1 = gLastHitBy[gActiveBank];
+            bankIn1 = gLastHitBy[gActiveBattler];
 
             for (j = 0; j < 4; j++)
             {
@@ -425,7 +425,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
                 moveFlags = AI_TypeCalc(move, gBattleMons[bankIn1].species, gBattleMons[bankIn1].ability);
                 if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % moduloPercent == 0)
                 {
-                    *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
+                    *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i;
                     EmitTwoReturnValues(1, ACTION_SWITCH, 0);
                     return TRUE;
                 }
@@ -446,19 +446,19 @@ static bool8 ShouldSwitch(void)
     s32 i;
     s32 availableToSwitch;
 
-    if (gBattleMons[*(activeBankPtr = &gActiveBank)].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
+    if (gBattleMons[*(activeBankPtr = &gActiveBattler)].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
         return FALSE;
-    if (gStatuses3[gActiveBank] & STATUS3_ROOTED)
+    if (gStatuses3[gActiveBattler] & STATUS3_ROOTED)
         return FALSE;
-    if (AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBank, ABILITY_SHADOW_TAG, 0, 0))
+    if (AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBattler, ABILITY_SHADOW_TAG, 0, 0))
         return FALSE;
-    if (AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBank, ABILITY_ARENA_TRAP, 0, 0))
+    if (AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBattler, ABILITY_ARENA_TRAP, 0, 0))
         return FALSE; // misses the flying or levitate check
     if (AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, ABILITY_MAGNET_PULL, 0, 0))
     {
-        if (gBattleMons[gActiveBank].type1 == TYPE_STEEL)
+        if (gBattleMons[gActiveBattler].type1 == TYPE_STEEL)
             return FALSE;
-        if (gBattleMons[gActiveBank].type2 == TYPE_STEEL)
+        if (gBattleMons[gActiveBattler].type2 == TYPE_STEEL)
             return FALSE;
     }
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
@@ -468,10 +468,10 @@ static bool8 ShouldSwitch(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = *activeBankPtr;
-        if (gAbsentBankFlags & gBitTable[GetBankByPosition(GetBankPosition(*activeBankPtr) ^ BIT_MON)])
+        if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(*activeBankPtr) ^ BIT_FLANK)])
             bankIn2 = *activeBankPtr;
         else
-            bankIn2 = GetBankByPosition(GetBankPosition(*activeBankPtr) ^ BIT_MON);
+            bankIn2 = GetBattlerAtPosition(GetBattlerPosition(*activeBankPtr) ^ BIT_FLANK);
     }
     else
     {
@@ -481,7 +481,7 @@ static bool8 ShouldSwitch(void)
 
     if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
     {
-        if ((gActiveBank & BIT_MON) == 0)
+        if ((gActiveBattler & BIT_FLANK) == 0)
             firstId = 0, lastId = 3;
         else
             firstId = 3, lastId = 6;
@@ -491,7 +491,7 @@ static bool8 ShouldSwitch(void)
         firstId = 0, lastId = 6;
     }
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -543,9 +543,9 @@ void AI_TrySwitchOrUseItem(void)
     u8 bankIn1, bankIn2;
     s32 firstId;
     s32 lastId; // + 1
-    u8 bankIdentity = GetBankPosition(gActiveBank);
+    u8 bankIdentity = GetBattlerPosition(gActiveBattler);
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -554,25 +554,25 @@ void AI_TrySwitchOrUseItem(void)
     {
         if (ShouldSwitch())
         {
-            if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) == 6)
+            if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) == 6)
             {
                 s32 monToSwitchId = GetMostSuitableMonToSwitchInto();
                 if (monToSwitchId == 6)
                 {
                     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
                     {
-                        bankIn1 = GetBankByPosition(bankIdentity);
+                        bankIn1 = GetBattlerAtPosition(bankIdentity);
                         bankIn2 = bankIn1;
                     }
                     else
                     {
-                        bankIn1 = GetBankByPosition(bankIdentity);
-                        bankIn2 = GetBankByPosition(bankIdentity ^ BIT_MON);
+                        bankIn1 = GetBattlerAtPosition(bankIdentity);
+                        bankIn2 = GetBattlerAtPosition(bankIdentity ^ BIT_FLANK);
                     }
 
                     if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
                     {
-                        if ((gActiveBank & BIT_MON) == 0)
+                        if ((gActiveBattler & BIT_FLANK) == 0)
                             firstId = 0, lastId = 3;
                         else
                             firstId = 3, lastId = 6;
@@ -599,10 +599,10 @@ void AI_TrySwitchOrUseItem(void)
                     }
                 }
 
-                *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = monToSwitchId;
+                *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = monToSwitchId;
             }
 
-            *(gBattleStruct->monToSwitchIntoId + gActiveBank) = *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank);
+            *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler);
             return;
         }
         else if (ShouldUseItem())
@@ -611,7 +611,7 @@ void AI_TrySwitchOrUseItem(void)
         }
     }
 
-    EmitTwoReturnValues(1, ACTION_USE_MOVE, (gActiveBank ^ BIT_SIDE) << 8);
+    EmitTwoReturnValues(1, ACTION_USE_MOVE, (gActiveBattler ^ BIT_SIDE) << 8);
 }
 
 static void ModulateByTypeEffectiveness(u8 atkType, u8 defType1, u8 defType2, u8 *var)
@@ -651,34 +651,34 @@ u8 GetMostSuitableMonToSwitchInto(void)
     u8 invalidMons;
     u16 move;
 
-    if (*(gBattleStruct->monToSwitchIntoId + gActiveBank) != 6)
-        return *(gBattleStruct->monToSwitchIntoId + gActiveBank);
+    if (*(gBattleStruct->monToSwitchIntoId + gActiveBattler) != 6)
+        return *(gBattleStruct->monToSwitchIntoId + gActiveBattler);
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-        return gBattlePartyID[gActiveBank] + 1;
+        return gBattlePartyID[gActiveBattler] + 1;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        bankIn1 = gActiveBank;
-        if (gAbsentBankFlags & gBitTable[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)])
-            bankIn2 = gActiveBank;
+        bankIn1 = gActiveBattler;
+        if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)])
+            bankIn2 = gActiveBattler;
         else
-            bankIn2 = GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON);
+            bankIn2 = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK);
 
         // UB: It considers the opponent only player's side even though it can battle alongside player;
-        opposingBank = Random() & BIT_MON;
-        if (gAbsentBankFlags & gBitTable[opposingBank])
-            opposingBank ^= BIT_MON;
+        opposingBank = Random() & BIT_FLANK;
+        if (gAbsentBattlerFlags & gBitTable[opposingBank])
+            opposingBank ^= BIT_FLANK;
     }
     else
     {
-        opposingBank = GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_SIDE);
-        bankIn1 = gActiveBank;
-        bankIn2 = gActiveBank;
+        opposingBank = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_SIDE);
+        bankIn1 = gActiveBattler;
+        bankIn2 = gActiveBattler;
     }
 
     if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
     {
-        if ((gActiveBank & BIT_MON) == 0)
+        if ((gActiveBattler & BIT_FLANK) == 0)
             firstId = 0, lastId = 3;
         else
             firstId = 3, lastId = 6;
@@ -688,7 +688,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
         firstId = 0, lastId = 6;
     }
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -734,7 +734,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
             for (i = 0; i < 4; i++)
             {
                 move = GetMonData(&party[bestMonId], MON_DATA_MOVE1 + i);
-                if (move != MOVE_NONE && TypeCalc(move, gActiveBank, opposingBank) & MOVE_RESULT_SUPER_EFFECTIVE)
+                if (move != MOVE_NONE && TypeCalc(move, gActiveBattler, opposingBank) & MOVE_RESULT_SUPER_EFFECTIVE)
                     break;
             }
 
@@ -779,8 +779,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
             gBattleMoveDamage = 0;
             if (move != MOVE_NONE && gBattleMoves[move].power != 1)
             {
-                AI_CalcDmg(gActiveBank, opposingBank);
-                TypeCalc(move, gActiveBank, opposingBank);
+                AI_CalcDmg(gActiveBattler, opposingBank);
+                TypeCalc(move, gActiveBattler, opposingBank);
             }
             if (bestDmg < gBattleMoveDamage)
             {
@@ -817,10 +817,10 @@ static bool8 ShouldUseItem(void)
     u8 validMons = 0;
     bool8 shouldUse = FALSE;
 
-    if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBankPosition(gActiveBank) == B_POSITION_PLAYER_RIGHT)
+    if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_RIGHT)
         return FALSE;
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -855,14 +855,14 @@ static bool8 ShouldUseItem(void)
         else
             itemEffects = gItemEffectTable[item - 13];
 
-        *(gBattleStruct->AI_itemType + gActiveBank / 2) = GetAI_ItemType(item, itemEffects);
+        *(gBattleStruct->AI_itemType + gActiveBattler / 2) = GetAI_ItemType(item, itemEffects);
 
-        switch (*(gBattleStruct->AI_itemType + gActiveBank / 2))
+        switch (*(gBattleStruct->AI_itemType + gActiveBattler / 2))
         {
         case AI_ITEM_FULL_RESTORE:
-            if (gBattleMons[gActiveBank].hp >= gBattleMons[gActiveBank].maxHP / 4)
+            if (gBattleMons[gActiveBattler].hp >= gBattleMons[gActiveBattler].maxHP / 4)
                 break;
-            if (gBattleMons[gActiveBank].hp == 0)
+            if (gBattleMons[gActiveBattler].hp == 0)
                 break;
             shouldUse = TRUE;
             break;
@@ -870,65 +870,65 @@ static bool8 ShouldUseItem(void)
             paramOffset = GetItemEffectParamOffset(item, 4, 4);
             if (paramOffset == 0)
                 break;
-            if (gBattleMons[gActiveBank].hp == 0)
+            if (gBattleMons[gActiveBattler].hp == 0)
                 break;
-            if (gBattleMons[gActiveBank].hp < gBattleMons[gActiveBank].maxHP / 4 || gBattleMons[gActiveBank].maxHP - gBattleMons[gActiveBank].hp > itemEffects[paramOffset])
+            if (gBattleMons[gActiveBattler].hp < gBattleMons[gActiveBattler].maxHP / 4 || gBattleMons[gActiveBattler].maxHP - gBattleMons[gActiveBattler].hp > itemEffects[paramOffset])
                 shouldUse = TRUE;
             break;
         case AI_ITEM_CURE_CONDITION:
-            *(gBattleStruct->AI_itemFlags + gActiveBank / 2) = 0;
-            if (itemEffects[3] & 0x20 && gBattleMons[gActiveBank].status1 & STATUS1_SLEEP)
+            *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) = 0;
+            if (itemEffects[3] & 0x20 && gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
             {
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x20;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x20;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x10 && (gBattleMons[gActiveBank].status1 & STATUS1_POISON || gBattleMons[gActiveBank].status1 & STATUS1_TOXIC_POISON))
+            if (itemEffects[3] & 0x10 && (gBattleMons[gActiveBattler].status1 & STATUS1_POISON || gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_POISON))
             {
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x10;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x10;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x8 && gBattleMons[gActiveBank].status1 & STATUS1_BURN)
+            if (itemEffects[3] & 0x8 && gBattleMons[gActiveBattler].status1 & STATUS1_BURN)
             {
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x8;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x8;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x4 && gBattleMons[gActiveBank].status1 & STATUS1_FREEZE)
+            if (itemEffects[3] & 0x4 && gBattleMons[gActiveBattler].status1 & STATUS1_FREEZE)
             {
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x4;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x4;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x2 && gBattleMons[gActiveBank].status1 & STATUS1_PARALYSIS)
+            if (itemEffects[3] & 0x2 && gBattleMons[gActiveBattler].status1 & STATUS1_PARALYSIS)
             {
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x2;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x2;
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & 0x1 && gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION)
+            if (itemEffects[3] & 0x1 && gBattleMons[gActiveBattler].status2 & STATUS2_CONFUSION)
             {
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x1;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x1;
                 shouldUse = TRUE;
             }
             break;
         case AI_ITEM_X_STAT:
-            *(gBattleStruct->AI_itemFlags + gActiveBank / 2) = 0;
-            if (gDisableStructs[gActiveBank].isFirstTurn == 0)
+            *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) = 0;
+            if (gDisableStructs[gActiveBattler].isFirstTurn == 0)
                 break;
             if (itemEffects[0] & 0xF)
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x1;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x1;
             if (itemEffects[1] & 0xF0)
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x2;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x2;
             if (itemEffects[1] & 0xF)
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x4;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x4;
             if (itemEffects[2] & 0xF)
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x8;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x8;
             if (itemEffects[2] & 0xF0)
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x20;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x20;
             if (itemEffects[0] & 0x30)
-                *(gBattleStruct->AI_itemFlags + gActiveBank / 2) |= 0x80;
+                *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x80;
             shouldUse = TRUE;
             break;
         case AI_ITEM_GUARD_SPECS:
-            bankSide = GetBankSide(gActiveBank);
-            if (gDisableStructs[gActiveBank].isFirstTurn != 0 && gSideTimers[bankSide].mistTimer == 0)
+            bankSide = GetBattlerSide(gActiveBattler);
+            if (gDisableStructs[gActiveBattler].isFirstTurn != 0 && gSideTimers[bankSide].mistTimer == 0)
                 shouldUse = TRUE;
             break;
         case AI_ITEM_NOT_RECOGNIZABLE:
@@ -938,7 +938,7 @@ static bool8 ShouldUseItem(void)
         if (shouldUse)
         {
             EmitTwoReturnValues(1, ACTION_USE_ITEM, 0);
-            *(gBattleStruct->chosenItem + (gActiveBank / 2) * 2) = item;
+            *(gBattleStruct->chosenItem + (gActiveBattler / 2) * 2) = item;
             gBattleResources->battleHistory->trainerItems[i] = 0;
             return shouldUse;
         }
diff --git a/src/battle_anim.c b/src/battle_anim.c
index c1051f93a..93d4de7b3 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -25,8 +25,8 @@
 
 #define ANIM_SPRITE_INDEX_COUNT 8
 
-extern u8 gBankAttacker;
-extern u8 gBankDefender;
+extern u8 gBattleAttacker;
+extern u8 gBattleDefender;
 extern u16 gBattle_WIN0H;
 extern u16 gBattle_WIN0V;
 extern u16 gBattle_WIN1H;
@@ -35,8 +35,8 @@ extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
@@ -132,7 +132,7 @@ EWRAM_DATA static u8 sAnimBackgroundFadeState = 0;
 EWRAM_DATA static u16 sAnimMoveIndex = 0; // set but unused.
 EWRAM_DATA u8 gAnimBankAttacker = 0;
 EWRAM_DATA u8 gAnimBankTarget = 0;
-EWRAM_DATA u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT] = {0};
+EWRAM_DATA u16 gAnimSpeciesByBanks[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gUnknown_02038440 = 0;
 
 // const rom data
@@ -221,8 +221,8 @@ void ClearBattleAnimationVars(void)
 
 void DoMoveAnim(u16 move)
 {
-    gAnimBankAttacker = gBankAttacker;
-    gAnimBankTarget = gBankDefender;
+    gAnimBankAttacker = gBattleAttacker;
+    gAnimBankTarget = gBattleDefender;
     LaunchBattleAnimation(gBattleAnims_Moves, move, TRUE);
 }
 
@@ -234,9 +234,9 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
     {
         sub_80A8278();
         UpdateOamPriorityInAllHealthboxes(0);
-        for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+        for (i = 0; i < MAX_BATTLERS_COUNT; i++)
         {
-            if (GetBankSide(i) != 0)
+            if (GetBattlerSide(i) != 0)
                 gAnimSpeciesByBanks[i] = GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_SPECIES);
             else
                 gAnimSpeciesByBanks[i] = GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_SPECIES);
@@ -613,7 +613,7 @@ static void ScriptCmd_monbg(void)
 
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 position = GetBankPosition(bank);
+        u8 position = GetBattlerPosition(bank);
         if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
@@ -629,10 +629,10 @@ static void ScriptCmd_monbg(void)
 
     }
 
-    bank ^= BIT_MON;
+    bank ^= BIT_FLANK;
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 position = GetBankPosition(bank);
+        u8 position = GetBattlerPosition(bank);
         if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
@@ -718,7 +718,7 @@ void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible)
         if (IsContest())
             bankIdentity = 0;
         else
-            bankIdentity = GetBankPosition(bank);
+            bankIdentity = GetBattlerPosition(bank);
 
         sub_8118FBC(1, 0, 0, bankIdentity, unknownStruct.unk8, unknownStruct.unk0, unknownStruct.unk4, unknownStruct.unkA);
 
@@ -750,7 +750,7 @@ void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible)
         LoadPalette(&gPlttBufferUnfaded[0x100 + bank * 16], 0x90, 0x20);
         CpuCopy32(&gPlttBufferUnfaded[0x100 + bank * 16], (void*)(BG_PLTT + 0x120), 0x20);
 
-        sub_8118FBC(2, 0, 0, GetBankPosition(bank), unknownStruct.unk8, unknownStruct.unk0 + 0x1000, unknownStruct.unk4 + 0x400, unknownStruct.unkA);
+        sub_8118FBC(2, 0, 0, GetBattlerPosition(bank), unknownStruct.unk8, unknownStruct.unk0 + 0x1000, unknownStruct.unk4 + 0x400, unknownStruct.unkA);
     }
 }
 
@@ -876,7 +876,7 @@ static void ScriptCmd_clearmonbg(void)
     if (sMonAnimTaskIdArray[0] != 0xFF)
         gSprites[gBankSpriteIds[bank]].invisible = 0;
     if (animBankId > 1 && sMonAnimTaskIdArray[1] != 0xFF)
-        gSprites[gBankSpriteIds[bank ^ BIT_MON]].invisible = 0;
+        gSprites[gBankSpriteIds[bank ^ BIT_FLANK]].invisible = 0;
     else
         animBankId = 0;
 
@@ -893,7 +893,7 @@ static void sub_80A4980(u8 taskId)
     if (gTasks[taskId].data[1] != 1)
     {
         u8 to_BG2;
-        u8 position = GetBankPosition(gTasks[taskId].data[2]);
+        u8 position = GetBattlerPosition(gTasks[taskId].data[2]);
         if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             to_BG2 = FALSE;
         else
@@ -937,7 +937,7 @@ static void ScriptCmd_monbg_22(void)
 
     if (IsAnimBankSpriteVisible(bank))
     {
-        u8 position = GetBankPosition(bank);
+        u8 position = GetBattlerPosition(bank);
         if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
@@ -946,10 +946,10 @@ static void ScriptCmd_monbg_22(void)
         sub_80A438C(bank, toBG_2, FALSE);
     }
 
-    bank ^= BIT_MON;
+    bank ^= BIT_FLANK;
     if (animBankId > 1 && IsAnimBankSpriteVisible(bank))
     {
-        u8 position = GetBankPosition(bank);
+        u8 position = GetBattlerPosition(bank);
         if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
@@ -982,8 +982,8 @@ static void ScriptCmd_clearmonbg_23(void)
 
     if (IsAnimBankSpriteVisible(bank))
         gSprites[gBankSpriteIds[bank]].invisible = 0;
-    if (animBankId > 1 && IsAnimBankSpriteVisible(bank ^ BIT_MON))
-        gSprites[gBankSpriteIds[bank ^ BIT_MON]].invisible = 0;
+    if (animBankId > 1 && IsAnimBankSpriteVisible(bank ^ BIT_FLANK))
+        gSprites[gBankSpriteIds[bank ^ BIT_FLANK]].invisible = 0;
     else
         animBankId = 0;
 
@@ -1001,7 +1001,7 @@ static void sub_80A4BB0(u8 taskId)
     {
         bool8 toBG_2;
         u8 bank = gTasks[taskId].data[2];
-        u8 position = GetBankPosition(bank);
+        u8 position = GetBattlerPosition(bank);
         if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
             toBG_2 = FALSE;
         else
@@ -1009,7 +1009,7 @@ static void sub_80A4BB0(u8 taskId)
 
         if (IsAnimBankSpriteVisible(bank))
             sub_80A477C(toBG_2);
-        if (gTasks[taskId].data[0] > 1 && IsAnimBankSpriteVisible(bank ^ BIT_MON))
+        if (gTasks[taskId].data[0] > 1 && IsAnimBankSpriteVisible(bank ^ BIT_FLANK))
             sub_80A477C(toBG_2 ^ 1);
 
         DestroyTask(taskId);
@@ -1145,7 +1145,7 @@ static void ScriptCmd_fadetobgfromset(void)
 
     if (IsContest())
         gTasks[taskId].tBackgroundId = bg3;
-    else if (GetBankSide(gAnimBankTarget) == SIDE_PLAYER)
+    else if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
         gTasks[taskId].tBackgroundId = bg2;
     else
         gTasks[taskId].tBackgroundId = bg1;
@@ -1272,7 +1272,7 @@ s8 BattleAnimAdjustPanning(s8 pan)
 {
     if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gAnimBankAttacker].statusAnimActive)
     {
-        if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
             pan = PAN_SIDE_OPPONENT;
         else
             pan = PAN_SIDE_PLAYER;
@@ -1282,9 +1282,9 @@ s8 BattleAnimAdjustPanning(s8 pan)
         if (gAnimBankAttacker != gAnimBankTarget || gAnimBankAttacker != 2 || pan != PAN_SIDE_OPPONENT)
             pan *= -1;
     }
-    else if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER)
+    else if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
     {
-        if (GetBankSide(gAnimBankTarget) == SIDE_PLAYER)
+        if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
         {
             if (pan == PAN_SIDE_OPPONENT)
                 pan = PAN_SIDE_PLAYER;
@@ -1292,7 +1292,7 @@ s8 BattleAnimAdjustPanning(s8 pan)
                 pan *= -1;
         }
     }
-    else if (GetBankSide(gAnimBankTarget) == SIDE_OPPONENT)
+    else if (GetBattlerSide(gAnimBankTarget) == B_SIDE_OPPONENT)
     {
         if (pan == PAN_SIDE_PLAYER)
             pan = PAN_SIDE_OPPONENT;
@@ -1314,14 +1314,14 @@ s8 BattleAnimAdjustPanning2(s8 pan)
 {
     if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gAnimBankAttacker].statusAnimActive)
     {
-        if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
+        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
             pan = PAN_SIDE_OPPONENT;
         else
             pan = PAN_SIDE_PLAYER;
     }
     else
     {
-        if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER || IsContest())
+        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER || IsContest())
             pan = -pan;
     }
     return pan;
@@ -1705,7 +1705,7 @@ static void ScriptCmd_monbgprio_28(void)
     else
         bank = gAnimBankAttacker;
 
-    bankIdentity = GetBankPosition(bank);
+    bankIdentity = GetBattlerPosition(bank);
     if (!IsContest() && (bankIdentity == B_POSITION_PLAYER_LEFT || bankIdentity == B_POSITION_OPPONENT_RIGHT))
     {
         SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
@@ -1731,14 +1731,14 @@ static void ScriptCmd_monbgprio_2A(void)
 
     wantedBank = sBattleAnimScriptPtr[1];
     sBattleAnimScriptPtr += 2;
-    if (GetBankSide(gAnimBankAttacker) != GetBankSide(gAnimBankTarget))
+    if (GetBattlerSide(gAnimBankAttacker) != GetBattlerSide(gAnimBankTarget))
     {
         if (wantedBank != ANIM_ATTACKER)
             bank = gAnimBankTarget;
         else
             bank = gAnimBankAttacker;
 
-        bankIdentity = GetBankPosition(bank);
+        bankIdentity = GetBattlerPosition(bank);
         if (!IsContest() && (bankIdentity == B_POSITION_PLAYER_LEFT || bankIdentity == B_POSITION_OPPONENT_RIGHT))
         {
             SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1);
@@ -1778,7 +1778,7 @@ static void ScriptCmd_doublebattle_2D(void)
     wantedBank = sBattleAnimScriptPtr[1];
     sBattleAnimScriptPtr += 2;
     if (!IsContest() && IsDoubleBattle()
-     && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
+     && GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
     {
         if (wantedBank == ANIM_ATTACKER)
         {
@@ -1813,7 +1813,7 @@ static void ScriptCmd_doublebattle_2E(void)
     wantedBank = sBattleAnimScriptPtr[1];
     sBattleAnimScriptPtr += 2;
     if (!IsContest() && IsDoubleBattle()
-     && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
+     && GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
     {
         if (wantedBank == ANIM_ATTACKER)
         {
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 4bb1e65a9..cb106adae 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -363,7 +363,7 @@ void sub_8035D74(u8 taskId)
     case 0:
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
-            for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+            for (i = 0; i < MAX_BATTLERS_COUNT; i++)
             {
                 name = gLinkPlayers[i].name;
                 linkPlayer = &gLinkPlayers[i];
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 1733ee966..0c7d929a4 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -25,32 +25,32 @@
 #include "data2.h"
 
 extern u32 gBattleExecBuffer;
-extern u8 gActiveBank;
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gBattleBanksCount;
+extern u8 gActiveBattler;
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern u16 gUnknown_020243FC;
-extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBankDefender;
-extern u8 gAbsentBankFlags;
+extern u8 gBattleDefender;
+extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
-extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
+extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 extern u16 gTrainerBattleOpponent_A;
@@ -203,15 +203,15 @@ static void nullsub_28(void)
 
 void SetControllerToLinkOpponent(void)
 {
-    gBattleBankFunc[gActiveBank] = LinkOpponentBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = LinkOpponentBufferRunCommand;
 }
 
 static void LinkOpponentBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sLinkOpponentBufferCommands))
-            sLinkOpponentBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sLinkOpponentBufferCommands))
+            sLinkOpponentBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             LinkOpponentBufferExecCompleted();
     }
@@ -219,32 +219,32 @@ static void LinkOpponentBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         LinkOpponentBufferExecCompleted();
 }
 
 static void CompleteOnBankSpriteCallbackDummy2(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         LinkOpponentBufferExecCompleted();
 }
 
 static void sub_8064470(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        FreeTrainerFrontPicPalette(gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        FreeTrainerFrontPicPalette(gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         LinkOpponentBufferExecCompleted();
     }
 }
 
 static void sub_80644D8(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 == 0xFF)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         LinkOpponentBufferExecCompleted();
     }
 }
@@ -256,13 +256,13 @@ static void sub_8064520(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
             r8 = TRUE;
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gHealthBoxesIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
@@ -271,39 +271,39 @@ static void sub_8064520(void)
 
     if (r8)
     {
-        if (r4 || !IsAnimBankSpriteVisible(gActiveBank ^ BIT_MON))
+        if (r4 || !IsAnimBankSpriteVisible(gActiveBattler ^ BIT_FLANK))
         {
-            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
                 return;
-            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
+            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
                 return;
 
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
 
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0;
 
             FreeSpriteTilesByTag(0x27F9);
             FreeSpritePaletteByTag(0x27F9);
         }
         else
         {
-            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
                 return;
 
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
 
-            if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
+            if (GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_RIGHT)
             {
                 FreeSpriteTilesByTag(0x27F9);
                 FreeSpritePaletteByTag(0x27F9);
             }
         }
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 3;
-        gBattleBankFunc[gActiveBank] = sub_80644D8;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
+        gBattlerFuncs[gActiveBattler] = sub_80644D8;
     }
 }
 
@@ -311,48 +311,48 @@ static void sub_8064734(void)
 {
     bool32 r10 = FALSE;
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
     {
-        sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
     }
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
     {
-        sub_8172EF0(gActiveBank ^ BIT_MON, &gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
+        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
     }
 
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank ^ BIT_MON], &gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]], HEALTHBOX_ALL);
-                sub_8076918(gActiveBank ^ BIT_MON);
-                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank ^ BIT_MON]);
+                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+                sub_8076918(gActiveBattler ^ BIT_FLANK);
+                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
             }
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-            sub_8076918(gActiveBank);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+            sub_8076918(gActiveBattler);
+            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 1;
     }
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x40
-        && gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x40
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x40
+        && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x40
         && !IsCryPlayingOrClearCrySongs())
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
-                if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_LEFT)
+                if (GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_LEFT)
                     m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
@@ -361,56 +361,56 @@ static void sub_8064734(void)
             }
         }
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 1;
         r10 = TRUE;
     }
 
     if (r10)
     {
-        if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         {
-            if (gBattleTypeFlags & BATTLE_TYPE_MULTI && GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
+            if (gBattleTypeFlags & BATTLE_TYPE_MULTI && GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_RIGHT)
             {
-                if (++gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 == 1)
+                if (++gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 1)
                     return;
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
             }
 
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]]);
-                SetBankEnemyShadowSpriteCallback(gActiveBank ^ BIT_MON, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]], MON_DATA_SPECIES));
+                DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
+                SetBankEnemyShadowSpriteCallback(gActiveBattler ^ BIT_FLANK, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], MON_DATA_SPECIES));
             }
 
 
-            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-            SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+            SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
 
             gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 0;
 
-            gBattleBankFunc[gActiveBank] = sub_8064520;
+            gBattlerFuncs[gActiveBattler] = sub_8064520;
         }
     }
 }
 
 static void sub_8064B04(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
-     && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+     && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80)
         {
-            sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+            sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
         }
         else
         {
-            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
             {
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
                 FreeSpriteTilesByTag(0x27F9);
                 FreeSpritePaletteByTag(0x27F9);
                 LinkOpponentBufferExecCompleted();
@@ -421,13 +421,13 @@ static void sub_8064B04(void)
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBank, gHealthBoxesIds[gActiveBank], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
@@ -437,21 +437,21 @@ static void CompleteOnHealthbarDone(void)
 
 static void sub_8064C14(void)
 {
-    if (!gSprites[gBankSpriteIds[gActiveBank]].inUse)
+    if (!gSprites[gBankSpriteIds[gActiveBattler]].inUse)
     {
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         LinkOpponentBufferExecCompleted();
     }
 }
 
 static void sub_8064C58(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBank);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        EnemyShadowCallbackToSetInvisible(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         LinkOpponentBufferExecCompleted();
     }
 }
@@ -464,7 +464,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -483,21 +483,21 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_8064D60(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattleBankFunc[gActiveBank] = sub_8064DD0;
+        gBattlerFuncs[gActiveBattler] = sub_8064DD0;
     }
 }
 
 static void sub_8064DD0(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive && !IsCryPlayingOrClearCrySongs())
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs())
     {
-        if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
-            || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2)
+        if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            || gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
         {
             m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             LinkOpponentBufferExecCompleted();
@@ -507,67 +507,67 @@ static void sub_8064DD0(void)
 
 static void sub_8064E50(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1
-     && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
+     && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
 
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
+        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-        sub_8076918(gActiveBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
-        CopyBattleSpriteInvisibility(gActiveBank);
-        gBattleBankFunc[gActiveBank] = sub_8064D60;
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        sub_8076918(gActiveBattler);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        CopyBattleSpriteInvisibility(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = sub_8064D60;
     }
 }
 
 static void sub_8064F40(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80)
     {
-        sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
     }
 
-    if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
-        gBattleBankFunc[gActiveBank] = sub_8064E50;
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+        gBattlerFuncs[gActiveBattler] = sub_8064E50;
     }
 }
 
 static void CompleteOnFinishedStatusAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
         LinkOpponentBufferExecCompleted();
 }
 
 static void CompleteOnFinishedBattleAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animFromTableActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
         LinkOpponentBufferExecCompleted();
 }
 
 static void LinkOpponentBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = LinkOpponentBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = LinkOpponentBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
+        gBattleBufferA[gActiveBattler][0] = CONTROLLER_TERMINATOR_NOP;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -578,13 +578,13 @@ static void LinkOpponentHandleGetMonData(void)
     u8 monToCheck;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyLinkOpponentMonData(gBattlePartyID[gActiveBank], monData);
+        size += CopyLinkOpponentMonData(gBattlePartyID[gActiveBattler], monData);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -606,7 +606,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         battleMon.species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES);
@@ -672,7 +672,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        data16 = GetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE);
+        data16 = GetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE);
         dst[0] = data16;
         dst[1] = data16 >> 8;
         size = 2;
@@ -687,7 +687,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE);
+        dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE);
         size = 1;
         break;
     case REQUEST_OTID_BATTLE:
@@ -912,13 +912,13 @@ static void LinkOpponentHandleSetMonData(void)
     u8 monToCheck;
     u8 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetLinkOpponentMonData(gBattlePartyID[gActiveBank]);
+        SetLinkOpponentMonData(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -931,11 +931,11 @@ static void LinkOpponentHandleSetMonData(void)
 
 static void SetLinkOpponentMonData(u8 monId)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         {
@@ -976,10 +976,10 @@ static void SetLinkOpponentMonData(u8 monId)
         }
         break;
     case REQUEST_SPECIES_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HELDITEM_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MOVES_PP_BATTLE:
         for (i = 0; i < 4; i++)
@@ -993,196 +993,196 @@ static void SetLinkOpponentMonData(u8 monId)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PP_DATA_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case REQUEST_PPMOVE1_BATTLE:
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_OTID_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_EXP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_FRIENDSHIP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKERUS_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LOCATION_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LEVEL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_GAME_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKEBALL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ALL_IVS_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case REQUEST_HP_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PERSONALITY_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CHECKSUM_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_STATUS_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_LEVEL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MAX_HP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SHEEN_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
 }
 
 static void LinkOpponentHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
+    u8 *dst = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
-    for (i = 0; i < gBattleBufferA[gActiveBank][2]; i++)
-        dst[i] = gBattleBufferA[gActiveBank][3 + i];
+    for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
+        dst[i] = gBattleBufferA[gActiveBattler][3 + i];
 
     LinkOpponentBufferExecCompleted();
 }
 
 static void LinkOpponentHandleLoadMonSprite(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
-    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    sub_806A068(species, GetBankPosition(gActiveBank));
+    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBank, 2),
-                                               GetBankSpriteDefault_Y(gActiveBank),
-                                               sub_80A82E4(gActiveBank));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBankCoord(gActiveBattler, 2),
+                                               GetBankSpriteDefault_Y(gActiveBattler),
+                                               sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
 
-    SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+    SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
 
-    gBattleBankFunc[gActiveBank] = sub_8064B04;
+    gBattlerFuncs[gActiveBattler] = sub_8064B04;
 }
 
 static void LinkOpponentHandleSwitchInAnim(void)
 {
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    sub_8066494(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_8064F40;
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    sub_8066494(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlerFuncs[gActiveBattler] = sub_8064F40;
 }
 
 static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
@@ -1194,7 +1194,7 @@ static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
     species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
-    sub_806A068(species, GetBankPosition(bank));
+    sub_806A068(species, GetBattlerPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
@@ -1219,37 +1219,37 @@ static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
 
 static void LinkOpponentHandleReturnMonToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-        gBattleBankFunc[gActiveBank] = DoSwitchOutAnimation;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBank);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        EnemyShadowCallbackToSetInvisible(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         LinkOpponentBufferExecCompleted();
     }
 }
 
 static void DoSwitchOutAnimation(void)
 {
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
-            gBattleBankFunc[gActiveBank] = sub_8064C58;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_OPPONENT_MON);
+            gBattlerFuncs[gActiveBattler] = sub_8064C58;
         }
         break;
     }
@@ -1262,39 +1262,39 @@ static void LinkOpponentHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBattlerPosition(gActiveBattler) & BIT_FLANK) != 0) // second mon
             xPos = 152;
         else // first mon
             xPos = 200;
 
         if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
         {
-            if (gActiveBank == 1)
+            if (gActiveBattler == 1)
                 trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_A);
             else
                 trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_B);
         }
         else
         {
-            if ((gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_FIRE_RED
-            || (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_LEAF_GREEN)
+            if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED
+            || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
             {
-                if (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender != 0)
+                if (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender != 0)
                     trainerPicId = gUnknown_0831F578[0x4F];
                 else
                     trainerPicId = gUnknown_0831F578[0x4E];
             }
-            else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_RUBY
-                     || (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_SAPPHIRE)
+            else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
+                     || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
             {
-                if (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender != 0)
+                if (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender != 0)
                     trainerPicId = gUnknown_0831F578[0x51];
                 else
                     trainerPicId = gUnknown_0831F578[0x50];
             }
             else
             {
-                trainerPicId = PlayerGenderToFrontTrainerPicId(gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender);
+                trainerPicId = PlayerGenderToFrontTrainerPicId(gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender);
             }
         }
     }
@@ -1327,73 +1327,73 @@ static void LinkOpponentHandleDrawTrainerPic(void)
         }
     }
 
-    DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
+    DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
+    sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
                                                xPos,
                                                (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40,
-                                               sub_80A82E4(gActiveBank));
+                                               sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicId;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void LinkOpponentHandleTrainerSlide(void)
 {
     u32 trainerPicId;
 
-    if (gActiveBank == 1)
+    if (gActiveBattler == 1)
         trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_A);
     else
         trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_B);
 
-    DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E);
+    DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
+    sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E);
 
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 96;
-    gSprites[gBankSpriteIds[gActiveBank]].pos1.x += 32;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicId;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 96;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos1.x += 32;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy2; // this line is redundant, because LinkOpponentBufferExecCompleted changes the battle bank function
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2; // this line is redundant, because LinkOpponentBufferExecCompleted changes the battle bank function
     LinkOpponentBufferExecCompleted();
 }
 
 static void LinkOpponentHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    gBattleBankFunc[gActiveBank] = sub_8064470;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerFuncs[gActiveBattler] = sub_8064470;
 }
 
 static void LinkOpponentHandleFaintAnimation(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
     else
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT);
-            gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039934;
-            gBattleBankFunc[gActiveBank] = sub_8064C14;
+            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039934;
+            gBattlerFuncs[gActiveBattler] = sub_8064C14;
         }
     }
 }
@@ -1420,25 +1420,25 @@ static void LinkOpponentHandlePause(void)
 
 static void LinkOpponentHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4] | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6] | (gBattleBufferA[gActiveBattler][7] << 8) | (gBattleBufferA[gActiveBattler][8] << 16) | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
         if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE
         {
             LinkOpponentBufferExecCompleted();
         }
         else
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            gBattleBankFunc[gActiveBank] = LinkOpponentDoMoveAnimation;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            gBattlerFuncs[gActiveBattler] = LinkOpponentDoMoveAnimation;
             sub_817E0FC(move, gWeatherMoveAnim, gAnimDisableStructPtr);
         }
     }
@@ -1446,26 +1446,26 @@ static void LinkOpponentHandleMoveAnimation(void)
 
 static void LinkOpponentDoMoveAnimation(void)
 {
-    u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 multihit = gBattleBufferA[gActiveBank][11];
+    u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 multihit = gBattleBufferA[gActiveBattler][11];
 
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             sub_805EB9C(0);
             DoMoveAnim(move);
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 2;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
         }
         break;
     case 2:
@@ -1473,20 +1473,20 @@ static void LinkOpponentDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
             {
-                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
+                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
+                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
             }
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
         break;
     case 3:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             CopyAllBattleSpritesInvisibilities();
-            TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            TrySetBehindSubstituteSpriteBit(gActiveBattler, gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             LinkOpponentBufferExecCompleted();
         }
         break;
@@ -1499,10 +1499,10 @@ static void LinkOpponentHandlePrintString(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    stringId = (u16*)(&gBattleBufferA[gActiveBank][2]);
+    stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
+    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
     sub_817C95C(*stringId);
 }
 
@@ -1546,23 +1546,23 @@ static void LinkOpponentHandleHealthBarUpdate(void)
     s16 hpVal;
 
     LoadBattleBarGfx(0);
-    hpVal = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    hpVal = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, 0, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnHealthbarDone;
+    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void LinkOpponentHandleExpUpdate(void)
@@ -1572,24 +1572,24 @@ static void LinkOpponentHandleExpUpdate(void)
 
 static void LinkOpponentHandleStatusIconUpdate(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], HEALTHBOX_STATUS_ICON);
-        bank = gActiveBank;
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
 static void LinkOpponentHandleStatusAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
-                        gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
+                        gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1646,7 +1646,7 @@ static void LinkOpponentHandleCmd37(void)
 
 static void LinkOpponentHandleCmd38(void)
 {
-    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1];
     LinkOpponentBufferExecCompleted();
 }
 
@@ -1664,16 +1664,16 @@ static void LinkOpponentHandleCmd40(void)
 
 static void LinkOpponentHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         LinkOpponentBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        DoHitAnimHealthboxEffect(gActiveBank);
-        gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        DoHitAnimHealthboxEffect(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1686,25 +1686,25 @@ static void LinkOpponentHandlePlaySE(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         pan = PAN_SIDE_PLAYER;
     else
         pan = PAN_SIDE_OPPONENT;
 
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     LinkOpponentBufferExecCompleted();
 }
 
 static void LinkOpponentHandlePlayFanfareOrBGM(void)
 {
-    if (gBattleBufferA[gActiveBank][3])
+    if (gBattleBufferA[gActiveBattler][3])
     {
         BattleStopLowHpSound();
-        PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
     else
     {
-        PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
 
     LinkOpponentBufferExecCompleted();
@@ -1712,7 +1712,7 @@ static void LinkOpponentHandlePlayFanfareOrBGM(void)
 
 static void LinkOpponentHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, 25, 5);
     LinkOpponentBufferExecCompleted();
@@ -1720,7 +1720,7 @@ static void LinkOpponentHandleFaintingCry(void)
 
 static void LinkOpponentHandleIntroSlide(void)
 {
-    HandleIntroSlide(gBattleBufferA[gActiveBank][1]);
+    HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
     gUnknown_020243FC |= 1;
     LinkOpponentBufferExecCompleted();
 }
@@ -1730,46 +1730,46 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_80676FC);
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_80676FC);
 
     taskId = CreateTask(sub_8067618, 5);
-    gTasks[taskId].data[0] = gActiveBank;
+    gTasks[taskId].data[0] = gActiveBattler;
 
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_28;
+    gBattlerFuncs[gActiveBattler] = nullsub_28;
 }
 
 static void sub_8067618(u8 taskId)
 {
-    u8 savedActiveBank = gActiveBank;
+    u8 savedActiveBank = gActiveBattler;
 
-    gActiveBank = gTasks[taskId].data[0];
+    gActiveBattler = gTasks[taskId].data[0];
     if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_8066494(gActiveBank, FALSE);
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_8066494(gActiveBattler, FALSE);
     }
     else
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_8066494(gActiveBank, FALSE);
-        gActiveBank ^= BIT_MON;
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_8066494(gActiveBank, FALSE);
-        gActiveBank ^= BIT_MON;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_8066494(gActiveBattler, FALSE);
+        gActiveBattler ^= BIT_FLANK;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_8066494(gActiveBattler, FALSE);
+        gActiveBattler ^= BIT_FLANK;
     }
-    gBattleBankFunc[gActiveBank] = sub_8064734;
-    gActiveBank = savedActiveBank;
+    gBattlerFuncs[gActiveBattler] = sub_8064734;
+    gActiveBattler = savedActiveBank;
     DestroyTask(taskId);
 }
 
@@ -1782,50 +1782,50 @@ static void sub_80676FC(struct Sprite *sprite)
 
 static void LinkOpponentHandleDrawPartyStatusSummary(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
     {
         LinkOpponentBufferExecCompleted();
     }
     else
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
 
-        if (gBattleBufferA[gActiveBank][2] != 0)
+        if (gBattleBufferA[gActiveBattler][2] != 0)
         {
-            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1E < 2)
+            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1E < 2)
             {
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1E++;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1E++;
                 return;
             }
             else
             {
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1E = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1E = 0;
             }
         }
 
-        gUnknown_020244B4[gActiveBank] = CreatePartyStatusSummarySprites(gActiveBank, (struct HpAndStatus *)&gBattleBufferA[gActiveBank][4], gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][2]);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
-        if (gBattleBufferA[gActiveBank][2] != 0)
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0x5D;
+        if (gBattleBufferA[gActiveBattler][2] != 0)
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattleBankFunc[gActiveBank] = sub_806782C;
+        gBattlerFuncs[gActiveBattler] = sub_806782C;
     }
 }
 
 static void sub_806782C(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5++ > 0x5C)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5++ > 0x5C)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
         LinkOpponentBufferExecCompleted();
     }
 }
 
 static void LinkOpponentHandleCmd49(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
     LinkOpponentBufferExecCompleted();
 }
 
@@ -1836,25 +1836,25 @@ static void LinkOpponentHandleCmd50(void)
 
 static void LinkOpponentHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank))
+    if (IsBankSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        CopyBattleSpriteInvisibility(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        CopyBattleSpriteInvisibility(gActiveBattler);
     }
     LinkOpponentBufferExecCompleted();
 }
 
 static void LinkOpponentHandleBattleAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u8 animationId = gBattleBufferA[gActiveBank][1];
-        u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 animationId = gBattleBufferA[gActiveBattler][1];
+        u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             LinkOpponentBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
+            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
 
         sub_817E32C(animationId);
     }
@@ -1862,7 +1862,7 @@ static void LinkOpponentHandleBattleAnimation(void)
 
 static void LinkOpponentHandleLinkStandbyMsg(void)
 {
-    sub_81851A8(&gBattleBufferA[gActiveBank][2]);
+    sub_81851A8(&gBattleBufferA[gActiveBattler][2]);
     LinkOpponentBufferExecCompleted();
 }
 
@@ -1873,18 +1873,18 @@ static void LinkOpponentHandleResetActionMoveSelection(void)
 
 static void LinkOpponentHandleCmd55(void)
 {
-    sub_81851A8(&gBattleBufferA[gActiveBank][4]);
+    sub_81851A8(&gBattleBufferA[gActiveBattler][4]);
 
-    if (gBattleBufferA[gActiveBank][1] == B_OUTCOME_DREW)
-        gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    if (gBattleBufferA[gActiveBattler][1] == B_OUTCOME_DREW)
+        gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     else
-        gBattleOutcome = gBattleBufferA[gActiveBank][1] ^ B_OUTCOME_DREW;
+        gBattleOutcome = gBattleBufferA[gActiveBattler][1] ^ B_OUTCOME_DREW;
 
-    gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBank][2];
+    gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBattler][2];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     LinkOpponentBufferExecCompleted();
-    gBattleBankFunc[gActiveBank] = sub_80587B0;
+    gBattlerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_92(void)
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 9835f6cb2..d184370f4 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -25,32 +25,32 @@
 #include "data2.h"
 
 extern u32 gBattleExecBuffer;
-extern u8 gActiveBank;
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gBattleBanksCount;
+extern u8 gActiveBattler;
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern u16 gUnknown_020243FC;
-extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBankDefender;
-extern u8 gAbsentBankFlags;
+extern u8 gBattleDefender;
+extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
-extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
+extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
@@ -198,15 +198,15 @@ static void nullsub_112(void)
 
 void SetControllerToLinkPartner(void)
 {
-    gBattleBankFunc[gActiveBank] = LinkPartnerBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = LinkPartnerBufferRunCommand;
 }
 
 static void LinkPartnerBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sLinkPartnerBufferCommands))
-            sLinkPartnerBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sLinkPartnerBufferCommands))
+            sLinkPartnerBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             LinkPartnerBufferExecCompleted();
     }
@@ -214,26 +214,26 @@ static void LinkPartnerBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         LinkPartnerBufferExecCompleted();
 }
 
 static void sub_814AF54(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         nullsub_25(0);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         LinkPartnerBufferExecCompleted();
     }
 }
 
 static void sub_814AFBC(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 == 0xFF)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         LinkPartnerBufferExecCompleted();
     }
 }
@@ -244,13 +244,13 @@ static void sub_814B004(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gHealthBoxesIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r6 = TRUE;
         }
@@ -261,84 +261,84 @@ static void sub_814B004(void)
 
     if (r6)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 3;
-        gBattleBankFunc[gActiveBank] = sub_814AFBC;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
+        gBattlerFuncs[gActiveBattler] = sub_814AFBC;
     }
 }
 
 static void sub_814B0E8(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive
-        && gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-        && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
-        && ++gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 != 1)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive
+        && gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+        && ++gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 != 1)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
 
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]]);
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank ^ BIT_MON], &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], HEALTHBOX_ALL);
-            sub_8076918(gActiveBank ^ BIT_MON);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank ^ BIT_MON]);
+            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
+            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+            sub_8076918(gActiveBattler ^ BIT_FLANK);
+            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
         }
 
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-        sub_8076918(gActiveBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        sub_8076918(gActiveBattler);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
 
-        gBattleBankFunc[gActiveBank] = sub_814B004;
+        gBattlerFuncs[gActiveBattler] = sub_814B004;
     }
 }
 
 static void sub_814B290(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].animEnded && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].animEnded && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
         LinkPartnerBufferExecCompleted();
 }
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBank, gHealthBoxesIds[gActiveBank], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         LinkPartnerBufferExecCompleted();
     }
 }
 
 static void sub_814B340(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].pos1.y + gSprites[gBankSpriteIds[gActiveBank]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].pos1.y + gSprites[gBankSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
     {
-        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
         nullsub_24(species);
-        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBank]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBattler]].oam.matrixNum);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         LinkPartnerBufferExecCompleted();
     }
 }
 
 static void sub_814B3DC(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         LinkPartnerBufferExecCompleted();
     }
 }
@@ -351,7 +351,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -370,20 +370,20 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_814B4E0(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        CopyBattleSpriteInvisibility(gActiveBank);
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+        CopyBattleSpriteInvisibility(gActiveBattler);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattleBankFunc[gActiveBank] = sub_814B554;
+        gBattlerFuncs[gActiveBattler] = sub_814B554;
     }
 }
 
 static void sub_814B554(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive
-        && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive
+        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         LinkPartnerBufferExecCompleted();
     }
@@ -391,66 +391,66 @@ static void sub_814B554(void)
 
 static void sub_814B5A8(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
 
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-        sub_8076918(gActiveBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        sub_8076918(gActiveBattler);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
-        gBattleBankFunc[gActiveBank] = sub_814B4E0;
+        gBattlerFuncs[gActiveBattler] = sub_814B4E0;
     }
 }
 
 static void sub_814B69C(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
     }
 
-    if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        gBattleBankFunc[gActiveBank] = sub_814B5A8;
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        gBattlerFuncs[gActiveBattler] = sub_814B5A8;
     }
 }
 
 static void LinkPartnerBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = LinkPartnerBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = LinkPartnerBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
+        gBattleBufferA[gActiveBattler][0] = CONTROLLER_TERMINATOR_NOP;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
 static void CompleteOnFinishedStatusAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
         LinkPartnerBufferExecCompleted();
 }
 
 static void CompleteOnFinishedBattleAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animFromTableActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
         LinkPartnerBufferExecCompleted();
 }
 
@@ -461,13 +461,13 @@ static void LinkPartnerHandleGetMonData(void)
     u8 monToCheck;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyLinkPartnerMonData(gBattlePartyID[gActiveBank], monData);
+        size += CopyLinkPartnerMonData(gBattlePartyID[gActiveBattler], monData);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -489,7 +489,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         battleMon.species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
@@ -555,7 +555,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        data16 = GetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE);
+        data16 = GetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE);
         dst[0] = data16;
         dst[1] = data16 >> 8;
         size = 2;
@@ -570,7 +570,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE);
+        dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE);
         size = 1;
         break;
     case REQUEST_OTID_BATTLE:
@@ -795,13 +795,13 @@ static void LinkPartnerHandleSetMonData(void)
     u8 monToCheck;
     u8 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetLinkPartnerMonData(gBattlePartyID[gActiveBank]);
+        SetLinkPartnerMonData(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -814,11 +814,11 @@ static void LinkPartnerHandleSetMonData(void)
 
 static void SetLinkPartnerMonData(u8 monId)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         {
@@ -859,10 +859,10 @@ static void SetLinkPartnerMonData(u8 monId)
         }
         break;
     case REQUEST_SPECIES_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HELDITEM_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MOVES_PP_BATTLE:
         for (i = 0; i < 4; i++)
@@ -876,167 +876,167 @@ static void SetLinkPartnerMonData(u8 monId)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PP_DATA_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case REQUEST_PPMOVE1_BATTLE:
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_OTID_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_EXP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_FRIENDSHIP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKERUS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LOCATION_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LEVEL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_GAME_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKEBALL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ALL_IVS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case REQUEST_HP_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PERSONALITY_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CHECKSUM_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_STATUS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_LEVEL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MAX_HP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SHEEN_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
 
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 }
 
 static void LinkPartnerHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
+    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
-    for (i = 0; i < gBattleBufferA[gActiveBank][2]; i++)
-        dst[i] = gBattleBufferA[gActiveBank][3 + i];
+    for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
+        dst[i] = gBattleBufferA[gActiveBattler][3 + i];
 
     LinkPartnerBufferExecCompleted();
 }
@@ -1045,28 +1045,28 @@ static void LinkPartnerHandleLoadMonSprite(void)
 {
     u16 species;
 
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
-    sub_806A068(species, GetBankPosition(gActiveBank));
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBank, 2),
-                                               GetBankSpriteDefault_Y(gActiveBank),
-                                               sub_80A82E4(gActiveBank));
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
-    gBattleBankFunc[gActiveBank] = sub_814B290;
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBankCoord(gActiveBattler, 2),
+                                               GetBankSpriteDefault_Y(gActiveBattler),
+                                               sub_80A82E4(gActiveBattler));
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    gBattlerFuncs[gActiveBattler] = sub_814B290;
 }
 
 static void LinkPartnerHandleSwitchInAnim(void)
 {
-    ClearTemporarySpeciesSpriteData(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    sub_814CC98(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_814B69C;
+    ClearTemporarySpeciesSpriteData(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    sub_814CC98(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlerFuncs[gActiveBattler] = sub_814B69C;
 }
 
 static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
@@ -1077,7 +1077,7 @@ static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    sub_806A068(species, GetBankPosition(bank));
+    sub_806A068(species, GetBattlerPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
@@ -1102,36 +1102,36 @@ static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
 
 static void LinkPartnerHandleReturnMonToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-        gBattleBankFunc[gActiveBank] = DoSwitchOutAnimation;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         LinkPartnerBufferExecCompleted();
     }
 }
 
 static void DoSwitchOutAnimation(void)
 {
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
-            gBattleBankFunc[gActiveBank] = sub_814B3DC;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_PLAYER_MON);
+            gBattlerFuncs[gActiveBattler] = sub_814B3DC;
         }
         break;
     }
@@ -1144,7 +1144,7 @@ static void LinkPartnerHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBattlerPosition(gActiveBattler) & BIT_FLANK) != 0) // second mon
             xPos = 90;
         else // first mon
             xPos = 32;
@@ -1154,31 +1154,31 @@ static void LinkPartnerHandleDrawTrainerPic(void)
         xPos = 80;
     }
 
-    if ((gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_FIRE_RED
-        || (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_LEAF_GREEN)
+    if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED
+        || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender + BACK_PIC_RED;
+        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender + BACK_PIC_RED;
     }
-    else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_RUBY
-             || (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_SAPPHIRE)
+    else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
+             || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender + BACK_PIC_RS_BRENDAN;
+        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender + BACK_PIC_RS_BRENDAN;
     }
     else
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender;
+        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender;
     }
 
-    DecompressTrainerBackPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, sub_80A82E4(gActiveBank));
+    DecompressTrainerBackPic(trainerPicId, gActiveBattler);
+    sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void LinkPartnerHandleTrainerSlide(void)
@@ -1188,34 +1188,34 @@ static void LinkPartnerHandleTrainerSlide(void)
 
 static void LinkPartnerHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    gBattleBankFunc[gActiveBank] = sub_814AF54;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerFuncs[gActiveBattler] = sub_814AF54;
 }
 
 static void LinkPartnerHandleFaintAnimation(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
     else
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
-            gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-            gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
-            gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039C00;
-            gBattleBankFunc[gActiveBank] = sub_814B340;
+            gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+            gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 5;
+            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039C00;
+            gBattlerFuncs[gActiveBattler] = sub_814B340;
         }
     }
 }
@@ -1242,25 +1242,25 @@ static void LinkPartnerHandlePause(void)
 
 static void LinkPartnerHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4] | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6] | (gBattleBufferA[gActiveBattler][7] << 8) | (gBattleBufferA[gActiveBattler][8] << 16) | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
         if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE
         {
             LinkPartnerBufferExecCompleted();
         }
         else
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            gBattleBankFunc[gActiveBank] = LinkPartnerDoMoveAnimation;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            gBattlerFuncs[gActiveBattler] = LinkPartnerDoMoveAnimation;
             sub_817E0FC(move, gWeatherMoveAnim, gAnimDisableStructPtr);
         }
     }
@@ -1268,26 +1268,26 @@ static void LinkPartnerHandleMoveAnimation(void)
 
 static void LinkPartnerDoMoveAnimation(void)
 {
-    u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 multihit = gBattleBufferA[gActiveBank][11];
+    u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 multihit = gBattleBufferA[gActiveBattler][11];
 
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             sub_805EB9C(0);
             DoMoveAnim(move);
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 2;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
         }
         break;
     case 2:
@@ -1295,20 +1295,20 @@ static void LinkPartnerDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
             {
-                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
+                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
+                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
             }
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
         break;
     case 3:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             CopyAllBattleSpritesInvisibilities();
-            TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            TrySetBehindSubstituteSpriteBit(gActiveBattler, gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             LinkPartnerBufferExecCompleted();
         }
         break;
@@ -1321,10 +1321,10 @@ static void LinkPartnerHandlePrintString(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    stringId = (u16*)(&gBattleBufferA[gActiveBank][2]);
+    stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
+    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
     sub_817C95C(*stringId);
 }
 
@@ -1368,23 +1368,23 @@ static void LinkPartnerHandleHealthBarUpdate(void)
     s16 hpVal;
 
     LoadBattleBarGfx(0);
-    hpVal = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    hpVal = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, 0, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnHealthbarDone;
+    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void LinkPartnerHandleExpUpdate(void)
@@ -1394,24 +1394,24 @@ static void LinkPartnerHandleExpUpdate(void)
 
 static void LinkPartnerHandleStatusIconUpdate(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_STATUS_ICON);
-        bank = gActiveBank;
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
 static void LinkPartnerHandleStatusAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
-                        gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
+                        gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1468,7 +1468,7 @@ static void LinkPartnerHandleCmd37(void)
 
 static void LinkPartnerHandleCmd38(void)
 {
-    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1];
     LinkPartnerBufferExecCompleted();
 }
 
@@ -1486,16 +1486,16 @@ static void LinkPartnerHandleCmd40(void)
 
 static void LinkPartnerHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         LinkPartnerBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        DoHitAnimHealthboxEffect(gActiveBank);
-        gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        DoHitAnimHealthboxEffect(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1508,25 +1508,25 @@ static void LinkPartnerHandlePlaySE(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         pan = PAN_SIDE_PLAYER;
     else
         pan = PAN_SIDE_OPPONENT;
 
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     LinkPartnerBufferExecCompleted();
 }
 
 static void LinkPartnerHandlePlayFanfareOrBGM(void)
 {
-    if (gBattleBufferA[gActiveBank][3])
+    if (gBattleBufferA[gActiveBattler][3])
     {
         BattleStopLowHpSound();
-        PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
     else
     {
-        PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
 
     LinkPartnerBufferExecCompleted();
@@ -1534,7 +1534,7 @@ static void LinkPartnerHandlePlayFanfareOrBGM(void)
 
 static void LinkPartnerHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, -25, 5);
     LinkPartnerBufferExecCompleted();
@@ -1542,7 +1542,7 @@ static void LinkPartnerHandleFaintingCry(void)
 
 static void LinkPartnerHandleIntroSlide(void)
 {
-    HandleIntroSlide(gBattleBufferA[gActiveBank][1]);
+    HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
     gUnknown_020243FC |= 1;
     LinkPartnerBufferExecCompleted();
 }
@@ -1553,46 +1553,46 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
     u8 taskId;
     u32 trainerPicId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_805CC00);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_805CC00);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F9);
 
-    if ((gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_FIRE_RED
-        || (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_LEAF_GREEN)
+    if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED
+        || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender + BACK_PIC_RED;
+        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender + BACK_PIC_RED;
     }
-    else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_RUBY
-             || (gLinkPlayers[GetBankMultiplayerId(gActiveBank)].version & 0xFF) == VERSION_SAPPHIRE)
+    else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
+             || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender + BACK_PIC_RS_BRENDAN;
+        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender + BACK_PIC_RS_BRENDAN;
     }
     else
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender;
+        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender;
     }
 
     LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, 0x100 + paletteNum * 16, 32);
 
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = paletteNum;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(sub_814DCCC, 5);
-    gTasks[taskId].data[0] = gActiveBank;
+    gTasks[taskId].data[0] = gActiveBattler;
 
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_112;
+    gBattlerFuncs[gActiveBattler] = nullsub_112;
 }
 
 static void sub_814DCCC(u8 taskId)
@@ -1603,62 +1603,62 @@ static void sub_814DCCC(u8 taskId)
     }
     else
     {
-        u8 savedActiveBank = gActiveBank;
+        u8 savedActiveBank = gActiveBattler;
 
-        gActiveBank = gTasks[taskId].data[0];
+        gActiveBattler = gTasks[taskId].data[0];
         if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_814CC98(gActiveBank, FALSE);
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            sub_814CC98(gActiveBattler, FALSE);
         }
         else
         {
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_814CC98(gActiveBank, FALSE);
-            gActiveBank ^= BIT_MON;
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-            sub_814CC98(gActiveBank, FALSE);
-            gActiveBank ^= BIT_MON;
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            sub_814CC98(gActiveBattler, FALSE);
+            gActiveBattler ^= BIT_FLANK;
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            sub_814CC98(gActiveBattler, FALSE);
+            gActiveBattler ^= BIT_FLANK;
         }
-        gBattleBankFunc[gActiveBank] = sub_814B0E8;
-        gActiveBank = savedActiveBank;
+        gBattlerFuncs[gActiveBattler] = sub_814B0E8;
+        gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
 }
 
 static void LinkPartnerHandleDrawPartyStatusSummary(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
     {
         LinkPartnerBufferExecCompleted();
     }
     else
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1 = 1;
-        gUnknown_020244B4[gActiveBank] = CreatePartyStatusSummarySprites(gActiveBank, (struct HpAndStatus *)&gBattleBufferA[gActiveBank][4], gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][2]);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
+        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
-        if (gBattleBufferA[gActiveBank][2] != 0)
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0x5D;
+        if (gBattleBufferA[gActiveBattler][2] != 0)
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattleBankFunc[gActiveBank] = sub_814DE9C;
+        gBattlerFuncs[gActiveBattler] = sub_814DE9C;
     }
 }
 
 static void sub_814DE9C(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5++ > 0x5C)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5++ > 0x5C)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
         LinkPartnerBufferExecCompleted();
     }
 }
 
 static void LinkPartnerHandleCmd49(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
     LinkPartnerBufferExecCompleted();
 }
 
@@ -1669,25 +1669,25 @@ static void LinkPartnerHandleCmd50(void)
 
 static void LinkPartnerHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank))
+    if (IsBankSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        CopyBattleSpriteInvisibility(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        CopyBattleSpriteInvisibility(gActiveBattler);
     }
     LinkPartnerBufferExecCompleted();
 }
 
 static void LinkPartnerHandleBattleAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u8 animationId = gBattleBufferA[gActiveBank][1];
-        u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 animationId = gBattleBufferA[gActiveBattler][1];
+        u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             LinkPartnerBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
+            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
 
         sub_817E32C(animationId);
     }
@@ -1695,7 +1695,7 @@ static void LinkPartnerHandleBattleAnimation(void)
 
 static void LinkPartnerHandleLinkStandbyMsg(void)
 {
-    sub_81851A8(&gBattleBufferA[gActiveBank][2]);
+    sub_81851A8(&gBattleBufferA[gActiveBattler][2]);
     LinkPartnerBufferExecCompleted();
 }
 
@@ -1706,13 +1706,13 @@ static void LinkPartnerHandleResetActionMoveSelection(void)
 
 static void LinkPartnerHandleCmd55(void)
 {
-    sub_81851A8(&gBattleBufferA[gActiveBank][4]);
-    gBattleOutcome = gBattleBufferA[gActiveBank][1];
-    gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBank][2];
+    sub_81851A8(&gBattleBufferA[gActiveBattler][4]);
+    gBattleOutcome = gBattleBufferA[gActiveBattler][1];
+    gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBattler][2];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     LinkPartnerBufferExecCompleted();
-    gBattleBankFunc[gActiveBank] = sub_80587B0;
+    gBattlerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_113(void)
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 6940fdc73..7131cbde6 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -29,26 +29,26 @@
 #include "data2.h"
 
 extern u32 gBattleExecBuffer;
-extern u8 gActiveBank;
-extern u8 gBankDefender;
-extern u8 gAbsentBankFlags;
+extern u8 gActiveBattler;
+extern u8 gBattleDefender;
+extern u8 gAbsentBattlerFlags;
 extern bool8 gDoingBattleAnim;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
+extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void *gUnknown_020244D8;
 extern void *gUnknown_020244DC;
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
-extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
+extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern u16 gUnknown_020243FC;
@@ -207,15 +207,15 @@ static void nullsub_26(void)
 
 void SetControllerToOpponent(void)
 {
-    gBattleBankFunc[gActiveBank] = OpponentBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = OpponentBufferRunCommand;
 }
 
 static void OpponentBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sOpponentBufferCommands))
-            sOpponentBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sOpponentBufferCommands))
+            sOpponentBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             OpponentBufferExecCompleted();
     }
@@ -223,32 +223,32 @@ static void OpponentBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         OpponentBufferExecCompleted();
 }
 
 static void CompleteOnBankSpriteCallbackDummy2(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         OpponentBufferExecCompleted();
 }
 
 static void sub_805F240(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        FreeTrainerFrontPicPalette(gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        FreeTrainerFrontPicPalette(gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         OpponentBufferExecCompleted();
     }
 }
 
 static void sub_805F2A8(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 == 0xFF)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         OpponentBufferExecCompleted();
     }
 }
@@ -260,42 +260,42 @@ static void sub_805F2F0(void)
 
     if (!IsDoubleBattle() || ((IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)) || (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
             var = TRUE;
         var2 = FALSE;
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy
-         && gSprites[gHealthBoxesIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+         && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
             var = TRUE;
         var2 = TRUE;
     }
 
-    gUnknown_020244D8 = &gBattleSpritesDataPtr->healthBoxesData[gActiveBank];
-    gUnknown_020244DC = &gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON];
+    gUnknown_020244D8 = &gBattleSpritesDataPtr->healthBoxesData[gActiveBattler];
+    gUnknown_020244DC = &gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK];
 
     if (var)
     {
         if (var2 == TRUE)
         {
-            if (var2 && gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 && gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
+            if (var2 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
             {
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 = 0;
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0;
                 FreeSpriteTilesByTag(0x27F9);
                 FreeSpritePaletteByTag(0x27F9);
             }
             else
                 return;
         }
-        else if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+        else if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
         {
-            if (GetBankPosition(gActiveBank) == 3)
+            if (GetBattlerPosition(gActiveBattler) == 3)
             {
-                if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 == 0 && gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1 == 0)
+                if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 == 0 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 == 0)
                 {
                     FreeSpriteTilesByTag(0x27F9);
                     FreeSpritePaletteByTag(0x27F9);
@@ -303,14 +303,14 @@ static void sub_805F2F0(void)
                 else
                     return;
             }
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
         }
         else
             return;
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 3;
-        gBattleBankFunc[gActiveBank] = sub_805F2A8;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
+        gBattlerFuncs[gActiveBattler] = sub_805F2A8;
     }
 }
 
@@ -319,60 +319,60 @@ static void sub_805F560(void)
     bool32 sp = FALSE;
     bool32 r10 = FALSE;
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
-        sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
-    if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI) && IsDoubleBattle() && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
-        sub_8172EF0(gActiveBank ^ BIT_MON, &gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+    if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI) && IsDoubleBattle() && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
+        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank ^ BIT_MON], &gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]], HEALTHBOX_ALL);
-                sub_8076918(gActiveBank ^ BIT_MON);
-                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank ^ BIT_MON]);
+                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+                sub_8076918(gActiveBattler ^ BIT_FLANK);
+                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
             }
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-            sub_8076918(gActiveBank);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+            sub_8076918(gActiveBattler);
+            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 1;
     }
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x40
-        && gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x40
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x40
+        && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x40
         && !IsCryPlayingOrClearCrySongs())
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
-                if (GetBankPosition(gActiveBank) == 1)
+                if (GetBattlerPosition(gActiveBattler) == 1)
                     m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
                 m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 1;
         sp = TRUE;
     }
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         {
             r10 = TRUE;
         }
     }
     else
     {
-        if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy)
+        if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r10 = TRUE;
         }
@@ -382,29 +382,29 @@ static void sub_805F560(void)
     {
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]]);
-            SetBankEnemyShadowSpriteCallback(gActiveBank ^ BIT_MON, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]], MON_DATA_SPECIES));
+            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
+            SetBankEnemyShadowSpriteCallback(gActiveBattler ^ BIT_FLANK, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], MON_DATA_SPECIES));
         }
 
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 0;
 
-        gBattleBankFunc[gActiveBank] = sub_805F2F0;
+        gBattlerFuncs[gActiveBattler] = sub_805F2F0;
     }
 }
 
 static void sub_805F994(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
-        sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+    if (gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
 
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy && gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
         OpponentBufferExecCompleted();
@@ -413,11 +413,11 @@ static void sub_805F994(void)
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBank, gHealthBoxesIds[gActiveBank], HEALTH_BAR, 0);
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
+    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
         OpponentBufferExecCompleted();
@@ -425,21 +425,21 @@ static void CompleteOnHealthbarDone(void)
 
 static void sub_805FAC4(void)
 {
-    if (!gSprites[gBankSpriteIds[gActiveBank]].inUse)
+    if (!gSprites[gBankSpriteIds[gActiveBattler]].inUse)
     {
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         OpponentBufferExecCompleted();
     }
 }
 
 static void sub_805FB08(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBank);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        EnemyShadowCallbackToSetInvisible(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         OpponentBufferExecCompleted();
     }
 }
@@ -452,7 +452,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -471,19 +471,19 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_805FC10(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
-        gBattleBankFunc[gActiveBank] = sub_805FC80;
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
+        gBattlerFuncs[gActiveBattler] = sub_805FC80;
     }
 }
 
 static void sub_805FC80(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive && !IsCryPlayingOrClearCrySongs())
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs())
     {
-        if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2)
+        if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy || gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
         {
             m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             OpponentBufferExecCompleted();
@@ -493,60 +493,60 @@ static void sub_805FC80(void)
 
 static void sub_805FD00(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-        sub_8076918(gActiveBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
-        CopyBattleSpriteInvisibility(gActiveBank);
-        gBattleBankFunc[gActiveBank] = sub_805FC10;
+        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        sub_8076918(gActiveBattler);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        CopyBattleSpriteInvisibility(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = sub_805FC10;
     }
 }
 
 static void sub_805FDF0(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
-        sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
 
-    if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
-        gBattleBankFunc[gActiveBank] = sub_805FD00;
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+        gBattlerFuncs[gActiveBattler] = sub_805FD00;
     }
 }
 
 static void CompleteOnFinishedStatusAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
         OpponentBufferExecCompleted();
 }
 
 static void CompleteOnFinishedBattleAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animFromTableActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
         OpponentBufferExecCompleted();
 }
 
 static void OpponentBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = OpponentBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = OpponentBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
+        gBattleBufferA[gActiveBattler][0] = CONTROLLER_TERMINATOR_NOP;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -557,13 +557,13 @@ static void OpponentHandleGetMonData(void)
     u8 monToCheck;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += GetOpponentMonData(gBattlePartyID[gActiveBank], monData);
+        size += GetOpponentMonData(gBattlePartyID[gActiveBattler], monData);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -585,7 +585,7 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         battleMon.species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES);
@@ -651,7 +651,7 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        data16 = GetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE);
+        data16 = GetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE);
         dst[0] = data16;
         dst[1] = data16 >> 8;
         size = 2;
@@ -666,7 +666,7 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst)
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE);
+        dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE);
         size = 1;
         break;
     case REQUEST_OTID_BATTLE:
@@ -884,14 +884,14 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst)
 static void OpponentHandleGetRawMonData(void)
 {
     struct BattlePokemon battleMon;
-    u8 *src = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
-    u8 *dst = (u8 *)&battleMon + gBattleBufferA[gActiveBank][1];
+    u8 *src = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *dst = (u8 *)&battleMon + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
-    for (i = 0; i < gBattleBufferA[gActiveBank][2]; i++)
+    for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
         dst[i] = src[i];
 
-    EmitDataTransfer(1, gBattleBufferA[gActiveBank][2], dst);
+    EmitDataTransfer(1, gBattleBufferA[gActiveBattler][2], dst);
     OpponentBufferExecCompleted();
 }
 
@@ -900,13 +900,13 @@ static void OpponentHandleSetMonData(void)
     u8 monToCheck;
     u8 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetOpponentMonData(gBattlePartyID[gActiveBank]);
+        SetOpponentMonData(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -919,11 +919,11 @@ static void OpponentHandleSetMonData(void)
 
 static void SetOpponentMonData(u8 monId)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         {
@@ -964,10 +964,10 @@ static void SetOpponentMonData(u8 monId)
         }
         break;
     case REQUEST_SPECIES_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HELDITEM_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MOVES_PP_BATTLE:
         for (i = 0; i < 4; i++)
@@ -981,198 +981,198 @@ static void SetOpponentMonData(u8 monId)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PP_DATA_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case REQUEST_PPMOVE1_BATTLE:
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_OTID_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_EXP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_FRIENDSHIP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKERUS_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LOCATION_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LEVEL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_GAME_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKEBALL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ALL_IVS_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case REQUEST_HP_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PERSONALITY_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CHECKSUM_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_STATUS_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_LEVEL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MAX_HP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SHEEN_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
 }
 
 static void OpponentHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
+    u8 *dst = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
-    for (i = 0; i < gBattleBufferA[gActiveBank][2]; i++)
-        dst[i] = gBattleBufferA[gActiveBank][3 + i];
+    for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
+        dst[i] = gBattleBufferA[gActiveBattler][3 + i];
 
     OpponentBufferExecCompleted();
 }
 
 static void OpponentHandleLoadMonSprite(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
-    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    sub_806A068(species, GetBankPosition(gActiveBank));
+    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBank, 2),
-                                               GetBankSpriteDefault_Y(gActiveBank),
-                                               sub_80A82E4(gActiveBank));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBankCoord(gActiveBattler, 2),
+                                               GetBankSpriteDefault_Y(gActiveBattler),
+                                               sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = species;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = species;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
 
-    SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+    SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
 
-    gBattleBankFunc[gActiveBank] = sub_805F994;
+    gBattlerFuncs[gActiveBattler] = sub_805F994;
 }
 
 static void OpponentHandleSwitchInAnim(void)
 {
-    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    sub_80613DC(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_805FDF0;
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    sub_80613DC(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlerFuncs[gActiveBattler] = sub_805FDF0;
 }
 
 static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
@@ -1184,7 +1184,7 @@ static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
     species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
-    sub_806A068(species, GetBankPosition(bank));
+    sub_806A068(species, GetBattlerPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
                                         GetBankCoord(bank, 2),
@@ -1209,37 +1209,37 @@ static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
 
 static void OpponentHandleReturnMonToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-        gBattleBankFunc[gActiveBank] = DoSwitchOutAnimation;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBank);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        EnemyShadowCallbackToSetInvisible(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         OpponentBufferExecCompleted();
     }
 }
 
 static void DoSwitchOutAnimation(void)
 {
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
-            gBattleBankFunc[gActiveBank] = sub_805FB08;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_OPPONENT_MON);
+            gBattlerFuncs[gActiveBattler] = sub_805FB08;
         }
         break;
     }
@@ -1262,7 +1262,7 @@ static void OpponentHandleDrawTrainerPic(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
         {
-            if (gActiveBank == 1)
+            if (gActiveBattler == 1)
                 trainerPicId = sub_81D5588(gTrainerBattleOpponent_A);
             else
                 trainerPicId = sub_81D5588(gTrainerBattleOpponent_B);
@@ -1276,7 +1276,7 @@ static void OpponentHandleDrawTrainerPic(void)
     {
         if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
         {
-            if (gActiveBank == 1)
+            if (gActiveBattler == 1)
                 trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_A);
             else
                 trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_B);
@@ -1292,7 +1292,7 @@ static void OpponentHandleDrawTrainerPic(void)
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
     {
-        if (gActiveBank != 1)
+        if (gActiveBattler != 1)
             trainerPicId = gTrainers[gTrainerBattleOpponent_B].trainerPic;
         else
             trainerPicId = gTrainers[gTrainerBattleOpponent_A].trainerPic;
@@ -1304,7 +1304,7 @@ static void OpponentHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS))
     {
-        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBattlerPosition(gActiveBattler) & BIT_FLANK) != 0) // second mon
             xPos = 152;
         else // first mon
             xPos = 200;
@@ -1314,20 +1314,20 @@ static void OpponentHandleDrawTrainerPic(void)
         xPos = 176;
     }
 
-    DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
+    DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
+    sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
                                                xPos,
                                                (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40,
-                                               sub_80A82E4(gActiveBank));
+                                               sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicId;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void OpponentHandleTrainerSlide(void)
@@ -1346,7 +1346,7 @@ static void OpponentHandleTrainerSlide(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
         {
-            if (gActiveBank == 1)
+            if (gActiveBattler == 1)
                 trainerPicId = sub_81D5588(gTrainerBattleOpponent_A);
             else
                 trainerPicId = sub_81D5588(gTrainerBattleOpponent_B);
@@ -1360,7 +1360,7 @@ static void OpponentHandleTrainerSlide(void)
     {
         if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
         {
-            if (gActiveBank == 1)
+            if (gActiveBattler == 1)
                 trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_A);
             else
                 trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_B);
@@ -1376,7 +1376,7 @@ static void OpponentHandleTrainerSlide(void)
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
     {
-        if (gActiveBank != 1)
+        if (gActiveBattler != 1)
             trainerPicId = gTrainers[gTrainerBattleOpponent_B].trainerPic;
         else
             trainerPicId = gTrainers[gTrainerBattleOpponent_A].trainerPic;
@@ -1386,47 +1386,47 @@ static void OpponentHandleTrainerSlide(void)
         trainerPicId = gTrainers[gTrainerBattleOpponent_A].trainerPic;
     }
 
-    DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E);
+    DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
+    sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E);
 
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 96;
-    gSprites[gBankSpriteIds[gActiveBank]].pos1.x += 32;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicId;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 96;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos1.x += 32;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy2;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
 }
 
 static void OpponentHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    gBattleBankFunc[gActiveBank] = sub_805F240;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerFuncs[gActiveBattler] = sub_805F240;
 }
 
 static void OpponentHandleFaintAnimation(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
     else
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT);
-            gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039934;
-            gBattleBankFunc[gActiveBank] = sub_805FAC4;
+            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039934;
+            gBattlerFuncs[gActiveBattler] = sub_805FAC4;
         }
     }
 }
@@ -1453,51 +1453,51 @@ static void OpponentHandlePause(void)
 
 static void OpponentHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
+        u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
 
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4] | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6] | (gBattleBufferA[gActiveBattler][7] << 8) | (gBattleBufferA[gActiveBattler][8] << 16) | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
         if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE
         {
             OpponentBufferExecCompleted();
         }
         else
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            gBattleBankFunc[gActiveBank] = OpponentDoMoveAnimation;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            gBattlerFuncs[gActiveBattler] = OpponentDoMoveAnimation;
         }
     }
 }
 
 static void OpponentDoMoveAnimation(void)
 {
-    u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 multihit = gBattleBufferA[gActiveBank][11];
+    u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 multihit = gBattleBufferA[gActiveBattler][11];
 
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             sub_805EB9C(0);
             DoMoveAnim(move);
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 2;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
         }
         break;
     case 2:
@@ -1505,20 +1505,20 @@ static void OpponentDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
             {
-                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
+                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
+                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
             }
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
         break;
     case 3:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             CopyAllBattleSpritesInvisibilities();
-            TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            TrySetBehindSubstituteSpriteBit(gActiveBattler, gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             OpponentBufferExecCompleted();
         }
         break;
@@ -1531,11 +1531,11 @@ static void OpponentHandlePrintString(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    stringId = (u16*)(&gBattleBufferA[gActiveBank][2]);
+    stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
-    sub_81A57E4(gActiveBank, *stringId);
+    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
+    sub_81A57E4(gActiveBattler, *stringId);
 }
 
 static void OpponentHandlePrintSelectionString(void)
@@ -1564,7 +1564,7 @@ static void OpponentHandleChooseMove(void)
     else
     {
         u8 chosenMoveId;
-        struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
+        struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
 
         if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_FIRST_BATTLE | BATTLE_TYPE_SAFARI | BATTLE_TYPE_ROAMER))
         {
@@ -1581,18 +1581,18 @@ static void OpponentHandleChooseMove(void)
                 EmitTwoReturnValues(1, ACTION_RUN, 0);
                 break;
             case 6:
-                EmitTwoReturnValues(1, 15, gBankDefender);
+                EmitTwoReturnValues(1, 15, gBattleDefender);
                 break;
             default:
                 if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_USER | MOVE_TARGET_x10))
-                    gBankDefender = gActiveBank;
+                    gBattleDefender = gActiveBattler;
                 if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH)
                 {
-                    gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
-                    if (gAbsentBankFlags & gBitTable[gBankDefender])
-                        gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+                    gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+                    if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
+                        gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
                 }
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (gBankDefender << 8));
+                EmitTwoReturnValues(1, 10, (chosenMoveId) | (gBattleDefender << 8));
                 break;
             }
             OpponentBufferExecCompleted();
@@ -1607,11 +1607,11 @@ static void OpponentHandleChooseMove(void)
             } while (move == MOVE_NONE);
 
             if (gBattleMoves[move].target & (MOVE_TARGET_USER | MOVE_TARGET_x10))
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (gActiveBank << 8));
+                EmitTwoReturnValues(1, 10, (chosenMoveId) | (gActiveBattler << 8));
             else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBankByPosition(Random() & 2) << 8));
+                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBattlerAtPosition(Random() & 2) << 8));
             else
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBankByPosition(B_POSITION_PLAYER_LEFT) << 8));
+                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBattlerAtPosition(B_POSITION_PLAYER_LEFT) << 8));
 
             OpponentBufferExecCompleted();
         }
@@ -1620,7 +1620,7 @@ static void OpponentHandleChooseMove(void)
 
 static void OpponentHandleChooseItem(void)
 {
-    EmitOneReturnValue(1, *(gBattleStruct->chosenItem + (gActiveBank / 2) * 2));
+    EmitOneReturnValue(1, *(gBattleStruct->chosenItem + (gActiveBattler / 2) * 2));
     OpponentBufferExecCompleted();
 }
 
@@ -1628,7 +1628,7 @@ static void OpponentHandleChoosePokemon(void)
 {
     s32 chosenMonId;
 
-    if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) == 6)
+    if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) == 6)
     {
         chosenMonId = GetMostSuitableMonToSwitchInto();
 
@@ -1638,17 +1638,17 @@ static void OpponentHandleChoosePokemon(void)
 
             if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
             {
-                bank2 = bank1 = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+                bank2 = bank1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
             }
             else
             {
-                bank1 = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
-                bank2 = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+                bank1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+                bank2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
             }
 
             if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000))
             {
-                if (gActiveBank == 1)
+                if (gActiveBattler == 1)
                     firstId = 0, lastId = 3;
                 else
                     firstId = 3, lastId = 6;
@@ -1671,12 +1671,12 @@ static void OpponentHandleChoosePokemon(void)
     }
     else
     {
-        chosenMonId = *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank);
-        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
+        chosenMonId = *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler);
+        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
     }
 
 
-    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = chosenMonId;
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = chosenMonId;
     EmitChosenMonReturnValue(1, chosenMonId, NULL);
     OpponentBufferExecCompleted();
 }
@@ -1691,23 +1691,23 @@ static void OpponentHandleHealthBarUpdate(void)
     s16 hpVal;
 
     LoadBattleBarGfx(0);
-    hpVal = (gBattleBufferA[gActiveBank][3] << 8) | gBattleBufferA[gActiveBank][2];
+    hpVal = (gBattleBufferA[gActiveBattler][3] << 8) | gBattleBufferA[gActiveBattler][2];
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, 0, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnHealthbarDone;
+    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void OpponentHandleExpUpdate(void)
@@ -1717,24 +1717,24 @@ static void OpponentHandleExpUpdate(void)
 
 static void OpponentHandleStatusIconUpdate(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], HEALTHBOX_STATUS_ICON);
-        bank = gActiveBank;
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
 static void OpponentHandleStatusAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
-                        gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
+                        gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1791,7 +1791,7 @@ static void OpponentHandleCmd37(void)
 
 static void OpponentHandleCmd38(void)
 {
-    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1];
     OpponentBufferExecCompleted();
 }
 
@@ -1809,16 +1809,16 @@ static void OpponentHandleCmd40(void)
 
 static void OpponentHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         OpponentBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        DoHitAnimHealthboxEffect(gActiveBank);
-        gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        DoHitAnimHealthboxEffect(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1831,25 +1831,25 @@ static void OpponentHandlePlaySE(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         pan = PAN_SIDE_PLAYER;
     else
         pan = PAN_SIDE_OPPONENT;
 
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     OpponentBufferExecCompleted();
 }
 
 static void OpponentHandlePlayFanfareOrBGM(void)
 {
-    if (gBattleBufferA[gActiveBank][3])
+    if (gBattleBufferA[gActiveBattler][3])
     {
         BattleStopLowHpSound();
-        PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
     else
     {
-        PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
 
     OpponentBufferExecCompleted();
@@ -1857,7 +1857,7 @@ static void OpponentHandlePlayFanfareOrBGM(void)
 
 static void OpponentHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, 25, 5);
     OpponentBufferExecCompleted();
@@ -1865,7 +1865,7 @@ static void OpponentHandleFaintingCry(void)
 
 static void OpponentHandleIntroSlide(void)
 {
-    HandleIntroSlide(gBattleBufferA[gActiveBank][1]);
+    HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
     gUnknown_020243FC |= 1;
     OpponentBufferExecCompleted();
 }
@@ -1875,23 +1875,23 @@ static void OpponentHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_806280C);
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_806280C);
 
     taskId = CreateTask(sub_8062828, 5);
-    gTasks[taskId].data[0] = gActiveBank;
+    gTasks[taskId].data[0] = gActiveBattler;
 
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_26;
+    gBattlerFuncs[gActiveBattler] = nullsub_26;
 }
 
 static void sub_806280C(struct Sprite *sprite)
@@ -1903,79 +1903,79 @@ static void sub_806280C(struct Sprite *sprite)
 
 static void sub_8062828(u8 taskId)
 {
-    u8 savedActiveBank = gActiveBank;
+    u8 savedActiveBank = gActiveBattler;
 
-    gActiveBank = gTasks[taskId].data[0];
+    gActiveBattler = gTasks[taskId].data[0];
     if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_80613DC(gActiveBank, FALSE);
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_80613DC(gActiveBattler, FALSE);
     }
     else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS))
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_80613DC(gActiveBank, FALSE);
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_80613DC(gActiveBattler, FALSE);
     }
     else
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_80613DC(gActiveBank, FALSE);
-        gActiveBank ^= BIT_MON;
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_80613DC(gActiveBank, FALSE);
-        gActiveBank ^= BIT_MON;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_80613DC(gActiveBattler, FALSE);
+        gActiveBattler ^= BIT_FLANK;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_80613DC(gActiveBattler, FALSE);
+        gActiveBattler ^= BIT_FLANK;
     }
-    gBattleBankFunc[gActiveBank] = sub_805F560;
-    gActiveBank = savedActiveBank;
+    gBattlerFuncs[gActiveBattler] = sub_805F560;
+    gActiveBattler = savedActiveBank;
     DestroyTask(taskId);
 }
 
 static void OpponentHandleDrawPartyStatusSummary(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
     {
         OpponentBufferExecCompleted();
     }
     else
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
 
-        if (gBattleBufferA[gActiveBank][2] != 0)
+        if (gBattleBufferA[gActiveBattler][2] != 0)
         {
-            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1E < 2)
+            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1E < 2)
             {
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1E++;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1E++;
                 return;
             }
             else
             {
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1E = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1E = 0;
             }
         }
 
-        gUnknown_020244B4[gActiveBank] = CreatePartyStatusSummarySprites(gActiveBank, (struct HpAndStatus *)&gBattleBufferA[gActiveBank][4], gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][2]);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
-        if (gBattleBufferA[gActiveBank][2] != 0)
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0x5D;
+        if (gBattleBufferA[gActiveBattler][2] != 0)
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattleBankFunc[gActiveBank] = sub_8062A2C;
+        gBattlerFuncs[gActiveBattler] = sub_8062A2C;
     }
 }
 
 static void sub_8062A2C(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5++ > 0x5C)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5++ > 0x5C)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
         OpponentBufferExecCompleted();
     }
 }
 
 static void OpponentHandleCmd49(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
     OpponentBufferExecCompleted();
 }
 
@@ -1986,25 +1986,25 @@ static void OpponentHandleCmd50(void)
 
 static void OpponentHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank))
+    if (IsBankSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        CopyBattleSpriteInvisibility(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        CopyBattleSpriteInvisibility(gActiveBattler);
     }
     OpponentBufferExecCompleted();
 }
 
 static void OpponentHandleBattleAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u8 animationId = gBattleBufferA[gActiveBank][1];
-        u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 animationId = gBattleBufferA[gActiveBattler][1];
+        u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             OpponentBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
+            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
     }
 }
 
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index e8a6898f8..8d52ee377 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -28,31 +28,31 @@
 #include "data2.h"
 
 extern u32 gBattleExecBuffer;
-extern u8 gActiveBank;
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gAbsentBankFlags;
-extern u8 gBattleBanksCount;
+extern u8 gActiveBattler;
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gAbsentBattlerFlags;
+extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
 extern u8 gPlayerDpadHoldFrames;
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u8 gMultiUsePlayerCursor;
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u16 gPartnerTrainerId;
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gSpecialVar_ItemId;
 extern u8 gUnknown_0203CEE8;
 extern u8 gUnknown_0203CEE9;
 extern u8 gUnknown_0203CF00[];
-extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u8 gNumberOfMovesToChoose;
 extern u16 gBattle_BG0_X;
@@ -60,7 +60,7 @@ extern u16 gBattle_BG0_Y;
 extern s32 gUnknown_0203CD70;
 extern u8 gBankInMenu;
 extern u32 gBattlePalaceMoveSelectionRngValue;
-extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
+extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_020244B4[];
 extern u16 gUnknown_020243FC;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
@@ -243,33 +243,33 @@ void nullsub_21(void)
 
 void SetControllerToPlayer(void)
 {
-    gBattleBankFunc[gActiveBank] = PlayerBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = PlayerBufferRunCommand;
     gDoingBattleAnim = FALSE;
     gPlayerDpadHoldFrames = 0;
 }
 
 static void PlayerBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = PlayerBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = PlayerBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
+        gBattleBufferA[gActiveBattler][0] = CONTROLLER_TERMINATOR_NOP;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
 static void PlayerBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sPlayerBufferCommands))
-            sPlayerBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sPlayerBufferCommands))
+            sPlayerBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             PlayerBufferExecCompleted();
     }
@@ -277,16 +277,16 @@ static void PlayerBufferRunCommand(void)
 
 static void CompleteOnBankSpritePosX_0(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
         PlayerBufferExecCompleted();
 }
 
 static void HandleInputChooseAction(void)
 {
-    u16 itemId = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    u16 itemId = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-    dp11b_obj_instanciate(gActiveBank, 1, 7, 1);
-    dp11b_obj_instanciate(gActiveBank, 0, 7, 1);
+    dp11b_obj_instanciate(gActiveBattler, 1, 7, 1);
+    dp11b_obj_instanciate(gActiveBattler, 0, 7, 1);
 
     if (gMain.newAndRepeatedKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2)
         gPlayerDpadHoldFrames++;
@@ -297,7 +297,7 @@ static void HandleInputChooseAction(void)
     {
         PlaySE(SE_SELECT);
 
-        switch (gActionSelectionCursor[gActiveBank])
+        switch (gActionSelectionCursor[gActiveBattler])
         {
         case 0:
             EmitTwoReturnValues(1, ACTION_USE_MOVE, 0);
@@ -316,52 +316,52 @@ static void HandleInputChooseAction(void)
     }
     else if (gMain.newKeys & DPAD_LEFT)
     {
-        if (gActionSelectionCursor[gActiveBank] & 1) // if is ACTION_USE_ITEM or ACTION_RUN
+        if (gActionSelectionCursor[gActiveBattler] & 1) // if is ACTION_USE_ITEM or ACTION_RUN
         {
             PlaySE(SE_SELECT);
-            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 1;
-            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 1;
+            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (!(gActionSelectionCursor[gActiveBank] & 1)) // if is ACTION_USE_MOVE or ACTION_SWITCH
+        if (!(gActionSelectionCursor[gActiveBattler] & 1)) // if is ACTION_USE_MOVE or ACTION_SWITCH
         {
             PlaySE(SE_SELECT);
-            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 1;
-            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 1;
+            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_UP)
     {
-        if (gActionSelectionCursor[gActiveBank] & 2) // if is ACTION_SWITCH or ACTION_RUN
+        if (gActionSelectionCursor[gActiveBattler] & 2) // if is ACTION_SWITCH or ACTION_RUN
         {
             PlaySE(SE_SELECT);
-            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 2;
-            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 2;
+            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
-        if (!(gActionSelectionCursor[gActiveBank] & 2)) // if is ACTION_USE_MOVE or ACTION_USE_ITEM
+        if (!(gActionSelectionCursor[gActiveBattler] & 2)) // if is ACTION_USE_MOVE or ACTION_USE_ITEM
         {
             PlaySE(SE_SELECT);
-            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 2;
-            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 2;
+            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59)
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-         && GetBankPosition(gActiveBank) == B_POSITION_PLAYER_RIGHT
-         && !(gAbsentBankFlags & gBitTable[GetBankByPosition(B_POSITION_PLAYER_LEFT)])
+         && GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_RIGHT
+         && !(gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)])
          && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            if (gBattleBufferA[gActiveBank][1] == ACTION_USE_ITEM)
+            if (gBattleBufferA[gActiveBattler][1] == ACTION_USE_ITEM)
             {
                 // Add item to bag if it is a ball
                 if (itemId <= ITEM_PREMIER_BALL)
@@ -382,9 +382,9 @@ static void HandleInputChooseAction(void)
 
 static void sub_80577F0(void) // unused
 {
-    dp11b_obj_free(gActiveBank, 1);
-    dp11b_obj_free(gActiveBank, 0);
-    gBattleBankFunc[gActiveBank] = HandleInputChooseTarget;
+    dp11b_obj_free(gActiveBattler, 1);
+    dp11b_obj_free(gActiveBattler, 0);
+    gBattlerFuncs[gActiveBattler] = HandleInputChooseTarget;
 }
 
 static void HandleInputChooseTarget(void)
@@ -397,14 +397,14 @@ static void HandleInputChooseTarget(void)
 
     // what a weird loop
     i = 0;
-    if (gBattleBanksCount != 0)
+    if (gBattlersCount != 0)
     {
         do
         {
             if (i != gMultiUsePlayerCursor)
                 dp11b_obj_free(i, 1);
             i++;
-        } while (i < gBattleBanksCount);
+        } while (i < gBattlersCount);
     }
 
     if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2)
@@ -416,7 +416,7 @@ static void HandleInputChooseTarget(void)
     {
         PlaySE(SE_SELECT);
         gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
-        EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBank] | (gMultiUsePlayerCursor << 8));
+        EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8));
         dp11b_obj_free(gMultiUsePlayerCursor, 1);
         PlayerBufferExecCompleted();
     }
@@ -424,9 +424,9 @@ static void HandleInputChooseTarget(void)
     {
         PlaySE(SE_SELECT);
         gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
-        gBattleBankFunc[gActiveBank] = HandleInputChooseMove;
-        dp11b_obj_instanciate(gActiveBank, 1, 7, 1);
-        dp11b_obj_instanciate(gActiveBank, 0, 7, 1);
+        gBattlerFuncs[gActiveBattler] = HandleInputChooseMove;
+        dp11b_obj_instanciate(gActiveBattler, 1, 7, 1);
+        dp11b_obj_instanciate(gActiveBattler, 0, 7, 1);
         dp11b_obj_free(gMultiUsePlayerCursor, 1);
     }
     else if (gMain.newKeys & (DPAD_LEFT | DPAD_UP))
@@ -436,9 +436,9 @@ static void HandleInputChooseTarget(void)
 
         do
         {
-            u8 currSelIdentity = GetBankPosition(gMultiUsePlayerCursor);
+            u8 currSelIdentity = GetBattlerPosition(gMultiUsePlayerCursor);
 
-            for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+            for (i = 0; i < MAX_BATTLERS_COUNT; i++)
             {
                 if (currSelIdentity == identities[i])
                     break;
@@ -447,17 +447,17 @@ static void HandleInputChooseTarget(void)
             {
                 if (--i < 0)
                     i = 4; // UB: array out of range
-                gMultiUsePlayerCursor = GetBankByPosition(identities[i]);
-            } while (gMultiUsePlayerCursor == gBattleBanksCount);
+                gMultiUsePlayerCursor = GetBattlerAtPosition(identities[i]);
+            } while (gMultiUsePlayerCursor == gBattlersCount);
 
             i = 0;
-            switch (GetBankPosition(gMultiUsePlayerCursor))
+            switch (GetBattlerPosition(gMultiUsePlayerCursor))
             {
             case B_POSITION_PLAYER_LEFT:
             case B_POSITION_PLAYER_RIGHT:
-                if (gActiveBank != gMultiUsePlayerCursor)
+                if (gActiveBattler != gMultiUsePlayerCursor)
                     i++;
-                else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBank])].target & MOVE_TARGET_USER)
+                else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler])].target & MOVE_TARGET_USER)
                     i++;
                 break;
             case B_POSITION_OPPONENT_LEFT:
@@ -466,7 +466,7 @@ static void HandleInputChooseTarget(void)
                 break;
             }
 
-            if (gAbsentBankFlags & gBitTable[gMultiUsePlayerCursor])
+            if (gAbsentBattlerFlags & gBitTable[gMultiUsePlayerCursor])
                 i = 0;
         } while (i == 0);
         gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
@@ -478,9 +478,9 @@ static void HandleInputChooseTarget(void)
 
         do
         {
-            u8 currSelIdentity = GetBankPosition(gMultiUsePlayerCursor);
+            u8 currSelIdentity = GetBattlerPosition(gMultiUsePlayerCursor);
 
-            for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+            for (i = 0; i < MAX_BATTLERS_COUNT; i++)
             {
                 if (currSelIdentity == identities[i])
                     break;
@@ -489,17 +489,17 @@ static void HandleInputChooseTarget(void)
             {
                 if (++i > 3)
                     i = 0;
-                gMultiUsePlayerCursor = GetBankByPosition(identities[i]);
-            } while (gMultiUsePlayerCursor == gBattleBanksCount);
+                gMultiUsePlayerCursor = GetBattlerAtPosition(identities[i]);
+            } while (gMultiUsePlayerCursor == gBattlersCount);
 
             i = 0;
-            switch (GetBankPosition(gMultiUsePlayerCursor))
+            switch (GetBattlerPosition(gMultiUsePlayerCursor))
             {
             case B_POSITION_PLAYER_LEFT:
             case B_POSITION_PLAYER_RIGHT:
-                if (gActiveBank != gMultiUsePlayerCursor)
+                if (gActiveBattler != gMultiUsePlayerCursor)
                     i++;
-                else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBank])].target & MOVE_TARGET_USER)
+                else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler])].target & MOVE_TARGET_USER)
                     i++;
                 break;
             case B_POSITION_OPPONENT_LEFT:
@@ -508,7 +508,7 @@ static void HandleInputChooseTarget(void)
                 break;
             }
 
-            if (gAbsentBankFlags & gBitTable[gMultiUsePlayerCursor])
+            if (gAbsentBattlerFlags & gBitTable[gMultiUsePlayerCursor])
                 i = 0;
         } while (i == 0);
         gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
@@ -518,7 +518,7 @@ static void HandleInputChooseTarget(void)
 static void HandleInputChooseMove(void)
 {
     bool32 canSelectTarget = FALSE;
-    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
+    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
 
     if (gMain.heldKeys & DPAD_ANY && gSaveBlock2Ptr->optionsButtonMode == 2)
         gPlayerDpadHoldFrames++;
@@ -530,7 +530,7 @@ static void HandleInputChooseMove(void)
         u8 moveTarget;
 
         PlaySE(SE_SELECT);
-        if (moveInfo->moves[gMoveSelectionCursor[gActiveBank]] == MOVE_CURSE)
+        if (moveInfo->moves[gMoveSelectionCursor[gActiveBattler]] == MOVE_CURSE)
         {
             if (moveInfo->monType1 != TYPE_GHOST && moveInfo->monType2 != TYPE_GHOST)
                 moveTarget = MOVE_TARGET_x10;
@@ -539,17 +539,17 @@ static void HandleInputChooseMove(void)
         }
         else
         {
-            moveTarget = gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBank]]].target;
+            moveTarget = gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].target;
         }
 
         if (moveTarget & MOVE_TARGET_x10)
-            gMultiUsePlayerCursor = gActiveBank;
+            gMultiUsePlayerCursor = gActiveBattler;
         else
-            gMultiUsePlayerCursor = GetBankByPosition((GetBankPosition(gActiveBank) & BIT_SIDE) ^ BIT_SIDE);
+            gMultiUsePlayerCursor = GetBattlerAtPosition((GetBattlerPosition(gActiveBattler) & BIT_SIDE) ^ BIT_SIDE);
 
-        if (!gBattleBufferA[gActiveBank][1]) // not a double battle
+        if (!gBattleBufferA[gActiveBattler][1]) // not a double battle
         {
-            if (moveTarget & MOVE_TARGET_USER && !gBattleBufferA[gActiveBank][2])
+            if (moveTarget & MOVE_TARGET_USER && !gBattleBufferA[gActiveBattler][2])
                 canSelectTarget++;
         }
         else // double battle
@@ -557,32 +557,32 @@ static void HandleInputChooseMove(void)
             if (!(moveTarget & (MOVE_TARGET_RANDOM | MOVE_TARGET_BOTH | MOVE_TARGET_DEPENDS | MOVE_TARGET_FOES_AND_ALLY | MOVE_TARGET_OPPONENTS_FIELD | MOVE_TARGET_x10)))
                 canSelectTarget++; // either selected or user
 
-            if (moveInfo->currentPp[gMoveSelectionCursor[gActiveBank]] == 0)
+            if (moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]] == 0)
             {
                 canSelectTarget = FALSE;
             }
             else if (!(moveTarget & (MOVE_TARGET_x10 | MOVE_TARGET_USER)) && CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) <= 1)
             {
-                gMultiUsePlayerCursor = GetDefaultMoveTarget(gActiveBank);
+                gMultiUsePlayerCursor = GetDefaultMoveTarget(gActiveBattler);
                 canSelectTarget = FALSE;
             }
         }
 
         if (!canSelectTarget)
         {
-            EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBank] | (gMultiUsePlayerCursor << 8));
+            EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8));
             PlayerBufferExecCompleted();
         }
         else
         {
-            gBattleBankFunc[gActiveBank] = HandleInputChooseTarget;
+            gBattlerFuncs[gActiveBattler] = HandleInputChooseTarget;
 
             if (moveTarget & (MOVE_TARGET_x10 | MOVE_TARGET_USER))
-                gMultiUsePlayerCursor = gActiveBank;
-            else if (gAbsentBankFlags & gBitTable[GetBankByPosition(B_POSITION_OPPONENT_LEFT)])
-                gMultiUsePlayerCursor = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+                gMultiUsePlayerCursor = gActiveBattler;
+            else if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)])
+                gMultiUsePlayerCursor = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
             else
-                gMultiUsePlayerCursor = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+                gMultiUsePlayerCursor = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
 
             gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
         }
@@ -595,50 +595,50 @@ static void HandleInputChooseMove(void)
     }
     else if (gMain.newKeys & DPAD_LEFT)
     {
-        if (gMoveSelectionCursor[gActiveBank] & 1)
+        if (gMoveSelectionCursor[gActiveBattler] & 1)
         {
-            MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBank]);
-            gMoveSelectionCursor[gActiveBank] ^= 1;
+            MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]);
+            gMoveSelectionCursor[gActiveBattler] ^= 1;
             PlaySE(SE_SELECT);
-            MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
+            MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
             MoveSelectionDisplayPpNumber();
             MoveSelectionDisplayMoveType();
         }
     }
     else if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (!(gMoveSelectionCursor[gActiveBank] & 1)
-         && (gMoveSelectionCursor[gActiveBank] ^ 1) < gNumberOfMovesToChoose)
+        if (!(gMoveSelectionCursor[gActiveBattler] & 1)
+         && (gMoveSelectionCursor[gActiveBattler] ^ 1) < gNumberOfMovesToChoose)
         {
-            MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBank]);
-            gMoveSelectionCursor[gActiveBank] ^= 1;
+            MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]);
+            gMoveSelectionCursor[gActiveBattler] ^= 1;
             PlaySE(SE_SELECT);
-            MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
+            MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
             MoveSelectionDisplayPpNumber();
             MoveSelectionDisplayMoveType();
         }
     }
     else if (gMain.newKeys & DPAD_UP)
     {
-        if (gMoveSelectionCursor[gActiveBank] & 2)
+        if (gMoveSelectionCursor[gActiveBattler] & 2)
         {
-            MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBank]);
-            gMoveSelectionCursor[gActiveBank] ^= 2;
+            MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]);
+            gMoveSelectionCursor[gActiveBattler] ^= 2;
             PlaySE(SE_SELECT);
-            MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
+            MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
             MoveSelectionDisplayPpNumber();
             MoveSelectionDisplayMoveType();
         }
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
-        if (!(gMoveSelectionCursor[gActiveBank] & 2)
-         && (gMoveSelectionCursor[gActiveBank] ^ 2) < gNumberOfMovesToChoose)
+        if (!(gMoveSelectionCursor[gActiveBattler] & 2)
+         && (gMoveSelectionCursor[gActiveBattler] ^ 2) < gNumberOfMovesToChoose)
         {
-            MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBank]);
-            gMoveSelectionCursor[gActiveBank] ^= 2;
+            MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]);
+            gMoveSelectionCursor[gActiveBattler] ^= 2;
             PlaySE(SE_SELECT);
-            MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
+            MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
             MoveSelectionDisplayPpNumber();
             MoveSelectionDisplayMoveType();
         }
@@ -647,16 +647,16 @@ static void HandleInputChooseMove(void)
     {
         if (gNumberOfMovesToChoose > 1 && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
         {
-            MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 29);
+            MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 29);
 
-            if (gMoveSelectionCursor[gActiveBank] != 0)
+            if (gMoveSelectionCursor[gActiveBattler] != 0)
                 gMultiUsePlayerCursor = 0;
             else
-                gMultiUsePlayerCursor = gMoveSelectionCursor[gActiveBank] + 1;
+                gMultiUsePlayerCursor = gMoveSelectionCursor[gActiveBattler] + 1;
 
             MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27);
             BattleHandleAddTextPrinter(gText_BattleSwitchWhich, 0xB);
-            gBattleBankFunc[gActiveBank] = HandleMoveSwitchting;
+            gBattlerFuncs[gActiveBattler] = HandleMoveSwitchting;
         }
     }
 }
@@ -677,35 +677,35 @@ u32 sub_8057FBC(void) // unused
         gBattle_BG0_Y = 0x140;
         var = 0xFF;
     }
-    if (gMain.newKeys & DPAD_LEFT && gMoveSelectionCursor[gActiveBank] & 1)
+    if (gMain.newKeys & DPAD_LEFT && gMoveSelectionCursor[gActiveBattler] & 1)
     {
-        MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBank]);
-        gMoveSelectionCursor[gActiveBank] ^= 1;
+        MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]);
+        gMoveSelectionCursor[gActiveBattler] ^= 1;
         PlaySE(SE_SELECT);
-        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
+        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
     }
-    if (gMain.newKeys & DPAD_RIGHT && !(gMoveSelectionCursor[gActiveBank] & 1)
-        && (gMoveSelectionCursor[gActiveBank] ^ 1) < gNumberOfMovesToChoose)
+    if (gMain.newKeys & DPAD_RIGHT && !(gMoveSelectionCursor[gActiveBattler] & 1)
+        && (gMoveSelectionCursor[gActiveBattler] ^ 1) < gNumberOfMovesToChoose)
     {
-        MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBank]);
-        gMoveSelectionCursor[gActiveBank] ^= 1;
+        MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]);
+        gMoveSelectionCursor[gActiveBattler] ^= 1;
         PlaySE(SE_SELECT);
-        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
+        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
     }
-    if (gMain.newKeys & DPAD_UP && gMoveSelectionCursor[gActiveBank] & 2)
+    if (gMain.newKeys & DPAD_UP && gMoveSelectionCursor[gActiveBattler] & 2)
     {
-        MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBank]);
-        gMoveSelectionCursor[gActiveBank] ^= 2;
+        MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]);
+        gMoveSelectionCursor[gActiveBattler] ^= 2;
         PlaySE(SE_SELECT);
-        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
+        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
     }
-    if (gMain.newKeys & DPAD_DOWN && !(gMoveSelectionCursor[gActiveBank] & 2)
-        && (gMoveSelectionCursor[gActiveBank] ^ 2) < gNumberOfMovesToChoose)
+    if (gMain.newKeys & DPAD_DOWN && !(gMoveSelectionCursor[gActiveBattler] & 2)
+        && (gMoveSelectionCursor[gActiveBattler] ^ 2) < gNumberOfMovesToChoose)
     {
-        MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBank]);
-        gMoveSelectionCursor[gActiveBank] ^= 2;
+        MoveSelectionDestroyCursorAt(gMoveSelectionCursor[gActiveBattler]);
+        gMoveSelectionCursor[gActiveBattler] ^= 2;
         PlaySE(SE_SELECT);
-        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
+        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
     }
 
     return var;
@@ -721,73 +721,73 @@ static void HandleMoveSwitchting(void)
     {
         PlaySE(SE_SELECT);
 
-        if (gMoveSelectionCursor[gActiveBank] != gMultiUsePlayerCursor)
+        if (gMoveSelectionCursor[gActiveBattler] != gMultiUsePlayerCursor)
         {
-            struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
+            struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
             s32 i;
 
             // swap moves and pp
-            i = moveInfo->moves[gMoveSelectionCursor[gActiveBank]];
-            moveInfo->moves[gMoveSelectionCursor[gActiveBank]] = moveInfo->moves[gMultiUsePlayerCursor];
+            i = moveInfo->moves[gMoveSelectionCursor[gActiveBattler]];
+            moveInfo->moves[gMoveSelectionCursor[gActiveBattler]] = moveInfo->moves[gMultiUsePlayerCursor];
             moveInfo->moves[gMultiUsePlayerCursor] = i;
 
-            i = moveInfo->currentPp[gMoveSelectionCursor[gActiveBank]];
-            moveInfo->currentPp[gMoveSelectionCursor[gActiveBank]] = moveInfo->currentPp[gMultiUsePlayerCursor];
+            i = moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]];
+            moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]] = moveInfo->currentPp[gMultiUsePlayerCursor];
             moveInfo->currentPp[gMultiUsePlayerCursor] = i;
 
-            i = moveInfo->maxPp[gMoveSelectionCursor[gActiveBank]];
-            moveInfo->maxPp[gMoveSelectionCursor[gActiveBank]] = moveInfo->maxPp[gMultiUsePlayerCursor];
+            i = moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]];
+            moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]] = moveInfo->maxPp[gMultiUsePlayerCursor];
             moveInfo->maxPp[gMultiUsePlayerCursor] = i;
 
-            if (gDisableStructs[gActiveBank].unk18_b & gBitTable[gMoveSelectionCursor[gActiveBank]])
+            if (gDisableStructs[gActiveBattler].unk18_b & gBitTable[gMoveSelectionCursor[gActiveBattler]])
             {
-                gDisableStructs[gActiveBank].unk18_b &= (~gBitTable[gMoveSelectionCursor[gActiveBank]]);
-                gDisableStructs[gActiveBank].unk18_b |= gBitTable[gMultiUsePlayerCursor];
+                gDisableStructs[gActiveBattler].unk18_b &= (~gBitTable[gMoveSelectionCursor[gActiveBattler]]);
+                gDisableStructs[gActiveBattler].unk18_b |= gBitTable[gMultiUsePlayerCursor];
             }
 
             MoveSelectionDisplayMoveNames();
 
             for (i = 0; i < 4; i++)
-                perMovePPBonuses[i] = (gBattleMons[gActiveBank].ppBonuses & (3 << (i * 2))) >> (i * 2);
+                perMovePPBonuses[i] = (gBattleMons[gActiveBattler].ppBonuses & (3 << (i * 2))) >> (i * 2);
 
-            totalPPBonuses = perMovePPBonuses[gMoveSelectionCursor[gActiveBank]];
-            perMovePPBonuses[gMoveSelectionCursor[gActiveBank]] = perMovePPBonuses[gMultiUsePlayerCursor];
+            totalPPBonuses = perMovePPBonuses[gMoveSelectionCursor[gActiveBattler]];
+            perMovePPBonuses[gMoveSelectionCursor[gActiveBattler]] = perMovePPBonuses[gMultiUsePlayerCursor];
             perMovePPBonuses[gMultiUsePlayerCursor] = totalPPBonuses;
 
             totalPPBonuses = 0;
             for (i = 0; i < 4; i++)
                 totalPPBonuses |= perMovePPBonuses[i] << (i * 2);
 
-            gBattleMons[gActiveBank].ppBonuses = totalPPBonuses;
+            gBattleMons[gActiveBattler].ppBonuses = totalPPBonuses;
 
             for (i = 0; i < 4; i++)
             {
-                gBattleMons[gActiveBank].moves[i] = moveInfo->moves[i];
-                gBattleMons[gActiveBank].pp[i] = moveInfo->currentPp[i];
+                gBattleMons[gActiveBattler].moves[i] = moveInfo->moves[i];
+                gBattleMons[gActiveBattler].pp[i] = moveInfo->currentPp[i];
             }
 
-            if (!(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
+            if (!(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
             {
                 for (i = 0; i < 4; i++)
                 {
-                    moveStruct.moves[i] = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + i);
-                    moveStruct.currentPp[i] = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_PP1 + i);
+                    moveStruct.moves[i] = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + i);
+                    moveStruct.currentPp[i] = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP1 + i);
                 }
 
-                totalPPBonuses = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_PP_BONUSES);
+                totalPPBonuses = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP_BONUSES);
                 for (i = 0; i < 4; i++)
                     perMovePPBonuses[i] = (totalPPBonuses & (3 << (i * 2))) >> (i * 2);
 
-                i = moveStruct.moves[gMoveSelectionCursor[gActiveBank]];
-                moveStruct.moves[gMoveSelectionCursor[gActiveBank]] = moveStruct.moves[gMultiUsePlayerCursor];
+                i = moveStruct.moves[gMoveSelectionCursor[gActiveBattler]];
+                moveStruct.moves[gMoveSelectionCursor[gActiveBattler]] = moveStruct.moves[gMultiUsePlayerCursor];
                 moveStruct.moves[gMultiUsePlayerCursor] = i;
 
-                i = moveStruct.currentPp[gMoveSelectionCursor[gActiveBank]];
-                moveStruct.currentPp[gMoveSelectionCursor[gActiveBank]] = moveStruct.currentPp[gMultiUsePlayerCursor];
+                i = moveStruct.currentPp[gMoveSelectionCursor[gActiveBattler]];
+                moveStruct.currentPp[gMoveSelectionCursor[gActiveBattler]] = moveStruct.currentPp[gMultiUsePlayerCursor];
                 moveStruct.currentPp[gMultiUsePlayerCursor] = i;
 
-                totalPPBonuses = perMovePPBonuses[gMoveSelectionCursor[gActiveBank]];
-                perMovePPBonuses[gMoveSelectionCursor[gActiveBank]] = perMovePPBonuses[gMultiUsePlayerCursor];
+                totalPPBonuses = perMovePPBonuses[gMoveSelectionCursor[gActiveBattler]];
+                perMovePPBonuses[gMoveSelectionCursor[gActiveBattler]] = perMovePPBonuses[gMultiUsePlayerCursor];
                 perMovePPBonuses[gMultiUsePlayerCursor] = totalPPBonuses;
 
                 totalPPBonuses = 0;
@@ -796,17 +796,17 @@ static void HandleMoveSwitchting(void)
 
                 for (i = 0; i < 4; i++)
                 {
-                    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1 + i, &moveStruct.moves[i]);
-                    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_PP1 + i, &moveStruct.currentPp[i]);
+                    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + i, &moveStruct.moves[i]);
+                    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP1 + i, &moveStruct.currentPp[i]);
                 }
 
-                SetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_PP_BONUSES, &totalPPBonuses);
+                SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP_BONUSES, &totalPPBonuses);
             }
         }
 
-        gBattleBankFunc[gActiveBank] = HandleInputChooseMove;
-        gMoveSelectionCursor[gActiveBank] = gMultiUsePlayerCursor;
-        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
+        gBattlerFuncs[gActiveBattler] = HandleInputChooseMove;
+        gMoveSelectionCursor[gActiveBattler] = gMultiUsePlayerCursor;
+        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
         MoveSelectionDisplayPpString();
         MoveSelectionDisplayPpNumber();
         MoveSelectionDisplayMoveType();
@@ -815,8 +815,8 @@ static void HandleMoveSwitchting(void)
     {
         PlaySE(SE_SELECT);
         MoveSelectionDestroyCursorAt(gMultiUsePlayerCursor);
-        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
-        gBattleBankFunc[gActiveBank] = HandleInputChooseMove;
+        MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
+        gBattlerFuncs[gActiveBattler] = HandleInputChooseMove;
         MoveSelectionDisplayPpString();
         MoveSelectionDisplayPpNumber();
         MoveSelectionDisplayMoveType();
@@ -825,15 +825,15 @@ static void HandleMoveSwitchting(void)
     {
         if (gMultiUsePlayerCursor & 1)
         {
-            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBank])
-                MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 29);
+            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBattler])
+                MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 29);
             else
                 MoveSelectionDestroyCursorAt(gMultiUsePlayerCursor);
 
             gMultiUsePlayerCursor ^= 1;
             PlaySE(SE_SELECT);
 
-            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBank])
+            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBattler])
                 MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 0);
             else
                 MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27);
@@ -843,15 +843,15 @@ static void HandleMoveSwitchting(void)
     {
         if (!(gMultiUsePlayerCursor & 1) && (gMultiUsePlayerCursor ^ 1) < gNumberOfMovesToChoose)
         {
-            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBank])
-                MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 29);
+            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBattler])
+                MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 29);
             else
                 MoveSelectionDestroyCursorAt(gMultiUsePlayerCursor);
 
             gMultiUsePlayerCursor ^= 1;
             PlaySE(SE_SELECT);
 
-            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBank])
+            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBattler])
                 MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 0);
             else
                 MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27);
@@ -861,15 +861,15 @@ static void HandleMoveSwitchting(void)
     {
         if (gMultiUsePlayerCursor & 2)
         {
-            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBank])
-                MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 29);
+            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBattler])
+                MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 29);
             else
                 MoveSelectionDestroyCursorAt(gMultiUsePlayerCursor);
 
             gMultiUsePlayerCursor ^= 2;
             PlaySE(SE_SELECT);
 
-            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBank])
+            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBattler])
                 MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 0);
             else
                 MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27);
@@ -879,15 +879,15 @@ static void HandleMoveSwitchting(void)
     {
         if (!(gMultiUsePlayerCursor & 2) && (gMultiUsePlayerCursor ^ 2) < gNumberOfMovesToChoose)
         {
-            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBank])
-                MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 29);
+            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBattler])
+                MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 29);
             else
                 MoveSelectionDestroyCursorAt(gMultiUsePlayerCursor);
 
             gMultiUsePlayerCursor ^= 2;
             PlaySE(SE_SELECT);
 
-            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBank])
+            if (gMultiUsePlayerCursor == gMoveSelectionCursor[gActiveBattler])
                 MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 0);
             else
                 MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27);
@@ -938,7 +938,7 @@ void sub_80587B0(void)
                 else
                     sub_800ADF8();
 
-                gBattleBankFunc[gActiveBank] = sub_80586F8;
+                gBattlerFuncs[gActiveBattler] = sub_80586F8;
             }
         }
         else
@@ -953,32 +953,32 @@ void sub_80587B0(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         PlayerBufferExecCompleted();
 }
 
 static void CompleteOnBankSpriteCallbackDummy2(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         PlayerBufferExecCompleted();
 }
 
 static void sub_80588B4(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         nullsub_25(gSaveBlock2Ptr->playerGender);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         PlayerBufferExecCompleted();
     }
 }
 
 static void sub_8058924(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 == 0xFF)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         PlayerBufferExecCompleted();
     }
 }
@@ -989,33 +989,33 @@ static void sub_805896C(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
             var = TRUE;
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy
-         && gSprites[gHealthBoxesIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+         && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
             var = TRUE;
     }
 
-    if (var && gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1
-        && gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
+    if (var && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
+        && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 
         if (IsDoubleBattle())
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], gActiveBank ^ BIT_MON);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], gActiveBattler ^ BIT_FLANK);
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 3;
-        gBattleBankFunc[gActiveBank] = sub_8058924;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
+        gBattlerFuncs[gActiveBattler] = sub_8058924;
     }
 }
 
@@ -1024,58 +1024,58 @@ static void sub_8058B40(void)
     bool32 r9 = FALSE;
     bool32 r8 = FALSE;
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
-        sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
-        sub_8172EF0(gActiveBank ^ BIT_MON, &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
+        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank ^ BIT_MON], &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], HEALTHBOX_ALL);
-                sub_8076918(gActiveBank ^ BIT_MON);
-                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank ^ BIT_MON]);
+                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+                sub_8076918(gActiveBattler ^ BIT_FLANK);
+                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
             }
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-            sub_8076918(gActiveBank);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+            sub_8076918(gActiveBattler);
+            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 1;
     }
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x40
-        && gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x40
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x40
+        && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x40
         && !IsCryPlayingOrClearCrySongs())
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
                 m4aMPlayContinue(&gMPlayInfo_BGM);
             else
                 m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 1;
         r9 = TRUE;
     }
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
     }
     else
     {
-        if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy)
+        if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
@@ -1084,63 +1084,63 @@ static void sub_8058B40(void)
     if (r9 && r8)
     {
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
-            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]]);
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
+            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
 
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 0;
 
-        gBattleBankFunc[gActiveBank] = sub_805896C;
+        gBattlerFuncs[gActiveBattler] = sub_805896C;
     }
 }
 
 static void sub_8058EDC(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy
-     && gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1
-     && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+     && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
+     && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        CopyBattleSpriteInvisibility(gActiveBank);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+        CopyBattleSpriteInvisibility(gActiveBattler);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattleBankFunc[gActiveBank] = sub_8058FC0;
+        gBattlerFuncs[gActiveBattler] = sub_8058FC0;
     }
 }
 
 static void sub_8058FC0(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive
         && !IsCryPlayingOrClearCrySongs())
     {
         m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         PlayerBufferExecCompleted();
     }
 }
 
 static void sub_805902C(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
     }
 
-    if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-        sub_8076918(gActiveBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
-        gBattleBankFunc[gActiveBank] = sub_8058EDC;
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        sub_8076918(gActiveBattler);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        gBattlerFuncs[gActiveBattler] = sub_8058EDC;
     }
 }
 
@@ -1155,17 +1155,17 @@ void c3_0802FDF4(u8 taskId)
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBank, gHealthBoxesIds[gActiveBank], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         PlayerBufferExecCompleted();
     }
 }
@@ -1202,13 +1202,13 @@ static void Task_GiveExpToMon(u8 taskId)
             SetMonData(mon, MON_DATA_EXP, &nextLvlExp);
             CalculateMonStats(mon);
             gainedExp -= nextLvlExp - currExp;
-            savedActiveBank = gActiveBank;
-            gActiveBank = bank;
+            savedActiveBank = gActiveBattler;
+            gActiveBattler = bank;
             EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
-            gActiveBank = savedActiveBank;
+            gActiveBattler = savedActiveBank;
 
             if (IsDoubleBattle() == TRUE
-             && ((u16)(monId) == gBattlePartyID[bank] || (u16)(monId) == gBattlePartyID[bank ^ BIT_MON]))
+             && ((u16)(monId) == gBattlePartyID[bank] || (u16)(monId) == gBattlePartyID[bank ^ BIT_FLANK]))
                 gTasks[taskId].func = sub_8059544;
             else
                 gTasks[taskId].func = DestroyExpTaskAndCompleteOnInactiveTextPrinter;
@@ -1217,7 +1217,7 @@ static void Task_GiveExpToMon(u8 taskId)
         {
             currExp += gainedExp;
             SetMonData(mon, MON_DATA_EXP, &currExp);
-            gBattleBankFunc[bank] = CompleteOnInactiveTextPrinter;
+            gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
             DestroyTask(taskId);
         }
     }
@@ -1281,17 +1281,17 @@ static void sub_8059400(u8 taskId)
                 SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &expOnNextLvl);
                 CalculateMonStats(&gPlayerParty[monId]);
                 gainedExp -= expOnNextLvl - currExp;
-                savedActiveBank = gActiveBank;
-                gActiveBank = bank;
+                savedActiveBank = gActiveBattler;
+                gActiveBattler = bank;
                 EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
-                gActiveBank = savedActiveBank;
+                gActiveBattler = savedActiveBank;
                 gTasks[taskId].func = sub_8059544;
             }
             else
             {
                 currExp += gainedExp;
                 SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &currExp);
-                gBattleBankFunc[bank] = CompleteOnInactiveTextPrinter;
+                gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
                 DestroyTask(taskId);
             }
         }
@@ -1303,8 +1303,8 @@ static void sub_8059544(u8 taskId)
     u8 bank = gTasks[taskId].tExpTask_bank;
     u8 monIndex = gTasks[taskId].tExpTask_monId;
 
-    if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_MON])
-        bank ^= BIT_MON;
+    if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_FLANK])
+        bank ^= BIT_FLANK;
 
     InitAndLaunchSpecialAnimation(bank, bank, bank, B_ANIM_LVL_UP);
     gTasks[taskId].func = sub_80595A4;
@@ -1320,8 +1320,8 @@ static void sub_80595A4(u8 taskId)
 
         GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL);  // Unused return value
 
-        if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_MON])
-            UpdateHealthboxAttribute(gHealthBoxesIds[bank ^ BIT_MON], &gPlayerParty[monIndex], HEALTHBOX_ALL);
+        if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_FLANK])
+            UpdateHealthboxAttribute(gHealthBoxesIds[bank ^ BIT_FLANK], &gPlayerParty[monIndex], HEALTHBOX_ALL);
         else
             UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gPlayerParty[monIndex], HEALTHBOX_ALL);
 
@@ -1337,31 +1337,31 @@ static void DestroyExpTaskAndCompleteOnInactiveTextPrinter(u8 taskId)
     monIndex = gTasks[taskId].tExpTask_monId;
     GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL);  // Unused return value
     bank = gTasks[taskId].tExpTask_bank;
-    gBattleBankFunc[bank] = CompleteOnInactiveTextPrinter;
+    gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
     DestroyTask(taskId);
 }
 
 static void sub_80596A8(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].pos1.y + gSprites[gBankSpriteIds[gActiveBank]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].pos1.y + gSprites[gBankSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
     {
-        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
         nullsub_24(species);
-        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBank]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBattler]].oam.matrixNum);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         PlayerBufferExecCompleted();
     }
 }
 
 static void sub_8059744(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         PlayerBufferExecCompleted();
     }
 }
@@ -1378,9 +1378,9 @@ static void sub_80597CC(void)
     {
         u8 r4;
 
-        gBattleBankFunc[gActiveBank] = sub_8059828;
-        r4 = gTasks[gUnknown_03005D7C[gActiveBank]].data[0];
-        DestroyTask(gUnknown_03005D7C[gActiveBank]);
+        gBattlerFuncs[gActiveBattler] = sub_8059828;
+        r4 = gTasks[gUnknown_03005D7C[gActiveBattler]].data[0];
+        DestroyTask(gUnknown_03005D7C[gActiveBattler]);
         FreeAllWindowBuffers();
         sub_81B89AC(r4);
     }
@@ -1395,7 +1395,7 @@ static void sub_8059828(void)
         else
             EmitChosenMonReturnValue(1, 6, NULL);
 
-        if ((gBattleBufferA[gActiveBank][1] & 0xF) == 1)
+        if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1)
             PrintLinkStandbyMsg();
 
         PlayerBufferExecCompleted();
@@ -1406,7 +1406,7 @@ static void OpenBagAndChooseItem(void)
 {
     if (!gPaletteFade.active)
     {
-        gBattleBankFunc[gActiveBank] = CompleteWhenChoseItem;
+        gBattlerFuncs[gActiveBattler] = CompleteWhenChoseItem;
         nullsub_35();
         FreeAllWindowBuffers();
         sub_81AABB0();
@@ -1424,13 +1424,13 @@ static void CompleteWhenChoseItem(void)
 
 static void CompleteOnSpecialAnimDone(void)
 {
-    if (!gDoingBattleAnim || !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+    if (!gDoingBattleAnim || !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         PlayerBufferExecCompleted();
 }
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -1486,7 +1486,7 @@ static void PlayerHandleUnknownYesNoInput(void)
 static void MoveSelectionDisplayMoveNames(void)
 {
     s32 i;
-    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
+    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
     gNumberOfMovesToChoose = 0;
 
     for (i = 0; i < 4; i++)
@@ -1510,15 +1510,15 @@ static void MoveSelectionDisplayPpNumber(void)
     u8 *txtPtr;
     struct ChooseMoveStruct *moveInfo;
 
-    if (gBattleBufferA[gActiveBank][2] == TRUE) // check if we didn't want to display pp number
+    if (gBattleBufferA[gActiveBattler][2] == TRUE) // check if we didn't want to display pp number
         return;
 
     SetPpNumbersPaletteInMoveSelection();
-    moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
-    txtPtr = ConvertIntToDecimalStringN(gDisplayedStringBattle, moveInfo->currentPp[gMoveSelectionCursor[gActiveBank]], STR_CONV_MODE_RIGHT_ALIGN, 2);
+    moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
+    txtPtr = ConvertIntToDecimalStringN(gDisplayedStringBattle, moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2);
     txtPtr[0] = CHAR_SLASH;
     txtPtr++;
-    ConvertIntToDecimalStringN(txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBank]], STR_CONV_MODE_RIGHT_ALIGN, 2);
+    ConvertIntToDecimalStringN(txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2);
 
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 9);
 }
@@ -1526,7 +1526,7 @@ static void MoveSelectionDisplayPpNumber(void)
 static void MoveSelectionDisplayMoveType(void)
 {
     u8 *txtPtr;
-    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
+    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
 
     txtPtr = StringCopy(gDisplayedStringBattle, gText_MoveInterfaceType);
     txtPtr[0] = EXT_CTRL_CODE_BEGIN;
@@ -1536,7 +1536,7 @@ static void MoveSelectionDisplayMoveType(void)
     txtPtr[0] = 1;
     txtPtr++;
 
-    StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBank]]].type]);
+    StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 10);
 }
 
@@ -1592,13 +1592,13 @@ void SetCB2ToReshowScreenAfterMenu2(void)
 
 static void CompleteOnFinishedStatusAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
         PlayerBufferExecCompleted();
 }
 
 static void CompleteOnFinishedBattleAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animFromTableActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
         PlayerBufferExecCompleted();
 }
 
@@ -1619,13 +1619,13 @@ static void PlayerHandleGetMonData(void)
     u8 monToCheck;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyPlayerMonData(gBattlePartyID[gActiveBank], monData);
+        size += CopyPlayerMonData(gBattlePartyID[gActiveBattler], monData);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -1647,7 +1647,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         battleMon.species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
@@ -1713,7 +1713,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        data16 = GetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE);
+        data16 = GetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE);
         dst[0] = data16;
         dst[1] = data16 >> 8;
         size = 2;
@@ -1728,7 +1728,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE);
+        dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE);
         size = 1;
         break;
     case REQUEST_OTID_BATTLE:
@@ -1946,14 +1946,14 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
 void PlayerHandleGetRawMonData(void)
 {
     struct BattlePokemon battleMon;
-    u8 *src = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
-    u8 *dst = (u8 *)&battleMon + gBattleBufferA[gActiveBank][1];
+    u8 *src = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *dst = (u8 *)&battleMon + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
-    for (i = 0; i < gBattleBufferA[gActiveBank][2]; i++)
+    for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
         dst[i] = src[i];
 
-    EmitDataTransfer(1, gBattleBufferA[gActiveBank][2], dst);
+    EmitDataTransfer(1, gBattleBufferA[gActiveBattler][2], dst);
     PlayerBufferExecCompleted();
 }
 
@@ -1962,13 +1962,13 @@ static void PlayerHandleSetMonData(void)
     u8 monToCheck;
     u8 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetPlayerMonData(gBattlePartyID[gActiveBank]);
+        SetPlayerMonData(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -1981,11 +1981,11 @@ static void PlayerHandleSetMonData(void)
 
 static void SetPlayerMonData(u8 monId)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         {
@@ -2026,10 +2026,10 @@ static void SetPlayerMonData(u8 monId)
         }
         break;
     case REQUEST_SPECIES_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HELDITEM_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MOVES_PP_BATTLE:
         for (i = 0; i < 4; i++)
@@ -2043,187 +2043,187 @@ static void SetPlayerMonData(u8 monId)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PP_DATA_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case REQUEST_PPMOVE1_BATTLE:
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_OTID_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_EXP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_FRIENDSHIP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKERUS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LOCATION_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LEVEL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_GAME_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKEBALL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ALL_IVS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case REQUEST_HP_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PERSONALITY_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CHECKSUM_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_STATUS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_LEVEL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MAX_HP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SHEEN_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
 
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 }
 
 static void PlayerHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
+    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
-    for (i = 0; i < gBattleBufferA[gActiveBank][2]; i++)
-        dst[i] = gBattleBufferA[gActiveBank][3 + i];
+    for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
+        dst[i] = gBattleBufferA[gActiveBattler][3 + i];
 
     PlayerBufferExecCompleted();
 }
 
 static void PlayerHandleLoadMonSprite(void)
 {
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpritePosX_0;
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpritePosX_0;
 }
 
 static void PlayerHandleSwitchInAnim(void)
 {
-    ClearTemporarySpeciesSpriteData(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    gActionSelectionCursor[gActiveBank] = 0;
-    gMoveSelectionCursor[gActiveBank] = 0;
-    sub_805B258(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_805902C;
+    ClearTemporarySpeciesSpriteData(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    gActionSelectionCursor[gActiveBattler] = 0;
+    gMoveSelectionCursor[gActiveBattler] = 0;
+    sub_805B258(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlerFuncs[gActiveBattler] = sub_805902C;
 }
 
 static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
@@ -2234,7 +2234,7 @@ static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    sub_806A068(species, GetBankPosition(bank));
+    sub_806A068(species, GetBattlerPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
@@ -2259,36 +2259,36 @@ static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
 
 static void PlayerHandleReturnMonToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-        gBattleBankFunc[gActiveBank] = DoSwitchOutAnimation;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         PlayerBufferExecCompleted();
     }
 }
 
 static void DoSwitchOutAnimation(void)
 {
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
-            gBattleBankFunc[gActiveBank] = sub_8059744;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_PLAYER_MON);
+            gBattlerFuncs[gActiveBattler] = sub_8059744;
         }
         break;
     }
@@ -2326,7 +2326,7 @@ static void PlayerHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBattlerPosition(gActiveBattler) & BIT_FLANK) != 0) // second mon
             xPos = 90;
         else // first mon
             xPos = 32;
@@ -2352,32 +2352,32 @@ static void PlayerHandleDrawTrainerPic(void)
     if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId != STEVEN_PARTNER_ID)
     {
         trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender);
-        DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-        sub_806A1C0(trainerPicId, GetBankPosition(gActiveBank));
-        gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
-
-        gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-        gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBank]].pos2.y = 48;
-        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
-        gSprites[gBankSpriteIds[gActiveBank]].oam.affineMode = 0;
-        gSprites[gBankSpriteIds[gActiveBank]].hFlip = 1;
+        DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
+        sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler));
+        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBankSpriteIds[gActiveBattler]].pos2.y = 48;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.affineMode = 0;
+        gSprites[gBankSpriteIds[gActiveBattler]].hFlip = 1;
     }
     // use the back pic in any other scenario
     else
     {
-        DecompressTrainerBackPic(trainerPicId, gActiveBank);
-        sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
-        gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
+        DecompressTrainerBackPic(trainerPicId, gActiveBattler);
+        sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
+        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
 
-        gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-        gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void PlayerHandleTrainerSlide(void)
@@ -2406,49 +2406,49 @@ static void PlayerHandleTrainerSlide(void)
         trainerPicId = gSaveBlock2Ptr->playerGender;
     }
 
-    DecompressTrainerBackPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, 80, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, 30);
+    DecompressTrainerBackPic(trainerPicId, gActiveBattler);
+    sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 80, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, 30);
 
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -96;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -96;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy2;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
 }
 
 static void PlayerHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
-    gBattleBankFunc[gActiveBank] = sub_80588B4;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
+    gBattlerFuncs[gActiveBattler] = sub_80588B4;
 }
 
 static void PlayerHandleFaintAnimation(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
     else
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
-            gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-            gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
-            gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039C00;
-            gBattleBankFunc[gActiveBank] = sub_80596A8;
+            gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+            gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 5;
+            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039C00;
+            gBattlerFuncs[gActiveBattler] = sub_80596A8;
         }
     }
 }
@@ -2463,23 +2463,23 @@ static void PlayerHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
-    gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
+    InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
+    gBattlerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
 }
 
 static void PlayerHandleBallThrowAnim(void)
 {
-    u8 ballThrowCaseId = gBattleBufferA[gActiveBank][1];
+    u8 ballThrowCaseId = gBattleBufferA[gActiveBattler][1];
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
-    gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
+    InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
+    gBattlerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
 }
 
 static void PlayerHandlePause(void)
 {
-    u8 var = gBattleBufferA[gActiveBank][1];
+    u8 var = gBattleBufferA[gActiveBattler][1];
 
     // WTF is this??
     while (var != 0)
@@ -2490,25 +2490,25 @@ static void PlayerHandlePause(void)
 
 static void PlayerHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
+        u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
 
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4] | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6] | (gBattleBufferA[gActiveBattler][7] << 8) | (gBattleBufferA[gActiveBattler][8] << 16) | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
         if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE
         {
             PlayerBufferExecCompleted();
         }
         else
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            gBattleBankFunc[gActiveBank] = PlayerDoMoveAnimation;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            gBattlerFuncs[gActiveBattler] = PlayerDoMoveAnimation;
             sub_817E0FC(move, gWeatherMoveAnim, gAnimDisableStructPtr);
         }
     }
@@ -2516,26 +2516,26 @@ static void PlayerHandleMoveAnimation(void)
 
 static void PlayerDoMoveAnimation(void)
 {
-    u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 multihit = gBattleBufferA[gActiveBank][11];
+    u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 multihit = gBattleBufferA[gActiveBattler][11];
 
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             sub_805EB9C(0);
             DoMoveAnim(move);
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 2;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
         }
         break;
     case 2:
@@ -2543,20 +2543,20 @@ static void PlayerDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
             {
-                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
+                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
+                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
             }
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
         break;
     case 3:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             CopyAllBattleSpritesInvisibilities();
-            TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            TrySetBehindSubstituteSpriteBit(gActiveBattler, gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             PlayerBufferExecCompleted();
         }
         break;
@@ -2569,17 +2569,17 @@ static void PlayerHandlePrintString(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    stringId = (u16*)(&gBattleBufferA[gActiveBank][2]);
+    stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter2;
+    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2;
     sub_817C95C(*stringId);
-    sub_81A57E4(gActiveBank, *stringId);
+    sub_81A57E4(gActiveBattler, *stringId);
 }
 
 static void PlayerHandlePrintSelectionString(void)
 {
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         PlayerHandlePrintString();
     else
         PlayerBufferExecCompleted();
@@ -2591,7 +2591,7 @@ static void HandleChooseActionAfterDma3(void)
     {
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 160;
-        gBattleBankFunc[gActiveBank] = HandleInputChooseAction;
+        gBattlerFuncs[gActiveBattler] = HandleInputChooseAction;
     }
 }
 
@@ -2599,27 +2599,27 @@ static void PlayerHandleChooseAction(void)
 {
     s32 i;
 
-    gBattleBankFunc[gActiveBank] = HandleChooseActionAfterDma3;
+    gBattlerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
     sub_817F2A8();
     BattleHandleAddTextPrinter(gText_BattleMenu, 2);
 
     for (i = 0; i < 4; i++)
         ActionSelectionDestroyCursorAt(i);
 
-    ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+    ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
     BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 1);
 }
 
 static void PlayerHandleUnknownYesNoBox(void)
 {
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
     {
         HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
         BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 12);
         gMultiUsePlayerCursor = 1;
         BattleCreateYesNoCursorAt(1);
-        gBattleBankFunc[gActiveBank] = PlayerHandleUnknownYesNoInput;
+        gBattlerFuncs[gActiveBattler] = PlayerHandleUnknownYesNoInput;
     }
     else
     {
@@ -2633,13 +2633,13 @@ static void HandleChooseMoveAfterDma3(void)
     {
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 320;
-        gBattleBankFunc[gActiveBank] = HandleInputChooseMove;
+        gBattlerFuncs[gActiveBattler] = HandleInputChooseMove;
     }
 }
 
 static void PlayerChooseMoveInBattlePalace(void)
 {
-    if (--*(gBattleStruct->field_298 + gActiveBank) == 0)
+    if (--*(gBattleStruct->field_298 + gActiveBattler) == 0)
     {
         gBattlePalaceMoveSelectionRngValue = gRngValue;
         EmitTwoReturnValues(1, 10, ChooseMoveAndTargetInBattlePalace());
@@ -2651,13 +2651,13 @@ static void PlayerHandleChooseMove(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
     {
-        *(gBattleStruct->field_298 + gActiveBank) = 8;
-        gBattleBankFunc[gActiveBank] = PlayerChooseMoveInBattlePalace;
+        *(gBattleStruct->field_298 + gActiveBattler) = 8;
+        gBattlerFuncs[gActiveBattler] = PlayerChooseMoveInBattlePalace;
     }
     else
     {
         InitMoveSelectionsVarsAndStrings();
-        gBattleBankFunc[gActiveBank] = HandleChooseMoveAfterDma3;
+        gBattlerFuncs[gActiveBattler] = HandleChooseMoveAfterDma3;
     }
 }
 
@@ -2665,7 +2665,7 @@ void InitMoveSelectionsVarsAndStrings(void)
 {
     MoveSelectionDisplayMoveNames();
     gMultiUsePlayerCursor = 0xFF;
-    MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBank], 0);
+    MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
     MoveSelectionDisplayPpString();
     MoveSelectionDisplayPpNumber();
     MoveSelectionDisplayMoveType();
@@ -2676,11 +2676,11 @@ static void PlayerHandleChooseItem(void)
     s32 i;
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-    gBattleBankFunc[gActiveBank] = OpenBagAndChooseItem;
-    gBankInMenu = gActiveBank;
+    gBattlerFuncs[gActiveBattler] = OpenBagAndChooseItem;
+    gBankInMenu = gActiveBattler;
 
     for (i = 0; i < 3; i++)
-        gUnknown_0203CF00[i] = gBattleBufferA[gActiveBank][1 + i];
+        gUnknown_0203CF00[i] = gBattleBufferA[gActiveBattler][1 + i];
 }
 
 static void PlayerHandleChoosePokemon(void)
@@ -2688,23 +2688,23 @@ static void PlayerHandleChoosePokemon(void)
     s32 i;
 
     for (i = 0; i < 3; i++)
-        gUnknown_0203CF00[i] = gBattleBufferA[gActiveBank][4 + i];
+        gUnknown_0203CF00[i] = gBattleBufferA[gActiveBattler][4 + i];
 
-    if (gBattleTypeFlags & BATTLE_TYPE_ARENA && (gBattleBufferA[gActiveBank][1] & 0xF) != 2)
+    if (gBattleTypeFlags & BATTLE_TYPE_ARENA && (gBattleBufferA[gActiveBattler][1] & 0xF) != 2)
     {
-        EmitChosenMonReturnValue(1, gBattlePartyID[gActiveBank] + 1, gUnknown_0203CF00);
+        EmitChosenMonReturnValue(1, gBattlePartyID[gActiveBattler] + 1, gUnknown_0203CF00);
         PlayerBufferExecCompleted();
     }
     else
     {
-        gUnknown_03005D7C[gActiveBank] = CreateTask(TaskDummy, 0xFF);
-        gTasks[gUnknown_03005D7C[gActiveBank]].data[0] = gBattleBufferA[gActiveBank][1] & 0xF;
-        *(&gBattleStruct->field_49) = gBattleBufferA[gActiveBank][1] >> 4;
-        *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBank][2];
-        *(&gBattleStruct->field_B0) = gBattleBufferA[gActiveBank][3];
+        gUnknown_03005D7C[gActiveBattler] = CreateTask(TaskDummy, 0xFF);
+        gTasks[gUnknown_03005D7C[gActiveBattler]].data[0] = gBattleBufferA[gActiveBattler][1] & 0xF;
+        *(&gBattleStruct->field_49) = gBattleBufferA[gActiveBattler][1] >> 4;
+        *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
+        *(&gBattleStruct->field_B0) = gBattleBufferA[gActiveBattler][3];
         BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-        gBattleBankFunc[gActiveBank] = sub_80597CC;
-        gBankInMenu = gActiveBank;
+        gBattlerFuncs[gActiveBattler] = sub_80597CC;
+        gBankInMenu = gActiveBattler;
     }
 }
 
@@ -2720,32 +2720,32 @@ static void PlayerHandleHealthBarUpdate(void)
     s16 hpVal;
 
     LoadBattleBarGfx(0);
-    hpVal = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    hpVal = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
     if (hpVal > 0)
         gUnknown_0203CD70 += hpVal;
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, 0, hpVal);
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], 0, HP_CURRENT);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], 0, HP_CURRENT);
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnHealthbarDone;
+    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void PlayerHandleExpUpdate(void)
 {
-    u8 monId = gBattleBufferA[gActiveBank][1];
+    u8 monId = gBattleBufferA[gActiveBattler][1];
 
     if (GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL) >= MAX_MON_LEVEL)
     {
@@ -2758,12 +2758,12 @@ static void PlayerHandleExpUpdate(void)
 
         LoadBattleBarGfx(1);
         GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);  // unused return value
-        expPointsToGive = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        expPointsToGive = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
         taskId = CreateTask(Task_GiveExpToMon, 10);
         gTasks[taskId].tExpTask_monId = monId;
         gTasks[taskId].tExpTask_gainedExp = expPointsToGive;
-        gTasks[taskId].tExpTask_bank = gActiveBank;
-        gBattleBankFunc[gActiveBank] = nullsub_21;
+        gTasks[taskId].tExpTask_bank = gActiveBattler;
+        gBattlerFuncs[gActiveBattler] = nullsub_21;
     }
 }
 
@@ -2774,32 +2774,32 @@ static void PlayerHandleExpUpdate(void)
 
 static void PlayerHandleStatusIconUpdate(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_STATUS_ICON);
-        bank = gActiveBank;
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
 static void PlayerHandleStatusAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
-                        gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
+                        gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
 static void PlayerHandleStatusXor(void)
 {
-    u8 val = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_STATUS) ^ gBattleBufferA[gActiveBank][1];
+    u8 val = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_STATUS) ^ gBattleBufferA[gActiveBattler][1];
 
-    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_STATUS, &val);
+    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_STATUS, &val);
     PlayerBufferExecCompleted();
 }
 
@@ -2810,13 +2810,13 @@ static void PlayerHandleDataTransfer(void)
 
 static void PlayerHandleDMA3Transfer(void)
 {
-    u32 dstArg = gBattleBufferA[gActiveBank][1]
-            | (gBattleBufferA[gActiveBank][2] << 8)
-            | (gBattleBufferA[gActiveBank][3] << 16)
-            | (gBattleBufferA[gActiveBank][4] << 24);
-    u16 sizeArg = gBattleBufferA[gActiveBank][5] | (gBattleBufferA[gActiveBank][6] << 8);
+    u32 dstArg = gBattleBufferA[gActiveBattler][1]
+            | (gBattleBufferA[gActiveBattler][2] << 8)
+            | (gBattleBufferA[gActiveBattler][3] << 16)
+            | (gBattleBufferA[gActiveBattler][4] << 24);
+    u16 sizeArg = gBattleBufferA[gActiveBattler][5] | (gBattleBufferA[gActiveBattler][6] << 8);
 
-    const u8 *src = &gBattleBufferA[gActiveBank][7];
+    const u8 *src = &gBattleBufferA[gActiveBattler][7];
     u8 *dst = (u8*)(dstArg);
     u32 size = sizeArg;
 
@@ -2837,7 +2837,7 @@ static void PlayerHandleDMA3Transfer(void)
 
 static void PlayerHandlePlayBGM(void)
 {
-    PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     PlayerBufferExecCompleted();
 }
 
@@ -2878,7 +2878,7 @@ static void PlayerHandleCmd37(void)
 
 static void PlayerHandleCmd38(void)
 {
-    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1];
     PlayerBufferExecCompleted();
 }
 
@@ -2896,16 +2896,16 @@ static void PlayerHandleCmd40(void)
 
 static void PlayerHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         PlayerBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        DoHitAnimHealthboxEffect(gActiveBank);
-        gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        DoHitAnimHealthboxEffect(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -2918,25 +2918,25 @@ static void PlayerHandlePlaySE(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         pan = PAN_SIDE_PLAYER;
     else
         pan = PAN_SIDE_OPPONENT;
 
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     PlayerBufferExecCompleted();
 }
 
 static void PlayerHandlePlayFanfareOrBGM(void)
 {
-    if (gBattleBufferA[gActiveBank][3])
+    if (gBattleBufferA[gActiveBattler][3])
     {
         BattleStopLowHpSound();
-        PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
     else
     {
-        PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
 
     PlayerBufferExecCompleted();
@@ -2944,7 +2944,7 @@ static void PlayerHandlePlayFanfareOrBGM(void)
 
 static void PlayerHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, -25, 5);
     PlayerBufferExecCompleted();
@@ -2952,7 +2952,7 @@ static void PlayerHandleFaintingCry(void)
 
 static void PlayerHandleIntroSlide(void)
 {
-    HandleIntroSlide(gBattleBufferA[gActiveBank][1]);
+    HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
     gUnknown_020243FC |= 1;
     PlayerBufferExecCompleted();
 }
@@ -2962,29 +2962,29 @@ static void PlayerHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_805CC00);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_805CC00);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F8);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[gSaveBlock2Ptr->playerGender].data, 0x100 + paletteNum * 16, 32);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = paletteNum;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(task05_08033660, 5);
-    gTasks[taskId].data[0] = gActiveBank;
+    gTasks[taskId].data[0] = gActiveBattler;
 
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_21;
+    gBattlerFuncs[gActiveBattler] = nullsub_21;
 }
 
 void sub_805CC00(struct Sprite *sprite)
@@ -3006,93 +3006,93 @@ static void task05_08033660(u8 taskId)
     }
     else
     {
-        u8 savedActiveBank = gActiveBank;
+        u8 savedActiveBank = gActiveBattler;
 
-        gActiveBank = gTasks[taskId].data[0];
+        gActiveBattler = gTasks[taskId].data[0];
         if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_805B258(gActiveBank, FALSE);
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            sub_805B258(gActiveBattler, FALSE);
         }
         else
         {
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_805B258(gActiveBank, FALSE);
-            gActiveBank ^= BIT_MON;
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-            sub_805B258(gActiveBank, FALSE);
-            gActiveBank ^= BIT_MON;
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            sub_805B258(gActiveBattler, FALSE);
+            gActiveBattler ^= BIT_FLANK;
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            sub_805B258(gActiveBattler, FALSE);
+            gActiveBattler ^= BIT_FLANK;
         }
-        gBattleBankFunc[gActiveBank] = sub_8058B40;
-        gActiveBank = savedActiveBank;
+        gBattlerFuncs[gActiveBattler] = sub_8058B40;
+        gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
 }
 
 static void PlayerHandleDrawPartyStatusSummary(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
     {
         PlayerBufferExecCompleted();
     }
     else
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1 = 1;
-        gUnknown_020244B4[gActiveBank] = CreatePartyStatusSummarySprites(gActiveBank, (struct HpAndStatus *)&gBattleBufferA[gActiveBank][4], gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][2]);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
+        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
-        if (gBattleBufferA[gActiveBank][2] != 0)
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0x5D;
+        if (gBattleBufferA[gActiveBattler][2] != 0)
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattleBankFunc[gActiveBank] = sub_805CE38;
+        gBattlerFuncs[gActiveBattler] = sub_805CE38;
     }
 }
 
 static void sub_805CE38(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5++ > 0x5C)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5++ > 0x5C)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
         PlayerBufferExecCompleted();
     }
 }
 
 static void PlayerHandleCmd49(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
     PlayerBufferExecCompleted();
 }
 
 static void PlayerHandleCmd50(void)
 {
-    dp11b_obj_free(gActiveBank, 1);
-    dp11b_obj_free(gActiveBank, 0);
+    dp11b_obj_free(gActiveBattler, 1);
+    dp11b_obj_free(gActiveBattler, 0);
     PlayerBufferExecCompleted();
 }
 
 static void PlayerHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank))
+    if (IsBankSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        CopyBattleSpriteInvisibility(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        CopyBattleSpriteInvisibility(gActiveBattler);
     }
     PlayerBufferExecCompleted();
 }
 
 static void PlayerHandleBattleAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u8 animationId = gBattleBufferA[gActiveBank][1];
-        u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 animationId = gBattleBufferA[gActiveBattler][1];
+        u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             PlayerBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
+            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
 
         sub_817E32C(animationId);
     }
@@ -3100,15 +3100,15 @@ static void PlayerHandleBattleAnimation(void)
 
 static void PlayerHandleLinkStandbyMsg(void)
 {
-    sub_81851A8(&gBattleBufferA[gActiveBank][2]);
-    switch (gBattleBufferA[gActiveBank][1])
+    sub_81851A8(&gBattleBufferA[gActiveBattler][2]);
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case 0:
         PrintLinkStandbyMsg();
         // fall through
     case 1:
-        dp11b_obj_free(gActiveBank, 1);
-        dp11b_obj_free(gActiveBank, 0);
+        dp11b_obj_free(gActiveBattler, 1);
+        dp11b_obj_free(gActiveBattler, 0);
         break;
     case 2:
         PrintLinkStandbyMsg();
@@ -3119,17 +3119,17 @@ static void PlayerHandleLinkStandbyMsg(void)
 
 static void PlayerHandleResetActionMoveSelection(void)
 {
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case RESET_ACTION_MOVE_SELECTION:
-        gActionSelectionCursor[gActiveBank] = 0;
-        gMoveSelectionCursor[gActiveBank] = 0;
+        gActionSelectionCursor[gActiveBattler] = 0;
+        gMoveSelectionCursor[gActiveBattler] = 0;
         break;
     case RESET_ACTION_SELECTION:
-        gActionSelectionCursor[gActiveBank] = 0;
+        gActionSelectionCursor[gActiveBattler] = 0;
         break;
     case RESET_MOVE_SELECTION:
-        gMoveSelectionCursor[gActiveBank] = 0;
+        gMoveSelectionCursor[gActiveBattler] = 0;
         break;
     }
     PlayerBufferExecCompleted();
@@ -3137,13 +3137,13 @@ static void PlayerHandleResetActionMoveSelection(void)
 
 static void PlayerHandleCmd55(void)
 {
-    sub_81851A8(&gBattleBufferA[gActiveBank][4]);
-    gBattleOutcome = gBattleBufferA[gActiveBank][1];
-    gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBank][2];
+    sub_81851A8(&gBattleBufferA[gActiveBattler][4]);
+    gBattleOutcome = gBattleBufferA[gActiveBattler][1];
+    gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBattler][2];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     PlayerBufferExecCompleted();
-    gBattleBankFunc[gActiveBank] = sub_80587B0;
+    gBattlerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_22(void)
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 1da8ee04c..2b21dab94 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -24,33 +24,33 @@
 #include "data2.h"
 
 extern u32 gBattleExecBuffer;
-extern u8 gActiveBank;
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gBattleBanksCount;
+extern u8 gActiveBattler;
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern u8 gBankInMenu;
 extern u16 gUnknown_020243FC;
-extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBankDefender;
-extern u8 gAbsentBankFlags;
+extern u8 gBattleDefender;
+extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
-extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
+extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
@@ -213,15 +213,15 @@ static void nullsub_77(void)
 
 void SetControllerToPlayerPartner(void)
 {
-    gBattleBankFunc[gActiveBank] = PlayerPartnerBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = PlayerPartnerBufferRunCommand;
 }
 
 static void PlayerPartnerBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sPlayerPartnerBufferCommands))
-            sPlayerPartnerBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sPlayerPartnerBufferCommands))
+            sPlayerPartnerBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             PlayerPartnerBufferExecCompleted();
     }
@@ -229,26 +229,26 @@ static void PlayerPartnerBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         PlayerPartnerBufferExecCompleted();
 }
 
 static void sub_81BAE98(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         nullsub_25(0);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         PlayerPartnerBufferExecCompleted();
     }
 }
 
 static void sub_81BAF00(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 == 0xFF)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         PlayerPartnerBufferExecCompleted();
     }
 }
@@ -259,13 +259,13 @@ static void sub_81BAF48(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gHealthBoxesIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r6 = TRUE;
         }
@@ -276,59 +276,59 @@ static void sub_81BAF48(void)
 
     if (r6)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 3;
-        gBattleBankFunc[gActiveBank] = sub_81BAF00;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
+        gBattlerFuncs[gActiveBattler] = sub_81BAF00;
     }
 }
 
 static void sub_81BB02C(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive
-        && gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-        && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
-        && ++gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 != 1)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive
+        && gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+        && ++gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 != 1)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
 
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]]);
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank ^ BIT_MON], &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], HEALTHBOX_ALL);
-            sub_8076918(gActiveBank ^ BIT_MON);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank ^ BIT_MON]);
+            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
+            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+            sub_8076918(gActiveBattler ^ BIT_FLANK);
+            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
         }
 
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-        sub_8076918(gActiveBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        sub_8076918(gActiveBattler);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
 
-        gBattleBankFunc[gActiveBank] = sub_81BAF48;
+        gBattlerFuncs[gActiveBattler] = sub_81BAF48;
     }
 }
 
 static void sub_81BB1D4(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].animEnded && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].animEnded && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
         PlayerPartnerBufferExecCompleted();
 }
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBank, gHealthBoxesIds[gActiveBank], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         PlayerPartnerBufferExecCompleted();
     }
 }
@@ -366,13 +366,13 @@ static void Task_GiveExpToMon(u8 taskId)
             SetMonData(mon, MON_DATA_EXP, &nextLvlExp);
             CalculateMonStats(mon);
             gainedExp -= nextLvlExp - currExp;
-            savedActiveBank = gActiveBank;
-            gActiveBank = bank;
+            savedActiveBank = gActiveBattler;
+            gActiveBattler = bank;
             EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
-            gActiveBank = savedActiveBank;
+            gActiveBattler = savedActiveBank;
 
             if (IsDoubleBattle() == TRUE
-             && ((u16)(monId) == gBattlePartyID[bank] || (u16)(monId) == gBattlePartyID[bank ^ BIT_MON]))
+             && ((u16)(monId) == gBattlePartyID[bank] || (u16)(monId) == gBattlePartyID[bank ^ BIT_FLANK]))
                 gTasks[taskId].func = sub_81BB628;
             else
                 gTasks[taskId].func = DestroyExpTaskAndCompleteOnInactiveTextPrinter;
@@ -381,7 +381,7 @@ static void Task_GiveExpToMon(u8 taskId)
         {
             currExp += gainedExp;
             SetMonData(mon, MON_DATA_EXP, &currExp);
-            gBattleBankFunc[bank] = CompleteOnInactiveTextPrinter;
+            gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
             DestroyTask(taskId);
         }
     }
@@ -445,17 +445,17 @@ static void sub_81BB4E4(u8 taskId)
                 SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &expOnNextLvl);
                 CalculateMonStats(&gPlayerParty[monId]);
                 gainedExp -= expOnNextLvl - currExp;
-                savedActiveBank = gActiveBank;
-                gActiveBank = bank;
+                savedActiveBank = gActiveBattler;
+                gActiveBattler = bank;
                 EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
-                gActiveBank = savedActiveBank;
+                gActiveBattler = savedActiveBank;
                 gTasks[taskId].func = sub_81BB628;
             }
             else
             {
                 currExp += gainedExp;
                 SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &currExp);
-                gBattleBankFunc[bank] = CompleteOnInactiveTextPrinter;
+                gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
                 DestroyTask(taskId);
             }
         }
@@ -467,8 +467,8 @@ static void sub_81BB628(u8 taskId)
     u8 bank = gTasks[taskId].tExpTask_bank;
     u8 monIndex = gTasks[taskId].tExpTask_monId;
 
-    if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_MON])
-        bank ^= BIT_MON;
+    if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_FLANK])
+        bank ^= BIT_FLANK;
 
     InitAndLaunchSpecialAnimation(bank, bank, bank, B_ANIM_LVL_UP);
     gTasks[taskId].func = sub_81BB688;
@@ -484,8 +484,8 @@ static void sub_81BB688(u8 taskId)
 
         GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL);  // Unused return value
 
-        if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_MON])
-            UpdateHealthboxAttribute(gHealthBoxesIds[bank ^ BIT_MON], &gPlayerParty[monIndex], HEALTHBOX_ALL);
+        if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_FLANK])
+            UpdateHealthboxAttribute(gHealthBoxesIds[bank ^ BIT_FLANK], &gPlayerParty[monIndex], HEALTHBOX_ALL);
         else
             UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gPlayerParty[monIndex], HEALTHBOX_ALL);
 
@@ -501,31 +501,31 @@ static void DestroyExpTaskAndCompleteOnInactiveTextPrinter(u8 taskId)
     monIndex = gTasks[taskId].tExpTask_monId;
     GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL);  // Unused return value
     bank = gTasks[taskId].tExpTask_bank;
-    gBattleBankFunc[bank] = CompleteOnInactiveTextPrinter;
+    gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
     DestroyTask(taskId);
 }
 
 static void sub_81BB78C(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].pos1.y + gSprites[gBankSpriteIds[gActiveBank]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].pos1.y + gSprites[gBankSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
     {
-        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
         nullsub_24(species);
-        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBank]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBattler]].oam.matrixNum);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         PlayerPartnerBufferExecCompleted();
     }
 }
 
 static void sub_81BB828(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         PlayerPartnerBufferExecCompleted();
     }
 }
@@ -538,7 +538,7 @@ static void CompleteOnInactiveTextPrinter2(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -557,20 +557,20 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_81BB92C(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        CopyBattleSpriteInvisibility(gActiveBank);
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+        CopyBattleSpriteInvisibility(gActiveBattler);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattleBankFunc[gActiveBank] = sub_81BB9A0;
+        gBattlerFuncs[gActiveBattler] = sub_81BB9A0;
     }
 }
 
 static void sub_81BB9A0(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive
-        && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive
+        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         PlayerPartnerBufferExecCompleted();
     }
@@ -578,66 +578,66 @@ static void sub_81BB9A0(void)
 
 static void sub_81BB9F4(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
 
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-        sub_8076918(gActiveBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        sub_8076918(gActiveBattler);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
-        gBattleBankFunc[gActiveBank] = sub_81BB92C;
+        gBattlerFuncs[gActiveBattler] = sub_81BB92C;
     }
 }
 
 static void sub_81BBAE8(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
     }
 
-    if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        gBattleBankFunc[gActiveBank] = sub_81BB9F4;
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        gBattlerFuncs[gActiveBattler] = sub_81BB9F4;
     }
 }
 
 static void PlayerPartnerBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = PlayerPartnerBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = PlayerPartnerBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
+        gBattleBufferA[gActiveBattler][0] = CONTROLLER_TERMINATOR_NOP;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
 static void CompleteOnFinishedStatusAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
         PlayerPartnerBufferExecCompleted();
 }
 
 static void CompleteOnFinishedBattleAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animFromTableActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
         PlayerPartnerBufferExecCompleted();
 }
 
@@ -648,13 +648,13 @@ static void PlayerPartnerHandleGetMonData(void)
     u8 monToCheck;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyPlayerPartnerMonData(gBattlePartyID[gActiveBank], monData);
+        size += CopyPlayerPartnerMonData(gBattlePartyID[gActiveBattler], monData);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -676,7 +676,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         battleMon.species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
@@ -742,7 +742,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        data16 = GetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE);
+        data16 = GetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE);
         dst[0] = data16;
         dst[1] = data16 >> 8;
         size = 2;
@@ -757,7 +757,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE);
+        dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE);
         size = 1;
         break;
     case REQUEST_OTID_BATTLE:
@@ -982,13 +982,13 @@ static void PlayerPartnerHandleSetMonData(void)
     u8 monToCheck;
     u8 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetPlayerPartnerMonData(gBattlePartyID[gActiveBank]);
+        SetPlayerPartnerMonData(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -1001,11 +1001,11 @@ static void PlayerPartnerHandleSetMonData(void)
 
 static void SetPlayerPartnerMonData(u8 monId)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         {
@@ -1046,10 +1046,10 @@ static void SetPlayerPartnerMonData(u8 monId)
         }
         break;
     case REQUEST_SPECIES_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HELDITEM_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MOVES_PP_BATTLE:
         for (i = 0; i < 4; i++)
@@ -1063,167 +1063,167 @@ static void SetPlayerPartnerMonData(u8 monId)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PP_DATA_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case REQUEST_PPMOVE1_BATTLE:
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_OTID_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_EXP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_FRIENDSHIP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKERUS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LOCATION_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LEVEL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_GAME_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKEBALL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ALL_IVS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case REQUEST_HP_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PERSONALITY_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CHECKSUM_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_STATUS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_LEVEL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MAX_HP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SHEEN_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
 
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 }
 
 static void PlayerPartnerHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
+    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
-    for (i = 0; i < gBattleBufferA[gActiveBank][2]; i++)
-        dst[i] = gBattleBufferA[gActiveBank][3 + i];
+    for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
+        dst[i] = gBattleBufferA[gActiveBattler][3 + i];
 
     PlayerPartnerBufferExecCompleted();
 }
@@ -1232,28 +1232,28 @@ static void PlayerPartnerHandleLoadMonSprite(void)
 {
     u16 species;
 
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
-    sub_806A068(species, GetBankPosition(gActiveBank));
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBank, 2),
-                                               GetBankSpriteDefault_Y(gActiveBank),
-                                               sub_80A82E4(gActiveBank));
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
-    gBattleBankFunc[gActiveBank] = sub_81BB1D4;
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBankCoord(gActiveBattler, 2),
+                                               GetBankSpriteDefault_Y(gActiveBattler),
+                                               sub_80A82E4(gActiveBattler));
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    gBattlerFuncs[gActiveBattler] = sub_81BB1D4;
 }
 
 static void PlayerPartnerHandleSwitchInAnim(void)
 {
-    ClearTemporarySpeciesSpriteData(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    sub_81BD0E4(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_81BBAE8;
+    ClearTemporarySpeciesSpriteData(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    sub_81BD0E4(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlerFuncs[gActiveBattler] = sub_81BBAE8;
 }
 
 static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
@@ -1264,7 +1264,7 @@ static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    sub_806A068(species, GetBankPosition(bank));
+    sub_806A068(species, GetBattlerPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
@@ -1289,36 +1289,36 @@ static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
 
 static void PlayerPartnerHandleReturnMonToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-        gBattleBankFunc[gActiveBank] = DoSwitchOutAnimation;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         PlayerPartnerBufferExecCompleted();
     }
 }
 
 static void DoSwitchOutAnimation(void)
 {
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
-            gBattleBankFunc[gActiveBank] = sub_81BB828;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_PLAYER_MON);
+            gBattlerFuncs[gActiveBattler] = sub_81BB828;
         }
         break;
     }
@@ -1348,31 +1348,31 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
     // Use back pic only if the partner is Steven
     if (gPartnerTrainerId == STEVEN_PARTNER_ID)
     {
-        DecompressTrainerBackPic(trainerPicId, gActiveBank);
-        sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
-        gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
-
-        gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-        gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
+        DecompressTrainerBackPic(trainerPicId, gActiveBattler);
+        sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
+        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
     }
     else // otherwise use front sprite
     {
-        DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-        sub_806A1C0(trainerPicId, GetBankPosition(gActiveBank));
-        gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
-
-        gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-        gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBank]].pos2.y = 48;
-        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
-        gSprites[gBankSpriteIds[gActiveBank]].oam.affineMode = 0;
-        gSprites[gBankSpriteIds[gActiveBank]].hFlip = 1;
+        DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
+        sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler));
+        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBankSpriteIds[gActiveBattler]].pos2.y = 48;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.affineMode = 0;
+        gSprites[gBankSpriteIds[gActiveBattler]].hFlip = 1;
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void PlayerPartnerHandleTrainerSlide(void)
@@ -1382,34 +1382,34 @@ static void PlayerPartnerHandleTrainerSlide(void)
 
 static void PlayerPartnerHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    gBattleBankFunc[gActiveBank] = sub_81BAE98;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerFuncs[gActiveBattler] = sub_81BAE98;
 }
 
 static void PlayerPartnerHandleFaintAnimation(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
     else
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
-            gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-            gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
-            gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039C00;
-            gBattleBankFunc[gActiveBank] = sub_81BB78C;
+            gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+            gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 5;
+            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039C00;
+            gBattlerFuncs[gActiveBattler] = sub_81BB78C;
         }
     }
 }
@@ -1436,51 +1436,51 @@ static void PlayerPartnerHandlePause(void)
 
 static void PlayerPartnerHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4] | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6] | (gBattleBufferA[gActiveBattler][7] << 8) | (gBattleBufferA[gActiveBattler][8] << 16) | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
         if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE
         {
             PlayerPartnerBufferExecCompleted();
         }
         else
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            gBattleBankFunc[gActiveBank] = PlayerPartnerDoMoveAnimation;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            gBattlerFuncs[gActiveBattler] = PlayerPartnerDoMoveAnimation;
         }
     }
 }
 
 static void PlayerPartnerDoMoveAnimation(void)
 {
-    u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 multihit = gBattleBufferA[gActiveBank][11];
+    u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 multihit = gBattleBufferA[gActiveBattler][11];
 
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             sub_805EB9C(0);
             DoMoveAnim(move);
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 2;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
         }
         break;
     case 2:
@@ -1488,20 +1488,20 @@ static void PlayerPartnerDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
             {
-                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
+                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
+                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
             }
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
         break;
     case 3:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             CopyAllBattleSpritesInvisibilities();
-            TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            TrySetBehindSubstituteSpriteBit(gActiveBattler, gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             PlayerPartnerBufferExecCompleted();
         }
         break;
@@ -1514,10 +1514,10 @@ static void PlayerPartnerHandlePrintString(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    stringId = (u16*)(&gBattleBufferA[gActiveBank][2]);
+    stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter2;
+    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2;
 }
 
 static void PlayerPartnerHandlePrintSelectionString(void)
@@ -1539,21 +1539,21 @@ static void PlayerPartnerHandleUnknownYesNoBox(void)
 static void PlayerPartnerHandleChooseMove(void)
 {
     u8 chosenMoveId;
-    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
+    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
 
     BattleAI_SetupAIData(0xF);
     chosenMoveId = BattleAI_ChooseMoveOrAction();
 
     if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_x10 | MOVE_TARGET_USER))
-        gBankDefender = gActiveBank;
+        gBattleDefender = gActiveBattler;
     if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH)
     {
-        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
-        if (gAbsentBankFlags & gBitTable[gBankDefender])
-            gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+        gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
+            gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
     }
 
-    EmitTwoReturnValues(1, 10, chosenMoveId | (gBankDefender << 8));
+    EmitTwoReturnValues(1, 10, chosenMoveId | (gBattleDefender << 8));
     PlayerPartnerBufferExecCompleted();
 }
 
@@ -1568,8 +1568,8 @@ static void PlayerPartnerHandleChoosePokemon(void)
 
     if (chosenMonId == 6) // just switch to the next mon
     {
-        u8 playerMonIdentity = GetBankByPosition(B_POSITION_PLAYER_LEFT);
-        u8 selfIdentity = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+        u8 playerMonIdentity = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+        u8 selfIdentity = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
 
         for (chosenMonId = 3; chosenMonId < 6; chosenMonId++)
         {
@@ -1582,7 +1582,7 @@ static void PlayerPartnerHandleChoosePokemon(void)
         }
     }
 
-    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = chosenMonId;
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = chosenMonId;
     EmitChosenMonReturnValue(1, chosenMonId, NULL);
     PlayerPartnerBufferExecCompleted();
 }
@@ -1597,28 +1597,28 @@ static void PlayerPartnerHandleHealthBarUpdate(void)
     s16 hpVal;
 
     LoadBattleBarGfx(0);
-    hpVal = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    hpVal = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, 0, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnHealthbarDone;
+    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void PlayerPartnerHandleExpUpdate(void)
 {
-    u8 monId = gBattleBufferA[gActiveBank][1];
+    u8 monId = gBattleBufferA[gActiveBattler][1];
 
     if (GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL) >= MAX_MON_LEVEL)
     {
@@ -1631,12 +1631,12 @@ static void PlayerPartnerHandleExpUpdate(void)
 
         LoadBattleBarGfx(1);
         GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);  // unused return value
-        expPointsToGive = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        expPointsToGive = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
         taskId = CreateTask(Task_GiveExpToMon, 10);
         gTasks[taskId].tExpTask_monId = monId;
         gTasks[taskId].tExpTask_gainedExp = expPointsToGive;
-        gTasks[taskId].tExpTask_bank = gActiveBank;
-        gBattleBankFunc[gActiveBank] = nullsub_21;
+        gTasks[taskId].tExpTask_bank = gActiveBattler;
+        gBattlerFuncs[gActiveBattler] = nullsub_21;
     }
 }
 
@@ -1647,24 +1647,24 @@ static void PlayerPartnerHandleExpUpdate(void)
 
 static void PlayerPartnerHandleStatusIconUpdate(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_STATUS_ICON);
-        bank = gActiveBank;
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
 static void PlayerPartnerHandleStatusAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
-                        gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
+                        gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1721,7 +1721,7 @@ static void PlayerPartnerHandleCmd37(void)
 
 static void PlayerPartnerHandleCmd38(void)
 {
-    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1];
     PlayerPartnerBufferExecCompleted();
 }
 
@@ -1739,16 +1739,16 @@ static void PlayerPartnerHandleCmd40(void)
 
 static void PlayerPartnerHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         PlayerPartnerBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        DoHitAnimHealthboxEffect(gActiveBank);
-        gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        DoHitAnimHealthboxEffect(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1761,25 +1761,25 @@ static void PlayerPartnerHandlePlaySE(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         pan = PAN_SIDE_PLAYER;
     else
         pan = PAN_SIDE_OPPONENT;
 
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     PlayerPartnerBufferExecCompleted();
 }
 
 static void PlayerPartnerHandlePlayFanfareOrBGM(void)
 {
-    if (gBattleBufferA[gActiveBank][3])
+    if (gBattleBufferA[gActiveBattler][3])
     {
         BattleStopLowHpSound();
-        PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
     else
     {
-        PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
 
     PlayerPartnerBufferExecCompleted();
@@ -1787,7 +1787,7 @@ static void PlayerPartnerHandlePlayFanfareOrBGM(void)
 
 static void PlayerPartnerHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, -25, 5);
     PlayerPartnerBufferExecCompleted();
@@ -1795,7 +1795,7 @@ static void PlayerPartnerHandleFaintingCry(void)
 
 static void PlayerPartnerHandleIntroSlide(void)
 {
-    HandleIntroSlide(gBattleBufferA[gActiveBank][1]);
+    HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
     gUnknown_020243FC |= 1;
     PlayerPartnerBufferExecCompleted();
 }
@@ -1805,16 +1805,16 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_805CC00);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_805CC00);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F9);
     if (gPartnerTrainerId == STEVEN_PARTNER_ID)
@@ -1829,16 +1829,16 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
     }
 
 
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = paletteNum;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(sub_81BE2C8, 5);
-    gTasks[taskId].data[0] = gActiveBank;
+    gTasks[taskId].data[0] = gActiveBattler;
 
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_77;
+    gBattlerFuncs[gActiveBattler] = nullsub_77;
 }
 
 static void sub_81BE2C8(u8 taskId)
@@ -1849,62 +1849,62 @@ static void sub_81BE2C8(u8 taskId)
     }
     else
     {
-        u8 savedActiveBank = gActiveBank;
+        u8 savedActiveBank = gActiveBattler;
 
-        gActiveBank = gTasks[taskId].data[0];
+        gActiveBattler = gTasks[taskId].data[0];
         if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_81BD0E4(gActiveBank, FALSE);
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            sub_81BD0E4(gActiveBattler, FALSE);
         }
         else
         {
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_81BD0E4(gActiveBank, FALSE);
-            gActiveBank ^= BIT_MON;
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-            sub_81BD0E4(gActiveBank, FALSE);
-            gActiveBank ^= BIT_MON;
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            sub_81BD0E4(gActiveBattler, FALSE);
+            gActiveBattler ^= BIT_FLANK;
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            sub_81BD0E4(gActiveBattler, FALSE);
+            gActiveBattler ^= BIT_FLANK;
         }
-        gBattleBankFunc[gActiveBank] = sub_81BB02C;
-        gActiveBank = savedActiveBank;
+        gBattlerFuncs[gActiveBattler] = sub_81BB02C;
+        gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
 }
 
 static void PlayerPartnerHandleDrawPartyStatusSummary(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
     {
         PlayerPartnerBufferExecCompleted();
     }
     else
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1 = 1;
-        gUnknown_020244B4[gActiveBank] = CreatePartyStatusSummarySprites(gActiveBank, (struct HpAndStatus *)&gBattleBufferA[gActiveBank][4], gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][2]);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
+        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
-        if (gBattleBufferA[gActiveBank][2] != 0)
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0x5D;
+        if (gBattleBufferA[gActiveBattler][2] != 0)
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattleBankFunc[gActiveBank] = sub_81BE498;
+        gBattlerFuncs[gActiveBattler] = sub_81BE498;
     }
 }
 
 static void sub_81BE498(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5++ > 0x5C)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5++ > 0x5C)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
         PlayerPartnerBufferExecCompleted();
     }
 }
 
 static void PlayerPartnerHandleCmd49(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
     PlayerPartnerBufferExecCompleted();
 }
 
@@ -1915,25 +1915,25 @@ static void PlayerPartnerHandleCmd50(void)
 
 static void PlayerPartnerHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank))
+    if (IsBankSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        CopyBattleSpriteInvisibility(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        CopyBattleSpriteInvisibility(gActiveBattler);
     }
     PlayerPartnerBufferExecCompleted();
 }
 
 static void PlayerPartnerHandleBattleAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u8 animationId = gBattleBufferA[gActiveBank][1];
-        u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 animationId = gBattleBufferA[gActiveBattler][1];
+        u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             PlayerPartnerBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
+            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
     }
 }
 
@@ -1949,11 +1949,11 @@ static void PlayerPartnerHandleResetActionMoveSelection(void)
 
 static void PlayerPartnerHandleCmd55(void)
 {
-    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     PlayerPartnerBufferExecCompleted();
-    gBattleBankFunc[gActiveBank] = sub_80587B0;
+    gBattlerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_128(void)
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index e970c5f58..290eee61b 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -26,32 +26,32 @@
 #include "data2.h"
 
 extern u32 gBattleExecBuffer;
-extern u8 gActiveBank;
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gBattleBanksCount;
+extern u8 gActiveBattler;
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern u16 gUnknown_020243FC;
-extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBankDefender;
-extern u8 gAbsentBankFlags;
+extern u8 gBattleDefender;
+extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
-extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
+extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 extern u16 gTrainerBattleOpponent_A;
@@ -202,15 +202,15 @@ static void nullsub_70(void)
 
 void SetControllerToRecordedOpponent(void)
 {
-    gBattleBankFunc[gActiveBank] = RecordedOpponentBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = RecordedOpponentBufferRunCommand;
 }
 
 static void RecordedOpponentBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sRecordedOpponentBufferCommands))
-            sRecordedOpponentBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sRecordedOpponentBufferCommands))
+            sRecordedOpponentBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             RecordedOpponentBufferExecCompleted();
     }
@@ -218,32 +218,32 @@ static void RecordedOpponentBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         RecordedOpponentBufferExecCompleted();
 }
 
 static void CompleteOnBankSpriteCallbackDummy2(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         RecordedOpponentBufferExecCompleted();
 }
 
 static void sub_81865C8(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        FreeTrainerFrontPicPalette(gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        FreeTrainerFrontPicPalette(gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         RecordedOpponentBufferExecCompleted();
     }
 }
 
 static void sub_8186630(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 == 0xFF)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         RecordedOpponentBufferExecCompleted();
     }
 }
@@ -254,8 +254,8 @@ static void sub_8186678(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank]].animEnded)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler]].animEnded)
         {
             var = TRUE;
         }
@@ -263,10 +263,10 @@ static void sub_8186678(void)
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gHealthBoxesIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank]].animEnded
-            && gSprites[gBankSpriteIds[gActiveBank ^ BIT_MON]].animEnded)
+        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler]].animEnded
+            && gSprites[gBankSpriteIds[gActiveBattler ^ BIT_FLANK]].animEnded)
          {
              var = TRUE;
          }
@@ -274,23 +274,23 @@ static void sub_8186678(void)
 
     if (var)
     {
-        if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_LEFT)
+        if (GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_LEFT)
         {
-            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
                 return;
-            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
+            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
                 return;
 
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0;
             FreeSpriteTilesByTag(0x27F9);
             FreeSpritePaletteByTag(0x27F9);
         }
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 3;
-        gBattleBankFunc[gActiveBank] = sub_8186630;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
+        gBattlerFuncs[gActiveBattler] = sub_8186630;
     }
 }
 
@@ -299,38 +299,38 @@ static void sub_818686C(void)
     bool32 r9 = FALSE;
     bool32 r8 = FALSE;
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
-        sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
-        sub_8172EF0(gActiveBank ^ BIT_MON, &gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
+        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank ^ BIT_MON], &gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]], HEALTHBOX_ALL);
-                sub_8076918(gActiveBank ^ BIT_MON);
-                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank ^ BIT_MON]);
+                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+                sub_8076918(gActiveBattler ^ BIT_FLANK);
+                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
             }
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-            sub_8076918(gActiveBank);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+            sub_8076918(gActiveBattler);
+            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 1;
     }
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x40
-        && gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x40
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x40
+        && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x40
         && !IsCryPlayingOrClearCrySongs())
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
             {
-                if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_LEFT)
+                if (GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_LEFT)
                     m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
@@ -338,24 +338,24 @@ static void sub_818686C(void)
                 m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             }
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 1;
         r9 = TRUE;
     }
 
     if (!IsDoubleBattle())
     {
-        if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+        if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
     }
     else
     {
-        if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
-            && gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy)
+        if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
+            && gSprites[gBankSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
@@ -365,36 +365,36 @@ static void sub_818686C(void)
     {
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]]);
-            SetBankEnemyShadowSpriteCallback(gActiveBank ^ BIT_MON, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank ^ BIT_MON]], MON_DATA_SPECIES));
+            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
+            SetBankEnemyShadowSpriteCallback(gActiveBattler ^ BIT_FLANK, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], MON_DATA_SPECIES));
         }
 
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
 
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 0;
 
-        gBattleBankFunc[gActiveBank] = sub_8186678;
+        gBattlerFuncs[gActiveBattler] = sub_8186678;
     }
 }
 
 static void sub_8186C48(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
-     && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+     && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80)
         {
-            sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+            sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
         }
         else
         {
-            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
             {
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
                 FreeSpriteTilesByTag(0x27F9);
                 FreeSpritePaletteByTag(0x27F9);
                 RecordedOpponentBufferExecCompleted();
@@ -405,13 +405,13 @@ static void sub_8186C48(void)
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBank, gHealthBoxesIds[gActiveBank], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
@@ -421,21 +421,21 @@ static void CompleteOnHealthbarDone(void)
 
 static void sub_8186D58(void)
 {
-    if (!gSprites[gBankSpriteIds[gActiveBank]].inUse)
+    if (!gSprites[gBankSpriteIds[gActiveBattler]].inUse)
     {
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         RecordedOpponentBufferExecCompleted();
     }
 }
 
 static void sub_8186D9C(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBank);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        EnemyShadowCallbackToSetInvisible(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         RecordedOpponentBufferExecCompleted();
     }
 }
@@ -448,7 +448,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -467,22 +467,22 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_8186EA4(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattleBankFunc[gActiveBank] = sub_8186F14;
+        gBattlerFuncs[gActiveBattler] = sub_8186F14;
     }
 }
 
 static void sub_8186F14(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive
         && !IsCryPlayingOrClearCrySongs())
     {
-        if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy
-            || gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy_2)
+        if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            || gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
         {
             m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             RecordedOpponentBufferExecCompleted();
@@ -492,67 +492,67 @@ static void sub_8186F14(void)
 
 static void sub_8186F94(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1
-     && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
+     && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
 
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
+        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-        sub_8076918(gActiveBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
-        CopyBattleSpriteInvisibility(gActiveBank);
-        gBattleBankFunc[gActiveBank] = sub_8186EA4;
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        sub_8076918(gActiveBattler);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        CopyBattleSpriteInvisibility(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = sub_8186EA4;
     }
 }
 
 static void sub_8187084(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80)
     {
-        sub_8172EF0(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]);
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
     }
 
-    if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
-        gBattleBankFunc[gActiveBank] = sub_8186F94;
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+        gBattlerFuncs[gActiveBattler] = sub_8186F94;
     }
 }
 
 static void CompleteOnFinishedStatusAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
         RecordedOpponentBufferExecCompleted();
 }
 
 static void CompleteOnFinishedBattleAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animFromTableActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
         RecordedOpponentBufferExecCompleted();
 }
 
 static void RecordedOpponentBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = RecordedOpponentBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = RecordedOpponentBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
+        gBattleBufferA[gActiveBattler][0] = CONTROLLER_TERMINATOR_NOP;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -563,13 +563,13 @@ static void RecordedOpponentHandleGetMonData(void)
     u8 monToCheck;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyRecordedOpponentMonData(gBattlePartyID[gActiveBank], monData);
+        size += CopyRecordedOpponentMonData(gBattlePartyID[gActiveBattler], monData);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -591,7 +591,7 @@ static u32 CopyRecordedOpponentMonData(u8 monId, u8 *dst)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         battleMon.species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES);
@@ -657,7 +657,7 @@ static u32 CopyRecordedOpponentMonData(u8 monId, u8 *dst)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        data16 = GetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE);
+        data16 = GetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE);
         dst[0] = data16;
         dst[1] = data16 >> 8;
         size = 2;
@@ -672,7 +672,7 @@ static u32 CopyRecordedOpponentMonData(u8 monId, u8 *dst)
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE);
+        dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE);
         size = 1;
         break;
     case REQUEST_OTID_BATTLE:
@@ -897,13 +897,13 @@ static void RecordedOpponentHandleSetMonData(void)
     u8 monToCheck;
     u8 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetRecordedOpponentMonData(gBattlePartyID[gActiveBank]);
+        SetRecordedOpponentMonData(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -916,11 +916,11 @@ static void RecordedOpponentHandleSetMonData(void)
 
 static void SetRecordedOpponentMonData(u8 monId)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         {
@@ -961,10 +961,10 @@ static void SetRecordedOpponentMonData(u8 monId)
         }
         break;
     case REQUEST_SPECIES_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HELDITEM_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MOVES_PP_BATTLE:
         for (i = 0; i < 4; i++)
@@ -978,198 +978,198 @@ static void SetRecordedOpponentMonData(u8 monId)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PP_DATA_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case REQUEST_PPMOVE1_BATTLE:
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_OTID_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_EXP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_EV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_FRIENDSHIP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKERUS_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LOCATION_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LEVEL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_GAME_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKEBALL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ALL_IVS_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case REQUEST_HP_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_IV_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PERSONALITY_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CHECKSUM_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_STATUS_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_LEVEL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MAX_HP_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SHEEN_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_RIBBON_BATTLE:
-        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
 }
 
 static void RecordedOpponentHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
+    u8 *dst = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
-    for (i = 0; i < gBattleBufferA[gActiveBank][2]; i++)
-        dst[i] = gBattleBufferA[gActiveBank][3 + i];
+    for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
+        dst[i] = gBattleBufferA[gActiveBattler][3 + i];
 
     RecordedOpponentBufferExecCompleted();
 }
 
 static void RecordedOpponentHandleLoadMonSprite(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
-    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    sub_806A068(species, GetBankPosition(gActiveBank));
+    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBank, 2),
-                                               GetBankSpriteDefault_Y(gActiveBank),
-                                               sub_80A82E4(gActiveBank));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBankCoord(gActiveBattler, 2),
+                                               GetBankSpriteDefault_Y(gActiveBattler),
+                                               sub_80A82E4(gActiveBattler));
 
 
 
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
 
-    SetBankEnemyShadowSpriteCallback(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES));
+    SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
 
-    gBattleBankFunc[gActiveBank] = sub_8186C48;
+    gBattlerFuncs[gActiveBattler] = sub_8186C48;
 }
 
 static void RecordedOpponentHandleSwitchInAnim(void)
 {
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    sub_81885D8(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_8187084;
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    sub_81885D8(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlerFuncs[gActiveBattler] = sub_8187084;
 }
 
 static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
@@ -1181,7 +1181,7 @@ static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
     species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
-    sub_806A068(species, GetBankPosition(bank));
+    sub_806A068(species, GetBattlerPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
                                         GetBankCoord(bank, 2),
@@ -1205,37 +1205,37 @@ static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
 
 static void RecordedOpponentHandleReturnMonToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-        gBattleBankFunc[gActiveBank] = DoSwitchOutAnimation;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBank);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        EnemyShadowCallbackToSetInvisible(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         RecordedOpponentBufferExecCompleted();
     }
 }
 
 static void DoSwitchOutAnimation(void)
 {
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
-            gBattleBankFunc[gActiveBank] = sub_8186D9C;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_OPPONENT_MON);
+            gBattlerFuncs[gActiveBattler] = sub_8186D9C;
         }
         break;
     }
@@ -1248,14 +1248,14 @@ static void RecordedOpponentHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBattlerPosition(gActiveBattler) & BIT_FLANK) != 0) // second mon
             xPos = 152;
         else // first mon
             xPos = 200;
 
         if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
         {
-            if (gActiveBank == 1)
+            if (gActiveBattler == 1)
                 trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_A);
             else
                 trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_B);
@@ -1278,20 +1278,20 @@ static void RecordedOpponentHandleDrawTrainerPic(void)
         }
     }
 
-    DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-    sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
+    DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
+    sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
                                                xPos,
                                                (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40,
-                                               sub_80A82E4(gActiveBank));
+                                               sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.affineParam = trainerPicId;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void RecordedOpponentHandleTrainerSlide(void)
@@ -1301,31 +1301,31 @@ static void RecordedOpponentHandleTrainerSlide(void)
 
 static void RecordedOpponentHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    gBattleBankFunc[gActiveBank] = sub_81865C8;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerFuncs[gActiveBattler] = sub_81865C8;
 }
 
 static void RecordedOpponentHandleFaintAnimation(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
     else
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT);
-            gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039934;
-            gBattleBankFunc[gActiveBank] = sub_8186D58;
+            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039934;
+            gBattlerFuncs[gActiveBattler] = sub_8186D58;
         }
     }
 }
@@ -1352,51 +1352,51 @@ static void RecordedOpponentHandlePause(void)
 
 static void RecordedOpponentHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4] | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6] | (gBattleBufferA[gActiveBattler][7] << 8) | (gBattleBufferA[gActiveBattler][8] << 16) | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
         if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE
         {
             RecordedOpponentBufferExecCompleted();
         }
         else
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            gBattleBankFunc[gActiveBank] = RecordedOpponentDoMoveAnimation;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            gBattlerFuncs[gActiveBattler] = RecordedOpponentDoMoveAnimation;
         }
     }
 }
 
 static void RecordedOpponentDoMoveAnimation(void)
 {
-    u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 multihit = gBattleBufferA[gActiveBank][11];
+    u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 multihit = gBattleBufferA[gActiveBattler][11];
 
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             sub_805EB9C(0);
             DoMoveAnim(move);
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 2;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
         }
         break;
     case 2:
@@ -1404,20 +1404,20 @@ static void RecordedOpponentDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
             {
-                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
+                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
+                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
             }
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
         break;
     case 3:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             CopyAllBattleSpritesInvisibilities();
-            TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            TrySetBehindSubstituteSpriteBit(gActiveBattler, gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             RecordedOpponentBufferExecCompleted();
         }
         break;
@@ -1430,10 +1430,10 @@ static void RecordedOpponentHandlePrintString(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    stringId = (u16*)(&gBattleBufferA[gActiveBank][2]);
+    stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
+    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
 }
 
 static void RecordedOpponentHandlePrintSelectionString(void)
@@ -1443,7 +1443,7 @@ static void RecordedOpponentHandlePrintSelectionString(void)
 
 static void RecordedOpponentHandleChooseAction(void)
 {
-    EmitTwoReturnValues(1, RecordedBattle_ReadBankAction(gActiveBank), 0);
+    EmitTwoReturnValues(1, RecordedBattle_ReadBankAction(gActiveBattler), 0);
     RecordedOpponentBufferExecCompleted();
 }
 
@@ -1460,8 +1460,8 @@ static void RecordedOpponentHandleChooseMove(void)
     }
     else
     {
-        u8 moveId = RecordedBattle_ReadBankAction(gActiveBank);
-        u8 target = RecordedBattle_ReadBankAction(gActiveBank);
+        u8 moveId = RecordedBattle_ReadBankAction(gActiveBattler);
+        u8 target = RecordedBattle_ReadBankAction(gActiveBattler);
         EmitTwoReturnValues(1, 10, moveId | (target << 8));
     }
 
@@ -1475,8 +1475,8 @@ static void RecordedOpponentHandleChooseItem(void)
 
 static void RecordedOpponentHandleChoosePokemon(void)
 {
-    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = RecordedBattle_ReadBankAction(gActiveBank);
-    EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBank), NULL);
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = RecordedBattle_ReadBankAction(gActiveBattler);
+    EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBattler), NULL);
     RecordedOpponentBufferExecCompleted();
 }
 
@@ -1490,23 +1490,23 @@ static void RecordedOpponentHandleHealthBarUpdate(void)
     s16 hpVal;
 
     LoadBattleBarGfx(0);
-    hpVal = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    hpVal = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, 0, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnHealthbarDone;
+    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void RecordedOpponentHandleExpUpdate(void)
@@ -1516,24 +1516,24 @@ static void RecordedOpponentHandleExpUpdate(void)
 
 static void RecordedOpponentHandleStatusIconUpdate(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gEnemyParty[gBattlePartyID[gActiveBank]], HEALTHBOX_STATUS_ICON);
-        bank = gActiveBank;
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
 static void RecordedOpponentHandleStatusAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
-                        gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
+                        gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1590,7 +1590,7 @@ static void RecordedOpponentHandleCmd37(void)
 
 static void RecordedOpponentHandleCmd38(void)
 {
-    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1];
     RecordedOpponentBufferExecCompleted();
 }
 
@@ -1608,16 +1608,16 @@ static void RecordedOpponentHandleCmd40(void)
 
 static void RecordedOpponentHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         RecordedOpponentBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        DoHitAnimHealthboxEffect(gActiveBank);
-        gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        DoHitAnimHealthboxEffect(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1630,25 +1630,25 @@ static void RecordedOpponentHandlePlaySE(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         pan = PAN_SIDE_PLAYER;
     else
         pan = PAN_SIDE_OPPONENT;
 
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     RecordedOpponentBufferExecCompleted();
 }
 
 static void RecordedOpponentHandlePlayFanfareOrBGM(void)
 {
-    if (gBattleBufferA[gActiveBank][3])
+    if (gBattleBufferA[gActiveBattler][3])
     {
         BattleStopLowHpSound();
-        PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
     else
     {
-        PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
 
     RecordedOpponentBufferExecCompleted();
@@ -1656,7 +1656,7 @@ static void RecordedOpponentHandlePlayFanfareOrBGM(void)
 
 static void RecordedOpponentHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, 25, 5);
     RecordedOpponentBufferExecCompleted();
@@ -1664,7 +1664,7 @@ static void RecordedOpponentHandleFaintingCry(void)
 
 static void RecordedOpponentHandleIntroSlide(void)
 {
-    HandleIntroSlide(gBattleBufferA[gActiveBank][1]);
+    HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
     gUnknown_020243FC |= 1;
     RecordedOpponentBufferExecCompleted();
 }
@@ -1674,46 +1674,46 @@ static void RecordedOpponentHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_818962C);
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_818962C);
 
     taskId = CreateTask(sub_8189548, 5);
-    gTasks[taskId].data[0] = gActiveBank;
+    gTasks[taskId].data[0] = gActiveBattler;
 
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_70;
+    gBattlerFuncs[gActiveBattler] = nullsub_70;
 }
 
 static void sub_8189548(u8 taskId)
 {
-    u8 savedActiveBank = gActiveBank;
+    u8 savedActiveBank = gActiveBattler;
 
-    gActiveBank = gTasks[taskId].data[0];
+    gActiveBattler = gTasks[taskId].data[0];
     if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_81885D8(gActiveBank, FALSE);
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_81885D8(gActiveBattler, FALSE);
     }
     else
     {
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_81885D8(gActiveBank, FALSE);
-        gActiveBank ^= BIT_MON;
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_81885D8(gActiveBank, FALSE);
-        gActiveBank ^= BIT_MON;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_81885D8(gActiveBattler, FALSE);
+        gActiveBattler ^= BIT_FLANK;
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_81885D8(gActiveBattler, FALSE);
+        gActiveBattler ^= BIT_FLANK;
     }
-    gBattleBankFunc[gActiveBank] = sub_818686C;
-    gActiveBank = savedActiveBank;
+    gBattlerFuncs[gActiveBattler] = sub_818686C;
+    gActiveBattler = savedActiveBank;
     DestroyTask(taskId);
 }
 
@@ -1726,50 +1726,50 @@ static void sub_818962C(struct Sprite *sprite)
 
 static void RecordedOpponentHandleDrawPartyStatusSummary(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
     {
         RecordedOpponentBufferExecCompleted();
     }
     else
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
 
-        if (gBattleBufferA[gActiveBank][2] != 0)
+        if (gBattleBufferA[gActiveBattler][2] != 0)
         {
-            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1E < 2)
+            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1E < 2)
             {
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1E++;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1E++;
                 return;
             }
             else
             {
-                gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1E = 0;
+                gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1E = 0;
             }
         }
 
-        gUnknown_020244B4[gActiveBank] = CreatePartyStatusSummarySprites(gActiveBank, (struct HpAndStatus *)&gBattleBufferA[gActiveBank][4], gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][2]);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
-        if (gBattleBufferA[gActiveBank][2] != 0)
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0x5D;
+        if (gBattleBufferA[gActiveBattler][2] != 0)
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattleBankFunc[gActiveBank] = sub_818975C;
+        gBattlerFuncs[gActiveBattler] = sub_818975C;
     }
 }
 
 static void sub_818975C(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5++ > 0x5C)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5++ > 0x5C)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
         RecordedOpponentBufferExecCompleted();
     }
 }
 
 static void RecordedOpponentHandleCmd49(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
     RecordedOpponentBufferExecCompleted();
 }
 
@@ -1780,25 +1780,25 @@ static void RecordedOpponentHandleCmd50(void)
 
 static void RecordedOpponentHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank))
+    if (IsBankSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        CopyBattleSpriteInvisibility(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        CopyBattleSpriteInvisibility(gActiveBattler);
     }
     RecordedOpponentBufferExecCompleted();
 }
 
 static void RecordedOpponentHandleBattleAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u8 animationId = gBattleBufferA[gActiveBank][1];
-        u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 animationId = gBattleBufferA[gActiveBattler][1];
+        u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             RecordedOpponentBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
+            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
     }
 }
 
@@ -1814,15 +1814,15 @@ static void RecordedOpponentHandleResetActionMoveSelection(void)
 
 static void RecordedOpponentHandleCmd55(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == B_OUTCOME_DREW)
-        gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    if (gBattleBufferA[gActiveBattler][1] == B_OUTCOME_DREW)
+        gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     else
-        gBattleOutcome = gBattleBufferA[gActiveBank][1] ^ B_OUTCOME_DREW;
+        gBattleOutcome = gBattleBufferA[gActiveBattler][1] ^ B_OUTCOME_DREW;
 
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     RecordedOpponentBufferExecCompleted();
-    gBattleBankFunc[gActiveBank] = sub_80587B0;
+    gBattlerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_119(void)
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 775ea3e7c..ad8cb3a05 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -25,33 +25,33 @@
 #include "data2.h"
 
 extern u32 gBattleExecBuffer;
-extern u8 gActiveBank;
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gBattleBanksCount;
+extern u8 gActiveBattler;
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern u8 gBankInMenu;
 extern u16 gUnknown_020243FC;
-extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBankDefender;
-extern u8 gAbsentBankFlags;
+extern u8 gBattleDefender;
+extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
-extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
+extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern u8 gBattleCommunication[];
 extern u8 gUnknown_0203C7B4;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
@@ -201,15 +201,15 @@ static void nullsub_120(void)
 
 void SetControllerToRecordedPlayer(void)
 {
-    gBattleBankFunc[gActiveBank] = RecordedPlayerBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = RecordedPlayerBufferRunCommand;
 }
 
 static void RecordedPlayerBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sRecordedPlayerBufferCommands))
-            sRecordedPlayerBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sRecordedPlayerBufferCommands))
+            sRecordedPlayerBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             RecordedPlayerBufferExecCompleted();
     }
@@ -217,26 +217,26 @@ static void RecordedPlayerBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         RecordedPlayerBufferExecCompleted();
 }
 
 static void sub_81899F0(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         nullsub_25(0);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
         RecordedPlayerBufferExecCompleted();
     }
 }
 
 static void sub_8189A58(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 == 0xFF)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -245,53 +245,53 @@ static void sub_8189AA0(void)
 {
     bool32 r6 = FALSE;
 
-    if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_LEFT)
+    if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_LEFT)
     {
         if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
         {
-            if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+            if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
                 r6 = TRUE;
         }
         else
         {
-            if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy
-                && gSprites[gHealthBoxesIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy)
+            if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+                && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
             {
                 r6 = TRUE;
             }
         }
 
-        if (r6 && gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1
-            && gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
+        if (r6 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
+            && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
 
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0;
 
             FreeSpriteTilesByTag(0x27F9);
             FreeSpritePaletteByTag(0x27F9);
 
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
             if (IsDoubleBattle())
-                HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], gActiveBank ^ BIT_MON);
+                HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], gActiveBattler ^ BIT_FLANK);
 
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 3;
-            gBattleBankFunc[gActiveBank] = sub_8189A58;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
+            gBattlerFuncs[gActiveBattler] = sub_8189A58;
         }
     }
     else
     {
         if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
         {
-            if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+            if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
                 r6 = TRUE;
         }
         else
         {
-            if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy
-                && gSprites[gHealthBoxesIds[gActiveBank ^ BIT_MON]].callback == SpriteCallbackDummy)
+            if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+                && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
             {
                 r6 = TRUE;
             }
@@ -302,8 +302,8 @@ static void sub_8189AA0(void)
 
         if (r6)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_9 = 3;
-            gBattleBankFunc[gActiveBank] = sub_8189A58;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
+            gBattlerFuncs[gActiveBattler] = sub_8189A58;
         }
     }
 }
@@ -312,48 +312,48 @@ static void sub_8189D40(void)
 {
     bool32 r10 = FALSE;
 
-    if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_LEFT)
+    if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_LEFT)
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
         {
-            sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
+            sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
         }
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
         {
-            sub_8172EF0(gActiveBank ^ BIT_MON, &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
+            sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
         }
     }
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank ^ BIT_MON], &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], HEALTHBOX_ALL);
-                sub_8076918(gActiveBank ^ BIT_MON);
-                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank ^ BIT_MON]);
+                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+                sub_8076918(gActiveBattler ^ BIT_FLANK);
+                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
             }
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-            sub_8076918(gActiveBank);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+            sub_8076918(gActiveBattler);
+            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 1;
     }
 
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x40
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x40
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x40
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x40
         && !IsCryPlayingOrClearCrySongs())
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20)
         {
             if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && (gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_LEFT)
+                if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_LEFT)
                     m4aMPlayContinue(&gMPlayInfo_BGM);
             }
             else
@@ -362,68 +362,68 @@ static void sub_8189D40(void)
             }
 
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 1;
         r10 = TRUE;
     }
 
-    if (r10 && gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-        && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (r10 && gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
-            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]]);
+            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
 
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x20 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x80 = 0;
-        gBattleBankFunc[gActiveBank] = sub_8189AA0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 0;
+        gBattlerFuncs[gActiveBattler] = sub_8189AA0;
     }
 }
 
 static void sub_818A064(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].animEnded && gSprites[gBankSpriteIds[gActiveBank]].pos2.x == 0)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].animEnded && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
         RecordedPlayerBufferExecCompleted();
 }
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBank, gHealthBoxesIds[gActiveBank], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         RecordedPlayerBufferExecCompleted();
     }
 }
 
 static void sub_818A114(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].pos1.y + gSprites[gBankSpriteIds[gActiveBank]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].pos1.y + gSprites[gBankSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
     {
-        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
         nullsub_24(species);
-        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBank]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBattler]].oam.matrixNum);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         RecordedPlayerBufferExecCompleted();
     }
 }
 
 static void sub_818A1B0(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -436,7 +436,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -455,20 +455,20 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_818A2B4(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        CopyBattleSpriteInvisibility(gActiveBank);
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+        CopyBattleSpriteInvisibility(gActiveBattler);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattleBankFunc[gActiveBank] = sub_818A328;
+        gBattlerFuncs[gActiveBattler] = sub_818A328;
     }
 }
 
 static void sub_818A328(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive
-        && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive
+        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         RecordedPlayerBufferExecCompleted();
     }
@@ -476,66 +476,66 @@ static void sub_818A328(void)
 
 static void sub_818A37C(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
 
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-        sub_8076918(gActiveBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        sub_8076918(gActiveBattler);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
-        gBattleBankFunc[gActiveBank] = sub_818A2B4;
+        gBattlerFuncs[gActiveBattler] = sub_818A2B4;
     }
 }
 
 static void sub_818A470(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
     }
 
-    if (gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
+    if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        gBattleBankFunc[gActiveBank] = sub_818A37C;
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        gBattlerFuncs[gActiveBattler] = sub_818A37C;
     }
 }
 
 static void RecordedPlayerBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = RecordedPlayerBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = RecordedPlayerBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
+        gBattleBufferA[gActiveBattler][0] = CONTROLLER_TERMINATOR_NOP;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
 static void CompleteOnFinishedStatusAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
         RecordedPlayerBufferExecCompleted();
 }
 
 static void CompleteOnFinishedBattleAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animFromTableActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
         RecordedPlayerBufferExecCompleted();
 }
 
@@ -546,13 +546,13 @@ static void RecordedPlayerHandleGetMonData(void)
     u8 monToCheck;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyRecordedPlayerMonData(gBattlePartyID[gActiveBank], monData);
+        size += CopyRecordedPlayerMonData(gBattlePartyID[gActiveBattler], monData);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -574,7 +574,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         battleMon.species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
@@ -640,7 +640,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        data16 = GetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE);
+        data16 = GetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE);
         dst[0] = data16;
         dst[1] = data16 >> 8;
         size = 2;
@@ -655,7 +655,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE);
+        dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE);
         size = 1;
         break;
     case REQUEST_OTID_BATTLE:
@@ -880,13 +880,13 @@ static void RecordedPlayerHandleSetMonData(void)
     u8 monToCheck;
     u8 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetRecordedPlayerMonData(gBattlePartyID[gActiveBank]);
+        SetRecordedPlayerMonData(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -899,11 +899,11 @@ static void RecordedPlayerHandleSetMonData(void)
 
 static void SetRecordedPlayerMonData(u8 monId)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         {
@@ -944,10 +944,10 @@ static void SetRecordedPlayerMonData(u8 monId)
         }
         break;
     case REQUEST_SPECIES_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HELDITEM_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MOVES_PP_BATTLE:
         for (i = 0; i < 4; i++)
@@ -961,167 +961,167 @@ static void SetRecordedPlayerMonData(u8 monId)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PP_DATA_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case REQUEST_PPMOVE1_BATTLE:
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_OTID_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_EXP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_FRIENDSHIP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKERUS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LOCATION_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LEVEL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_GAME_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKEBALL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ALL_IVS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case REQUEST_HP_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PERSONALITY_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CHECKSUM_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_STATUS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_LEVEL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MAX_HP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SHEEN_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
 
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 }
 
 static void RecordedPlayerHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1];
+    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
-    for (i = 0; i < gBattleBufferA[gActiveBank][2]; i++)
-        dst[i] = gBattleBufferA[gActiveBank][3 + i];
+    for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
+        dst[i] = gBattleBufferA[gActiveBattler][3 + i];
 
     RecordedPlayerBufferExecCompleted();
 }
@@ -1130,28 +1130,28 @@ static void RecordedPlayerHandleLoadMonSprite(void)
 {
     u16 species;
 
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
-    sub_806A068(species, GetBankPosition(gActiveBank));
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBank, 2),
-                                               GetBankSpriteDefault_Y(gActiveBank),
-                                               sub_80A82E4(gActiveBank));
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], gBattleMonForms[gActiveBank]);
-    gBattleBankFunc[gActiveBank] = sub_818A064;
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBankCoord(gActiveBattler, 2),
+                                               GetBankSpriteDefault_Y(gActiveBattler),
+                                               sub_80A82E4(gActiveBattler));
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    gBattlerFuncs[gActiveBattler] = sub_818A064;
 }
 
 static void RecordedPlayerHandleSwitchInAnim(void)
 {
-    ClearTemporarySpeciesSpriteData(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-    sub_818BA6C(gActiveBank, gBattleBufferA[gActiveBank][2]);
-    gBattleBankFunc[gActiveBank] = sub_818A470;
+    ClearTemporarySpeciesSpriteData(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    sub_818BA6C(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
+    gBattlerFuncs[gActiveBattler] = sub_818A470;
 }
 
 static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
@@ -1162,7 +1162,7 @@ static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    sub_806A068(species, GetBankPosition(bank));
+    sub_806A068(species, GetBattlerPosition(bank));
 
     gBankSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
@@ -1187,36 +1187,36 @@ static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
 
 static void RecordedPlayerHandleReturnMonToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-        gBattleBankFunc[gActiveBank] = DoSwitchOutAnimation;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         RecordedPlayerBufferExecCompleted();
     }
 }
 
 static void DoSwitchOutAnimation(void)
 {
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
-            gBattleBankFunc[gActiveBank] = sub_818A1B0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_PLAYER_MON);
+            gBattlerFuncs[gActiveBattler] = sub_818A1B0;
         }
         break;
     }
@@ -1241,7 +1241,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        if ((GetBankPosition(gActiveBank) & BIT_MON) != 0) // second mon
+        if ((GetBattlerPosition(gActiveBattler) & BIT_FLANK) != 0) // second mon
             xPos = 90;
         else // first mon
             xPos = 32;
@@ -1266,31 +1266,31 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
     if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
     {
         trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender);
-        DecompressTrainerFrontPic(trainerPicId, gActiveBank);
-        sub_806A1C0(trainerPicId, GetBankPosition(gActiveBank));
-        gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
-
-        gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-        gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBank]].pos2.y = 48;
-        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
-        gSprites[gBankSpriteIds[gActiveBank]].oam.affineMode = 0;
-        gSprites[gBankSpriteIds[gActiveBank]].hFlip = 1;
+        DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
+        sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler));
+        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBankSpriteIds[gActiveBattler]].pos2.y = 48;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.affineMode = 0;
+        gSprites[gBankSpriteIds[gActiveBattler]].hFlip = 1;
     }
     else
     {
-        DecompressTrainerBackPic(trainerPicId, gActiveBank);
-        sub_806A12C(trainerPicId, GetBankPosition(gActiveBank));
-        gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBank));
-
-        gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-        gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
+        DecompressTrainerBackPic(trainerPicId, gActiveBattler);
+        sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
+        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+
+        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void RecordedPlayerHandleTrainerSlide(void)
@@ -1300,34 +1300,34 @@ static void RecordedPlayerHandleTrainerSlide(void)
 
 static void RecordedPlayerHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], SpriteCallbackDummy);
-    gBattleBankFunc[gActiveBank] = sub_81899F0;
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerFuncs[gActiveBattler] = sub_81899F0;
 }
 
 static void RecordedPlayerHandleFaintAnimation(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
     else
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
             PlaySE12WithPanning(SE_POKE_DEAD, -64);
-            gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-            gSprites[gBankSpriteIds[gActiveBank]].data[2] = 5;
-            gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039C00;
-            gBattleBankFunc[gActiveBank] = sub_818A114;
+            gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+            gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 5;
+            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039C00;
+            gBattlerFuncs[gActiveBattler] = sub_818A114;
         }
     }
 }
@@ -1354,51 +1354,51 @@ static void RecordedPlayerHandlePause(void)
 
 static void RecordedPlayerHandleMoveAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-
-        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-        gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-        gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-        gAnimFriendship = gBattleBufferA[gActiveBank][10];
-        gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
-        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+        u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+
+        gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+        gAnimMovePower = gBattleBufferA[gActiveBattler][4] | (gBattleBufferA[gActiveBattler][5] << 8);
+        gAnimMoveDmg = gBattleBufferA[gActiveBattler][6] | (gBattleBufferA[gActiveBattler][7] << 8) | (gBattleBufferA[gActiveBattler][8] << 16) | (gBattleBufferA[gActiveBattler][9] << 24);
+        gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+        gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8);
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+        gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
         if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE
         {
             RecordedPlayerBufferExecCompleted();
         }
         else
         {
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-            gBattleBankFunc[gActiveBank] = RecordedPlayerDoMoveAnimation;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+            gBattlerFuncs[gActiveBattler] = RecordedPlayerDoMoveAnimation;
         }
     }
 }
 
 static void RecordedPlayerDoMoveAnimation(void)
 {
-    u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
-    u8 multihit = gBattleBufferA[gActiveBank][11];
+    u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
+    u8 multihit = gBattleBufferA[gActiveBattler][11];
 
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             sub_805EB9C(0);
             DoMoveAnim(move);
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 2;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
         }
         break;
     case 2:
@@ -1406,20 +1406,20 @@ static void RecordedPlayerDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
             {
-                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
+                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
+                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
             }
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
         break;
     case 3:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             CopyAllBattleSpritesInvisibilities();
-            TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            TrySetBehindSubstituteSpriteBit(gActiveBattler, gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             RecordedPlayerBufferExecCompleted();
         }
         break;
@@ -1432,10 +1432,10 @@ static void RecordedPlayerHandlePrintString(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    stringId = (u16*)(&gBattleBufferA[gActiveBank][2]);
+    stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
+    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
 }
 
 static void RecordedPlayerHandlePrintSelectionString(void)
@@ -1445,9 +1445,9 @@ static void RecordedPlayerHandlePrintSelectionString(void)
 
 static void ChooseActionInBattlePalace(void)
 {
-    if (gBattleCommunication[4] >= gBattleBanksCount / 2)
+    if (gBattleCommunication[4] >= gBattlersCount / 2)
     {
-        EmitTwoReturnValues(1, RecordedBattle_ReadBankAction(gActiveBank), 0);
+        EmitTwoReturnValues(1, RecordedBattle_ReadBankAction(gActiveBattler), 0);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -1456,11 +1456,11 @@ static void RecordedPlayerHandleChooseAction(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
     {
-        gBattleBankFunc[gActiveBank] = ChooseActionInBattlePalace;
+        gBattlerFuncs[gActiveBattler] = ChooseActionInBattlePalace;
     }
     else
     {
-        EmitTwoReturnValues(1, RecordedBattle_ReadBankAction(gActiveBank), 0);
+        EmitTwoReturnValues(1, RecordedBattle_ReadBankAction(gActiveBattler), 0);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -1478,8 +1478,8 @@ static void RecordedPlayerHandleChooseMove(void)
     }
     else
     {
-        u8 moveId = RecordedBattle_ReadBankAction(gActiveBank);
-        u8 target = RecordedBattle_ReadBankAction(gActiveBank);
+        u8 moveId = RecordedBattle_ReadBankAction(gActiveBattler);
+        u8 target = RecordedBattle_ReadBankAction(gActiveBattler);
         EmitTwoReturnValues(1, 10, moveId | (target << 8));
     }
 
@@ -1493,8 +1493,8 @@ static void RecordedPlayerHandleChooseItem(void)
 
 static void RecordedPlayerHandleChoosePokemon(void)
 {
-    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = RecordedBattle_ReadBankAction(gActiveBank);
-    EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBank), NULL);
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = RecordedBattle_ReadBankAction(gActiveBattler);
+    EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBattler), NULL);
     RecordedPlayerBufferExecCompleted();
 }
 
@@ -1508,24 +1508,24 @@ static void RecordedPlayerHandleHealthBarUpdate(void)
     s16 hpVal;
 
     LoadBattleBarGfx(0);
-    hpVal = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    hpVal = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, 0, hpVal);
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], 0, HP_CURRENT);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], 0, HP_CURRENT);
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnHealthbarDone;
+    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void RecordedPlayerHandleExpUpdate(void)
@@ -1535,24 +1535,24 @@ static void RecordedPlayerHandleExpUpdate(void)
 
 static void RecordedPlayerHandleStatusIconUpdate(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_STATUS_ICON);
-        bank = gActiveBank;
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
 static void RecordedPlayerHandleStatusAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
-                        gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
+        InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
+                        gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1609,7 +1609,7 @@ static void RecordedPlayerHandleCmd37(void)
 
 static void RecordedPlayerHandleCmd38(void)
 {
-    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBank][1];
+    gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1];
     RecordedPlayerBufferExecCompleted();
 }
 
@@ -1627,16 +1627,16 @@ static void RecordedPlayerHandleCmd40(void)
 
 static void RecordedPlayerHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         RecordedPlayerBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        DoHitAnimHealthboxEffect(gActiveBank);
-        gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        DoHitAnimHealthboxEffect(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1649,25 +1649,25 @@ static void RecordedPlayerHandlePlaySE(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         pan = PAN_SIDE_PLAYER;
     else
         pan = PAN_SIDE_OPPONENT;
 
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     RecordedPlayerBufferExecCompleted();
 }
 
 static void RecordedPlayerHandlePlayFanfareOrBGM(void)
 {
-    if (gBattleBufferA[gActiveBank][3])
+    if (gBattleBufferA[gActiveBattler][3])
     {
         BattleStopLowHpSound();
-        PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
     else
     {
-        PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
 
     RecordedPlayerBufferExecCompleted();
@@ -1675,7 +1675,7 @@ static void RecordedPlayerHandlePlayFanfareOrBGM(void)
 
 static void RecordedPlayerHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, -25, 5);
     RecordedPlayerBufferExecCompleted();
@@ -1683,7 +1683,7 @@ static void RecordedPlayerHandleFaintingCry(void)
 
 static void RecordedPlayerHandleIntroSlide(void)
 {
-    HandleIntroSlide(gBattleBufferA[gActiveBank][1]);
+    HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
     gUnknown_020243FC |= 1;
     RecordedPlayerBufferExecCompleted();
 }
@@ -1694,35 +1694,35 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void)
     u8 taskId;
     u32 trainerPicId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_805CC00);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_805CC00);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F9);
     if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBank)].gender;
+        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender;
     else
         trainerPicId = gSaveBlock2Ptr->playerGender;
 
     LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, 0x100 + paletteNum * 16, 32);
 
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = paletteNum;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(sub_818CC24, 5);
-    gTasks[taskId].data[0] = gActiveBank;
+    gTasks[taskId].data[0] = gActiveBattler;
 
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_120;
+    gBattlerFuncs[gActiveBattler] = nullsub_120;
 }
 
 static void sub_818CC24(u8 taskId)
@@ -1733,62 +1733,62 @@ static void sub_818CC24(u8 taskId)
     }
     else
     {
-        u8 savedActiveBank = gActiveBank;
+        u8 savedActiveBank = gActiveBattler;
 
-        gActiveBank = gTasks[taskId].data[0];
+        gActiveBattler = gTasks[taskId].data[0];
         if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_818BA6C(gActiveBank, FALSE);
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            sub_818BA6C(gActiveBattler, FALSE);
         }
         else
         {
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            sub_818BA6C(gActiveBank, FALSE);
-            gActiveBank ^= BIT_MON;
-            gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
-            sub_818BA6C(gActiveBank, FALSE);
-            gActiveBank ^= BIT_MON;
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            sub_818BA6C(gActiveBattler, FALSE);
+            gActiveBattler ^= BIT_FLANK;
+            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            sub_818BA6C(gActiveBattler, FALSE);
+            gActiveBattler ^= BIT_FLANK;
         }
-        gBattleBankFunc[gActiveBank] = sub_8189D40;
-        gActiveBank = savedActiveBank;
+        gBattlerFuncs[gActiveBattler] = sub_8189D40;
+        gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
 }
 
 static void RecordedPlayerHandleDrawPartyStatusSummary(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
     {
         RecordedPlayerBufferExecCompleted();
     }
     else
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1 = 1;
-        gUnknown_020244B4[gActiveBank] = CreatePartyStatusSummarySprites(gActiveBank, (struct HpAndStatus *)&gBattleBufferA[gActiveBank][4], gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][2]);
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
+        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
-        if (gBattleBufferA[gActiveBank][2] != 0)
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0x5D;
+        if (gBattleBufferA[gActiveBattler][2] != 0)
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattleBankFunc[gActiveBank] = sub_818CDF4;
+        gBattlerFuncs[gActiveBattler] = sub_818CDF4;
     }
 }
 
 static void sub_818CDF4(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5++ > 0x5C)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5++ > 0x5C)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_5 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
         RecordedPlayerBufferExecCompleted();
     }
 }
 
 static void RecordedPlayerHandleCmd49(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
     RecordedPlayerBufferExecCompleted();
 }
 
@@ -1799,25 +1799,25 @@ static void RecordedPlayerHandleCmd50(void)
 
 static void RecordedPlayerHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBank))
+    if (IsBankSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
-        CopyBattleSpriteInvisibility(gActiveBank);
+        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        CopyBattleSpriteInvisibility(gActiveBattler);
     }
     RecordedPlayerBufferExecCompleted();
 }
 
 static void RecordedPlayerHandleBattleAnimation(void)
 {
-    if (!mplay_80342A4(gActiveBank))
+    if (!mplay_80342A4(gActiveBattler))
     {
-        u8 animationId = gBattleBufferA[gActiveBank][1];
-        u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+        u8 animationId = gBattleBufferA[gActiveBattler][1];
+        u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-        if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+        if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             RecordedPlayerBufferExecCompleted();
         else
-            gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
+            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
     }
 }
 
@@ -1833,11 +1833,11 @@ static void RecordedPlayerHandleResetActionMoveSelection(void)
 
 static void RecordedPlayerHandleCmd55(void)
 {
-    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     RecordedPlayerBufferExecCompleted();
-    gBattleBankFunc[gActiveBank] = sub_80587B0;
+    gBattlerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_121(void)
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index a605e4cb8..9e90d660c 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -23,20 +23,20 @@
 #include "pokeblock.h"
 
 extern u32 gBattleExecBuffer;
-extern u8 gActiveBank;
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gBattleBanksCount;
+extern u8 gActiveBattler;
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
@@ -180,15 +180,15 @@ static void nullsub_114(void)
 
 void SetControllerToSafari(void)
 {
-    gBattleBankFunc[gActiveBank] = SafariBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = SafariBufferRunCommand;
 }
 
 static void SafariBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sSafariBufferCommands))
-            sSafariBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sSafariBufferCommands))
+            sSafariBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             SafariBufferExecCompleted();
     }
@@ -200,7 +200,7 @@ static void HandleInputChooseAction(void)
     {
         PlaySE(SE_SELECT);
 
-        switch (gActionSelectionCursor[gActiveBank])
+        switch (gActionSelectionCursor[gActiveBattler])
         {
         case 0:
             EmitTwoReturnValues(1, ACTION_SAFARI_ZONE_BALL, 0);
@@ -219,49 +219,49 @@ static void HandleInputChooseAction(void)
     }
     else if (gMain.newKeys & DPAD_LEFT)
     {
-        if (gActionSelectionCursor[gActiveBank] & 1)
+        if (gActionSelectionCursor[gActiveBattler] & 1)
         {
             PlaySE(SE_SELECT);
-            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 1;
-            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 1;
+            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (!(gActionSelectionCursor[gActiveBank] & 1))
+        if (!(gActionSelectionCursor[gActiveBattler] & 1))
         {
             PlaySE(SE_SELECT);
-            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 1;
-            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 1;
+            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_UP)
     {
-        if (gActionSelectionCursor[gActiveBank] & 2)
+        if (gActionSelectionCursor[gActiveBattler] & 2)
         {
             PlaySE(SE_SELECT);
-            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 2;
-            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 2;
+            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
-        if (!(gActionSelectionCursor[gActiveBank] & 2))
+        if (!(gActionSelectionCursor[gActiveBattler] & 2))
         {
             PlaySE(SE_SELECT);
-            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBank]);
-            gActionSelectionCursor[gActiveBank] ^= 2;
-            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+            ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
+            gActionSelectionCursor[gActiveBattler] ^= 2;
+            ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
         }
     }
 }
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         SafariBufferExecCompleted();
 }
 
@@ -273,7 +273,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void CompleteOnHealthboxSpriteCallbackDummy(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
         SafariBufferExecCompleted();
 }
 
@@ -289,7 +289,7 @@ static void sub_81595E4(void)
 
 static void CompleteOnSpecialAnimDone(void)
 {
-    if (!gDoingBattleAnim || !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+    if (!gDoingBattleAnim || !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         SafariBufferExecCompleted();
 }
 
@@ -297,7 +297,7 @@ static void SafariOpenPokeblockCase(void)
 {
     if (!gPaletteFade.active)
     {
-        gBattleBankFunc[gActiveBank] = CompleteWhenChosePokeblock;
+        gBattlerFuncs[gActiveBattler] = CompleteWhenChosePokeblock;
         FreeAllWindowBuffers();
         OpenPokeblockCaseInBattle();
     }
@@ -314,29 +314,29 @@ static void CompleteWhenChosePokeblock(void)
 
 static void CompleteOnFinishedBattleAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animFromTableActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
         SafariBufferExecCompleted();
 }
 
 static void SafariBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = SafariBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = SafariBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
+        gBattleBufferA[gActiveBattler][0] = CONTROLLER_TERMINATOR_NOP;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
 static void CompleteOnFinishedStatusAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
         SafariBufferExecCompleted();
 }
 
@@ -377,18 +377,18 @@ static void SafariHandleReturnMonToBall(void)
 
 static void SafariHandleDrawTrainerPic(void)
 {
-    DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, gActiveBank);
-    sub_806A12C(gSaveBlock2Ptr->playerGender, GetBankPosition(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(
+    DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, gActiveBattler);
+    sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_0202499C,
       80,
       (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80,
       30);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void SafariHandleTrainerSlide(void)
@@ -415,18 +415,18 @@ static void SafariHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
-    gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
+    InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
+    gBattlerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
 }
 
 static void SafariHandleBallThrowAnim(void)
 {
-    u8 ballThrowCaseId = gBattleBufferA[gActiveBank][1];
+    u8 ballThrowCaseId = gBattleBufferA[gActiveBattler][1];
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
-    gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
+    InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
+    gBattlerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
 }
 
 static void SafariHandlePause(void)
@@ -445,15 +445,15 @@ static void SafariHandlePrintString(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    stringId = (u16*)(&gBattleBufferA[gActiveBank][2]);
+    stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
+    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
 }
 
 static void SafariHandlePrintSelectionString(void)
 {
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         SafariHandlePrintString();
     else
         SafariBufferExecCompleted();
@@ -465,7 +465,7 @@ static void HandleChooseActionAfterDma3(void)
     {
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 160;
-        gBattleBankFunc[gActiveBank] = HandleInputChooseAction;
+        gBattlerFuncs[gActiveBattler] = HandleInputChooseAction;
     }
 }
 
@@ -473,13 +473,13 @@ static void SafariHandleChooseAction(void)
 {
     s32 i;
 
-    gBattleBankFunc[gActiveBank] = HandleChooseActionAfterDma3;
+    gBattlerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
     BattleHandleAddTextPrinter(gText_SafariZoneMenu, 2);
 
     for (i = 0; i < 4; i++)
         ActionSelectionDestroyCursorAt(i);
 
-    ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+    ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
     BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo2);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 1);
 }
@@ -499,8 +499,8 @@ static void SafariHandleChooseItem(void)
     s32 i;
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-    gBattleBankFunc[gActiveBank] = SafariOpenPokeblockCase;
-    gBankInMenu = gActiveBank;
+    gBattlerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
+    gBankInMenu = gActiveBattler;
 }
 
 static void SafariHandleChoosePokemon(void)
@@ -525,7 +525,7 @@ static void SafariHandleExpUpdate(void)
 
 static void SafariHandleStatusIconUpdate(void)
 {
-    UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_SAFARI_BALLS_TEXT);
+    UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_SAFARI_BALLS_TEXT);
     SafariBufferExecCompleted();
 }
 
@@ -613,25 +613,25 @@ static void SafariHandlePlaySE(void)
 {
     s8 pan;
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         pan = PAN_SIDE_PLAYER;
     else
         pan = PAN_SIDE_OPPONENT;
 
-    PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan);
+    PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
     SafariBufferExecCompleted();
 }
 
 static void SafariHandlePlayFanfareOrBGM(void)
 {
-    if (gBattleBufferA[gActiveBank][3])
+    if (gBattleBufferA[gActiveBattler][3])
     {
         BattleStopLowHpSound();
-        PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
     else
     {
-        PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
 
     SafariBufferExecCompleted();
@@ -639,7 +639,7 @@ static void SafariHandlePlayFanfareOrBGM(void)
 
 static void SafariHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry1(species, 25);
     SafariBufferExecCompleted();
@@ -647,17 +647,17 @@ static void SafariHandleFaintingCry(void)
 
 static void SafariHandleIntroSlide(void)
 {
-    HandleIntroSlide(gBattleBufferA[gActiveBank][1]);
+    HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
     gUnknown_020243FC |= 1;
     SafariBufferExecCompleted();
 }
 
 static void SafariHandleIntroTrainerBallThrow(void)
 {
-    UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_SAFARI_ALL_TEXT);
-    sub_8076918(gActiveBank);
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
-    gBattleBankFunc[gActiveBank] = CompleteOnHealthboxSpriteCallbackDummy;
+    UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_SAFARI_ALL_TEXT);
+    sub_8076918(gActiveBattler);
+    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+    gBattlerFuncs[gActiveBattler] = CompleteOnHealthboxSpriteCallbackDummy;
 }
 
 static void SafariHandleDrawPartyStatusSummary(void)
@@ -682,13 +682,13 @@ static void SafariHandleSpriteInvisibility(void)
 
 static void SafariHandleBattleAnimation(void)
 {
-    u8 animationId = gBattleBufferA[gActiveBank][1];
-    u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    u8 animationId = gBattleBufferA[gActiveBattler][1];
+    u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-    if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+    if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
         SafariBufferExecCompleted();
     else
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
 }
 
 static void SafariHandleLinkStandbyMsg(void)
@@ -703,12 +703,12 @@ static void SafariHandleResetActionMoveSelection(void)
 
 static void SafariHandleCmd55(void)
 {
-    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     SafariBufferExecCompleted();
     if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_WILD))
-        gBattleBankFunc[gActiveBank] = sub_81595E4;
+        gBattlerFuncs[gActiveBattler] = sub_81595E4;
 }
 
 static void nullsub_115(void)
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 11fb0074f..d12a0a907 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -29,26 +29,26 @@
 #include "party_menu.h"
 
 extern u32 gBattleExecBuffer;
-extern u8 gActiveBank;
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gAbsentBankFlags;
-extern u8 gBattleBanksCount;
+extern u8 gActiveBattler;
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gAbsentBattlerFlags;
+extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u8 gMultiUsePlayerCursor;
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u16 gPartnerTrainerId;
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gSpecialVar_ItemId;
-extern u8 gUnknown_03005D7C[BATTLE_BANKS_COUNT];
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u8 gNumberOfMovesToChoose;
 extern u16 gBattle_BG0_X;
@@ -56,7 +56,7 @@ extern u16 gBattle_BG0_Y;
 extern s32 gUnknown_0203CD70;
 extern u8 gBankInMenu;
 extern u32 gBattlePalaceMoveSelectionRngValue;
-extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
+extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_020244B4[];
 extern u16 gUnknown_020243FC;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
@@ -204,7 +204,7 @@ static void nullsub_117(void)
 
 void SetControllerToWally(void)
 {
-    gBattleBankFunc[gActiveBank] = WallyBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = WallyBufferRunCommand;
     gBattleStruct->wallyBattleState = 0;
     gBattleStruct->wallyMovesState = 0;
     gBattleStruct->wallyWaitFrames = 0;
@@ -213,10 +213,10 @@ void SetControllerToWally(void)
 
 static void WallyBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBank])
+    if (gBattleExecBuffer & gBitTable[gActiveBattler])
     {
-        if (gBattleBufferA[gActiveBank][0] < ARRAY_COUNT(sWallyBufferCommands))
-            sWallyBufferCommands[gBattleBufferA[gActiveBank][0]]();
+        if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sWallyBufferCommands))
+            sWallyBufferCommands[gBattleBufferA[gActiveBattler][0]]();
         else
             WallyBufferExecCompleted();
     }
@@ -284,7 +284,7 @@ static void WallyHandleActions(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         WallyBufferExecCompleted();
 }
 
@@ -304,7 +304,7 @@ static void OpenBagAfterPaletteFade(void)
 {
     if (!gPaletteFade.active)
     {
-        gBattleBankFunc[gActiveBank] = CompleteOnChosenItem;
+        gBattlerFuncs[gActiveBattler] = CompleteOnChosenItem;
         nullsub_35();
         FreeAllWindowBuffers();
         DoWallyTutorialBagMenu();
@@ -322,30 +322,30 @@ static void CompleteOnChosenItem(void)
 
 static void sub_816864C(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive)
-        sub_8172EF0(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]);
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive)
-        sub_8172EF0(gActiveBank ^ BIT_MON, &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]]);
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
+        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].ballAnimActive
-        && gSprites[gUnknown_03005D7C[gActiveBank]].callback == SpriteCallbackDummy
-        && gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive
+        && gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
+        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank ^ BIT_MON]]);
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank ^ BIT_MON], &gPlayerParty[gBattlePartyID[gActiveBank ^ BIT_MON]], HEALTHBOX_ALL);
-            sub_8076918(gActiveBank ^ BIT_MON);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank ^ BIT_MON]);
+            DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
+            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+            sub_8076918(gActiveBattler ^ BIT_FLANK);
+            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
         }
-        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBank]]);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
-        sub_8076918(gActiveBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+        DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
+        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        sub_8076918(gActiveBattler);
+        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
-        gBattleBankFunc[gActiveBank] = sub_8168818;
+        gBattlerFuncs[gActiveBattler] = sub_8168818;
     }
 
 }
@@ -354,23 +354,23 @@ static void sub_8168818(void)
 {
     bool32 r4 = FALSE;
 
-    if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
         r4 = TRUE;
 
-    if (r4 && gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1
-        && gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1)
+    if (r4 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
+        && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
 
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].flag_x80 = 0;
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank ^ BIT_MON].field_1_x1 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0;
 
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 
         WallyBufferExecCompleted();
     }
@@ -378,24 +378,24 @@ static void sub_8168818(void)
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBank, gHealthBoxesIds[gActiveBank], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBank]);
+    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
         WallyBufferExecCompleted();
     }
 }
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBank];
+    u8 spriteId = gBankSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -414,46 +414,46 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_8168A20(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         WallyBufferExecCompleted();
     }
 }
 
 static void CompleteOnBankSpriteCallbackDummy2(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].callback == SpriteCallbackDummy)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         WallyBufferExecCompleted();
 }
 
 static void CompleteOnFinishedBattleAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animFromTableActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animFromTableActive)
         WallyBufferExecCompleted();
 }
 
 static void WallyBufferExecCompleted(void)
 {
-    gBattleBankFunc[gActiveBank] = WallyBufferRunCommand;
+    gBattlerFuncs[gActiveBattler] = WallyBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
 
         PrepareBufferDataTransferLink(2, 4, &playerId);
-        gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
+        gBattleBufferA[gActiveBattler][0] = CONTROLLER_TERMINATOR_NOP;
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBank];
+        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
     }
 }
 
 static void CompleteOnFinishedStatusAnimation(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive)
         WallyBufferExecCompleted();
 }
 
@@ -464,13 +464,13 @@ static void WallyHandleGetMonData(void)
     u8 monToCheck;
     s32 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyWallyMonData(gBattlePartyID[gActiveBank], monData);
+        size += CopyWallyMonData(gBattlePartyID[gActiveBattler], monData);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -492,7 +492,7 @@ static u32 CopyWallyMonData(u8 monId, u8 *dst)
     u32 data32;
     s32 size = 0;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         battleMon.species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
@@ -558,7 +558,7 @@ static u32 CopyWallyMonData(u8 monId, u8 *dst)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        data16 = GetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE);
+        data16 = GetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE);
         dst[0] = data16;
         dst[1] = data16 >> 8;
         size = 2;
@@ -573,7 +573,7 @@ static u32 CopyWallyMonData(u8 monId, u8 *dst)
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE);
+        dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE);
         size = 1;
         break;
     case REQUEST_OTID_BATTLE:
@@ -798,13 +798,13 @@ static void WallyHandleSetMonData(void)
     u8 monToCheck;
     u8 i;
 
-    if (gBattleBufferA[gActiveBank][2] == 0)
+    if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetWallyMonData(gBattlePartyID[gActiveBank]);
+        SetWallyMonData(gBattlePartyID[gActiveBattler]);
     }
     else
     {
-        monToCheck = gBattleBufferA[gActiveBank][2];
+        monToCheck = gBattleBufferA[gActiveBattler][2];
         for (i = 0; i < 6; i++)
         {
             if (monToCheck & 1)
@@ -817,11 +817,11 @@ static void WallyHandleSetMonData(void)
 
 static void SetWallyMonData(u8 monId)
 {
-    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
+    struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBattler][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBattler][3];
     s32 i;
 
-    switch (gBattleBufferA[gActiveBank][1])
+    switch (gBattleBufferA[gActiveBattler][1])
     {
     case REQUEST_ALL_BATTLE:
         {
@@ -862,10 +862,10 @@ static void SetWallyMonData(u8 monId)
         }
         break;
     case REQUEST_SPECIES_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HELDITEM_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MOVES_PP_BATTLE:
         for (i = 0; i < 4; i++)
@@ -879,158 +879,158 @@ static void SetWallyMonData(u8 monId)
     case REQUEST_MOVE2_BATTLE:
     case REQUEST_MOVE3_BATTLE:
     case REQUEST_MOVE4_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MOVE1 + gBattleBufferA[gActiveBattler][1] - REQUEST_MOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PP_DATA_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP1, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP2, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP3, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP4, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBattler][7]);
         break;
     case REQUEST_PPMOVE1_BATTLE:
     case REQUEST_PPMOVE2_BATTLE:
     case REQUEST_PPMOVE3_BATTLE:
     case REQUEST_PPMOVE4_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PP1 + gBattleBufferA[gActiveBattler][1] - REQUEST_PPMOVE1_BATTLE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_OTID_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_OT_ID, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_EXP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_EV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_FRIENDSHIP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKERUS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_POKERUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LOCATION_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_LEVEL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MET_GAME_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_POKEBALL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ALL_IVS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][4]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][5]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][6]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][7]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][8]);
         break;
     case REQUEST_HP_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_IV_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_PERSONALITY_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CHECKSUM_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_STATUS_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_STATUS, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_LEVEL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_LEVEL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_HP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_MAX_HP_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_ATK_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_DEF_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPEED_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPATK_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SPDEF_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_COOL, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SMART, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SHEEN_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SHEEN, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_COOL_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_BEAUTY_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_CUTE_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_SMART_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     case REQUEST_TOUGH_RIBBON_BATTLE:
-        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[monId], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBattler][3]);
         break;
     }
 
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 }
 
 static void WallyHandleSetRawMonData(void)
@@ -1050,48 +1050,48 @@ static void WallyHandleSwitchInAnim(void)
 
 static void WallyHandleReturnMonToBall(void)
 {
-    if (gBattleBufferA[gActiveBank][1] == 0)
+    if (gBattleBufferA[gActiveBattler][1] == 0)
     {
-        InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
-        gBattleBankFunc[gActiveBank] = sub_8168A20;
+        InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_PLAYER_MON);
+        gBattlerFuncs[gActiveBattler] = sub_8168A20;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
+        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
         WallyBufferExecCompleted();
     }
 }
 
 static void WallyHandleDrawTrainerPic(void)
 {
-    DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBank);
-    sub_806A12C(BACK_PIC_WALLY, GetBankPosition(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
+    DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBattler);
+    sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
                                                80,
                                                80 + 4 * (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords),
                                                30);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void WallyHandleTrainerSlide(void)
 {
-    DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBank);
-    sub_806A12C(BACK_PIC_WALLY, GetBankPosition(gActiveBank));
-    gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
+    DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBattler);
+    sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler));
+    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
                                                80,
                                                80 + 4 * (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords),
                                                30);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = gActiveBank;
-    gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -96;
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_805D7AC;
-    gBattleBankFunc[gActiveBank] = CompleteOnBankSpriteCallbackDummy2;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -96;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
 }
 
 static void WallyHandleTrainerSlideBack(void)
@@ -1113,18 +1113,18 @@ static void WallyHandleSuccessBallThrowAnim(void)
 {
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
-    gBattleBankFunc[gActiveBank] = CompleteOnFinishedAnimation;
+    InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
+    gBattlerFuncs[gActiveBattler] = CompleteOnFinishedAnimation;
 }
 
 static void WallyHandleBallThrowAnim(void)
 {
-    u8 ballThrowCaseId = gBattleBufferA[gActiveBank][1];
+    u8 ballThrowCaseId = gBattleBufferA[gActiveBattler][1];
 
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
-    InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
-    gBattleBankFunc[gActiveBank] = CompleteOnFinishedAnimation;
+    InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
+    gBattlerFuncs[gActiveBattler] = CompleteOnFinishedAnimation;
 }
 
 static void WallyHandlePause(void)
@@ -1134,46 +1134,46 @@ static void WallyHandlePause(void)
 
 static void WallyHandleMoveAnimation(void)
 {
-    u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
+    u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
 
-    gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
-    gAnimMovePower = gBattleBufferA[gActiveBank][4] | (gBattleBufferA[gActiveBank][5] << 8);
-    gAnimMoveDmg = gBattleBufferA[gActiveBank][6] | (gBattleBufferA[gActiveBank][7] << 8) | (gBattleBufferA[gActiveBank][8] << 16) | (gBattleBufferA[gActiveBank][9] << 24);
-    gAnimFriendship = gBattleBufferA[gActiveBank][10];
-    gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] | (gBattleBufferA[gActiveBank][13] << 8);
-    gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
-    gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
+    gAnimMoveTurn = gBattleBufferA[gActiveBattler][3];
+    gAnimMovePower = gBattleBufferA[gActiveBattler][4] | (gBattleBufferA[gActiveBattler][5] << 8);
+    gAnimMoveDmg = gBattleBufferA[gActiveBattler][6] | (gBattleBufferA[gActiveBattler][7] << 8) | (gBattleBufferA[gActiveBattler][8] << 16) | (gBattleBufferA[gActiveBattler][9] << 24);
+    gAnimFriendship = gBattleBufferA[gActiveBattler][10];
+    gWeatherMoveAnim = gBattleBufferA[gActiveBattler][12] | (gBattleBufferA[gActiveBattler][13] << 8);
+    gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBattler][16];
+    gTransformedPersonalities[gActiveBattler] = gAnimDisableStructPtr->transformedMonPersonality;
     if (IsMoveWithoutAnimation(move, gAnimMoveTurn)) // always returns FALSE
     {
         WallyBufferExecCompleted();
     }
     else
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
-        gBattleBankFunc[gActiveBank] = WallyDoMoveAnimation;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
+        gBattlerFuncs[gActiveBattler] = WallyDoMoveAnimation;
     }
 
 }
 
 static void WallyDoMoveAnimation(void)
 {
-    u16 move = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8);
+    u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
 
-    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState)
+    switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
+        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
         {
-            InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
+            InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
         break;
     case 1:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             sub_805EB9C(0);
             DoMoveAnim(move);
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 2;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 2;
         }
         break;
     case 2:
@@ -1181,19 +1181,19 @@ static void WallyDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
+            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
             {
-                InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
+                InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
             }
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
         break;
     case 3:
-        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
+        if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             CopyAllBattleSpritesInvisibilities();
-            TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
+            TrySetBehindSubstituteSpriteBit(gActiveBattler, gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             WallyBufferExecCompleted();
         }
         break;
@@ -1206,15 +1206,15 @@ static void WallyHandlePrintString(void)
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    stringId = (u16*)(&gBattleBufferA[gActiveBank][2]);
+    stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
+    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
 }
 
 static void WallyHandlePrintSelectionString(void)
 {
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         WallyHandlePrintString();
     else
         WallyBufferExecCompleted();
@@ -1226,7 +1226,7 @@ static void HandleChooseActionAfterDma3(void)
     {
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 160;
-        gBattleBankFunc[gActiveBank] = WallyHandleActions;
+        gBattlerFuncs[gActiveBattler] = WallyHandleActions;
     }
 }
 
@@ -1234,13 +1234,13 @@ static void WallyHandleChooseAction(void)
 {
     s32 i;
 
-    gBattleBankFunc[gActiveBank] = HandleChooseActionAfterDma3;
+    gBattlerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
     BattleHandleAddTextPrinter(gText_BattleMenu, 2);
 
     for (i = 0; i < 4; i++)
         ActionSelectionDestroyCursorAt(i);
 
-    ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBank], 0);
+    ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
     BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillWallyDo);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 1);
 }
@@ -1281,8 +1281,8 @@ static void WallyHandleChooseMove(void)
 static void WallyHandleChooseItem(void)
 {
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-    gBattleBankFunc[gActiveBank] = OpenBagAfterPaletteFade;
-    gBankInMenu = gActiveBank;
+    gBattlerFuncs[gActiveBattler] = OpenBagAfterPaletteFade;
+    gBankInMenu = gActiveBattler;
 }
 
 static void WallyHandleChoosePokemon(void)
@@ -1300,24 +1300,24 @@ static void WallyHandleHealthBarUpdate(void)
     s16 hpVal;
 
     LoadBattleBarGfx(0);
-    hpVal = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    hpVal = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBank, gHealthBoxesIds[gActiveBank], maxHP, 0, hpVal);
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBank], 0, HP_CURRENT);
+        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
+        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], 0, HP_CURRENT);
     }
 
-    gBattleBankFunc[gActiveBank] = CompleteOnHealthbarDone;
+    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void WallyHandleExpUpdate(void)
@@ -1402,16 +1402,16 @@ static void WallyHandleCmd40(void)
 
 static void WallyHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBank]].invisible == TRUE)
+    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         WallyBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBank]].data[1] = 0;
-        DoHitAnimHealthboxEffect(gActiveBank);
-        gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;
+        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        DoHitAnimHealthboxEffect(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1422,20 +1422,20 @@ static void WallyHandleCmd42(void)
 
 static void WallyHandlePlaySE(void)
 {
-    PlaySE(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+    PlaySE(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     WallyBufferExecCompleted();
 }
 
 static void WallyHandlePlayFanfareOrBGM(void)
 {
-    if (gBattleBufferA[gActiveBank][3])
+    if (gBattleBufferA[gActiveBattler][3])
     {
         BattleStopLowHpSound();
-        PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayBGM(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
     else
     {
-        PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
+        PlayFanfare(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8));
     }
 
     WallyBufferExecCompleted();
@@ -1443,7 +1443,7 @@ static void WallyHandlePlayFanfareOrBGM(void)
 
 static void WallyHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry1(species, 25);
     WallyBufferExecCompleted();
@@ -1451,7 +1451,7 @@ static void WallyHandleFaintingCry(void)
 
 static void WallyHandleIntroSlide(void)
 {
-    HandleIntroSlide(gBattleBufferA[gActiveBank][1]);
+    HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
     gUnknown_020243FC |= 1;
     WallyBufferExecCompleted();
 }
@@ -1461,29 +1461,29 @@ static void WallyHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBank]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBank]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBank]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBank]].data[4] = gSprites[gBankSpriteIds[gActiveBank]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBank]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBank]].data[5] = gActiveBank;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBank]], sub_805CC00);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 1);
+    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_805CC00);
+    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F8);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[BACK_PIC_WALLY].data, 0x100 + paletteNum * 16, 32);
-    gSprites[gBankSpriteIds[gActiveBank]].oam.paletteNum = paletteNum;
+    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(sub_816AC04, 5);
-    gTasks[taskId].data[0] = gActiveBank;
+    gTasks[taskId].data[0] = gActiveBattler;
 
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBank]].func = sub_8073C30;
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
+        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattleBankFunc[gActiveBank] = nullsub_21;
+    gBattlerFuncs[gActiveBattler] = nullsub_21;
 }
 
 static void sub_816AA80(u8 bank)
@@ -1494,7 +1494,7 @@ static void sub_816AA80(u8 bank)
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    sub_806A068(species, GetBankPosition(bank));
+    sub_806A068(species, GetBattlerPosition(bank));
     gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
                                         GetBankCoord(bank, 2),
                                         GetBankSpriteDefault_Y(bank),
@@ -1521,27 +1521,27 @@ static void sub_816AC04(u8 taskId)
     }
     else
     {
-        u8 savedActiveBank = gActiveBank;
+        u8 savedActiveBank = gActiveBattler;
 
-        gActiveBank = gTasks[taskId].data[0];
-        gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank];
-        sub_816AA80(gActiveBank);
-        gBattleBankFunc[gActiveBank] = sub_816864C;
-        gActiveBank = savedActiveBank;
+        gActiveBattler = gTasks[taskId].data[0];
+        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        sub_816AA80(gActiveBattler);
+        gBattlerFuncs[gActiveBattler] = sub_816864C;
+        gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
 }
 
 static void WallyHandleDrawPartyStatusSummary(void)
 {
-    if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
     {
         WallyBufferExecCompleted();
     }
     else
     {
-        gBattleSpritesDataPtr->healthBoxesData[gActiveBank].flag_x1 = 1;
-        gUnknown_020244B4[gActiveBank] = CreatePartyStatusSummarySprites(gActiveBank, (struct HpAndStatus *)&gBattleBufferA[gActiveBank][4], gBattleBufferA[gActiveBank][1], gBattleBufferA[gActiveBank][2]);
+        gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
+        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         WallyBufferExecCompleted();
     }
 }
@@ -1563,13 +1563,13 @@ static void WallyHandleSpriteInvisibility(void)
 
 static void WallyHandleBattleAnimation(void)
 {
-    u8 animationId = gBattleBufferA[gActiveBank][1];
-    u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
+    u8 animationId = gBattleBufferA[gActiveBattler][1];
+    u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
 
-    if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
+    if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
         WallyBufferExecCompleted();
     else
-        gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;
+        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
 }
 
 static void WallyHandleLinkStandbyMsg(void)
@@ -1584,13 +1584,13 @@ static void WallyHandleResetActionMoveSelection(void)
 
 static void WallyHandleCmd55(void)
 {
-    gBattleOutcome = gBattleBufferA[gActiveBank][1];
+    gBattleOutcome = gBattleBufferA[gActiveBattler][1];
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     WallyBufferExecCompleted();
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_WILD) && gBattleTypeFlags & BATTLE_TYPE_LINK)
-        gBattleBankFunc[gActiveBank] = sub_80587B0;
+        gBattlerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_118(void)
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 499d816be..aafc106aa 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -15,28 +15,28 @@
 extern u32 gBattleTypeFlags;
 extern u32 gBattleExecBuffer;
 extern void (*gBattleMainFunc)(void);
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
-extern u8 gBankPositions[BATTLE_BANKS_COUNT];
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gBattleBanksCount;
-extern u8 gActiveBank;
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gBattlersCount;
+extern u8 gActiveBattler;
 extern u8 gUnknown_0202428C;
 extern u32 gUnknown_02022FF4;
 extern u8 gUnknown_0203C7B4;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBuffersTransferData[0x100];
 extern u8 gUnknown_02022D08;
 extern u8 gUnknown_02022D09;
 extern u8 gUnknown_02022D0A;
-extern u8 gBankAttacker;
-extern u8 gBankDefender;
-extern u8 gAbsentBankFlags;
+extern u8 gBattleAttacker;
+extern u8 gBattleDefender;
+extern u8 gAbsentBattlerFlags;
 extern u8 gEffectBank;
 extern u16 gBattleWeather;
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern u16 gCurrentMove;
 extern u16 gChosenMove;
 extern u16 gLastUsedItem;
@@ -76,10 +76,10 @@ void SetUpBattleVarsAndBirchZigzagoon(void)
 
     gBattleMainFunc = nullsub_20;
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
-        gBattleBankFunc[i] = nullsub_21;
-        gBankPositions[i] = 0xFF;
+        gBattlerFuncs[i] = nullsub_21;
+        gBattlerPositions[i] = 0xFF;
         gActionSelectionCursor[i] = 0;
         gMoveSelectionCursor[i] = 0;
     }
@@ -124,7 +124,7 @@ void sub_8032768(void)
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        for (i = 0; i < gBattleBanksCount; i++)
+        for (i = 0; i < gBattlersCount; i++)
             sub_81B8D64(i, 0);
     }
 
@@ -145,34 +145,34 @@ static void SetControllersVariables(void)
 
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         {
-            gBattleBankFunc[0] = SetControllerToRecordedPlayer;
-            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+            gBattlerFuncs[0] = SetControllerToRecordedPlayer;
+            gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattleBankFunc[1] = SetControllerToOpponent;
-            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+            gBattlerFuncs[1] = SetControllerToOpponent;
+            gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattleBankFunc[2] = SetControllerToPlayerPartner;
-            gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
+            gBattlerFuncs[2] = SetControllerToPlayerPartner;
+            gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-            gBattleBankFunc[3] = SetControllerToOpponent;
-            gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
+            gBattlerFuncs[3] = SetControllerToOpponent;
+            gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
         }
         else
         {
-            gBattleBankFunc[0] = SetControllerToPlayer;
-            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+            gBattlerFuncs[0] = SetControllerToPlayer;
+            gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattleBankFunc[1] = SetControllerToOpponent;
-            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+            gBattlerFuncs[1] = SetControllerToOpponent;
+            gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattleBankFunc[2] = SetControllerToPlayerPartner;
-            gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
+            gBattlerFuncs[2] = SetControllerToPlayerPartner;
+            gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-            gBattleBankFunc[3] = SetControllerToOpponent;
-            gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
+            gBattlerFuncs[3] = SetControllerToOpponent;
+            gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
         }
 
-        gBattleBanksCount = 4;
+        gBattlersCount = 4;
 
         sub_81B8D64(0, 0);
         sub_81B8D64(1, 0);
@@ -189,18 +189,18 @@ static void SetControllersVariables(void)
         gBattleMainFunc = BeginBattleIntro;
 
         if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-            gBattleBankFunc[0] = SetControllerToSafari;
+            gBattlerFuncs[0] = SetControllerToSafari;
         else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL)
-            gBattleBankFunc[0] = SetControllerToWally;
+            gBattlerFuncs[0] = SetControllerToWally;
         else
-            gBattleBankFunc[0] = SetControllerToPlayer;
+            gBattlerFuncs[0] = SetControllerToPlayer;
 
-        gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+        gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-        gBattleBankFunc[1] = SetControllerToOpponent;
-        gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+        gBattlerFuncs[1] = SetControllerToOpponent;
+        gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-        gBattleBanksCount = 2;
+        gBattlersCount = 2;
 
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         {
@@ -210,32 +210,32 @@ static void SetControllersVariables(void)
                 {
                     gBattleMainFunc = BeginBattleIntro;
 
-                    gBattleBankFunc[0] = SetControllerToRecordedPlayer;
-                    gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+                    gBattlerFuncs[0] = SetControllerToRecordedPlayer;
+                    gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-                    gBattleBankFunc[1] = SetControllerToRecordedOpponent;
-                    gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+                    gBattlerFuncs[1] = SetControllerToRecordedOpponent;
+                    gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-                    gBattleBanksCount = 2;
+                    gBattlersCount = 2;
                 }
                 else // see how the banks are switched
                 {
-                    gBattleBankFunc[1] = SetControllerToRecordedPlayer;
-                    gBankPositions[1] = B_POSITION_PLAYER_LEFT;
+                    gBattlerFuncs[1] = SetControllerToRecordedPlayer;
+                    gBattlerPositions[1] = B_POSITION_PLAYER_LEFT;
 
-                    gBattleBankFunc[0] = SetControllerToRecordedOpponent;
-                    gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
+                    gBattlerFuncs[0] = SetControllerToRecordedOpponent;
+                    gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT;
 
-                    gBattleBanksCount = 2;
+                    gBattlersCount = 2;
                 }
             }
             else
             {
-                gBattleBankFunc[0] = SetControllerToRecordedPlayer;
-                gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+                gBattlerFuncs[0] = SetControllerToRecordedPlayer;
+                gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-                gBattleBankFunc[1] = SetControllerToOpponent;
-                gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+                gBattlerFuncs[1] = SetControllerToOpponent;
+                gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
             }
         }
     }
@@ -243,19 +243,19 @@ static void SetControllersVariables(void)
     {
         gBattleMainFunc = BeginBattleIntro;
 
-        gBattleBankFunc[0] = SetControllerToPlayer;
-        gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+        gBattlerFuncs[0] = SetControllerToPlayer;
+        gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-        gBattleBankFunc[1] = SetControllerToOpponent;
-        gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+        gBattlerFuncs[1] = SetControllerToOpponent;
+        gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-        gBattleBankFunc[2] = SetControllerToPlayer;
-        gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
+        gBattlerFuncs[2] = SetControllerToPlayer;
+        gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-        gBattleBankFunc[3] = SetControllerToOpponent;
-        gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
+        gBattlerFuncs[3] = SetControllerToOpponent;
+        gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-        gBattleBanksCount = 4;
+        gBattlersCount = 4;
 
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         {
@@ -263,19 +263,19 @@ static void SetControllersVariables(void)
             {
                 gBattleMainFunc = BeginBattleIntro;
 
-                gBattleBankFunc[0] = SetControllerToRecordedPlayer;
-                gBankPositions[0] = 0;
+                gBattlerFuncs[0] = SetControllerToRecordedPlayer;
+                gBattlerPositions[0] = 0;
 
-                gBattleBankFunc[1] = SetControllerToOpponent;
-                gBankPositions[1] = 1;
+                gBattlerFuncs[1] = SetControllerToOpponent;
+                gBattlerPositions[1] = 1;
 
-                gBattleBankFunc[2] = SetControllerToRecordedPlayer;
-                gBankPositions[2] = 2;
+                gBattlerFuncs[2] = SetControllerToRecordedPlayer;
+                gBattlerPositions[2] = 2;
 
-                gBattleBankFunc[3] = SetControllerToOpponent;
-                gBankPositions[3] = 3;
+                gBattlerFuncs[3] = SetControllerToOpponent;
+                gBattlerPositions[3] = 3;
 
-                gBattleBanksCount = 4;
+                gBattlersCount = 4;
 
                 sub_81B8D64(0, 0);
                 sub_81B8D64(1, 0);
@@ -291,7 +291,7 @@ static void SetControllersVariables(void)
             {
                 u8 var; // multiplayer Id in a recorded battle?
 
-                for (var = gUnknown_0203C7B4, i = 0; i < BATTLE_BANKS_COUNT; i++)
+                for (var = gUnknown_0203C7B4, i = 0; i < MAX_BATTLERS_COUNT; i++)
                 {
                     switch (gLinkPlayers[i].lp_field_18)
                     {
@@ -307,17 +307,17 @@ static void SetControllersVariables(void)
 
                     if (i == var)
                     {
-                        gBattleBankFunc[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer;
+                        gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer;
                         switch (gLinkPlayers[i].lp_field_18)
                         {
                         case 0:
                         case 3:
-                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
+                            gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                             break;
                         case 1:
                         case 2:
-                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
+                            gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                             break;
                         }
@@ -325,34 +325,34 @@ static void SetControllersVariables(void)
                     else if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[var].lp_field_18 & 1))
                             || ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[var].lp_field_18 & 1)))
                     {
-                        gBattleBankFunc[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer;
+                        gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer;
                         switch (gLinkPlayers[i].lp_field_18)
                         {
                         case 0:
                         case 3:
-                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
+                            gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                             break;
                         case 1:
                         case 2:
-                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
+                            gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                             break;
                         }
                     }
                     else
                     {
-                        gBattleBankFunc[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedOpponent;
+                        gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedOpponent;
                         switch (gLinkPlayers[i].lp_field_18)
                         {
                         case 0:
                         case 3:
-                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_LEFT;
+                            gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_LEFT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                             break;
                         case 1:
                         case 2:
-                            gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_RIGHT;
+                            gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_RIGHT;
                             gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                             break;
                         }
@@ -361,52 +361,52 @@ static void SetControllersVariables(void)
             }
             else if (gBattleTypeFlags & BATTLE_TYPE_WILD)
             {
-                gBattleBankFunc[0] = SetControllerToRecordedPlayer;
-                gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+                gBattlerFuncs[0] = SetControllerToRecordedPlayer;
+                gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-                gBattleBankFunc[2] = SetControllerToRecordedPlayer;
-                gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
+                gBattlerFuncs[2] = SetControllerToRecordedPlayer;
+                gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
                 if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
                 {
-                  gBattleBankFunc[1] = SetControllerToRecordedOpponent;
-                  gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+                  gBattlerFuncs[1] = SetControllerToRecordedOpponent;
+                  gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-                  gBattleBankFunc[3] = SetControllerToRecordedOpponent;
-                  gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
+                  gBattlerFuncs[3] = SetControllerToRecordedOpponent;
+                  gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
                 }
                 else
                 {
-                  gBattleBankFunc[1] = SetControllerToOpponent;
-                  gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+                  gBattlerFuncs[1] = SetControllerToOpponent;
+                  gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-                  gBattleBankFunc[3] = SetControllerToOpponent;
-                  gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
+                  gBattlerFuncs[3] = SetControllerToOpponent;
+                  gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
                 }
             }
             else
             {
-                gBattleBankFunc[1] = SetControllerToRecordedPlayer;
-                gBankPositions[1] = B_POSITION_PLAYER_LEFT;
+                gBattlerFuncs[1] = SetControllerToRecordedPlayer;
+                gBattlerPositions[1] = B_POSITION_PLAYER_LEFT;
 
-                gBattleBankFunc[3] = SetControllerToRecordedPlayer;
-                gBankPositions[3] = B_POSITION_PLAYER_RIGHT;
+                gBattlerFuncs[3] = SetControllerToRecordedPlayer;
+                gBattlerPositions[3] = B_POSITION_PLAYER_RIGHT;
 
                 if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
                 {
-                    gBattleBankFunc[0] = SetControllerToRecordedOpponent;
-                    gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
+                    gBattlerFuncs[0] = SetControllerToRecordedOpponent;
+                    gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT;
 
-                    gBattleBankFunc[2] = SetControllerToRecordedOpponent;
-                    gBankPositions[2] = B_POSITION_OPPONENT_RIGHT;
+                    gBattlerFuncs[2] = SetControllerToRecordedOpponent;
+                    gBattlerPositions[2] = B_POSITION_OPPONENT_RIGHT;
                 }
                 else
                 {
-                    gBattleBankFunc[0] = SetControllerToOpponent;
-                    gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
+                    gBattlerFuncs[0] = SetControllerToOpponent;
+                    gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT;
 
-                    gBattleBankFunc[2] = SetControllerToOpponent;
-                    gBankPositions[2] = B_POSITION_OPPONENT_RIGHT;
+                    gBattlerFuncs[2] = SetControllerToOpponent;
+                    gBattlerPositions[2] = B_POSITION_OPPONENT_RIGHT;
                 }
             }
         }
@@ -424,23 +424,23 @@ static void SetControllersVariablesInLinkBattle(void)
         {
             gBattleMainFunc = BeginBattleIntro;
 
-            gBattleBankFunc[0] = SetControllerToPlayer;
-            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+            gBattlerFuncs[0] = SetControllerToPlayer;
+            gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattleBankFunc[1] = SetControllerToLinkOpponent;
-            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+            gBattlerFuncs[1] = SetControllerToLinkOpponent;
+            gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattleBanksCount = 2;
+            gBattlersCount = 2;
         }
         else
         {
-            gBattleBankFunc[1] = SetControllerToPlayer;
-            gBankPositions[1] = B_POSITION_PLAYER_LEFT;
+            gBattlerFuncs[1] = SetControllerToPlayer;
+            gBattlerPositions[1] = B_POSITION_PLAYER_LEFT;
 
-            gBattleBankFunc[0] = SetControllerToLinkOpponent;
-            gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
+            gBattlerFuncs[0] = SetControllerToLinkOpponent;
+            gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT;
 
-            gBattleBanksCount = 2;
+            gBattlersCount = 2;
         }
     }
     else if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -449,35 +449,35 @@ static void SetControllersVariablesInLinkBattle(void)
         {
             gBattleMainFunc = BeginBattleIntro;
 
-            gBattleBankFunc[0] = SetControllerToPlayer;
-            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+            gBattlerFuncs[0] = SetControllerToPlayer;
+            gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattleBankFunc[1] = SetControllerToLinkOpponent;
-            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+            gBattlerFuncs[1] = SetControllerToLinkOpponent;
+            gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattleBankFunc[2] = SetControllerToPlayer;
-            gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
+            gBattlerFuncs[2] = SetControllerToPlayer;
+            gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-            gBattleBankFunc[3] = SetControllerToLinkOpponent;
-            gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
+            gBattlerFuncs[3] = SetControllerToLinkOpponent;
+            gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-            gBattleBanksCount = 4;
+            gBattlersCount = 4;
         }
         else
         {
-            gBattleBankFunc[1] = SetControllerToPlayer;
-            gBankPositions[1] = B_POSITION_PLAYER_LEFT;
+            gBattlerFuncs[1] = SetControllerToPlayer;
+            gBattlerPositions[1] = B_POSITION_PLAYER_LEFT;
 
-            gBattleBankFunc[0] = SetControllerToLinkOpponent;
-            gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
+            gBattlerFuncs[0] = SetControllerToLinkOpponent;
+            gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT;
 
-            gBattleBankFunc[3] = SetControllerToPlayer;
-            gBankPositions[3] = B_POSITION_PLAYER_RIGHT;
+            gBattlerFuncs[3] = SetControllerToPlayer;
+            gBattlerPositions[3] = B_POSITION_PLAYER_RIGHT;
 
-            gBattleBankFunc[2] = SetControllerToLinkOpponent;
-            gBankPositions[2] = B_POSITION_OPPONENT_RIGHT;
+            gBattlerFuncs[2] = SetControllerToLinkOpponent;
+            gBattlerPositions[2] = B_POSITION_OPPONENT_RIGHT;
 
-            gBattleBanksCount = 4;
+            gBattlersCount = 4;
         }
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
@@ -486,35 +486,35 @@ static void SetControllersVariablesInLinkBattle(void)
         {
             gBattleMainFunc = BeginBattleIntro;
 
-            gBattleBankFunc[0] = SetControllerToPlayer;
-            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+            gBattlerFuncs[0] = SetControllerToPlayer;
+            gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattleBankFunc[1] = SetControllerToOpponent;
-            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+            gBattlerFuncs[1] = SetControllerToOpponent;
+            gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattleBankFunc[2] = SetControllerToLinkPartner;
-            gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
+            gBattlerFuncs[2] = SetControllerToLinkPartner;
+            gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-            gBattleBankFunc[3] = SetControllerToOpponent;
-            gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
+            gBattlerFuncs[3] = SetControllerToOpponent;
+            gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-            gBattleBanksCount = 4;
+            gBattlersCount = 4;
         }
         else
         {
-            gBattleBankFunc[0] = SetControllerToLinkPartner;
-            gBankPositions[0] = B_POSITION_PLAYER_LEFT;
+            gBattlerFuncs[0] = SetControllerToLinkPartner;
+            gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattleBankFunc[1] = SetControllerToLinkOpponent;
-            gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
+            gBattlerFuncs[1] = SetControllerToLinkOpponent;
+            gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattleBankFunc[2] = SetControllerToPlayer;
-            gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
+            gBattlerFuncs[2] = SetControllerToPlayer;
+            gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-            gBattleBankFunc[3] = SetControllerToLinkOpponent;
-            gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
+            gBattlerFuncs[3] = SetControllerToLinkOpponent;
+            gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
-            gBattleBanksCount = 4;
+            gBattlersCount = 4;
         }
 
         sub_81B8D64(0, 0);
@@ -533,7 +533,7 @@ static void SetControllersVariablesInLinkBattle(void)
         if (gBattleTypeFlags & BATTLE_TYPE_WILD)
             gBattleMainFunc = BeginBattleIntro;
 
-        for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+        for (i = 0; i < MAX_BATTLERS_COUNT; i++)
         {
             switch (gLinkPlayers[i].lp_field_18)
             {
@@ -549,17 +549,17 @@ static void SetControllersVariablesInLinkBattle(void)
 
             if (i == multiplayerId)
             {
-                gBattleBankFunc[gLinkPlayers[i].lp_field_18] = SetControllerToPlayer;
+                gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToPlayer;
                 switch (gLinkPlayers[i].lp_field_18)
                 {
                 case 0:
                 case 3:
-                    gBankPositions[gLinkPlayers[i].lp_field_18] = 0;
+                    gBattlerPositions[gLinkPlayers[i].lp_field_18] = 0;
                     gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                     break;
                 case 1:
                 case 2:
-                    gBankPositions[gLinkPlayers[i].lp_field_18] = 2;
+                    gBattlerPositions[gLinkPlayers[i].lp_field_18] = 2;
                     gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                     break;
                 }
@@ -569,34 +569,34 @@ static void SetControllersVariablesInLinkBattle(void)
                 if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[multiplayerId].lp_field_18 & 1))
                  || ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[multiplayerId].lp_field_18 & 1)))
                 {
-                    gBattleBankFunc[gLinkPlayers[i].lp_field_18] = SetControllerToLinkPartner;
+                    gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToLinkPartner;
                     switch (gLinkPlayers[i].lp_field_18)
                     {
                     case 0:
                     case 3:
-                        gBankPositions[gLinkPlayers[i].lp_field_18] = 0;
+                        gBattlerPositions[gLinkPlayers[i].lp_field_18] = 0;
                         gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                         break;
                     case 1:
                     case 2:
-                        gBankPositions[gLinkPlayers[i].lp_field_18] = 2;
+                        gBattlerPositions[gLinkPlayers[i].lp_field_18] = 2;
                         gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                         break;
                     }
                 }
                 else
                 {
-                    gBattleBankFunc[gLinkPlayers[i].lp_field_18] = SetControllerToLinkOpponent;
+                    gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToLinkOpponent;
                     switch (gLinkPlayers[i].lp_field_18)
                     {
                     case 0:
                     case 3:
-                        gBankPositions[gLinkPlayers[i].lp_field_18] = 1;
+                        gBattlerPositions[gLinkPlayers[i].lp_field_18] = 1;
                         gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
                         break;
                     case 1:
                     case 2:
-                        gBankPositions[gLinkPlayers[i].lp_field_18] = 3;
+                        gBattlerPositions[gLinkPlayers[i].lp_field_18] = 3;
                         gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
                         break;
                     }
@@ -604,7 +604,7 @@ static void SetControllersVariablesInLinkBattle(void)
             }
         }
 
-        gBattleBanksCount = 4;
+        gBattlersCount = 4;
     }
 }
 
@@ -614,13 +614,13 @@ static void SetBattlePartyIds(void)
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        for (i = 0; i < gBattleBanksCount; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
             for (j = 0; j < 6; j++)
             {
                 if (i < 2)
                 {
-                    if (GET_BANK_SIDE2(i) == SIDE_PLAYER)
+                    if (GET_BATTLER_SIDE2(i) == B_SIDE_PLAYER)
                     {
                         if (GetMonData(&gPlayerParty[j], MON_DATA_HP) != 0
                          && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES2) != SPECIES_NONE
@@ -645,7 +645,7 @@ static void SetBattlePartyIds(void)
                 }
                 else
                 {
-                    if (GET_BANK_SIDE2(i) == SIDE_PLAYER)
+                    if (GET_BATTLER_SIDE2(i) == B_SIDE_PLAYER)
                     {
                         if (GetMonData(&gPlayerParty[j], MON_DATA_HP) != 0
                          && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES) != SPECIES_NONE  // Probably a typo by Game Freak. The rest use SPECIES2.
@@ -693,14 +693,14 @@ static void PrepareBufferDataTransfer(u8 bufferId, u8 *data, u16 size)
         case 0:
             for (i = 0; i < size; i++)
             {
-                gBattleBufferA[gActiveBank][i] = *data;
+                gBattleBufferA[gActiveBattler][i] = *data;
                 data++;
             }
             break;
         case 1:
             for (i = 0; i < size; i++)
             {
-                gBattleBufferB[gActiveBank][i] = *data;
+                gBattleBufferB[gActiveBattler][i] = *data;
                 data++;
             }
             break;
@@ -751,12 +751,12 @@ void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data)
         gTasks[gUnknown_02022D08].data[14] = 0;
     }
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_BUFFER_ID] = bufferId;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BANK] = gActiveBank;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBankAttacker;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBankDefender;
+    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BANK] = gActiveBattler;
+    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBattleAttacker;
+    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBattleDefender;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_LO] = alignedSize;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BANK_FLAGS] = gAbsentBankFlags;
+    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BANK_FLAGS] = gAbsentBattlerFlags;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_EFFECT_BANK] = gEffectBank;
 
     for (i = 0; i < size; i++)
@@ -920,9 +920,9 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
 
             if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
             {
-                gBankAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 2];
-                gBankDefender = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
-                gAbsentBankFlags = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 6];
+                gBattleAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 2];
+                gBattleDefender = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
+                gAbsentBattlerFlags = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 6];
                 gEffectBank = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 7];
             }
             break;
@@ -1123,13 +1123,13 @@ void EmitPrintString(u8 bufferId, u16 stringID)
     stringInfo->originallyUsedMove = gChosenMove;
     stringInfo->lastItem = gLastUsedItem;
     stringInfo->lastAbility = gLastUsedAbility;
-    stringInfo->scrActive = gBattleScripting.bank;
+    stringInfo->scrActive = gBattleScripting.battler;
     stringInfo->unk1605E = gBattleStruct->field_52;
     stringInfo->hpScale = gBattleStruct->hpScale;
     stringInfo->StringBank = gStringBank;
     stringInfo->moveType = gBattleMoves[gCurrentMove].type;
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
         stringInfo->abilities[i] = gBattleMons[i].ability;
     for (i = 0; i < TEXT_BUFF_ARRAY_COUNT; i++)
     {
@@ -1155,10 +1155,10 @@ void EmitPrintSelectionString(u8 bufferId, u16 stringID)
     stringInfo->originallyUsedMove = gChosenMove;
     stringInfo->lastItem = gLastUsedItem;
     stringInfo->lastAbility = gLastUsedAbility;
-    stringInfo->scrActive = gBattleScripting.bank;
+    stringInfo->scrActive = gBattleScripting.battler;
     stringInfo->unk1605E = gBattleStruct->field_52;
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
         stringInfo->abilities[i] = gBattleMons[i].ability;
     for (i = 0; i < TEXT_BUFF_ARRAY_COUNT; i++)
     {
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 4bfbebf98..a6b6f7a09 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -23,17 +23,17 @@
 #include "contest.h"
 #include "constants/songs.h"
 
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gActiveBank;
-extern u8 gBattleBanksCount;
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gActiveBattler;
+extern u8 gBattlersCount;
 extern u16 gUnknown_020243FC;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u8 gBankPositions[BATTLE_BANKS_COUNT];
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
-extern u32 gTransformedPersonalities[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
+extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
+extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
@@ -109,7 +109,7 @@ static const struct CompressedSpriteSheet gUnknown_0832C100 =
     gUnknown_08C1F8E8, 0x1000, TAG_HEALTHBOX_SAFARI_TILE
 };
 
-static const struct CompressedSpriteSheet gUnknown_0832C108[BATTLE_BANKS_COUNT] =
+static const struct CompressedSpriteSheet gUnknown_0832C108[MAX_BATTLERS_COUNT] =
 {
     {gBlankGfxCompressed, 0x0100, 0xd704},
     {gBlankGfxCompressed, 0x0120, 0xd705},
@@ -127,10 +127,10 @@ static const struct SpritePalette gUnknown_0832C128[2] =
 void AllocateBattleSpritesData(void)
 {
     gBattleSpritesDataPtr = AllocZeroed(sizeof(struct BattleSpriteData));
-    gBattleSpritesDataPtr->bankData = AllocZeroed(sizeof(struct BattleSpriteInfo) * BATTLE_BANKS_COUNT);
-    gBattleSpritesDataPtr->healthBoxesData = AllocZeroed(sizeof(struct BattleHealthboxInfo) * BATTLE_BANKS_COUNT);
+    gBattleSpritesDataPtr->bankData = AllocZeroed(sizeof(struct BattleSpriteInfo) * MAX_BATTLERS_COUNT);
+    gBattleSpritesDataPtr->healthBoxesData = AllocZeroed(sizeof(struct BattleHealthboxInfo) * MAX_BATTLERS_COUNT);
     gBattleSpritesDataPtr->animationData = AllocZeroed(sizeof(struct BattleAnimationInfo));
-    gBattleSpritesDataPtr->battleBars = AllocZeroed(sizeof(struct BattleBarInfo) * BATTLE_BANKS_COUNT);
+    gBattleSpritesDataPtr->battleBars = AllocZeroed(sizeof(struct BattleBarInfo) * MAX_BATTLERS_COUNT);
 }
 
 void FreeBattleSpritesData(void)
@@ -149,17 +149,17 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
 {
     s32 i, var1, var2;
     s32 chosenMoveId = -1;
-    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
-    u8 unusableMovesBits = CheckMoveLimitations(gActiveBank, 0, 0xFF);
+    struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
+    u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
     s32 percent = Random() % 100;
 
-    i = (gBattleStruct->field_92 & gBitTable[gActiveBank]) ? 2 : 0;
+    i = (gBattleStruct->field_92 & gBitTable[gActiveBattler]) ? 2 : 0;
     var2 = i;
     var1 = i + 2;
 
     for (; i < var1; i++)
     {
-        if (gUnknown_0831C494[GetNatureFromPersonality(gBattleMons[gActiveBank].personality)][i] > percent)
+        if (gUnknown_0831C494[GetNatureFromPersonality(gBattleMons[gActiveBattler].personality)][i] > percent)
             break;
     }
 
@@ -234,13 +234,13 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
 
             if (Random() % 100 > 49)
             {
-                gProtectStructs[gActiveBank].flag_x10 = 1;
+                gProtectStructs[gActiveBattler].flag_x10 = 1;
                 return 0;
             }
         }
         else
         {
-            gProtectStructs[gActiveBank].flag_x10 = 1;
+            gProtectStructs[gActiveBattler].flag_x10 = 1;
             return 0;
         }
     }
@@ -258,11 +258,11 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
     }
 
     if (var1 & MOVE_TARGET_x10)
-        chosenMoveId |= (gActiveBank << 8);
+        chosenMoveId |= (gActiveBattler << 8);
     else if (var1 == MOVE_TARGET_SELECTED)
         chosenMoveId |= (BattlePalaceGetTargetRetValue());
     else
-        chosenMoveId |= (GetBankByPosition((GetBankPosition(gActiveBank) & BIT_SIDE) ^ BIT_SIDE) << 8);
+        chosenMoveId |= (GetBattlerAtPosition((GetBattlerPosition(gActiveBattler) & BIT_SIDE) ^ BIT_SIDE) << 8);
 
     return chosenMoveId;
 }
@@ -297,21 +297,21 @@ static u16 BattlePalaceGetTargetRetValue(void)
     {
         u8 opposing1, opposing2;
 
-        if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+        if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         {
-            opposing1 = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
-            opposing2 = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+            opposing1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+            opposing2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
         }
         else
         {
-            opposing1 = GetBankByPosition(B_POSITION_PLAYER_LEFT);
-            opposing2 = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+            opposing1 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+            opposing2 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
         }
 
         if (gBattleMons[opposing1].hp == gBattleMons[opposing2].hp)
-            return (((gActiveBank & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
+            return (((gActiveBattler & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
 
-        switch (gUnknown_0831C604[GetNatureFromPersonality(gBattleMons[gActiveBank].personality)])
+        switch (gUnknown_0831C604[GetNatureFromPersonality(gBattleMons[gActiveBattler].personality)])
         {
         case 0:
             if (gBattleMons[opposing1].hp > gBattleMons[opposing2].hp)
@@ -324,11 +324,11 @@ static u16 BattlePalaceGetTargetRetValue(void)
             else
                 return opposing2 << 8;
         case 2:
-            return (((gActiveBank & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
+            return (((gActiveBattler & BIT_SIDE) ^ BIT_SIDE) + (Random() & 2)) << 8;
         }
     }
 
-    return (gActiveBank ^ BIT_SIDE) << 8;
+    return (gActiveBattler ^ BIT_SIDE) << 8;
 }
 
 void sub_805D714(struct Sprite *sprite)
@@ -388,36 +388,36 @@ static void sub_805D7EC(struct Sprite *sprite)
 
 void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status)
 {
-    gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive = 1;
+    gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive = 1;
     if (!isStatus2)
     {
         if (status == STATUS1_FREEZE)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_FRZ);
+            LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_FRZ);
         else if (status == STATUS1_POISON || status & STATUS1_TOXIC_POISON)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_PSN);
+            LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_PSN);
         else if (status == STATUS1_BURN)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_BRN);
+            LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_BRN);
         else if (status & STATUS1_SLEEP)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_SLP);
+            LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_SLP);
         else if (status == STATUS1_PARALYSIS)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_PRZ);
+            LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_PRZ);
         else // no animation
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive = 0;
     }
     else
     {
         if (status & STATUS2_INFATUATION)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_INFATUATION);
+            LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_INFATUATION);
         else if (status & STATUS2_CONFUSION)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_CONFUSION);
+            LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_CONFUSION);
         else if (status & STATUS2_CURSED)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_CURSED);
+            LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_CURSED);
         else if (status & STATUS2_NIGHTMARE)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_NIGHTMARE);
+            LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_NIGHTMARE);
         else if (status & STATUS2_WRAPPED)
-            LaunchStatusAnimation(gActiveBank, B_ANIM_STATUS_WRAPPED); // this animation doesn't actually exist
+            LaunchStatusAnimation(gActiveBattler, B_ANIM_STATUS_WRAPPED); // this animation doesn't actually exist
         else // no animation
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBank].statusAnimActive = 0;
+            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].statusAnimActive = 0;
     }
 }
 
@@ -524,7 +524,7 @@ bool8 mplay_80342A4(u8 bank)
     if (IsSEPlaying())
     {
         gBattleSpritesDataPtr->healthBoxesData[bank].field_8++;
-        if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].field_8 < 30)
+        if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_8 < 30)
             return TRUE;
 
         m4aMPlayStop(&gMPlayInfo_SE1);
@@ -561,7 +561,7 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
-    position = GetBankPosition(bank);
+    position = GetBattlerPosition(bank);
     HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
                                               gMonSpritesGfxPtr->sprites[position],
                                               species, currentPersonality);
@@ -614,7 +614,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
-    position = GetBankPosition(bank);
+    position = GetBattlerPosition(bank);
 
     if (sub_80688F8(1, bank) == 1 || gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
     {
@@ -665,7 +665,7 @@ void nullsub_24(u16 species)
 
 void DecompressTrainerFrontPic(u16 frontPicId, u8 bank)
 {
-    u8 position = GetBankPosition(bank);
+    u8 position = GetBattlerPosition(bank);
     DecompressPicFromTable_2(&gTrainerFrontPicTable[frontPicId],
                              gMonSpritesGfxPtr->sprites[position],
                              SPECIES_NONE);
@@ -674,7 +674,7 @@ void DecompressTrainerFrontPic(u16 frontPicId, u8 bank)
 
 void DecompressTrainerBackPic(u16 backPicId, u8 bank)
 {
-    u8 position = GetBankPosition(bank);
+    u8 position = GetBattlerPosition(bank);
     DecompressPicFromTable_2(&gTrainerBackPicTable[backPicId],
                              gMonSpritesGfxPtr->sprites[position],
                              SPECIES_NONE);
@@ -713,7 +713,7 @@ void sub_805DFFC(void)
         numberOfBanks = 4;
     }
     for (i = 0; i < numberOfBanks; i++)
-        LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[i]]);
+        LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[i]]);
 }
 
 bool8 BattleLoadAllHealthBoxesGfx(u8 state)
@@ -739,9 +739,9 @@ bool8 BattleLoadAllHealthBoxesGfx(u8 state)
             else if (state == 3)
                 LoadCompressedObjectPic(&gUnknown_0832C0D8);
             else if (state == 4)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[0]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[0]]);
             else if (state == 5)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[1]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[1]]);
             else
                 retVal = TRUE;
         }
@@ -756,13 +756,13 @@ bool8 BattleLoadAllHealthBoxesGfx(u8 state)
             else if (state == 5)
                 LoadCompressedObjectPic(&gUnknown_0832C0F0[1]);
             else if (state == 6)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[0]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[0]]);
             else if (state == 7)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[1]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[1]]);
             else if (state == 8)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[2]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[2]]);
             else if (state == 9)
-                LoadCompressedObjectPic(&gUnknown_0832C108[gBankPositions[3]]);
+                LoadCompressedObjectPic(&gUnknown_0832C108[gBattlerPositions[3]]);
             else
                 retVal = TRUE;
         }
@@ -807,7 +807,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
             gHealthBoxesIds[*bank] = CreateBankHealthboxSprites(*bank);
 
         (*bank)++;
-        if (*bank == gBattleBanksCount)
+        if (*bank == gBattlersCount)
         {
             *bank = 0;
             (*state1)++;
@@ -815,20 +815,20 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
         break;
     case 4:
         SetBankHealthboxSpritePos(*bank);
-        if (gBankPositions[*bank] <= 1)
+        if (gBattlerPositions[*bank] <= 1)
             DummyBattleInterfaceFunc(gHealthBoxesIds[*bank], FALSE);
         else
             DummyBattleInterfaceFunc(gHealthBoxesIds[*bank], TRUE);
 
         (*bank)++;
-        if (*bank == gBattleBanksCount)
+        if (*bank == gBattlersCount)
         {
             *bank = 0;
             (*state1)++;
         }
         break;
     case 5:
-        if (GetBankSide(*bank) == SIDE_PLAYER)
+        if (GetBattlerSide(*bank) == B_SIDE_PLAYER)
         {
             if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
                 UpdateHealthboxAttribute(gHealthBoxesIds[*bank], &gPlayerParty[gBattlePartyID[*bank]], HEALTHBOX_ALL);
@@ -839,7 +839,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
         }
         SetHealthboxSpriteInvisible(gHealthBoxesIds[*bank]);
         (*bank)++;
-        if (*bank == gBattleBanksCount)
+        if (*bank == gBattlersCount)
         {
             *bank = 0;
             (*state1)++;
@@ -857,21 +857,21 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
 
 void ClearSpritesHealthboxAnimData(void)
 {
-    memset(gBattleSpritesDataPtr->healthBoxesData, 0, sizeof(struct BattleHealthboxInfo) * BATTLE_BANKS_COUNT);
+    memset(gBattleSpritesDataPtr->healthBoxesData, 0, sizeof(struct BattleHealthboxInfo) * MAX_BATTLERS_COUNT);
     memset(gBattleSpritesDataPtr->animationData, 0, sizeof(struct BattleAnimationInfo));
 }
 
 static void ClearSpritesBankHealthboxAnimData(void)
 {
     ClearSpritesHealthboxAnimData();
-    memset(gBattleSpritesDataPtr->bankData, 0, sizeof(struct BattleSpriteInfo) * BATTLE_BANKS_COUNT);
+    memset(gBattleSpritesDataPtr->bankData, 0, sizeof(struct BattleSpriteInfo) * MAX_BATTLERS_COUNT);
 }
 
 void CopyAllBattleSpritesInvisibilities(void)
 {
     s32 i;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
         gBattleSpritesDataPtr->bankData[i].invisible = gSprites[gBankSpriteIds[i]].invisible;
 }
 
@@ -921,14 +921,14 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
         }
         else
         {
-            position = GetBankPosition(bankAtk);
+            position = GetBattlerPosition(bankAtk);
 
-            if (GetBankSide(bankDef) == SIDE_OPPONENT)
+            if (GetBattlerSide(bankDef) == B_SIDE_OPPONENT)
                 targetSpecies = GetMonData(&gEnemyParty[gBattlePartyID[bankDef]], MON_DATA_SPECIES);
             else
                 targetSpecies = GetMonData(&gPlayerParty[gBattlePartyID[bankDef]], MON_DATA_SPECIES);
 
-            if (GetBankSide(bankAtk) == SIDE_PLAYER)
+            if (GetBattlerSide(bankAtk) == B_SIDE_PLAYER)
             {
                 personalityValue = GetMonData(&gPlayerParty[gBattlePartyID[bankAtk]], MON_DATA_PERSONALITY);
                 otId = GetMonData(&gPlayerParty[gBattlePartyID[bankAtk]], MON_DATA_OT_ID);
@@ -991,11 +991,11 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
         if (IsContest())
             position = 0;
         else
-            position = GetBankPosition(bank);
+            position = GetBattlerPosition(bank);
 
         if (IsContest())
             LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[position]);
-        else if (GetBankSide(bank) != SIDE_PLAYER)
+        else if (GetBattlerSide(bank) != B_SIDE_PLAYER)
             LZDecompressVram(gSubstituteDollGfx, gMonSpritesGfxPtr->sprites[position]);
         else
             LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[position]);
@@ -1018,7 +1018,7 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
     {
         if (!IsContest())
         {
-            if (GetBankSide(bank) != SIDE_PLAYER)
+            if (GetBattlerSide(bank) != B_SIDE_PLAYER)
                 BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
             else
                 BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[bank]], bank);
@@ -1057,7 +1057,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank)
     {
         if (!gBattleSpritesDataPtr->bankData[bank].lowHpSong)
         {
-            if (!gBattleSpritesDataPtr->bankData[bank ^ BIT_MON].lowHpSong)
+            if (!gBattleSpritesDataPtr->bankData[bank ^ BIT_FLANK].lowHpSong)
                 PlaySE(SE_HINSI);
             gBattleSpritesDataPtr->bankData[bank].lowHpSong = 1;
         }
@@ -1070,7 +1070,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank)
             m4aSongNumStop(SE_HINSI);
             return;
         }
-        if (IsDoubleBattle() && !gBattleSpritesDataPtr->bankData[bank ^ BIT_MON].lowHpSong)
+        if (IsDoubleBattle() && !gBattleSpritesDataPtr->bankData[bank ^ BIT_FLANK].lowHpSong)
         {
             m4aSongNumStop(SE_HINSI);
             return;
@@ -1080,11 +1080,11 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank)
 
 void BattleStopLowHpSound(void)
 {
-    u8 playerBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+    u8 playerBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
 
     gBattleSpritesDataPtr->bankData[playerBank].lowHpSong = 0;
     if (IsDoubleBattle())
-        gBattleSpritesDataPtr->bankData[playerBank ^ BIT_MON].lowHpSong = 0;
+        gBattleSpritesDataPtr->bankData[playerBank ^ BIT_FLANK].lowHpSong = 0;
 
     m4aSongNumStop(SE_HINSI);
 }
@@ -1101,8 +1101,8 @@ void sub_805EAE8(void)
 {
     if (gMain.inBattle)
     {
-        u8 playerBank1 = GetBankByPosition(B_POSITION_PLAYER_LEFT);
-        u8 playerBank2 = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+        u8 playerBank1 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+        u8 playerBank2 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
         u8 bank1PartyId = pokemon_order_func(gBattlePartyID[playerBank1]);
         u8 bank2PartyId = pokemon_order_func(gBattlePartyID[playerBank2]);
 
@@ -1117,7 +1117,7 @@ void sub_805EB9C(u8 affineMode)
 {
     s32 i;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (IsBankSpritePresent(i))
         {
@@ -1143,13 +1143,13 @@ void LoadAndCreateEnemyShadowSprites(void)
 
     LoadCompressedObjectPic(&gSpriteSheet_EnemyShadow);
 
-    bank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+    bank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
     gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankCoord(bank, 0), GetBankCoord(bank, 1) + 29, 0xC8);
     gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
 
     if (IsDoubleBattle())
     {
-        bank = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+        bank = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
         gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankCoord(bank, 0), GetBankCoord(bank, 1) + 29, 0xC8);
         gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
     }
@@ -1189,7 +1189,7 @@ void SpriteCB_SetInvisible(struct Sprite *sprite)
 
 void SetBankEnemyShadowSpriteCallback(u8 bank, u16 species)
 {
-    if (GetBankSide(bank) == SIDE_PLAYER)
+    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         return;
 
     if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
@@ -1245,7 +1245,7 @@ void AllocateMonSpritesGfx(void)
     gMonSpritesGfxPtr = AllocZeroed(sizeof(*gMonSpritesGfxPtr));
     gMonSpritesGfxPtr->firstDecompressed = AllocZeroed(0x8000);
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         gMonSpritesGfxPtr->sprites[i] = gMonSpritesGfxPtr->firstDecompressed + (i * 0x2000);
         *(gMonSpritesGfxPtr->templates + i) = gUnknown_08329D98[i];
diff --git a/src/battle_interface.c b/src/battle_interface.c
index f7b585ca4..b006a9d31 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -153,10 +153,10 @@ enum
     HEALTHBOX_GFX_117,
 };
 
-extern u8 gBankPositions[BATTLE_BANKS_COUNT];
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBanksCount;
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattlersCount;
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 
 extern const u8 * const gNatureNamePointers[];
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
@@ -907,7 +907,7 @@ u8 CreateBankHealthboxSprites(u8 bank)
 
     if (!IsDoubleBattle())
     {
-        if (GetBankSide(bank) == SIDE_PLAYER)
+        if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         {
             healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1);
             healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1);
@@ -932,10 +932,10 @@ u8 CreateBankHealthboxSprites(u8 bank)
     }
     else
     {
-        if (GetBankSide(bank) == SIDE_PLAYER)
+        if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         {
-            healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBankPosition(bank) / 2], 240, 160, 1);
-            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBankPosition(bank) / 2], 240, 160, 1);
+            healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(bank) / 2], 240, 160, 1);
+            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(bank) / 2], 240, 160, 1);
 
             gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2;
 
@@ -947,8 +947,8 @@ u8 CreateBankHealthboxSprites(u8 bank)
         }
         else
         {
-            healthboxSpriteId_1 = CreateSprite(&sHealthboxOpponentSpriteTemplates[GetBankPosition(bank) / 2], 240, 160, 1);
-            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[GetBankPosition(bank) / 2], 240, 160, 1);
+            healthboxSpriteId_1 = CreateSprite(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(bank) / 2], 240, 160, 1);
+            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(bank) / 2], 240, 160, 1);
 
             gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2;
 
@@ -960,9 +960,9 @@ u8 CreateBankHealthboxSprites(u8 bank)
         }
     }
 
-    unkSpriteId = CreateSpriteAtEnd(&sUnknown_0832C1C0[gBankPositions[bank]], 140, 60, 0);
+    unkSpriteId = CreateSpriteAtEnd(&sUnknown_0832C1C0[gBattlerPositions[bank]], 140, 60, 0);
     unkSpritePtr = &gSprites[unkSpriteId];
-    SetSubspriteTables(unkSpritePtr, &sUnknown_0832C28C[GetBankSide(bank)]);
+    SetSubspriteTables(unkSpritePtr, &sUnknown_0832C28C[GetBattlerSide(bank)]);
     unkSpritePtr->subspriteMode = 2;
     unkSpritePtr->oam.priority = 1;
 
@@ -1087,7 +1087,7 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority)
 {
     s32 i;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         u8 healthboxSpriteId_1 = gHealthBoxesIds[i];
         u8 healthboxSpriteId_2 = gSprites[gHealthBoxesIds[i]].oam.affineParam;
@@ -1105,14 +1105,14 @@ void SetBankHealthboxSpritePos(u8 bank)
 
     if (!IsDoubleBattle())
     {
-        if (GetBankSide(bank) != SIDE_PLAYER)
+        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
             x = 44, y = 30;
         else
             x = 158, y = 88;
     }
     else
     {
-        switch (GetBankPosition(bank))
+        switch (GetBattlerPosition(bank))
         {
         case B_POSITION_PLAYER_LEFT:
             x = 159, y = 76;
@@ -1156,7 +1156,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl)
     windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, xPos, 3, 2, &windowId);
     spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32;
 
-    if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER)
+    if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER)
     {
         objVram = (void*)(OBJ_VRAM0);
         if (!IsDoubleBattle())
@@ -1180,7 +1180,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
     u8 text[32];
     void *objVram;
 
-    if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER && !IsDoubleBattle())
+    if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER && !IsDoubleBattle())
     {
         spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32;
         if (maxOrCurrent != HP_CURRENT) // singles, max
@@ -1214,7 +1214,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
 
         memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4));
         bank = gSprites[healthboxSpriteId].data[6];
-        if (IsDoubleBattle() == TRUE || GetBankSide(bank) == SIDE_OPPONENT)
+        if (IsDoubleBattle() == TRUE || GetBattlerSide(bank) == B_SIDE_OPPONENT)
         {
             UpdateHpTextInHealthboxInDoubles(healthboxSpriteId, value, maxOrCurrent);
         }
@@ -1223,7 +1223,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
             u32 var;
             u8 i;
 
-            if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER)
+            if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER)
             {
                 if (maxOrCurrent == HP_CURRENT)
                     var = 29;
@@ -1258,7 +1258,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
     u8 text[32];
     void *objVram;
 
-    if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER)
+    if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER)
     {
         if (gBattleSpritesDataPtr->bankData[gSprites[healthboxSpriteId].data[6]].hpNumbersNoBars) // don't print text if only bars are visible
         {
@@ -1335,7 +1335,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
             }
             else
             {
-                if (GetBankSide(bank) == SIDE_PLAYER) // impossible to reach part, because the bank is from the opponent's side
+                if (GetBattlerSide(bank) == B_SIDE_PLAYER) // impossible to reach part, because the bank is from the opponent's side
                 {
                     CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_116),
                           (void*)(OBJ_VRAM0) + ((gSprites[healthboxSpriteId].oam.tileNum + 52) * 32),
@@ -1354,7 +1354,7 @@ static void sub_80730D4(u8 healthboxSpriteId, struct Pokemon *mon)
     u8 i, var, nature, healthboxSpriteId_2;
 
     memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4));
-    barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBankPosition(gSprites[healthboxSpriteId].data[6]) * 384)];
+    barFontGfx = &gMonSpritesGfxPtr->barFontGfx[0x520 + (GetBattlerPosition(gSprites[healthboxSpriteId].data[6]) * 384)];
     var = 5;
     nature = GetNature(mon);
     StringCopy(text + 6, gNatureNamePointers[nature]);
@@ -1415,17 +1415,17 @@ void SwapHpBarsWithHpText(void)
     s32 i;
     u8 spriteId;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (gSprites[gHealthBoxesIds[i]].callback == SpriteCallbackDummy
-         && GetBankSide(i) != SIDE_OPPONENT
-         && (IsDoubleBattle() || GetBankSide(i) != SIDE_PLAYER))
+         && GetBattlerSide(i) != B_SIDE_OPPONENT
+         && (IsDoubleBattle() || GetBattlerSide(i) != B_SIDE_PLAYER))
         {
             bool8 noBars;
 
             gBattleSpritesDataPtr->bankData[i].hpNumbersNoBars ^= 1;
             noBars = gBattleSpritesDataPtr->bankData[i].hpNumbersNoBars;
-            if (GetBankSide(i) == SIDE_PLAYER)
+            if (GetBattlerSide(i) == B_SIDE_PLAYER)
             {
                 if (!IsDoubleBattle())
                     continue;
@@ -1486,9 +1486,9 @@ u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 ar
     u8 ballIconSpritesIds[6];
     u8 taskId;
 
-    if (!arg2 || GetBankPosition(bank) != B_POSITION_OPPONENT_RIGHT)
+    if (!arg2 || GetBattlerPosition(bank) != B_POSITION_OPPONENT_RIGHT)
     {
-        if (GetBankSide(bank) == SIDE_PLAYER)
+        if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         {
             isOpponent = FALSE;
             bar_X = 136, bar_Y = 96;
@@ -1567,7 +1567,7 @@ u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 ar
         gSprites[ballIconSpritesIds[i]].data[2] = isOpponent;
     }
 
-    if (GetBankSide(bank) == SIDE_PLAYER)
+    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
@@ -1712,7 +1712,7 @@ void sub_8073C30(u8 taskId)
     {
         for (i = 0; i < 6; i++)
         {
-            if (GetBankSide(bank) != SIDE_PLAYER)
+            if (GetBattlerSide(bank) != B_SIDE_PLAYER)
             {
                 gSprites[sp[5 - i]].data[1] = 7 * i;
                 gSprites[sp[5 - i]].data[3] = 0;
@@ -1964,7 +1964,7 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon)
 
     spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * 32;
 
-    if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER)
+    if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER)
     {
         sub_8075198((void*)(0x6010040 + spriteTileNum), windowTileData, 6);
         ptr = (void*)(OBJ_VRAM0);
@@ -1992,7 +1992,7 @@ static void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus)
         return;
 
     bank = gSprites[healthboxSpriteId].data[6];
-    if (GetBankSide(bank) == SIDE_PLAYER)
+    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         return;
     if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES)), FLAG_GET_CAUGHT))
         return;
@@ -2016,7 +2016,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
 
     bank = gSprites[healthboxSpriteId].data[6];
     healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5];
-    if (GetBankSide(bank) == SIDE_PLAYER)
+    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
     {
         status = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_STATUS);
         if (!IsDoubleBattle())
@@ -2075,7 +2075,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
     FillPalette(sStatusIconColors[statusPalId], pltAdder + 0x100, 2);
     CpuCopy16(gPlttBufferUnfaded + 0x100 + pltAdder, (void*)(OBJ_PLTT + pltAdder * 2), 2);
     CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * 32), 96);
-    if (IsDoubleBattle() == TRUE || GetBankSide(bank) == SIDE_OPPONENT)
+    if (IsDoubleBattle() == TRUE || GetBattlerSide(bank) == B_SIDE_OPPONENT)
     {
         if (!gBattleSpritesDataPtr->bankData[bank].hpNumbersNoBars)
         {
@@ -2181,9 +2181,9 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem
     u8 bank = gSprites[healthboxSpriteId].data[6];
 
     if (elementId == HEALTHBOX_ALL && !IsDoubleBattle())
-        GetBankSide(bank); // pointless function call
+        GetBattlerSide(bank); // pointless function call
 
-    if (GetBankSide(gSprites[healthboxSpriteId].data[6]) == SIDE_PLAYER)
+    if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER)
     {
         u8 isDoubles;
 
diff --git a/src/battle_main.c b/src/battle_main.c
index 9027b1d14..a0f89f019 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -77,7 +77,7 @@ extern u16 gBattle_WIN1H;
 extern u16 gBattle_WIN1V;
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
-extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
+extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
 extern void (*gPreBattleCallback1)(void);
 extern void (*gBattleMainFunc)(void);
 extern void (*gCB2_AfterEvolution)(void);
@@ -87,54 +87,54 @@ extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern u8 gDecompressionBuffer[];
 extern u16 gUnknown_020243FC;
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
-extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u8 gStringBank;
 extern u32 gUnknown_02022F88;
 extern u32 gHitMarker;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
 extern u16 gPaydayMoney;
 extern u16 gBattleWeather;
 extern u16 gPauseCounterBattle;
 extern u16 gRandomTurnNumber;
-extern u8 gActiveBank;
-extern u8 gBattleBanksCount;
-extern u8 gBankAttacker;
-extern u8 gBankDefender;
+extern u8 gActiveBattler;
+extern u8 gBattlersCount;
+extern u8 gBattleAttacker;
+extern u8 gBattleDefender;
 extern u8 gLeveledUpInBattle;
-extern u8 gAbsentBankFlags;
+extern u8 gAbsentBattlerFlags;
 extern u32 gBattleExecBuffer;
 extern u8 gMultiHitCounter;
 extern u8 gMoveResultFlags;
 extern s32 gBattleMoveDamage;
-extern const u8* gPalaceSelectionBattleScripts[BATTLE_BANKS_COUNT];
-extern u16 gLastPrintedMoves[BATTLE_BANKS_COUNT];
-extern u16 gLastMoves[BATTLE_BANKS_COUNT];
-extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
-extern u16 gLastHitByType[BATTLE_BANKS_COUNT];
-extern u16 gLastResultingMoves[BATTLE_BANKS_COUNT];
-extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
-extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
-extern u8 gUnknown_02024284[BATTLE_BANKS_COUNT];
-extern u32 gStatuses3[BATTLE_BANKS_COUNT];
+extern const u8* gPalaceSelectionBattleScripts[MAX_BATTLERS_COUNT];
+extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
+extern u16 gLastMoves[MAX_BATTLERS_COUNT];
+extern u16 gLastLandedMoves[MAX_BATTLERS_COUNT];
+extern u16 gLastHitByType[MAX_BATTLERS_COUNT];
+extern u16 gLastResultingMoves[MAX_BATTLERS_COUNT];
+extern u16 gLockedMoves[MAX_BATTLERS_COUNT];
+extern u8 gLastHitBy[MAX_BATTLERS_COUNT];
+extern u8 gUnknown_02024284[MAX_BATTLERS_COUNT];
+extern u32 gStatuses3[MAX_BATTLERS_COUNT];
 extern u16 gSideStatuses[2];
 extern u16 gCurrentMove;
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
-extern u8 gActionForBanks[BATTLE_BANKS_COUNT];
-extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
+extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
+extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
+extern u8 gActionForBanks[MAX_BATTLERS_COUNT];
+extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
 extern u8 gCurrentActionFuncId;
 extern u8 gLastUsedAbility;
 extern u8 gUnknown_0203CF00[];
-extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
+extern const u8* gSelectionBattleScripts[MAX_BATTLERS_COUNT];
 extern const u8* gBattlescriptCurrInstr;
-extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
+extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
 extern u8 gCurrentTurnActionNumber;
 extern u16 gDynamicBasePower;
 extern u8 gCritMultiplier;
@@ -2506,7 +2506,7 @@ static void sub_8039A48(struct Sprite *sprite)
         }
         else
         {
-            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBankPosition(sprite->tBank)] + (gBattleMonForms[sprite->tBank] << 11) + (sprite->data[3] << 8);
+            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBattlerPosition(sprite->tBank)] + (gBattleMonForms[sprite->tBank] << 11) + (sprite->data[3] << 8);
 
             for (i = 0; i < 0x100; i++)
                 *(dst++) = 0;
@@ -2709,8 +2709,8 @@ static void BattleMainCB1(void)
 {
     gBattleMainFunc();
 
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
-        gBattleBankFunc[gActiveBank]();
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
+        gBattlerFuncs[gActiveBattler]();
 }
 
 static void BattleStartClearSetData(void)
@@ -2722,7 +2722,7 @@ static void BattleStartClearSetData(void)
     TurnValuesCleanUp(FALSE);
     SpecialStatusesClear();
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         gStatuses3[i] = 0;
 
@@ -2752,8 +2752,8 @@ static void BattleStartClearSetData(void)
             dataPtr[j] = 0;
     }
 
-    gBankAttacker = 0;
-    gBankDefender = 0;
+    gBattleAttacker = 0;
+    gBattleDefender = 0;
     gBattleWeather = 0;
 
     dataPtr = (u8 *)&gWishFutureKnock;
@@ -2788,7 +2788,7 @@ static void BattleStartClearSetData(void)
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
     gLeveledUpInBattle = 0;
-    gAbsentBankFlags = 0;
+    gAbsentBattlerFlags = 0;
     gBattleStruct->runTries = 0;
     gBattleStruct->field_79 = 0;
     gBattleStruct->field_7A = 0;
@@ -2809,7 +2809,7 @@ static void BattleStartClearSetData(void)
         *(i + 3 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
     }
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + i) = 6;
     }
@@ -2831,19 +2831,19 @@ static void BattleStartClearSetData(void)
 
 void SwitchInClearSetData(void)
 {
-    struct DisableStruct disableStructCopy = gDisableStructs[gActiveBank];
+    struct DisableStruct disableStructCopy = gDisableStructs[gActiveBattler];
     s32 i;
     u8 *ptr;
 
     if (gBattleMoves[gCurrentMove].effect != EFFECT_BATON_PASS)
     {
         for (i = 0; i < BATTLE_STATS_NO; i++)
-            gBattleMons[gActiveBank].statStages[i] = 6;
-        for (i = 0; i < gBattleBanksCount; i++)
+            gBattleMons[gActiveBattler].statStages[i] = 6;
+        for (i = 0; i < gBattlersCount; i++)
         {
-            if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBank)
+            if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBattler)
                 gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
-            if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].bankWithSureHit == gActiveBank)
+            if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].bankWithSureHit == gActiveBattler)
             {
                 gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
                 gDisableStructs[i].bankWithSureHit = 0;
@@ -2852,14 +2852,14 @@ void SwitchInClearSetData(void)
     }
     if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
     {
-        gBattleMons[gActiveBank].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED);
-        gStatuses3[gActiveBank] &= (STATUS3_LEECHSEED_BANK | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT);
+        gBattleMons[gActiveBattler].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED);
+        gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BANK | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT);
 
-        for (i = 0; i < gBattleBanksCount; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
-            if (GetBankSide(gActiveBank) != GetBankSide(i)
+            if (GetBattlerSide(gActiveBattler) != GetBattlerSide(i)
              && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
-             && (gDisableStructs[i].bankWithSureHit == gActiveBank))
+             && (gDisableStructs[i].bankWithSureHit == gActiveBattler))
             {
                 gStatuses3[i] &= ~(STATUS3_ALWAYS_HITS);
                 gStatuses3[i] |= 0x10;
@@ -2868,77 +2868,77 @@ void SwitchInClearSetData(void)
     }
     else
     {
-        gBattleMons[gActiveBank].status2 = 0;
-        gStatuses3[gActiveBank] = 0;
+        gBattleMons[gActiveBattler].status2 = 0;
+        gStatuses3[gActiveBattler] = 0;
     }
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
-        if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBank))
-            gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBank));
-        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && *(gBattleStruct->wrappedBy + i) == gActiveBank)
+        if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBattler))
+            gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBattler));
+        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && *(gBattleStruct->wrappedBy + i) == gActiveBattler)
             gBattleMons[i].status2 &= ~(STATUS2_WRAPPED);
     }
 
-    gActionSelectionCursor[gActiveBank] = 0;
-    gMoveSelectionCursor[gActiveBank] = 0;
+    gActionSelectionCursor[gActiveBattler] = 0;
+    gMoveSelectionCursor[gActiveBattler] = 0;
 
-    ptr = (u8 *)&gDisableStructs[gActiveBank];
+    ptr = (u8 *)&gDisableStructs[gActiveBattler];
     for (i = 0; i < sizeof(struct DisableStruct); i++)
         ptr[i] = 0;
 
     if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
     {
-        gDisableStructs[gActiveBank].substituteHP = disableStructCopy.substituteHP;
-        gDisableStructs[gActiveBank].bankWithSureHit = disableStructCopy.bankWithSureHit;
-        gDisableStructs[gActiveBank].perishSongTimer1 = disableStructCopy.perishSongTimer1;
-        gDisableStructs[gActiveBank].perishSongTimer2 = disableStructCopy.perishSongTimer2;
-        gDisableStructs[gActiveBank].bankPreventingEscape = disableStructCopy.bankPreventingEscape;
+        gDisableStructs[gActiveBattler].substituteHP = disableStructCopy.substituteHP;
+        gDisableStructs[gActiveBattler].bankWithSureHit = disableStructCopy.bankWithSureHit;
+        gDisableStructs[gActiveBattler].perishSongTimer1 = disableStructCopy.perishSongTimer1;
+        gDisableStructs[gActiveBattler].perishSongTimer2 = disableStructCopy.perishSongTimer2;
+        gDisableStructs[gActiveBattler].bankPreventingEscape = disableStructCopy.bankPreventingEscape;
     }
 
     gMoveResultFlags = 0;
-    gDisableStructs[gActiveBank].isFirstTurn = 2;
-    gDisableStructs[gActiveBank].truantUnknownBit = disableStructCopy.truantUnknownBit;
-    gLastMoves[gActiveBank] = 0;
-    gLastLandedMoves[gActiveBank] = 0;
-    gLastHitByType[gActiveBank] = 0;
-    gLastResultingMoves[gActiveBank] = 0;
-    gLastPrintedMoves[gActiveBank] = 0;
-    gLastHitBy[gActiveBank] = 0xFF;
-
-    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 0) = 0;
-    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 1) = 0;
-    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-
-    gBattleStruct->field_92 &= ~(gBitTable[gActiveBank]);
-
-    for (i = 0; i < gBattleBanksCount; i++)
-    {
-        if (i != gActiveBank && GetBankSide(i) != GetBankSide(gActiveBank))
+    gDisableStructs[gActiveBattler].isFirstTurn = 2;
+    gDisableStructs[gActiveBattler].truantUnknownBit = disableStructCopy.truantUnknownBit;
+    gLastMoves[gActiveBattler] = 0;
+    gLastLandedMoves[gActiveBattler] = 0;
+    gLastHitByType[gActiveBattler] = 0;
+    gLastResultingMoves[gActiveBattler] = 0;
+    gLastPrintedMoves[gActiveBattler] = 0;
+    gLastHitBy[gActiveBattler] = 0xFF;
+
+    *(gBattleStruct->mirrorMoves + gActiveBattler * 2 + 0) = 0;
+    *(gBattleStruct->mirrorMoves + gActiveBattler * 2 + 1) = 0;
+    *(0 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(0 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(1 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(1 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(2 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(2 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(3 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(3 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+
+    gBattleStruct->field_92 &= ~(gBitTable[gActiveBattler]);
+
+    for (i = 0; i < gBattlersCount; i++)
+    {
+        if (i != gActiveBattler && GetBattlerSide(i) != GetBattlerSide(gActiveBattler))
         {
             *(gBattleStruct->mirrorMoves + i * 2 + 0) = 0;
             *(gBattleStruct->mirrorMoves + i * 2 + 1) = 0;
         }
-        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+        *(i * 8 + gActiveBattler * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+        *(i * 8 + gActiveBattler * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
     }
 
-    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 0) = 0;
-    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 1) = 0;
+    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 0) = 0;
+    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 1) = 0;
 
-    gBattleResources->flags->flags[gActiveBank] = 0;
+    gBattleResources->flags->flags[gActiveBattler] = 0;
     gCurrentMove = 0;
     gBattleStruct->field_DA = 0xFF;
 
-    ClearBankMoveHistory(gActiveBank);
-    ClearBankAbilityHistory(gActiveBank);
+    ClearBankMoveHistory(gActiveBattler);
+    ClearBankAbilityHistory(gActiveBattler);
 }
 
 void FaintClearSetData(void)
@@ -2947,91 +2947,91 @@ void FaintClearSetData(void)
     u8 *ptr;
 
     for (i = 0; i < BATTLE_STATS_NO; i++)
-        gBattleMons[gActiveBank].statStages[i] = 6;
+        gBattleMons[gActiveBattler].statStages[i] = 6;
 
-    gBattleMons[gActiveBank].status2 = 0;
-    gStatuses3[gActiveBank] = 0;
+    gBattleMons[gActiveBattler].status2 = 0;
+    gStatuses3[gActiveBattler] = 0;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
-        if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBank)
+        if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBattler)
             gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
-        if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBank))
-            gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBank));
-        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && *(gBattleStruct->wrappedBy + i) == gActiveBank)
+        if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBattler))
+            gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBattler));
+        if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && *(gBattleStruct->wrappedBy + i) == gActiveBattler)
             gBattleMons[i].status2 &= ~(STATUS2_WRAPPED);
     }
 
-    gActionSelectionCursor[gActiveBank] = 0;
-    gMoveSelectionCursor[gActiveBank] = 0;
+    gActionSelectionCursor[gActiveBattler] = 0;
+    gMoveSelectionCursor[gActiveBattler] = 0;
 
-    ptr = (u8 *)&gDisableStructs[gActiveBank];
+    ptr = (u8 *)&gDisableStructs[gActiveBattler];
     for (i = 0; i < sizeof(struct DisableStruct); i++)
         ptr[i] = 0;
 
-    gProtectStructs[gActiveBank].protected = 0;
-    gProtectStructs[gActiveBank].endured = 0;
-    gProtectStructs[gActiveBank].onlyStruggle = 0;
-    gProtectStructs[gActiveBank].helpingHand = 0;
-    gProtectStructs[gActiveBank].bounceMove = 0;
-    gProtectStructs[gActiveBank].stealMove = 0;
-    gProtectStructs[gActiveBank].flag0Unknown = 0;
-    gProtectStructs[gActiveBank].prlzImmobility = 0;
-    gProtectStructs[gActiveBank].confusionSelfDmg = 0;
-    gProtectStructs[gActiveBank].targetNotAffected = 0;
-    gProtectStructs[gActiveBank].chargingTurn = 0;
-    gProtectStructs[gActiveBank].fleeFlag = 0;
-    gProtectStructs[gActiveBank].usedImprisionedMove = 0;
-    gProtectStructs[gActiveBank].loveImmobility = 0;
-    gProtectStructs[gActiveBank].usedDisabledMove = 0;
-    gProtectStructs[gActiveBank].usedTauntedMove = 0;
-    gProtectStructs[gActiveBank].flag2Unknown = 0;
-    gProtectStructs[gActiveBank].flinchImmobility = 0;
-    gProtectStructs[gActiveBank].notFirstStrike = 0;
-
-    gDisableStructs[gActiveBank].isFirstTurn = 2;
-
-    gLastMoves[gActiveBank] = 0;
-    gLastLandedMoves[gActiveBank] = 0;
-    gLastHitByType[gActiveBank] = 0;
-    gLastResultingMoves[gActiveBank] = 0;
-    gLastPrintedMoves[gActiveBank] = 0;
-    gLastHitBy[gActiveBank] = 0xFF;
-
-    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 0) = 0;
-    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 1) = 0;
-
-    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 0) = 0;
-    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 1) = 0;
-    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(0 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(1 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(2 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-    *(3 * 2 + gActiveBank * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
-
-    gBattleStruct->field_92 &= ~(gBitTable[gActiveBank]);
-
-    for (i = 0; i < gBattleBanksCount; i++)
-    {
-        if (i != gActiveBank && GetBankSide(i) != GetBankSide(gActiveBank))
+    gProtectStructs[gActiveBattler].protected = 0;
+    gProtectStructs[gActiveBattler].endured = 0;
+    gProtectStructs[gActiveBattler].onlyStruggle = 0;
+    gProtectStructs[gActiveBattler].helpingHand = 0;
+    gProtectStructs[gActiveBattler].bounceMove = 0;
+    gProtectStructs[gActiveBattler].stealMove = 0;
+    gProtectStructs[gActiveBattler].flag0Unknown = 0;
+    gProtectStructs[gActiveBattler].prlzImmobility = 0;
+    gProtectStructs[gActiveBattler].confusionSelfDmg = 0;
+    gProtectStructs[gActiveBattler].targetNotAffected = 0;
+    gProtectStructs[gActiveBattler].chargingTurn = 0;
+    gProtectStructs[gActiveBattler].fleeFlag = 0;
+    gProtectStructs[gActiveBattler].usedImprisionedMove = 0;
+    gProtectStructs[gActiveBattler].loveImmobility = 0;
+    gProtectStructs[gActiveBattler].usedDisabledMove = 0;
+    gProtectStructs[gActiveBattler].usedTauntedMove = 0;
+    gProtectStructs[gActiveBattler].flag2Unknown = 0;
+    gProtectStructs[gActiveBattler].flinchImmobility = 0;
+    gProtectStructs[gActiveBattler].notFirstStrike = 0;
+
+    gDisableStructs[gActiveBattler].isFirstTurn = 2;
+
+    gLastMoves[gActiveBattler] = 0;
+    gLastLandedMoves[gActiveBattler] = 0;
+    gLastHitByType[gActiveBattler] = 0;
+    gLastResultingMoves[gActiveBattler] = 0;
+    gLastPrintedMoves[gActiveBattler] = 0;
+    gLastHitBy[gActiveBattler] = 0xFF;
+
+    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 0) = 0;
+    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 1) = 0;
+
+    *(gBattleStruct->mirrorMoves + gActiveBattler * 2 + 0) = 0;
+    *(gBattleStruct->mirrorMoves + gActiveBattler * 2 + 1) = 0;
+    *(0 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(0 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(1 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(1 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(2 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(2 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+    *(3 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+    *(3 * 2 + gActiveBattler * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+
+    gBattleStruct->field_92 &= ~(gBitTable[gActiveBattler]);
+
+    for (i = 0; i < gBattlersCount; i++)
+    {
+        if (i != gActiveBattler && GetBattlerSide(i) != GetBattlerSide(gActiveBattler))
         {
             *(gBattleStruct->mirrorMoves + i * 2 + 0) = 0;
             *(gBattleStruct->mirrorMoves + i * 2 + 1) = 0;
         }
-        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
-        *(i * 8 + gActiveBank * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
+        *(i * 8 + gActiveBattler * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
+        *(i * 8 + gActiveBattler * 2 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = 0;
     }
 
-    gBattleResources->flags->flags[gActiveBank] = 0;
+    gBattleResources->flags->flags[gActiveBattler] = 0;
 
-    gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
-    gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
+    gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
+    gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
 
-    ClearBankMoveHistory(gActiveBank);
-    ClearBankAbilityHistory(gActiveBank);
+    ClearBankMoveHistory(gActiveBattler);
+    ClearBankAbilityHistory(gActiveBattler);
 }
 
 static void BattleIntroGetMonsData(void)
@@ -3039,16 +3039,16 @@ static void BattleIntroGetMonsData(void)
     switch (gBattleCommunication[MULTIUSE_STATE])
     {
     case 0:
-        gActiveBank = gBattleCommunication[1];
+        gActiveBattler = gBattleCommunication[1];
         EmitGetMonData(0, 0, 0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattleCommunication[MULTIUSE_STATE]++;
         break;
     case 1:
         if (gBattleExecBuffer == 0)
         {
             gBattleCommunication[1]++;
-            if (gBattleCommunication[1] == gBattleBanksCount)
+            if (gBattleCommunication[1] == gBattlersCount)
                 gBattleMainFunc = BattleIntroPrepareBackgroundSlide;
             else
                 gBattleCommunication[MULTIUSE_STATE] = 0;
@@ -3061,9 +3061,9 @@ static void BattleIntroPrepareBackgroundSlide(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBankByPosition(0);
+        gActiveBattler = GetBattlerAtPosition(0);
         EmitIntroSlide(0, gBattleTerrain);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattleMainFunc = BattleIntroDrawTrainersOrMonsSprites;
         gBattleCommunication[0] = 0;
         gBattleCommunication[1] = 0;
@@ -3078,12 +3078,12 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
     if (gBattleExecBuffer)
         return;
 
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
         if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-         && GetBankSide(gActiveBank) == SIDE_PLAYER)
+         && GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         {
-            ptr = (u8 *)&gBattleMons[gActiveBank];
+            ptr = (u8 *)&gBattleMons[gActiveBattler];
             for (i = 0; i < sizeof(struct BattlePokemon); i++)
                 ptr[i] = 0;
         }
@@ -3091,46 +3091,46 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
         {
             u16* hpOnSwitchout;
 
-            ptr = (u8 *)&gBattleMons[gActiveBank];
+            ptr = (u8 *)&gBattleMons[gActiveBattler];
             for (i = 0; i < sizeof(struct BattlePokemon); i++)
-                ptr[i] = gBattleBufferB[gActiveBank][4 + i];
+                ptr[i] = gBattleBufferB[gActiveBattler][4 + i];
 
-            gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
-            gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
-            gBattleMons[gActiveBank].ability = GetAbilityBySpecies(gBattleMons[gActiveBank].species, gBattleMons[gActiveBank].altAbility);
-            hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBankSide(gActiveBank)];
-            *hpOnSwitchout = gBattleMons[gActiveBank].hp;
+            gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
+            gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
+            gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].altAbility);
+            hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(gActiveBattler)];
+            *hpOnSwitchout = gBattleMons[gActiveBattler].hp;
             for (i = 0; i < BATTLE_STATS_NO; i++)
-                gBattleMons[gActiveBank].statStages[i] = 6;
-            gBattleMons[gActiveBank].status2 = 0;
+                gBattleMons[gActiveBattler].statStages[i] = 6;
+            gBattleMons[gActiveBattler].status2 = 0;
         }
 
-        if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_LEFT)
+        if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_LEFT)
         {
             EmitDrawTrainerPic(0);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
         }
 
         if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
         {
-            if (GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_LEFT)
+            if (GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_LEFT)
             {
                 EmitDrawTrainerPic(0);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT
              && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
                                       | BATTLE_TYPE_FRONTIER
                                       | BATTLE_TYPE_LINK
                                       | BATTLE_TYPE_x2000000
                                       | BATTLE_TYPE_x4000000)))
             {
-                HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), FLAG_SET_SEEN, gBattleMons[gActiveBank].personality);
+                HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality);
             }
         }
         else
         {
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT)
             {
                 if (!(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
                                       | BATTLE_TYPE_FRONTIER
@@ -3138,28 +3138,28 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
                                       | BATTLE_TYPE_x2000000
                                       | BATTLE_TYPE_x4000000)))
                 {
-                    HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), FLAG_SET_SEEN, gBattleMons[gActiveBank].personality);
+                    HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality);
                 }
                 EmitLoadMonSprite(0);
-                MarkBufferBankForExecution(gActiveBank);
-                gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES, NULL);
+                MarkBufferBankForExecution(gActiveBattler);
+                gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES, NULL);
             }
         }
 
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
-            if (GetBankPosition(gActiveBank) == B_POSITION_PLAYER_RIGHT
-             || GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
+            if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_RIGHT
+             || GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_RIGHT)
             {
                 EmitDrawTrainerPic(0);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
         }
 
-        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBankPosition(gActiveBank) == B_POSITION_OPPONENT_RIGHT)
+        if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_RIGHT)
         {
             EmitDrawTrainerPic(0);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
         }
 
         if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
@@ -3192,9 +3192,9 @@ static void BattleIntroDrawPartySummaryScreens(void)
                 hpStatus[i].status = GetMonData(&gEnemyParty[i], MON_DATA_STATUS);
             }
         }
-        gActiveBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+        gActiveBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
 
         for (i = 0; i < PARTY_SIZE; i++)
         {
@@ -3210,9 +3210,9 @@ static void BattleIntroDrawPartySummaryScreens(void)
                 hpStatus[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
             }
         }
-        gActiveBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+        gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
 
         gBattleMainFunc = BattleIntroPrintTrainerWantsToBattle;
     }
@@ -3246,8 +3246,8 @@ static void BattleIntroPrintTrainerWantsToBattle(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
-        PrepareStringBattle(STRINGID_INTROMSG, gActiveBank);
+        gActiveBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        PrepareStringBattle(STRINGID_INTROMSG, gActiveBattler);
         gBattleMainFunc = BattleIntroPrintOpponentSendsOut;
     }
 }
@@ -3280,7 +3280,7 @@ static void BattleIntroPrintOpponentSendsOut(void)
     else
         position = B_POSITION_OPPONENT_LEFT;
 
-    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(position));
+    PrepareStringBattle(STRINGID_INTROSENDOUT, GetBattlerAtPosition(position));
     gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
 }
 
@@ -3300,12 +3300,12 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void)
     else
         position = B_POSITION_OPPONENT_RIGHT;
 
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
-        if (GetBankPosition(gActiveBank) == position)
+        if (GetBattlerPosition(gActiveBattler) == position)
         {
             EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
         }
     }
 
@@ -3332,12 +3332,12 @@ static void BattleIntroOpponent1SendsOutMonAnimation(void)
     if (gBattleExecBuffer)
         return;
 
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
-        if (GetBankPosition(gActiveBank) == position)
+        if (GetBattlerPosition(gActiveBattler) == position)
         {
             EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS))
             {
                 gBattleMainFunc = BattleIntroOpponent2SendsOutMonAnimation;
@@ -3387,9 +3387,9 @@ _0803B29A:\n\
 	ldr r2, [r0]\n\
 	cmp r2, 0\n\
 	bne _0803B2F2\n\
-	ldr r0, =gActiveBank\n\
+	ldr r0, =gActiveBattler\n\
 	strb r2, [r0]\n\
-	ldr r1, =gBattleBanksCount\n\
+	ldr r1, =gBattlersCount\n\
 	adds r4, r0, 0\n\
 	ldrb r1, [r1]\n\
 	cmp r2, r1\n\
@@ -3397,7 +3397,7 @@ _0803B29A:\n\
 	adds r6, r4, 0\n\
 _0803B2B2:\n\
 	ldrb r0, [r4]\n\
-	bl GetBankPosition\n\
+	bl GetBattlerPosition\n\
 	lsls r0, 24\n\
 	lsrs r0, 24\n\
 	cmp r0, r5\n\
@@ -3416,10 +3416,10 @@ _0803B2D8:\n\
 	ldrb r0, [r6]\n\
 	adds r0, 0x1\n\
 	strb r0, [r6]\n\
-	ldr r1, =gBattleBanksCount\n\
+	ldr r1, =gBattlersCount\n\
 	lsls r0, 24\n\
 	lsrs r0, 24\n\
-	ldr r4, =gActiveBank\n\
+	ldr r4, =gActiveBattler\n\
 	ldrb r1, [r1]\n\
 	cmp r0, r1\n\
 	bcc _0803B2B2\n\
@@ -3442,16 +3442,16 @@ static void BattleIntroRecordMonsToDex(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT
              && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
                                       | BATTLE_TYPE_FRONTIER
                                       | BATTLE_TYPE_LINK
                                       | BATTLE_TYPE_x2000000
                                       | BATTLE_TYPE_x4000000)))
             {
-                HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), FLAG_SET_SEEN, gBattleMons[gActiveBank].personality);
+                HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality);
             }
         }
         gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
@@ -3483,7 +3483,7 @@ static void BattleIntroPrintPlayerSendsOut(void)
             position = B_POSITION_PLAYER_LEFT;
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
-            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByPosition(position));
+            PrepareStringBattle(STRINGID_INTROSENDOUT, GetBattlerAtPosition(position));
 
         gBattleMainFunc = BattleIntroPlayer1SendsOutMonAnimation;
     }
@@ -3505,12 +3505,12 @@ static void BattleIntroPlayer2SendsOutMonAnimation(void)
     else
         position = B_POSITION_PLAYER_RIGHT;
 
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
-        if (GetBankPosition(gActiveBank) == position)
+        if (GetBattlerPosition(gActiveBattler) == position)
         {
             EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
         }
     }
 
@@ -3540,12 +3540,12 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void)
     if (gBattleExecBuffer)
         return;
 
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
-        if (GetBankPosition(gActiveBank) == position)
+        if (GetBattlerPosition(gActiveBattler) == position)
         {
             EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             if (gBattleTypeFlags & (BATTLE_TYPE_MULTI))
             {
                 gBattleMainFunc = BattleIntroPlayer2SendsOutMonAnimation;
@@ -3565,12 +3565,12 @@ void sub_803B598(void) // unused
 {
     if (gBattleExecBuffer == 0)
     {
-        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
-            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
             {
-                EmitSwitchInAnim(0, gBattlePartyID[gActiveBank], FALSE);
-                MarkBufferBankForExecution(gActiveBank);
+                EmitSwitchInAnim(0, gBattlePartyID[gActiveBattler], FALSE);
+                MarkBufferBankForExecution(gActiveBattler);
             }
         }
 
@@ -3593,13 +3593,13 @@ static void TryDoEventsBeforeFirstTurn(void)
 
     if (gBattleStruct->switchInAbilitiesCounter == 0)
     {
-        for (i = 0; i < gBattleBanksCount; i++)
-            gBanksByTurnOrder[i] = i;
-        for (i = 0; i < gBattleBanksCount - 1; i++)
+        for (i = 0; i < gBattlersCount; i++)
+            gBattleTurnOrder[i] = i;
+        for (i = 0; i < gBattlersCount - 1; i++)
         {
-            for (j = i + 1; j < gBattleBanksCount; j++)
+            for (j = i + 1; j < gBattlersCount; j++)
             {
-                if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], TRUE) != 0)
+                if (GetWhoStrikesFirst(gBattleTurnOrder[i], gBattleTurnOrder[j], TRUE) != 0)
                     SwapTurnOrder(i, j);
             }
         }
@@ -3611,9 +3611,9 @@ static void TryDoEventsBeforeFirstTurn(void)
         return;
     }
     // check all switch in abilities happening from the fastest mon to slowest
-    while (gBattleStruct->switchInAbilitiesCounter < gBattleBanksCount)
+    while (gBattleStruct->switchInAbilitiesCounter < gBattlersCount)
     {
-        if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gBanksByTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0)
+        if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gBattleTurnOrder[gBattleStruct->switchInAbilitiesCounter], 0, 0, 0) != 0)
             effect++;
 
         gBattleStruct->switchInAbilitiesCounter++;
@@ -3626,9 +3626,9 @@ static void TryDoEventsBeforeFirstTurn(void)
     if (AbilityBattleEffects(ABILITYEFFECT_TRACE, 0, 0, 0, 0) != 0)
         return;
     // check all switch in items having effect from the fastest mon to slowest
-    while (gBattleStruct->switchInItemsCounter < gBattleBanksCount)
+    while (gBattleStruct->switchInItemsCounter < gBattlersCount)
     {
-        if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBanksByTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0)
+        if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gBattleTurnOrder[gBattleStruct->switchInItemsCounter], 0) != 0)
             effect++;
 
         gBattleStruct->switchInItemsCounter++;
@@ -3636,7 +3636,7 @@ static void TryDoEventsBeforeFirstTurn(void)
         if (effect)
             return;
     }
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         *(gBattleStruct->monToSwitchIntoId + i) = 6;
         gActionForBanks[i] = ACTION_INIT_VALUE;
@@ -3644,7 +3644,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     }
     TurnValuesCleanUp(FALSE);
     SpecialStatusesClear();
-    *(&gBattleStruct->field_91) = gAbsentBankFlags;
+    *(&gBattleStruct->field_91) = gAbsentBattlerFlags;
     BattleHandleAddTextPrinter(gText_EmptyString3, 0);
     gBattleMainFunc = HandleTurnActionSelectionState;
     ResetSentPokesToOpponentValue();
@@ -3652,7 +3652,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
         gBattleCommunication[i] = 0;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
         gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
 
     *(&gBattleStruct->turnEffectsTracker) = 0;
@@ -3682,7 +3682,7 @@ static void HandleEndTurn_ContinueBattle(void)
         gBattleMainFunc = BattleTurnPassed;
         for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
             gBattleCommunication[i] = 0;
-        for (i = 0; i < gBattleBanksCount; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
             gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
             if ((gBattleMons[i].status1 & STATUS1_SLEEP) && (gBattleMons[i].status2 & STATUS2_MULTIPLETURNS))
@@ -3742,7 +3742,7 @@ void BattleTurnPassed(void)
         gBattleStruct->field_DA++;
     }
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         gActionForBanks[i] = ACTION_INIT_VALUE;
         gChosenMovesByBanks[i] = MOVE_NONE;
@@ -3751,7 +3751,7 @@ void BattleTurnPassed(void)
     for (i = 0; i < 4; i++)
         *(gBattleStruct->monToSwitchIntoId + i) = 6;
 
-    *(&gBattleStruct->field_91) = gAbsentBankFlags;
+    *(&gBattleStruct->field_91) = gAbsentBattlerFlags;
     BattleHandleAddTextPrinter(gText_EmptyString3, 0);
     gBattleMainFunc = HandleTurnActionSelectionState;
     gRandomTurnNumber = Random();
@@ -3768,54 +3768,54 @@ u8 IsRunningFromBattleImpossible(void)
     u8 side;
     s32 i;
 
-    if (gBattleMons[gActiveBank].item == ITEM_ENIGMA_BERRY)
-        holdEffect = gEnigmaBerries[gActiveBank].holdEffect;
+    if (gBattleMons[gActiveBattler].item == ITEM_ENIGMA_BERRY)
+        holdEffect = gEnigmaBerries[gActiveBattler].holdEffect;
     else
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBank].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
 
-    gStringBank = gActiveBank;
+    gStringBank = gActiveBattler;
 
     if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
         return 0;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         return 0;
-    if (gBattleMons[gActiveBank].ability == ABILITY_RUN_AWAY)
+    if (gBattleMons[gActiveBattler].ability == ABILITY_RUN_AWAY)
         return 0;
 
-    side = GetBankSide(gActiveBank);
+    side = GetBattlerSide(gActiveBattler);
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
-        if (side != GetBankSide(i)
+        if (side != GetBattlerSide(i)
          && gBattleMons[i].ability == ABILITY_SHADOW_TAG)
         {
-            gBattleScripting.bank = i;
+            gBattleScripting.battler = i;
             gLastUsedAbility = gBattleMons[i].ability;
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
             return 2;
         }
-        if (side != GetBankSide(i)
-         && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE
-         && gBattleMons[gActiveBank].type1 != TYPE_FLYING
-         && gBattleMons[gActiveBank].type2 != TYPE_FLYING
+        if (side != GetBattlerSide(i)
+         && gBattleMons[gActiveBattler].ability != ABILITY_LEVITATE
+         && gBattleMons[gActiveBattler].type1 != TYPE_FLYING
+         && gBattleMons[gActiveBattler].type2 != TYPE_FLYING
          && gBattleMons[i].ability == ABILITY_ARENA_TRAP)
         {
-            gBattleScripting.bank = i;
+            gBattleScripting.battler = i;
             gLastUsedAbility = gBattleMons[i].ability;
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
             return 2;
         }
     }
-    i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK, gActiveBank, ABILITY_MAGNET_PULL, 0, 0);
-    if (i != 0 && (gBattleMons[gActiveBank].type1 == TYPE_STEEL || gBattleMons[gActiveBank].type2 == TYPE_STEEL))
+    i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK, gActiveBattler, ABILITY_MAGNET_PULL, 0, 0);
+    if (i != 0 && (gBattleMons[gActiveBattler].type1 == TYPE_STEEL || gBattleMons[gActiveBattler].type2 == TYPE_STEEL))
     {
-        gBattleScripting.bank = i - 1;
+        gBattleScripting.battler = i - 1;
         gLastUsedAbility = gBattleMons[i - 1].ability;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         return 2;
     }
-    if ((gBattleMons[gActiveBank].status2 & (STATUS2_ESCAPE_PREVENTION | STATUS2_WRAPPED))
-        || (gStatuses3[gActiveBank] & STATUS3_ROOTED))
+    if ((gBattleMons[gActiveBattler].status2 & (STATUS2_ESCAPE_PREVENTION | STATUS2_WRAPPED))
+        || (gStatuses3[gActiveBattler] & STATUS3_ROOTED))
     {
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         return 1;
@@ -3848,7 +3848,7 @@ void sub_803BDA0(u8 bank)
         for (i = 0; i < 3; i++)
         {
             *(bank * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
-            *((bank ^ BIT_MON) * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+            *((bank ^ BIT_FLANK) * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
         }
     }
     else
@@ -3878,91 +3878,91 @@ static void HandleTurnActionSelectionState(void)
     s32 i;
 
     gBattleCommunication[ACTIONS_CONFIRMED_COUNT] = 0;
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
-        u8 position = GetBankPosition(gActiveBank);
-        switch (gBattleCommunication[gActiveBank])
+        u8 position = GetBattlerPosition(gActiveBattler);
+        switch (gBattleCommunication[gActiveBattler])
         {
         case STATE_TURN_START_RECORD: // recorded battle related on start of every turn
             RecordedBattle_CopyBankMoves();
-            gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
+            gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN;
             break;
         case STATE_BEFORE_ACTION_CHOSEN: // choose an action
-            *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
+            *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI
-                || !(position & BIT_MON)
-                || gBattleStruct->field_91 & gBitTable[GetBankByPosition(position ^ BIT_MON)]
-                || gBattleCommunication[GetBankByPosition(position ^ BIT_MON)] == 5)
+                || !(position & BIT_FLANK)
+                || gBattleStruct->field_91 & gBitTable[GetBattlerAtPosition(position ^ BIT_FLANK)]
+                || gBattleCommunication[GetBattlerAtPosition(position ^ BIT_FLANK)] == 5)
             {
-                if (gBattleStruct->field_91 & gBitTable[gActiveBank])
+                if (gBattleStruct->field_91 & gBitTable[gActiveBattler])
                 {
-                    gActionForBanks[gActiveBank] = ACTION_NOTHING_FAINTED;
+                    gActionForBanks[gActiveBattler] = ACTION_NOTHING_FAINTED;
                     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
-                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED;
+                        gBattleCommunication[gActiveBattler] = STATE_WAIT_ACTION_CONFIRMED;
                     else
-                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
+                        gBattleCommunication[gActiveBattler] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                 }
                 else
                 {
-                    if (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS
-                        || gBattleMons[gActiveBank].status2 & STATUS2_RECHARGE)
+                    if (gBattleMons[gActiveBattler].status2 & STATUS2_MULTIPLETURNS
+                        || gBattleMons[gActiveBattler].status2 & STATUS2_RECHARGE)
                     {
-                        gActionForBanks[gActiveBank] = ACTION_USE_MOVE;
-                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
+                        gActionForBanks[gActiveBattler] = ACTION_USE_MOVE;
+                        gBattleCommunication[gActiveBattler] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                     }
                     else
                     {
                         EmitChooseAction(0, gActionForBanks[0], gBattleBufferB[0][1] | (gBattleBufferB[0][2] << 8));
-                        MarkBufferBankForExecution(gActiveBank);
-                        gBattleCommunication[gActiveBank]++;
+                        MarkBufferBankForExecution(gActiveBattler);
+                        gBattleCommunication[gActiveBattler]++;
                     }
                 }
             }
             break;
         case STATE_WAIT_ACTION_CHOSEN: // try to perform an action
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
-                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]);
-                gActionForBanks[gActiveBank] = gBattleBufferB[gActiveBank][1];
+                RecordedBattle_SetBankAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]);
+                gActionForBanks[gActiveBattler] = gBattleBufferB[gActiveBattler][1];
 
-                switch (gBattleBufferB[gActiveBank][1])
+                switch (gBattleBufferB[gActiveBattler][1])
                 {
                 case ACTION_USE_MOVE:
                     if (AreAllMovesUnusable())
                     {
-                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
-                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
-                        *(gBattleStruct->moveTarget + gActiveBank) = gBattleBufferB[gActiveBank][3];
+                        gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
+                        *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
+                        *(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
+                        *(gBattleStruct->moveTarget + gActiveBattler) = gBattleBufferB[gActiveBattler][3];
                         return;
                     }
-                    else if (gDisableStructs[gActiveBank].encoredMove != 0)
+                    else if (gDisableStructs[gActiveBattler].encoredMove != 0)
                     {
-                        gChosenMovesByBanks[gActiveBank] = gDisableStructs[gActiveBank].encoredMove;
-                        *(gBattleStruct->chosenMovePositions + gActiveBank) = gDisableStructs[gActiveBank].encoredMovePos;
-                        gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
+                        gChosenMovesByBanks[gActiveBattler] = gDisableStructs[gActiveBattler].encoredMove;
+                        *(gBattleStruct->chosenMovePositions + gActiveBattler) = gDisableStructs[gActiveBattler].encoredMovePos;
+                        gBattleCommunication[gActiveBattler] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                         return;
                     }
                     else
                     {
                         struct ChooseMoveStruct moveInfo;
 
-                        moveInfo.species = gBattleMons[gActiveBank].species;
-                        moveInfo.monType1 = gBattleMons[gActiveBank].type1;
-                        moveInfo.monType2 = gBattleMons[gActiveBank].type2;
+                        moveInfo.species = gBattleMons[gActiveBattler].species;
+                        moveInfo.monType1 = gBattleMons[gActiveBattler].type1;
+                        moveInfo.monType2 = gBattleMons[gActiveBattler].type2;
 
                         for (i = 0; i < 4; i++)
                         {
-                            moveInfo.moves[i] = gBattleMons[gActiveBank].moves[i];
-                            moveInfo.currentPp[i] = gBattleMons[gActiveBank].pp[i];
+                            moveInfo.moves[i] = gBattleMons[gActiveBattler].moves[i];
+                            moveInfo.currentPp[i] = gBattleMons[gActiveBattler].pp[i];
                             moveInfo.maxPp[i] = CalculatePPWithBonus(
-                                                            gBattleMons[gActiveBank].moves[i],
-                                                            gBattleMons[gActiveBank].ppBonuses,
+                                                            gBattleMons[gActiveBattler].moves[i],
+                                                            gBattleMons[gActiveBattler].ppBonuses,
                                                             i);
                         }
 
                         EmitChooseMove(0, (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) != 0, FALSE, &moveInfo);
-                        MarkBufferBankForExecution(gActiveBank);
+                        MarkBufferBankForExecution(gActiveBattler);
                     }
                     break;
                 case ACTION_USE_ITEM:
@@ -3971,142 +3971,142 @@ static void HandleTurnActionSelectionState(void)
                                             | BATTLE_TYPE_EREADER_TRAINER
                                             | BATTLE_TYPE_x2000000))
                     {
-                        RecordedBattle_ClearBankAction(gActiveBank, 1);
-                        gSelectionBattleScripts[gActiveBank] = BattleScript_ActionSelectionItemsCantBeUsed;
-                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
-                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
+                        RecordedBattle_ClearBankAction(gActiveBattler, 1);
+                        gSelectionBattleScripts[gActiveBattler] = BattleScript_ActionSelectionItemsCantBeUsed;
+                        gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
+                        *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
+                        *(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_BEFORE_ACTION_CHOSEN;
                         return;
                     }
                     else
                     {
-                        EmitChooseItem(0, gBattleStruct->field_60[gActiveBank]);
-                        MarkBufferBankForExecution(gActiveBank);
+                        EmitChooseItem(0, gBattleStruct->field_60[gActiveBattler]);
+                        MarkBufferBankForExecution(gActiveBattler);
                     }
                     break;
                 case ACTION_SWITCH:
-                    *(gBattleStruct->field_58 + gActiveBank) = gBattlePartyID[gActiveBank];
-                    if (gBattleMons[gActiveBank].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)
+                    *(gBattleStruct->field_58 + gActiveBattler) = gBattlePartyID[gActiveBattler];
+                    if (gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)
                         || gBattleTypeFlags & BATTLE_TYPE_ARENA
-                        || gStatuses3[gActiveBank] & STATUS3_ROOTED)
+                        || gStatuses3[gActiveBattler] & STATUS3_ROOTED)
                     {
-                        EmitChoosePokemon(0, 2, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                        EmitChoosePokemon(0, 2, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                     }
-                    else if ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBank, ABILITY_SHADOW_TAG, 0, 0))
-                             || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBank, ABILITY_ARENA_TRAP, 0, 0))
-                                 && gBattleMons[gActiveBank].type1 != TYPE_FLYING
-                                 && gBattleMons[gActiveBank].type2 != TYPE_FLYING
-                                 && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE)
-                             || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK, gActiveBank, ABILITY_MAGNET_PULL, 0, 0))
-                                 && (gBattleMons[gActiveBank].type1 == TYPE_STEEL
-                                     || gBattleMons[gActiveBank].type2 == TYPE_STEEL)))
+                    else if ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBattler, ABILITY_SHADOW_TAG, 0, 0))
+                             || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBattler, ABILITY_ARENA_TRAP, 0, 0))
+                                 && gBattleMons[gActiveBattler].type1 != TYPE_FLYING
+                                 && gBattleMons[gActiveBattler].type2 != TYPE_FLYING
+                                 && gBattleMons[gActiveBattler].ability != ABILITY_LEVITATE)
+                             || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK, gActiveBattler, ABILITY_MAGNET_PULL, 0, 0))
+                                 && (gBattleMons[gActiveBattler].type1 == TYPE_STEEL
+                                     || gBattleMons[gActiveBattler].type2 == TYPE_STEEL)))
                     {
-                        EmitChoosePokemon(0, ((i - 1) << 4) | 4, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBank]);
+                        EmitChoosePokemon(0, ((i - 1) << 4) | 4, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]);
                     }
                     else
                     {
-                        if (gActiveBank == 2 && gActionForBanks[0] == ACTION_SWITCH)
-                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
-                        else if (gActiveBank == 3 && gActionForBanks[1] == ACTION_SWITCH)
-                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                        if (gActiveBattler == 2 && gActionForBanks[0] == ACTION_SWITCH)
+                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
+                        else if (gActiveBattler == 3 && gActionForBanks[1] == ACTION_SWITCH)
+                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                         else
-                            EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
+                            EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                     }
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                     break;
                 case ACTION_SAFARI_ZONE_BALL:
                     if (IsPlayerPartyAndPokemonStorageFull())
                     {
-                        gSelectionBattleScripts[gActiveBank] = BattleScript_PrintFullBox;
-                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
-                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
+                        gSelectionBattleScripts[gActiveBattler] = BattleScript_PrintFullBox;
+                        gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
+                        *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
+                        *(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_BEFORE_ACTION_CHOSEN;
                         return;
                     }
                     break;
                 case ACTION_POKEBLOCK_CASE:
-                    EmitChooseItem(0, gBattleStruct->field_60[gActiveBank]);
-                    MarkBufferBankForExecution(gActiveBank);
+                    EmitChooseItem(0, gBattleStruct->field_60[gActiveBattler]);
+                    MarkBufferBankForExecution(gActiveBattler);
                     break;
                 case ACTION_CANCEL_PARTNER:
-                    gBattleCommunication[gActiveBank] = 7;
-                    gBattleCommunication[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] = 1;
-                    RecordedBattle_ClearBankAction(gActiveBank, 1);
-                    if (gBattleMons[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_MULTIPLETURNS
-                        || gBattleMons[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].status2 & STATUS2_RECHARGE)
+                    gBattleCommunication[gActiveBattler] = 7;
+                    gBattleCommunication[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] = 1;
+                    RecordedBattle_ClearBankAction(gActiveBattler, 1);
+                    if (gBattleMons[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].status2 & STATUS2_MULTIPLETURNS
+                        || gBattleMons[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].status2 & STATUS2_RECHARGE)
                     {
                         EmitCmd50(0);
-                        MarkBufferBankForExecution(gActiveBank);
+                        MarkBufferBankForExecution(gActiveBattler);
                         return;
                     }
-                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_SWITCH)
+                    else if (gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_SWITCH)
                     {
-                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 2);
+                        RecordedBattle_ClearBankAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 2);
                     }
-                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_RUN)
+                    else if (gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_RUN)
                     {
-                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
+                        RecordedBattle_ClearBankAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
                     }
-                    else if (gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE
-                             && (gProtectStructs[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].onlyStruggle
-                                || gDisableStructs[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)].encoredMove))
+                    else if (gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_USE_MOVE
+                             && (gProtectStructs[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].onlyStruggle
+                                || gDisableStructs[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].encoredMove))
                     {
-                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
+                        RecordedBattle_ClearBankAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
                     }
                     else if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-                             && gActionForBanks[GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON)] == ACTION_USE_MOVE)
+                             && gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_USE_MOVE)
                     {
                         gRngValue = gBattlePalaceMoveSelectionRngValue;
-                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 1);
+                        RecordedBattle_ClearBankAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
                     }
                     else
                     {
-                        RecordedBattle_ClearBankAction(GetBankByPosition(GetBankPosition(gActiveBank) ^ BIT_MON), 3);
+                        RecordedBattle_ClearBankAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 3);
                     }
                     EmitCmd50(0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                     return;
                 }
 
                 if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
                     && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000)
-                    && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
+                    && gBattleBufferB[gActiveBattler][1] == ACTION_RUN)
                 {
-                    gSelectionBattleScripts[gActiveBank] = BattleScript_AskIfWantsToForfeitMatch;
-                    gBattleCommunication[gActiveBank] = 8;
-                    *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                    *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
+                    gSelectionBattleScripts[gActiveBattler] = BattleScript_AskIfWantsToForfeitMatch;
+                    gBattleCommunication[gActiveBattler] = 8;
+                    *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
+                    *(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_BEFORE_ACTION_CHOSEN;
                     return;
                 }
                 else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
                          && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-                         && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
+                         && gBattleBufferB[gActiveBattler][1] == ACTION_RUN)
                 {
                     BattleScriptExecute(BattleScript_PrintCantRunFromTrainer);
-                    gBattleCommunication[gActiveBank] = 1;
+                    gBattleCommunication[gActiveBattler] = 1;
                 }
                 else if (IsRunningFromBattleImpossible()
-                         && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
+                         && gBattleBufferB[gActiveBattler][1] == ACTION_RUN)
                 {
-                    gSelectionBattleScripts[gActiveBank] = BattleScript_PrintCantEscapeFromBattle;
-                    gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
-                    *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                    *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
+                    gSelectionBattleScripts[gActiveBattler] = BattleScript_PrintCantEscapeFromBattle;
+                    gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
+                    *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
+                    *(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_BEFORE_ACTION_CHOSEN;
                     return;
                 }
                 else
                 {
-                    gBattleCommunication[gActiveBank]++;
+                    gBattleCommunication[gActiveBattler]++;
                 }
             }
             break;
         case STATE_WAIT_ACTION_CASE_CHOSEN:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
-                switch (gActionForBanks[gActiveBank])
+                switch (gActionForBanks[gActiveBattler])
                 {
                 case ACTION_USE_MOVE:
-                    switch (gBattleBufferB[gActiveBank][1])
+                    switch (gBattleBufferB[gActiveBattler][1])
                     {
                     case 3:
                     case 4:
@@ -4115,107 +4115,107 @@ static void HandleTurnActionSelectionState(void)
                     case 7:
                     case 8:
                     case 9:
-                        gActionForBanks[gActiveBank] = gBattleBufferB[gActiveBank][1];
+                        gActionForBanks[gActiveBattler] = gBattleBufferB[gActiveBattler][1];
                         return;
                     case 15:
-                        gActionForBanks[gActiveBank] = ACTION_SWITCH;
+                        gActionForBanks[gActiveBattler] = ACTION_SWITCH;
                         sub_803CDF8();
                         return;
                     default:
                         sub_818603C(2);
-                        if ((gBattleBufferB[gActiveBank][2] | (gBattleBufferB[gActiveBank][3] << 8)) == 0xFFFF)
+                        if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == 0xFFFF)
                         {
-                            gBattleCommunication[gActiveBank] = 1;
-                            RecordedBattle_ClearBankAction(gActiveBank, 1);
+                            gBattleCommunication[gActiveBattler] = 1;
+                            RecordedBattle_ClearBankAction(gActiveBattler, 1);
                         }
                         else if (TrySetCantSelectMoveBattleScript())
                         {
-                            RecordedBattle_ClearBankAction(gActiveBank, 1);
-                            gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
-                            *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
-                            gBattleBufferB[gActiveBank][1] = 0;
-                            *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_WAIT_ACTION_CHOSEN;
+                            RecordedBattle_ClearBankAction(gActiveBattler, 1);
+                            gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
+                            *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
+                            gBattleBufferB[gActiveBattler][1] = 0;
+                            *(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_WAIT_ACTION_CHOSEN;
                             return;
                         }
                         else
                         {
                             if (!(gBattleTypeFlags & BATTLE_TYPE_PALACE))
                             {
-                                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][2]);
-                                RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][3]);
+                                RecordedBattle_SetBankAction(gActiveBattler, gBattleBufferB[gActiveBattler][2]);
+                                RecordedBattle_SetBankAction(gActiveBattler, gBattleBufferB[gActiveBattler][3]);
                             }
-                            *(gBattleStruct->chosenMovePositions + gActiveBank) = gBattleBufferB[gActiveBank][2];
-                            gChosenMovesByBanks[gActiveBank] = gBattleMons[gActiveBank].moves[*(gBattleStruct->chosenMovePositions + gActiveBank)];
-                            *(gBattleStruct->moveTarget + gActiveBank) = gBattleBufferB[gActiveBank][3];
-                            gBattleCommunication[gActiveBank]++;
+                            *(gBattleStruct->chosenMovePositions + gActiveBattler) = gBattleBufferB[gActiveBattler][2];
+                            gChosenMovesByBanks[gActiveBattler] = gBattleMons[gActiveBattler].moves[*(gBattleStruct->chosenMovePositions + gActiveBattler)];
+                            *(gBattleStruct->moveTarget + gActiveBattler) = gBattleBufferB[gActiveBattler][3];
+                            gBattleCommunication[gActiveBattler]++;
                         }
                         break;
                     }
                     break;
                 case ACTION_USE_ITEM:
-                    if ((gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8)) == 0)
+                    if ((gBattleBufferB[gActiveBattler][1] | (gBattleBufferB[gActiveBattler][2] << 8)) == 0)
                     {
-                        gBattleCommunication[gActiveBank] = 1;
+                        gBattleCommunication[gActiveBattler] = 1;
                     }
                     else
                     {
-                        gLastUsedItem = (gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8));
-                        gBattleCommunication[gActiveBank]++;
+                        gLastUsedItem = (gBattleBufferB[gActiveBattler][1] | (gBattleBufferB[gActiveBattler][2] << 8));
+                        gBattleCommunication[gActiveBattler]++;
                     }
                     break;
                 case ACTION_SWITCH:
-                    if (gBattleBufferB[gActiveBank][1] == 6)
+                    if (gBattleBufferB[gActiveBattler][1] == 6)
                     {
-                        gBattleCommunication[gActiveBank] = 1;
-                        RecordedBattle_ClearBankAction(gActiveBank, 1);
+                        gBattleCommunication[gActiveBattler] = 1;
+                        RecordedBattle_ClearBankAction(gActiveBattler, 1);
                     }
                     else
                     {
                         sub_803CDF8();
-                        gBattleCommunication[gActiveBank]++;
+                        gBattleCommunication[gActiveBattler]++;
                     }
                     break;
                 case ACTION_RUN:
                     gHitMarker |= HITMARKER_RUN;
-                    gBattleCommunication[gActiveBank]++;
+                    gBattleCommunication[gActiveBattler]++;
                     break;
                 case ACTION_WATCHES_CAREFULLY:
-                    gBattleCommunication[gActiveBank]++;
+                    gBattleCommunication[gActiveBattler]++;
                     break;
                 case ACTION_SAFARI_ZONE_BALL:
-                    gBattleCommunication[gActiveBank]++;
+                    gBattleCommunication[gActiveBattler]++;
                     break;
                 case ACTION_POKEBLOCK_CASE:
-                    if ((gBattleBufferB[gActiveBank][1] | (gBattleBufferB[gActiveBank][2] << 8)) != 0)
+                    if ((gBattleBufferB[gActiveBattler][1] | (gBattleBufferB[gActiveBattler][2] << 8)) != 0)
                     {
-                        gBattleCommunication[gActiveBank]++;
+                        gBattleCommunication[gActiveBattler]++;
                     }
                     else
                     {
-                        gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
+                        gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN;
                     }
                     break;
                 case ACTION_GO_NEAR:
-                    gBattleCommunication[gActiveBank]++;
+                    gBattleCommunication[gActiveBattler]++;
                     break;
                 case ACTION_SAFARI_ZONE_RUN:
                     gHitMarker |= HITMARKER_RUN;
-                    gBattleCommunication[gActiveBank]++;
+                    gBattleCommunication[gActiveBattler]++;
                     break;
                 case ACTION_9:
-                    gBattleCommunication[gActiveBank]++;
+                    gBattleCommunication[gActiveBattler]++;
                     break;
                 }
             }
             break;
         case STATE_WAIT_ACTION_CONFIRMED_STANDBY:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
                 i = (sub_803CDB8() != 0);
 
                 if (((gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_DOUBLE)) != BATTLE_TYPE_DOUBLE)
-                    || (position & BIT_MON)
-                    || (*(&gBattleStruct->field_91) & gBitTable[GetBankByPosition(position ^ BIT_MON)]))
+                    || (position & BIT_FLANK)
+                    || (*(&gBattleStruct->field_91) & gBitTable[GetBattlerAtPosition(position ^ BIT_FLANK)]))
                 {
                     EmitLinkStandbyMsg(0, 0, i);
                 }
@@ -4223,76 +4223,76 @@ static void HandleTurnActionSelectionState(void)
                 {
                     EmitLinkStandbyMsg(0, 1, i);
                 }
-                MarkBufferBankForExecution(gActiveBank);
-                gBattleCommunication[gActiveBank]++;
+                MarkBufferBankForExecution(gActiveBattler);
+                gBattleCommunication[gActiveBattler]++;
             }
             break;
         case STATE_WAIT_ACTION_CONFIRMED:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
                 gBattleCommunication[ACTIONS_CONFIRMED_COUNT]++;
             }
             break;
         case STATE_SELECTION_SCRIPT:
-            if (*(gBattleStruct->selectionScriptFinished + gActiveBank))
+            if (*(gBattleStruct->selectionScriptFinished + gActiveBattler))
             {
-                gBattleCommunication[gActiveBank] = *(gBattleStruct->stateIdAfterSelScript + gActiveBank);
+                gBattleCommunication[gActiveBattler] = *(gBattleStruct->stateIdAfterSelScript + gActiveBattler);
             }
             else
             {
-                gBankAttacker = gActiveBank;
-                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBank];
-                if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+                gBattleAttacker = gActiveBattler;
+                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBattler];
+                if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
                 {
                     gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
                 }
-                gSelectionBattleScripts[gActiveBank] = gBattlescriptCurrInstr;
+                gSelectionBattleScripts[gActiveBattler] = gBattlescriptCurrInstr;
             }
             break;
         case STATE_WAIT_SET_BEFORE_ACTION:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+            if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
-                gBattleCommunication[gActiveBank] = 1;
+                gBattleCommunication[gActiveBattler] = 1;
             }
             break;
         case STATE_SELECTION_SCRIPT_MAY_RUN:
-            if (*(gBattleStruct->selectionScriptFinished + gActiveBank))
+            if (*(gBattleStruct->selectionScriptFinished + gActiveBattler))
             {
-                if (gBattleBufferB[gActiveBank][1] == 13)
+                if (gBattleBufferB[gActiveBattler][1] == 13)
                 {
                     gHitMarker |= HITMARKER_RUN;
-                    gActionForBanks[gActiveBank] = ACTION_RUN;
-                    gBattleCommunication[gActiveBank] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
+                    gActionForBanks[gActiveBattler] = ACTION_RUN;
+                    gBattleCommunication[gActiveBattler] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                 }
                 else
                 {
-                    RecordedBattle_ClearBankAction(gActiveBank, 1);
-                    gBattleCommunication[gActiveBank] = *(gBattleStruct->stateIdAfterSelScript + gActiveBank);
+                    RecordedBattle_ClearBankAction(gActiveBattler, 1);
+                    gBattleCommunication[gActiveBattler] = *(gBattleStruct->stateIdAfterSelScript + gActiveBattler);
                 }
             }
             else
             {
-                gBankAttacker = gActiveBank;
-                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBank];
-                if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
+                gBattleAttacker = gActiveBattler;
+                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBattler];
+                if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
                 {
                     gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
                 }
-                gSelectionBattleScripts[gActiveBank] = gBattlescriptCurrInstr;
+                gSelectionBattleScripts[gActiveBattler] = gBattlescriptCurrInstr;
             }
             break;
         }
     }
 
     // check if everyone chose actions
-    if (gBattleCommunication[ACTIONS_CONFIRMED_COUNT] == gBattleBanksCount)
+    if (gBattleCommunication[ACTIONS_CONFIRMED_COUNT] == gBattlersCount)
     {
         sub_818603C(1);
         gBattleMainFunc = SetActionsAndBanksTurnOrder;
 
         if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
         {
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gActionForBanks[i] == ACTION_SWITCH)
                     sub_80571DC(i, *(gBattleStruct->monToSwitchIntoId + i));
@@ -4305,13 +4305,13 @@ static bool8 sub_803CDB8(void)
 {
     s32 i, var;
 
-    for (var = 0, i = 0; i < gBattleBanksCount; i++)
+    for (var = 0, i = 0; i < gBattlersCount; i++)
     {
         if (gBattleCommunication[i] == 5)
             var++;
     }
 
-    if (var + 1 == gBattleBanksCount)
+    if (var + 1 == gBattlersCount)
         return TRUE;
     else
         return FALSE;
@@ -4319,18 +4319,18 @@ static bool8 sub_803CDB8(void)
 
 static void sub_803CDF8(void)
 {
-    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = gBattleBufferB[gActiveBank][1];
-    RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]);
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = gBattleBufferB[gActiveBattler][1];
+    RecordedBattle_SetBankAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]);
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
-        *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 0) &= 0xF;
-        *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBank][2] & 0xF0);
-        *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 1) = gBattleBufferB[gActiveBank][3];
+        *(gActiveBattler * 3 + (u8*)(gBattleStruct->field_60) + 0) &= 0xF;
+        *(gActiveBattler * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0);
+        *(gActiveBattler * 3 + (u8*)(gBattleStruct->field_60) + 1) = gBattleBufferB[gActiveBattler][3];
 
-        *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 0) &= (0xF0);
-        *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBank][2] & 0xF0) >> 4;
-        *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 2) = gBattleBufferB[gActiveBank][3];
+        *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->field_60) + 0) &= (0xF0);
+        *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0) >> 4;
+        *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->field_60) + 2) = gBattleBufferB[gActiveBattler][3];
     }
 }
 
@@ -4340,9 +4340,9 @@ void SwapTurnOrder(u8 id1, u8 id2)
     gActionsByTurnOrder[id1] = gActionsByTurnOrder[id2];
     gActionsByTurnOrder[id2] = temp;
 
-    temp = gBanksByTurnOrder[id1];
-    gBanksByTurnOrder[id1] = gBanksByTurnOrder[id2];
-    gBanksByTurnOrder[id2] = temp;
+    temp = gBattleTurnOrder[id1];
+    gBattleTurnOrder[id1] = gBattleTurnOrder[id2];
+    gBattleTurnOrder[id2] = temp;
 }
 
 u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
@@ -4392,7 +4392,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
     // badge boost
     if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
         && FlagGet(FLAG_BADGE03_GET)
-        && GetBankSide(bank1) == SIDE_PLAYER)
+        && GetBattlerSide(bank1) == B_SIDE_PLAYER)
     {
         speedBank1 = (speedBank1 * 110) / 100;
     }
@@ -4426,7 +4426,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
     // badge boost
     if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
         && FlagGet(FLAG_BADGE03_GET)
-        && GetBankSide(bank2) == SIDE_PLAYER)
+        && GetBattlerSide(bank2) == B_SIDE_PLAYER)
     {
         speedBank2 = (speedBank2 * 110) / 100;
     }
@@ -4507,10 +4507,10 @@ static void SetActionsAndBanksTurnOrder(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
     {
-        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
-            gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
-            gBanksByTurnOrder[var] = gActiveBank;
+            gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
+            gBattleTurnOrder[var] = gActiveBattler;
             var++;
         }
     }
@@ -4518,9 +4518,9 @@ static void SetActionsAndBanksTurnOrder(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_LINK)
         {
-            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+            for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
-                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                if (gActionForBanks[gActiveBattler] == ACTION_RUN)
                 {
                     var = 5;
                     break;
@@ -4531,27 +4531,27 @@ static void SetActionsAndBanksTurnOrder(void)
         {
             if (gActionForBanks[0] == ACTION_RUN)
             {
-                gActiveBank = 0;
+                gActiveBattler = 0;
                 var = 5;
             }
             if (gActionForBanks[2] == ACTION_RUN)
             {
-                gActiveBank = 2;
+                gActiveBattler = 2;
                 var = 5;
             }
         }
 
         if (var == 5)
         {
-            gActionsByTurnOrder[0] = gActionForBanks[gActiveBank];
-            gBanksByTurnOrder[0] = gActiveBank;
+            gActionsByTurnOrder[0] = gActionForBanks[gActiveBattler];
+            gBattleTurnOrder[0] = gActiveBattler;
             var = 1;
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
-                if (i != gActiveBank)
+                if (i != gActiveBattler)
                 {
                     gActionsByTurnOrder[var] = gActionForBanks[i];
-                    gBanksByTurnOrder[var] = i;
+                    gBattleTurnOrder[var] = i;
                     var++;
                 }
             }
@@ -4561,30 +4561,30 @@ static void SetActionsAndBanksTurnOrder(void)
         }
         else
         {
-            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+            for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
-                if (gActionForBanks[gActiveBank] == ACTION_USE_ITEM || gActionForBanks[gActiveBank] == ACTION_SWITCH)
+                if (gActionForBanks[gActiveBattler] == ACTION_USE_ITEM || gActionForBanks[gActiveBattler] == ACTION_SWITCH)
                 {
-                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
-                    gBanksByTurnOrder[var] = gActiveBank;
+                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
+                    gBattleTurnOrder[var] = gActiveBattler;
                     var++;
                 }
             }
-            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+            for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
-                if (gActionForBanks[gActiveBank] != ACTION_USE_ITEM && gActionForBanks[gActiveBank] != ACTION_SWITCH)
+                if (gActionForBanks[gActiveBattler] != ACTION_USE_ITEM && gActionForBanks[gActiveBattler] != ACTION_SWITCH)
                 {
-                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBank];
-                    gBanksByTurnOrder[var] = gActiveBank;
+                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
+                    gBattleTurnOrder[var] = gActiveBattler;
                     var++;
                 }
             }
-            for (i = 0; i < gBattleBanksCount - 1; i++)
+            for (i = 0; i < gBattlersCount - 1; i++)
             {
-                for (j = i + 1; j < gBattleBanksCount; j++)
+                for (j = i + 1; j < gBattlersCount; j++)
                 {
-                    u8 bank1 = gBanksByTurnOrder[i];
-                    u8 bank2 = gBanksByTurnOrder[j];
+                    u8 bank1 = gBattleTurnOrder[i];
+                    u8 bank2 = gBattleTurnOrder[j];
                     if (gActionsByTurnOrder[i] != ACTION_USE_ITEM
                         && gActionsByTurnOrder[j] != ACTION_USE_ITEM
                         && gActionsByTurnOrder[i] != ACTION_SWITCH
@@ -4606,32 +4606,32 @@ static void TurnValuesCleanUp(bool8 var0)
     s32 i;
     u8 *dataPtr;
 
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
         if (var0)
         {
-            gProtectStructs[gActiveBank].protected = 0;
-            gProtectStructs[gActiveBank].endured = 0;
+            gProtectStructs[gActiveBattler].protected = 0;
+            gProtectStructs[gActiveBattler].endured = 0;
         }
         else
         {
-            dataPtr = (u8*)(&gProtectStructs[gActiveBank]);
+            dataPtr = (u8*)(&gProtectStructs[gActiveBattler]);
             for (i = 0; i < sizeof(struct ProtectStruct); i++)
                 dataPtr[i] = 0;
 
-            if (gDisableStructs[gActiveBank].isFirstTurn)
-                gDisableStructs[gActiveBank].isFirstTurn--;
+            if (gDisableStructs[gActiveBattler].isFirstTurn)
+                gDisableStructs[gActiveBattler].isFirstTurn--;
 
-            if (gDisableStructs[gActiveBank].rechargeCounter)
+            if (gDisableStructs[gActiveBattler].rechargeCounter)
             {
-                gDisableStructs[gActiveBank].rechargeCounter--;
-                if (gDisableStructs[gActiveBank].rechargeCounter == 0)
-                    gBattleMons[gActiveBank].status2 &= ~(STATUS2_RECHARGE);
+                gDisableStructs[gActiveBattler].rechargeCounter--;
+                if (gDisableStructs[gActiveBattler].rechargeCounter == 0)
+                    gBattleMons[gActiveBattler].status2 &= ~(STATUS2_RECHARGE);
             }
         }
 
-        if (gDisableStructs[gActiveBank].substituteHP == 0)
-                gBattleMons[gActiveBank].status2 &= ~(STATUS2_SUBSTITUTE);
+        if (gDisableStructs[gActiveBattler].substituteHP == 0)
+                gBattleMons[gActiveBattler].status2 &= ~(STATUS2_SUBSTITUTE);
     }
 
     gSideTimers[0].followmeTimer = 0;
@@ -4640,10 +4640,10 @@ static void TurnValuesCleanUp(bool8 var0)
 
 static void SpecialStatusesClear(void)
 {
-    for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+    for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
         s32 i;
-        u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBank]);
+        u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBattler]);
 
         for (i = 0; i < sizeof(struct SpecialStatus); i++)
             dataPtr[i] = 0;
@@ -4654,14 +4654,14 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
 {
     if (!(gHitMarker & HITMARKER_RUN))
     {
-        while (gBattleStruct->focusPunchBank < gBattleBanksCount)
+        while (gBattleStruct->focusPunchBank < gBattlersCount)
         {
-            gActiveBank = gBankAttacker = gBattleStruct->focusPunchBank;
+            gActiveBattler = gBattleAttacker = gBattleStruct->focusPunchBank;
             gBattleStruct->focusPunchBank++;
-            if (gChosenMovesByBanks[gActiveBank] == MOVE_FOCUS_PUNCH
-                && !(gBattleMons[gActiveBank].status1 & STATUS1_SLEEP)
-                && !(gDisableStructs[gBankAttacker].truantCounter)
-                && !(gProtectStructs[gActiveBank].onlyStruggle))
+            if (gChosenMovesByBanks[gActiveBattler] == MOVE_FOCUS_PUNCH
+                && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
+                && !(gDisableStructs[gBattleAttacker].truantCounter)
+                && !(gProtectStructs[gActiveBattler].onlyStruggle))
             {
                 BattleScriptExecute(BattleScript_FocusPunchSetUp);
                 return;
@@ -4693,7 +4693,7 @@ static void RunTurnActionsFunctions(void)
     *(&gBattleStruct->savedTurnActionNumber) = gCurrentTurnActionNumber;
     sTurnActionsFuncsTable[gCurrentActionFuncId]();
 
-    if (gCurrentTurnActionNumber >= gBattleBanksCount) // everyone did their actions, turn finished
+    if (gCurrentTurnActionNumber >= gBattlersCount) // everyone did their actions, turn finished
     {
         gHitMarker &= ~(HITMARKER_x100000);
         gBattleMainFunc = sEndTurnFuncsTable[gBattleOutcome & 0x7F];
@@ -4716,7 +4716,7 @@ static void HandleEndTurn_BattleWon(void)
     {
         gSpecialVar_Result = gBattleOutcome;
         gBattleTextBuff1[0] = gBattleOutcome;
-        gBankAttacker = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+        gBattleAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
         gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
     }
@@ -4789,7 +4789,7 @@ static void HandleEndTurn_BattleLost(void)
         else
         {
             gBattleTextBuff1[0] = gBattleOutcome;
-            gBankAttacker = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+            gBattleAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
             gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
             gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
         }
@@ -4819,7 +4819,7 @@ static void HandleEndTurn_RanFromBattle(void)
     }
     else
     {
-        switch (gProtectStructs[gBankAttacker].fleeFlag)
+        switch (gProtectStructs[gBattleAttacker].fleeFlag)
         {
         default:
             gBattlescriptCurrInstr = BattleScript_GotAwaySafely;
@@ -4840,7 +4840,7 @@ static void HandleEndTurn_MonFled(void)
 {
     gCurrentActionFuncId = 0;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker]);
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleAttacker, gBattlePartyID[gBattleAttacker]);
     gBattlescriptCurrInstr = BattleScript_WildMonFled;
 
     gBattleMainFunc = HandleEndTurn_FinishBattle;
@@ -4858,19 +4858,19 @@ static void HandleEndTurn_FinishBattle(void)
                                   | BATTLE_TYPE_WALLY_TUTORIAL
                                   | BATTLE_TYPE_FRONTIER)))
         {
-            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+            for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
-                if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+                if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
                 {
                     if (gBattleResults.playerMon1Species == SPECIES_NONE)
                     {
-                        gBattleResults.playerMon1Species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES, NULL);
-                        GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_NICKNAME, gBattleResults.playerMon1Name);
+                        gBattleResults.playerMon1Species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES, NULL);
+                        GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_NICKNAME, gBattleResults.playerMon1Name);
                     }
                     else
                     {
-                        gBattleResults.playerMon2Species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES, NULL);
-                        GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_NICKNAME, gBattleResults.playerMon2Name);
+                        gBattleResults.playerMon2Species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES, NULL);
+                        GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_NICKNAME, gBattleResults.playerMon2Name);
                     }
                 }
             }
@@ -5017,9 +5017,9 @@ static void HandleAction_UseMove(void)
     u8 side;
     u8 var = 4;
 
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
 
-    if (*(&gBattleStruct->field_91) & gBitTable[gBankAttacker])
+    if (*(&gBattleStruct->field_91) & gBitTable[gBattleAttacker])
     {
         gCurrentActionFuncId = ACTION_FINISHED;
         return;
@@ -5031,186 +5031,186 @@ static void HandleAction_UseMove(void)
     gMoveResultFlags = 0;
     gMultiHitCounter = 0;
     gBattleCommunication[6] = 0;
-    gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBankAttacker);
+    gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattleAttacker);
 
     // choose move
-    if (gProtectStructs[gBankAttacker].onlyStruggle)
+    if (gProtectStructs[gBattleAttacker].onlyStruggle)
     {
-        gProtectStructs[gBankAttacker].onlyStruggle = 0;
+        gProtectStructs[gBattleAttacker].onlyStruggle = 0;
         gCurrentMove = gChosenMove = MOVE_STRUGGLE;
         gHitMarker |= HITMARKER_NO_PPDEDUCT;
-        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
+        *(gBattleStruct->moveTarget + gBattleAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
     }
-    else if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE)
+    else if (gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBattleAttacker].status2 & STATUS2_RECHARGE)
     {
-        gCurrentMove = gChosenMove = gLockedMoves[gBankAttacker];
+        gCurrentMove = gChosenMove = gLockedMoves[gBattleAttacker];
     }
     // encore forces you to use the same move
-    else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
-             && gDisableStructs[gBankAttacker].encoredMove == gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
+    else if (gDisableStructs[gBattleAttacker].encoredMove != MOVE_NONE
+             && gDisableStructs[gBattleAttacker].encoredMove == gBattleMons[gBattleAttacker].moves[gDisableStructs[gBattleAttacker].encoredMovePos])
     {
-        gCurrentMove = gChosenMove = gDisableStructs[gBankAttacker].encoredMove;
-        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
-        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
+        gCurrentMove = gChosenMove = gDisableStructs[gBattleAttacker].encoredMove;
+        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattleAttacker].encoredMovePos;
+        *(gBattleStruct->moveTarget + gBattleAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
     // check if the encored move wasn't overwritten
-    else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
-             && gDisableStructs[gBankAttacker].encoredMove != gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
+    else if (gDisableStructs[gBattleAttacker].encoredMove != MOVE_NONE
+             && gDisableStructs[gBattleAttacker].encoredMove != gBattleMons[gBattleAttacker].moves[gDisableStructs[gBattleAttacker].encoredMovePos])
     {
-        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
-        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
-        gDisableStructs[gBankAttacker].encoredMove = MOVE_NONE;
-        gDisableStructs[gBankAttacker].encoredMovePos = 0;
-        gDisableStructs[gBankAttacker].encoreTimer1 = 0;
-        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
+        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattleAttacker].encoredMovePos;
+        gCurrentMove = gChosenMove = gBattleMons[gBattleAttacker].moves[gCurrMovePos];
+        gDisableStructs[gBattleAttacker].encoredMove = MOVE_NONE;
+        gDisableStructs[gBattleAttacker].encoredMovePos = 0;
+        gDisableStructs[gBattleAttacker].encoreTimer1 = 0;
+        *(gBattleStruct->moveTarget + gBattleAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
-    else if (gBattleMons[gBankAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBankAttacker])
+    else if (gBattleMons[gBattleAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBattleAttacker])
     {
-        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
-        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
+        gCurrentMove = gChosenMove = gBattleMons[gBattleAttacker].moves[gCurrMovePos];
+        *(gBattleStruct->moveTarget + gBattleAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
     else
     {
-        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gCurrentMove = gChosenMove = gBattleMons[gBattleAttacker].moves[gCurrMovePos];
     }
 
-    if (gBattleMons[gBankAttacker].hp != 0)
+    if (gBattleMons[gBattleAttacker].hp != 0)
     {
-        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
             gBattleResults.lastUsedMovePlayer = gCurrentMove;
         else
             gBattleResults.lastUsedMoveOpponent = gCurrentMove;
     }
 
     // choose target
-    side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
+    side = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
     if (gSideTimers[side].followmeTimer != 0
         && gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED
-        && GetBankSide(gBankAttacker) != GetBankSide(gSideTimers[side].followmeTarget)
+        && GetBattlerSide(gBattleAttacker) != GetBattlerSide(gSideTimers[side].followmeTarget)
         && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
     {
-        gBankDefender = gSideTimers[side].followmeTarget;
+        gBattleDefender = gSideTimers[side].followmeTarget;
     }
     else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
              && gSideTimers[side].followmeTimer == 0
              && (gBattleMoves[gCurrentMove].power != 0
                  || gBattleMoves[gCurrentMove].target != MOVE_TARGET_x10)
-             && gBattleMons[*(gBattleStruct->moveTarget + gBankAttacker)].ability != ABILITY_LIGHTNING_ROD
+             && gBattleMons[*(gBattleStruct->moveTarget + gBattleAttacker)].ability != ABILITY_LIGHTNING_ROD
              && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
     {
-        side = GetBankSide(gBankAttacker);
-        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        side = GetBattlerSide(gBattleAttacker);
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
-            if (side != GetBankSide(gActiveBank)
-                && *(gBattleStruct->moveTarget + gBankAttacker) != gActiveBank
-                && gBattleMons[gActiveBank].ability == ABILITY_LIGHTNING_ROD
-                && BankGetTurnOrder(gActiveBank) < var)
+            if (side != GetBattlerSide(gActiveBattler)
+                && *(gBattleStruct->moveTarget + gBattleAttacker) != gActiveBattler
+                && gBattleMons[gActiveBattler].ability == ABILITY_LIGHTNING_ROD
+                && BankGetTurnOrder(gActiveBattler) < var)
             {
-                var = BankGetTurnOrder(gActiveBank);
+                var = BankGetTurnOrder(gActiveBattler);
             }
         }
         if (var == 4)
         {
             if (gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
             {
-                if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+                if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
                 {
                     if (Random() & 1)
-                        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+                        gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
                     else
-                        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+                        gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
                 }
                 else
                 {
                     if (Random() & 1)
-                        gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+                        gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
                     else
-                        gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+                        gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
                 }
             }
             else
             {
-                gBankDefender = *(gBattleStruct->moveTarget + gBankAttacker);
+                gBattleDefender = *(gBattleStruct->moveTarget + gBattleAttacker);
             }
 
-            if (gAbsentBankFlags & gBitTable[gBankDefender])
+            if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
             {
-                if (GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
+                if (GetBattlerSide(gBattleAttacker) != GetBattlerSide(gBattleDefender))
                 {
-                    gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
+                    gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleDefender) ^ BIT_FLANK);
                 }
                 else
                 {
-                    gBankDefender = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
-                    if (gAbsentBankFlags & gBitTable[gBankDefender])
-                        gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
+                    gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_SIDE);
+                    if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
+                        gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleDefender) ^ BIT_FLANK);
                 }
             }
         }
         else
         {
-            gActiveBank = gBanksByTurnOrder[var];
-            RecordAbilityBattle(gActiveBank, gBattleMons[gActiveBank].ability);
-            gSpecialStatuses[gActiveBank].lightningRodRedirected = 1;
-            gBankDefender = gActiveBank;
+            gActiveBattler = gBattleTurnOrder[var];
+            RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability);
+            gSpecialStatuses[gActiveBattler].lightningRodRedirected = 1;
+            gBattleDefender = gActiveBattler;
         }
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
              && gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
     {
-        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
         {
             if (Random() & 1)
-                gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+                gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
             else
-                gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+                gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
         }
         else
         {
             if (Random() & 1)
-                gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+                gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
             else
-                gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+                gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
         }
 
-        if (gAbsentBankFlags & gBitTable[gBankDefender]
-            && GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
+        if (gAbsentBattlerFlags & gBitTable[gBattleDefender]
+            && GetBattlerSide(gBattleAttacker) != GetBattlerSide(gBattleDefender))
         {
-            gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
+            gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleDefender) ^ BIT_FLANK);
         }
     }
     else
     {
-        gBankDefender = *(gBattleStruct->moveTarget + gBankAttacker);
-        if (gAbsentBankFlags & gBitTable[gBankDefender])
+        gBattleDefender = *(gBattleStruct->moveTarget + gBattleAttacker);
+        if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
         {
-            if (GetBankSide(gBankAttacker) != GetBankSide(gBankDefender))
+            if (GetBattlerSide(gBattleAttacker) != GetBattlerSide(gBattleDefender))
             {
-                gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
+                gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleDefender) ^ BIT_FLANK);
             }
             else
             {
-                gBankDefender = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_SIDE);
-                if (gAbsentBankFlags & gBitTable[gBankDefender])
-                    gBankDefender = GetBankByPosition(GetBankPosition(gBankDefender) ^ BIT_MON);
+                gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_SIDE);
+                if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
+                    gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleDefender) ^ BIT_FLANK);
             }
         }
     }
 
     // choose battlescript
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-        && gProtectStructs[gBankAttacker].flag_x10)
+        && gProtectStructs[gBattleAttacker].flag_x10)
     {
-        if (gBattleMons[gBankAttacker].hp == 0)
+        if (gBattleMons[gBattleAttacker].hp == 0)
         {
             gCurrentActionFuncId = 12;
             return;
         }
-        else if (gPalaceSelectionBattleScripts[gBankAttacker] != NULL)
+        else if (gPalaceSelectionBattleScripts[gBattleAttacker] != NULL)
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBankAttacker];
-            gPalaceSelectionBattleScripts[gBankAttacker] = NULL;
+            gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBattleAttacker];
+            gPalaceSelectionBattleScripts[gBattleAttacker] = NULL;
         }
         else
         {
@@ -5224,22 +5224,22 @@ static void HandleAction_UseMove(void)
     }
 
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-        sub_81A56E8(gBankAttacker);
+        sub_81A56E8(gBattleAttacker);
 
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
 
 static void HandleAction_Switch(void)
 {
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    gActionSelectionCursor[gBankAttacker] = 0;
-    gMoveSelectionCursor[gBankAttacker] = 0;
+    gActionSelectionCursor[gBattleAttacker] = 0;
+    gMoveSelectionCursor[gBattleAttacker] = 0;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, *(gBattleStruct->field_58 + gBankAttacker))
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleAttacker, *(gBattleStruct->field_58 + gBattleAttacker))
 
-    gBattleScripting.bank = gBankAttacker;
+    gBattleScripting.battler = gBattleAttacker;
     gBattlescriptCurrInstr = BattleScript_ActionSwitch;
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 
@@ -5249,11 +5249,11 @@ static void HandleAction_Switch(void)
 
 static void HandleAction_UseItem(void)
 {
-    gBankAttacker = gBankDefender = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattleAttacker = gBattleDefender = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    ClearFuryCutterDestinyBondGrudge(gBankAttacker);
-    gLastUsedItem = gBattleBufferB[gBankAttacker][1] | (gBattleBufferB[gBankAttacker][2] << 8);
+    ClearFuryCutterDestinyBondGrudge(gBattleAttacker);
+    gLastUsedItem = gBattleBufferB[gBattleAttacker][1] | (gBattleBufferB[gBattleAttacker][2] << 8);
 
     if (gLastUsedItem <= ITEM_PREMIER_BALL) // is ball
     {
@@ -5263,38 +5263,38 @@ static void HandleAction_UseItem(void)
     {
         gBattlescriptCurrInstr = gBattlescriptsForRunningByItem[0];
     }
-    else if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+    else if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
     {
         gBattlescriptCurrInstr = gBattlescriptsForUsingItem[0];
     }
     else
     {
-        gBattleScripting.bank = gBankAttacker;
+        gBattleScripting.battler = gBattleAttacker;
 
-        switch (*(gBattleStruct->AI_itemType + (gBankAttacker >> 1)))
+        switch (*(gBattleStruct->AI_itemType + (gBattleAttacker >> 1)))
         {
         case AI_ITEM_FULL_RESTORE:
         case AI_ITEM_HEAL_HP:
             break;
         case AI_ITEM_CURE_CONDITION:
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-            if (*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 1)
+            if (*(gBattleStruct->AI_itemFlags + gBattleAttacker / 2) & 1)
             {
-                if (*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 0x3E)
+                if (*(gBattleStruct->AI_itemFlags + gBattleAttacker / 2) & 0x3E)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 5;
             }
             else
             {
-                while (!(*(gBattleStruct->AI_itemFlags + gBankAttacker / 2) & 1))
+                while (!(*(gBattleStruct->AI_itemFlags + gBattleAttacker / 2) & 1))
                 {
-                    *(gBattleStruct->AI_itemFlags + gBankAttacker / 2) >>= 1;
+                    *(gBattleStruct->AI_itemFlags + gBattleAttacker / 2) >>= 1;
                     gBattleCommunication[MULTISTRING_CHOOSER]++;
                 }
             }
             break;
         case AI_ITEM_X_STAT:
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            if (*(gBattleStruct->AI_itemFlags + (gBankAttacker >> 1)) & 0x80)
+            if (*(gBattleStruct->AI_itemFlags + (gBattleAttacker >> 1)) & 0x80)
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = 5;
             }
@@ -5303,9 +5303,9 @@ static void HandleAction_UseItem(void)
                 PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK)
                 PREPARE_STRING_BUFFER(gBattleTextBuff2, 0xD2)
 
-                while (!((*(gBattleStruct->AI_itemFlags + (gBankAttacker >> 1))) & 1))
+                while (!((*(gBattleStruct->AI_itemFlags + (gBattleAttacker >> 1))) & 1))
                 {
-                    *(gBattleStruct->AI_itemFlags + gBankAttacker / 2) >>= 1;
+                    *(gBattleStruct->AI_itemFlags + gBattleAttacker / 2) >>= 1;
                     gBattleTextBuff1[2]++;
                 }
 
@@ -5321,7 +5321,7 @@ static void HandleAction_UseItem(void)
             break;
         }
 
-        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[*(gBattleStruct->AI_itemType + gBankAttacker / 2)];
+        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[*(gBattleStruct->AI_itemType + gBattleAttacker / 2)];
     }
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
@@ -5399,7 +5399,7 @@ bool8 TryRunFromBattle(u8 bank)
 
     if (effect)
     {
-        gCurrentTurnActionNumber = gBattleBanksCount;
+        gCurrentTurnActionNumber = gBattlersCount;
         gBattleOutcome = B_OUTCOME_RAN;
     }
 
@@ -5408,22 +5408,22 @@ bool8 TryRunFromBattle(u8 bank)
 
 static void HandleAction_Run(void)
 {
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
 
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
     {
-        gCurrentTurnActionNumber = gBattleBanksCount;
+        gCurrentTurnActionNumber = gBattlersCount;
 
-        for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+        for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
-            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
             {
-                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                if (gActionForBanks[gActiveBattler] == ACTION_RUN)
                     gBattleOutcome |= B_OUTCOME_LOST;
             }
             else
             {
-                if (gActionForBanks[gActiveBank] == ACTION_RUN)
+                if (gActionForBanks[gActiveBattler] == ACTION_RUN)
                     gBattleOutcome |= B_OUTCOME_WON;
             }
         }
@@ -5433,11 +5433,11 @@ static void HandleAction_Run(void)
     }
     else
     {
-        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
         {
-            if (!TryRunFromBattle(gBankAttacker)) // failed to run away
+            if (!TryRunFromBattle(gBattleAttacker)) // failed to run away
             {
-                ClearFuryCutterDestinyBondGrudge(gBankAttacker);
+                ClearFuryCutterDestinyBondGrudge(gBattleAttacker);
                 gBattleCommunication[MULTISTRING_CHOOSER] = 3;
                 gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
                 gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
@@ -5445,7 +5445,7 @@ static void HandleAction_Run(void)
         }
         else
         {
-            if (gBattleMons[gBankAttacker].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
+            if (gBattleMons[gBattleAttacker].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = 4;
                 gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
@@ -5453,7 +5453,7 @@ static void HandleAction_Run(void)
             }
             else
             {
-                gCurrentTurnActionNumber = gBattleBanksCount;
+                gCurrentTurnActionNumber = gBattlersCount;
                 gBattleOutcome = B_OUTCOME_POKE_FLED;
             }
         }
@@ -5462,7 +5462,7 @@ static void HandleAction_Run(void)
 
 static void HandleAction_WatchesCarefully(void)
 {
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
     gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0];
@@ -5471,7 +5471,7 @@ static void HandleAction_WatchesCarefully(void)
 
 static void HandleAction_SafariZoneBallThrow(void)
 {
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
     gNumSafariBalls--;
@@ -5482,11 +5482,11 @@ static void HandleAction_SafariZoneBallThrow(void)
 
 static void HandleAction_ThrowPokeblock(void)
 {
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBankAttacker][1] - 1;
-    gLastUsedItem = gBattleBufferB[gBankAttacker][2];
+    gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattleAttacker][1] - 1;
+    gLastUsedItem = gBattleBufferB[gBattleAttacker][2];
 
     if (gBattleResults.field_1F < 0xFF)
         gBattleResults.field_1F++;
@@ -5506,7 +5506,7 @@ static void HandleAction_ThrowPokeblock(void)
 
 static void HandleAction_GoNear(void)
 {
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
 
@@ -5533,19 +5533,19 @@ static void HandleAction_GoNear(void)
 
 static void HandleAction_SafriZoneRun(void)
 {
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     PlaySE(SE_NIGERU);
-    gCurrentTurnActionNumber = gBattleBanksCount;
+    gCurrentTurnActionNumber = gBattlersCount;
     gBattleOutcome = B_OUTCOME_RAN;
 }
 
 static void HandleAction_Action9(void)
 {
-    gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber];
+    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker])
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleAttacker, gBattlePartyID[gBattleAttacker])
 
     gBattlescriptCurrInstr = gBattlescriptsForSafariActions[3];
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
@@ -5574,7 +5574,7 @@ static void HandleAction_NothingIsFainted(void)
 
 static void HandleAction_ActionFinished(void)
 {
-    *(gBattleStruct->monToSwitchIntoId + gBanksByTurnOrder[gCurrentTurnActionNumber]) = 6;
+    *(gBattleStruct->monToSwitchIntoId + gBattleTurnOrder[gCurrentTurnActionNumber]) = 6;
     gCurrentTurnActionNumber++;
     gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
     SpecialStatusesClear();
@@ -5589,8 +5589,8 @@ static void HandleAction_ActionFinished(void)
     gMoveResultFlags = 0;
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
-    gLastLandedMoves[gBankAttacker] = 0;
-    gLastHitByType[gBankAttacker] = 0;
+    gLastLandedMoves[gBattleAttacker] = 0;
+    gLastHitByType[gBattleAttacker] = 0;
     gBattleStruct->dynamicMoveType = 0;
     gDynamicBasePower = 0;
     gBattleScripting.atk49_state = 0;
diff --git a/src/battle_message.c b/src/battle_message.c
index 7ab6fcef3..3bfa5b48d 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -16,20 +16,20 @@
 
 extern u16 gLastUsedItem;
 extern u8 gLastUsedAbility;
-extern u8 gActiveBank;
-extern u8 gBankAttacker;
-extern u8 gBankDefender;
+extern u8 gActiveBattler;
+extern u8 gBattleAttacker;
+extern u8 gBattleDefender;
 extern u8 gStringBank;
 extern u8 gEffectBank;
-extern u8 gAbilitiesPerBank[BATTLE_BANKS_COUNT];
+extern u8 gAbilitiesPerBank[MAX_BATTLERS_COUNT];
 extern u32 gBattleTypeFlags;
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u16 gPartnerTrainerId;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200];
-extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
+extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_0203C7B4;
 extern struct StringInfoBattle *gStringInfo;
 
@@ -1430,16 +1430,16 @@ void BufferStringBattle(u16 stringID)
     s32 i;
     const u8* stringPtr = NULL;
 
-    gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBank][4]);
+    gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBattler][4]);
     gLastUsedItem = gStringInfo->lastItem;
     gLastUsedAbility = gStringInfo->lastAbility;
-    gBattleScripting.bank = gStringInfo->scrActive;
+    gBattleScripting.battler = gStringInfo->scrActive;
     *(&gBattleStruct->field_52) = gStringInfo->unk1605E;
     *(&gBattleStruct->hpScale) = gStringInfo->hpScale;
     gStringBank = gStringInfo->StringBank;
     *(&gBattleStruct->stringMoveType) = gStringInfo->moveType;
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         gAbilitiesPerBank[i] = gStringInfo->abilities[i];
     }
@@ -1501,7 +1501,7 @@ void BufferStringBattle(u16 stringID)
         }
         break;
     case STRINGID_INTROSENDOUT: // poke first send-out
-        if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+        if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
             {
@@ -1546,7 +1546,7 @@ void BufferStringBattle(u16 stringID)
         }
         break;
     case STRINGID_RETURNMON: // sending poke to ball msg
-        if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+        if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         {
             if (*(&gBattleStruct->hpScale) == 0)
                 stringPtr = gText_PkmnThatsEnough;
@@ -1573,7 +1573,7 @@ void BufferStringBattle(u16 stringID)
         }
         break;
     case STRINGID_SWITCHINMON: // switch-in msg
-        if (GetBankSide(gBattleScripting.bank) == SIDE_PLAYER)
+        if (GetBattlerSide(gBattleScripting.battler) == B_SIDE_PLAYER)
         {
             if (*(&gBattleStruct->hpScale) == 0 || gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
                 stringPtr = gText_GoPkmn2;
@@ -1590,7 +1590,7 @@ void BufferStringBattle(u16 stringID)
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_x800000)
                 {
-                    if (gBattleScripting.bank == 1)
+                    if (gBattleScripting.battler == 1)
                         stringPtr = gText_Trainer1SentOutPkmn2;
                     else
                         stringPtr = gText_Trainer2SentOutPkmn;
@@ -1609,7 +1609,7 @@ void BufferStringBattle(u16 stringID)
             {
                 if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
                 {
-                    if (gBattleScripting.bank == 1)
+                    if (gBattleScripting.battler == 1)
                         stringPtr = gText_Trainer1SentOutPkmn2;
                     else
                         stringPtr = gText_Trainer2SentOutPkmn;
@@ -1636,7 +1636,7 @@ void BufferStringBattle(u16 stringID)
         if (gBattleTextBuff1[0] & B_OUTCOME_LINK_BATTLE_RAN)
         {
             gBattleTextBuff1[0] &= ~(B_OUTCOME_LINK_BATTLE_RAN);
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT && gBattleTextBuff1[0] != B_OUTCOME_DREW)
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT && gBattleTextBuff1[0] != B_OUTCOME_DREW)
                 gBattleTextBuff1[0] ^= (B_OUTCOME_LOST | B_OUTCOME_WON);
 
             if (gBattleTextBuff1[0] == B_OUTCOME_LOST || gBattleTextBuff1[0] == B_OUTCOME_DREW)
@@ -1648,7 +1648,7 @@ void BufferStringBattle(u16 stringID)
         }
         else
         {
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT && gBattleTextBuff1[0] != B_OUTCOME_DREW)
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT && gBattleTextBuff1[0] != B_OUTCOME_DREW)
                 gBattleTextBuff1[0] ^= (B_OUTCOME_LOST | B_OUTCOME_WON);
 
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
@@ -1754,7 +1754,7 @@ static const u8* TryGetStatusString(u8* src)
 }
 
 #define HANDLE_NICKNAME_STRING_CASE(bank, monIndex)                     \
-    if (GetBankSide(bank) != SIDE_PLAYER)                               \
+    if (GetBattlerSide(bank) != B_SIDE_PLAYER)                               \
     {                                                                   \
         if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)                     \
             toCpy = gText_FoePkmnPrefix;                                \
@@ -1836,25 +1836,25 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gStringVar3;
                 break;
             case B_TXT_PLAYER_MON1_NAME: // first player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPosition(B_POSITION_PLAYER_LEFT)]],
+                GetMonData(&gPlayerParty[gBattlePartyID[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_OPPONENT_MON1_NAME: // first enemy poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPosition(B_POSITION_OPPONENT_LEFT)]],
+                GetMonData(&gEnemyParty[gBattlePartyID[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_PLAYER_MON2_NAME: // second player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPosition(B_POSITION_PLAYER_RIGHT)]],
+                GetMonData(&gPlayerParty[gBattlePartyID[GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_OPPONENT_MON2_NAME: // second enemy poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPosition(B_POSITION_OPPONENT_RIGHT)]],
+                GetMonData(&gEnemyParty[gBattlePartyID[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
@@ -1884,32 +1884,32 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = text;
                 break;
             case B_TXT_ATK_NAME_WITH_PREFIX_MON1: // attacker name with prefix, only bank 0/1
-                HANDLE_NICKNAME_STRING_CASE(gBankAttacker,
-                                            gBattlePartyID[GetBankByPosition(GET_BANK_SIDE(gBankAttacker))])
+                HANDLE_NICKNAME_STRING_CASE(gBattleAttacker,
+                                            gBattlePartyID[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleAttacker))])
                 break;
             case B_TXT_ATK_PARTNER_NAME: // attacker partner name
-                if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-                    GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPosition(GET_BANK_SIDE(gBankAttacker)) + 2]], MON_DATA_NICKNAME, text);
+                if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+                    GetMonData(&gPlayerParty[gBattlePartyID[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleAttacker)) + 2]], MON_DATA_NICKNAME, text);
                 else
-                    GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPosition(GET_BANK_SIDE(gBankAttacker)) + 2]], MON_DATA_NICKNAME, text);
+                    GetMonData(&gEnemyParty[gBattlePartyID[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleAttacker)) + 2]], MON_DATA_NICKNAME, text);
 
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_ATK_NAME_WITH_PREFIX: // attacker name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gBankAttacker, gBattlePartyID[gBankAttacker])
+                HANDLE_NICKNAME_STRING_CASE(gBattleAttacker, gBattlePartyID[gBattleAttacker])
                 break;
             case B_TXT_DEF_NAME_WITH_PREFIX: // target name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gBankDefender, gBattlePartyID[gBankDefender])
+                HANDLE_NICKNAME_STRING_CASE(gBattleDefender, gBattlePartyID[gBattleDefender])
                 break;
             case B_TXT_EFF_NAME_WITH_PREFIX: // effect bank name with prefix
                 HANDLE_NICKNAME_STRING_CASE(gEffectBank, gBattlePartyID[gEffectBank])
                 break;
             case B_TXT_ACTIVE_NAME_WITH_PREFIX: // active bank name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gActiveBank, gBattlePartyID[gActiveBank])
+                HANDLE_NICKNAME_STRING_CASE(gActiveBattler, gBattlePartyID[gActiveBattler])
                 break;
             case B_TXT_SCR_ACTIVE_NAME_WITH_PREFIX: // scripting active bank name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gBattleScripting.bank, gBattlePartyID[gBattleScripting.bank])
+                HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler, gBattlePartyID[gBattleScripting.battler])
                 break;
             case B_TXT_CURRENT_MOVE: // current move name
                 if (gStringInfo->currentMove > LAST_MOVE_INDEX)
@@ -1970,13 +1970,13 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gAbilityNames[gLastUsedAbility];
                 break;
             case B_TXT_ATK_ABILITY: // attacker ability
-                toCpy = gAbilityNames[gAbilitiesPerBank[gBankAttacker]];
+                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleAttacker]];
                 break;
             case B_TXT_DEF_ABILITY: // target ability
-                toCpy = gAbilityNames[gAbilitiesPerBank[gBankDefender]];
+                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleDefender]];
                 break;
             case B_TXT_SCR_ACTIVE_ABILITY: // scripting active ability
-                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleScripting.bank]];
+                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleScripting.battler]];
                 break;
             case B_TXT_EFF_ABILITY: // effect bank ability
                 toCpy = gAbilityNames[gAbilitiesPerBank[gEffectBank]];
@@ -2048,7 +2048,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gLinkPlayers[GetBankMultiplayerId(3 ^ gLinkPlayers[multiplayerID].lp_field_18)].name;
                 break;
             case B_TXT_22: // link scripting active name
-                toCpy = gLinkPlayers[GetBankMultiplayerId(gBattleScripting.bank)].name;
+                toCpy = gLinkPlayers[GetBankMultiplayerId(gBattleScripting.battler)].name;
                 break;
             case B_TXT_PLAYER_NAME: // player name
                 if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
@@ -2085,7 +2085,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 }
                 break;
             case B_TXT_26: // ?
-                HANDLE_NICKNAME_STRING_CASE(gBattleScripting.bank, *(&gBattleStruct->field_52))
+                HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler, *(&gBattleStruct->field_52))
                 break;
             case B_TXT_PC_CREATOR_NAME: // lanette pc
                 if (FlagGet(FLAG_SYS_PC_LANETTE))
@@ -2094,37 +2094,37 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                     toCpy = gText_Someones;
                 break;
             case B_TXT_ATK_PREFIX2:
-                if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+                if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix2;
                 else
                     toCpy = gText_FoePkmnPrefix3;
                 break;
             case B_TXT_DEF_PREFIX2:
-                if (GetBankSide(gBankDefender) == SIDE_PLAYER)
+                if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix2;
                 else
                     toCpy = gText_FoePkmnPrefix3;
                 break;
             case B_TXT_ATK_PREFIX1:
-                if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+                if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix;
                 else
                     toCpy = gText_FoePkmnPrefix2;
                 break;
             case B_TXT_DEF_PREFIX1:
-                if (GetBankSide(gBankDefender) == SIDE_PLAYER)
+                if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix;
                 else
                     toCpy = gText_FoePkmnPrefix2;
                 break;
             case B_TXT_ATK_PREFIX3:
-                if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+                if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix3;
                 else
                     toCpy = gText_FoePkmnPrefix4;
                 break;
             case B_TXT_DEF_PREFIX3:
-                if (GetBankSide(gBankDefender) == SIDE_PLAYER)
+                if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix3;
                 else
                     toCpy = gText_FoePkmnPrefix4;
@@ -2266,7 +2266,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
             srcID += 2;
             break;
         case B_BUFF_MON_NICK_WITH_PREFIX: // poke nick with prefix
-            if (GetBankSide(src[srcID + 1]) == SIDE_PLAYER)
+            if (GetBattlerSide(src[srcID + 1]) == B_SIDE_PLAYER)
             {
                 GetMonData(&gPlayerParty[src[srcID + 2]], MON_DATA_NICKNAME, text);
             }
@@ -2292,7 +2292,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
             srcID += 3;
             break;
         case B_BUFF_MON_NICK: // poke nick without prefix
-            if (GetBankSide(src[srcID + 1]) == SIDE_PLAYER)
+            if (GetBattlerSide(src[srcID + 1]) == B_SIDE_PLAYER)
                 GetMonData(&gPlayerParty[src[srcID + 2]], MON_DATA_NICKNAME, dst);
             else
                 GetMonData(&gEnemyParty[src[srcID + 2]], MON_DATA_NICKNAME, dst);
@@ -2490,10 +2490,10 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1)
 
 void SetPpNumbersPaletteInMoveSelection(void)
 {
-    struct ChooseMoveStruct *chooseMoveStruct = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBank][4]);
+    struct ChooseMoveStruct *chooseMoveStruct = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
     const u16 *palPtr = gUnknown_08D85620;
-    u8 var = GetCurrentPpToMaxPpState(chooseMoveStruct->currentPp[gMoveSelectionCursor[gActiveBank]],
-                         chooseMoveStruct->maxPp[gMoveSelectionCursor[gActiveBank]]);
+    u8 var = GetCurrentPpToMaxPpState(chooseMoveStruct->currentPp[gMoveSelectionCursor[gActiveBattler]],
+                         chooseMoveStruct->maxPp[gMoveSelectionCursor[gActiveBattler]]);
 
     gPlttBufferUnfaded[92] = palPtr[(var * 2) + 0];
     gPlttBufferUnfaded[91] = palPtr[(var * 2) + 1];
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index be20305fa..8f3036028 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -44,26 +44,26 @@
 
 extern u8 gCritMultiplier;
 extern s32 gBattleMoveDamage;
-extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u8 gActiveBank;
+extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
+extern u8 gActiveBattler;
 extern u32 gBattleExecBuffer;
-extern u8 gBattleBanksCount;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
-extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
+extern u8 gBattlersCount;
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
+extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
 extern u16 gCurrentMove;
 extern u8 gLastUsedAbility;
 extern u8 gStringBank;
 extern u8 gEffectBank;
-extern u8 gAbsentBankFlags;
+extern u8 gAbsentBattlerFlags;
 extern u8 gMultiHitCounter;
-extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
+extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
 extern u16 gPauseCounterBattle;
 extern u16 gPaydayMoney;
 extern u16 gRandomTurnNumber;
-extern u8 gBankAttacker;
-extern u8 gBankDefender;
+extern u8 gBattleAttacker;
+extern u8 gBattleDefender;
 extern const u8* gBattlescriptCurrInstr;
 extern u8 gCurrMovePos;
 extern u8 gCurrentActionFuncId;
@@ -78,8 +78,8 @@ extern u16 gDynamicBasePower;
 extern u16 gLastUsedItem;
 extern u16 gBattleMovePower;
 extern s32 gHpDealt;
-extern s32 gTakenDmg[BATTLE_BANKS_COUNT];
-extern u8 gTakenDmgBanks[BATTLE_BANKS_COUNT];
+extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
+extern u8 gTakenDmgBanks[MAX_BATTLERS_COUNT];
 extern u8 gSentPokesToOpponent[2];
 extern u8 gBank1;
 extern u16 gExpShareExp;
@@ -89,14 +89,14 @@ extern u8 gPlayerPartyCount;
 extern u16 gMoveToLearn;
 extern u16 gRandomMove;
 extern u8 gBankInMenu;
-extern u8 gActionForBanks[BATTLE_BANKS_COUNT];
+extern u8 gActionForBanks[MAX_BATTLERS_COUNT];
 extern u8 gCurrentTurnActionNumber;
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
-extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
+extern u16 gLockedMoves[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u16 gChosenMove;
-extern u16 gLastPrintedMoves[BATTLE_BANKS_COUNT];
-extern u16 gLastMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
+extern u16 gLastMoves[MAX_BATTLERS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u8 gUnknown_020241E9;
@@ -155,10 +155,10 @@ extern const u8 gText_BattleYesNoChoice[];
 #define BS2ScriptRead16(ptr) ((ptr)[0] + ((ptr)[1] << 8))
 #define BS2ScriptReadPtr(ptr) ((void *)BS2ScriptRead32(ptr))
 
-#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBankDefender].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
+#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattleDefender].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
 
-#define TARGET_TURN_DAMAGED (gSpecialStatuses[gBankDefender].moveturnLostHP_physical != 0 \
-                          || gSpecialStatuses[gBankDefender].moveturnLostHP_special != 0)
+#define TARGET_TURN_DAMAGED (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical != 0 \
+                          || gSpecialStatuses[gBattleDefender].moveturnLostHP_special != 0)
 
 // this file's functions
 static bool8 IsTwoTurnsMove(u16 move);
@@ -1027,7 +1027,7 @@ static void atk00_attackcanceler(void)
         gCurrentActionFuncId = ACTION_FINISHED;
         return;
     }
-    if (gBattleMons[gBankAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
+    if (gBattleMons[gBattleAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
     {
         gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
         gBattlescriptCurrInstr = BattleScript_MoveEnd;
@@ -1035,10 +1035,10 @@ static void atk00_attackcanceler(void)
     }
     if (AtkCanceller_UnableToUseMove())
         return;
-    if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBankDefender, 0, 0, 0))
+    if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattleDefender, 0, 0, 0))
         return;
-    if (!gBattleMons[gBankAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200)
-     && !(gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS))
+    if (!gBattleMons[gBattleAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200)
+     && !(gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
         gBattlescriptCurrInstr = BattleScript_NoPPForMove;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
@@ -1047,7 +1047,7 @@ static void atk00_attackcanceler(void)
 
     gHitMarker &= ~(HITMARKER_x800000);
 
-    if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS))
+    if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
         i = IsMonDisobedient(); // why use the 'i' variable...?
         switch (i)
@@ -1065,44 +1065,44 @@ static void atk00_attackcanceler(void)
 
     gHitMarker |= HITMARKER_OBEYS;
 
-    if (gProtectStructs[gBankDefender].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED)
+    if (gProtectStructs[gBattleDefender].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED)
     {
-        PressurePPLose(gBankAttacker, gBankDefender, MOVE_MAGIC_COAT);
-        gProtectStructs[gBankDefender].bounceMove = 0;
+        PressurePPLose(gBattleAttacker, gBattleDefender, MOVE_MAGIC_COAT);
+        gProtectStructs[gBattleDefender].bounceMove = 0;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_MagicCoatBounce;
         return;
     }
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
-        if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
+        if ((gProtectStructs[gBattleTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
         {
-            PressurePPLose(gBankAttacker, gBanksByTurnOrder[i], MOVE_SNATCH);
-            gProtectStructs[gBanksByTurnOrder[i]].stealMove = 0;
-            gBattleScripting.bank = gBanksByTurnOrder[i];
+            PressurePPLose(gBattleAttacker, gBattleTurnOrder[i], MOVE_SNATCH);
+            gProtectStructs[gBattleTurnOrder[i]].stealMove = 0;
+            gBattleScripting.battler = gBattleTurnOrder[i];
             BattleScriptPushCursor();
             gBattlescriptCurrInstr = BattleScript_SnatchedMove;
             return;
         }
     }
 
-    if (gSpecialStatuses[gBankDefender].lightningRodRedirected)
+    if (gSpecialStatuses[gBattleDefender].lightningRodRedirected)
     {
-        gSpecialStatuses[gBankDefender].lightningRodRedirected = 0;
+        gSpecialStatuses[gBattleDefender].lightningRodRedirected = 0;
         gLastUsedAbility = ABILITY_LIGHTNING_ROD;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_TookAttack;
-        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
     }
     else if (DEFENDER_IS_PROTECTED
-     && (gCurrentMove != MOVE_CURSE || (gBattleMons[gBankAttacker].type1 == TYPE_GHOST || gBattleMons[gBankAttacker].type2 == TYPE_GHOST))
-     && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS))))
+     && (gCurrentMove != MOVE_CURSE || (gBattleMons[gBattleAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleAttacker].type2 == TYPE_GHOST))
+     && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS))))
     {
-        CancelMultiTurnMoves(gBankAttacker);
+        CancelMultiTurnMoves(gBattleAttacker);
         gMoveResultFlags |= MOVE_RESULT_MISSED;
-        gLastLandedMoves[gBankDefender] = 0;
-        gLastHitByType[gBankDefender] = 0;
+        gLastLandedMoves[gBattleDefender] = 0;
+        gLastHitByType[gBattleDefender] = 0;
         gBattleCommunication[6] = 1;
         gBattlescriptCurrInstr++;
     }
@@ -1117,14 +1117,14 @@ static void JumpIfMoveFailed(u8 adder, u16 move)
     const u8 *BS_ptr = gBattlescriptCurrInstr + adder;
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
-        gLastLandedMoves[gBankDefender] = 0;
-        gLastHitByType[gBankDefender] = 0;
+        gLastLandedMoves[gBattleDefender] = 0;
+        gLastHitByType[gBattleDefender] = 0;
         BS_ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
         TrySetDestinyBondToHappen();
-        if (AbilityBattleEffects(ABILITYEFFECT_ABSORBING, gBankDefender, 0, 0, move))
+        if (AbilityBattleEffects(ABILITYEFFECT_ABSORBING, gBattleDefender, 0, 0, move))
             return;
     }
     gBattlescriptCurrInstr = BS_ptr;
@@ -1159,13 +1159,13 @@ bool8 JumpIfMoveAffectedByProtect(u16 move)
 
 static bool8 AccuracyCalcHelper(u16 move)
 {
-    if (gStatuses3[gBankDefender] & STATUS3_ALWAYS_HITS && gDisableStructs[gBankDefender].bankWithSureHit == gBankAttacker)
+    if (gStatuses3[gBattleDefender] & STATUS3_ALWAYS_HITS && gDisableStructs[gBattleDefender].bankWithSureHit == gBattleAttacker)
     {
         JumpIfMoveFailed(7, move);
         return TRUE;
     }
 
-    if (!(gHitMarker & HITMARKER_IGNORE_ON_AIR) && gStatuses3[gBankDefender] & STATUS3_ON_AIR)
+    if (!(gHitMarker & HITMARKER_IGNORE_ON_AIR) && gStatuses3[gBattleDefender] & STATUS3_ON_AIR)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
@@ -1174,7 +1174,7 @@ static bool8 AccuracyCalcHelper(u16 move)
 
     gHitMarker &= ~HITMARKER_IGNORE_ON_AIR;
 
-    if (!(gHitMarker & HITMARKER_IGNORE_UNDERGROUND) && gStatuses3[gBankDefender] & STATUS3_UNDERGROUND)
+    if (!(gHitMarker & HITMARKER_IGNORE_UNDERGROUND) && gStatuses3[gBattleDefender] & STATUS3_UNDERGROUND)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
@@ -1183,7 +1183,7 @@ static bool8 AccuracyCalcHelper(u16 move)
 
     gHitMarker &= ~HITMARKER_IGNORE_UNDERGROUND;
 
-    if (!(gHitMarker & HITMARKER_IGNORE_UNDERWATER) && gStatuses3[gBankDefender] & STATUS3_UNDERWATER)
+    if (!(gHitMarker & HITMARKER_IGNORE_UNDERWATER) && gStatuses3[gBattleDefender] & STATUS3_UNDERWATER)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
@@ -1208,9 +1208,9 @@ static void atk01_accuracycheck(void)
 
     if (move == 0xFFFE || move == 0xFFFF)
     {
-        if (gStatuses3[gBankDefender] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBankDefender].bankWithSureHit == gBankAttacker)
+        if (gStatuses3[gBattleDefender] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBattleDefender].bankWithSureHit == gBattleAttacker)
             gBattlescriptCurrInstr += 7;
-        else if (gStatuses3[gBankDefender] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
+        else if (gStatuses3[gBattleDefender] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         else if (!JumpIfMoveAffectedByProtect(0))
             gBattlescriptCurrInstr += 7;
@@ -1231,15 +1231,15 @@ static void atk01_accuracycheck(void)
         if (AccuracyCalcHelper(move))
             return;
 
-        if (gBattleMons[gBankDefender].status2 & STATUS2_FORESIGHT)
+        if (gBattleMons[gBattleDefender].status2 & STATUS2_FORESIGHT)
         {
-            u8 acc = gBattleMons[gBankAttacker].statStages[STAT_STAGE_ACC];
+            u8 acc = gBattleMons[gBattleAttacker].statStages[STAT_STAGE_ACC];
             buff = acc;
         }
         else
         {
-            u8 acc = gBattleMons[gBankAttacker].statStages[STAT_STAGE_ACC];
-            buff = acc + 6 - gBattleMons[gBankDefender].statStages[STAT_STAGE_EVASION];
+            u8 acc = gBattleMons[gBattleAttacker].statStages[STAT_STAGE_ACC];
+            buff = acc + 6 - gBattleMons[gBattleDefender].statStages[STAT_STAGE_EVASION];
         }
 
         if (buff < 0)
@@ -1255,25 +1255,25 @@ static void atk01_accuracycheck(void)
         calc = sAccuracyStageRatios[buff].dividend * moveAcc;
         calc /= sAccuracyStageRatios[buff].divisor;
 
-        if (gBattleMons[gBankAttacker].ability == ABILITY_COMPOUND_EYES)
+        if (gBattleMons[gBattleAttacker].ability == ABILITY_COMPOUND_EYES)
             calc = (calc * 130) / 100; // 1.3 compound eyes boost
-        if (WEATHER_HAS_EFFECT && gBattleMons[gBankDefender].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY)
+        if (WEATHER_HAS_EFFECT && gBattleMons[gBattleDefender].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY)
             calc = (calc * 80) / 100; // 1.2 sand veil loss
-        if (gBattleMons[gBankAttacker].ability == ABILITY_HUSTLE && type < 9)
+        if (gBattleMons[gBattleAttacker].ability == ABILITY_HUSTLE && type < 9)
             calc = (calc * 80) / 100; // 1.2 hustle loss
 
-        if (gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY)
+        if (gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY)
         {
-            holdEffect = gEnigmaBerries[gBankDefender].holdEffect;
-            quality = gEnigmaBerries[gBankDefender].holdEffectParam;
+            holdEffect = gEnigmaBerries[gBattleDefender].holdEffect;
+            quality = gEnigmaBerries[gBattleDefender].holdEffectParam;
         }
         else
         {
-            holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankDefender].item);
-            quality = ItemId_GetHoldEffectParam(gBattleMons[gBankDefender].item);
+            holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleDefender].item);
+            quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleDefender].item);
         }
 
-        gStringBank = gBankDefender;
+        gStringBank = gBattleDefender;
 
         if (holdEffect == HOLD_EFFECT_EVASION_UP)
             calc = (calc * (100 - quality)) / 100;
@@ -1300,7 +1300,7 @@ static void atk02_attackstring(void)
          return;
     if (!(gHitMarker & (HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED)))
     {
-        PrepareStringBattle(STRINGID_USEDMOVE, gBankAttacker);
+        PrepareStringBattle(STRINGID_USEDMOVE, gBattleAttacker);
         gHitMarker |= HITMARKER_ATTACKSTRING_PRINTED;
     }
     gBattlescriptCurrInstr++;
@@ -1314,39 +1314,39 @@ static void atk03_ppreduce(void)
     if (gBattleExecBuffer)
         return;
 
-    if (!gSpecialStatuses[gBankAttacker].flag20)
+    if (!gSpecialStatuses[gBattleAttacker].flag20)
     {
         switch (gBattleMoves[gCurrentMove].target)
         {
         case MOVE_TARGET_FOES_AND_ALLY:
-            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBankAttacker, ABILITY_PRESSURE, 0, 0);
+            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBattleAttacker, ABILITY_PRESSURE, 0, 0);
             break;
         case MOVE_TARGET_BOTH:
         case MOVE_TARGET_OPPONENTS_FIELD:
-            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBankAttacker, ABILITY_PRESSURE, 0, 0);
+            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattleAttacker, ABILITY_PRESSURE, 0, 0);
             break;
         default:
-            if (gBankAttacker != gBankDefender && gBattleMons[gBankDefender].ability == ABILITY_PRESSURE)
+            if (gBattleAttacker != gBattleDefender && gBattleMons[gBattleDefender].ability == ABILITY_PRESSURE)
                 ppToDeduct++;
             break;
         }
     }
 
-    if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBankAttacker].pp[gCurrMovePos])
+    if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBattleAttacker].pp[gCurrMovePos])
     {
-        gProtectStructs[gBankAttacker].notFirstStrike = 1;
+        gProtectStructs[gBattleAttacker].notFirstStrike = 1;
 
-        if (gBattleMons[gBankAttacker].pp[gCurrMovePos] > ppToDeduct)
-            gBattleMons[gBankAttacker].pp[gCurrMovePos] -= ppToDeduct;
+        if (gBattleMons[gBattleAttacker].pp[gCurrMovePos] > ppToDeduct)
+            gBattleMons[gBattleAttacker].pp[gCurrMovePos] -= ppToDeduct;
         else
-            gBattleMons[gBankAttacker].pp[gCurrMovePos] = 0;
+            gBattleMons[gBattleAttacker].pp[gCurrMovePos] = 0;
 
-        if (!(gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED)
-            && !((gDisableStructs[gBankAttacker].unk18_b) & gBitTable[gCurrMovePos]))
+        if (!(gBattleMons[gBattleAttacker].status2 & STATUS2_TRANSFORMED)
+            && !((gDisableStructs[gBattleAttacker].unk18_b) & gBitTable[gCurrMovePos]))
         {
-            gActiveBank = gBankAttacker;
-            EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBankAttacker].pp[gCurrMovePos]);
-            MarkBufferBankForExecution(gBankAttacker);
+            gActiveBattler = gBattleAttacker;
+            EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattleAttacker].pp[gCurrMovePos]);
+            MarkBufferBankForExecution(gBattleAttacker);
         }
     }
 
@@ -1359,29 +1359,29 @@ static void atk04_critcalc(void)
     u8 holdEffect;
     u16 item, critChance;
 
-    item = gBattleMons[gBankAttacker].item;
+    item = gBattleMons[gBattleAttacker].item;
 
     if (item == ITEM_ENIGMA_BERRY)
-        holdEffect = gEnigmaBerries[gBankAttacker].holdEffect;
+        holdEffect = gEnigmaBerries[gBattleAttacker].holdEffect;
     else
         holdEffect = ItemId_GetHoldEffect(item);
 
-    gStringBank = gBankAttacker;
+    gStringBank = gBattleAttacker;
 
-    critChance  = 2 * ((gBattleMons[gBankAttacker].status2 & STATUS2_FOCUS_ENERGY) != 0)
+    critChance  = 2 * ((gBattleMons[gBattleAttacker].status2 & STATUS2_FOCUS_ENERGY) != 0)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_HIGH_CRITICAL)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_SKY_ATTACK)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_BLAZE_KICK)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_POISON_TAIL)
                 + (holdEffect == HOLD_EFFECT_SCOPE_LENS)
-                + 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBankAttacker].species == SPECIES_CHANSEY)
-                + 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBankAttacker].species == SPECIES_FARFETCHD);
+                + 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBattleAttacker].species == SPECIES_CHANSEY)
+                + 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBattleAttacker].species == SPECIES_FARFETCHD);
 
     if (critChance > 4)
         critChance = 4;
 
-    if ((gBattleMons[gBankDefender].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBankDefender].ability != ABILITY_SHELL_ARMOR)
-     && !(gStatuses3[gBankAttacker] & STATUS3_CANT_SCORE_A_CRIT)
+    if ((gBattleMons[gBattleDefender].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBattleDefender].ability != ABILITY_SHELL_ARMOR)
+     && !(gStatuses3[gBattleAttacker] & STATUS3_CANT_SCORE_A_CRIT)
      && !(gBattleTypeFlags & (BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_FIRST_BATTLE))
      && !(Random() % sCriticalHitChance[critChance]))
         gCritMultiplier = 2;
@@ -1393,32 +1393,32 @@ static void atk04_critcalc(void)
 
 static void atk05_damagecalc(void)
 {
-    u16 sideStatus = gSideStatuses[GET_BANK_SIDE(gBankDefender)];
-    gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankDefender], gCurrentMove,
+    u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(gBattleDefender)];
+    gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleAttacker], &gBattleMons[gBattleDefender], gCurrentMove,
                                             sideStatus, gDynamicBasePower,
-                                            gBattleStruct->dynamicMoveType, gBankAttacker, gBankDefender);
+                                            gBattleStruct->dynamicMoveType, gBattleAttacker, gBattleDefender);
     gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleScripting.dmgMultiplier;
 
-    if (gStatuses3[gBankAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
+    if (gStatuses3[gBattleAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
         gBattleMoveDamage *= 2;
-    if (gProtectStructs[gBankAttacker].helpingHand)
+    if (gProtectStructs[gBattleAttacker].helpingHand)
         gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
 
     gBattlescriptCurrInstr++;
 }
 
-void AI_CalcDmg(u8 bankAtk, u8 bankDef)
+void AI_CalcDmg(u8 attacker, u8 defender)
 {
-    u16 sideStatus = gSideStatuses[GET_BANK_SIDE(bankDef)];
-    gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[bankAtk], &gBattleMons[bankDef], gCurrentMove,
+    u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(defender)];
+    gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[attacker], &gBattleMons[defender], gCurrentMove,
                                             sideStatus, gDynamicBasePower,
-                                            gBattleStruct->dynamicMoveType, bankAtk, bankDef);
+                                            gBattleStruct->dynamicMoveType, attacker, defender);
     gDynamicBasePower = 0;
     gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleScripting.dmgMultiplier;
 
-    if (gStatuses3[bankAtk] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
+    if (gStatuses3[attacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
         gBattleMoveDamage *= 2;
-    if (gProtectStructs[bankAtk].helpingHand)
+    if (gProtectStructs[attacker].helpingHand)
         gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
 }
 
@@ -1470,20 +1470,20 @@ static void atk06_typecalc(void)
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
     // check stab
-    if (gBattleMons[gBankAttacker].type1 == moveType || gBattleMons[gBankAttacker].type2 == moveType)
+    if (gBattleMons[gBattleAttacker].type1 == moveType || gBattleMons[gBattleAttacker].type2 == moveType)
     {
         gBattleMoveDamage = gBattleMoveDamage * 15;
         gBattleMoveDamage = gBattleMoveDamage / 10;
     }
 
-    if (gBattleMons[gBankDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBattleDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
-        gLastUsedAbility = gBattleMons[gBankDefender].ability;
+        gLastUsedAbility = gBattleMons[gBattleDefender].ability;
         gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
-        gLastLandedMoves[gBankDefender] = 0;
-        gLastHitByType[gBankDefender] = 0;
+        gLastLandedMoves[gBattleDefender] = 0;
+        gLastHitByType[gBattleDefender] = 0;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
     }
     else
     {
@@ -1491,7 +1491,7 @@ static void atk06_typecalc(void)
         {
             if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
-                if (gBattleMons[gBankDefender].status2 & STATUS2_FORESIGHT)
+                if (gBattleMons[gBattleDefender].status2 & STATUS2_FORESIGHT)
                     break;
                 i += 3;
                 continue;
@@ -1499,30 +1499,30 @@ static void atk06_typecalc(void)
             else if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type1)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type1)
                     ModulateDmgByType(TYPE_EFFECT_MULTIPLIER(i));
                 // check type2
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2 &&
-                    gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2 &&
+                    gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2)
                     ModulateDmgByType(TYPE_EFFECT_MULTIPLIER(i));
             }
             i += 3;
         }
     }
 
-    if (gBattleMons[gBankDefender].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBankAttacker, gCurrentMove) == 2
+    if (gBattleMons[gBattleDefender].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattleAttacker, gCurrentMove) == 2
      && (!(gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) || ((gMoveResultFlags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
      && gBattleMoves[gCurrentMove].power)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
-        gLastLandedMoves[gBankDefender] = 0;
-        gLastHitByType[gBankDefender] = 0;
+        gLastLandedMoves[gBattleDefender] = 0;
+        gLastHitByType[gBattleDefender] = 0;
         gBattleCommunication[6] = 3;
-        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
     }
     if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
-        gProtectStructs[gBankAttacker].targetNotAffected = 1;
+        gProtectStructs[gBattleAttacker].targetNotAffected = 1;
 
     gBattlescriptCurrInstr++;
 }
@@ -1538,11 +1538,11 @@ static void CheckWonderGuardAndLevitate(void)
 
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
-    if (gBattleMons[gBankDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBattleDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
         gLastUsedAbility = ABILITY_LEVITATE;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBankDefender, ABILITY_LEVITATE);
+        RecordAbilityBattle(gBattleDefender, ABILITY_LEVITATE);
         return;
     }
 
@@ -1550,7 +1550,7 @@ static void CheckWonderGuardAndLevitate(void)
     {
         if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
         {
-            if (gBattleMons[gBankDefender].status2 & STATUS2_FORESIGHT)
+            if (gBattleMons[gBattleDefender].status2 & STATUS2_FORESIGHT)
                 break;
             i += 3;
             continue;
@@ -1558,46 +1558,46 @@ static void CheckWonderGuardAndLevitate(void)
         if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
         {
             // check no effect
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type1
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type1
                 && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
             {
                 gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
-                gProtectStructs[gBankAttacker].targetNotAffected = 1;
+                gProtectStructs[gBattleAttacker].targetNotAffected = 1;
             }
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2 &&
-                gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2 &&
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2 &&
+                gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2 &&
                 TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
             {
                 gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
-                gProtectStructs[gBankAttacker].targetNotAffected = 1;
+                gProtectStructs[gBattleAttacker].targetNotAffected = 1;
             }
 
             // check super effective
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type1 && TYPE_EFFECT_MULTIPLIER(i) == 20)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type1 && TYPE_EFFECT_MULTIPLIER(i) == 20)
                 flags |= 1;
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2
-             && gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2
+             && gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2
              && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                 flags |= 1;
 
             // check not very effective
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type1 && TYPE_EFFECT_MULTIPLIER(i) == 5)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type1 && TYPE_EFFECT_MULTIPLIER(i) == 5)
                 flags |= 2;
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2
-             && gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2
+             && gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2
              && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                 flags |= 2;
         }
         i += 3;
     }
 
-    if (gBattleMons[gBankDefender].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBankAttacker, gCurrentMove) == 2)
+    if (gBattleMons[gBattleDefender].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattleAttacker, gCurrentMove) == 2)
     {
         if (((flags & 2) || !(flags & 1)) && gBattleMoves[gCurrentMove].power)
         {
             gLastUsedAbility = ABILITY_WONDER_GUARD;
             gBattleCommunication[6] = 3;
-            RecordAbilityBattle(gBankDefender, ABILITY_WONDER_GUARD);
+            RecordAbilityBattle(gBattleDefender, ABILITY_WONDER_GUARD);
         }
     }
 }
@@ -1636,7 +1636,7 @@ static void ModulateDmgByType2(u8 multiplier, u16 move, u8* flags) // same as Mo
     }
 }
 
-u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef)
+u8 TypeCalc(u16 move, u8 attacker, u8 defender)
 {
     s32 i = 0;
     u8 flags = 0;
@@ -1648,13 +1648,13 @@ u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef)
     moveType = gBattleMoves[move].type;
 
     // check stab
-    if (gBattleMons[bankAtk].type1 == moveType || gBattleMons[bankAtk].type2 == moveType)
+    if (gBattleMons[attacker].type1 == moveType || gBattleMons[attacker].type2 == moveType)
     {
         gBattleMoveDamage = gBattleMoveDamage * 15;
         gBattleMoveDamage = gBattleMoveDamage / 10;
     }
 
-    if (gBattleMons[bankDef].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[defender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
         flags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
     }
@@ -1664,7 +1664,7 @@ u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef)
         {
             if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
-                if (gBattleMons[bankDef].status2 & STATUS2_FORESIGHT)
+                if (gBattleMons[defender].status2 & STATUS2_FORESIGHT)
                     break;
                 i += 3;
                 continue;
@@ -1673,19 +1673,19 @@ u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef)
             else if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[bankDef].type1)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[defender].type1)
                     ModulateDmgByType2(TYPE_EFFECT_MULTIPLIER(i), move, &flags);
                 // check type2
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[bankDef].type2 &&
-                    gBattleMons[bankDef].type1 != gBattleMons[bankDef].type2)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[defender].type2 &&
+                    gBattleMons[defender].type1 != gBattleMons[defender].type2)
                     ModulateDmgByType2(TYPE_EFFECT_MULTIPLIER(i), move, &flags);
             }
             i += 3;
         }
     }
 
-    if (gBattleMons[bankDef].ability == ABILITY_WONDER_GUARD && !(flags & MOVE_RESULT_MISSED)
-        && AttacksThisTurn(bankAtk, move) == 2
+    if (gBattleMons[defender].ability == ABILITY_WONDER_GUARD && !(flags & MOVE_RESULT_MISSED)
+        && AttacksThisTurn(attacker, move) == 2
         && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
         && gBattleMoves[move].power)
     {
@@ -1764,42 +1764,42 @@ static void atk07_adjustnormaldamage(void)
 
     ApplyRandomDmgMultiplier();
 
-    if (gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBankDefender].holdEffect, quality = gEnigmaBerries[gBankDefender].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattleDefender].holdEffect, quality = gEnigmaBerries[gBattleDefender].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankDefender].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBankDefender].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleDefender].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleDefender].item);
     }
 
-    gStringBank = gBankDefender;
+    gStringBank = gBattleDefender;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBankDefender, holdEffect);
-        gSpecialStatuses[gBankDefender].focusBanded = 1;
+        RecordItemEffectBattle(gBattleDefender, holdEffect);
+        gSpecialStatuses[gBattleDefender].focusBanded = 1;
     }
-    if (gBattleMons[gBankDefender].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBattleDefender].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBankDefender].endured
-     && !gSpecialStatuses[gBankDefender].focusBanded)
+    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattleDefender].endured
+     && !gSpecialStatuses[gBattleDefender].focusBanded)
         goto END;
 
-    if (gBattleMons[gBankDefender].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattleDefender].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBankDefender].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBattleDefender].hp - 1;
 
-    if (gProtectStructs[gBankDefender].endured)
+    if (gProtectStructs[gBattleDefender].endured)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBankDefender].focusBanded)
+    else if (gSpecialStatuses[gBattleDefender].focusBanded)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-        gLastUsedItem = gBattleMons[gBankDefender].item;
+        gLastUsedItem = gBattleMons[gBattleDefender].item;
     }
 
     END:
@@ -1812,40 +1812,40 @@ static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't
 
     ApplyRandomDmgMultiplier();
 
-    if (gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBankDefender].holdEffect, quality = gEnigmaBerries[gBankDefender].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattleDefender].holdEffect, quality = gEnigmaBerries[gBattleDefender].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankDefender].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBankDefender].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleDefender].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleDefender].item);
     }
 
-    gStringBank = gBankDefender;
+    gStringBank = gBattleDefender;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBankDefender, holdEffect);
-        gSpecialStatuses[gBankDefender].focusBanded = 1;
+        RecordItemEffectBattle(gBattleDefender, holdEffect);
+        gSpecialStatuses[gBattleDefender].focusBanded = 1;
     }
-    if (gBattleMons[gBankDefender].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBattleDefender].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (!gProtectStructs[gBankDefender].endured && !gSpecialStatuses[gBankDefender].focusBanded)
+    if (!gProtectStructs[gBattleDefender].endured && !gSpecialStatuses[gBattleDefender].focusBanded)
         goto END;
-    if (gBattleMons[gBankDefender].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattleDefender].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBankDefender].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBattleDefender].hp - 1;
 
-    if (gProtectStructs[gBankDefender].endured)
+    if (gProtectStructs[gBattleDefender].endured)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBankDefender].focusBanded)
+    else if (gSpecialStatuses[gBattleDefender].focusBanded)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-        gLastUsedItem = gBattleMons[gBankDefender].item;
+        gLastUsedItem = gBattleMons[gBattleDefender].item;
     }
 
     END:
@@ -1878,13 +1878,13 @@ static void atk09_attackanimation(void)
         {
             u8 multihit;
 
-            gActiveBank = gBankAttacker;
+            gActiveBattler = gBattleAttacker;
 
-            if (gBattleMons[gBankDefender].status2 & STATUS2_SUBSTITUTE)
+            if (gBattleMons[gBattleDefender].status2 & STATUS2_SUBSTITUTE)
                 multihit = gMultiHitCounter;
             else if (gMultiHitCounter != 0 && gMultiHitCounter != 1)
             {
-                if (gBattleMons[gBankDefender].hp <= gBattleMoveDamage)
+                if (gBattleMons[gBattleDefender].hp <= gBattleMoveDamage)
                     multihit = 1;
                 else
                     multihit = gMultiHitCounter;
@@ -1892,10 +1892,10 @@ static void atk09_attackanimation(void)
             else
                 multihit = gMultiHitCounter;
 
-            EmitMoveAnimation(0, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBankAttacker].friendship, &gDisableStructs[gBankAttacker], multihit);
+            EmitMoveAnimation(0, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBattleAttacker].friendship, &gDisableStructs[gBattleAttacker], multihit);
             gBattleScripting.animTurn += 1;
             gBattleScripting.animTargetsHit += 1;
-            MarkBufferBankForExecution(gBankAttacker);
+            MarkBufferBankForExecution(gBattleAttacker);
             gBattlescriptCurrInstr++;
         }
         else
@@ -1919,11 +1919,11 @@ static void atk0B_healthbarupdate(void)
 
     if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-        if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
+        if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
         {
-            PrepareStringBattle(STRINGID_SUBSTITUTEDAMAGED, gActiveBank);
+            PrepareStringBattle(STRINGID_SUBSTITUTEDAMAGED, gActiveBattler);
         }
         else
         {
@@ -1938,9 +1938,9 @@ static void atk0B_healthbarupdate(void)
                 healthValue = maxPossibleDmgValue;
 
             EmitHealthBarUpdate(0, healthValue);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
 
-            if (GetBankSide(gActiveBank) == SIDE_PLAYER && gBattleMoveDamage > 0)
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleMoveDamage > 0)
                 gBattleResults.unk5_0 = 1;
         }
     }
@@ -1964,25 +1964,25 @@ static void atk0C_datahpupdate(void)
 
     if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-        if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
         {
-            if (gDisableStructs[gActiveBank].substituteHP >= gBattleMoveDamage)
+            if (gDisableStructs[gActiveBattler].substituteHP >= gBattleMoveDamage)
             {
-                if (gSpecialStatuses[gActiveBank].moveturnLostHP == 0)
-                    gSpecialStatuses[gActiveBank].moveturnLostHP = gBattleMoveDamage;
-                gDisableStructs[gActiveBank].substituteHP -= gBattleMoveDamage;
+                if (gSpecialStatuses[gActiveBattler].moveturnLostHP == 0)
+                    gSpecialStatuses[gActiveBattler].moveturnLostHP = gBattleMoveDamage;
+                gDisableStructs[gActiveBattler].substituteHP -= gBattleMoveDamage;
                 gHpDealt = gBattleMoveDamage;
             }
             else
             {
-                if (gSpecialStatuses[gActiveBank].moveturnLostHP == 0)
-                    gSpecialStatuses[gActiveBank].moveturnLostHP = gDisableStructs[gActiveBank].substituteHP;
-                gHpDealt = gDisableStructs[gActiveBank].substituteHP;
-                gDisableStructs[gActiveBank].substituteHP = 0;
+                if (gSpecialStatuses[gActiveBattler].moveturnLostHP == 0)
+                    gSpecialStatuses[gActiveBattler].moveturnLostHP = gDisableStructs[gActiveBattler].substituteHP;
+                gHpDealt = gDisableStructs[gActiveBattler].substituteHP;
+                gDisableStructs[gActiveBattler].substituteHP = 0;
             }
             // check substitute fading
-            if (gDisableStructs[gActiveBank].substituteHP == 0)
+            if (gDisableStructs[gActiveBattler].substituteHP == 0)
             {
                 gBattlescriptCurrInstr += 2;
                 BattleScriptPushCursor();
@@ -1995,9 +1995,9 @@ static void atk0C_datahpupdate(void)
             gHitMarker &= ~(HITMARKER_IGNORE_SUBSTITUTE);
             if (gBattleMoveDamage < 0) // hp goes up
             {
-                gBattleMons[gActiveBank].hp -= gBattleMoveDamage;
-                if (gBattleMons[gActiveBank].hp > gBattleMons[gActiveBank].maxHP)
-                    gBattleMons[gActiveBank].hp = gBattleMons[gActiveBank].maxHP;
+                gBattleMons[gActiveBattler].hp -= gBattleMoveDamage;
+                if (gBattleMons[gActiveBattler].hp > gBattleMons[gActiveBattler].maxHP)
+                    gBattleMons[gActiveBattler].hp = gBattleMons[gActiveBattler].maxHP;
 
             }
             else // hp goes down
@@ -2008,68 +2008,68 @@ static void atk0C_datahpupdate(void)
                 }
                 else
                 {
-                    gTakenDmg[gActiveBank] += gBattleMoveDamage;
+                    gTakenDmg[gActiveBattler] += gBattleMoveDamage;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
-                        gTakenDmgBanks[gActiveBank] = gBankAttacker;
+                        gTakenDmgBanks[gActiveBattler] = gBattleAttacker;
                     else
-                        gTakenDmgBanks[gActiveBank] = gBankDefender;
+                        gTakenDmgBanks[gActiveBattler] = gBattleDefender;
                 }
 
-                if (gBattleMons[gActiveBank].hp > gBattleMoveDamage)
+                if (gBattleMons[gActiveBattler].hp > gBattleMoveDamage)
                 {
-                    gBattleMons[gActiveBank].hp -= gBattleMoveDamage;
+                    gBattleMons[gActiveBattler].hp -= gBattleMoveDamage;
                     gHpDealt = gBattleMoveDamage;
                 }
                 else
                 {
-                    gHpDealt = gBattleMons[gActiveBank].hp;
-                    gBattleMons[gActiveBank].hp = 0;
+                    gHpDealt = gBattleMons[gActiveBattler].hp;
+                    gBattleMons[gActiveBattler].hp = 0;
                 }
 
-                if (!gSpecialStatuses[gActiveBank].moveturnLostHP && !(gHitMarker & HITMARKER_x100000))
-                    gSpecialStatuses[gActiveBank].moveturnLostHP = gHpDealt;
+                if (!gSpecialStatuses[gActiveBattler].moveturnLostHP && !(gHitMarker & HITMARKER_x100000))
+                    gSpecialStatuses[gActiveBattler].moveturnLostHP = gHpDealt;
 
                 if (moveType <= 8 && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT)
                 {
-                    gProtectStructs[gActiveBank].physicalDmg = gHpDealt;
-                    gSpecialStatuses[gActiveBank].moveturnLostHP_physical = gHpDealt;
+                    gProtectStructs[gActiveBattler].physicalDmg = gHpDealt;
+                    gSpecialStatuses[gActiveBattler].moveturnLostHP_physical = gHpDealt;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                     {
-                        gProtectStructs[gActiveBank].physicalBank = gBankAttacker;
-                        gSpecialStatuses[gActiveBank].moveturnPhysicalBank = gBankAttacker;
+                        gProtectStructs[gActiveBattler].physicalBank = gBattleAttacker;
+                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattleAttacker;
                     }
                     else
                     {
-                        gProtectStructs[gActiveBank].physicalBank = gBankDefender;
-                        gSpecialStatuses[gActiveBank].moveturnPhysicalBank = gBankDefender;
+                        gProtectStructs[gActiveBattler].physicalBank = gBattleDefender;
+                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattleDefender;
                     }
                 }
                 else if (moveType > 8 && !(gHitMarker & HITMARKER_x100000))
                 {
-                    gProtectStructs[gActiveBank].specialDmg = gHpDealt;
-                    gSpecialStatuses[gActiveBank].moveturnLostHP_special = gHpDealt;
+                    gProtectStructs[gActiveBattler].specialDmg = gHpDealt;
+                    gSpecialStatuses[gActiveBattler].moveturnLostHP_special = gHpDealt;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                     {
-                        gProtectStructs[gActiveBank].specialBank = gBankAttacker;
-                        gSpecialStatuses[gActiveBank].moveturnSpecialBank = gBankAttacker;
+                        gProtectStructs[gActiveBattler].specialBank = gBattleAttacker;
+                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattleAttacker;
                     }
                     else
                     {
-                        gProtectStructs[gActiveBank].specialBank = gBankDefender;
-                        gSpecialStatuses[gActiveBank].moveturnSpecialBank = gBankDefender;
+                        gProtectStructs[gActiveBattler].specialBank = gBattleDefender;
+                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattleDefender;
                     }
                 }
             }
             gHitMarker &= ~(HITMARKER_x100000);
-            EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp);
-            MarkBufferBankForExecution(gActiveBank);
+            EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp);
+            MarkBufferBankForExecution(gActiveBattler);
         }
     }
     else
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-        if (gSpecialStatuses[gActiveBank].moveturnLostHP == 0)
-            gSpecialStatuses[gActiveBank].moveturnLostHP = 0xFFFF;
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        if (gSpecialStatuses[gActiveBattler].moveturnLostHP == 0)
+            gSpecialStatuses[gActiveBattler].moveturnLostHP = 0xFFFF;
     }
     gBattlescriptCurrInstr += 2;
 }
@@ -2080,7 +2080,7 @@ static void atk0D_critmessage(void)
     {
         if (gCritMultiplier == 2 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
         {
-            PrepareStringBattle(STRINGID_CRITICALHIT, gBankAttacker);
+            PrepareStringBattle(STRINGID_CRITICALHIT, gBattleAttacker);
             gBattleCommunication[MSG_DISPLAY] = 1;
         }
         gBattlescriptCurrInstr++;
@@ -2092,18 +2092,18 @@ static void atk0E_effectivenesssound(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = gBankDefender;
+    gActiveBattler = gBattleDefender;
     if (!(gMoveResultFlags & MOVE_RESULT_MISSED))
     {
         switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED)))
         {
         case MOVE_RESULT_SUPER_EFFECTIVE:
             EmitPlaySE(0, SE_KOUKA_H);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             break;
         case MOVE_RESULT_NOT_VERY_EFFECTIVE:
             EmitPlaySE(0, SE_KOUKA_L);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             break;
         case MOVE_RESULT_DOESNT_AFFECT_FOE:
         case MOVE_RESULT_FAILED:
@@ -2116,17 +2116,17 @@ static void atk0E_effectivenesssound(void)
             if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             {
                 EmitPlaySE(0, SE_KOUKA_H);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE)
             {
                 EmitPlaySE(0, SE_KOUKA_L);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)))
             {
                 EmitPlaySE(0, SE_KOUKA_M);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             break;
         }
@@ -2170,8 +2170,8 @@ static void atk0F_resultmessage(void)
             stringId = STRINGID_ITDOESNTAFFECT;
             break;
         case MOVE_RESULT_FOE_HUNG_ON:
-            gLastUsedItem = gBattleMons[gBankDefender].item;
-            gStringBank = gBankDefender;
+            gLastUsedItem = gBattleMons[gBattleDefender].item;
+            gStringBank = gBattleDefender;
             gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
             BattleScriptPushCursor();
             gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
@@ -2199,8 +2199,8 @@ static void atk0F_resultmessage(void)
             }
             else if (gMoveResultFlags & MOVE_RESULT_FOE_HUNG_ON)
             {
-                gLastUsedItem = gBattleMons[gBankDefender].item;
-                gStringBank = gBankDefender;
+                gLastUsedItem = gBattleMons[gBattleDefender].item;
+                gStringBank = gBattleDefender;
                 gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
@@ -2218,7 +2218,7 @@ static void atk0F_resultmessage(void)
     }
 
     if (stringId)
-        PrepareStringBattle(stringId, gBankAttacker);
+        PrepareStringBattle(stringId, gBattleAttacker);
 
     gBattlescriptCurrInstr++;
 }
@@ -2228,7 +2228,7 @@ static void atk10_printstring(void)
     if (gBattleExecBuffer == 0)
     {
         u16 var = BS2ScriptRead16(gBattlescriptCurrInstr + 1);
-        PrepareStringBattle(var, gBankAttacker);
+        PrepareStringBattle(var, gBattleAttacker);
         gBattlescriptCurrInstr += 3;
         gBattleCommunication[MSG_DISPLAY] = 1;
     }
@@ -2236,10 +2236,10 @@ static void atk10_printstring(void)
 
 static void atk11_printselectionstring(void)
 {
-    gActiveBank = gBankAttacker;
+    gActiveBattler = gBattleAttacker;
 
     EmitPrintSelectionString(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 3;
     gBattleCommunication[MSG_DISPLAY] = 1;
@@ -2273,7 +2273,7 @@ static void atk13_printfromtable(void)
         const u16 *ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         ptr += gBattleCommunication[MULTISTRING_CHOOSER];
 
-        PrepareStringBattle(*ptr, gBankAttacker);
+        PrepareStringBattle(*ptr, gBattleAttacker);
 
         gBattlescriptCurrInstr += 5;
         gBattleCommunication[MSG_DISPLAY] = 1;
@@ -2287,9 +2287,9 @@ static void atk14_printselectionstringfromtable(void)
         const u16 *ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         ptr += gBattleCommunication[MULTISTRING_CHOOSER];
 
-        gActiveBank = gBankAttacker;
+        gActiveBattler = gBattleAttacker;
         EmitPrintSelectionString(0, *ptr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
 
         gBattlescriptCurrInstr += 5;
         gBattleCommunication[MSG_DISPLAY] = 1;
@@ -2299,9 +2299,9 @@ static void atk14_printselectionstringfromtable(void)
 u8 BankGetTurnOrder(u8 bank)
 {
     s32 i;
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
-        if (gBanksByTurnOrder[i] == bank)
+        if (gBattleTurnOrder[i] == bank)
             break;
     }
     return i;
@@ -2328,22 +2328,22 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
     if (gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_AFFECTS_USER)
     {
-        gEffectBank = gBankAttacker; // bank that effects get applied on
+        gEffectBank = gBattleAttacker; // bank that effects get applied on
         gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_AFFECTS_USER);
         affectsUser = MOVE_EFFECT_AFFECTS_USER;
-        gBattleScripting.bank = gBankDefender; // theoretically the attacker
+        gBattleScripting.battler = gBattleDefender; // theoretically the attacker
     }
     else
     {
-        gEffectBank = gBankDefender;
-        gBattleScripting.bank = gBankAttacker;
+        gEffectBank = gBattleDefender;
+        gBattleScripting.battler = gBattleAttacker;
     }
 
     if (gBattleMons[gEffectBank].ability == ABILITY_SHIELD_DUST && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
         && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 9)
         INCREMENT_RESET_RETURN
 
-    if (gSideStatuses[GET_BANK_SIDE(gEffectBank)] & SIDE_STATUS_SAFEGUARD && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
+    if (gSideStatuses[GET_BATTLER_SIDE(gEffectBank)] & SIDE_STATUS_SAFEGUARD && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
         && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 7)
         INCREMENT_RESET_RETURN
 
@@ -2363,17 +2363,17 @@ void SetMoveEffect(bool8 primary, u8 certain)
             // check active uproar
             if (gBattleMons[gEffectBank].ability != ABILITY_SOUNDPROOF)
             {
-                for (gActiveBank = 0;
-                    gActiveBank < gBattleBanksCount && !(gBattleMons[gActiveBank].status2 & STATUS2_UPROAR);
-                    gActiveBank++)
+                for (gActiveBattler = 0;
+                    gActiveBattler < gBattlersCount && !(gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR);
+                    gActiveBattler++)
                 {}
             }
             else
-                gActiveBank = gBattleBanksCount;
+                gActiveBattler = gBattlersCount;
 
             if (gBattleMons[gEffectBank].status1)
                 break;
-            if (gActiveBank != gBattleBanksCount)
+            if (gActiveBattler != gBattlersCount)
                 break;
             if (gBattleMons[gEffectBank].ability == ABILITY_VITAL_SPIRIT)
                 break;
@@ -2583,9 +2583,9 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
             gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
 
-            gActiveBank = gEffectBank;
+            gActiveBattler = gEffectBank;
             EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBank].status1);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
 
             if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
             {
@@ -2681,10 +2681,10 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 break;
             case MOVE_EFFECT_PAYDAY:
-                if (GET_BANK_SIDE(gBankAttacker) == SIDE_PLAYER)
+                if (GET_BATTLER_SIDE(gBattleAttacker) == B_SIDE_PLAYER)
                 {
                     u16 PayDay = gPaydayMoney;
-                    gPaydayMoney += (gBattleMons[gBankAttacker].level * 5);
+                    gPaydayMoney += (gBattleMons[gBattleAttacker].level * 5);
                     if (PayDay > gPaydayMoney)
                         gPaydayMoney = 0xFFFF;
                 }
@@ -2719,7 +2719,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
                     *(gBattleStruct->wrappedMove + gEffectBank * 2 + 0) = gCurrentMove;
                     *(gBattleStruct->wrappedMove + gEffectBank * 2 + 1) = gCurrentMove >> 8;
-                    *(gBattleStruct->wrappedBy + gEffectBank) = gBankAttacker;
+                    *(gBattleStruct->wrappedBy + gEffectBank) = gBattleAttacker;
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
@@ -2832,7 +2832,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_RAGE:
-                gBattleMons[gBankAttacker].status2 |= STATUS2_RAGE;
+                gBattleMons[gBattleAttacker].status2 |= STATUS2_RAGE;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_STEAL_ITEM:
@@ -2843,8 +2843,8 @@ void SetMoveEffect(bool8 primary, u8 certain)
                         break;
                     }
 
-                    side = GetBankSide(gBankAttacker);
-                    if (GetBankSide(gBankAttacker) == SIDE_OPPONENT
+                    side = GetBattlerSide(gBattleAttacker);
+                    if (GetBattlerSide(gBattleAttacker) == B_SIDE_OPPONENT
                         && !(gBattleTypeFlags &
                              (BATTLE_TYPE_EREADER_TRAINER
                               | BATTLE_TYPE_FRONTIER
@@ -2860,56 +2860,56 @@ void SetMoveEffect(bool8 primary, u8 certain)
                            | BATTLE_TYPE_LINK
                            | BATTLE_TYPE_x2000000
                            | BATTLE_TYPE_SECRET_BASE))
-                        && (gWishFutureKnock.knockedOffPokes[side] & gBitTable[gBattlePartyID[gBankAttacker]]))
+                        && (gWishFutureKnock.knockedOffPokes[side] & gBitTable[gBattlePartyID[gBattleAttacker]]))
                     {
                         gBattlescriptCurrInstr++;
                     }
-                    else if (gBattleMons[gBankDefender].item
-                        && gBattleMons[gBankDefender].ability == ABILITY_STICKY_HOLD)
+                    else if (gBattleMons[gBattleDefender].item
+                        && gBattleMons[gBattleDefender].ability == ABILITY_STICKY_HOLD)
                     {
                         BattleScriptPushCursor();
                         gBattlescriptCurrInstr = BattleScript_NoItemSteal;
 
-                        gLastUsedAbility = gBattleMons[gBankDefender].ability;
-                        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
+                        gLastUsedAbility = gBattleMons[gBattleDefender].ability;
+                        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
                     }
-                    else if (gBattleMons[gBankAttacker].item != 0
-                        || gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY
-                        || IS_ITEM_MAIL(gBattleMons[gBankDefender].item)
-                        || gBattleMons[gBankDefender].item == 0)
+                    else if (gBattleMons[gBattleAttacker].item != 0
+                        || gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY
+                        || IS_ITEM_MAIL(gBattleMons[gBattleDefender].item)
+                        || gBattleMons[gBattleDefender].item == 0)
                     {
                         gBattlescriptCurrInstr++;
                     }
                     else
                     {
-                        u16* changedItem = &gBattleStruct->changedItems[gBankAttacker];
-                        gLastUsedItem = *changedItem = gBattleMons[gBankDefender].item;
-                        gBattleMons[gBankDefender].item = 0;
+                        u16* changedItem = &gBattleStruct->changedItems[gBattleAttacker];
+                        gLastUsedItem = *changedItem = gBattleMons[gBattleDefender].item;
+                        gBattleMons[gBattleDefender].item = 0;
 
-                        gActiveBank = gBankAttacker;
+                        gActiveBattler = gBattleAttacker;
                         EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem);
-                        MarkBufferBankForExecution(gBankAttacker);
+                        MarkBufferBankForExecution(gBattleAttacker);
 
-                        gActiveBank = gBankDefender;
-                        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankDefender].item);
-                        MarkBufferBankForExecution(gBankDefender);
+                        gActiveBattler = gBattleDefender;
+                        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattleDefender].item);
+                        MarkBufferBankForExecution(gBattleDefender);
 
                         BattleScriptPush(gBattlescriptCurrInstr + 1);
                         gBattlescriptCurrInstr = BattleScript_ItemSteal;
 
-                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankDefender]) + 0) = 0;
-                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankDefender]) + 1) = 0;
+                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleDefender]) + 0) = 0;
+                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleDefender]) + 1) = 0;
                     }
 
                 }
                 break;
             case MOVE_EFFECT_PREVENT_ESCAPE:
-                gBattleMons[gBankDefender].status2 |= STATUS2_ESCAPE_PREVENTION;
-                gDisableStructs[gBankDefender].bankPreventingEscape = gBankAttacker;
+                gBattleMons[gBattleDefender].status2 |= STATUS2_ESCAPE_PREVENTION;
+                gDisableStructs[gBattleDefender].bankPreventingEscape = gBattleAttacker;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_NIGHTMARE:
-                gBattleMons[gBankDefender].status2 |= STATUS2_NIGHTMARE;
+                gBattleMons[gBattleDefender].status2 |= STATUS2_NIGHTMARE;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_ALL_STATS_UP:
@@ -2921,17 +2921,17 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattlescriptCurrInstr = BattleScript_RapidSpinAway;
                 break;
             case MOVE_EFFECT_REMOVE_PARALYSIS: // Smelling salts
-                if (!(gBattleMons[gBankDefender].status1 & STATUS1_PARALYSIS))
+                if (!(gBattleMons[gBattleDefender].status1 & STATUS1_PARALYSIS))
                 {
                     gBattlescriptCurrInstr++;
                 }
                 else
                 {
-                    gBattleMons[gBankDefender].status1 &= ~(STATUS1_PARALYSIS);
+                    gBattleMons[gBattleDefender].status1 &= ~(STATUS1_PARALYSIS);
 
-                    gActiveBank = gBankDefender;
-                    EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-                    MarkBufferBankForExecution(gActiveBank);
+                    gActiveBattler = gBattleDefender;
+                    EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                    MarkBufferBankForExecution(gActiveBattler);
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = BattleScript_TargetPRLZHeal;
@@ -2978,7 +2978,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 if (gBattleMons[gEffectBank].item)
                 {
-                    side = GetBankSide(gEffectBank);
+                    side = GetBattlerSide(gEffectBank);
 
                     gLastUsedItem = gBattleMons[gEffectBank].item;
                     gBattleMons[gEffectBank].item = 0;
@@ -3010,7 +3010,7 @@ static void atk15_seteffectwithchance(void)
 {
     u32 percentChance;
 
-    if (gBattleMons[gBankAttacker].ability == ABILITY_SERENE_GRACE)
+    if (gBattleMons[gBattleAttacker].ability == ABILITY_SERENE_GRACE)
         percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance * 2;
     else
         percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance;
@@ -3051,12 +3051,12 @@ static void atk17_seteffectsecondary(void)
 
 static void atk18_clearstatusfromeffect(void)
 {
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
     if (gBattleCommunication[MOVE_EFFECT_BYTE] <= MOVE_EFFECT_TOXIC)
-        gBattleMons[gActiveBank].status1 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
+        gBattleMons[gActiveBattler].status1 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
     else
-        gBattleMons[gActiveBank].status2 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
+        gBattleMons[gActiveBattler].status2 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
 
     gBattleCommunication[MOVE_EFFECT_BYTE] = 0;
     gBattlescriptCurrInstr += 2;
@@ -3069,14 +3069,14 @@ static void atk19_tryfaintmon(void)
 
     if (gBattlescriptCurrInstr[2] != 0)
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-        if (gHitMarker & HITMARKER_FAINTED(gActiveBank))
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        if (gHitMarker & HITMARKER_FAINTED(gActiveBattler))
         {
             BS_ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 3);
 
             BattleScriptPop();
             gBattlescriptCurrInstr = BS_ptr;
-            gSideStatuses[GetBankSide(gActiveBank)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
+            gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
         }
         else
         {
@@ -3089,58 +3089,58 @@ static void atk19_tryfaintmon(void)
 
         if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
         {
-            gActiveBank = gBankAttacker;
-            bank = gBankDefender;
+            gActiveBattler = gBattleAttacker;
+            bank = gBattleDefender;
             BS_ptr = BattleScript_FaintAttacker;
         }
         else
         {
-            gActiveBank = gBankDefender;
-            bank = gBankAttacker;
+            gActiveBattler = gBattleDefender;
+            bank = gBattleAttacker;
             BS_ptr = BattleScript_FaintTarget;
         }
-        if (!(gAbsentBankFlags & gBitTable[gActiveBank])
-         && gBattleMons[gActiveBank].hp == 0)
+        if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler])
+         && gBattleMons[gActiveBattler].hp == 0)
         {
-            gHitMarker |= HITMARKER_FAINTED(gActiveBank);
+            gHitMarker |= HITMARKER_FAINTED(gActiveBattler);
             BattleScriptPush(gBattlescriptCurrInstr + 7);
             gBattlescriptCurrInstr = BS_ptr;
-            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
             {
                 gHitMarker |= HITMARKER_x400000;
                 if (gBattleResults.playerFaintCounter < 0xFF)
                     gBattleResults.playerFaintCounter++;
-                AdjustFriendshipOnBattleFaint(gActiveBank);
+                AdjustFriendshipOnBattleFaint(gActiveBattler);
             }
             else
             {
                 if (gBattleResults.opponentFaintCounter < 0xFF)
                     gBattleResults.opponentFaintCounter++;
-                gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES, NULL);
+                gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES, NULL);
             }
-            if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBankAttacker].hp != 0)
+            if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBattleAttacker].hp != 0)
             {
                 gHitMarker &= ~(HITMARKER_DESTINYBOND);
                 BattleScriptPush(gBattlescriptCurrInstr);
                 gBattleMoveDamage = gBattleMons[bank].hp;
                 gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife;
             }
-            if ((gStatuses3[gBankDefender] & STATUS3_GRUDGE)
+            if ((gStatuses3[gBattleDefender] & STATUS3_GRUDGE)
              && !(gHitMarker & HITMARKER_GRUDGE)
-             && GetBankSide(gBankAttacker) != GetBankSide(gBankDefender)
-             && gBattleMons[gBankAttacker].hp != 0
+             && GetBattlerSide(gBattleAttacker) != GetBattlerSide(gBattleDefender)
+             && gBattleMons[gBattleAttacker].hp != 0
              && gCurrentMove != MOVE_STRUGGLE)
             {
-                u8 moveIndex = *(gBattleStruct->chosenMovePositions + gBankAttacker);
+                u8 moveIndex = *(gBattleStruct->chosenMovePositions + gBattleAttacker);
 
-                gBattleMons[gBankAttacker].pp[moveIndex] = 0;
+                gBattleMons[gBattleAttacker].pp[moveIndex] = 0;
                 BattleScriptPush(gBattlescriptCurrInstr);
                 gBattlescriptCurrInstr = BattleScript_GrudgeTakesPp;
-                gActiveBank = gBankAttacker;
-                EmitSetMonData(0, moveIndex + REQUEST_PPMOVE1_BATTLE, 0, 1, &gBattleMons[gActiveBank].pp[moveIndex]);
-                MarkBufferBankForExecution(gActiveBank);
+                gActiveBattler = gBattleAttacker;
+                EmitSetMonData(0, moveIndex + REQUEST_PPMOVE1_BATTLE, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]);
+                MarkBufferBankForExecution(gActiveBattler);
 
-                PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBankAttacker].moves[moveIndex])
+                PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattleAttacker].moves[moveIndex])
             }
         }
         else
@@ -3154,9 +3154,9 @@ static void atk1A_dofaintanimation(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
         EmitFaintAnimation(0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 2;
     }
 }
@@ -3165,13 +3165,13 @@ static void atk1B_cleareffectsonfaint(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-        if (!(gBattleTypeFlags & BATTLE_TYPE_ARENA) || gBattleMons[gActiveBank].hp == 0)
+        if (!(gBattleTypeFlags & BATTLE_TYPE_ARENA) || gBattleMons[gActiveBattler].hp == 0)
         {
-            gBattleMons[gActiveBank].status1 = 0;
-            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBank].status1);
-            MarkBufferBankForExecution(gActiveBank);
+            gBattleMons[gActiveBattler].status1 = 0;
+            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBattler].status1);
+            MarkBufferBankForExecution(gActiveBattler);
         }
 
         FaintClearSetData(); // Effects like attractions, trapping, etc.
@@ -3211,7 +3211,7 @@ static void atk1E_jumpifability(void)
 
     if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER_SIDE)
     {
-        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBankAttacker, ability, 0, 0);
+        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattleAttacker, ability, 0, 0);
         if (bank)
         {
             gLastUsedAbility = ability;
@@ -3224,7 +3224,7 @@ static void atk1E_jumpifability(void)
     }
     else if (gBattlescriptCurrInstr[1] == BS_GET_NOT_ATTACKER_SIDE)
     {
-        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBankAttacker, ability, 0, 0);
+        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBattleAttacker, ability, 0, 0);
         if (bank)
         {
             gLastUsedAbility = ability;
@@ -3257,9 +3257,9 @@ static void atk1F_jumpifsideaffecting(void)
     const u8* jumpPtr;
 
     if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
-        side = GET_BANK_SIDE(gBankAttacker);
+        side = GET_BATTLER_SIDE(gBattleAttacker);
     else
-        side = GET_BANK_SIDE(gBankDefender);
+        side = GET_BATTLER_SIDE(gBattleDefender);
 
     flags = BS2ScriptRead16(gBattlescriptCurrInstr + 2);
     jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 4);
@@ -3315,20 +3315,20 @@ static void atk21_jumpifstatus3condition(void)
     u32 flags;
     const u8 *jumpPtr;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
     flags = BS2ScriptRead32(gBattlescriptCurrInstr + 2);
     jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 7);
 
     if (gBattlescriptCurrInstr[6])
     {
-        if ((gStatuses3[gActiveBank] & flags) != 0)
+        if ((gStatuses3[gActiveBattler] & flags) != 0)
             gBattlescriptCurrInstr += 11;
         else
             gBattlescriptCurrInstr = jumpPtr;
     }
     else
     {
-        if ((gStatuses3[gActiveBank] & flags) != 0)
+        if ((gStatuses3[gActiveBattler] & flags) != 0)
             gBattlescriptCurrInstr = jumpPtr;
         else
             gBattlescriptCurrInstr += 11;
@@ -3363,7 +3363,7 @@ static void atk23_getexp(void)
     switch (gBattleScripting.atk23_state)
     {
     case 0: // check if should receive exp at all
-        if (GetBankSide(gBank1) != SIDE_OPPONENT || (gBattleTypeFlags &
+        if (GetBattlerSide(gBank1) != B_SIDE_OPPONENT || (gBattleTypeFlags &
              (BATTLE_TYPE_LINK
               | BATTLE_TYPE_x2000000
               | BATTLE_TYPE_x4000000
@@ -3495,11 +3495,11 @@ static void atk23_getexp(void)
                     // get exp getter bank
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
                     {
-                        if (!(gBattlePartyID[2] != gBattleStruct->expGetterId) && !(gAbsentBankFlags & gBitTable[2]))
+                        if (!(gBattlePartyID[2] != gBattleStruct->expGetterId) && !(gAbsentBattlerFlags & gBitTable[2]))
                             gBattleStruct->expGetterBank = 2;
                         else
                         {
-                            if (!(gAbsentBankFlags & gBitTable[0]))
+                            if (!(gAbsentBattlerFlags & gBitTable[0]))
                                 gBattleStruct->expGetterBank = 0;
                             else
                                 gBattleStruct->expGetterBank = 2;
@@ -3536,9 +3536,9 @@ static void atk23_getexp(void)
                 BATTLE_LVLUP_STATS->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPATK);
                 BATTLE_LVLUP_STATS->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPDEF);
 
-                gActiveBank = gBattleStruct->expGetterBank;
+                gActiveBattler = gBattleStruct->expGetterBank;
                 EmitExpUpdate(0, gBattleStruct->expGetterId, gBattleMoveDamage);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
             gBattleScripting.atk23_state++;
         }
@@ -3546,20 +3546,20 @@ static void atk23_getexp(void)
     case 4: // lvl up if necessary
         if (gBattleExecBuffer == 0)
         {
-            gActiveBank = gBattleStruct->expGetterBank;
-            if (gBattleBufferB[gActiveBank][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBank][1] == RET_VALUE_LEVELLED_UP)
+            gActiveBattler = gBattleStruct->expGetterBank;
+            if (gBattleBufferB[gActiveBattler][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBattler][1] == RET_VALUE_LEVELLED_UP)
             {
-                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlePartyID[gActiveBank] == gBattleStruct->expGetterId)
-                    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
+                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlePartyID[gActiveBattler] == gBattleStruct->expGetterId)
+                    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
 
-                PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBank, gBattleStruct->expGetterId)
+                PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterId)
 
                 PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL))
 
                 BattleScriptPushCursor();
                 gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterId];
                 gBattlescriptCurrInstr = BattleScript_LevelUp;
-                gBattleMoveDamage = (gBattleBufferB[gActiveBank][2] | (gBattleBufferB[gActiveBank][3] << 8));
+                gBattleMoveDamage = (gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8));
                 AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterId], 0);
 
                 // update battle mon structure after level up
@@ -3674,13 +3674,13 @@ static void atk24(void)
         s32 foundOpponent;
 
         // Impossible to decompile loops.
-        for (foundPlayer = 0, i = 0; i < gBattleBanksCount; i += 2)
+        for (foundPlayer = 0, i = 0; i < gBattlersCount; i += 2)
         {
             if (HITMARKER_UNK(i) & gHitMarker && !gSpecialStatuses[i].flag40)
                 foundPlayer++;
         }
 
-        for (foundOpponent = 0, i = 1; i < gBattleBanksCount; i += 2)
+        for (foundOpponent = 0, i = 1; i < gBattlersCount; i += 2)
         {
             if (HITMARKER_UNK(i) & gHitMarker && !gSpecialStatuses[i].flag40)
                 foundOpponent++;
@@ -3889,7 +3889,7 @@ static void atk24(void)
         beq _0804AF1A\n\
         movs r3, 0\n\
         movs r5, 0\n\
-        ldr r0, =gBattleBanksCount\n\
+        ldr r0, =gBattlersCount\n\
         ldrb r1, [r0]\n\
         mov r12, r0\n\
         ldr r7, =gBattlescriptCurrInstr\n\
@@ -4323,12 +4323,12 @@ static void atk3A_waitstate(void)
 static void atk3B_healthbar_update(void)
 {
     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
-        gActiveBank = gBankDefender;
+        gActiveBattler = gBattleDefender;
     else
-        gActiveBank = gBankAttacker;
+        gActiveBattler = gBattleAttacker;
 
     EmitHealthBarUpdate(0, gBattleMoveDamage);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
@@ -4340,16 +4340,16 @@ static void atk3C_return(void)
 static void atk3D_end(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-        sub_81A5718(gBankAttacker);
+        sub_81A5718(gBattleAttacker);
 
     gMoveResultFlags = 0;
-    gActiveBank = 0;
+    gActiveBattler = 0;
     gCurrentActionFuncId = 0xB;
 }
 
 static void atk3E_end2(void)
 {
-    gActiveBank = 0;
+    gActiveBattler = 0;
     gCurrentActionFuncId = 0xB;
 }
 
@@ -4387,14 +4387,14 @@ static void atk43_jumpifabilitypresent(void)
 
 static void atk44_endselectionscript(void)
 {
-    *(gBankAttacker + gBattleStruct->selectionScriptFinished) = TRUE;
+    *(gBattleAttacker + gBattleStruct->selectionScriptFinished) = TRUE;
 }
 
 static void atk45_playanimation(void)
 {
     const u16* argumentPtr;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
     argumentPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 3);
 
     if (gBattlescriptCurrInstr[2] == B_ANIM_STATS_CHANGE
@@ -4402,7 +4402,7 @@ static void atk45_playanimation(void)
         || gBattlescriptCurrInstr[2] == B_ANIM_SUBSTITUTE_FADE)
     {
         EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 7;
     }
     else if (gHitMarker & HITMARKER_NO_ANIMATIONS)
@@ -4416,17 +4416,17 @@ static void atk45_playanimation(void)
              || gBattlescriptCurrInstr[2] == B_ANIM_HAIL_CONTINUES)
     {
         EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 7;
     }
-    else if (gStatuses3[gActiveBank] & STATUS3_SEMI_INVULNERABLE)
+    else if (gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
     {
         gBattlescriptCurrInstr += 7;
     }
     else
     {
         EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 7;
     }
 }
@@ -4436,7 +4436,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
     const u16* argumentPtr;
     const u8* animationIdPtr;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
     animationIdPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 2);
     argumentPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 6);
 
@@ -4445,7 +4445,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
         || *animationIdPtr == B_ANIM_SUBSTITUTE_FADE)
     {
         EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 10;
     }
     else if (gHitMarker & HITMARKER_NO_ANIMATIONS)
@@ -4458,17 +4458,17 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
              || *animationIdPtr == B_ANIM_HAIL_CONTINUES)
     {
         EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 10;
     }
-    else if (gStatuses3[gActiveBank] & STATUS3_SEMI_INVULNERABLE)
+    else if (gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
     {
         gBattlescriptCurrInstr += 10;
     }
     else
     {
         EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 10;
     }
 }
@@ -4505,7 +4505,7 @@ static void atk48_playstatchangeanimation(void)
     s32 changeableStats = 0;
     u32 statsToCheck = 0;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
     statsToCheck = gBattlescriptCurrInstr[2];
 
     if (gBattlescriptCurrInstr[3] & ATK48_STAT_NEGATIVE) // goes down
@@ -4517,19 +4517,19 @@ static void atk48_playstatchangeanimation(void)
             {
                 if (!(gBattlescriptCurrInstr[3] & ATK48_LOWER_FAIL_CHECK))
                 {
-                    if (gBattleMons[gActiveBank].statStages[currStat] > 0)
+                    if (gBattleMons[gActiveBattler].statStages[currStat] > 0)
                     {
                         statAnimId = checkingStatAnimId;
                         changeableStats++;
                     }
                 }
-                else if (!gSideTimers[GET_BANK_SIDE(gActiveBank)].mistTimer
-                        && gBattleMons[gActiveBank].ability != ABILITY_CLEAR_BODY
-                        && gBattleMons[gActiveBank].ability != ABILITY_WHITE_SMOKE
-                        && !(gBattleMons[gActiveBank].ability == ABILITY_KEEN_EYE && currStat == STAT_STAGE_ACC)
-                        && !(gBattleMons[gActiveBank].ability == ABILITY_HYPER_CUTTER && currStat == STAT_STAGE_ATK))
+                else if (!gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].mistTimer
+                        && gBattleMons[gActiveBattler].ability != ABILITY_CLEAR_BODY
+                        && gBattleMons[gActiveBattler].ability != ABILITY_WHITE_SMOKE
+                        && !(gBattleMons[gActiveBattler].ability == ABILITY_KEEN_EYE && currStat == STAT_STAGE_ACC)
+                        && !(gBattleMons[gActiveBattler].ability == ABILITY_HYPER_CUTTER && currStat == STAT_STAGE_ATK))
                 {
-                    if (gBattleMons[gActiveBank].statStages[currStat] > 0)
+                    if (gBattleMons[gActiveBattler].statStages[currStat] > 0)
                     {
                         statAnimId = checkingStatAnimId;
                         changeableStats++;
@@ -4552,7 +4552,7 @@ static void atk48_playstatchangeanimation(void)
         checkingStatAnimId = (gBattlescriptCurrInstr[3] & ATK48_STAT_BY_TWO) ? 0x26 : 0xE;
         while (statsToCheck != 0)
         {
-            if (statsToCheck & 1 && gBattleMons[gActiveBank].statStages[currStat] < 0xC)
+            if (statsToCheck & 1 && gBattleMons[gActiveBattler].statStages[currStat] < 0xC)
             {
                 statAnimId = checkingStatAnimId;
                 changeableStats++;
@@ -4576,7 +4576,7 @@ static void atk48_playstatchangeanimation(void)
     else if (changeableStats != 0 && gBattleScripting.field_1B == 0)
     {
         EmitBattleAnimation(0, B_ANIM_STATS_CHANGE, statAnimId);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         if (gBattlescriptCurrInstr[3] & ATK48_BIT_x4 && changeableStats > 1)
             gBattleScripting.field_1B = 1;
         gBattlescriptCurrInstr += 4;
@@ -4607,7 +4607,7 @@ static void atk48_playstatchangeanimation(void)
 	ldrb r0, [r0, 0x1]\n\
 	str r3, [sp]\n\
 	bl GetBattleBank\n\
-	ldr r2, =gActiveBank\n\
+	ldr r2, =gActiveBattler\n\
 	strb r0, [r2]\n\
 	ldr r0, [r5]\n\
 	ldrb r4, [r0, 0x2]\n\
@@ -4644,7 +4644,7 @@ _0804BA26:\n\
 	ands r0, r1\n\
 	cmp r0, 0\n\
 	beq _0804BA58\n\
-	ldr r0, =gActiveBank\n\
+	ldr r0, =gActiveBattler\n\
 	ldrb r1, [r0]\n\
 	movs r0, 0x58\n\
 	muls r0, r1\n\
@@ -4652,10 +4652,10 @@ _0804BA26:\n\
 	b _0804BAA0\n\
 	.pool\n\
 _0804BA58:\n\
-	ldr r6, =gActiveBank\n\
+	ldr r6, =gActiveBattler\n\
 	ldrb r0, [r6]\n\
 	str r3, [sp]\n\
-	bl GetBankPosition\n\
+	bl GetBattlerPosition\n\
 	mov r1, r10\n\
 	ands r1, r0\n\
 	lsls r0, r1, 1\n\
@@ -4804,7 +4804,7 @@ _0804BB6C:\n\
 	mov r2, r8\n\
 	str r3, [sp]\n\
 	bl EmitBattleAnimation\n\
-	ldr r0, =gActiveBank\n\
+	ldr r0, =gActiveBattler\n\
 	ldrb r0, [r0]\n\
 	bl MarkBufferBankForExecution\n\
 	ldr r0, =gBattlescriptCurrInstr\n\
@@ -4864,12 +4864,12 @@ static void atk49_moveend(void)
     arg1 = gBattlescriptCurrInstr[1];
     arg2 = gBattlescriptCurrInstr[2];
 
-    if (gBattleMons[gBankAttacker].item == ITEM_ENIGMA_BERRY)
-        holdEffectAtk = gEnigmaBerries[gBankAttacker].holdEffect;
+    if (gBattleMons[gBattleAttacker].item == ITEM_ENIGMA_BERRY)
+        holdEffectAtk = gEnigmaBerries[gBattleAttacker].holdEffect;
     else
-        holdEffectAtk = ItemId_GetHoldEffect(gBattleMons[gBankAttacker].item);
+        holdEffectAtk = ItemId_GetHoldEffect(gBattleMons[gBattleAttacker].item);
 
-    choicedMoveAtk = &gBattleStruct->choicedMove[gBankAttacker];
+    choicedMoveAtk = &gBattleStruct->choicedMove[gBattleAttacker];
 
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
@@ -4878,13 +4878,13 @@ static void atk49_moveend(void)
         switch (gBattleScripting.atk49_state)
         {
         case 0: // rage check
-            if (gBattleMons[gBankDefender].status2 & STATUS2_RAGE
-                && gBattleMons[gBankDefender].hp != 0 && gBankAttacker != gBankDefender
-                && GetBankSide(gBankAttacker) != GetBankSide(gBankDefender)
+            if (gBattleMons[gBattleDefender].status2 & STATUS2_RAGE
+                && gBattleMons[gBattleDefender].hp != 0 && gBattleAttacker != gBattleDefender
+                && GetBattlerSide(gBattleAttacker) != GetBattlerSide(gBattleDefender)
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED
-                && gBattleMoves[gCurrentMove].power && gBattleMons[gBankDefender].statStages[STAT_STAGE_ATK] <= 0xB)
+                && gBattleMoves[gCurrentMove].power && gBattleMons[gBattleDefender].statStages[STAT_STAGE_ATK] <= 0xB)
             {
-                gBattleMons[gBankDefender].statStages[STAT_STAGE_ATK]++;
+                gBattleMons[gBattleDefender].statStages[STAT_STAGE_ATK]++;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_RageIsBuilding;
                 effect = TRUE;
@@ -4892,15 +4892,15 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 1: // defrosting check
-            if (gBattleMons[gBankDefender].status1 & STATUS1_FREEZE
-                && gBattleMons[gBankDefender].hp != 0 && gBankAttacker != gBankDefender
-                && gSpecialStatuses[gBankDefender].moveturnLostHP_special
+            if (gBattleMons[gBattleDefender].status1 & STATUS1_FREEZE
+                && gBattleMons[gBattleDefender].hp != 0 && gBattleAttacker != gBattleDefender
+                && gSpecialStatuses[gBattleDefender].moveturnLostHP_special
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && moveType == TYPE_FIRE)
             {
-                gBattleMons[gBankDefender].status1 &= ~(STATUS1_FREEZE);
-                gActiveBank = gBankDefender;
-                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankDefender].status1);
-                MarkBufferBankForExecution(gActiveBank);
+                gBattleMons[gBattleDefender].status1 &= ~(STATUS1_FREEZE);
+                gActiveBattler = gBattleDefender;
+                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBattleDefender].status1);
+                MarkBufferBankForExecution(gActiveBattler);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove;
                 effect = TRUE;
@@ -4908,12 +4908,12 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 2: // target synchronize
-            if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBankDefender, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBattleDefender, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
         case 3: // contact abilities
-            if (AbilityBattleEffects(ABILITYEFFECT_CONTACT, gBankDefender, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_CONTACT, gBattleDefender, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
@@ -4924,7 +4924,7 @@ static void atk49_moveend(void)
                 gBattleScripting.atk49_state++;
             break;
         case 5: // attacker synchronize
-            if (AbilityBattleEffects(ABILITYEFFECT_ATK_SYNCHRONIZE, gBankAttacker, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_ATK_SYNCHRONIZE, gBattleAttacker, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
@@ -4942,7 +4942,7 @@ static void atk49_moveend(void)
             {
                 for (i = 0; i < 4; i++)
                 {
-                    if (gBattleMons[gBankAttacker].moves[i] == *choicedMoveAtk)
+                    if (gBattleMons[gBattleAttacker].moves[i] == *choicedMoveAtk)
                         break;
                 }
                 if (i == 4)
@@ -4952,7 +4952,7 @@ static void atk49_moveend(void)
             }
             break;
         case 7: // changed held items
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 u16* changedItem = &gBattleStruct->changedItems[i];
                 if (*changedItem != 0)
@@ -4975,12 +4975,12 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 8: // make attacker sprite invisible
-            if (gStatuses3[gBankAttacker] & (STATUS3_SEMI_INVULNERABLE)
+            if (gStatuses3[gBattleAttacker] & (STATUS3_SEMI_INVULNERABLE)
                 && gHitMarker & HITMARKER_NO_ANIMATIONS)
             {
-                gActiveBank = gBankAttacker;
+                gActiveBattler = gBattleAttacker;
                 EmitSpriteInvisibility(0, TRUE);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
                 gBattleScripting.atk49_state++;
                 return;
             }
@@ -4988,34 +4988,34 @@ static void atk49_moveend(void)
             break;
         case 9: // make attacker sprite visible
             if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT
-                || !(gStatuses3[gBankAttacker] & (STATUS3_SEMI_INVULNERABLE))
-                || WasUnableToUseMove(gBankAttacker))
+                || !(gStatuses3[gBattleAttacker] & (STATUS3_SEMI_INVULNERABLE))
+                || WasUnableToUseMove(gBattleAttacker))
             {
-                gActiveBank = gBankAttacker;
+                gActiveBattler = gBattleAttacker;
                 EmitSpriteInvisibility(0, FALSE);
-                MarkBufferBankForExecution(gActiveBank);
-                gStatuses3[gBankAttacker] &= ~(STATUS3_SEMI_INVULNERABLE);
-                gSpecialStatuses[gBankAttacker].restoredBankSprite = 1;
+                MarkBufferBankForExecution(gActiveBattler);
+                gStatuses3[gBattleAttacker] &= ~(STATUS3_SEMI_INVULNERABLE);
+                gSpecialStatuses[gBattleAttacker].restoredBankSprite = 1;
                 gBattleScripting.atk49_state++;
                 return;
             }
             gBattleScripting.atk49_state++;
             break;
         case 10: // make target sprite visible
-            if (!gSpecialStatuses[gBankDefender].restoredBankSprite && gBankDefender < gBattleBanksCount
-                && !(gStatuses3[gBankDefender] & STATUS3_SEMI_INVULNERABLE))
+            if (!gSpecialStatuses[gBattleDefender].restoredBankSprite && gBattleDefender < gBattlersCount
+                && !(gStatuses3[gBattleDefender] & STATUS3_SEMI_INVULNERABLE))
             {
-                gActiveBank = gBankDefender;
+                gActiveBattler = gBattleDefender;
                 EmitSpriteInvisibility(0, FALSE);
-                MarkBufferBankForExecution(gActiveBank);
-                gStatuses3[gBankDefender] &= ~(STATUS3_SEMI_INVULNERABLE);
+                MarkBufferBankForExecution(gActiveBattler);
+                gStatuses3[gBattleDefender] &= ~(STATUS3_SEMI_INVULNERABLE);
                 gBattleScripting.atk49_state++;
                 return;
             }
             gBattleScripting.atk49_state++;
             break;
         case 13: // update substitute
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gDisableStructs[i].substituteHP == 0)
                     gBattleMons[i].status2 &= ~(STATUS2_SUBSTITUTE);
@@ -5025,82 +5025,82 @@ static void atk49_moveend(void)
         case 14: // This case looks interesting, although I am not certain what it does. Probably fine tunes edge cases.
             if (gHitMarker & HITMARKER_PURSUIT_TRAP)
             {
-                gActiveBank = gBankAttacker;
-                gBankAttacker = gBankDefender;
-                gBankDefender = gActiveBank;
+                gActiveBattler = gBattleAttacker;
+                gBattleAttacker = gBattleDefender;
+                gBattleDefender = gActiveBattler;
                 gHitMarker &= ~(HITMARKER_PURSUIT_TRAP);
             }
             if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED)
             {
-                gLastPrintedMoves[gBankAttacker] = gChosenMove;
+                gLastPrintedMoves[gBattleAttacker] = gChosenMove;
             }
-            if (!(gAbsentBankFlags & gBitTable[gBankAttacker])
-                && !(gBattleStruct->field_91 & gBitTable[gBankAttacker])
+            if (!(gAbsentBattlerFlags & gBitTable[gBattleAttacker])
+                && !(gBattleStruct->field_91 & gBitTable[gBattleAttacker])
                 && gBattleMoves[originallyUsedMove].effect != EFFECT_BATON_PASS)
             {
                 if (gHitMarker & HITMARKER_OBEYS)
                 {
-                    gLastMoves[gBankAttacker] = gChosenMove;
-                    gLastResultingMoves[gBankAttacker] = gCurrentMove;
+                    gLastMoves[gBattleAttacker] = gChosenMove;
+                    gLastResultingMoves[gBattleAttacker] = gCurrentMove;
                 }
                 else
                 {
-                    gLastMoves[gBankAttacker] = 0xFFFF;
-                    gLastResultingMoves[gBankAttacker] = 0xFFFF;
+                    gLastMoves[gBattleAttacker] = 0xFFFF;
+                    gLastResultingMoves[gBattleAttacker] = 0xFFFF;
                 }
 
-                if (!(gHitMarker & HITMARKER_FAINTED(gBankDefender)))
-                    gLastHitBy[gBankDefender] = gBankAttacker;
+                if (!(gHitMarker & HITMARKER_FAINTED(gBattleDefender)))
+                    gLastHitBy[gBattleDefender] = gBattleAttacker;
 
                 if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
                 {
                     if (gChosenMove == 0xFFFF)
                     {
-                        gLastLandedMoves[gBankDefender] = gChosenMove;
+                        gLastLandedMoves[gBattleDefender] = gChosenMove;
                     }
                     else
                     {
-                        gLastLandedMoves[gBankDefender] = gCurrentMove;
-                        GET_MOVE_TYPE(gCurrentMove, gLastHitByType[gBankDefender]);
+                        gLastLandedMoves[gBattleDefender] = gCurrentMove;
+                        GET_MOVE_TYPE(gCurrentMove, gLastHitByType[gBattleDefender]);
                     }
                 }
                 else
                 {
-                    gLastLandedMoves[gBankDefender] = 0xFFFF;
+                    gLastLandedMoves[gBattleDefender] = 0xFFFF;
                 }
             }
             gBattleScripting.atk49_state++;
             break;
         case 15: // mirror move
-            if (!(gAbsentBankFlags & gBitTable[gBankAttacker]) && !(gBattleStruct->field_91 & gBitTable[gBankAttacker])
+            if (!(gAbsentBattlerFlags & gBitTable[gBattleAttacker]) && !(gBattleStruct->field_91 & gBitTable[gBattleAttacker])
                 && gBattleMoves[originallyUsedMove].flags & FLAG_MIRROR_MOVE_AFFECTED && gHitMarker & HITMARKER_OBEYS
-                && gBankAttacker != gBankDefender && !(gHitMarker & HITMARKER_FAINTED(gBankDefender))
+                && gBattleAttacker != gBattleDefender && !(gHitMarker & HITMARKER_FAINTED(gBattleDefender))
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
             {
                 u8 target, attacker;
 
-                *(gBattleStruct->mirrorMoves + gBankDefender * 2 + 0) = gChosenMove;
-                *(gBattleStruct->mirrorMoves + gBankDefender * 2 + 1) = gChosenMove >> 8;
+                *(gBattleStruct->mirrorMoves + gBattleDefender * 2 + 0) = gChosenMove;
+                *(gBattleStruct->mirrorMoves + gBattleDefender * 2 + 1) = gChosenMove >> 8;
 
-                target = gBankDefender;
-                attacker = gBankAttacker;
+                target = gBattleDefender;
+                attacker = gBattleAttacker;
                 *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = gChosenMove;
 
-                target = gBankDefender;
-                attacker = gBankAttacker;
+                target = gBattleDefender;
+                attacker = gBattleAttacker;
                 *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = gChosenMove >> 8;
             }
             gBattleScripting.atk49_state++;
             break;
         case 16: //
             if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-                && !gProtectStructs[gBankAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
+                && !gProtectStructs[gBattleAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
                 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
             {
-                u8 bank = GetBankByPosition(B_POSITION_PARTNER(GetBankPosition(gBankDefender)));
+                u8 bank = GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gBattleDefender)));
                 if (gBattleMons[bank].hp != 0)
                 {
-                    gBankDefender = bank;
+                    gBattleDefender = bank;
                     gHitMarker |= HITMARKER_NO_ATTACKSTRING;
                     gBattleScripting.atk49_state = 0;
                     MoveValuesCleanUp();
@@ -5136,13 +5136,13 @@ static void atk4A_typecalc2(void)
     s32 i = 0;
     u8 moveType = gBattleMoves[gCurrentMove].type;
 
-    if (gBattleMons[gBankDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBattleDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
-        gLastUsedAbility = gBattleMons[gBankDefender].ability;
+        gLastUsedAbility = gBattleMons[gBattleDefender].ability;
         gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
-        gLastLandedMoves[gBankDefender] = 0;
+        gLastLandedMoves[gBattleDefender] = 0;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
     }
     else
     {
@@ -5150,7 +5150,7 @@ static void atk4A_typecalc2(void)
         {
             if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
-                if (gBattleMons[gBankDefender].status2 & STATUS2_FORESIGHT)
+                if (gBattleMons[gBattleDefender].status2 & STATUS2_FORESIGHT)
                 {
                     break;
                 }
@@ -5164,7 +5164,7 @@ static void atk4A_typecalc2(void)
             if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type1)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type1)
                 {
                     if (TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
                     {
@@ -5181,22 +5181,22 @@ static void atk4A_typecalc2(void)
                     }
                 }
                 // check type2
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2)
                 {
-                    if (gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2
+                    if (gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
                     {
                         gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
                         break;
                     }
-                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2
-                        && gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2
+                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2
+                        && gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                     {
                         flags |= MOVE_RESULT_NOT_VERY_EFFECTIVE;
                     }
-                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBankDefender].type2
-                        && gBattleMons[gBankDefender].type1 != gBattleMons[gBankDefender].type2
+                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2
+                        && gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                     {
                         flags |= MOVE_RESULT_SUPER_EFFECTIVE;
@@ -5207,31 +5207,31 @@ static void atk4A_typecalc2(void)
         }
     }
 
-    if (gBattleMons[gBankDefender].ability == ABILITY_WONDER_GUARD
+    if (gBattleMons[gBattleDefender].ability == ABILITY_WONDER_GUARD
         && !(flags & MOVE_RESULT_NO_EFFECT)
-        && AttacksThisTurn(gBankAttacker, gCurrentMove) == 2
+        && AttacksThisTurn(gBattleAttacker, gCurrentMove) == 2
         && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
         && gBattleMoves[gCurrentMove].power)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
-        gLastLandedMoves[gBankDefender] = 0;
+        gLastLandedMoves[gBattleDefender] = 0;
         gBattleCommunication[6] = 3;
-        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
     }
     if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
-        gProtectStructs[gBankAttacker].targetNotAffected = 1;
+        gProtectStructs[gBattleAttacker].targetNotAffected = 1;
 
     gBattlescriptCurrInstr++;
 }
 
 static void atk4B_returnatktoball(void)
 {
-    gActiveBank = gBankAttacker;
-    if (!(gHitMarker & HITMARKER_FAINTED(gActiveBank)))
+    gActiveBattler = gBattleAttacker;
+    if (!(gHitMarker & HITMARKER_FAINTED(gActiveBattler)))
     {
         EmitReturnMonToBall(0, 0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
     }
     gBattlescriptCurrInstr++;
 }
@@ -5241,12 +5241,12 @@ static void atk4C_getswitchedmondata(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-    gBattlePartyID[gActiveBank] = *(gBattleStruct->monToSwitchIntoId + gActiveBank);
+    gBattlePartyID[gActiveBattler] = *(gBattleStruct->monToSwitchIntoId + gActiveBattler);
 
-    EmitGetMonData(0, REQUEST_ALL_BATTLE, gBitTable[gBattlePartyID[gActiveBank]]);
-    MarkBufferBankForExecution(gActiveBank);
+    EmitGetMonData(0, REQUEST_ALL_BATTLE, gBitTable[gBattlePartyID[gActiveBattler]]);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -5260,46 +5260,46 @@ static void atk4D_switchindataupdate(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-    oldData = gBattleMons[gActiveBank];
-    monData = (u8*)(&gBattleMons[gActiveBank]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    oldData = gBattleMons[gActiveBattler];
+    monData = (u8*)(&gBattleMons[gActiveBattler]);
 
     for (i = 0; i < sizeof(struct BattlePokemon); i++)
     {
-        monData[i] = gBattleBufferB[gActiveBank][4 + i];
+        monData[i] = gBattleBufferB[gActiveBattler][4 + i];
     }
 
-    gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1;
-    gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2;
-    gBattleMons[gActiveBank].ability = GetAbilityBySpecies(gBattleMons[gActiveBank].species, gBattleMons[gActiveBank].altAbility);
+    gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
+    gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
+    gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].altAbility);
 
     // check knocked off item
-    i = GetBankSide(gActiveBank);
-    if (gWishFutureKnock.knockedOffPokes[i] & gBitTable[gBattlePartyID[gActiveBank]])
+    i = GetBattlerSide(gActiveBattler);
+    if (gWishFutureKnock.knockedOffPokes[i] & gBitTable[gBattlePartyID[gActiveBattler]])
     {
-        gBattleMons[gActiveBank].item = 0;
+        gBattleMons[gActiveBattler].item = 0;
     }
 
     if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
     {
         for (i = 0; i < BATTLE_STATS_NO; i++)
         {
-            gBattleMons[gActiveBank].statStages[i] = oldData.statStages[i];
+            gBattleMons[gActiveBattler].statStages[i] = oldData.statStages[i];
         }
-        gBattleMons[gActiveBank].status2 = oldData.status2;
+        gBattleMons[gActiveBattler].status2 = oldData.status2;
     }
 
     SwitchInClearSetData();
 
-    if (gBattleTypeFlags & BATTLE_TYPE_PALACE && gBattleMons[gActiveBank].maxHP / 2 >= gBattleMons[gActiveBank].hp
-        && gBattleMons[gActiveBank].hp != 0 && !(gBattleMons[gActiveBank].status1 & STATUS1_SLEEP))
+    if (gBattleTypeFlags & BATTLE_TYPE_PALACE && gBattleMons[gActiveBattler].maxHP / 2 >= gBattleMons[gActiveBattler].hp
+        && gBattleMons[gActiveBattler].hp != 0 && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP))
     {
-        gBattleStruct->field_92 |= gBitTable[gActiveBank];
+        gBattleStruct->field_92 |= gBitTable[gActiveBattler];
     }
 
-    gBattleScripting.bank = gActiveBank;
+    gBattleScripting.battler = gActiveBattler;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gActiveBank, gBattlePartyID[gActiveBank]);
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gActiveBattler, gBattlePartyID[gActiveBattler]);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -5309,20 +5309,20 @@ static void atk4E_switchinanim(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-    if (GetBankSide(gActiveBank) == SIDE_OPPONENT
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT
         && !(gBattleTypeFlags & (BATTLE_TYPE_LINK
                                  | BATTLE_TYPE_EREADER_TRAINER
                                  | BATTLE_TYPE_x2000000
                                  | BATTLE_TYPE_x4000000
                                  | BATTLE_TYPE_FRONTIER)))
-            HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), FLAG_SET_SEEN, gBattleMons[gActiveBank].personality);
+            HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality);
 
-    gAbsentBankFlags &= ~(gBitTable[gActiveBank]);
+    gAbsentBattlerFlags &= ~(gBitTable[gActiveBattler]);
 
-    EmitSwitchInAnim(0, gBattlePartyID[gActiveBank], gBattlescriptCurrInstr[2]);
-    MarkBufferBankForExecution(gActiveBank);
+    EmitSwitchInAnim(0, gBattlePartyID[gActiveBattler], gBattlescriptCurrInstr[2]);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 3;
 
@@ -5337,11 +5337,11 @@ static void atk4F_jumpifcantswitch(void)
     struct Pokemon *party = NULL;
     s32 r7 = 0;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1] & ~(ATK4F_DONT_CHECK_STATUSES));
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1] & ~(ATK4F_DONT_CHECK_STATUSES));
 
     if (!(gBattlescriptCurrInstr[1] & ATK4F_DONT_CHECK_STATUSES)
-        && ((gBattleMons[gActiveBank].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
-            || (gStatuses3[gActiveBank] & STATUS3_ROOTED)))
+        && ((gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
+            || (gStatuses3[gActiveBattler] & STATUS3_ROOTED)))
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
     }
@@ -5350,13 +5350,13 @@ static void atk4F_jumpifcantswitch(void)
         #ifndef NONMATCHING
             asm("":::"r5");
         #endif // NONMATCHING
-        if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
+        if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT)
             party = gEnemyParty;
         else
             party = gPlayerParty;
 
         val = 0;
-        if (2 & gActiveBank)
+        if (2 & gActiveBattler)
             val = 3;
 
         for (compareVar = val + 3; val < compareVar; val++)
@@ -5364,7 +5364,7 @@ static void atk4F_jumpifcantswitch(void)
             if (GetMonData(&party[val], MON_DATA_SPECIES) != SPECIES_NONE
              && !GetMonData(&party[val], MON_DATA_IS_EGG)
              && GetMonData(&party[val], MON_DATA_HP) != 0
-             && gBattlePartyID[gActiveBank] != val)
+             && gBattlePartyID[gActiveBattler] != val)
                 break;
         }
 
@@ -5377,19 +5377,19 @@ static void atk4F_jumpifcantswitch(void)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x800000)
         {
-            if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
             {
                 party = gPlayerParty;
 
                 val = 0;
-                if (sub_806D82C(GetBankMultiplayerId(gActiveBank)) == TRUE)
+                if (sub_806D82C(GetBankMultiplayerId(gActiveBattler)) == TRUE)
                     val = 3;
             }
             else
             {
                 party = gEnemyParty;
 
-                if (gActiveBank == 1)
+                if (gActiveBattler == 1)
                     val = 0;
                 else
                     val = 3;
@@ -5397,14 +5397,14 @@ static void atk4F_jumpifcantswitch(void)
         }
         else
         {
-            if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
+            if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT)
                 party = gEnemyParty;
             else
                 party = gPlayerParty;
 
 
             val = 0;
-            if (sub_806D82C(GetBankMultiplayerId(gActiveBank)) == TRUE)
+            if (sub_806D82C(GetBankMultiplayerId(gActiveBattler)) == TRUE)
                 val = 3;
         }
 
@@ -5413,7 +5413,7 @@ static void atk4F_jumpifcantswitch(void)
             if (GetMonData(&party[val], MON_DATA_SPECIES) != SPECIES_NONE
              && !GetMonData(&party[val], MON_DATA_IS_EGG)
              && GetMonData(&party[val], MON_DATA_HP) != 0
-             && gBattlePartyID[gActiveBank] != val)
+             && gBattlePartyID[gActiveBattler] != val)
                 break;
         }
 
@@ -5422,12 +5422,12 @@ static void atk4F_jumpifcantswitch(void)
         else
             gBattlescriptCurrInstr += 6;
     }
-    else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBankSide(gActiveBank) == SIDE_OPPONENT)
+    else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT)
     {
         party = gEnemyParty;
 
         val = 0;
-        if (gActiveBank == 3)
+        if (gActiveBattler == 3)
             val = 3;
 
         for (compareVar = val + 3; val < compareVar; val++)
@@ -5435,7 +5435,7 @@ static void atk4F_jumpifcantswitch(void)
             if (GetMonData(&party[val], MON_DATA_SPECIES) != SPECIES_NONE
              && !GetMonData(&party[val], MON_DATA_IS_EGG)
              && GetMonData(&party[val], MON_DATA_HP) != 0
-             && gBattlePartyID[gActiveBank] != val)
+             && gBattlePartyID[gActiveBattler] != val)
                 break;
         }
 
@@ -5446,12 +5446,12 @@ static void atk4F_jumpifcantswitch(void)
     }
     else
     {
-        if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
+        if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT)
         {
-            r7 = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+            r7 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
 
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                compareVar = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+                compareVar = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
             else
                 compareVar = r7;
 
@@ -5459,10 +5459,10 @@ static void atk4F_jumpifcantswitch(void)
         }
         else
         {
-            r7 = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+            r7 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
 
             if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                compareVar = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+                compareVar = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
             else
                 compareVar = r7;
 
@@ -5486,12 +5486,12 @@ static void atk4F_jumpifcantswitch(void)
 
 static void sub_804CF10(u8 arg0)
 {
-    *(gBattleStruct->field_58 + gActiveBank) = gBattlePartyID[gActiveBank];
-    *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
-    gBattleStruct->field_93 &= ~(gBitTable[gActiveBank]);
+    *(gBattleStruct->field_58 + gActiveBattler) = gBattlePartyID[gActiveBattler];
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
+    gBattleStruct->field_93 &= ~(gBitTable[gActiveBattler]);
 
-    EmitChoosePokemon(0, 1, arg0, 0, gBattleStruct->field_60[gActiveBank]);
-    MarkBufferBankForExecution(gActiveBank);
+    EmitChoosePokemon(0, 1, arg0, 0, gBattleStruct->field_60[gActiveBattler]);
+    MarkBufferBankForExecution(gActiveBattler);
 }
 
 static void atk50_openpartyscreen(void)
@@ -5509,27 +5509,27 @@ static void atk50_openpartyscreen(void)
     {
         if ((gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_MULTI)) != BATTLE_TYPE_DOUBLE)
         {
-            for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+            for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
-                if (gHitMarker & HITMARKER_FAINTED(gActiveBank))
+                if (gHitMarker & HITMARKER_FAINTED(gActiveBattler))
                 {
-                    if (sub_80423F4(gActiveBank, 6, 6))
+                    if (sub_80423F4(gActiveBattler, 6, 6))
                     {
-                        gAbsentBankFlags |= gBitTable[gActiveBank];
-                        gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
+                        gAbsentBattlerFlags |= gBitTable[gActiveBattler];
+                        gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
                         EmitLinkStandbyMsg(0, 2, 0);
-                        MarkBufferBankForExecution(gActiveBank);
+                        MarkBufferBankForExecution(gActiveBattler);
                     }
-                    else if (!gSpecialStatuses[gActiveBank].flag40)
+                    else if (!gSpecialStatuses[gActiveBattler].flag40)
                     {
                         sub_804CF10(6);
-                        gSpecialStatuses[gActiveBank].flag40 = 1;
+                        gSpecialStatuses[gActiveBattler].flag40 = 1;
                     }
                 }
                 else
                 {
                     EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
             }
         }
@@ -5541,88 +5541,88 @@ static void atk50_openpartyscreen(void)
 
             if (gBitTable[0] & hitmarkerFaintBits)
             {
-                gActiveBank = 0;
+                gActiveBattler = 0;
                 if (sub_80423F4(0, 6, 6))
                 {
-                    gAbsentBankFlags |= gBitTable[gActiveBank];
-                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
+                    gAbsentBattlerFlags |= gBitTable[gActiveBattler];
+                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
                     EmitCmd42(0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
-                else if (!gSpecialStatuses[gActiveBank].flag40)
+                else if (!gSpecialStatuses[gActiveBattler].flag40)
                 {
                     sub_804CF10(gBattleStruct->monToSwitchIntoId[2]);
-                    gSpecialStatuses[gActiveBank].flag40 = 1;
+                    gSpecialStatuses[gActiveBattler].flag40 = 1;
                 }
                 else
                 {
                     EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                     flags |= 1;
                 }
             }
             if (gBitTable[2] & hitmarkerFaintBits && !(gBitTable[0] & hitmarkerFaintBits))
             {
-                gActiveBank = 2;
+                gActiveBattler = 2;
                 if (sub_80423F4(2, 6, 6))
                 {
-                    gAbsentBankFlags |= gBitTable[gActiveBank];
-                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
+                    gAbsentBattlerFlags |= gBitTable[gActiveBattler];
+                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
                     EmitCmd42(0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
-                else if (!gSpecialStatuses[gActiveBank].flag40)
+                else if (!gSpecialStatuses[gActiveBattler].flag40)
                 {
                     sub_804CF10(gBattleStruct->monToSwitchIntoId[0]);
-                    gSpecialStatuses[gActiveBank].flag40 = 1;
+                    gSpecialStatuses[gActiveBattler].flag40 = 1;
                 }
                 else if (!(flags & 1))
                 {
                     EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
             }
             if (gBitTable[1] & hitmarkerFaintBits)
             {
-                gActiveBank = 1;
+                gActiveBattler = 1;
                 if (sub_80423F4(1, 6, 6))
                 {
-                    gAbsentBankFlags |= gBitTable[gActiveBank];
-                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
+                    gAbsentBattlerFlags |= gBitTable[gActiveBattler];
+                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
                     EmitCmd42(0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
-                else if (!gSpecialStatuses[gActiveBank].flag40)
+                else if (!gSpecialStatuses[gActiveBattler].flag40)
                 {
                     sub_804CF10(gBattleStruct->monToSwitchIntoId[3]);
-                    gSpecialStatuses[gActiveBank].flag40 = 1;
+                    gSpecialStatuses[gActiveBattler].flag40 = 1;
                 }
                 else
                 {
                     EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                     flags |= 2;
                 }
             }
             if (gBitTable[3] & hitmarkerFaintBits && !(gBitTable[1] & hitmarkerFaintBits))
             {
-                gActiveBank = 3;
+                gActiveBattler = 3;
                 if (sub_80423F4(3, 6, 6))
                 {
-                    gAbsentBankFlags |= gBitTable[gActiveBank];
-                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
+                    gAbsentBattlerFlags |= gBitTable[gActiveBattler];
+                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
                     EmitCmd42(0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
-                else if (!gSpecialStatuses[gActiveBank].flag40)
+                else if (!gSpecialStatuses[gActiveBattler].flag40)
                 {
                     sub_804CF10(gBattleStruct->monToSwitchIntoId[1]);
-                    gSpecialStatuses[gActiveBank].flag40 = 1;
+                    gSpecialStatuses[gActiveBattler].flag40 = 1;
                 }
                 else if (!(flags & 2))
                 {
                     EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
             }
 
@@ -5632,13 +5632,13 @@ static void atk50_openpartyscreen(void)
                 flag40_2 = gSpecialStatuses[2].flag40;
                 if (!flag40_2 && hitmarkerFaintBits != 0)
                 {
-                    if (gAbsentBankFlags & gBitTable[0])
-                        gActiveBank = 2;
+                    if (gAbsentBattlerFlags & gBitTable[0])
+                        gActiveBattler = 2;
                     else
-                        gActiveBank = 0;
+                        gActiveBattler = 0;
 
                     EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
 
             }
@@ -5648,13 +5648,13 @@ static void atk50_openpartyscreen(void)
                 flag40_3 = gSpecialStatuses[3].flag40;
                 if (!flag40_3 && hitmarkerFaintBits != 0)
                 {
-                    if (gAbsentBankFlags & gBitTable[1])
-                        gActiveBank = 3;
+                    if (gAbsentBattlerFlags & gBitTable[1])
+                        gActiveBattler = 3;
                     else
-                        gActiveBank = 1;
+                        gActiveBattler = 1;
 
                     EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                 }
             }
         }
@@ -5669,34 +5669,34 @@ static void atk50_openpartyscreen(void)
                 hitmarkerFaintBits = gHitMarker >> 0x1C;
                 if (gBitTable[2] & hitmarkerFaintBits && gBitTable[0] & hitmarkerFaintBits)
                 {
-                    gActiveBank = 2;
+                    gActiveBattler = 2;
                     if (sub_80423F4(2, gBattleBufferB[0][1], 6))
                     {
-                        gAbsentBankFlags |= gBitTable[gActiveBank];
-                        gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
+                        gAbsentBattlerFlags |= gBitTable[gActiveBattler];
+                        gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
                         EmitCmd42(0);
-                        MarkBufferBankForExecution(gActiveBank);
+                        MarkBufferBankForExecution(gActiveBattler);
                     }
-                    else if (!gSpecialStatuses[gActiveBank].flag40)
+                    else if (!gSpecialStatuses[gActiveBattler].flag40)
                     {
                         sub_804CF10(gBattleStruct->monToSwitchIntoId[0]);
-                        gSpecialStatuses[gActiveBank].flag40 = 1;
+                        gSpecialStatuses[gActiveBattler].flag40 = 1;
                     }
                 }
                 if (gBitTable[3] & hitmarkerFaintBits && hitmarkerFaintBits & gBitTable[1])
                 {
-                    gActiveBank = 3;
+                    gActiveBattler = 3;
                     if (sub_80423F4(3, gBattleBufferB[1][1], 6))
                     {
-                        gAbsentBankFlags |= gBitTable[gActiveBank];
-                        gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
+                        gAbsentBattlerFlags |= gBitTable[gActiveBattler];
+                        gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
                         EmitCmd42(0);
-                        MarkBufferBankForExecution(gActiveBank);
+                        MarkBufferBankForExecution(gActiveBattler);
                     }
-                    else if (!gSpecialStatuses[gActiveBank].flag40)
+                    else if (!gSpecialStatuses[gActiveBattler].flag40)
                     {
                         sub_804CF10(gBattleStruct->monToSwitchIntoId[1]);
-                        gSpecialStatuses[gActiveBank].flag40 = 1;
+                        gSpecialStatuses[gActiveBattler].flag40 = 1;
                     }
                 }
                 gBattlescriptCurrInstr += 6;
@@ -5718,12 +5718,12 @@ static void atk50_openpartyscreen(void)
         {
             if (gBitTable[gBank1] & hitmarkerFaintBits)
                 break;
-            if (gBank1 >= gBattleBanksCount)
+            if (gBank1 >= gBattlersCount)
                 break;
             gBank1++;
         }
 
-        if (gBank1 == gBattleBanksCount)
+        if (gBank1 == gBattlersCount)
             gBattlescriptCurrInstr = jumpPtr;
     }
     else
@@ -5740,45 +5740,45 @@ static void atk50_openpartyscreen(void)
         }
         else if (sub_80423F4(bank, 6, 6))
         {
-            gActiveBank = bank;
-            gAbsentBankFlags |= gBitTable[gActiveBank];
-            gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
+            gActiveBattler = bank;
+            gAbsentBattlerFlags |= gBitTable[gActiveBattler];
+            gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
             gBattlescriptCurrInstr = jumpPtr;
         }
         else
         {
-            gActiveBank = bank;
-            *(gBattleStruct->field_58 + gActiveBank) = gBattlePartyID[gActiveBank];
-            *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
-            gBattleStruct->field_93 &= ~(gBitTable[gActiveBank]);
+            gActiveBattler = bank;
+            *(gBattleStruct->field_58 + gActiveBattler) = gBattlePartyID[gActiveBattler];
+            *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
+            gBattleStruct->field_93 &= ~(gBitTable[gActiveBattler]);
 
-            EmitChoosePokemon(0, hitmarkerFaintBits, *(gBattleStruct->monToSwitchIntoId + (gActiveBank ^ 2)), 0, gBattleStruct->field_60[gActiveBank]);
-            MarkBufferBankForExecution(gActiveBank);
+            EmitChoosePokemon(0, hitmarkerFaintBits, *(gBattleStruct->monToSwitchIntoId + (gActiveBattler ^ 2)), 0, gBattleStruct->field_60[gActiveBattler]);
+            MarkBufferBankForExecution(gActiveBattler);
 
             gBattlescriptCurrInstr += 6;
 
-            if (GetBankPosition(gActiveBank) == 0 && gBattleResults.playerSwitchesCounter < 0xFF)
+            if (GetBattlerPosition(gActiveBattler) == 0 && gBattleResults.playerSwitchesCounter < 0xFF)
                 gBattleResults.playerSwitchesCounter++;
 
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             {
-                for (gActiveBank = 0; gActiveBank < gBattleBanksCount; gActiveBank++)
+                for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
                 {
-                    if (gActiveBank != bank)
+                    if (gActiveBattler != bank)
                     {
                         EmitLinkStandbyMsg(0, 2, 0);
-                        MarkBufferBankForExecution(gActiveBank);
+                        MarkBufferBankForExecution(gActiveBattler);
                     }
                 }
             }
             else
             {
-                gActiveBank = GetBankByPosition(GetBankPosition(bank) ^ BIT_SIDE);
-                if (gAbsentBankFlags & gBitTable[gActiveBank])
-                    gActiveBank ^= BIT_MON;
+                gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(bank) ^ BIT_SIDE);
+                if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
+                    gActiveBattler ^= BIT_FLANK;
 
                 EmitLinkStandbyMsg(0, 2, 0);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
         }
     }
@@ -5790,12 +5790,12 @@ static void atk51_switchhandleorder(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
     switch (gBattlescriptCurrInstr[2])
     {
     case 0:
-        for (i = 0; i < gBattleBanksCount; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
             if (gBattleBufferB[i][0] == 0x22)
             {
@@ -5810,40 +5810,40 @@ static void atk51_switchhandleorder(void)
         break;
     case 1:
         if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
-            sub_803BDA0(gActiveBank);
+            sub_803BDA0(gActiveBattler);
         break;
     case 2:
-        if (!(gBattleStruct->field_93 & gBitTable[gActiveBank]))
+        if (!(gBattleStruct->field_93 & gBitTable[gActiveBattler]))
         {
-            RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]);
-            gBattleStruct->field_93 |= gBitTable[gActiveBank];
+            RecordedBattle_SetBankAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]);
+            gBattleStruct->field_93 |= gBitTable[gActiveBattler];
         }
         // fall through
     case 3:
-        gBattleCommunication[0] = gBattleBufferB[gActiveBank][1];
-        *(gBattleStruct->monToSwitchIntoId + gActiveBank) = gBattleBufferB[gActiveBank][1];
+        gBattleCommunication[0] = gBattleBufferB[gActiveBattler][1];
+        *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = gBattleBufferB[gActiveBattler][1];
 
         if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
         {
-            *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 0) &= 0xF;
-            *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBank][2] & 0xF0);
-            *(gActiveBank * 3 + (u8*)(gBattleStruct->field_60) + 1) = gBattleBufferB[gActiveBank][3];
+            *(gActiveBattler * 3 + (u8*)(gBattleStruct->field_60) + 0) &= 0xF;
+            *(gActiveBattler * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0);
+            *(gActiveBattler * 3 + (u8*)(gBattleStruct->field_60) + 1) = gBattleBufferB[gActiveBattler][3];
 
-            *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 0) &= (0xF0);
-            *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBank][2] & 0xF0) >> 4;
-            *((gActiveBank ^ BIT_MON) * 3 + (u8*)(gBattleStruct->field_60) + 2) = gBattleBufferB[gActiveBank][3];
+            *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->field_60) + 0) &= (0xF0);
+            *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->field_60) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0) >> 4;
+            *((gActiveBattler ^ BIT_FLANK) * 3 + (u8*)(gBattleStruct->field_60) + 2) = gBattleBufferB[gActiveBattler][3];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
         {
-            sub_80571DC(gActiveBank, *(gBattleStruct->monToSwitchIntoId + gActiveBank));
+            sub_80571DC(gActiveBattler, *(gBattleStruct->monToSwitchIntoId + gActiveBattler));
         }
         else
         {
-            sub_803BDA0(gActiveBank);
+            sub_803BDA0(gActiveBattler);
         }
 
-        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBankAttacker].species)
-        PREPARE_MON_NICK_BUFFER(gBattleTextBuff2, gActiveBank, gBattleBufferB[gActiveBank][1])
+        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattleAttacker].species)
+        PREPARE_MON_NICK_BUFFER(gBattleTextBuff2, gActiveBattler, gBattleBufferB[gActiveBattler][1])
 
         break;
     }
@@ -5855,31 +5855,31 @@ static void atk52_switchineffects(void)
 {
     s32 i;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-    sub_803FA70(gActiveBank);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    sub_803FA70(gActiveBattler);
 
-    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBank));
-    gSpecialStatuses[gActiveBank].flag40 = 0;
+    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+    gSpecialStatuses[gActiveBattler].flag40 = 0;
 
-    if (!(gSideStatuses[GetBankSide(gActiveBank)] & SIDE_STATUS_SPIKES_DAMAGED)
-        && (gSideStatuses[GetBankSide(gActiveBank)] & SIDE_STATUS_SPIKES)
-        && gBattleMons[gActiveBank].type1 != TYPE_FLYING
-        && gBattleMons[gActiveBank].type2 != TYPE_FLYING
-        && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE)
+    if (!(gSideStatuses[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES_DAMAGED)
+        && (gSideStatuses[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES)
+        && gBattleMons[gActiveBattler].type1 != TYPE_FLYING
+        && gBattleMons[gActiveBattler].type2 != TYPE_FLYING
+        && gBattleMons[gActiveBattler].ability != ABILITY_LEVITATE)
     {
         u8 spikesDmg;
 
-        gSideStatuses[GetBankSide(gActiveBank)] |= SIDE_STATUS_SPIKES_DAMAGED;
+        gSideStatuses[GetBattlerSide(gActiveBattler)] |= SIDE_STATUS_SPIKES_DAMAGED;
 
-        gBattleMons[gActiveBank].status2 &= ~(STATUS2_DESTINY_BOND);
+        gBattleMons[gActiveBattler].status2 &= ~(STATUS2_DESTINY_BOND);
         gHitMarker &= ~(HITMARKER_DESTINYBOND);
 
-        spikesDmg = (5 - gSideTimers[GetBankSide(gActiveBank)].spikesAmount) * 2;
-        gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / (spikesDmg);
+        spikesDmg = (5 - gSideTimers[GetBattlerSide(gActiveBattler)].spikesAmount) * 2;
+        gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / (spikesDmg);
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
-        gBattleScripting.bank = gActiveBank;
+        gBattleScripting.battler = gActiveBattler;
         BattleScriptPushCursor();
 
         if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
@@ -5891,25 +5891,25 @@ static void atk52_switchineffects(void)
     }
     else
     {
-        if (gBattleMons[gActiveBank].ability == ABILITY_TRUANT && !gDisableStructs[gActiveBank].truantUnknownBit)
-            gDisableStructs[gActiveBank].truantCounter = 1;
+        if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT && !gDisableStructs[gActiveBattler].truantUnknownBit)
+            gDisableStructs[gActiveBattler].truantCounter = 1;
 
-        gDisableStructs[gActiveBank].truantUnknownBit = 0;
+        gDisableStructs[gActiveBattler].truantUnknownBit = 0;
 
-        if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBank, 0, 0, 0) == 0 &&
-            ItemBattleEffects(0, gActiveBank, 0) == 0)
+        if (AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0) == 0 &&
+            ItemBattleEffects(0, gActiveBattler, 0) == 0)
         {
-            gSideStatuses[GetBankSide(gActiveBank)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
+            gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
 
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
-                if (gBanksByTurnOrder[i] == gActiveBank)
+                if (gBattleTurnOrder[i] == gActiveBattler)
                     gActionsByTurnOrder[i] = ACTION_CANCEL_PARTNER;
             }
 
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
-                u16* hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBankSide(i)];
+                u16* hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(i)];
                 *hpOnSwitchout = gBattleMons[i].hp;
             }
 
@@ -5920,9 +5920,9 @@ static void atk52_switchineffects(void)
                 gBank1++;
                 while (1)
                 {
-                    if (hitmarkerFaintBits & gBitTable[gBank1] && !(gAbsentBankFlags & gBitTable[gBank1]))
+                    if (hitmarkerFaintBits & gBitTable[gBank1] && !(gAbsentBattlerFlags & gBitTable[gBank1]))
                         break;
-                    if (gBank1 >= gBattleBanksCount)
+                    if (gBank1 >= gBattlersCount)
                         break;
                     gBank1++;
                 }
@@ -5934,54 +5934,54 @@ static void atk52_switchineffects(void)
 
 static void atk53_trainerslidein(void)
 {
-    gActiveBank = GetBankByPosition(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerAtPosition(gBattlescriptCurrInstr[1]);
     EmitTrainerSlide(0);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk54_playse(void)
 {
-    gActiveBank = gBankAttacker;
+    gActiveBattler = gBattleAttacker;
     EmitPlaySE(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 3;
 }
 
 static void atk55_fanfare(void)
 {
-    gActiveBank = gBankAttacker;
+    gActiveBattler = gBattleAttacker;
     EmitPlayFanfareOrBGM(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1), FALSE);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 3;
 }
 
 static void atk56_playfaintcry(void)
 {
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
     EmitFaintingCry(0);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk57(void)
 {
-    gActiveBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+    gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     EmitCmd55(0, gBattleOutcome);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 1;
 }
 
 static void atk58_returntoball(void)
 {
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
     EmitReturnMonToBall(0, 1);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -6005,20 +6005,20 @@ static void atk59_handlelearnnewmove(void)
     }
     else
     {
-        gActiveBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+        gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
 
-        if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterId
-            && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
+        if (gBattlePartyID[gActiveBattler] == gBattleStruct->expGetterId
+            && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
         {
-            GiveMoveToBattleMon(&gBattleMons[gActiveBank], ret);
+            GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret);
         }
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
-            gActiveBank = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
-            if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterId
-                && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
+            gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
+            if (gBattlePartyID[gActiveBattler] == gBattleStruct->expGetterId
+                && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
             {
-                GiveMoveToBattleMon(&gBattleMons[gActiveBank], ret);
+                GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret);
             }
         }
 
@@ -6028,7 +6028,7 @@ static void atk59_handlelearnnewmove(void)
 
 static void atk5A_yesnoboxlearnmove(void)
 {
-    gActiveBank = 0;
+    gActiveBattler = 0;
 
     switch (gBattleScripting.learnMoveState)
     {
@@ -6101,7 +6101,7 @@ static void atk5A_yesnoboxlearnmove(void)
                 u16 moveId = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_MOVE1 + movePosition);
                 if (IsHMMove2(moveId))
                 {
-                    PrepareStringBattle(STRINGID_HMMOVESCANTBEFORGOTTEN, gActiveBank);
+                    PrepareStringBattle(STRINGID_HMMOVESCANTBEFORGOTTEN, gActiveBattler);
                     gBattleScripting.learnMoveState = 6;
                 }
                 else
@@ -6194,16 +6194,16 @@ static void atk5B_yesnoboxstoplearningmove(void)
 
 static void atk5C_hitanimation(void)
 {
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
         gBattlescriptCurrInstr += 2;
     }
-    else if (!(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE) || !(gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE) || gDisableStructs[gActiveBank].substituteHP == 0)
+    else if (!(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE) || !(gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE) || gDisableStructs[gActiveBattler].substituteHP == 0)
     {
         EmitHitAnimation(0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 2;
     }
     else
@@ -6284,24 +6284,24 @@ static void atk5D_getmoneyreward(void)
 
 static void atk5E(void)
 {
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
     switch (gBattleCommunication[0])
     {
     case 0:
         EmitGetMonData(0, REQUEST_ALL_BATTLE, 0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattleCommunication[0]++;
         break;
     case 1:
          if (gBattleExecBuffer == 0)
          {
             s32 i;
-            struct BattlePokemon* bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBank][4];
+            struct BattlePokemon* bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBattler][4];
             for (i = 0; i < 4; i++)
             {
-                gBattleMons[gActiveBank].moves[i] = bufferPoke->moves[i];
-                gBattleMons[gActiveBank].pp[i] = bufferPoke->pp[i];
+                gBattleMons[gActiveBattler].moves[i] = bufferPoke->moves[i];
+                gBattleMons[gActiveBattler].pp[i] = bufferPoke->pp[i];
             }
             gBattlescriptCurrInstr += 2;
          }
@@ -6311,9 +6311,9 @@ static void atk5E(void)
 
 static void atk5F(void)
 {
-    gActiveBank = gBankAttacker;
-    gBankAttacker = gBankDefender;
-    gBankDefender = gActiveBank;
+    gActiveBattler = gBattleAttacker;
+    gBattleAttacker = gBattleDefender;
+    gBattleDefender = gActiveBattler;
 
     if (gHitMarker & HITMARKER_PURSUIT_TRAP)
         gHitMarker &= ~(HITMARKER_PURSUIT_TRAP);
@@ -6325,7 +6325,7 @@ static void atk5F(void)
 
 static void atk60_incrementgamestat(void)
 {
-    if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
         IncrementGameStat(gBattlescriptCurrInstr[1]);
 
     gBattlescriptCurrInstr += 2;
@@ -6340,9 +6340,9 @@ static void atk61_drawpartystatussummary(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
@@ -6363,16 +6363,16 @@ static void atk61_drawpartystatussummary(void)
     }
 
     EmitDrawPartyStatusSummary(0, hpStatuses, 1);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk62(void)
 {
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
     EmitCmd49(0);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -6391,13 +6391,13 @@ static void atk64_statusanimation(void)
 {
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-        if (!(gStatuses3[gActiveBank] & STATUS3_SEMI_INVULNERABLE)
-            && gDisableStructs[gActiveBank].substituteHP == 0
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
+            && gDisableStructs[gActiveBattler].substituteHP == 0
             && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
         {
-            EmitStatusAnimation(0, FALSE, gBattleMons[gActiveBank].status1);
-            MarkBufferBankForExecution(gActiveBank);
+            EmitStatusAnimation(0, FALSE, gBattleMons[gActiveBattler].status1);
+            MarkBufferBankForExecution(gActiveBattler);
         }
         gBattlescriptCurrInstr += 2;
     }
@@ -6409,14 +6409,14 @@ static void atk65_status2animation(void)
 
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
         wantedToAnimate = BSScriptRead32(gBattlescriptCurrInstr + 2);
-        if (!(gStatuses3[gActiveBank] & STATUS3_SEMI_INVULNERABLE)
-            && gDisableStructs[gActiveBank].substituteHP == 0
+        if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
+            && gDisableStructs[gActiveBattler].substituteHP == 0
             && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
         {
-            EmitStatusAnimation(0, TRUE, gBattleMons[gActiveBank].status2 & wantedToAnimate);
-            MarkBufferBankForExecution(gActiveBank);
+            EmitStatusAnimation(0, TRUE, gBattleMons[gActiveBattler].status2 & wantedToAnimate);
+            MarkBufferBankForExecution(gActiveBattler);
         }
         gBattlescriptCurrInstr += 6;
     }
@@ -6428,14 +6428,14 @@ static void atk66_chosenstatusanimation(void)
 
     if (gBattleExecBuffer == 0)
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
         wantedStatus = BSScriptRead32(gBattlescriptCurrInstr + 3);
-        if (!(gStatuses3[gActiveBank] & STATUS3_SEMI_INVULNERABLE)
-            && gDisableStructs[gActiveBank].substituteHP == 0
+        if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
+            && gDisableStructs[gActiveBattler].substituteHP == 0
             && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
         {
             EmitStatusAnimation(0, gBattlescriptCurrInstr[2], wantedStatus);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
         }
         gBattlescriptCurrInstr += 7;
     }
@@ -6488,7 +6488,7 @@ static void atk68_cancelallactions(void)
 {
     s32 i;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
         gActionsByTurnOrder[i] = ACTION_CANCEL_PARTNER;
 
     gBattlescriptCurrInstr++;
@@ -6498,42 +6498,42 @@ static void atk69_adjustsetdamage(void) // The same as 0x7, except there's no ra
 {
     u8 holdEffect, quality;
 
-    if (gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBankDefender].holdEffect, quality = gEnigmaBerries[gBankDefender].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattleDefender].holdEffect, quality = gEnigmaBerries[gBattleDefender].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankDefender].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBankDefender].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleDefender].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleDefender].item);
     }
 
-    gStringBank = gBankDefender;
+    gStringBank = gBattleDefender;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBankDefender, holdEffect);
-        gSpecialStatuses[gBankDefender].focusBanded = 1;
+        RecordItemEffectBattle(gBattleDefender, holdEffect);
+        gSpecialStatuses[gBattleDefender].focusBanded = 1;
     }
-    if (gBattleMons[gBankDefender].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBattleDefender].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBankDefender].endured
-     && !gSpecialStatuses[gBankDefender].focusBanded)
+    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattleDefender].endured
+     && !gSpecialStatuses[gBattleDefender].focusBanded)
         goto END;
 
-    if (gBattleMons[gBankDefender].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattleDefender].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBankDefender].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBattleDefender].hp - 1;
 
-    if (gProtectStructs[gBankDefender].endured)
+    if (gProtectStructs[gBattleDefender].endured)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBankDefender].focusBanded)
+    else if (gSpecialStatuses[gBattleDefender].focusBanded)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-        gLastUsedItem = gBattleMons[gBankDefender].item;
+        gLastUsedItem = gBattleMons[gBattleDefender].item;
     }
 
     END:
@@ -6544,21 +6544,21 @@ static void atk6A_removeitem(void)
 {
     u16* usedHeldItem;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-    usedHeldItem = &gBattleStruct->usedHeldItems[gActiveBank];
-    *usedHeldItem = gBattleMons[gActiveBank].item;
-    gBattleMons[gActiveBank].item = 0;
+    usedHeldItem = &gBattleStruct->usedHeldItems[gActiveBattler];
+    *usedHeldItem = gBattleMons[gActiveBattler].item;
+    gBattleMons[gActiveBattler].item = 0;
 
-    EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item);
-    MarkBufferBankForExecution(gActiveBank);
+    EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk6B_atknameinbuff1(void)
 {
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker])
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleAttacker, gBattlePartyID[gBattleAttacker])
 
     gBattlescriptCurrInstr++;
 }
@@ -6845,23 +6845,23 @@ static void atk6D_resetsentmonsvalue(void)
 
 static void atk6E_setatktoplayer0(void)
 {
-    gBankAttacker = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+    gBattleAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     gBattlescriptCurrInstr++;
 }
 
 static void atk6F_makevisible(void)
 {
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
     EmitSpriteInvisibility(0, FALSE);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk70_recordlastability(void)
 {
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-    RecordAbilityBattle(gActiveBank, gLastUsedAbility);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
     gBattlescriptCurrInstr += 1; // UB: Should be + 2, one byte for command and one byte for bank argument.
 }
 
@@ -6891,8 +6891,8 @@ static void atk73_hpthresholds(void)
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-        opposingBank = gActiveBank ^ BIT_SIDE;
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        opposingBank = gActiveBattler ^ BIT_SIDE;
 
         result = gBattleMons[opposingBank].hp * 100 / gBattleMons[opposingBank].maxHP;
         if (result == 0)
@@ -6919,9 +6919,9 @@ static void atk74_hpthresholds2(void)
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-        opposingBank = gActiveBank ^ BIT_SIDE;
-        hpSwitchout = *(gBattleStruct->hpOnSwitchout + GetBankSide(opposingBank));
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        opposingBank = gActiveBattler ^ BIT_SIDE;
+        hpSwitchout = *(gBattleStruct->hpOnSwitchout + GetBattlerSide(opposingBank));
         result = (hpSwitchout - gBattleMons[opposingBank].hp) * 100 / hpSwitchout;
 
         if (gBattleMons[opposingBank].hp >= hpSwitchout)
@@ -6939,8 +6939,8 @@ static void atk74_hpthresholds2(void)
 
 static void atk75_useitemonopponent(void)
 {
-    gBankInMenu = gBankAttacker;
-    ExecuteTableBasedItemEffect(&gEnemyParty[gBattlePartyID[gBankAttacker]], gLastUsedItem, gBattlePartyID[gBankAttacker], 0, 1);
+    gBankInMenu = gBattleAttacker;
+    ExecuteTableBasedItemEffect(&gEnemyParty[gBattlePartyID[gBattleAttacker]], gLastUsedItem, gBattlePartyID[gBattleAttacker], 0, 1);
 
     gBattlescriptCurrInstr += 1;
 }
@@ -6950,36 +6950,36 @@ static void atk76_various(void)
     u8 side;
     s32 i;
 
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
     switch (gBattlescriptCurrInstr[2])
     {
     case VARIOUS_CANCEL_MULTI_TURN_MOVES:
-        CancelMultiTurnMoves(gActiveBank);
+        CancelMultiTurnMoves(gActiveBattler);
         break;
     case VARIOUS_SET_MAGIC_COAT_TARGET:
-        gBankAttacker = gBankDefender;
-        side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
+        gBattleAttacker = gBattleDefender;
+        side = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer != 0 && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
-            gBankDefender = gSideTimers[side].followmeTarget;
+            gBattleDefender = gSideTimers[side].followmeTarget;
         else
-            gBankDefender = gActiveBank;
+            gBattleDefender = gActiveBattler;
         break;
     case VARIOUS_IS_RUNNING_IMPOSSIBLE:
         gBattleCommunication[0] = IsRunningFromBattleImpossible();
         break;
     case VARIOUS_GET_MOVE_TARGET:
-        gBankDefender = GetMoveTarget(gCurrentMove, 0);
+        gBattleDefender = GetMoveTarget(gCurrentMove, 0);
         break;
     case 4:
-        if (gHitMarker & HITMARKER_FAINTED(gActiveBank))
+        if (gHitMarker & HITMARKER_FAINTED(gActiveBattler))
             gBattleCommunication[0] = 1;
         else
             gBattleCommunication[0] = 0;
         break;
     case VARIOUS_RESET_INTIMIDATE_TRACE_BITS:
-        gSpecialStatuses[gActiveBank].intimidatedPoke = 0;
-        gSpecialStatuses[gActiveBank].traced = 0;
+        gSpecialStatuses[gActiveBattler].intimidatedPoke = 0;
+        gSpecialStatuses[gActiveBattler].traced = 0;
         break;
     case VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP:
         if (gBattlePartyID[0] == gBattleStruct->expGetterId || gBattlePartyID[2] == gBattleStruct->expGetterId)
@@ -6987,15 +6987,15 @@ static void atk76_various(void)
             u16 *choicedMove;
 
             if (gBattlePartyID[0] == gBattleStruct->expGetterId)
-                gActiveBank = 0;
+                gActiveBattler = 0;
             else
-                gActiveBank = 2;
+                gActiveBattler = 2;
 
-            choicedMove = &gBattleStruct->choicedMove[gActiveBank];
+            choicedMove = &gBattleStruct->choicedMove[gActiveBattler];
 
             for (i = 0; i < 4; i++)
             {
-                if (gBattleMons[gActiveBank].moves[i] == *choicedMove)
+                if (gBattleMons[gActiveBattler].moves[i] == *choicedMove)
                     break;
             }
             if (i == 4)
@@ -7013,15 +7013,15 @@ static void atk76_various(void)
         break;
     case 8:
         gBattleCommunication[0] = 0;
-        gBattleScripting.bank = gActiveBank = gBattleCommunication[1];
-        if (!(gBattleStruct->field_92 & gBitTable[gActiveBank])
-            && gBattleMons[gActiveBank].maxHP / 2 >= gBattleMons[gActiveBank].hp
-            && gBattleMons[gActiveBank].hp != 0
-            && !(gBattleMons[gActiveBank].status1 & STATUS1_SLEEP))
+        gBattleScripting.battler = gActiveBattler = gBattleCommunication[1];
+        if (!(gBattleStruct->field_92 & gBitTable[gActiveBattler])
+            && gBattleMons[gActiveBattler].maxHP / 2 >= gBattleMons[gActiveBattler].hp
+            && gBattleMons[gActiveBattler].hp != 0
+            && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP))
         {
-            gBattleStruct->field_92 |= gBitTable[gActiveBank];
+            gBattleStruct->field_92 |= gBitTable[gActiveBattler];
             gBattleCommunication[0] = 1;
-            gBattleCommunication[MULTISTRING_CHOOSER] = sUnknown_0831C4F8[GetNatureFromPersonality(gBattleMons[gActiveBank].personality)];
+            gBattleCommunication[MULTISTRING_CHOOSER] = sUnknown_0831C4F8[GetNatureFromPersonality(gBattleMons[gActiveBattler].personality)];
         }
         break;
     case 9:
@@ -7057,7 +7057,7 @@ static void atk76_various(void)
         break;
     case VARIOUS_EMIT_YESNOBOX:
         EmitUnknownYesNoBox(0);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         break;
     case 14:
         sub_81A5BF8();
@@ -7078,21 +7078,21 @@ static void atk76_various(void)
             return;
         break;
     case VARIOUS_RETURN_OPPONENT_MON1:
-        gActiveBank = 1;
-        if (gBattleMons[gActiveBank].hp != 0)
+        gActiveBattler = 1;
+        if (gBattleMons[gActiveBattler].hp != 0)
         {
             EmitReturnMonToBall(0, 0);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
         }
         break;
     case VARIOUS_RETURN_OPPONENT_MON2:
-        if (gBattleBanksCount > 3)
+        if (gBattlersCount > 3)
         {
-            gActiveBank = 3;
-            if (gBattleMons[gActiveBank].hp != 0)
+            gActiveBattler = 3;
+            if (gBattleMons[gActiveBattler].hp != 0)
             {
                 EmitReturnMonToBall(0, 0);
-                MarkBufferBankForExecution(gActiveBank);
+                MarkBufferBankForExecution(gActiveBattler);
             }
         }
         break;
@@ -7103,21 +7103,21 @@ static void atk76_various(void)
         m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
         break;
     case 23:
-        gBattleStruct->field_2A2 |= gBitTable[gActiveBank];
+        gBattleStruct->field_2A2 |= gBitTable[gActiveBattler];
         break;
     case 24:
-        if (sub_805725C(gActiveBank))
+        if (sub_805725C(gActiveBattler))
             return;
         break;
     case VARIOUS_SET_TELEPORT_OUTCOME:
-        if (GetBankSide(gActiveBank) == SIDE_PLAYER)
+        if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
             gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED;
         else
             gBattleOutcome = B_OUTCOME_POKE_TELEPORTED;
         break;
     case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC:
         EmitPlayFanfareOrBGM(0, MUS_KACHI1, TRUE);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         break;
     }
 
@@ -7127,31 +7127,31 @@ static void atk76_various(void)
 static void atk77_setprotectlike(void) // protect and endure
 {
     bool8 notLastTurn = TRUE;
-    u16 lastMove = gLastResultingMoves[gBankAttacker];
+    u16 lastMove = gLastResultingMoves[gBattleAttacker];
 
     if (lastMove != MOVE_PROTECT && lastMove != MOVE_DETECT && lastMove != MOVE_ENDURE)
-        gDisableStructs[gBankAttacker].protectUses = 0;
+        gDisableStructs[gBattleAttacker].protectUses = 0;
 
-    if (gCurrentTurnActionNumber == (gBattleBanksCount - 1))
+    if (gCurrentTurnActionNumber == (gBattlersCount - 1))
         notLastTurn = FALSE;
 
-    if (sProtectSuccessRates[gDisableStructs[gBankAttacker].protectUses] >= Random() && notLastTurn)
+    if (sProtectSuccessRates[gDisableStructs[gBattleAttacker].protectUses] >= Random() && notLastTurn)
     {
         if (gBattleMoves[gCurrentMove].effect == EFFECT_PROTECT)
         {
-            gProtectStructs[gBankAttacker].protected = 1;
+            gProtectStructs[gBattleAttacker].protected = 1;
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         }
         if (gBattleMoves[gCurrentMove].effect == EFFECT_ENDURE)
         {
-            gProtectStructs[gBankAttacker].endured = 1;
+            gProtectStructs[gBattleAttacker].endured = 1;
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
         }
-        gDisableStructs[gBankAttacker].protectUses++;
+        gDisableStructs[gBattleAttacker].protectUses++;
     }
     else
     {
-        gDisableStructs[gBankAttacker].protectUses = 0;
+        gDisableStructs[gBattleAttacker].protectUses = 0;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
     }
@@ -7164,32 +7164,32 @@ static void atk78_faintifabilitynotdamp(void)
     if (gBattleExecBuffer)
         return;
 
-    for (gBankDefender = 0; gBankDefender < gBattleBanksCount; gBankDefender++)
+    for (gBattleDefender = 0; gBattleDefender < gBattlersCount; gBattleDefender++)
     {
-        if (gBattleMons[gBankDefender].ability == ABILITY_DAMP)
+        if (gBattleMons[gBattleDefender].ability == ABILITY_DAMP)
             break;
     }
 
-    if (gBankDefender == gBattleBanksCount)
+    if (gBattleDefender == gBattlersCount)
     {
-        gActiveBank = gBankAttacker;
-        gBattleMoveDamage = gBattleMons[gActiveBank].hp;
+        gActiveBattler = gBattleAttacker;
+        gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
         EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr++;
 
-        for (gBankDefender = 0; gBankDefender < gBattleBanksCount; gBankDefender++)
+        for (gBattleDefender = 0; gBattleDefender < gBattlersCount; gBattleDefender++)
         {
-            if (gBankDefender == gBankAttacker)
+            if (gBattleDefender == gBattleAttacker)
                 continue;
-            if (!(gAbsentBankFlags & gBitTable[gBankDefender]))
+            if (!(gAbsentBattlerFlags & gBitTable[gBattleDefender]))
                 break;
         }
     }
     else
     {
         gLastUsedAbility = ABILITY_DAMP;
-        RecordAbilityBattle(gBankDefender, gBattleMons[gBankDefender].ability);
+        RecordAbilityBattle(gBattleDefender, gBattleMons[gBattleDefender].ability);
         gBattlescriptCurrInstr = BattleScript_DampStopsExplosion;
     }
 }
@@ -7199,10 +7199,10 @@ static void atk79_setatkhptozero(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = gBankAttacker;
-    gBattleMons[gActiveBank].hp = 0;
-    EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp);
-    MarkBufferBankForExecution(gActiveBank);
+    gActiveBattler = gBattleAttacker;
+    gBattleMons[gActiveBattler].hp = 0;
+    EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr++;
 }
@@ -7213,15 +7213,15 @@ static void atk7A_jumpifnexttargetvalid(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        for (gBankDefender++; ; gBankDefender++)
+        for (gBattleDefender++; ; gBattleDefender++)
         {
-            if (gBankDefender == gBankAttacker)
+            if (gBattleDefender == gBattleAttacker)
                 continue;
-            if (!(gAbsentBankFlags & gBitTable[gBankDefender]))
+            if (!(gAbsentBattlerFlags & gBitTable[gBattleDefender]))
                 break;
         }
 
-        if (gBankDefender >= gBattleBanksCount)
+        if (gBattleDefender >= gBattlersCount)
             gBattlescriptCurrInstr += 5;
         else
             gBattlescriptCurrInstr = jumpPtr;
@@ -7237,14 +7237,14 @@ static void atk7B_tryhealhalfhealth(void)
     const u8* failPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
     if (gBattlescriptCurrInstr[5] == BS_GET_ATTACKER)
-        gBankDefender = gBankAttacker;
+        gBattleDefender = gBattleAttacker;
 
-    gBattleMoveDamage = gBattleMons[gBankDefender].maxHP / 2;
+    gBattleMoveDamage = gBattleMons[gBattleDefender].maxHP / 2;
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
     gBattleMoveDamage *= -1;
 
-    if (gBattleMons[gBankDefender].hp == gBattleMons[gBankDefender].maxHP)
+    if (gBattleMons[gBattleDefender].hp == gBattleMons[gBattleDefender].maxHP)
         gBattlescriptCurrInstr = failPtr;
     else
         gBattlescriptCurrInstr += 6;
@@ -7260,12 +7260,12 @@ static void atk7C_trymirrormove(void)
     for (i = 0; i < 3; i++)
         movesArray[i] = 0;
 
-    for (validMovesCount = 0, i = 0; i < gBattleBanksCount; i++)
+    for (validMovesCount = 0, i = 0; i < gBattlersCount; i++)
     {
-        if (i != gBankAttacker)
+        if (i != gBattleAttacker)
         {
-            move = *(i * 2 + gBankAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0)
-                | (*(i * 2 + gBankAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) << 8);
+            move = *(i * 2 + gBattleAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0)
+                | (*(i * 2 + gBattleAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) << 8);
 
             if (move != 0 && move != 0xFFFF)
             {
@@ -7275,14 +7275,14 @@ static void atk7C_trymirrormove(void)
         }
     }
 
-    move = *(gBattleStruct->mirrorMoves + gBankAttacker * 2 + 0)
-        | (*(gBattleStruct->mirrorMoves + gBankAttacker * 2 + 1) << 8);
+    move = *(gBattleStruct->mirrorMoves + gBattleAttacker * 2 + 0)
+        | (*(gBattleStruct->mirrorMoves + gBattleAttacker * 2 + 1) << 8);
 
     if (move != 0 && move != 0xFFFF)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gCurrentMove = move;
-        gBankDefender = GetMoveTarget(gCurrentMove, 0);
+        gBattleDefender = GetMoveTarget(gCurrentMove, 0);
         gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
     }
     else if (validMovesCount)
@@ -7290,12 +7290,12 @@ static void atk7C_trymirrormove(void)
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         i = Random() % validMovesCount;
         gCurrentMove = movesArray[i];
-        gBankDefender = GetMoveTarget(gCurrentMove, 0);
+        gBattleDefender = GetMoveTarget(gCurrentMove, 0);
         gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
     }
     else
     {
-        gSpecialStatuses[gBankAttacker].flag20 = 1;
+        gSpecialStatuses[gBattleAttacker].flag20 = 1;
         gBattlescriptCurrInstr++;
     }
 }
@@ -7318,16 +7318,16 @@ static void atk7D_setrain(void)
 
 static void atk7E_setreflect(void)
 {
-    if (gSideStatuses[GET_BANK_SIDE(gBankAttacker)] & SIDE_STATUS_REFLECT)
+    if (gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] & SIDE_STATUS_REFLECT)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideStatuses[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_REFLECT;
-        gSideTimers[GET_BANK_SIDE(gBankAttacker)].reflectTimer = 5;
-        gSideTimers[GET_BANK_SIDE(gBankAttacker)].reflectBank = gBankAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] |= SIDE_STATUS_REFLECT;
+        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].reflectTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].reflectBank = gBattleAttacker;
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMonsInBattle(BATTLE_ALIVE_ATK_SIDE) == 2)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
@@ -7339,20 +7339,20 @@ static void atk7E_setreflect(void)
 
 static void atk7F_setseeded(void)
 {
-    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBankDefender] & STATUS3_LEECHSEED)
+    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBattleDefender] & STATUS3_LEECHSEED)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
-    else if (gBattleMons[gBankDefender].type1 == TYPE_GRASS || gBattleMons[gBankDefender].type2 == TYPE_GRASS)
+    else if (gBattleMons[gBattleDefender].type1 == TYPE_GRASS || gBattleMons[gBattleDefender].type2 == TYPE_GRASS)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
     }
     else
     {
-        gStatuses3[gBankDefender] |= gBankAttacker;
-        gStatuses3[gBankDefender] |= STATUS3_LEECHSEED;
+        gStatuses3[gBattleDefender] |= gBattleAttacker;
+        gStatuses3[gBattleDefender] |= STATUS3_LEECHSEED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
 
@@ -7370,8 +7370,8 @@ static void atk80_manipulatedamage(void)
         gBattleMoveDamage /= 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
-        if ((gBattleMons[gBankDefender].maxHP / 2) < gBattleMoveDamage)
-            gBattleMoveDamage = gBattleMons[gBankDefender].maxHP / 2;
+        if ((gBattleMons[gBattleDefender].maxHP / 2) < gBattleMoveDamage)
+            gBattleMoveDamage = gBattleMons[gBattleDefender].maxHP / 2;
         break;
     case ATK80_DMG_DOUBLED:
         gBattleMoveDamage *= 2;
@@ -7384,23 +7384,23 @@ static void atk80_manipulatedamage(void)
 static void atk81_trysetrest(void)
 {
     const u8 *failJump = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
-    gActiveBank = gBankDefender = gBankAttacker;
-    gBattleMoveDamage = gBattleMons[gBankDefender].maxHP * (-1);
+    gActiveBattler = gBattleDefender = gBattleAttacker;
+    gBattleMoveDamage = gBattleMons[gBattleDefender].maxHP * (-1);
 
-    if (gBattleMons[gBankDefender].hp == gBattleMons[gBankDefender].maxHP)
+    if (gBattleMons[gBattleDefender].hp == gBattleMons[gBattleDefender].maxHP)
     {
         gBattlescriptCurrInstr = failJump;
     }
     else
     {
-        if (gBattleMons[gBankDefender].status1 & ((u8)(~STATUS1_SLEEP)))
+        if (gBattleMons[gBattleDefender].status1 & ((u8)(~STATUS1_SLEEP)))
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
         else
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
 
-        gBattleMons[gBankDefender].status1 = 3;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-        MarkBufferBankForExecution(gActiveBank);
+        gBattleMons[gBattleDefender].status1 = 3;
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -7409,7 +7409,7 @@ static void atk82_jumpifnotfirstturn(void)
 {
     const u8* failJump = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (gDisableStructs[gBankAttacker].isFirstTurn)
+    if (gDisableStructs[gBattleAttacker].isFirstTurn)
         gBattlescriptCurrInstr += 5;
     else
         gBattlescriptCurrInstr = failJump;
@@ -7424,16 +7424,16 @@ bool8 UproarWakeUpCheck(u8 bank)
 {
     s32 i;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (!(gBattleMons[i].status2 & STATUS2_UPROAR) || gBattleMons[bank].ability == ABILITY_SOUNDPROOF)
             continue;
 
-        gBattleScripting.bank = i;
+        gBattleScripting.battler = i;
 
-        if (gBankDefender == 0xFF)
-            gBankDefender = i;
-        else if (gBankDefender == i)
+        if (gBattleDefender == 0xFF)
+            gBattleDefender = i;
+        else if (gBattleDefender == i)
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         else
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -7441,7 +7441,7 @@ bool8 UproarWakeUpCheck(u8 bank)
         break;
     }
 
-    if (i == gBattleBanksCount)
+    if (i == gBattlersCount)
         return FALSE;
     else
         return TRUE;
@@ -7451,17 +7451,17 @@ static void atk84_jumpifcantmakeasleep(void)
 {
     const u8 *jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (UproarWakeUpCheck(gBankDefender))
+    if (UproarWakeUpCheck(gBattleDefender))
     {
         gBattlescriptCurrInstr = jumpPtr;
     }
-    else if (gBattleMons[gBankDefender].ability == ABILITY_INSOMNIA
-            || gBattleMons[gBankDefender].ability == ABILITY_VITAL_SPIRIT)
+    else if (gBattleMons[gBattleDefender].ability == ABILITY_INSOMNIA
+            || gBattleMons[gBattleDefender].ability == ABILITY_VITAL_SPIRIT)
     {
-        gLastUsedAbility = gBattleMons[gBankDefender].ability;
+        gLastUsedAbility = gBattleMons[gBattleDefender].ability;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         gBattlescriptCurrInstr = jumpPtr;
-        RecordAbilityBattle(gBankDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
     }
     else
     {
@@ -7471,16 +7471,16 @@ static void atk84_jumpifcantmakeasleep(void)
 
 static void atk85_stockpile(void)
 {
-    if (gDisableStructs[gBankAttacker].stockpileCounter == 3)
+    if (gDisableStructs[gBattleAttacker].stockpileCounter == 3)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gDisableStructs[gBankAttacker].stockpileCounter++;
+        gDisableStructs[gBattleAttacker].stockpileCounter++;
 
-        PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gBankAttacker].stockpileCounter)
+        PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gBattleAttacker].stockpileCounter)
 
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
@@ -7490,7 +7490,7 @@ static void atk85_stockpile(void)
 static void atk86_stockpiletobasedamage(void)
 {
     const u8* jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
-    if (gDisableStructs[gBankAttacker].stockpileCounter == 0)
+    if (gDisableStructs[gBattleAttacker].stockpileCounter == 0)
     {
         gBattlescriptCurrInstr = jumpPtr;
     }
@@ -7498,17 +7498,17 @@ static void atk86_stockpiletobasedamage(void)
     {
         if (gBattleCommunication[6] != 1)
         {
-            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankDefender], gCurrentMove,
-                                                    gSideStatuses[GET_BANK_SIDE(gBankDefender)], 0,
-                                                    0, gBankAttacker, gBankDefender)
-                                * gDisableStructs[gBankAttacker].stockpileCounter;
-            gBattleScripting.animTurn = gDisableStructs[gBankAttacker].stockpileCounter;
+            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleAttacker], &gBattleMons[gBattleDefender], gCurrentMove,
+                                                    gSideStatuses[GET_BATTLER_SIDE(gBattleDefender)], 0,
+                                                    0, gBattleAttacker, gBattleDefender)
+                                * gDisableStructs[gBattleAttacker].stockpileCounter;
+            gBattleScripting.animTurn = gDisableStructs[gBattleAttacker].stockpileCounter;
 
-            if (gProtectStructs[gBankAttacker].helpingHand)
+            if (gProtectStructs[gBattleAttacker].helpingHand)
                 gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
         }
 
-        gDisableStructs[gBankAttacker].stockpileCounter = 0;
+        gDisableStructs[gBattleAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -7517,30 +7517,30 @@ static void atk87_stockpiletohpheal(void)
 {
     const u8* jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (gDisableStructs[gBankAttacker].stockpileCounter == 0)
+    if (gDisableStructs[gBattleAttacker].stockpileCounter == 0)
     {
         gBattlescriptCurrInstr = jumpPtr;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
-    else if (gBattleMons[gBankAttacker].maxHP == gBattleMons[gBankAttacker].hp)
+    else if (gBattleMons[gBattleAttacker].maxHP == gBattleMons[gBattleAttacker].hp)
     {
-        gDisableStructs[gBankAttacker].stockpileCounter = 0;
+        gDisableStructs[gBattleAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr = jumpPtr;
-        gBankDefender = gBankAttacker;
+        gBattleDefender = gBattleAttacker;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / (1 << (3 - gDisableStructs[gBankAttacker].stockpileCounter));
+        gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / (1 << (3 - gDisableStructs[gBattleAttacker].stockpileCounter));
 
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
 
-        gBattleScripting.animTurn = gDisableStructs[gBankAttacker].stockpileCounter;
-        gDisableStructs[gBankAttacker].stockpileCounter = 0;
+        gBattleScripting.animTurn = gDisableStructs[gBattleAttacker].stockpileCounter;
+        gDisableStructs[gBattleAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr += 5;
-        gBankDefender = gBankAttacker;
+        gBattleDefender = gBattleAttacker;
     }
 }
 
@@ -7560,9 +7560,9 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
     u32 index;
 
     if (flags & MOVE_EFFECT_AFFECTS_USER)
-        gActiveBank = gBankAttacker;
+        gActiveBattler = gBattleAttacker;
     else
-        gActiveBank = gBankDefender;
+        gActiveBattler = gBattleDefender;
 
     flags &= ~(MOVE_EFFECT_AFFECTS_USER);
 
@@ -7578,21 +7578,21 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
 
     if ((statValue << 0x18) < 0) // stat decrease
     {
-        if (gSideTimers[GET_BANK_SIDE(gActiveBank)].mistTimer
+        if (gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].mistTimer
             && !certain && gCurrentMove != MOVE_CURSE)
         {
             if (flags == STAT_CHANGE_BS_PTR)
             {
-                if (gSpecialStatuses[gActiveBank].statLowered)
+                if (gSpecialStatuses[gActiveBattler].statLowered)
                 {
                     gBattlescriptCurrInstr = BS_ptr;
                 }
                 else
                 {
                     BattleScriptPush(BS_ptr);
-                    gBattleScripting.bank = gActiveBank;
+                    gBattleScripting.battler = gActiveBattler;
                     gBattlescriptCurrInstr = BattleScript_MistProtected;
-                    gSpecialStatuses[gActiveBank].statLowered = 1;
+                    gSpecialStatuses[gActiveBattler].statLowered = 1;
                 }
             }
             return STAT_CHANGE_DIDNT_WORK;
@@ -7603,55 +7603,55 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
             gBattlescriptCurrInstr = BattleScript_ButItFailed;
             return STAT_CHANGE_DIDNT_WORK;
         }
-        else if ((gBattleMons[gActiveBank].ability == ABILITY_CLEAR_BODY
-                  || gBattleMons[gActiveBank].ability == ABILITY_WHITE_SMOKE)
+        else if ((gBattleMons[gActiveBattler].ability == ABILITY_CLEAR_BODY
+                  || gBattleMons[gActiveBattler].ability == ABILITY_WHITE_SMOKE)
                  && !certain && gCurrentMove != MOVE_CURSE)
         {
             if (flags == STAT_CHANGE_BS_PTR)
             {
-                if (gSpecialStatuses[gActiveBank].statLowered)
+                if (gSpecialStatuses[gActiveBattler].statLowered)
                 {
                     gBattlescriptCurrInstr = BS_ptr;
                 }
                 else
                 {
                     BattleScriptPush(BS_ptr);
-                    gBattleScripting.bank = gActiveBank;
+                    gBattleScripting.battler = gActiveBattler;
                     gBattlescriptCurrInstr = BattleScript_AbilityNoStatLoss;
-                    gLastUsedAbility = gBattleMons[gActiveBank].ability;
-                    RecordAbilityBattle(gActiveBank, gLastUsedAbility);
-                    gSpecialStatuses[gActiveBank].statLowered = 1;
+                    gLastUsedAbility = gBattleMons[gActiveBattler].ability;
+                    RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
+                    gSpecialStatuses[gActiveBattler].statLowered = 1;
                 }
             }
             return STAT_CHANGE_DIDNT_WORK;
         }
-        else if (gBattleMons[gActiveBank].ability == ABILITY_KEEN_EYE
+        else if (gBattleMons[gActiveBattler].ability == ABILITY_KEEN_EYE
                  && !certain && statId == STAT_STAGE_ACC)
         {
             if (flags == STAT_CHANGE_BS_PTR)
             {
                 BattleScriptPush(BS_ptr);
-                gBattleScripting.bank = gActiveBank;
+                gBattleScripting.battler = gActiveBattler;
                 gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss;
-                gLastUsedAbility = gBattleMons[gActiveBank].ability;
-                RecordAbilityBattle(gActiveBank, gLastUsedAbility);
+                gLastUsedAbility = gBattleMons[gActiveBattler].ability;
+                RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
             }
             return STAT_CHANGE_DIDNT_WORK;
         }
-        else if (gBattleMons[gActiveBank].ability == ABILITY_HYPER_CUTTER
+        else if (gBattleMons[gActiveBattler].ability == ABILITY_HYPER_CUTTER
                  && !certain && statId == STAT_STAGE_ATK)
         {
             if (flags == STAT_CHANGE_BS_PTR)
             {
                 BattleScriptPush(BS_ptr);
-                gBattleScripting.bank = gActiveBank;
+                gBattleScripting.battler = gActiveBattler;
                 gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss;
-                gLastUsedAbility = gBattleMons[gActiveBank].ability;
-                RecordAbilityBattle(gActiveBank, gLastUsedAbility);
+                gLastUsedAbility = gBattleMons[gActiveBattler].ability;
+                RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
             }
             return STAT_CHANGE_DIDNT_WORK;
         }
-        else if (gBattleMons[gActiveBank].ability == ABILITY_SHIELD_DUST && flags == 0)
+        else if (gBattleMons[gActiveBattler].ability == ABILITY_SHIELD_DUST && flags == 0)
         {
             return STAT_CHANGE_DIDNT_WORK;
         }
@@ -7675,10 +7675,10 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
             index++;
             gBattleTextBuff2[index] = B_BUFF_EOS;
 
-            if (gBattleMons[gActiveBank].statStages[statId] == 0)
+            if (gBattleMons[gActiveBattler].statStages[statId] == 0)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
             else
-                gBattleCommunication[MULTISTRING_CHOOSER] = (gBankDefender == gActiveBank);
+                gBattleCommunication[MULTISTRING_CHOOSER] = (gBattleDefender == gActiveBattler);
 
         }
     }
@@ -7702,17 +7702,17 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
         index++;
         gBattleTextBuff2[index] = B_BUFF_EOS;
 
-        if (gBattleMons[gActiveBank].statStages[statId] == 0xC)
+        if (gBattleMons[gActiveBattler].statStages[statId] == 0xC)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         else
-            gBattleCommunication[MULTISTRING_CHOOSER] = (gBankDefender == gActiveBank);
+            gBattleCommunication[MULTISTRING_CHOOSER] = (gBattleDefender == gActiveBattler);
     }
 
-    gBattleMons[gActiveBank].statStages[statId] += statValue;
-    if (gBattleMons[gActiveBank].statStages[statId] < 0)
-        gBattleMons[gActiveBank].statStages[statId] = 0;
-    if (gBattleMons[gActiveBank].statStages[statId] > 0xC)
-        gBattleMons[gActiveBank].statStages[statId] = 0xC;
+    gBattleMons[gActiveBattler].statStages[statId] += statValue;
+    if (gBattleMons[gActiveBattler].statStages[statId] < 0)
+        gBattleMons[gActiveBattler].statStages[statId] = 0;
+    if (gBattleMons[gActiveBattler].statStages[statId] > 0xC)
+        gBattleMons[gActiveBattler].statStages[statId] = 0xC;
 
     if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_CHANGE_BS_PTR)
         gMoveResultFlags |= MOVE_RESULT_MISSED;
@@ -7734,7 +7734,7 @@ static void atk8A_normalisebuffs(void) // haze
 {
     s32 i, j;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         for (j = 0; j < BATTLE_STATS_NO; j++)
             gBattleMons[i].statStages[j] = 6;
@@ -7745,17 +7745,17 @@ static void atk8A_normalisebuffs(void) // haze
 
 static void atk8B_setbide(void)
 {
-    gBattleMons[gBankAttacker].status2 |= STATUS2_MULTIPLETURNS;
-    gLockedMoves[gBankAttacker] = gCurrentMove;
-    gTakenDmg[gBankAttacker] = 0;
-    gBattleMons[gBankAttacker].status2 |= (STATUS2_BIDE - 0x100); // 2 turns
+    gBattleMons[gBattleAttacker].status2 |= STATUS2_MULTIPLETURNS;
+    gLockedMoves[gBattleAttacker] = gCurrentMove;
+    gTakenDmg[gBattleAttacker] = 0;
+    gBattleMons[gBattleAttacker].status2 |= (STATUS2_BIDE - 0x100); // 2 turns
 
     gBattlescriptCurrInstr++;
 }
 
 static void atk8C_confuseifrepeatingattackends(void)
 {
-    if (!(gBattleMons[gBankAttacker].status2 & STATUS2_LOCK_CONFUSE))
+    if (!(gBattleMons[gBattleAttacker].status2 & STATUS2_LOCK_CONFUSE))
         gBattleCommunication[MOVE_EFFECT_BYTE] = (MOVE_EFFECT_THRASH | MOVE_EFFECT_AFFECTS_USER);
 
     gBattlescriptCurrInstr++;
@@ -7788,19 +7788,19 @@ static void atk8E_initmultihitstring(void)
 
 static bool8 TryDoForceSwitchOut(void)
 {
-    if (gBattleMons[gBankAttacker].level >= gBattleMons[gBankDefender].level)
+    if (gBattleMons[gBattleAttacker].level >= gBattleMons[gBattleDefender].level)
     {
-        *(gBattleStruct->field_58 + gBankDefender) = gBattlePartyID[gBankDefender];
+        *(gBattleStruct->field_58 + gBattleDefender) = gBattlePartyID[gBattleDefender];
     }
     else
     {
         u16 random = Random() & 0xFF;
-        if ((u32)((random * (gBattleMons[gBankAttacker].level + gBattleMons[gBankDefender].level) >> 8) + 1) <= (gBattleMons[gBankDefender].level / 4))
+        if ((u32)((random * (gBattleMons[gBattleAttacker].level + gBattleMons[gBattleDefender].level) >> 8) + 1) <= (gBattleMons[gBattleDefender].level / 4))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
             return FALSE;
         }
-        *(gBattleStruct->field_58 + gBankDefender) = gBattlePartyID[gBankDefender];
+        *(gBattleStruct->field_58 + gBattleDefender) = gBattlePartyID[gBattleDefender];
     }
 
     gBattlescriptCurrInstr = BattleScript_SuccessForceOut;
@@ -7827,7 +7827,7 @@ static void atk8F_forcerandomswitch(void)
 
     if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER))
     {
-        if (GetBankSide(gBankDefender) == SIDE_PLAYER)
+        if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
             party = gPlayerParty;
         else
             party = gEnemyParty;
@@ -7836,7 +7836,7 @@ static void atk8F_forcerandomswitch(void)
             || (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER && gBattleTypeFlags & BATTLE_TYPE_x2000000)
             || (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER))
         {
-            if ((gBankDefender & BIT_MON) != 0)
+            if ((gBattleDefender & BIT_FLANK) != 0)
             {
                 firstMonId = 3;
                 lastMonId = 6;
@@ -7848,13 +7848,13 @@ static void atk8F_forcerandomswitch(void)
             }
             monsCount = 3;
             minNeeded = 1;
-            bank2PartyId = gBattlePartyID[gBankDefender];
-            bank1PartyId = gBattlePartyID[gBankDefender ^ BIT_MON];
+            bank2PartyId = gBattlePartyID[gBattleDefender];
+            bank1PartyId = gBattlePartyID[gBattleDefender ^ BIT_FLANK];
         }
         else if ((gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
                  || (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_x2000000))
         {
-            if (sub_806D82C(GetBankMultiplayerId(gBankDefender)) == 1)
+            if (sub_806D82C(GetBankMultiplayerId(gBattleDefender)) == 1)
             {
                 firstMonId = 3;
                 lastMonId = 6;
@@ -7866,12 +7866,12 @@ static void atk8F_forcerandomswitch(void)
             }
             monsCount = 3;
             minNeeded = 1;
-            bank2PartyId = gBattlePartyID[gBankDefender];
-            bank1PartyId = gBattlePartyID[gBankDefender ^ BIT_MON];
+            bank2PartyId = gBattlePartyID[gBattleDefender];
+            bank1PartyId = gBattlePartyID[gBattleDefender ^ BIT_FLANK];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
         {
-            if (GetBankSide(gBankDefender) == SIDE_PLAYER)
+            if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
             {
                 firstMonId = 0;
                 lastMonId = 6;
@@ -7880,7 +7880,7 @@ static void atk8F_forcerandomswitch(void)
             }
             else
             {
-                if ((gBankDefender & BIT_MON) != 0)
+                if ((gBattleDefender & BIT_FLANK) != 0)
                 {
                     firstMonId = 3;
                     lastMonId = 6;
@@ -7893,8 +7893,8 @@ static void atk8F_forcerandomswitch(void)
                 monsCount = 3;
                 minNeeded = 1;
             }
-            bank2PartyId = gBattlePartyID[gBankDefender];
-            bank1PartyId = gBattlePartyID[gBankDefender ^ BIT_MON];
+            bank2PartyId = gBattlePartyID[gBattleDefender];
+            bank1PartyId = gBattlePartyID[gBattleDefender ^ BIT_FLANK];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
@@ -7902,8 +7902,8 @@ static void atk8F_forcerandomswitch(void)
             lastMonId = 6;
             monsCount = 6;
             minNeeded = 2;
-            bank2PartyId = gBattlePartyID[gBankDefender];
-            bank1PartyId = gBattlePartyID[gBankDefender ^ BIT_MON];
+            bank2PartyId = gBattlePartyID[gBattleDefender];
+            bank1PartyId = gBattlePartyID[gBattleDefender ^ BIT_FLANK];
         }
         else
         {
@@ -7911,8 +7911,8 @@ static void atk8F_forcerandomswitch(void)
             lastMonId = 6;
             monsCount = 6;
             minNeeded = 1;
-            bank2PartyId = gBattlePartyID[gBankDefender]; // there is only one pokemon out in single battles
-            bank1PartyId = gBattlePartyID[gBankDefender];
+            bank2PartyId = gBattlePartyID[gBattleDefender]; // there is only one pokemon out in single battles
+            bank1PartyId = gBattlePartyID[gBattleDefender];
         }
 
         for (i = firstMonId; i < lastMonId; i++)
@@ -7944,22 +7944,22 @@ static void atk8F_forcerandomswitch(void)
                        || GetMonData(&party[i], MON_DATA_IS_EGG) == TRUE
                        || GetMonData(&party[i], MON_DATA_HP) == 0);
             }
-            *(gBattleStruct->monToSwitchIntoId + gBankDefender) = i;
+            *(gBattleStruct->monToSwitchIntoId + gBattleDefender) = i;
 
             if (!sub_81B1250())
-                sub_803BDA0(gBankDefender);
+                sub_803BDA0(gBattleDefender);
 
             if ((gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                 || (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
                 || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                 || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                sub_81B8E80(gBankDefender, i, 0);
-                sub_81B8E80(gBankDefender ^ BIT_MON, i, 1);
+                sub_81B8E80(gBattleDefender, i, 0);
+                sub_81B8E80(gBattleDefender ^ BIT_FLANK, i, 1);
             }
 
             if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
-                sub_80571DC(gBankDefender, i);
+                sub_80571DC(gBattleDefender, i);
         }
     }
     else
@@ -7976,7 +7976,7 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
 
     while (validMoves < 4)
     {
-        if (gBattleMons[gBankAttacker].moves[validMoves] == 0)
+        if (gBattleMons[gBattleAttacker].moves[validMoves] == 0)
             break;
 
         validMoves++;
@@ -7984,17 +7984,17 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
 
     for (moveChecked = 0; moveChecked < validMoves; moveChecked++)
     {
-        moveType = gBattleMoves[gBattleMons[gBankAttacker].moves[moveChecked]].type;
+        moveType = gBattleMoves[gBattleMons[gBattleAttacker].moves[moveChecked]].type;
 
         if (moveType == TYPE_MYSTERY)
         {
-            if (gBattleMons[gBankAttacker].type1 == TYPE_GHOST || gBattleMons[gBankAttacker].type2 == TYPE_GHOST)
+            if (gBattleMons[gBattleAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleAttacker].type2 == TYPE_GHOST)
                 moveType = TYPE_GHOST;
             else
                 moveType = TYPE_NORMAL;
         }
-        if (moveType != gBattleMons[gBankAttacker].type1
-            && moveType != gBattleMons[gBankAttacker].type2)
+        if (moveType != gBattleMons[gBattleAttacker].type1
+            && moveType != gBattleMons[gBattleAttacker].type2)
         {
             break;
         }
@@ -8011,20 +8011,20 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
 
             while ((moveChecked = Random() & 3) >= validMoves);
 
-            moveType = gBattleMoves[gBattleMons[gBankAttacker].moves[moveChecked]].type;
+            moveType = gBattleMoves[gBattleMons[gBattleAttacker].moves[moveChecked]].type;
 
             if (moveType == TYPE_MYSTERY)
             {
-                if (gBattleMons[gBankAttacker].type1 == TYPE_GHOST || gBattleMons[gBankAttacker].type2 == TYPE_GHOST)
+                if (gBattleMons[gBattleAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleAttacker].type2 == TYPE_GHOST)
                     moveType = TYPE_GHOST;
                 else
                     moveType = TYPE_NORMAL;
             }
         }
-        while (moveType == gBattleMons[gBankAttacker].type1 || moveType == gBattleMons[gBankAttacker].type2);
+        while (moveType == gBattleMons[gBattleAttacker].type1 || moveType == gBattleMons[gBattleAttacker].type2);
 
-        gBattleMons[gBankAttacker].type1 = moveType;
-        gBattleMons[gBankAttacker].type2 = moveType;
+        gBattleMons[gBattleAttacker].type1 = moveType;
+        gBattleMons[gBattleAttacker].type2 = moveType;
 
         PREPARE_TYPE_BUFFER(gBattleTextBuff1, moveType)
 
@@ -8052,16 +8052,16 @@ static void atk91_givepaydaymoney(void)
 
 static void atk92_setlightscreen(void)
 {
-    if (gSideStatuses[GET_BANK_SIDE(gBankAttacker)] & SIDE_STATUS_LIGHTSCREEN)
+    if (gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] & SIDE_STATUS_LIGHTSCREEN)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideStatuses[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_LIGHTSCREEN;
-        gSideTimers[GET_BANK_SIDE(gBankAttacker)].lightscreenTimer = 5;
-        gSideTimers[GET_BANK_SIDE(gBankAttacker)].lightscreenBank = gBankAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] |= SIDE_STATUS_LIGHTSCREEN;
+        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].lightscreenTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].lightscreenBank = gBattleAttacker;
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMonsInBattle(BATTLE_ALIVE_ATK_SIDE) == 2)
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
@@ -8076,72 +8076,72 @@ static void atk93_tryKO(void)
 {
     u8 holdEffect, param;
 
-    if (gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY)
     {
-       holdEffect = gEnigmaBerries[gBankDefender].holdEffect;
-       param = gEnigmaBerries[gBankDefender].holdEffectParam;
+       holdEffect = gEnigmaBerries[gBattleDefender].holdEffect;
+       param = gEnigmaBerries[gBattleDefender].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankDefender].item);
-        param = ItemId_GetHoldEffectParam(gBattleMons[gBankDefender].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleDefender].item);
+        param = ItemId_GetHoldEffectParam(gBattleMons[gBattleDefender].item);
     }
 
-    gStringBank = gBankDefender;
+    gStringBank = gBattleDefender;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
-        RecordItemEffectBattle(gBankDefender, HOLD_EFFECT_FOCUS_BAND);
-        gSpecialStatuses[gBankDefender].focusBanded = 1;
+        RecordItemEffectBattle(gBattleDefender, HOLD_EFFECT_FOCUS_BAND);
+        gSpecialStatuses[gBattleDefender].focusBanded = 1;
     }
 
-    if (gBattleMons[gBankDefender].ability == ABILITY_STURDY)
+    if (gBattleMons[gBattleDefender].ability == ABILITY_STURDY)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gLastUsedAbility = ABILITY_STURDY;
         gBattlescriptCurrInstr = BattleScript_SturdyPreventsOHKO;
-        RecordAbilityBattle(gBankDefender, ABILITY_STURDY);
+        RecordAbilityBattle(gBattleDefender, ABILITY_STURDY);
     }
     else
     {
         u16 chance;
-        if (!(gStatuses3[gBankDefender] & STATUS3_ALWAYS_HITS))
+        if (!(gStatuses3[gBattleDefender] & STATUS3_ALWAYS_HITS))
         {
-            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBankAttacker].level - gBattleMons[gBankDefender].level);
-            if (Random() % 100 + 1 < chance && gBattleMons[gBankAttacker].level >= gBattleMons[gBankDefender].level)
+            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattleAttacker].level - gBattleMons[gBattleDefender].level);
+            if (Random() % 100 + 1 < chance && gBattleMons[gBattleAttacker].level >= gBattleMons[gBattleDefender].level)
                 chance = TRUE;
             else
                 chance = FALSE;
         }
-        else if (gDisableStructs[gBankDefender].bankWithSureHit == gBankAttacker
-                 && gBattleMons[gBankAttacker].level >= gBattleMons[gBankDefender].level)
+        else if (gDisableStructs[gBattleDefender].bankWithSureHit == gBattleAttacker
+                 && gBattleMons[gBattleAttacker].level >= gBattleMons[gBattleDefender].level)
         {
             chance = TRUE;
         }
         else
         {
-            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBankAttacker].level - gBattleMons[gBankDefender].level);
-            if (Random() % 100 + 1 < chance && gBattleMons[gBankAttacker].level >= gBattleMons[gBankDefender].level)
+            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattleAttacker].level - gBattleMons[gBattleDefender].level);
+            if (Random() % 100 + 1 < chance && gBattleMons[gBattleAttacker].level >= gBattleMons[gBattleDefender].level)
                 chance = TRUE;
             else
                 chance = FALSE;
         }
         if (chance)
         {
-            if (gProtectStructs[gBankDefender].endured)
+            if (gProtectStructs[gBattleDefender].endured)
             {
-                gBattleMoveDamage = gBattleMons[gBankDefender].hp - 1;
+                gBattleMoveDamage = gBattleMons[gBattleDefender].hp - 1;
                 gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
             }
-            else if (gSpecialStatuses[gBankDefender].focusBanded)
+            else if (gSpecialStatuses[gBattleDefender].focusBanded)
             {
-                gBattleMoveDamage = gBattleMons[gBankDefender].hp - 1;
+                gBattleMoveDamage = gBattleMons[gBattleDefender].hp - 1;
                 gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-                gLastUsedItem = gBattleMons[gBankDefender].item;
+                gLastUsedItem = gBattleMons[gBattleDefender].item;
             }
             else
             {
-                gBattleMoveDamage = gBattleMons[gBankDefender].hp;
+                gBattleMoveDamage = gBattleMons[gBattleDefender].hp;
                 gMoveResultFlags |= MOVE_RESULT_ONE_HIT_KO;
             }
             gBattlescriptCurrInstr += 5;
@@ -8149,7 +8149,7 @@ static void atk93_tryKO(void)
         else
         {
             gMoveResultFlags |= MOVE_RESULT_MISSED;
-            if (gBattleMons[gBankAttacker].level >= gBattleMons[gBankDefender].level)
+            if (gBattleMons[gBattleAttacker].level >= gBattleMons[gBattleDefender].level)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             else
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -8160,7 +8160,7 @@ static void atk93_tryKO(void)
 
 static void atk94_damagetohalftargethp(void) // super fang
 {
-    gBattleMoveDamage = gBattleMons[gBankDefender].hp / 2;
+    gBattleMoveDamage = gBattleMons[gBattleDefender].hp / 2;
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
 
@@ -8189,17 +8189,17 @@ static void atk96_weatherdamage(void)
     {
         if (gBattleWeather & WEATHER_SANDSTORM_ANY)
         {
-            if (gBattleMons[gBankAttacker].type1 != TYPE_ROCK
-                && gBattleMons[gBankAttacker].type1 != TYPE_STEEL
-                && gBattleMons[gBankAttacker].type1 != TYPE_GROUND
-                && gBattleMons[gBankAttacker].type2 != TYPE_ROCK
-                && gBattleMons[gBankAttacker].type2 != TYPE_STEEL
-                && gBattleMons[gBankAttacker].type2 != TYPE_GROUND
-                && gBattleMons[gBankAttacker].ability != ABILITY_SAND_VEIL
-                && !(gStatuses3[gBankAttacker] & STATUS3_UNDERGROUND)
-                && !(gStatuses3[gBankAttacker] & STATUS3_UNDERWATER))
-            {
-                gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 16;
+            if (gBattleMons[gBattleAttacker].type1 != TYPE_ROCK
+                && gBattleMons[gBattleAttacker].type1 != TYPE_STEEL
+                && gBattleMons[gBattleAttacker].type1 != TYPE_GROUND
+                && gBattleMons[gBattleAttacker].type2 != TYPE_ROCK
+                && gBattleMons[gBattleAttacker].type2 != TYPE_STEEL
+                && gBattleMons[gBattleAttacker].type2 != TYPE_GROUND
+                && gBattleMons[gBattleAttacker].ability != ABILITY_SAND_VEIL
+                && !(gStatuses3[gBattleAttacker] & STATUS3_UNDERGROUND)
+                && !(gStatuses3[gBattleAttacker] & STATUS3_UNDERWATER))
+            {
+                gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 16;
                 if (gBattleMoveDamage == 0)
                     gBattleMoveDamage = 1;
             }
@@ -8210,12 +8210,12 @@ static void atk96_weatherdamage(void)
         }
         if (gBattleWeather & WEATHER_HAIL)
         {
-            if (gBattleMons[gBankAttacker].type1 != TYPE_ICE
-                && gBattleMons[gBankAttacker].type2 != TYPE_ICE
-                && !(gStatuses3[gBankAttacker] & STATUS3_UNDERGROUND)
-                && !(gStatuses3[gBankAttacker] & STATUS3_UNDERWATER))
+            if (gBattleMons[gBattleAttacker].type1 != TYPE_ICE
+                && gBattleMons[gBattleAttacker].type2 != TYPE_ICE
+                && !(gStatuses3[gBattleAttacker] & STATUS3_UNDERGROUND)
+                && !(gStatuses3[gBattleAttacker] & STATUS3_UNDERWATER))
             {
-                gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 16;
+                gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 16;
                 if (gBattleMoveDamage == 0)
                     gBattleMoveDamage = 1;
             }
@@ -8230,7 +8230,7 @@ static void atk96_weatherdamage(void)
         gBattleMoveDamage = 0;
     }
 
-    if (gAbsentBankFlags & gBitTable[gBankAttacker])
+    if (gAbsentBattlerFlags & gBitTable[gBattleAttacker])
         gBattleMoveDamage = 0;
 
     gBattlescriptCurrInstr++;
@@ -8242,15 +8242,15 @@ static void atk97_tryinfatuating(void)
     u16 speciesAttacker, speciesTarget;
     u32 personalityAttacker, personalityTarget;
 
-    if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-        monAttacker = &gPlayerParty[gBattlePartyID[gBankAttacker]];
+    if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+        monAttacker = &gPlayerParty[gBattlePartyID[gBattleAttacker]];
     else
-        monAttacker = &gEnemyParty[gBattlePartyID[gBankAttacker]];
+        monAttacker = &gEnemyParty[gBattlePartyID[gBattleAttacker]];
 
-    if (GetBankSide(gBankDefender) == SIDE_PLAYER)
-        monTarget = &gPlayerParty[gBattlePartyID[gBankDefender]];
+    if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
+        monTarget = &gPlayerParty[gBattlePartyID[gBattleDefender]];
     else
-        monTarget = &gEnemyParty[gBattlePartyID[gBankDefender]];
+        monTarget = &gEnemyParty[gBattlePartyID[gBattleDefender]];
 
     speciesAttacker = GetMonData(monAttacker, MON_DATA_SPECIES);
     personalityAttacker = GetMonData(monAttacker, MON_DATA_PERSONALITY);
@@ -8258,16 +8258,16 @@ static void atk97_tryinfatuating(void)
     speciesTarget = GetMonData(monTarget, MON_DATA_SPECIES);
     personalityTarget = GetMonData(monTarget, MON_DATA_PERSONALITY);
 
-    if (gBattleMons[gBankDefender].ability == ABILITY_OBLIVIOUS)
+    if (gBattleMons[gBattleDefender].ability == ABILITY_OBLIVIOUS)
     {
         gBattlescriptCurrInstr = BattleScript_ObliviousPreventsAttraction;
         gLastUsedAbility = ABILITY_OBLIVIOUS;
-        RecordAbilityBattle(gBankDefender, ABILITY_OBLIVIOUS);
+        RecordAbilityBattle(gBattleDefender, ABILITY_OBLIVIOUS);
     }
     else
     {
         if (GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget)
-            || gBattleMons[gBankDefender].status2 & STATUS2_INFATUATION
+            || gBattleMons[gBattleDefender].status2 & STATUS2_INFATUATION
             || GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == MON_GENDERLESS
             || GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget) == MON_GENDERLESS)
         {
@@ -8275,7 +8275,7 @@ static void atk97_tryinfatuating(void)
         }
         else
         {
-            gBattleMons[gBankDefender].status2 |= STATUS2_INFATUATED_WITH(gBankAttacker);
+            gBattleMons[gBattleDefender].status2 |= STATUS2_INFATUATED_WITH(gBattleAttacker);
             gBattlescriptCurrInstr += 5;
         }
     }
@@ -8288,26 +8288,26 @@ static void atk98_updatestatusicon(void)
 
     if (gBattlescriptCurrInstr[1] != BS_ATTACKER_WITH_PARTNER)
     {
-        gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
-        EmitStatusIconUpdate(0, gBattleMons[gActiveBank].status1, gBattleMons[gActiveBank].status2);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 2;
     }
     else
     {
-        gActiveBank = gBankAttacker;
-        if (!(gAbsentBankFlags & gBitTable[gActiveBank]))
+        gActiveBattler = gBattleAttacker;
+        if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
         {
-            EmitStatusIconUpdate(0, gBattleMons[gActiveBank].status1, gBattleMons[gActiveBank].status2);
-            MarkBufferBankForExecution(gActiveBank);
+            EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
+            MarkBufferBankForExecution(gActiveBattler);
         }
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         {
-            gActiveBank = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_MON);
-            if (!(gAbsentBankFlags & gBitTable[gActiveBank]))
+            gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_FLANK);
+            if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
             {
-                EmitStatusIconUpdate(0, gBattleMons[gActiveBank].status1, gBattleMons[gActiveBank].status2);
-                MarkBufferBankForExecution(gActiveBank);
+                EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
+                MarkBufferBankForExecution(gActiveBattler);
             }
         }
         gBattlescriptCurrInstr += 2;
@@ -8316,16 +8316,16 @@ static void atk98_updatestatusicon(void)
 
 static void atk99_setmist(void)
 {
-    if (gSideTimers[GET_BANK_SIDE(gBankAttacker)].mistTimer)
+    if (gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].mistTimer)
     {
         gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gSideTimers[GET_BANK_SIDE(gBankAttacker)].mistTimer = 5;
-        gSideTimers[GET_BANK_SIDE(gBankAttacker)].mistBank = gBankAttacker;
-        gSideStatuses[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_MIST;
+        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].mistTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].mistBank = gBattleAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] |= SIDE_STATUS_MIST;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     gBattlescriptCurrInstr++;
@@ -8333,14 +8333,14 @@ static void atk99_setmist(void)
 
 static void atk9A_setfocusenergy(void)
 {
-    if (gBattleMons[gBankAttacker].status2 & STATUS2_FOCUS_ENERGY)
+    if (gBattleMons[gBattleAttacker].status2 & STATUS2_FOCUS_ENERGY)
     {
         gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gBattleMons[gBankAttacker].status2 |= STATUS2_FOCUS_ENERGY;
+        gBattleMons[gBattleAttacker].status2 |= STATUS2_FOCUS_ENERGY;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     gBattlescriptCurrInstr++;
@@ -8350,8 +8350,8 @@ static void atk9B_transformdataexecution(void)
 {
     gChosenMove = 0xFFFF;
     gBattlescriptCurrInstr++;
-    if (gBattleMons[gBankDefender].status2 & STATUS2_TRANSFORMED
-        || gStatuses3[gBankDefender] & STATUS3_SEMI_INVULNERABLE)
+    if (gBattleMons[gBattleDefender].status2 & STATUS2_TRANSFORMED
+        || gStatuses3[gBattleDefender] & STATUS3_SEMI_INVULNERABLE)
     {
         gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -8361,55 +8361,55 @@ static void atk9B_transformdataexecution(void)
         s32 i;
         u8 *battleMonAttacker, *battleMonTarget;
 
-        gBattleMons[gBankAttacker].status2 |= STATUS2_TRANSFORMED;
-        gDisableStructs[gBankAttacker].disabledMove = 0;
-        gDisableStructs[gBankAttacker].disableTimer1 = 0;
-        gDisableStructs[gBankAttacker].transformedMonPersonality = gBattleMons[gBankDefender].personality;
-        gDisableStructs[gBankAttacker].unk18_b = 0;
+        gBattleMons[gBattleAttacker].status2 |= STATUS2_TRANSFORMED;
+        gDisableStructs[gBattleAttacker].disabledMove = 0;
+        gDisableStructs[gBattleAttacker].disableTimer1 = 0;
+        gDisableStructs[gBattleAttacker].transformedMonPersonality = gBattleMons[gBattleDefender].personality;
+        gDisableStructs[gBattleAttacker].unk18_b = 0;
 
-        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBankDefender].species)
+        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattleDefender].species)
 
-        battleMonAttacker = (u8*)(&gBattleMons[gBankAttacker]);
-        battleMonTarget = (u8*)(&gBattleMons[gBankDefender]);
+        battleMonAttacker = (u8*)(&gBattleMons[gBattleAttacker]);
+        battleMonTarget = (u8*)(&gBattleMons[gBattleDefender]);
 
         for (i = 0; i < offsetof(struct BattlePokemon, pp); i++)
             battleMonAttacker[i] = battleMonTarget[i];
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMoves[gBattleMons[gBankAttacker].moves[i]].pp < 5)
-                gBattleMons[gBankAttacker].pp[i] = gBattleMoves[gBattleMons[gBankAttacker].moves[i]].pp;
+            if (gBattleMoves[gBattleMons[gBattleAttacker].moves[i]].pp < 5)
+                gBattleMons[gBattleAttacker].pp[i] = gBattleMoves[gBattleMons[gBattleAttacker].moves[i]].pp;
             else
-                gBattleMons[gBankAttacker].pp[i] = 5;
+                gBattleMons[gBattleAttacker].pp[i] = 5;
         }
 
-        gActiveBank = gBankAttacker;
+        gActiveBattler = gBattleAttacker;
         EmitResetActionMoveSelection(0, RESET_MOVE_SELECTION);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
 }
 
 static void atk9C_setsubstitute(void)
 {
-    u32 hp = gBattleMons[gBankAttacker].maxHP / 4;
-    if (gBattleMons[gBankAttacker].maxHP / 4 == 0)
+    u32 hp = gBattleMons[gBattleAttacker].maxHP / 4;
+    if (gBattleMons[gBattleAttacker].maxHP / 4 == 0)
         hp = 1;
 
-    if (gBattleMons[gBankAttacker].hp <= hp)
+    if (gBattleMons[gBattleAttacker].hp <= hp)
     {
         gBattleMoveDamage = 0;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 4; // one bit value will only work for pokemon which max hp can go to 1020(which is more than possible in games)
+        gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 4; // one bit value will only work for pokemon which max hp can go to 1020(which is more than possible in games)
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
-        gBattleMons[gBankAttacker].status2 |= STATUS2_SUBSTITUTE;
-        gBattleMons[gBankAttacker].status2 &= ~(STATUS2_WRAPPED);
-        gDisableStructs[gBankAttacker].substituteHP = gBattleMoveDamage;
+        gBattleMons[gBattleAttacker].status2 |= STATUS2_SUBSTITUTE;
+        gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_WRAPPED);
+        gDisableStructs[gBattleAttacker].substituteHP = gBattleMoveDamage;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         gHitMarker |= HITMARKER_IGNORE_SUBSTITUTE;
     }
@@ -8430,10 +8430,10 @@ static void atk9D_mimicattackcopy(void)
 {
     gChosenMove = 0xFFFF;
 
-    if (IsMoveUncopyableByMimic(gLastMoves[gBankDefender])
-        || gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED
-        || gLastMoves[gBankDefender] == 0
-        || gLastMoves[gBankDefender] == 0xFFFF)
+    if (IsMoveUncopyableByMimic(gLastMoves[gBattleDefender])
+        || gBattleMons[gBattleAttacker].status2 & STATUS2_TRANSFORMED
+        || gLastMoves[gBattleDefender] == 0
+        || gLastMoves[gBattleDefender] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8443,22 +8443,22 @@ static void atk9D_mimicattackcopy(void)
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMons[gBankAttacker].moves[i] == gLastMoves[gBankDefender])
+            if (gBattleMons[gBattleAttacker].moves[i] == gLastMoves[gBattleDefender])
                 break;
         }
 
         if (i == 4)
         {
-            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gLastMoves[gBankDefender];
-            if (gBattleMoves[gLastMoves[gBankDefender]].pp < 5)
-                gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBankDefender]].pp;
+            gBattleMons[gBattleAttacker].moves[gCurrMovePos] = gLastMoves[gBattleDefender];
+            if (gBattleMoves[gLastMoves[gBattleDefender]].pp < 5)
+                gBattleMons[gBattleAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBattleDefender]].pp;
             else
-                gBattleMons[gBankAttacker].pp[gCurrMovePos] = 5;
+                gBattleMons[gBattleAttacker].pp[gCurrMovePos] = 5;
 
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBankDefender])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattleDefender])
 
-            gDisableStructs[gBankAttacker].unk18_b |= gBitTable[gCurrMovePos];
+            gDisableStructs[gBattleAttacker].unk18_b |= gBitTable[gCurrMovePos];
             gBattlescriptCurrInstr += 5;
         }
         else
@@ -8494,7 +8494,7 @@ static void atk9E_metronome(void)
         {
             gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
             gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
-            gBankDefender = GetMoveTarget(gCurrentMove, 0);
+            gBattleDefender = GetMoveTarget(gCurrentMove, 0);
             return;
         }
     }
@@ -8502,7 +8502,7 @@ static void atk9E_metronome(void)
 
 static void atk9F_dmgtolevel(void)
 {
-    gBattleMoveDamage = gBattleMons[gBankAttacker].level;
+    gBattleMoveDamage = gBattleMons[gBattleAttacker].level;
     gBattlescriptCurrInstr++;
 }
 
@@ -8513,54 +8513,54 @@ static void atkA0_psywavedamageeffect(void)
     while ((randDamage = (Random() & 0xF)) > 10);
 
     randDamage *= 10;
-    gBattleMoveDamage = gBattleMons[gBankAttacker].level * (randDamage + 50) / 100;
+    gBattleMoveDamage = gBattleMons[gBattleAttacker].level * (randDamage + 50) / 100;
     gBattlescriptCurrInstr++;
 }
 
 static void atkA1_counterdamagecalculator(void)
 {
-    u8 sideAttacker = GetBankSide(gBankAttacker);
-    u8 sideTarget = GetBankSide(gProtectStructs[gBankAttacker].physicalBank);
+    u8 sideAttacker = GetBattlerSide(gBattleAttacker);
+    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattleAttacker].physicalBank);
 
-    if (gProtectStructs[gBankAttacker].physicalDmg
+    if (gProtectStructs[gBattleAttacker].physicalDmg
         && sideAttacker != sideTarget
-        && gBattleMons[gProtectStructs[gBankAttacker].physicalBank].hp)
+        && gBattleMons[gProtectStructs[gBattleAttacker].physicalBank].hp)
     {
-        gBattleMoveDamage = gProtectStructs[gBankAttacker].physicalDmg * 2;
+        gBattleMoveDamage = gProtectStructs[gBattleAttacker].physicalDmg * 2;
 
         if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp)
-            gBankDefender = gSideTimers[sideTarget].followmeTarget;
+            gBattleDefender = gSideTimers[sideTarget].followmeTarget;
         else
-            gBankDefender = gProtectStructs[gBankAttacker].physicalBank;
+            gBattleDefender = gProtectStructs[gBattleAttacker].physicalBank;
 
         gBattlescriptCurrInstr += 5;
     }
     else
     {
-        gSpecialStatuses[gBankAttacker].flag20 = 1;
+        gSpecialStatuses[gBattleAttacker].flag20 = 1;
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
 
 static void atkA2_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the physical -> special field changes
 {
-    u8 sideAttacker = GetBankSide(gBankAttacker);
-    u8 sideTarget = GetBankSide(gProtectStructs[gBankAttacker].specialBank);
+    u8 sideAttacker = GetBattlerSide(gBattleAttacker);
+    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattleAttacker].specialBank);
 
-    if (gProtectStructs[gBankAttacker].specialDmg && sideAttacker != sideTarget && gBattleMons[gProtectStructs[gBankAttacker].specialBank].hp)
+    if (gProtectStructs[gBattleAttacker].specialDmg && sideAttacker != sideTarget && gBattleMons[gProtectStructs[gBattleAttacker].specialBank].hp)
     {
-        gBattleMoveDamage = gProtectStructs[gBankAttacker].specialDmg * 2;
+        gBattleMoveDamage = gProtectStructs[gBattleAttacker].specialDmg * 2;
 
         if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp)
-            gBankDefender = gSideTimers[sideTarget].followmeTarget;
+            gBattleDefender = gSideTimers[sideTarget].followmeTarget;
         else
-            gBankDefender = gProtectStructs[gBankAttacker].specialBank;
+            gBattleDefender = gProtectStructs[gBattleAttacker].specialBank;
 
         gBattlescriptCurrInstr += 5;
     }
     else
     {
-        gSpecialStatuses[gBankAttacker].flag20 = 1;
+        gSpecialStatuses[gBattleAttacker].flag20 = 1;
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
@@ -8571,17 +8571,17 @@ static void atkA3_disablelastusedattack(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBankDefender].moves[i] == gLastMoves[gBankDefender])
+        if (gBattleMons[gBattleDefender].moves[i] == gLastMoves[gBattleDefender])
             break;
     }
-    if (gDisableStructs[gBankDefender].disabledMove == 0
-        && i != 4 && gBattleMons[gBankDefender].pp[i] != 0)
+    if (gDisableStructs[gBattleDefender].disabledMove == 0
+        && i != 4 && gBattleMons[gBattleDefender].pp[i] != 0)
     {
-        PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBankDefender].moves[i])
+        PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattleDefender].moves[i])
 
-        gDisableStructs[gBankDefender].disabledMove = gBattleMons[gBankDefender].moves[i];
-        gDisableStructs[gBankDefender].disableTimer1 = (Random() & 3) + 2;
-        gDisableStructs[gBankDefender].disableTimer2 = gDisableStructs[gBankDefender].disableTimer1; // used to save the random amount of turns?
+        gDisableStructs[gBattleDefender].disabledMove = gBattleMons[gBattleDefender].moves[i];
+        gDisableStructs[gBattleDefender].disableTimer1 = (Random() & 3) + 2;
+        gDisableStructs[gBattleDefender].disableTimer2 = gDisableStructs[gBattleDefender].disableTimer1; // used to save the random amount of turns?
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -8596,24 +8596,24 @@ static void atkA4_trysetencore(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBankDefender].moves[i] == gLastMoves[gBankDefender])
+        if (gBattleMons[gBattleDefender].moves[i] == gLastMoves[gBattleDefender])
             break;
     }
 
-    if (gLastMoves[gBankDefender] == MOVE_STRUGGLE
-        || gLastMoves[gBankDefender] == MOVE_ENCORE
-        || gLastMoves[gBankDefender] == MOVE_MIRROR_MOVE)
+    if (gLastMoves[gBattleDefender] == MOVE_STRUGGLE
+        || gLastMoves[gBattleDefender] == MOVE_ENCORE
+        || gLastMoves[gBattleDefender] == MOVE_MIRROR_MOVE)
     {
         i = 4;
     }
 
-    if (gDisableStructs[gBankDefender].encoredMove == 0
-        && i != 4 && gBattleMons[gBankDefender].pp[i] != 0)
+    if (gDisableStructs[gBattleDefender].encoredMove == 0
+        && i != 4 && gBattleMons[gBattleDefender].pp[i] != 0)
     {
-        gDisableStructs[gBankDefender].encoredMove = gBattleMons[gBankDefender].moves[i];
-        gDisableStructs[gBankDefender].encoredMovePos = i;
-        gDisableStructs[gBankDefender].encoreTimer1 = (Random() & 3) + 3;
-        gDisableStructs[gBankDefender].encoreTimer2 = gDisableStructs[gBankDefender].encoreTimer1;
+        gDisableStructs[gBattleDefender].encoredMove = gBattleMons[gBattleDefender].moves[i];
+        gDisableStructs[gBattleDefender].encoredMovePos = i;
+        gDisableStructs[gBattleDefender].encoreTimer1 = (Random() & 3) + 3;
+        gDisableStructs[gBattleDefender].encoreTimer2 = gDisableStructs[gBattleDefender].encoreTimer1;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -8624,10 +8624,10 @@ static void atkA4_trysetencore(void)
 
 static void atkA5_painsplitdmgcalc(void)
 {
-    if (!(gBattleMons[gBankDefender].status2 & STATUS2_SUBSTITUTE))
+    if (!(gBattleMons[gBattleDefender].status2 & STATUS2_SUBSTITUTE))
     {
-        s32 hpDiff = (gBattleMons[gBankAttacker].hp + gBattleMons[gBankDefender].hp) / 2;
-        s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBankDefender].hp - hpDiff;
+        s32 hpDiff = (gBattleMons[gBattleAttacker].hp + gBattleMons[gBattleDefender].hp) / 2;
+        s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBattleDefender].hp - hpDiff;
         u8* storeLoc = (void*)(&gBattleScripting.painSplitHp);
 
         storeLoc[0] = (painSplitHp);
@@ -8635,8 +8635,8 @@ static void atkA5_painsplitdmgcalc(void)
         storeLoc[2] = (painSplitHp & 0x00FF0000) >> 16;
         storeLoc[3] = (painSplitHp & 0xFF000000) >> 24;
 
-        gBattleMoveDamage = gBattleMons[gBankAttacker].hp - hpDiff;
-        gSpecialStatuses[gBankDefender].moveturnLostHP = 0xFFFF;
+        gBattleMoveDamage = gBattleMons[gBattleAttacker].hp - hpDiff;
+        gSpecialStatuses[gBattleDefender].moveturnLostHP = 0xFFFF;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -8648,13 +8648,13 @@ static void atkA5_painsplitdmgcalc(void)
 
 static void atkA6_settypetorandomresistance(void) // conversion 2
 {
-    if (gLastLandedMoves[gBankAttacker] == 0
-        || gLastLandedMoves[gBankAttacker] == 0xFFFF)
+    if (gLastLandedMoves[gBattleAttacker] == 0
+        || gLastLandedMoves[gBattleAttacker] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
-    else if (IsTwoTurnsMove(gLastLandedMoves[gBankAttacker])
-            && gBattleMons[gLastHitBy[gBankAttacker]].status2 & STATUS2_MULTIPLETURNS)
+    else if (IsTwoTurnsMove(gLastLandedMoves[gBattleAttacker])
+            && gBattleMons[gLastHitBy[gBattleAttacker]].status2 & STATUS2_MULTIPLETURNS)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8668,13 +8668,13 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
 
             i *= 3;
 
-            if (TYPE_EFFECT_ATK_TYPE(i) == gLastHitByType[gBankAttacker]
+            if (TYPE_EFFECT_ATK_TYPE(i) == gLastHitByType[gBattleAttacker]
                 && TYPE_EFFECT_MULTIPLIER(i) <= TYPE_MUL_NOT_EFFECTIVE
-                && gBattleMons[gBankAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
-                && gBattleMons[gBankAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
+                && gBattleMons[gBattleAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
+                && gBattleMons[gBattleAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
             {
-                gBattleMons[gBankAttacker].type1 = TYPE_EFFECT_DEF_TYPE(i);
-                gBattleMons[gBankAttacker].type2 = TYPE_EFFECT_DEF_TYPE(i);
+                gBattleMons[gBattleAttacker].type1 = TYPE_EFFECT_DEF_TYPE(i);
+                gBattleMons[gBattleAttacker].type2 = TYPE_EFFECT_DEF_TYPE(i);
 
                 PREPARE_TYPE_BUFFER(gBattleTextBuff1, TYPE_EFFECT_DEF_TYPE(i))
 
@@ -8691,13 +8691,13 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
             case TYPE_FORESIGHT:
                 break;
             default:
-                if (TYPE_EFFECT_ATK_TYPE(j) == gLastHitByType[gBankAttacker]
+                if (TYPE_EFFECT_ATK_TYPE(j) == gLastHitByType[gBattleAttacker]
                     && TYPE_EFFECT_MULTIPLIER(j) <= 5
-                    && gBattleMons[gBankAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
-                    && gBattleMons[gBankAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
+                    && gBattleMons[gBattleAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
+                    && gBattleMons[gBattleAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
                 {
-                    gBattleMons[gBankAttacker].type1 = TYPE_EFFECT_DEF_TYPE(rands);
-                    gBattleMons[gBankAttacker].type2 = TYPE_EFFECT_DEF_TYPE(rands);
+                    gBattleMons[gBattleAttacker].type1 = TYPE_EFFECT_DEF_TYPE(rands);
+                    gBattleMons[gBattleAttacker].type2 = TYPE_EFFECT_DEF_TYPE(rands);
 
                     PREPARE_TYPE_BUFFER(gBattleTextBuff1, TYPE_EFFECT_DEF_TYPE(rands))
 
@@ -8714,9 +8714,9 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
 
 static void atkA7_setalwayshitflag(void)
 {
-    gStatuses3[gBankDefender] &= ~(STATUS3_ALWAYS_HITS);
-    gStatuses3[gBankDefender] |= 0x10;
-    gDisableStructs[gBankDefender].bankWithSureHit = gBankAttacker;
+    gStatuses3[gBattleDefender] &= ~(STATUS3_ALWAYS_HITS);
+    gStatuses3[gBattleDefender] |= 0x10;
+    gDisableStructs[gBattleDefender].bankWithSureHit = gBattleAttacker;
     gBattlescriptCurrInstr++;
 }
 
@@ -8724,19 +8724,19 @@ static void atkA8_copymovepermanently(void) // sketch
 {
     gChosenMove = 0xFFFF;
 
-    if (!(gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED)
-        && gLastPrintedMoves[gBankDefender] != MOVE_STRUGGLE
-        && gLastPrintedMoves[gBankDefender] != 0
-        && gLastPrintedMoves[gBankDefender] != 0xFFFF
-        && gLastPrintedMoves[gBankDefender] != MOVE_SKETCH)
+    if (!(gBattleMons[gBattleAttacker].status2 & STATUS2_TRANSFORMED)
+        && gLastPrintedMoves[gBattleDefender] != MOVE_STRUGGLE
+        && gLastPrintedMoves[gBattleDefender] != 0
+        && gLastPrintedMoves[gBattleDefender] != 0xFFFF
+        && gLastPrintedMoves[gBattleDefender] != MOVE_SKETCH)
     {
         s32 i;
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMons[gBankAttacker].moves[i] == MOVE_SKETCH)
+            if (gBattleMons[gBattleAttacker].moves[i] == MOVE_SKETCH)
                 continue;
-            if (gBattleMons[gBankAttacker].moves[i] == gLastPrintedMoves[gBankDefender])
+            if (gBattleMons[gBattleAttacker].moves[i] == gLastPrintedMoves[gBattleDefender])
                 break;
         }
 
@@ -8748,21 +8748,21 @@ static void atkA8_copymovepermanently(void) // sketch
         {
             struct MovePpInfo movePpData;
 
-            gBattleMons[gBankAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBankDefender];
-            gBattleMons[gBankAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBankDefender]].pp;
-            gActiveBank = gBankAttacker;
+            gBattleMons[gBattleAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBattleDefender];
+            gBattleMons[gBattleAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBattleDefender]].pp;
+            gActiveBattler = gBattleAttacker;
 
             for (i = 0; i < 4; i++)
             {
-                movePpData.moves[i] = gBattleMons[gBankAttacker].moves[i];
-                movePpData.pp[i] = gBattleMons[gBankAttacker].pp[i];
+                movePpData.moves[i] = gBattleMons[gBattleAttacker].moves[i];
+                movePpData.pp[i] = gBattleMons[gBattleAttacker].pp[i];
             }
-            movePpData.ppBonuses = gBattleMons[gBankAttacker].ppBonuses;
+            movePpData.ppBonuses = gBattleMons[gBattleAttacker].ppBonuses;
 
             EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct MovePpInfo), &movePpData);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBankDefender])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBattleDefender])
 
             gBattlescriptCurrInstr += 5;
         }
@@ -8822,17 +8822,17 @@ static void atkA9_trychoosesleeptalkmove(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (IsInvalidForSleepTalkOrAssist(gBattleMons[gBankAttacker].moves[i])
-            || gBattleMons[gBankAttacker].moves[i] == MOVE_FOCUS_PUNCH
-            || gBattleMons[gBankAttacker].moves[i] == MOVE_UPROAR
-            || IsTwoTurnsMove(gBattleMons[gBankAttacker].moves[i]))
+        if (IsInvalidForSleepTalkOrAssist(gBattleMons[gBattleAttacker].moves[i])
+            || gBattleMons[gBattleAttacker].moves[i] == MOVE_FOCUS_PUNCH
+            || gBattleMons[gBattleAttacker].moves[i] == MOVE_UPROAR
+            || IsTwoTurnsMove(gBattleMons[gBattleAttacker].moves[i]))
         {
             unusableMovesBits |= gBitTable[i];
         }
 
     }
 
-    unusableMovesBits = CheckMoveLimitations(gBankAttacker, unusableMovesBits, ~(MOVE_LIMITATION_PP));
+    unusableMovesBits = CheckMoveLimitations(gBattleAttacker, unusableMovesBits, ~(MOVE_LIMITATION_PP));
     if (unusableMovesBits == 0xF) // all 4 moves cannot be chosen
     {
         gBattlescriptCurrInstr += 5;
@@ -8846,25 +8846,25 @@ static void atkA9_trychoosesleeptalkmove(void)
             movePosition = Random() & 3;
         } while ((gBitTable[movePosition] & unusableMovesBits));
 
-        gRandomMove = gBattleMons[gBankAttacker].moves[movePosition];
+        gRandomMove = gBattleMons[gBattleAttacker].moves[movePosition];
         gCurrMovePos = movePosition;
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
-        gBankDefender = GetMoveTarget(gRandomMove, 0);
+        gBattleDefender = GetMoveTarget(gRandomMove, 0);
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
 
 static void atkAA_setdestinybond(void)
 {
-    gBattleMons[gBankAttacker].status2 |= STATUS2_DESTINY_BOND;
+    gBattleMons[gBattleAttacker].status2 |= STATUS2_DESTINY_BOND;
     gBattlescriptCurrInstr++;
 }
 
 static void TrySetDestinyBondToHappen(void)
 {
-    u8 sideAttacker = GetBankSide(gBankAttacker);
-    u8 sideTarget = GetBankSide(gBankDefender);
-    if (gBattleMons[gBankDefender].status2 & STATUS2_DESTINY_BOND
+    u8 sideAttacker = GetBattlerSide(gBattleAttacker);
+    u8 sideTarget = GetBattlerSide(gBattleDefender);
+    if (gBattleMons[gBattleDefender].status2 & STATUS2_DESTINY_BOND
         && sideAttacker != sideTarget
         && !(gHitMarker & HITMARKER_GRUDGE))
     {
@@ -8881,7 +8881,7 @@ static void atkAB_trysetdestinybondtohappen(void)
 static void atkAC_remaininghptopower(void)
 {
     s32 i;
-    s32 hpFraction = GetScaledHPFraction(gBattleMons[gBankAttacker].hp, gBattleMons[gBankAttacker].maxHP, 48);
+    s32 hpFraction = GetScaledHPFraction(gBattleMons[gBattleAttacker].hp, gBattleMons[gBattleAttacker].maxHP, 48);
 
     for (i = 0; i < (s32) sizeof(sFlailHpScaleToPowerTable); i += 2)
     {
@@ -8895,43 +8895,43 @@ static void atkAC_remaininghptopower(void)
 
 static void atkAD_tryspiteppreduce(void)
 {
-    if (gLastMoves[gBankDefender] != 0
-        && gLastMoves[gBankDefender] != 0xFFFF)
+    if (gLastMoves[gBattleDefender] != 0
+        && gLastMoves[gBattleDefender] != 0xFFFF)
     {
         s32 i;
 
         for (i = 0; i < 4; i++)
         {
-            if (gLastMoves[gBankDefender] == gBattleMons[gBankDefender].moves[i])
+            if (gLastMoves[gBattleDefender] == gBattleMons[gBattleDefender].moves[i])
                 break;
         }
 
-        if (i != 4 && gBattleMons[gBankDefender].pp[i] > 1)
+        if (i != 4 && gBattleMons[gBattleDefender].pp[i] > 1)
         {
             s32 ppToDeduct = (Random() & 3) + 2;
-            if (gBattleMons[gBankDefender].pp[i] < ppToDeduct)
-                ppToDeduct = gBattleMons[gBankDefender].pp[i];
+            if (gBattleMons[gBattleDefender].pp[i] < ppToDeduct)
+                ppToDeduct = gBattleMons[gBattleDefender].pp[i];
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBankDefender])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattleDefender])
 
             ConvertIntToDecimalStringN(gBattleTextBuff2, ppToDeduct, 0, 1);
 
             PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 1, ppToDeduct)
 
-            gBattleMons[gBankDefender].pp[i] -= ppToDeduct;
-            gActiveBank = gBankDefender;
+            gBattleMons[gBattleDefender].pp[i] -= ppToDeduct;
+            gActiveBattler = gBattleDefender;
 
-            if (!(gDisableStructs[gActiveBank].unk18_b & gBitTable[i])
-                && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED))
+            if (!(gDisableStructs[gActiveBattler].unk18_b & gBitTable[i])
+                && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
             {
-                EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]);
-                MarkBufferBankForExecution(gActiveBank);
+                EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]);
+                MarkBufferBankForExecution(gActiveBattler);
             }
 
             gBattlescriptCurrInstr += 5;
 
-            if (gBattleMons[gBankDefender].pp[i] == 0)
-                CancelMultiTurnMoves(gBankDefender);
+            if (gBattleMons[gBattleDefender].pp[i] == 0)
+                CancelMultiTurnMoves(gBattleDefender);
         }
         else
         {
@@ -8956,35 +8956,35 @@ static void atkAE_healpartystatus(void)
 
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
 
-        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
             party = gPlayerParty;
         else
             party = gEnemyParty;
 
-        if (gBattleMons[gBankAttacker].ability != ABILITY_SOUNDPROOF)
+        if (gBattleMons[gBattleAttacker].ability != ABILITY_SOUNDPROOF)
         {
-            gBattleMons[gBankAttacker].status1 = 0;
-            gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+            gBattleMons[gBattleAttacker].status1 = 0;
+            gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_NIGHTMARE);
         }
         else
         {
-            RecordAbilityBattle(gBankAttacker, gBattleMons[gBankAttacker].ability);
+            RecordAbilityBattle(gBattleAttacker, gBattleMons[gBattleAttacker].ability);
             gBattleCommunication[MULTISTRING_CHOOSER] |= 1;
         }
 
-        gActiveBank = gBattleScripting.bank = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_MON);
+        gActiveBattler = gBattleScripting.battler = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_FLANK);
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-            && !(gAbsentBankFlags & gBitTable[gActiveBank]))
+            && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
         {
-            if (gBattleMons[gActiveBank].ability != ABILITY_SOUNDPROOF)
+            if (gBattleMons[gActiveBattler].ability != ABILITY_SOUNDPROOF)
             {
-                gBattleMons[gActiveBank].status1 = 0;
-                gBattleMons[gActiveBank].status2 &= ~(STATUS2_NIGHTMARE);
+                gBattleMons[gActiveBattler].status1 = 0;
+                gBattleMons[gActiveBattler].status2 &= ~(STATUS2_NIGHTMARE);
             }
             else
             {
-                RecordAbilityBattle(gActiveBank, gBattleMons[gActiveBank].ability);
+                RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability);
                 gBattleCommunication[MULTISTRING_CHOOSER] |= 2;
             }
         }
@@ -8998,12 +8998,12 @@ static void atkAE_healpartystatus(void)
             {
                 u8 ability;
 
-                if (gBattlePartyID[gBankAttacker] == i)
-                    ability = gBattleMons[gBankAttacker].ability;
+                if (gBattlePartyID[gBattleAttacker] == i)
+                    ability = gBattleMons[gBattleAttacker].ability;
                 else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-                         && gBattlePartyID[gActiveBank] == i
-                         && !(gAbsentBankFlags & gBitTable[gActiveBank]))
-                    ability = gBattleMons[gActiveBank].ability;
+                         && gBattlePartyID[gActiveBattler] == i
+                         && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
+                    ability = gBattleMons[gActiveBattler].ability;
                 else
                     ability = GetAbilityBySpecies(species, abilityBit);
 
@@ -9017,24 +9017,24 @@ static void atkAE_healpartystatus(void)
         gBattleCommunication[MULTISTRING_CHOOSER] = 4;
         toHeal = 0x3F;
 
-        gBattleMons[gBankAttacker].status1 = 0;
-        gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+        gBattleMons[gBattleAttacker].status1 = 0;
+        gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_NIGHTMARE);
 
-        gActiveBank = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_MON);
+        gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_FLANK);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-            && !(gAbsentBankFlags & gBitTable[gActiveBank]))
+            && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
         {
-            gBattleMons[gActiveBank].status1 = 0;
-            gBattleMons[gActiveBank].status2 &= ~(STATUS2_NIGHTMARE);
+            gBattleMons[gActiveBattler].status1 = 0;
+            gBattleMons[gActiveBattler].status2 &= ~(STATUS2_NIGHTMARE);
         }
 
     }
 
     if (toHeal)
     {
-        gActiveBank = gBankAttacker;
+        gActiveBattler = gBattleAttacker;
         EmitSetMonData(0, REQUEST_STATUS_BATTLE, toHeal, 4, &zero);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
     }
 
     gBattlescriptCurrInstr++;
@@ -9042,14 +9042,14 @@ static void atkAE_healpartystatus(void)
 
 static void atkAF_cursetarget(void)
 {
-    if (gBattleMons[gBankDefender].status2 & STATUS2_CURSED)
+    if (gBattleMons[gBattleDefender].status2 & STATUS2_CURSED)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMons[gBankDefender].status2 |= STATUS2_CURSED;
-        gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 2;
+        gBattleMons[gBattleDefender].status2 |= STATUS2_CURSED;
+        gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
@@ -9059,11 +9059,11 @@ static void atkAF_cursetarget(void)
 
 static void atkB0_trysetspikes(void)
 {
-    u8 targetSide = GetBankSide(gBankAttacker) ^ BIT_SIDE;
+    u8 targetSide = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
 
     if (gSideTimers[targetSide].spikesAmount == 3)
     {
-        gSpecialStatuses[gBankAttacker].flag20 = 1;
+        gSpecialStatuses[gBattleAttacker].flag20 = 1;
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
@@ -9076,7 +9076,7 @@ static void atkB0_trysetspikes(void)
 
 static void atkB1_setforesight(void)
 {
-    gBattleMons[gBankDefender].status2 |= STATUS2_FORESIGHT;
+    gBattleMons[gBattleDefender].status2 |= STATUS2_FORESIGHT;
     gBattlescriptCurrInstr++;
 }
 
@@ -9085,7 +9085,7 @@ static void atkB2_trysetperishsong(void)
     s32 i;
     s32 notAffectedCount = 0;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if (gStatuses3[i] & STATUS3_PERISH_SONG
             || gBattleMons[i].ability == ABILITY_SOUNDPROOF)
@@ -9100,9 +9100,9 @@ static void atkB2_trysetperishsong(void)
         }
     }
 
-    PressurePPLoseOnUsingPerishSong(gBankAttacker);
+    PressurePPLoseOnUsingPerishSong(gBattleAttacker);
 
-    if (notAffectedCount == gBattleBanksCount)
+    if (notAffectedCount == gBattlersCount)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -9112,31 +9112,31 @@ static void atkB3_rolloutdamagecalculation(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
-        CancelMultiTurnMoves(gBankAttacker);
+        CancelMultiTurnMoves(gBattleAttacker);
         gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
     }
     else
     {
         s32 i;
 
-        if (!(gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS)) // first hit
+        if (!(gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS)) // first hit
         {
-            gDisableStructs[gBankAttacker].rolloutCounter1 = 5;
-            gDisableStructs[gBankAttacker].rolloutCounter2 = 5;
-            gBattleMons[gBankAttacker].status2 |= STATUS2_MULTIPLETURNS;
-            gLockedMoves[gBankAttacker] = gCurrentMove;
+            gDisableStructs[gBattleAttacker].rolloutCounter1 = 5;
+            gDisableStructs[gBattleAttacker].rolloutCounter2 = 5;
+            gBattleMons[gBattleAttacker].status2 |= STATUS2_MULTIPLETURNS;
+            gLockedMoves[gBattleAttacker] = gCurrentMove;
         }
-        if (--gDisableStructs[gBankAttacker].rolloutCounter1 == 0) // last hit
+        if (--gDisableStructs[gBattleAttacker].rolloutCounter1 == 0) // last hit
         {
-            gBattleMons[gBankAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
+            gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
         }
 
         gDynamicBasePower = gBattleMoves[gCurrentMove].power;
 
-        for (i = 1; i < (5 - gDisableStructs[gBankAttacker].rolloutCounter1); i++)
+        for (i = 1; i < (5 - gDisableStructs[gBattleAttacker].rolloutCounter1); i++)
             gDynamicBasePower *= 2;
 
-        if (gBattleMons[gBankAttacker].status2 & STATUS2_DEFENSE_CURL)
+        if (gBattleMons[gBattleAttacker].status2 & STATUS2_DEFENSE_CURL)
             gDynamicBasePower *= 2;
 
         gBattlescriptCurrInstr++;
@@ -9145,8 +9145,8 @@ static void atkB3_rolloutdamagecalculation(void)
 
 static void atkB4_jumpifconfusedandstatmaxed(void)
 {
-    if (gBattleMons[gBankDefender].status2 & STATUS2_CONFUSION
-        && gBattleMons[gBankDefender].statStages[gBattlescriptCurrInstr[1]] == 0xC)
+    if (gBattleMons[gBattleDefender].status2 & STATUS2_CONFUSION
+        && gBattleMons[gBattleDefender].statStages[gBattlescriptCurrInstr[1]] == 0xC)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
     else
         gBattlescriptCurrInstr += 6;
@@ -9156,19 +9156,19 @@ static void atkB5_furycuttercalc(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
-        gDisableStructs[gBankAttacker].furyCutterCounter = 0;
+        gDisableStructs[gBattleAttacker].furyCutterCounter = 0;
         gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
     }
     else
     {
         s32 i;
 
-        if (gDisableStructs[gBankAttacker].furyCutterCounter != 5)
-            gDisableStructs[gBankAttacker].furyCutterCounter++;
+        if (gDisableStructs[gBattleAttacker].furyCutterCounter != 5)
+            gDisableStructs[gBattleAttacker].furyCutterCounter++;
 
         gDynamicBasePower = gBattleMoves[gCurrentMove].power;
 
-        for (i = 1; i < gDisableStructs[gBankAttacker].furyCutterCounter; i++)
+        for (i = 1; i < gDisableStructs[gBattleAttacker].furyCutterCounter; i++)
             gDynamicBasePower *= 2;
 
         gBattlescriptCurrInstr++;
@@ -9178,9 +9178,9 @@ static void atkB5_furycuttercalc(void)
 static void atkB6_happinesstodamagecalculation(void)
 {
     if (gBattleMoves[gCurrentMove].effect == EFFECT_RETURN)
-        gDynamicBasePower = 10 * (gBattleMons[gBankAttacker].friendship) / 25;
+        gDynamicBasePower = 10 * (gBattleMons[gBattleAttacker].friendship) / 25;
     else // EFFECT_FRUSTRATION
-        gDynamicBasePower = 10 * (255 - gBattleMons[gBankAttacker].friendship) / 25;
+        gDynamicBasePower = 10 * (255 - gBattleMons[gBattleAttacker].friendship) / 25;
 
     gBattlescriptCurrInstr++;
 }
@@ -9197,14 +9197,14 @@ static void atkB7_presentdamagecalculation(void)
         gDynamicBasePower = 120;
     else
     {
-        gBattleMoveDamage = gBattleMons[gBankDefender].maxHP / 4;
+        gBattleMoveDamage = gBattleMons[gBattleDefender].maxHP / 4;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
     }
     if (rand < 204)
         gBattlescriptCurrInstr = BattleScript_HitFromCritCalc;
-    else if (gBattleMons[gBankDefender].maxHP == gBattleMons[gBankDefender].hp)
+    else if (gBattleMons[gBattleDefender].maxHP == gBattleMons[gBattleDefender].hp)
         gBattlescriptCurrInstr = BattleScript_AlreadyAtFullHp;
     else
     {
@@ -9215,16 +9215,16 @@ static void atkB7_presentdamagecalculation(void)
 
 static void atkB8_setsafeguard(void)
 {
-    if (gSideStatuses[GET_BANK_SIDE(gBankAttacker)] & SIDE_STATUS_SAFEGUARD)
+    if (gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] & SIDE_STATUS_SAFEGUARD)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideStatuses[GET_BANK_SIDE(gBankAttacker)] |= SIDE_STATUS_SAFEGUARD;
-        gSideTimers[GET_BANK_SIDE(gBankAttacker)].safeguardTimer = 5;
-        gSideTimers[GET_BANK_SIDE(gBankAttacker)].safeguardBank = gBankAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] |= SIDE_STATUS_SAFEGUARD;
+        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].safeguardTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].safeguardBank = gBattleAttacker;
         gBattleCommunication[MULTISTRING_CHOOSER] = 5;
     }
 
@@ -9274,11 +9274,11 @@ static void atkB9_magnitudedamagecalculation(void)
 
     PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 2, magnitude)
 
-    for (gBankDefender = 0; gBankDefender < gBattleBanksCount; gBankDefender++)
+    for (gBattleDefender = 0; gBattleDefender < gBattlersCount; gBattleDefender++)
     {
-        if (gBankDefender == gBankAttacker)
+        if (gBattleDefender == gBattleAttacker)
             continue;
-        if (!(gAbsentBankFlags & gBitTable[gBankDefender])) // a valid target was found
+        if (!(gAbsentBattlerFlags & gBitTable[gBattleDefender])) // a valid target was found
             break;
     }
 
@@ -9289,36 +9289,36 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
 {
     if (gMultiHitCounter == 1)
     {
-        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-            gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+            gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         else
-            gBankDefender = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+            gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     }
     else
     {
-        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-            gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+            gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
         else
-            gBankDefender = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+            gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
     }
 
-    if (gActionForBanks[gBankDefender] == ACTION_USE_MOVE
-        && gBankAttacker == *(gBattleStruct->moveTarget + gBankDefender)
-        && !(gBattleMons[gBankDefender].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
-        && gBattleMons[gBankAttacker].hp
-        && !gDisableStructs[gBankDefender].truantCounter
-        && gChosenMovesByBanks[gBankDefender] == MOVE_PURSUIT)
+    if (gActionForBanks[gBattleDefender] == ACTION_USE_MOVE
+        && gBattleAttacker == *(gBattleStruct->moveTarget + gBattleDefender)
+        && !(gBattleMons[gBattleDefender].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
+        && gBattleMons[gBattleAttacker].hp
+        && !gDisableStructs[gBattleDefender].truantCounter
+        && gChosenMovesByBanks[gBattleDefender] == MOVE_PURSUIT)
     {
         s32 i;
 
-        for (i = 0; i < gBattleBanksCount; i++)
+        for (i = 0; i < gBattlersCount; i++)
         {
-            if (gBanksByTurnOrder[i] == gBankDefender)
+            if (gBattleTurnOrder[i] == gBattleDefender)
                 gActionsByTurnOrder[i] = 11;
         }
 
         gCurrentMove = MOVE_PURSUIT;
-        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBankDefender);
+        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattleDefender);
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
@@ -9348,16 +9348,16 @@ static void atkBB_setsunny(void)
 
 static void atkBC_maxattackhalvehp(void) // belly drum
 {
-    u32 halfHp = gBattleMons[gBankAttacker].maxHP / 2;
+    u32 halfHp = gBattleMons[gBattleAttacker].maxHP / 2;
 
-    if (!(gBattleMons[gBankAttacker].maxHP / 2))
+    if (!(gBattleMons[gBattleAttacker].maxHP / 2))
         halfHp = 1;
 
-    if (gBattleMons[gBankAttacker].statStages[STAT_STAGE_ATK] < 12
-        && gBattleMons[gBankAttacker].hp > halfHp)
+    if (gBattleMons[gBattleAttacker].statStages[STAT_STAGE_ATK] < 12
+        && gBattleMons[gBattleAttacker].hp > halfHp)
     {
-        gBattleMons[gBankAttacker].statStages[STAT_STAGE_ATK] = 12;
-        gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 2;
+        gBattleMons[gBattleAttacker].statStages[STAT_STAGE_ATK] = 12;
+        gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
@@ -9375,7 +9375,7 @@ static void atkBD_copyfoestats(void) // psych up
 
     for (i = 0; i < BATTLE_STATS_NO; i++)
     {
-        gBattleMons[gBankAttacker].statStages[i] = gBattleMons[gBankDefender].statStages[i];
+        gBattleMons[gBattleAttacker].statStages[i] = gBattleMons[gBattleDefender].statStages[i];
     }
 
     gBattlescriptCurrInstr += 5; // Has an unused jump ptr(possibly for a failed attempt) parameter.
@@ -9383,32 +9383,32 @@ static void atkBD_copyfoestats(void) // psych up
 
 static void atkBE_rapidspinfree(void)
 {
-    if (gBattleMons[gBankAttacker].status2 & STATUS2_WRAPPED)
+    if (gBattleMons[gBattleAttacker].status2 & STATUS2_WRAPPED)
     {
-        gBattleScripting.bank = gBankDefender;
-        gBattleMons[gBankAttacker].status2 &= ~(STATUS2_WRAPPED);
-        gBankDefender = *(gBattleStruct->wrappedBy + gBankAttacker);
+        gBattleScripting.battler = gBattleDefender;
+        gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_WRAPPED);
+        gBattleDefender = *(gBattleStruct->wrappedBy + gBattleAttacker);
 
         gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN;
         gBattleTextBuff1[1] = B_BUFF_MOVE;
-        gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gBankAttacker * 2 + 0);
-        gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gBankAttacker * 2 + 1);
+        gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gBattleAttacker * 2 + 0);
+        gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gBattleAttacker * 2 + 1);
         gBattleTextBuff1[4] = B_BUFF_EOS;
 
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_WrapFree;
     }
-    else if (gStatuses3[gBankAttacker] & STATUS3_LEECHSEED)
+    else if (gStatuses3[gBattleAttacker] & STATUS3_LEECHSEED)
     {
-        gStatuses3[gBankAttacker] &= ~(STATUS3_LEECHSEED);
-        gStatuses3[gBankAttacker] &= ~(STATUS3_LEECHSEED_BANK);
+        gStatuses3[gBattleAttacker] &= ~(STATUS3_LEECHSEED);
+        gStatuses3[gBattleAttacker] &= ~(STATUS3_LEECHSEED_BANK);
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_LeechSeedFree;
     }
-    else if (gSideStatuses[GetBankSide(gBankAttacker)] & SIDE_STATUS_SPIKES)
+    else if (gSideStatuses[GetBattlerSide(gBattleAttacker)] & SIDE_STATUS_SPIKES)
     {
-        gSideStatuses[GetBankSide(gBankAttacker)] &= ~(SIDE_STATUS_SPIKES);
-        gSideTimers[GetBankSide(gBankAttacker)].spikesAmount = 0;
+        gSideStatuses[GetBattlerSide(gBattleAttacker)] &= ~(SIDE_STATUS_SPIKES);
+        gSideTimers[GetBattlerSide(gBattleAttacker)].spikesAmount = 0;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_SpikesFree;
     }
@@ -9420,22 +9420,22 @@ static void atkBE_rapidspinfree(void)
 
 static void atkBF_setdefensecurlbit(void)
 {
-    gBattleMons[gBankAttacker].status2 |= STATUS2_DEFENSE_CURL;
+    gBattleMons[gBattleAttacker].status2 |= STATUS2_DEFENSE_CURL;
     gBattlescriptCurrInstr++;
 }
 
 static void atkC0_recoverbasedonsunlight(void)
 {
-    gBankDefender = gBankAttacker;
+    gBattleDefender = gBattleAttacker;
 
-    if (gBattleMons[gBankAttacker].hp != gBattleMons[gBankAttacker].maxHP)
+    if (gBattleMons[gBattleAttacker].hp != gBattleMons[gBattleAttacker].maxHP)
     {
         if (gBattleWeather == 0 || !WEATHER_HAS_EFFECT)
-            gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 2;
+            gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 2;
         else if (gBattleWeather & WEATHER_SUN_ANY)
-            gBattleMoveDamage = 20 * gBattleMons[gBankAttacker].maxHP / 30;
+            gBattleMoveDamage = 20 * gBattleMons[gBattleAttacker].maxHP / 30;
         else // not sunny weather
-            gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 4;
+            gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 4;
 
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
@@ -9455,19 +9455,19 @@ static void atkC1_hiddenpowercalc(void)
     u32 powerBits = 0;
     u32 typeBits = 0;
 
-    powerBits |= ((gBattleMons[gBankAttacker].hpIV & 2) >> 1);
-    powerBits |= ((gBattleMons[gBankAttacker].attackIV & 2) << 0);
-    powerBits |= ((gBattleMons[gBankAttacker].defenseIV & 2) << 1);
-    powerBits |= ((gBattleMons[gBankAttacker].speedIV & 2) << 2);
-    powerBits |= ((gBattleMons[gBankAttacker].spAttackIV & 2) << 3);
-    powerBits |= ((gBattleMons[gBankAttacker].spDefenseIV & 2) << 4);
+    powerBits |= ((gBattleMons[gBattleAttacker].hpIV & 2) >> 1);
+    powerBits |= ((gBattleMons[gBattleAttacker].attackIV & 2) << 0);
+    powerBits |= ((gBattleMons[gBattleAttacker].defenseIV & 2) << 1);
+    powerBits |= ((gBattleMons[gBattleAttacker].speedIV & 2) << 2);
+    powerBits |= ((gBattleMons[gBattleAttacker].spAttackIV & 2) << 3);
+    powerBits |= ((gBattleMons[gBattleAttacker].spDefenseIV & 2) << 4);
 
-    typeBits |= ((gBattleMons[gBankAttacker].hpIV & 1) << 0);
-    typeBits |= ((gBattleMons[gBankAttacker].attackIV & 1) << 1);
-    typeBits |= ((gBattleMons[gBankAttacker].defenseIV & 1) << 2);
-    typeBits |= ((gBattleMons[gBankAttacker].speedIV & 1) << 3);
-    typeBits |= ((gBattleMons[gBankAttacker].spAttackIV & 1) << 4);
-    typeBits |= ((gBattleMons[gBankAttacker].spDefenseIV & 1) << 5);
+    typeBits |= ((gBattleMons[gBattleAttacker].hpIV & 1) << 0);
+    typeBits |= ((gBattleMons[gBattleAttacker].attackIV & 1) << 1);
+    typeBits |= ((gBattleMons[gBattleAttacker].defenseIV & 1) << 2);
+    typeBits |= ((gBattleMons[gBattleAttacker].speedIV & 1) << 3);
+    typeBits |= ((gBattleMons[gBattleAttacker].spAttackIV & 1) << 4);
+    typeBits |= ((gBattleMons[gBattleAttacker].spDefenseIV & 1) << 5);
 
     gDynamicBasePower = (40 * powerBits) / 63 + 30;
 
@@ -9490,7 +9490,7 @@ static void atkC1_hiddenpowercalc(void)
 	mov r5, r8\n\
 	push {r5-r7}\n\
 	ldr r2, =gBattleMons\n\
-	ldr r0, =gBankAttacker\n\
+	ldr r0, =gBattleAttacker\n\
 	ldrb r1, [r0]\n\
 	movs r0, 0x58\n\
 	adds r4, r1, 0\n\
@@ -9626,11 +9626,11 @@ _080544F0:\n\
 
 static void atkC2_selectfirstvalidtarget(void)
 {
-    for (gBankDefender = 0; gBankDefender < gBattleBanksCount; gBankDefender++)
+    for (gBattleDefender = 0; gBattleDefender < gBattlersCount; gBattleDefender++)
     {
-        if (gBankDefender == gBankAttacker)
+        if (gBattleDefender == gBattleAttacker)
             continue;
-        if (!(gAbsentBankFlags & gBitTable[gBankDefender]))
+        if (!(gAbsentBattlerFlags & gBitTable[gBattleDefender]))
             break;
     }
     gBattlescriptCurrInstr++;
@@ -9638,22 +9638,22 @@ static void atkC2_selectfirstvalidtarget(void)
 
 static void atkC3_trysetfutureattack(void)
 {
-    if (gWishFutureKnock.futureSightCounter[gBankDefender] != 0)
+    if (gWishFutureKnock.futureSightCounter[gBattleDefender] != 0)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gSideStatuses[GET_BANK_SIDE(gBankDefender)] |= SIDE_STATUS_FUTUREATTACK;
-        gWishFutureKnock.futureSightMove[gBankDefender] = gCurrentMove;
-        gWishFutureKnock.futureSightAttacker[gBankDefender] = gBankAttacker;
-        gWishFutureKnock.futureSightCounter[gBankDefender] = 3;
-        gWishFutureKnock.futureSightDmg[gBankDefender] = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankDefender], gCurrentMove,
-                                                    gSideStatuses[GET_BANK_SIDE(gBankDefender)], 0,
-                                                    0, gBankAttacker, gBankDefender);
+        gSideStatuses[GET_BATTLER_SIDE(gBattleDefender)] |= SIDE_STATUS_FUTUREATTACK;
+        gWishFutureKnock.futureSightMove[gBattleDefender] = gCurrentMove;
+        gWishFutureKnock.futureSightAttacker[gBattleDefender] = gBattleAttacker;
+        gWishFutureKnock.futureSightCounter[gBattleDefender] = 3;
+        gWishFutureKnock.futureSightDmg[gBattleDefender] = CalculateBaseDamage(&gBattleMons[gBattleAttacker], &gBattleMons[gBattleDefender], gCurrentMove,
+                                                    gSideStatuses[GET_BATTLER_SIDE(gBattleDefender)], 0,
+                                                    0, gBattleAttacker, gBattleDefender);
 
-        if (gProtectStructs[gBankAttacker].helpingHand)
-            gWishFutureKnock.futureSightDmg[gBankDefender] = gWishFutureKnock.futureSightDmg[gBankDefender] * 15 / 10;
+        if (gProtectStructs[gBattleAttacker].helpingHand)
+            gWishFutureKnock.futureSightDmg[gBattleDefender] = gWishFutureKnock.futureSightDmg[gBattleDefender] * 15 / 10;
 
         if (gCurrentMove == MOVE_DOOM_DESIRE)
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -9668,12 +9668,12 @@ static void atkC4_trydobeatup(void)
 {
     struct Pokemon *party;
 
-    if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+    if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
 
-    if (gBattleMons[gBankDefender].hp == 0)
+    if (gBattleMons[gBattleDefender].hp == 0)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -9690,16 +9690,16 @@ static void atkC4_trydobeatup(void)
         }
         if (gBattleCommunication[0] < 6)
         {
-            PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBankAttacker, gBattleCommunication[0])
+            PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleAttacker, gBattleCommunication[0])
 
             gBattlescriptCurrInstr += 9;
 
             gBattleMoveDamage = gBaseStats[GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES)].baseAttack;
             gBattleMoveDamage *= gBattleMoves[gCurrentMove].power;
             gBattleMoveDamage *= (GetMonData(&party[gBattleCommunication[0]], MON_DATA_LEVEL) * 2 / 5 + 2);
-            gBattleMoveDamage /= gBaseStats[gBattleMons[gBankDefender].species].baseDefense;
+            gBattleMoveDamage /= gBaseStats[gBattleMons[gBattleDefender].species].baseDefense;
             gBattleMoveDamage = (gBattleMoveDamage / 50) + 2;
-            if (gProtectStructs[gBankAttacker].helpingHand)
+            if (gProtectStructs[gBattleAttacker].helpingHand)
                 gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
 
             gBattleCommunication[0]++;
@@ -9717,13 +9717,13 @@ static void atkC5_setsemiinvulnerablebit(void)
     {
     case MOVE_FLY:
     case MOVE_BOUNCE:
-        gStatuses3[gBankAttacker] |= STATUS3_ON_AIR;
+        gStatuses3[gBattleAttacker] |= STATUS3_ON_AIR;
         break;
     case MOVE_DIG:
-        gStatuses3[gBankAttacker] |= STATUS3_UNDERGROUND;
+        gStatuses3[gBattleAttacker] |= STATUS3_UNDERGROUND;
         break;
     case MOVE_DIVE:
-        gStatuses3[gBankAttacker] |= STATUS3_UNDERWATER;
+        gStatuses3[gBattleAttacker] |= STATUS3_UNDERWATER;
         break;
     }
 
@@ -9736,13 +9736,13 @@ static void atkC6_clearsemiinvulnerablebit(void)
     {
     case MOVE_FLY:
     case MOVE_BOUNCE:
-        gStatuses3[gBankAttacker] &= ~STATUS3_ON_AIR;
+        gStatuses3[gBattleAttacker] &= ~STATUS3_ON_AIR;
         break;
     case MOVE_DIG:
-        gStatuses3[gBankAttacker] &= ~STATUS3_UNDERGROUND;
+        gStatuses3[gBattleAttacker] &= ~STATUS3_UNDERGROUND;
         break;
     case MOVE_DIVE:
-        gStatuses3[gBankAttacker] &= ~STATUS3_UNDERWATER;
+        gStatuses3[gBattleAttacker] &= ~STATUS3_UNDERWATER;
         break;
     }
 
@@ -9752,7 +9752,7 @@ static void atkC6_clearsemiinvulnerablebit(void)
 static void atkC7_setminimize(void)
 {
     if (gHitMarker & HITMARKER_OBEYS)
-        gStatuses3[gBankAttacker] |= STATUS3_MINIMIZED;
+        gStatuses3[gBattleAttacker] |= STATUS3_MINIMIZED;
 
     gBattlescriptCurrInstr++;
 }
@@ -9776,34 +9776,34 @@ static void atkC8_sethail(void)
 
 static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento
 {
-    if (gBattleMons[gBankDefender].statStages[STAT_STAGE_ATK] == 0
-        && gBattleMons[gBankDefender].statStages[STAT_STAGE_SPATK] == 0
+    if (gBattleMons[gBattleDefender].statStages[STAT_STAGE_ATK] == 0
+        && gBattleMons[gBattleDefender].statStages[STAT_STAGE_SPATK] == 0
         && gBattleCommunication[6] != 1)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gActiveBank = gBankAttacker;
-        gBattleMoveDamage = gBattleMons[gActiveBank].hp;
+        gActiveBattler = gBattleAttacker;
+        gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
         EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkCA_setforcedtarget(void) // follow me
 {
-    gSideTimers[GetBankSide(gBankAttacker)].followmeTimer = 1;
-    gSideTimers[GetBankSide(gBankAttacker)].followmeTarget = gBankAttacker;
+    gSideTimers[GetBattlerSide(gBattleAttacker)].followmeTimer = 1;
+    gSideTimers[GetBattlerSide(gBattleAttacker)].followmeTarget = gBattleAttacker;
     gBattlescriptCurrInstr++;
 }
 
 static void atkCB_setcharge(void)
 {
-    gStatuses3[gBankAttacker] |= STATUS3_CHARGED_UP;
-    gDisableStructs[gBankAttacker].chargeTimer1 = 2;
-    gDisableStructs[gBankAttacker].chargeTimer2 = 2;
+    gStatuses3[gBattleAttacker] |= STATUS3_CHARGED_UP;
+    gDisableStructs[gBattleAttacker].chargeTimer1 = 2;
+    gDisableStructs[gBattleAttacker].chargeTimer2 = 2;
     gBattlescriptCurrInstr++;
 }
 
@@ -9811,20 +9811,20 @@ static void atkCC_callterrainattack(void) // nature power
 {
     gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
     gCurrentMove = sNaturePowerMoves[gBattleTerrain];
-    gBankDefender = GetMoveTarget(gCurrentMove, 0);
+    gBattleDefender = GetMoveTarget(gCurrentMove, 0);
     BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
     gBattlescriptCurrInstr++;
 }
 
 static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
 {
-    if (gBattleMons[gBankAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
+    if (gBattleMons[gBattleAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
     {
-        gBattleMons[gBankAttacker].status1 = 0;
+        gBattleMons[gBattleAttacker].status1 = 0;
         gBattlescriptCurrInstr += 5;
-        gActiveBank = gBankAttacker;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = gBattleAttacker;
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBufferBankForExecution(gActiveBattler);
     }
     else
     {
@@ -9834,20 +9834,20 @@ static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
 
 static void atkCE_settorment(void)
 {
-    if (gBattleMons[gBankDefender].status2 & STATUS2_TORMENT)
+    if (gBattleMons[gBattleDefender].status2 & STATUS2_TORMENT)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMons[gBankDefender].status2 |= STATUS2_TORMENT;
+        gBattleMons[gBattleDefender].status2 |= STATUS2_TORMENT;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkCF_jumpifnodamage(void)
 {
-    if (gProtectStructs[gBankAttacker].physicalDmg || gProtectStructs[gBankAttacker].specialDmg)
+    if (gProtectStructs[gBattleAttacker].physicalDmg || gProtectStructs[gBattleAttacker].specialDmg)
         gBattlescriptCurrInstr += 5;
     else
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
@@ -9855,10 +9855,10 @@ static void atkCF_jumpifnodamage(void)
 
 static void atkD0_settaunt(void)
 {
-    if (gDisableStructs[gBankDefender].tauntTimer1 == 0)
+    if (gDisableStructs[gBattleDefender].tauntTimer1 == 0)
     {
-        gDisableStructs[gBankDefender].tauntTimer1 = 2;
-        gDisableStructs[gBankDefender].tauntTimer2 = 2;
+        gDisableStructs[gBattleDefender].tauntTimer1 = 2;
+        gDisableStructs[gBattleDefender].tauntTimer2 = 2;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9869,14 +9869,14 @@ static void atkD0_settaunt(void)
 
 static void atkD1_trysethelpinghand(void)
 {
-    gBankDefender = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_MON);
+    gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_FLANK);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-        && !(gAbsentBankFlags & gBitTable[gBankDefender])
-        && !gProtectStructs[gBankAttacker].helpingHand
-        && !gProtectStructs[gBankDefender].helpingHand)
+        && !(gAbsentBattlerFlags & gBitTable[gBattleDefender])
+        && !gProtectStructs[gBattleAttacker].helpingHand
+        && !gProtectStructs[gBattleDefender].helpingHand)
     {
-        gProtectStructs[gBankDefender].helpingHand = 1;
+        gProtectStructs[gBattleDefender].helpingHand = 1;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9889,7 +9889,7 @@ static void atkD2_tryswapitems(void) // trick
 {
     // opponent can't swap items with player in regular battles
     if (gBattleTypeFlags & BATTLE_TYPE_x4000000
-        || (GetBankSide(gBankAttacker) == SIDE_OPPONENT
+        || (GetBattlerSide(gBattleAttacker) == B_SIDE_OPPONENT
             && !(gBattleTypeFlags & (BATTLE_TYPE_LINK
                                   | BATTLE_TYPE_EREADER_TRAINER
                                   | BATTLE_TYPE_FRONTIER
@@ -9900,8 +9900,8 @@ static void atkD2_tryswapitems(void) // trick
     }
     else
     {
-        u8 sideAttacker = GetBankSide(gBankAttacker);
-        u8 sideTarget = GetBankSide(gBankDefender);
+        u8 sideAttacker = GetBattlerSide(gBattleAttacker);
+        u8 sideTarget = GetBattlerSide(gBattleDefender);
 
         // you can't swap items if they were knocked off in regular battles
         if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
@@ -9909,53 +9909,53 @@ static void atkD2_tryswapitems(void) // trick
                              | BATTLE_TYPE_FRONTIER
                              | BATTLE_TYPE_SECRET_BASE
                              | BATTLE_TYPE_x2000000))
-            && (gWishFutureKnock.knockedOffPokes[sideAttacker] & gBitTable[gBattlePartyID[gBankAttacker]]
-                || gWishFutureKnock.knockedOffPokes[sideTarget] & gBitTable[gBattlePartyID[gBankDefender]]))
+            && (gWishFutureKnock.knockedOffPokes[sideAttacker] & gBitTable[gBattlePartyID[gBattleAttacker]]
+                || gWishFutureKnock.knockedOffPokes[sideTarget] & gBitTable[gBattlePartyID[gBattleDefender]]))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         // can't swap if two pokemon don't have an item
         // or if either of them is an enigma berry or a mail
-        else if ((gBattleMons[gBankAttacker].item == 0 && gBattleMons[gBankDefender].item == 0)
-                 || gBattleMons[gBankAttacker].item == ITEM_ENIGMA_BERRY
-                 || gBattleMons[gBankDefender].item == ITEM_ENIGMA_BERRY
-                 || IS_ITEM_MAIL(gBattleMons[gBankAttacker].item)
-                 || IS_ITEM_MAIL(gBattleMons[gBankDefender].item))
+        else if ((gBattleMons[gBattleAttacker].item == 0 && gBattleMons[gBattleDefender].item == 0)
+                 || gBattleMons[gBattleAttacker].item == ITEM_ENIGMA_BERRY
+                 || gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY
+                 || IS_ITEM_MAIL(gBattleMons[gBattleAttacker].item)
+                 || IS_ITEM_MAIL(gBattleMons[gBattleDefender].item))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         // check if ability prevents swapping
-        else if (gBattleMons[gBankDefender].ability == ABILITY_STICKY_HOLD)
+        else if (gBattleMons[gBattleDefender].ability == ABILITY_STICKY_HOLD)
         {
             gBattlescriptCurrInstr = BattleScript_StickyHoldActivates;
-            gLastUsedAbility = gBattleMons[gBankDefender].ability;
-            RecordAbilityBattle(gBankDefender, gLastUsedAbility);
+            gLastUsedAbility = gBattleMons[gBattleDefender].ability;
+            RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
         }
         // took a while, but all checks passed and items can be safely swapped
         else
         {
             u16 oldItemAtk, *newItemAtk;
 
-            newItemAtk = &gBattleStruct->changedItems[gBankAttacker];
-            oldItemAtk = gBattleMons[gBankAttacker].item;
-            *newItemAtk = gBattleMons[gBankDefender].item;
+            newItemAtk = &gBattleStruct->changedItems[gBattleAttacker];
+            oldItemAtk = gBattleMons[gBattleAttacker].item;
+            *newItemAtk = gBattleMons[gBattleDefender].item;
 
-            gBattleMons[gBankAttacker].item = 0;
-            gBattleMons[gBankDefender].item = oldItemAtk;
+            gBattleMons[gBattleAttacker].item = 0;
+            gBattleMons[gBattleDefender].item = oldItemAtk;
 
-            gActiveBank = gBankAttacker;
+            gActiveBattler = gBattleAttacker;
             EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, newItemAtk);
-            MarkBufferBankForExecution(gBankAttacker);
+            MarkBufferBankForExecution(gBattleAttacker);
 
-            gActiveBank = gBankDefender;
-            EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankDefender].item);
-            MarkBufferBankForExecution(gBankDefender);
+            gActiveBattler = gBattleDefender;
+            EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattleDefender].item);
+            MarkBufferBankForExecution(gBattleDefender);
 
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankDefender]) + 0) = 0;
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankDefender]) + 1) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleDefender]) + 0) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleDefender]) + 1) = 0;
 
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankAttacker]) + 0) = 0;
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBankAttacker]) + 1) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleAttacker]) + 0) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleAttacker]) + 1) = 0;
 
             gBattlescriptCurrInstr += 5;
 
@@ -9974,11 +9974,11 @@ static void atkD2_tryswapitems(void) // trick
 
 static void atkD3_trycopyability(void) // role play
 {
-    if (gBattleMons[gBankDefender].ability != 0
-        && gBattleMons[gBankDefender].ability != ABILITY_WONDER_GUARD)
+    if (gBattleMons[gBattleDefender].ability != 0
+        && gBattleMons[gBattleDefender].ability != ABILITY_WONDER_GUARD)
     {
-        gBattleMons[gBankAttacker].ability = gBattleMons[gBankDefender].ability;
-        gLastUsedAbility = gBattleMons[gBankDefender].ability;
+        gBattleMons[gBattleAttacker].ability = gBattleMons[gBattleDefender].ability;
+        gLastUsedAbility = gBattleMons[gBattleDefender].ability;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9992,10 +9992,10 @@ static void atkD4_trywish(void)
     switch (gBattlescriptCurrInstr[1])
     {
     case 0: // use wish
-        if (gWishFutureKnock.wishCounter[gBankAttacker] == 0)
+        if (gWishFutureKnock.wishCounter[gBattleAttacker] == 0)
         {
-            gWishFutureKnock.wishCounter[gBankAttacker] = 2;
-            gWishFutureKnock.wishUserID[gBankAttacker] = gBattlePartyID[gBankAttacker];
+            gWishFutureKnock.wishCounter[gBattleAttacker] = 2;
+            gWishFutureKnock.wishUserID[gBattleAttacker] = gBattlePartyID[gBattleAttacker];
             gBattlescriptCurrInstr += 6;
         }
         else
@@ -10004,14 +10004,14 @@ static void atkD4_trywish(void)
         }
         break;
     case 1: // heal effect
-        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBankDefender, gWishFutureKnock.wishUserID[gBankDefender])
+        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleDefender, gWishFutureKnock.wishUserID[gBattleDefender])
 
-        gBattleMoveDamage = gBattleMons[gBankDefender].maxHP / 2;
+        gBattleMoveDamage = gBattleMons[gBattleDefender].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
 
-        if (gBattleMons[gBankDefender].hp == gBattleMons[gBankDefender].maxHP)
+        if (gBattleMons[gBattleDefender].hp == gBattleMons[gBattleDefender].maxHP)
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
         else
             gBattlescriptCurrInstr += 6;
@@ -10022,23 +10022,23 @@ static void atkD4_trywish(void)
 
 static void atkD5_trysetroots(void) // ingrain
 {
-    if (gStatuses3[gBankAttacker] & STATUS3_ROOTED)
+    if (gStatuses3[gBattleAttacker] & STATUS3_ROOTED)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gStatuses3[gBankAttacker] |= STATUS3_ROOTED;
+        gStatuses3[gBattleAttacker] |= STATUS3_ROOTED;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkD6_doubledamagedealtifdamaged(void)
 {
-    if ((gProtectStructs[gBankAttacker].physicalDmg
-         && gProtectStructs[gBankAttacker].physicalBank == gBankDefender)
-        || (gProtectStructs[gBankAttacker].specialDmg
-            && gProtectStructs[gBankAttacker].specialBank == gBankDefender))
+    if ((gProtectStructs[gBattleAttacker].physicalDmg
+         && gProtectStructs[gBattleAttacker].physicalBank == gBattleDefender)
+        || (gProtectStructs[gBattleAttacker].specialDmg
+            && gProtectStructs[gBattleAttacker].specialBank == gBattleDefender))
     {
         gBattleScripting.dmgMultiplier = 2;
     }
@@ -10048,27 +10048,27 @@ static void atkD6_doubledamagedealtifdamaged(void)
 
 static void atkD7_setyawn(void)
 {
-    if (gStatuses3[gBankDefender] & STATUS3_YAWN
-        || gBattleMons[gBankDefender].status1 & STATUS1_ANY)
+    if (gStatuses3[gBattleDefender] & STATUS3_YAWN
+        || gBattleMons[gBattleDefender].status1 & STATUS1_ANY)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gStatuses3[gBankDefender] |= 0x1000;
+        gStatuses3[gBattleDefender] |= 0x1000;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkD8_setdamagetohealthdifference(void)
 {
-    if (gBattleMons[gBankDefender].hp <= gBattleMons[gBankAttacker].hp)
+    if (gBattleMons[gBattleDefender].hp <= gBattleMons[gBattleAttacker].hp)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMoveDamage = gBattleMons[gBankDefender].hp - gBattleMons[gBankAttacker].hp;
+        gBattleMoveDamage = gBattleMons[gBattleDefender].hp - gBattleMons[gBattleAttacker].hp;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -10078,7 +10078,7 @@ static void atkD9_scaledamagebyhealthratio(void)
     if (gDynamicBasePower == 0)
     {
         u8 power = gBattleMoves[gCurrentMove].power;
-        gDynamicBasePower = gBattleMons[gBankAttacker].hp * power / gBattleMons[gBankAttacker].maxHP;
+        gDynamicBasePower = gBattleMons[gBattleAttacker].hp * power / gBattleMons[gBattleAttacker].maxHP;
         if (gDynamicBasePower == 0)
             gDynamicBasePower = 1;
     }
@@ -10087,19 +10087,19 @@ static void atkD9_scaledamagebyhealthratio(void)
 
 static void atkDA_tryswapabilities(void) // skill swap
 {
-    if ((gBattleMons[gBankAttacker].ability == 0
-         && gBattleMons[gBankDefender].ability == 0)
-     || gBattleMons[gBankAttacker].ability == ABILITY_WONDER_GUARD
-     || gBattleMons[gBankDefender].ability == ABILITY_WONDER_GUARD
+    if ((gBattleMons[gBattleAttacker].ability == 0
+         && gBattleMons[gBattleDefender].ability == 0)
+     || gBattleMons[gBattleAttacker].ability == ABILITY_WONDER_GUARD
+     || gBattleMons[gBattleDefender].ability == ABILITY_WONDER_GUARD
      || gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
      {
          gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
      }
     else
     {
-        u8 abilityAtk = gBattleMons[gBankAttacker].ability;
-        gBattleMons[gBankAttacker].ability = gBattleMons[gBankDefender].ability;
-        gBattleMons[gBankDefender].ability = abilityAtk;
+        u8 abilityAtk = gBattleMons[gBattleAttacker].ability;
+        gBattleMons[gBattleAttacker].ability = gBattleMons[gBattleDefender].ability;
+        gBattleMons[gBattleDefender].ability = abilityAtk;
 
             gBattlescriptCurrInstr += 5;
     }
@@ -10107,7 +10107,7 @@ static void atkDA_tryswapabilities(void) // skill swap
 
 static void atkDB_tryimprision(void)
 {
-    if ((gStatuses3[gBankAttacker] & STATUS3_IMPRISONED_OTHERS))
+    if ((gStatuses3[gBattleAttacker] & STATUS3_IMPRISONED_OTHERS))
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -10115,11 +10115,11 @@ static void atkDB_tryimprision(void)
     {
         u8 bank, sideAttacker;
 
-        sideAttacker = GetBankSide(gBankAttacker);
-        PressurePPLoseOnUsingImprision(gBankAttacker);
-        for (bank = 0; bank < gBattleBanksCount; bank++)
+        sideAttacker = GetBattlerSide(gBattleAttacker);
+        PressurePPLoseOnUsingImprision(gBattleAttacker);
+        for (bank = 0; bank < gBattlersCount; bank++)
         {
-            if (sideAttacker != GetBankSide(bank))
+            if (sideAttacker != GetBattlerSide(bank))
             {
                 s32 attackerMoveId;
                 for (attackerMoveId = 0; attackerMoveId < 4; attackerMoveId++)
@@ -10127,8 +10127,8 @@ static void atkDB_tryimprision(void)
                     s32 i;
                     for (i = 0; i < 4; i++)
                     {
-                        if (gBattleMons[gBankAttacker].moves[attackerMoveId] == gBattleMons[bank].moves[i]
-                            && gBattleMons[gBankAttacker].moves[attackerMoveId] != MOVE_NONE)
+                        if (gBattleMons[gBattleAttacker].moves[attackerMoveId] == gBattleMons[bank].moves[i]
+                            && gBattleMons[gBattleAttacker].moves[attackerMoveId] != MOVE_NONE)
                             break;
                     }
                     if (i != 4)
@@ -10136,26 +10136,26 @@ static void atkDB_tryimprision(void)
                 }
                 if (attackerMoveId != 4)
                 {
-                    gStatuses3[gBankAttacker] |= STATUS3_IMPRISONED_OTHERS;
+                    gStatuses3[gBattleAttacker] |= STATUS3_IMPRISONED_OTHERS;
                     gBattlescriptCurrInstr += 5;
                     break;
                 }
             }
         }
-        if (bank == gBattleBanksCount) // In Generation 3 games, Imprison fails if the user doesn't share any moves with any of the foes
+        if (bank == gBattlersCount) // In Generation 3 games, Imprison fails if the user doesn't share any moves with any of the foes
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
 
 static void atkDC_trysetgrudge(void)
 {
-    if (gStatuses3[gBankAttacker] & STATUS3_GRUDGE)
+    if (gStatuses3[gBattleAttacker] & STATUS3_GRUDGE)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gStatuses3[gBankAttacker] |= STATUS3_GRUDGE;
+        gStatuses3[gBattleAttacker] |= STATUS3_GRUDGE;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -10165,7 +10165,7 @@ static void atkDD_weightdamagecalculation(void)
     s32 i;
     for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2)
     {
-        if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBankDefender].species), 1))
+        if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattleDefender].species), 1))
             break;
     }
 
@@ -10184,14 +10184,14 @@ static void atkDE_asistattackselect(void)
     s32 monId, moveId;
     u16* movesArray = gBattleStruct->assistPossibleMoves;
 
-    if (GET_BANK_SIDE(gBankAttacker) != SIDE_PLAYER)
+    if (GET_BATTLER_SIDE(gBattleAttacker) != B_SIDE_PLAYER)
         party = gEnemyParty;
     else
         party = gPlayerParty;
 
     for (monId = 0; monId < 6; monId++)
     {
-        if (monId == gBattlePartyID[gBankAttacker])
+        if (monId == gBattlePartyID[gBattleAttacker])
             continue;
         if (GetMonData(&party[monId], MON_DATA_SPECIES2) == SPECIES_NONE)
             continue;
@@ -10221,7 +10221,7 @@ static void atkDE_asistattackselect(void)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gRandomMove = movesArray[((Random() & 0xFF) * chooseableMovesNo) >> 8];
-        gBankDefender = GetMoveTarget(gRandomMove, 0);
+        gBattleDefender = GetMoveTarget(gRandomMove, 0);
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -10232,29 +10232,29 @@ static void atkDE_asistattackselect(void)
 
 static void atkDF_trysetmagiccoat(void)
 {
-    gBankDefender = gBankAttacker;
-    gSpecialStatuses[gBankAttacker].flag20 = 1;
-    if (gCurrentTurnActionNumber == gBattleBanksCount - 1) // moves last turn
+    gBattleDefender = gBattleAttacker;
+    gSpecialStatuses[gBattleAttacker].flag20 = 1;
+    if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gProtectStructs[gBankAttacker].bounceMove = 1;
+        gProtectStructs[gBattleAttacker].bounceMove = 1;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkE0_trysetsnatch(void) // snatch
 {
-    gSpecialStatuses[gBankAttacker].flag20 = 1;
-    if (gCurrentTurnActionNumber == gBattleBanksCount - 1) // moves last turn
+    gSpecialStatuses[gBattleAttacker].flag20 = 1;
+    if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gProtectStructs[gBankAttacker].stealMove = 1;
+        gProtectStructs[gBattleAttacker].stealMove = 1;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -10263,20 +10263,20 @@ static void atkE1_trygetintimidatetarget(void)
 {
     u8 side;
 
-    gBattleScripting.bank = gBattleStruct->intimidateBank;
-    side = GetBankSide(gBattleScripting.bank);
+    gBattleScripting.battler = gBattleStruct->intimidateBank;
+    side = GetBattlerSide(gBattleScripting.battler);
 
-    PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gBattleMons[gBattleScripting.bank].ability)
+    PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gBattleMons[gBattleScripting.battler].ability)
 
-    for (;gBankDefender < gBattleBanksCount; gBankDefender++)
+    for (;gBattleDefender < gBattlersCount; gBattleDefender++)
     {
-        if (GetBankSide(gBankDefender) == side)
+        if (GetBattlerSide(gBattleDefender) == side)
             continue;
-        if (!(gAbsentBankFlags & gBitTable[gBankDefender]))
+        if (!(gAbsentBattlerFlags & gBitTable[gBattleDefender]))
             break;
     }
 
-    if (gBankDefender >= gBattleBanksCount)
+    if (gBattleDefender >= gBattlersCount)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -10284,14 +10284,14 @@ static void atkE1_trygetintimidatetarget(void)
 
 static void atkE2_switchoutabilities(void)
 {
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-    switch (gBattleMons[gActiveBank].ability)
+    switch (gBattleMons[gActiveBattler].ability)
     {
     case ABILITY_NATURAL_CURE:
-        gBattleMons[gActiveBank].status1 = 0;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[*(gBattleStruct->field_58 + gActiveBank)], 4, &gBattleMons[gActiveBank].status1);
-        MarkBufferBankForExecution(gActiveBank);
+        gBattleMons[gActiveBattler].status1 = 0;
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[*(gBattleStruct->field_58 + gActiveBattler)], 4, &gBattleMons[gActiveBattler].status1);
+        MarkBufferBankForExecution(gActiveBattler);
         break;
     }
 
@@ -10300,9 +10300,9 @@ static void atkE2_switchoutabilities(void)
 
 static void atkE3_jumpifhasnohp(void)
 {
-    gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-    if (gBattleMons[gActiveBank].hp == 0)
+    if (gBattleMons[gActiveBattler].hp == 0)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
     else
         gBattlescriptCurrInstr += 6;
@@ -10421,13 +10421,13 @@ static void atkE5_pickup(void)
 
 static void atkE6_docastformchangeanimation(void)
 {
-    gActiveBank = gBattleScripting.bank;
+    gActiveBattler = gBattleScripting.battler;
 
-    if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE)
         *(&gBattleStruct->formToChangeInto) |= 0x80;
 
     EmitBattleAnimation(0, B_ANIM_CASTFORM_CHANGE, gBattleStruct->formToChangeInto);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr++;
 }
@@ -10437,7 +10437,7 @@ static void atkE7_trycastformdatachange(void)
     u8 form;
 
     gBattlescriptCurrInstr++;
-    form = CastformDataTypeChange(gBattleScripting.bank);
+    form = CastformDataTypeChange(gBattleScripting.battler);
     if (form)
     {
         BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
@@ -10451,18 +10451,18 @@ static void atkE8_settypebasedhalvers(void) // water and mud sport
 
     if (gBattleMoves[gCurrentMove].effect == EFFECT_MUD_SPORT)
     {
-        if (!(gStatuses3[gBankAttacker] & STATUS3_MUDSPORT))
+        if (!(gStatuses3[gBattleAttacker] & STATUS3_MUDSPORT))
         {
-            gStatuses3[gBankAttacker] |= STATUS3_MUDSPORT;
+            gStatuses3[gBattleAttacker] |= STATUS3_MUDSPORT;
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             worked = TRUE;
         }
     }
     else // water sport
     {
-        if (!(gStatuses3[gBankAttacker] & STATUS3_WATERSPORT))
+        if (!(gStatuses3[gBattleAttacker] & STATUS3_WATERSPORT))
         {
-            gStatuses3[gBankAttacker] |= STATUS3_WATERSPORT;
+            gStatuses3[gBattleAttacker] |= STATUS3_WATERSPORT;
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
             worked = TRUE;
         }
@@ -10499,16 +10499,16 @@ static void atkEA_tryrecycleitem(void)
 {
     u16 *usedHeldItem;
 
-    gActiveBank = gBankAttacker;
-    usedHeldItem = &gBattleStruct->usedHeldItems[gActiveBank];
-    if (*usedHeldItem != 0 && gBattleMons[gActiveBank].item == 0)
+    gActiveBattler = gBattleAttacker;
+    usedHeldItem = &gBattleStruct->usedHeldItems[gActiveBattler];
+    if (*usedHeldItem != 0 && gBattleMons[gActiveBattler].item == 0)
     {
         gLastUsedItem = *usedHeldItem;
         *usedHeldItem = 0;
-        gBattleMons[gActiveBank].item = gLastUsedItem;
+        gBattleMons[gActiveBattler].item = gLastUsedItem;
 
-        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item);
-        MarkBufferBankForExecution(gActiveBank);
+        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item);
+        MarkBufferBankForExecution(gActiveBattler);
 
         gBattlescriptCurrInstr += 5;
     }
@@ -10520,11 +10520,11 @@ static void atkEA_tryrecycleitem(void)
 
 static void atkEB_settypetoterrain(void)
 {
-    if (gBattleMons[gBankAttacker].type1 != sTerrainToType[gBattleTerrain]
-        && gBattleMons[gBankAttacker].type2 != sTerrainToType[gBattleTerrain])
+    if (gBattleMons[gBattleAttacker].type1 != sTerrainToType[gBattleTerrain]
+        && gBattleMons[gBattleAttacker].type2 != sTerrainToType[gBattleTerrain])
     {
-        gBattleMons[gBankAttacker].type1 = sTerrainToType[gBattleTerrain];
-        gBattleMons[gBankAttacker].type2 = sTerrainToType[gBattleTerrain];
+        gBattleMons[gBattleAttacker].type1 = sTerrainToType[gBattleTerrain];
+        gBattleMons[gBattleAttacker].type2 = sTerrainToType[gBattleTerrain];
 
         PREPARE_TYPE_BUFFER(gBattleTextBuff1, sTerrainToType[gBattleTerrain])
 
@@ -10538,19 +10538,19 @@ static void atkEB_settypetoterrain(void)
 
 static void atkEC_pursuitrelated(void)
 {
-    gActiveBank = GetBankByPosition(GetBankPosition(gBankAttacker) ^ BIT_MON);
+    gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_FLANK);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-        && !(gAbsentBankFlags & gBitTable[gActiveBank])
-        && gActionForBanks[gActiveBank] == 0
-        && gChosenMovesByBanks[gActiveBank] == MOVE_PURSUIT)
+        && !(gAbsentBattlerFlags & gBitTable[gActiveBattler])
+        && gActionForBanks[gActiveBattler] == 0
+        && gChosenMovesByBanks[gActiveBattler] == MOVE_PURSUIT)
     {
-        gActionsByTurnOrder[gActiveBank] = 11;
+        gActionsByTurnOrder[gActiveBattler] = 11;
         gCurrentMove = MOVE_PURSUIT;
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
-        gBattleScripting.field_20 = gBankAttacker;
-        gBankAttacker = gActiveBank;
+        gBattleScripting.field_20 = gBattleAttacker;
+        gBattleAttacker = gActiveBattler;
     }
     else
     {
@@ -10560,20 +10560,20 @@ static void atkEC_pursuitrelated(void)
 
 static void atkEF_snatchsetbanks(void)
 {
-    gEffectBank = gBankAttacker;
+    gEffectBank = gBattleAttacker;
 
-    if (gBankAttacker == gBankDefender)
-        gBankAttacker = gBankDefender = gBattleScripting.bank;
+    if (gBattleAttacker == gBattleDefender)
+        gBattleAttacker = gBattleDefender = gBattleScripting.battler;
     else
-        gBankDefender = gBattleScripting.bank;
+        gBattleDefender = gBattleScripting.battler;
 
-    gBattleScripting.bank = gEffectBank;
+    gBattleScripting.battler = gEffectBank;
     gBattlescriptCurrInstr++;
 }
 
 static void atkEE_removelightscreenreflect(void) // brick break
 {
-    u8 opposingSide = GetBankSide(gBankAttacker) ^ BIT_SIDE;
+    u8 opposingSide = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
 
     if (gSideTimers[opposingSide].reflectTimer || gSideTimers[opposingSide].lightscreenTimer)
     {
@@ -10600,19 +10600,19 @@ static void atkEF_handleballthrow(void)
     if (gBattleExecBuffer)
         return;
 
-    gActiveBank = gBankAttacker;
-    gBankDefender = gBankAttacker ^ BIT_SIDE;
+    gActiveBattler = gBattleAttacker;
+    gBattleDefender = gBattleAttacker ^ BIT_SIDE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
         EmitBallThrowAnim(0, BALL_TRAINER_BLOCK);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr = BattleScript_TrainerBallBlock;
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL)
     {
         EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS);
-        MarkBufferBankForExecution(gActiveBank);
+        MarkBufferBankForExecution(gActiveBattler);
         gBattlescriptCurrInstr = BattleScript_WallyBallThrow;
     }
     else
@@ -10623,17 +10623,17 @@ static void atkEF_handleballthrow(void)
         if (gLastUsedItem == ITEM_SAFARI_BALL)
             catchRate = gBattleStruct->field_7C * 1275 / 100;
         else
-            catchRate = gBaseStats[gBattleMons[gBankDefender].species].catchRate;
+            catchRate = gBaseStats[gBattleMons[gBattleDefender].species].catchRate;
 
         if (gLastUsedItem > ITEM_SAFARI_BALL)
         {
             switch (gLastUsedItem)
             {
             case ITEM_NET_BALL:
-                if (gBattleMons[gBankDefender].type1 == TYPE_WATER
-                    || gBattleMons[gBankDefender].type2 == TYPE_WATER
-                    || gBattleMons[gBankDefender].type1 == TYPE_BUG
-                    || gBattleMons[gBankDefender].type2 == TYPE_BUG)
+                if (gBattleMons[gBattleDefender].type1 == TYPE_WATER
+                    || gBattleMons[gBattleDefender].type2 == TYPE_WATER
+                    || gBattleMons[gBattleDefender].type1 == TYPE_BUG
+                    || gBattleMons[gBattleDefender].type2 == TYPE_BUG)
                     ballMultiplier = 30;
                 else
                     ballMultiplier = 10;
@@ -10645,9 +10645,9 @@ static void atkEF_handleballthrow(void)
                     ballMultiplier = 10;
                 break;
             case ITEM_NEST_BALL:
-                if (gBattleMons[gBankDefender].level < 40)
+                if (gBattleMons[gBattleDefender].level < 40)
                 {
-                    ballMultiplier = 40 - gBattleMons[gBankDefender].level;
+                    ballMultiplier = 40 - gBattleMons[gBattleDefender].level;
                     if (ballMultiplier <= 9)
                         ballMultiplier = 10;
                 }
@@ -10657,7 +10657,7 @@ static void atkEF_handleballthrow(void)
                 }
                 break;
             case ITEM_REPEAT_BALL:
-                if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBankDefender].species), FLAG_GET_CAUGHT))
+                if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBattleDefender].species), FLAG_GET_CAUGHT))
                     ballMultiplier = 30;
                 else
                     ballMultiplier = 10;
@@ -10677,12 +10677,12 @@ static void atkEF_handleballthrow(void)
             ballMultiplier = sBallCatchBonuses[gLastUsedItem - 2];
 
         odds = (catchRate * ballMultiplier / 10)
-            * (gBattleMons[gBankDefender].maxHP * 3 - gBattleMons[gBankDefender].hp * 2)
-            / (3 * gBattleMons[gBankDefender].maxHP);
+            * (gBattleMons[gBattleDefender].maxHP * 3 - gBattleMons[gBattleDefender].hp * 2)
+            / (3 * gBattleMons[gBattleDefender].maxHP);
 
-        if (gBattleMons[gBankDefender].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
+        if (gBattleMons[gBattleDefender].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
             odds *= 2;
-        if (gBattleMons[gBankDefender].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
+        if (gBattleMons[gBattleDefender].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
             odds = (odds * 15) / 10;
 
         if (gLastUsedItem != ITEM_SAFARI_BALL)
@@ -10701,9 +10701,9 @@ static void atkEF_handleballthrow(void)
         if (odds > 254) // mon caught
         {
             EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
             gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
-            SetMonData(&gEnemyParty[gBattlePartyID[gBankDefender]], MON_DATA_POKEBALL, &gLastUsedItem);
+            SetMonData(&gEnemyParty[gBattlePartyID[gBattleDefender]], MON_DATA_POKEBALL, &gLastUsedItem);
 
             if (CalculatePlayerPartyCount() == 6)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -10723,12 +10723,12 @@ static void atkEF_handleballthrow(void)
                 shakes = BALL_3_SHAKES_SUCCESS; // why calculate the shakes before that check?
 
             EmitBallThrowAnim(0, shakes);
-            MarkBufferBankForExecution(gActiveBank);
+            MarkBufferBankForExecution(gActiveBattler);
 
             if (shakes == BALL_3_SHAKES_SUCCESS) // mon caught, copy of the code above
             {
                 gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
-                SetMonData(&gEnemyParty[gBattlePartyID[gBankDefender]], MON_DATA_POKEBALL, &gLastUsedItem);
+                SetMonData(&gEnemyParty[gBattlePartyID[gBattleDefender]], MON_DATA_POKEBALL, &gLastUsedItem);
 
                 if (CalculatePlayerPartyCount() == 6)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -10746,18 +10746,18 @@ static void atkEF_handleballthrow(void)
 
 static void atkF0_givecaughtmon(void)
 {
-    if (GiveMonToPlayer(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY)
+    if (GiveMonToPlayer(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY)
     {
         if (!sub_813B21C())
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN)));
-            GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
+            GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
         }
         else
         {
             StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN)));
-            GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
+            GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
             StringCopy(gStringVar3, GetBoxNamePtr(get_unknown_box_id()));
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         }
@@ -10766,9 +10766,9 @@ static void atkF0_givecaughtmon(void)
             gBattleCommunication[MULTISTRING_CHOOSER]++;
     }
 
-    gBattleResults.caughtMonSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]], MON_DATA_SPECIES, NULL);
-    GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleResults.caughtMonNick);
-    gBattleResults.caughtMonBall = GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]], MON_DATA_POKEBALL, NULL);
+    gBattleResults.caughtMonSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_SPECIES, NULL);
+    GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleResults.caughtMonNick);
+    gBattleResults.caughtMonBall = GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_POKEBALL, NULL);
 
     gBattlescriptCurrInstr++;
 }
@@ -10804,8 +10804,8 @@ static void atkF2_displaydexinfo(void)
         {
             FreeAllWindowBuffers();
             gBattleCommunication[TASK_ID] = CreateDexDisplayMonDataTask(SpeciesToNationalPokedexNum(species),
-                                                                        gBattleMons[gBankDefender].otId,
-                                                                        gBattleMons[gBankDefender].personality);
+                                                                        gBattleMons[gBattleDefender].otId,
+                                                                        gBattleMons[gBattleDefender].personality);
             gBattleCommunication[0]++;
         }
         break;
@@ -10956,13 +10956,13 @@ static void atkF3_trygivecaughtmonnick(void)
     case 2:
         if (!gPaletteFade.active)
         {
-            GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
+            GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
             FreeAllWindowBuffers();
 
             DoNamingScreen(NAMING_SCREEN_CAUGHT_MON, gBattleStruct->caughtMonNick,
-                           GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]], MON_DATA_SPECIES),
-                           GetMonGender(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]]),
-                           GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]], MON_DATA_PERSONALITY, NULL),
+                           GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_SPECIES),
+                           GetMonGender(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]]),
+                           GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_PERSONALITY, NULL),
                            BattleMainCB2);
 
             gBattleCommunication[MULTIUSE_STATE]++;
@@ -10971,7 +10971,7 @@ static void atkF3_trygivecaughtmonnick(void)
     case 3:
         if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active )
         {
-            SetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
+            SetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         break;
@@ -10986,13 +10986,13 @@ static void atkF3_trygivecaughtmonnick(void)
 
 static void atkF4_subattackerhpbydmg(void)
 {
-    gBattleMons[gBankAttacker].hp -= gBattleMoveDamage;
+    gBattleMons[gBattleAttacker].hp -= gBattleMoveDamage;
     gBattlescriptCurrInstr++;
 }
 
 static void atkF5_removeattackerstatus1(void)
 {
-    gBattleMons[gBankAttacker].status1 = 0;
+    gBattleMons[gBattleAttacker].status1 = 0;
     gBattlescriptCurrInstr++;
 }
 
@@ -11004,14 +11004,14 @@ static void atkF6_finishaction(void)
 static void atkF7_finishturn(void)
 {
     gCurrentActionFuncId = ACTION_FINISHED;
-    gCurrentTurnActionNumber = gBattleBanksCount;
+    gCurrentTurnActionNumber = gBattlersCount;
 }
 
 static void atkF8_trainerslideout(void)
 {
-    gActiveBank = GetBankByPosition(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerAtPosition(gBattlescriptCurrInstr[1]);
     EmitTrainerSlideBack(0);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
diff --git a/src/battle_util.c b/src/battle_util.c
index 250976347..135f4f7f2 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -24,36 +24,36 @@
 #include "berry.h"
 
 extern const u8* gBattlescriptCurrInstr;
-extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
-extern const u8* gPalaceSelectionBattleScripts[BATTLE_BANKS_COUNT];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u8 gActiveBank;
+extern const u8* gSelectionBattleScripts[MAX_BATTLERS_COUNT];
+extern const u8* gPalaceSelectionBattleScripts[MAX_BATTLERS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
+extern u8 gActiveBattler;
 extern u8 gStringBank;
 extern u16 gCurrentMove;
 extern u16 gLastUsedItem;
-extern u8 gBattleBanksCount;
-extern u32 gStatuses3[BATTLE_BANKS_COUNT];
-extern u8 gBankAttacker;
-extern u8 gBankDefender;
-extern u8 gAbsentBankFlags;
+extern u8 gBattlersCount;
+extern u32 gStatuses3[MAX_BATTLERS_COUNT];
+extern u8 gBattleAttacker;
+extern u8 gBattleDefender;
+extern u8 gAbsentBattlerFlags;
 extern u16 gBattleWeather;
-extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT];
+extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
 extern u16 gSideStatuses[2];
 extern u8 gBattleCommunication[];
 extern void (*gBattleMainFunc)(void);
 extern s32 gBattleMoveDamage;
-extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
-extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200];
+extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
+extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u32 gBattleTypeFlags;
-extern u16 gLastMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastMoves[MAX_BATTLERS_COUNT];
 extern u32 gHitMarker;
 extern u8 gEffectBank;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
 extern u8 gBank1;
-extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
+extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
 extern u8 gMoveResultFlags;
-extern s32 gTakenDmg[BATTLE_BANKS_COUNT];
-extern u8 gTakenDmgBanks[BATTLE_BANKS_COUNT];
+extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
+extern u8 gTakenDmgBanks[MAX_BATTLERS_COUNT];
 extern u8 gLastUsedAbility;
 extern u8 gCurrentActionFuncId;
 extern u32 gBattleExecBuffer;
@@ -79,10 +79,10 @@ u8 GetBattleBank(u8 caseId)
     switch (caseId)
     {
     case BS_GET_TARGET:
-        ret = gBankDefender;
+        ret = gBattleDefender;
         break;
     case BS_GET_ATTACKER:
-        ret = gBankAttacker;
+        ret = gBattleAttacker;
         break;
     case BS_GET_EFFECT_BANK:
         ret = gEffectBank;
@@ -91,7 +91,7 @@ u8 GetBattleBank(u8 caseId)
         ret = 0;
         break;
     case BS_GET_SCRIPTING_BANK:
-        ret = gBattleScripting.bank;
+        ret = gBattleScripting.battler;
         break;
     case BS_GET_gBank1:
         ret = gBank1;
@@ -104,113 +104,113 @@ u8 GetBattleBank(u8 caseId)
     case 8:
     case 9:
     case BS_GET_PLAYER1:
-        ret = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+        ret = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         break;
     case BS_GET_OPPONENT1:
-        ret = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+        ret = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         break;
     case BS_GET_PLAYER2:
-        ret = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+        ret = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
         break;
     case BS_GET_OPPONENT2:
-        ret = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+        ret = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
         break;
     }
     return ret;
 }
 
-void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move)
+void PressurePPLose(u8 defender, u8 attacker, u16 move)
 {
     s32 i;
 
-    if (gBattleMons[bankDef].ability != ABILITY_PRESSURE)
+    if (gBattleMons[defender].ability != ABILITY_PRESSURE)
         return;
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[bankAtk].moves[i] == move)
+        if (gBattleMons[attacker].moves[i] == move)
             break;
     }
 
     if (i == 4) // mons don't share any moves
         return;
 
-    if (gBattleMons[bankAtk].pp[i] != 0)
-        gBattleMons[bankAtk].pp[i]--;
+    if (gBattleMons[attacker].pp[i] != 0)
+        gBattleMons[attacker].pp[i]--;
 
-    if (!(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
-        && !(gDisableStructs[bankAtk].unk18_b & gBitTable[i]))
+    if (!(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
+        && !(gDisableStructs[attacker].unk18_b & gBitTable[i]))
     {
-        gActiveBank = bankAtk;
-        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = attacker;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]);
+        MarkBufferBankForExecution(gActiveBattler);
     }
 }
 
-void PressurePPLoseOnUsingImprision(u8 bankAtk)
+void PressurePPLoseOnUsingImprision(u8 attacker)
 {
     s32 i, j;
     s32 imprisionPos = 4;
-    u8 atkSide = GetBankSide(bankAtk);
+    u8 atkSide = GetBattlerSide(attacker);
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
-        if (atkSide != GetBankSide(i) && gBattleMons[i].ability == ABILITY_PRESSURE)
+        if (atkSide != GetBattlerSide(i) && gBattleMons[i].ability == ABILITY_PRESSURE)
         {
             for (j = 0; j < 4; j++)
             {
-                if (gBattleMons[bankAtk].moves[j] == MOVE_IMPRISON)
+                if (gBattleMons[attacker].moves[j] == MOVE_IMPRISON)
                     break;
             }
             if (j != 4)
             {
                 imprisionPos = j;
-                if (gBattleMons[bankAtk].pp[j] != 0)
-                    gBattleMons[bankAtk].pp[j]--;
+                if (gBattleMons[attacker].pp[j] != 0)
+                    gBattleMons[attacker].pp[j]--;
             }
         }
     }
 
     if (imprisionPos != 4
-        && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
-        && !(gDisableStructs[bankAtk].unk18_b & gBitTable[imprisionPos]))
+        && !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
+        && !(gDisableStructs[attacker].unk18_b & gBitTable[imprisionPos]))
     {
-        gActiveBank = bankAtk;
-        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBank].pp[imprisionPos]);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = attacker;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisionPos]);
+        MarkBufferBankForExecution(gActiveBattler);
     }
 }
 
-void PressurePPLoseOnUsingPerishSong(u8 bankAtk)
+void PressurePPLoseOnUsingPerishSong(u8 attacker)
 {
     s32 i, j;
     s32 perishSongPos = 4;
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
-        if (gBattleMons[i].ability == ABILITY_PRESSURE && i != bankAtk)
+        if (gBattleMons[i].ability == ABILITY_PRESSURE && i != attacker)
         {
             for (j = 0; j < 4; j++)
             {
-                if (gBattleMons[bankAtk].moves[j] == MOVE_PERISH_SONG)
+                if (gBattleMons[attacker].moves[j] == MOVE_PERISH_SONG)
                     break;
             }
             if (j != 4)
             {
                 perishSongPos = j;
-                if (gBattleMons[bankAtk].pp[j] != 0)
-                    gBattleMons[bankAtk].pp[j]--;
+                if (gBattleMons[attacker].pp[j] != 0)
+                    gBattleMons[attacker].pp[j]--;
             }
         }
     }
 
     if (perishSongPos != 4
-        && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED)
-        && !(gDisableStructs[bankAtk].unk18_b & gBitTable[perishSongPos]))
+        && !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
+        && !(gDisableStructs[attacker].unk18_b & gBitTable[perishSongPos]))
     {
-        gActiveBank = bankAtk;
-        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBank].pp[perishSongPos]);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = attacker;
+        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBattler].pp[perishSongPos]);
+        MarkBufferBankForExecution(gActiveBattler);
     }
 }
 
@@ -220,25 +220,25 @@ void MarkAllBufferBanksForExecution(void) // unused
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
-        for (i = 0; i < gBattleBanksCount; i++)
+        for (i = 0; i < gBattlersCount; i++)
             gBattleExecBuffer |= gBitTable[i] << 0x1C;
     }
     else
     {
-        for (i = 0; i < gBattleBanksCount; i++)
+        for (i = 0; i < gBattlersCount; i++)
             gBattleExecBuffer |= gBitTable[i];
     }
 }
 
-void MarkBufferBankForExecution(u8 bank)
+void MarkBufferBankForExecution(u8 battler)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
-        gBattleExecBuffer |= gBitTable[bank] << 0x1C;
+        gBattleExecBuffer |= gBitTable[battler] << 0x1C;
     }
     else
     {
-        gBattleExecBuffer |= gBitTable[bank];
+        gBattleExecBuffer |= gBitTable[battler];
     }
 }
 
@@ -252,40 +252,40 @@ void sub_803F850(u8 arg0)
     gBattleExecBuffer &= ~(0x10000000 << arg0);
 }
 
-void CancelMultiTurnMoves(u8 bank)
+void CancelMultiTurnMoves(u8 battler)
 {
-    gBattleMons[bank].status2 &= ~(STATUS2_MULTIPLETURNS);
-    gBattleMons[bank].status2 &= ~(STATUS2_LOCK_CONFUSE);
-    gBattleMons[bank].status2 &= ~(STATUS2_UPROAR);
-    gBattleMons[bank].status2 &= ~(STATUS2_BIDE);
+    gBattleMons[battler].status2 &= ~(STATUS2_MULTIPLETURNS);
+    gBattleMons[battler].status2 &= ~(STATUS2_LOCK_CONFUSE);
+    gBattleMons[battler].status2 &= ~(STATUS2_UPROAR);
+    gBattleMons[battler].status2 &= ~(STATUS2_BIDE);
 
-    gStatuses3[bank] &= ~(STATUS3_SEMI_INVULNERABLE);
+    gStatuses3[battler] &= ~(STATUS3_SEMI_INVULNERABLE);
 
-    gDisableStructs[bank].rolloutCounter1 = 0;
-    gDisableStructs[bank].furyCutterCounter = 0;
+    gDisableStructs[battler].rolloutCounter1 = 0;
+    gDisableStructs[battler].furyCutterCounter = 0;
 }
 
-bool8 WasUnableToUseMove(u8 bank)
+bool8 WasUnableToUseMove(u8 battler)
 {
-    if (gProtectStructs[bank].prlzImmobility
-        || gProtectStructs[bank].targetNotAffected
-        || gProtectStructs[bank].usedImprisionedMove
-        || gProtectStructs[bank].loveImmobility
-        || gProtectStructs[bank].usedDisabledMove
-        || gProtectStructs[bank].usedTauntedMove
-        || gProtectStructs[bank].flag2Unknown
-        || gProtectStructs[bank].flinchImmobility
-        || gProtectStructs[bank].confusionSelfDmg)
+    if (gProtectStructs[battler].prlzImmobility
+        || gProtectStructs[battler].targetNotAffected
+        || gProtectStructs[battler].usedImprisionedMove
+        || gProtectStructs[battler].loveImmobility
+        || gProtectStructs[battler].usedDisabledMove
+        || gProtectStructs[battler].usedTauntedMove
+        || gProtectStructs[battler].flag2Unknown
+        || gProtectStructs[battler].flinchImmobility
+        || gProtectStructs[battler].confusionSelfDmg)
         return TRUE;
     else
         return FALSE;
 }
 
-void PrepareStringBattle(u16 stringId, u8 bank)
+void PrepareStringBattle(u16 stringId, u8 battler)
 {
-    gActiveBank = bank;
+    gActiveBattler = battler;
     EmitPrintString(0, stringId);
-    MarkBufferBankForExecution(gActiveBank);
+    MarkBufferBankForExecution(gActiveBattler);
 }
 
 void ResetSentPokesToOpponentValue(void)
@@ -296,44 +296,44 @@ void ResetSentPokesToOpponentValue(void)
     gSentPokesToOpponent[0] = 0;
     gSentPokesToOpponent[1] = 0;
 
-    for (i = 0; i < gBattleBanksCount; i += 2)
+    for (i = 0; i < gBattlersCount; i += 2)
         bits |= gBitTable[gBattlePartyID[i]];
 
-    for (i = 1; i < gBattleBanksCount; i += 2)
-        gSentPokesToOpponent[(i & BIT_MON) >> 1] = bits;
+    for (i = 1; i < gBattlersCount; i += 2)
+        gSentPokesToOpponent[(i & BIT_FLANK) >> 1] = bits;
 }
 
-void sub_803F9EC(u8 bank)
+void sub_803F9EC(u8 battler)
 {
     s32 i = 0;
     u32 bits = 0;
 
-    if (GetBankSide(bank) == SIDE_OPPONENT)
+    if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
     {
-        u8 id = ((bank & BIT_MON) >> 1);
-        gSentPokesToOpponent[id] = 0;
+        u8 flank = ((battler & BIT_FLANK) >> 1);
+        gSentPokesToOpponent[flank] = 0;
 
-        for (i = 0; i < gBattleBanksCount; i += 2)
+        for (i = 0; i < gBattlersCount; i += 2)
         {
-            if (!(gAbsentBankFlags & gBitTable[i]))
+            if (!(gAbsentBattlerFlags & gBitTable[i]))
                 bits |= gBitTable[gBattlePartyID[i]];
         }
 
-        gSentPokesToOpponent[id] = bits;
+        gSentPokesToOpponent[flank] = bits;
     }
 }
 
-void sub_803FA70(u8 bank)
+void sub_803FA70(u8 battler)
 {
-    if (GetBankSide(bank) == SIDE_OPPONENT)
+    if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
     {
-        sub_803F9EC(bank);
+        sub_803F9EC(battler);
     }
     else
     {
         s32 i;
-        for (i = 1; i < gBattleBanksCount; i++)
-            gSentPokesToOpponent[(i & BIT_MON) >> 1] |= gBitTable[gBattlePartyID[bank]];
+        for (i = 1; i < gBattlersCount; i++)
+            gSentPokesToOpponent[(i & BIT_FLANK) >> 1] |= gBitTable[gBattlePartyID[battler]];
     }
 }
 
@@ -355,102 +355,102 @@ void BattleScriptPop(void)
 u8 TrySetCantSelectMoveBattleScript(void)
 {
     u8 limitations = 0;
-    u16 move = gBattleMons[gActiveBank].moves[gBattleBufferB[gActiveBank][2]];
+    u16 move = gBattleMons[gActiveBattler].moves[gBattleBufferB[gActiveBattler][2]];
     u8 holdEffect;
-    u16* choicedMove = &gBattleStruct->choicedMove[gActiveBank];
+    u16* choicedMove = &gBattleStruct->choicedMove[gActiveBattler];
 
-    if (gDisableStructs[gActiveBank].disabledMove == move && move != 0)
+    if (gDisableStructs[gActiveBattler].disabledMove == move && move != 0)
     {
-        gBattleScripting.bank = gActiveBank;
+        gBattleScripting.battler = gActiveBattler;
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingDisabledMoveInPalace;
-            gProtectStructs[gActiveBank].flag_x10 = 1;
+            gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingDisabledMoveInPalace;
+            gProtectStructs[gActiveBattler].flag_x10 = 1;
         }
         else
         {
-            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingDisabledMove;
+            gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingDisabledMove;
             limitations = 1;
         }
     }
 
-    if (move == gLastMoves[gActiveBank] && move != MOVE_STRUGGLE && (gBattleMons[gActiveBank].status2 & STATUS2_TORMENT))
+    if (move == gLastMoves[gActiveBattler] && move != MOVE_STRUGGLE && (gBattleMons[gActiveBattler].status2 & STATUS2_TORMENT))
     {
-        CancelMultiTurnMoves(gActiveBank);
+        CancelMultiTurnMoves(gActiveBattler);
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingTormentedMoveInPalace;
-            gProtectStructs[gActiveBank].flag_x10 = 1;
+            gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingTormentedMoveInPalace;
+            gProtectStructs[gActiveBattler].flag_x10 = 1;
         }
         else
         {
-            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingTormentedMove;
+            gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingTormentedMove;
             limitations++;
         }
     }
 
-    if (gDisableStructs[gActiveBank].tauntTimer1 != 0 && gBattleMoves[move].power == 0)
+    if (gDisableStructs[gActiveBattler].tauntTimer1 != 0 && gBattleMoves[move].power == 0)
     {
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingNotAllowedMoveTauntInPalace;
-            gProtectStructs[gActiveBank].flag_x10 = 1;
+            gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveTauntInPalace;
+            gProtectStructs[gActiveBattler].flag_x10 = 1;
         }
         else
         {
-            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingNotAllowedMoveTaunt;
+            gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveTaunt;
             limitations++;
         }
     }
 
-    if (GetImprisonedMovesCount(gActiveBank, move))
+    if (GetImprisonedMovesCount(gActiveBattler, move))
     {
         gCurrentMove = move;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gPalaceSelectionBattleScripts[gActiveBank] = BattleScript_SelectingImprisionedMoveInPalace;
-            gProtectStructs[gActiveBank].flag_x10 = 1;
+            gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMoveInPalace;
+            gProtectStructs[gActiveBattler].flag_x10 = 1;
         }
         else
         {
-            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingImprisionedMove;
+            gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMove;
             limitations++;
         }
     }
 
-    if (gBattleMons[gActiveBank].item == ITEM_ENIGMA_BERRY)
-        holdEffect = gEnigmaBerries[gActiveBank].holdEffect;
+    if (gBattleMons[gActiveBattler].item == ITEM_ENIGMA_BERRY)
+        holdEffect = gEnigmaBerries[gActiveBattler].holdEffect;
     else
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBank].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
 
-    gStringBank = gActiveBank;
+    gStringBank = gActiveBattler;
 
     if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move)
     {
         gCurrentMove = *choicedMove;
-        gLastUsedItem = gBattleMons[gActiveBank].item;
+        gLastUsedItem = gBattleMons[gActiveBattler].item;
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gProtectStructs[gActiveBank].flag_x10 = 1;
+            gProtectStructs[gActiveBattler].flag_x10 = 1;
         }
         else
         {
-            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingNotAllowedMoveChoiceItem;
+            gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingNotAllowedMoveChoiceItem;
             limitations++;
         }
     }
 
-    if (gBattleMons[gActiveBank].pp[gBattleBufferB[gActiveBank][2]] == 0)
+    if (gBattleMons[gActiveBattler].pp[gBattleBufferB[gActiveBattler][2]] == 0)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
         {
-            gProtectStructs[gActiveBank].flag_x10 = 1;
+            gProtectStructs[gActiveBattler].flag_x10 = 1;
         }
         else
         {
-            gSelectionBattleScripts[gActiveBank] = BattleScript_SelectingMoveWithNoPP;
+            gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingMoveWithNoPP;
             limitations++;
         }
     }
@@ -471,7 +471,7 @@ u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check)
 
     gStringBank = bank;
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         if (gBattleMons[bank].moves[i] == 0 && check & MOVE_LIMITATION_ZEROMOVE)
             unusableMoves |= gBitTable[i];
@@ -496,16 +496,16 @@ u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check)
 bool8 AreAllMovesUnusable(void)
 {
     u8 unusable;
-    unusable = CheckMoveLimitations(gActiveBank, 0, 0xFF);
+    unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
 
     if (unusable == 0xF) // all moves are unusable
     {
-        gProtectStructs[gActiveBank].onlyStruggle = 1;
-        gSelectionBattleScripts[gActiveBank] = BattleScript_NoMovesLeft;
+        gProtectStructs[gActiveBattler].onlyStruggle = 1;
+        gSelectionBattleScripts[gActiveBattler] = BattleScript_NoMovesLeft;
     }
     else
     {
-        gProtectStructs[gActiveBank].onlyStruggle = 0;
+        gProtectStructs[gActiveBattler].onlyStruggle = 0;
     }
 
     return (unusable == 0xF);
@@ -515,11 +515,11 @@ u8 GetImprisonedMovesCount(u8 bank, u16 move)
 {
     s32 i;
     u8 imprisionedMoves = 0;
-    u8 bankSide = GetBankSide(bank);
+    u8 bankSide = GetBattlerSide(bank);
 
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
-        if (bankSide != GetBankSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS)
+        if (bankSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS)
         {
             s32 j;
             for (j = 0; j < 4; j++)
@@ -540,10 +540,10 @@ u8 UpdateTurnCounters(void)
     u8 effect = 0;
     s32 i;
 
-    for (gBankAttacker = 0; gBankAttacker < gBattleBanksCount && gAbsentBankFlags & gBitTable[gBankAttacker]; gBankAttacker++)
+    for (gBattleAttacker = 0; gBattleAttacker < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattleAttacker]; gBattleAttacker++)
     {
     }
-    for (gBankDefender = 0; gBankDefender < gBattleBanksCount && gAbsentBankFlags & gBitTable[gBankDefender]; gBankDefender++)
+    for (gBattleDefender = 0; gBattleDefender < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattleDefender]; gBattleDefender++)
     {
     }
 
@@ -554,16 +554,16 @@ u8 UpdateTurnCounters(void)
         switch (gBattleStruct->turncountersTracker)
         {
         case 0:
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
-                gBanksByTurnOrder[i] = i;
+                gBattleTurnOrder[i] = i;
             }
-            for (i = 0; i < gBattleBanksCount - 1; i++)
+            for (i = 0; i < gBattlersCount - 1; i++)
             {
                 s32 j;
-                for (j = i + 1; j < gBattleBanksCount; j++)
+                for (j = i + 1; j < gBattlersCount; j++)
                 {
-                    if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 0))
+                    if (GetWhoStrikesFirst(gBattleTurnOrder[i], gBattleTurnOrder[j], 0))
                         SwapTurnOrder(i, j);
                 }
             }
@@ -579,7 +579,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBank = gBankAttacker = gSideTimers[sideBank].reflectBank;
+                gActiveBattler = gBattleAttacker = gSideTimers[sideBank].reflectBank;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_REFLECT)
                 {
                     if (--gSideTimers[sideBank].reflectTimer == 0)
@@ -604,7 +604,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBank = gBankAttacker = gSideTimers[sideBank].lightscreenBank;
+                gActiveBattler = gBattleAttacker = gSideTimers[sideBank].lightscreenBank;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_LIGHTSCREEN)
                 {
                     if (--gSideTimers[sideBank].lightscreenTimer == 0)
@@ -630,7 +630,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBank = gBankAttacker = gSideTimers[sideBank].mistBank;
+                gActiveBattler = gBattleAttacker = gSideTimers[sideBank].mistBank;
                 if (gSideTimers[sideBank].mistTimer != 0
                  && --gSideTimers[sideBank].mistTimer == 0)
                 {
@@ -654,7 +654,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBank = gBankAttacker = gSideTimers[sideBank].safeguardBank;
+                gActiveBattler = gBattleAttacker = gSideTimers[sideBank].safeguardBank;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_SAFEGUARD)
                 {
                     if (--gSideTimers[sideBank].safeguardTimer == 0)
@@ -675,14 +675,14 @@ u8 UpdateTurnCounters(void)
             }
             break;
         case 5:
-            while (gBattleStruct->turnSideTracker < gBattleBanksCount)
+            while (gBattleStruct->turnSideTracker < gBattlersCount)
             {
-                gActiveBank = gBanksByTurnOrder[gBattleStruct->turnSideTracker];
-                if (gWishFutureKnock.wishCounter[gActiveBank] != 0
-                 && --gWishFutureKnock.wishCounter[gActiveBank] == 0
-                 && gBattleMons[gActiveBank].hp != 0)
+                gActiveBattler = gBattleTurnOrder[gBattleStruct->turnSideTracker];
+                if (gWishFutureKnock.wishCounter[gActiveBattler] != 0
+                 && --gWishFutureKnock.wishCounter[gActiveBattler] == 0
+                 && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBankDefender = gActiveBank;
+                    gBattleDefender = gActiveBattler;
                     BattleScriptExecute(BattleScript_WishComesTrue);
                     effect++;
                 }
@@ -798,10 +798,10 @@ u8 TurnBasedEffects(void)
     u8 effect = 0;
 
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
-    while (gBattleStruct->turnEffectsBank < gBattleBanksCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
+    while (gBattleStruct->turnEffectsBank < gBattlersCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
     {
-        gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->turnEffectsBank];
-        if (gAbsentBankFlags & gBitTable[gActiveBank])
+        gActiveBattler = gBattleAttacker = gBattleTurnOrder[gBattleStruct->turnEffectsBank];
+        if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
         {
             gBattleStruct->turnEffectsBank++;
         }
@@ -810,11 +810,11 @@ u8 TurnBasedEffects(void)
             switch (gBattleStruct->turnEffectsTracker)
             {
             case 0:  // ingrain
-                if ((gStatuses3[gActiveBank] & STATUS3_ROOTED)
-                 && gBattleMons[gActiveBank].hp != gBattleMons[gActiveBank].maxHP
-                 && gBattleMons[gActiveBank].hp != 0)
+                if ((gStatuses3[gActiveBattler] & STATUS3_ROOTED)
+                 && gBattleMons[gActiveBattler].hp != gBattleMons[gActiveBattler].maxHP
+                 && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     gBattleMoveDamage *= -1;
@@ -824,40 +824,40 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 1:  // end turn abilities
-                if (AbilityBattleEffects(ABILITYEFFECT_ENDTURN, gActiveBank, 0, 0, 0))
+                if (AbilityBattleEffects(ABILITYEFFECT_ENDTURN, gActiveBattler, 0, 0, 0))
                     effect++;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 2:  // item effects
-                if (ItemBattleEffects(1, gActiveBank, 0))
+                if (ItemBattleEffects(1, gActiveBattler, 0))
                     effect++;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 18:  // item effects again
-                if (ItemBattleEffects(1, gActiveBank, 1))
+                if (ItemBattleEffects(1, gActiveBattler, 1))
                     effect++;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 3:  // leech seed
-                if ((gStatuses3[gActiveBank] & STATUS3_LEECHSEED)
-                 && gBattleMons[gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK].hp != 0
-                 && gBattleMons[gActiveBank].hp != 0)
+                if ((gStatuses3[gActiveBattler] & STATUS3_LEECHSEED)
+                 && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK].hp != 0
+                 && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBankDefender = gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
+                    gBattleDefender = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    gBattleScripting.animArg1 = gBankDefender;
-                    gBattleScripting.animArg2 = gBankAttacker;
+                    gBattleScripting.animArg1 = gBattleDefender;
+                    gBattleScripting.animArg2 = gBattleAttacker;
                     BattleScriptExecute(BattleScript_LeechSeedTurnDrain);
                     effect++;
                 }
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 4:  // poison
-                if ((gBattleMons[gActiveBank].status1 & STATUS1_POISON) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status1 & STATUS1_POISON) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     BattleScriptExecute(BattleScript_PoisonTurnDmg);
@@ -866,23 +866,23 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 5:  // toxic poison
-                if ((gBattleMons[gActiveBank].status1 & STATUS1_TOXIC_POISON) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_POISON) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    if ((gBattleMons[gActiveBank].status1 & 0xF00) != 0xF00) // not 16 turns
-                        gBattleMons[gActiveBank].status1 += 0x100;
-                    gBattleMoveDamage *= (gBattleMons[gActiveBank].status1 & 0xF00) >> 8;
+                    if ((gBattleMons[gActiveBattler].status1 & 0xF00) != 0xF00) // not 16 turns
+                        gBattleMons[gActiveBattler].status1 += 0x100;
+                    gBattleMoveDamage *= (gBattleMons[gActiveBattler].status1 & 0xF00) >> 8;
                     BattleScriptExecute(BattleScript_PoisonTurnDmg);
                     effect++;
                 }
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 6:  // burn
-                if ((gBattleMons[gActiveBank].status1 & STATUS1_BURN) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status1 & STATUS1_BURN) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     BattleScriptExecute(BattleScript_BurnTurnDmg);
@@ -891,13 +891,13 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 7:  // spooky nightmares
-                if ((gBattleMons[gActiveBank].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBattler].hp != 0)
                 {
                     // R/S does not perform this sleep check, which causes the nighmare effect to
                     // persist even after the affected Pokemon has been awakened by Shed Skin
-                    if (gBattleMons[gActiveBank].status1 & STATUS1_SLEEP)
+                    if (gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
                     {
-                        gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4;
+                        gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4;
                         if (gBattleMoveDamage == 0)
                             gBattleMoveDamage = 1;
                         BattleScriptExecute(BattleScript_NightmareTurnDmg);
@@ -905,15 +905,15 @@ u8 TurnBasedEffects(void)
                     }
                     else
                     {
-                        gBattleMons[gActiveBank].status2 &= ~STATUS2_NIGHTMARE;
+                        gBattleMons[gActiveBattler].status2 &= ~STATUS2_NIGHTMARE;
                     }
                 }
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 8:  // curse
-                if ((gBattleMons[gActiveBank].status2 & STATUS2_CURSED) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status2 & STATUS2_CURSED) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     BattleScriptExecute(BattleScript_CurseTurnDmg);
@@ -922,21 +922,21 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 9:  // wrap
-                if ((gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED) && gBattleMons[gActiveBank].hp != 0)
+                if ((gBattleMons[gActiveBattler].status2 & STATUS2_WRAPPED) && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMons[gActiveBank].status2 -= 0x2000;
-                    if (gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED)  // damaged by wrap
+                    gBattleMons[gActiveBattler].status2 -= 0x2000;
+                    if (gBattleMons[gActiveBattler].status2 & STATUS2_WRAPPED)  // damaged by wrap
                     {
                         // This is the only way I could get this array access to match.
-                        gBattleScripting.animArg1 = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 0);
-                        gBattleScripting.animArg2 = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 1);
+                        gBattleScripting.animArg1 = *(gBattleStruct->wrappedMove + gActiveBattler * 2 + 0);
+                        gBattleScripting.animArg2 = *(gBattleStruct->wrappedMove + gActiveBattler * 2 + 1);
                         gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN;
                         gBattleTextBuff1[1] = B_BUFF_MOVE;
-                        gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 0);
-                        gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 1);
+                        gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gActiveBattler * 2 + 0);
+                        gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gActiveBattler * 2 + 1);
                         gBattleTextBuff1[4] = EOS;
                         gBattlescriptCurrInstr = BattleScript_WrapTurnDmg;
-                        gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16;
+                        gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 16;
                         if (gBattleMoveDamage == 0)
                             gBattleMoveDamage = 1;
                     }
@@ -944,8 +944,8 @@ u8 TurnBasedEffects(void)
                     {
                         gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN;
                         gBattleTextBuff1[1] = B_BUFF_MOVE;
-                        gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 0);
-                        gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gActiveBank * 2 + 1);
+                        gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gActiveBattler * 2 + 0);
+                        gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gActiveBattler * 2 + 1);
                         gBattleTextBuff1[4] = EOS;
                         gBattlescriptCurrInstr = BattleScript_WrapEnds;
                     }
@@ -955,46 +955,46 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 10:  // uproar
-                if (gBattleMons[gActiveBank].status2 & STATUS2_UPROAR)
+                if (gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR)
                 {
-                    for (gBankAttacker = 0; gBankAttacker < gBattleBanksCount; gBankAttacker++)
+                    for (gBattleAttacker = 0; gBattleAttacker < gBattlersCount; gBattleAttacker++)
                     {
-                        if ((gBattleMons[gBankAttacker].status1 & STATUS1_SLEEP)
-                         && gBattleMons[gBankAttacker].ability != ABILITY_SOUNDPROOF)
+                        if ((gBattleMons[gBattleAttacker].status1 & STATUS1_SLEEP)
+                         && gBattleMons[gBattleAttacker].ability != ABILITY_SOUNDPROOF)
                         {
-                            gBattleMons[gBankAttacker].status1 &= ~(STATUS1_SLEEP);
-                            gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+                            gBattleMons[gBattleAttacker].status1 &= ~(STATUS1_SLEEP);
+                            gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                             BattleScriptExecute(BattleScript_MonWokeUpInUproar);
-                            gActiveBank = gBankAttacker;
-                            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-                            MarkBufferBankForExecution(gActiveBank);
+                            gActiveBattler = gBattleAttacker;
+                            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                            MarkBufferBankForExecution(gActiveBattler);
                             break;
                         }
                     }
-                    if (gBankAttacker != gBattleBanksCount)
+                    if (gBattleAttacker != gBattlersCount)
                     {
                         effect = 2;  // a pokemon was awaken
                         break;
                     }
                     else
                     {
-                        gBankAttacker = gActiveBank;
-                        gBattleMons[gActiveBank].status2 -= 0x10;  // uproar timer goes down
-                        if (WasUnableToUseMove(gActiveBank))
+                        gBattleAttacker = gActiveBattler;
+                        gBattleMons[gActiveBattler].status2 -= 0x10;  // uproar timer goes down
+                        if (WasUnableToUseMove(gActiveBattler))
                         {
-                            CancelMultiTurnMoves(gActiveBank);
+                            CancelMultiTurnMoves(gActiveBattler);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                         }
-                        else if (gBattleMons[gActiveBank].status2 & STATUS2_UPROAR)
+                        else if (gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR)
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-                            gBattleMons[gActiveBank].status2 |= STATUS2_MULTIPLETURNS;
+                            gBattleMons[gActiveBattler].status2 |= STATUS2_MULTIPLETURNS;
                         }
                         else
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                            CancelMultiTurnMoves(gActiveBank);
+                            CancelMultiTurnMoves(gActiveBattler);
                         }
                         BattleScriptExecute(BattleScript_PrintUproarOverTurns);
                         effect = 1;
@@ -1004,20 +1004,20 @@ u8 TurnBasedEffects(void)
                     gBattleStruct->turnEffectsTracker++;
                 break;
             case 11:  // thrash
-                if (gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE)
+                if (gBattleMons[gActiveBattler].status2 & STATUS2_LOCK_CONFUSE)
                 {
-                    gBattleMons[gActiveBank].status2 -= 0x400;
-                    if (WasUnableToUseMove(gActiveBank))
-                        CancelMultiTurnMoves(gActiveBank);
-                    else if (!(gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE)
-                     && (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS))
+                    gBattleMons[gActiveBattler].status2 -= 0x400;
+                    if (WasUnableToUseMove(gActiveBattler))
+                        CancelMultiTurnMoves(gActiveBattler);
+                    else if (!(gBattleMons[gActiveBattler].status2 & STATUS2_LOCK_CONFUSE)
+                     && (gBattleMons[gActiveBattler].status2 & STATUS2_MULTIPLETURNS))
                     {
-                        gBattleMons[gActiveBank].status2 &= ~(STATUS2_MULTIPLETURNS);
-                        if (!(gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION))
+                        gBattleMons[gActiveBattler].status2 &= ~(STATUS2_MULTIPLETURNS);
+                        if (!(gBattleMons[gActiveBattler].status2 & STATUS2_CONFUSION))
                         {
                             gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER;
                             SetMoveEffect(1, 0);
-                            if (gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION)
+                            if (gBattleMons[gActiveBattler].status2 & STATUS2_CONFUSION)
                                 BattleScriptExecute(BattleScript_ThrashConfuses);
                             effect++;
                         }
@@ -1026,22 +1026,22 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 12:  // disable
-                if (gDisableStructs[gActiveBank].disableTimer1 != 0)
+                if (gDisableStructs[gActiveBattler].disableTimer1 != 0)
                 {
                     int i;
                     for (i = 0; i < 4; i++)
                     {
-                        if (gDisableStructs[gActiveBank].disabledMove == gBattleMons[gActiveBank].moves[i])
+                        if (gDisableStructs[gActiveBattler].disabledMove == gBattleMons[gActiveBattler].moves[i])
                             break;
                     }
                     if (i == 4)  // pokemon does not have the disabled move anymore
                     {
-                        gDisableStructs[gActiveBank].disabledMove = 0;
-                        gDisableStructs[gActiveBank].disableTimer1 = 0;
+                        gDisableStructs[gActiveBattler].disabledMove = 0;
+                        gDisableStructs[gActiveBattler].disableTimer1 = 0;
                     }
-                    else if (--gDisableStructs[gActiveBank].disableTimer1 == 0)  // disable ends
+                    else if (--gDisableStructs[gActiveBattler].disableTimer1 == 0)  // disable ends
                     {
-                        gDisableStructs[gActiveBank].disabledMove = 0;
+                        gDisableStructs[gActiveBattler].disabledMove = 0;
                         BattleScriptExecute(BattleScript_DisabledNoMore);
                         effect++;
                     }
@@ -1049,18 +1049,18 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 13:  // encore
-                if (gDisableStructs[gActiveBank].encoreTimer1 != 0)
+                if (gDisableStructs[gActiveBattler].encoreTimer1 != 0)
                 {
-                    if (gBattleMons[gActiveBank].moves[gDisableStructs[gActiveBank].encoredMovePos] != gDisableStructs[gActiveBank].encoredMove)  // pokemon does not have the encored move anymore
+                    if (gBattleMons[gActiveBattler].moves[gDisableStructs[gActiveBattler].encoredMovePos] != gDisableStructs[gActiveBattler].encoredMove)  // pokemon does not have the encored move anymore
                     {
-                        gDisableStructs[gActiveBank].encoredMove = 0;
-                        gDisableStructs[gActiveBank].encoreTimer1 = 0;
+                        gDisableStructs[gActiveBattler].encoredMove = 0;
+                        gDisableStructs[gActiveBattler].encoreTimer1 = 0;
                     }
-                    else if (--gDisableStructs[gActiveBank].encoreTimer1 == 0
-                     || gBattleMons[gActiveBank].pp[gDisableStructs[gActiveBank].encoredMovePos] == 0)
+                    else if (--gDisableStructs[gActiveBattler].encoreTimer1 == 0
+                     || gBattleMons[gActiveBattler].pp[gDisableStructs[gActiveBattler].encoredMovePos] == 0)
                     {
-                        gDisableStructs[gActiveBank].encoredMove = 0;
-                        gDisableStructs[gActiveBank].encoreTimer1 = 0;
+                        gDisableStructs[gActiveBattler].encoredMove = 0;
+                        gDisableStructs[gActiveBattler].encoreTimer1 = 0;
                         BattleScriptExecute(BattleScript_EncoredNoMore);
                         effect++;
                     }
@@ -1068,33 +1068,33 @@ u8 TurnBasedEffects(void)
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 14:  // lock-on decrement
-                if (gStatuses3[gActiveBank] & STATUS3_ALWAYS_HITS)
-                    gStatuses3[gActiveBank] -= 0x8;
+                if (gStatuses3[gActiveBattler] & STATUS3_ALWAYS_HITS)
+                    gStatuses3[gActiveBattler] -= 0x8;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 15:  // charge
-                if (gDisableStructs[gActiveBank].chargeTimer1 && --gDisableStructs[gActiveBank].chargeTimer1 == 0)
-                    gStatuses3[gActiveBank] &= ~STATUS3_CHARGED_UP;
+                if (gDisableStructs[gActiveBattler].chargeTimer1 && --gDisableStructs[gActiveBattler].chargeTimer1 == 0)
+                    gStatuses3[gActiveBattler] &= ~STATUS3_CHARGED_UP;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 16:  // taunt
-                if (gDisableStructs[gActiveBank].tauntTimer1)
-                    gDisableStructs[gActiveBank].tauntTimer1--;
+                if (gDisableStructs[gActiveBattler].tauntTimer1)
+                    gDisableStructs[gActiveBattler].tauntTimer1--;
                 gBattleStruct->turnEffectsTracker++;
                 break;
             case 17:  // yawn
-                if (gStatuses3[gActiveBank] & STATUS3_YAWN)
-                {
-                    gStatuses3[gActiveBank] -= 0x800;
-                    if (!(gStatuses3[gActiveBank] & STATUS3_YAWN) && !(gBattleMons[gActiveBank].status1 & STATUS1_ANY)
-                     && gBattleMons[gActiveBank].ability != ABILITY_VITAL_SPIRIT
-                     && gBattleMons[gActiveBank].ability != ABILITY_INSOMNIA && !UproarWakeUpCheck(gActiveBank))
-                    {
-                        CancelMultiTurnMoves(gActiveBank);
-                        gBattleMons[gActiveBank].status1 |= (Random() & 3) + 2;
-                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-                        MarkBufferBankForExecution(gActiveBank);
-                        gEffectBank = gActiveBank;
+                if (gStatuses3[gActiveBattler] & STATUS3_YAWN)
+                {
+                    gStatuses3[gActiveBattler] -= 0x800;
+                    if (!(gStatuses3[gActiveBattler] & STATUS3_YAWN) && !(gBattleMons[gActiveBattler].status1 & STATUS1_ANY)
+                     && gBattleMons[gActiveBattler].ability != ABILITY_VITAL_SPIRIT
+                     && gBattleMons[gActiveBattler].ability != ABILITY_INSOMNIA && !UproarWakeUpCheck(gActiveBattler))
+                    {
+                        CancelMultiTurnMoves(gActiveBattler);
+                        gBattleMons[gActiveBattler].status1 |= (Random() & 3) + 2;
+                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                        MarkBufferBankForExecution(gActiveBattler);
+                        gEffectBank = gActiveBattler;
                         BattleScriptExecute(BattleScript_YawnMakesAsleep);
                         effect++;
                     }
@@ -1121,37 +1121,37 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
     switch (gBattleStruct->wishPerishSongState)
     {
     case 0:
-        while (gBattleStruct->wishPerishSongBank < gBattleBanksCount)
+        while (gBattleStruct->wishPerishSongBank < gBattlersCount)
         {
-            gActiveBank = gBattleStruct->wishPerishSongBank;
-            if (gAbsentBankFlags & gBitTable[gActiveBank])
+            gActiveBattler = gBattleStruct->wishPerishSongBank;
+            if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
             {
                 gBattleStruct->wishPerishSongBank++;
                 continue;
             }
 
             gBattleStruct->wishPerishSongBank++;
-            if (gWishFutureKnock.futureSightCounter[gActiveBank] != 0
-             && --gWishFutureKnock.futureSightCounter[gActiveBank] == 0
-             && gBattleMons[gActiveBank].hp != 0)
+            if (gWishFutureKnock.futureSightCounter[gActiveBattler] != 0
+             && --gWishFutureKnock.futureSightCounter[gActiveBattler] == 0
+             && gBattleMons[gActiveBattler].hp != 0)
             {
-                if (gWishFutureKnock.futureSightMove[gActiveBank] == MOVE_FUTURE_SIGHT)
+                if (gWishFutureKnock.futureSightMove[gActiveBattler] == MOVE_FUTURE_SIGHT)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                 else
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
 
-                PREPARE_MOVE_BUFFER(gBattleTextBuff1, gWishFutureKnock.futureSightMove[gActiveBank]);
+                PREPARE_MOVE_BUFFER(gBattleTextBuff1, gWishFutureKnock.futureSightMove[gActiveBattler]);
 
-                gBankDefender = gActiveBank;
-                gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank];
-                gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank];
-                gSpecialStatuses[gBankDefender].moveturnLostHP = 0xFFFF;
+                gBattleDefender = gActiveBattler;
+                gBattleAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler];
+                gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler];
+                gSpecialStatuses[gBattleDefender].moveturnLostHP = 0xFFFF;
                 BattleScriptExecute(BattleScript_MonTookFutureAttack);
 
-                if (gWishFutureKnock.futureSightCounter[gActiveBank] == 0
-                 && gWishFutureKnock.futureSightCounter[gActiveBank ^ BIT_MON] == 0)
+                if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0
+                 && gWishFutureKnock.futureSightCounter[gActiveBattler ^ BIT_FLANK] == 0)
                 {
-                    gSideStatuses[GET_BANK_SIDE(gBankDefender)] &= ~(SIDE_STATUS_FUTUREATTACK);
+                    gSideStatuses[GET_BATTLER_SIDE(gBattleDefender)] &= ~(SIDE_STATUS_FUTUREATTACK);
                 }
                 return TRUE;
             }
@@ -1164,27 +1164,27 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
         }
         // fall through
     case 1:
-        while (gBattleStruct->wishPerishSongBank < gBattleBanksCount)
+        while (gBattleStruct->wishPerishSongBank < gBattlersCount)
         {
-            gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->wishPerishSongBank];
-            if (gAbsentBankFlags & gBitTable[gActiveBank])
+            gActiveBattler = gBattleAttacker = gBattleTurnOrder[gBattleStruct->wishPerishSongBank];
+            if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
             {
                 gBattleStruct->wishPerishSongBank++;
                 continue;
             }
             gBattleStruct->wishPerishSongBank++;
-            if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG)
+            if (gStatuses3[gActiveBattler] & STATUS3_PERISH_SONG)
             {
-                PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gActiveBank].perishSongTimer1);
-                if (gDisableStructs[gActiveBank].perishSongTimer1 == 0)
+                PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gActiveBattler].perishSongTimer1);
+                if (gDisableStructs[gActiveBattler].perishSongTimer1 == 0)
                 {
-                    gStatuses3[gActiveBank] &= ~STATUS3_PERISH_SONG;
-                    gBattleMoveDamage = gBattleMons[gActiveBank].hp;
+                    gStatuses3[gActiveBattler] &= ~STATUS3_PERISH_SONG;
+                    gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
                     gBattlescriptCurrInstr = BattleScript_PerishSongTakesLife;
                 }
                 else
                 {
-                    gDisableStructs[gActiveBank].perishSongTimer1--;
+                    gDisableStructs[gActiveBattler].perishSongTimer1--;
                     gBattlescriptCurrInstr = BattleScript_PerishSongCountGoesDown;
                 }
                 BattleScriptExecute(gBattlescriptCurrInstr);
@@ -1235,30 +1235,30 @@ bool8 HandleFaintedMonActions(void)
         case 0:
             gBattleStruct->faintedActionsBank = 0;
             gBattleStruct->faintedActionsState++;
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
-                if (gAbsentBankFlags & gBitTable[i] && !sub_80423F4(i, 6, 6))
-                    gAbsentBankFlags &= ~(gBitTable[i]);
+                if (gAbsentBattlerFlags & gBitTable[i] && !sub_80423F4(i, 6, 6))
+                    gAbsentBattlerFlags &= ~(gBitTable[i]);
             }
             // fall through
         case 1:
             do
             {
-                gBank1 = gBankDefender = gBattleStruct->faintedActionsBank;
+                gBank1 = gBattleDefender = gBattleStruct->faintedActionsBank;
                 if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
                  && !(gBattleStruct->field_DF & gBitTable[gBattlePartyID[gBattleStruct->faintedActionsBank]])
-                 && !(gAbsentBankFlags & gBitTable[gBattleStruct->faintedActionsBank]))
+                 && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBank]))
                 {
                     BattleScriptExecute(BattleScript_GiveExp);
                     gBattleStruct->faintedActionsState = 2;
                     return TRUE;
                 }
-            } while (++gBattleStruct->faintedActionsBank != gBattleBanksCount);
+            } while (++gBattleStruct->faintedActionsBank != gBattlersCount);
             gBattleStruct->faintedActionsState = 3;
             break;
         case 2:
             sub_803F9EC(gBank1);
-            if (++gBattleStruct->faintedActionsBank == gBattleBanksCount)
+            if (++gBattleStruct->faintedActionsBank == gBattlersCount)
                 gBattleStruct->faintedActionsState = 3;
             else
                 gBattleStruct->faintedActionsState = 1;
@@ -1270,19 +1270,19 @@ bool8 HandleFaintedMonActions(void)
         case 4:
             do
             {
-                gBank1 = gBankDefender = gBattleStruct->faintedActionsBank;
+                gBank1 = gBattleDefender = gBattleStruct->faintedActionsBank;
                 if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
-                 && !(gAbsentBankFlags & gBitTable[gBattleStruct->faintedActionsBank]))
+                 && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBank]))
                 {
                     BattleScriptExecute(BattleScript_HandleFaintedMon);
                     gBattleStruct->faintedActionsState = 5;
                     return TRUE;
                 }
-            } while (++gBattleStruct->faintedActionsBank != gBattleBanksCount);
+            } while (++gBattleStruct->faintedActionsBank != gBattlersCount);
             gBattleStruct->faintedActionsState = 6;
             break;
         case 5:
-            if (++gBattleStruct->faintedActionsBank == gBattleBanksCount)
+            if (++gBattleStruct->faintedActionsBank == gBattlersCount)
                 gBattleStruct->faintedActionsState = 6;
             else
                 gBattleStruct->faintedActionsState = 4;
@@ -1302,7 +1302,7 @@ bool8 HandleFaintedMonActions(void)
 void TryClearRageStatuses(void)
 {
     int i;
-    for (i = 0; i < gBattleBanksCount; i++)
+    for (i = 0; i < gBattlersCount; i++)
     {
         if ((gBattleMons[i].status2 & STATUS2_RAGE) && gChosenMovesByBanks[i] != MOVE_RAGE)
             gBattleMons[i].status2 &= ~(STATUS2_RAGE);
@@ -1320,17 +1320,17 @@ u8 AtkCanceller_UnableToUseMove(void)
         switch (gBattleStruct->atkCancellerTracker)
         {
         case 0: // flags clear
-            gBattleMons[gBankAttacker].status2 &= ~(STATUS2_DESTINY_BOND);
-            gStatuses3[gBankAttacker] &= ~(STATUS3_GRUDGE);
+            gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_DESTINY_BOND);
+            gStatuses3[gBattleAttacker] &= ~(STATUS3_GRUDGE);
             gBattleStruct->atkCancellerTracker++;
             break;
         case 1: // check being asleep
-            if (gBattleMons[gBankAttacker].status1 & STATUS1_SLEEP)
+            if (gBattleMons[gBattleAttacker].status1 & STATUS1_SLEEP)
             {
-                if (UproarWakeUpCheck(gBankAttacker))
+                if (UproarWakeUpCheck(gBattleAttacker))
                 {
-                    gBattleMons[gBankAttacker].status1 &= ~(STATUS1_SLEEP);
-                    gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+                    gBattleMons[gBattleAttacker].status1 &= ~(STATUS1_SLEEP);
+                    gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                     gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
@@ -1339,15 +1339,15 @@ u8 AtkCanceller_UnableToUseMove(void)
                 else
                 {
                     u8 toSub;
-                    if (gBattleMons[gBankAttacker].ability == ABILITY_EARLY_BIRD)
+                    if (gBattleMons[gBattleAttacker].ability == ABILITY_EARLY_BIRD)
                         toSub = 2;
                     else
                         toSub = 1;
-                    if ((gBattleMons[gBankAttacker].status1 & STATUS1_SLEEP) < toSub)
-                        gBattleMons[gBankAttacker].status1 &= ~(STATUS1_SLEEP);
+                    if ((gBattleMons[gBattleAttacker].status1 & STATUS1_SLEEP) < toSub)
+                        gBattleMons[gBattleAttacker].status1 &= ~(STATUS1_SLEEP);
                     else
-                        gBattleMons[gBankAttacker].status1 -= toSub;
-                    if (gBattleMons[gBankAttacker].status1 & STATUS1_SLEEP)
+                        gBattleMons[gBattleAttacker].status1 -= toSub;
+                    if (gBattleMons[gBattleAttacker].status1 & STATUS1_SLEEP)
                     {
                         if (gCurrentMove != MOVE_SNORE && gCurrentMove != MOVE_SLEEP_TALK)
                         {
@@ -1358,7 +1358,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                     }
                     else
                     {
-                        gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+                        gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                         BattleScriptPushCursor();
                         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                         gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
@@ -1369,7 +1369,7 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 2: // check being frozen
-            if (gBattleMons[gBankAttacker].status1 & STATUS1_FREEZE)
+            if (gBattleMons[gBattleAttacker].status1 & STATUS1_FREEZE)
             {
                 if (Random() % 5)
                 {
@@ -1386,7 +1386,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                 }
                 else // unfreeze
                 {
-                    gBattleMons[gBankAttacker].status1 &= ~(STATUS1_FREEZE);
+                    gBattleMons[gBattleAttacker].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -1396,9 +1396,9 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 3: // truant
-            if (gBattleMons[gBankAttacker].ability == ABILITY_TRUANT && gDisableStructs[gBankAttacker].truantCounter)
+            if (gBattleMons[gBattleAttacker].ability == ABILITY_TRUANT && gDisableStructs[gBattleAttacker].truantCounter)
             {
-                CancelMultiTurnMoves(gBankAttacker);
+                CancelMultiTurnMoves(gBattleAttacker);
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                 gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround;
@@ -1408,11 +1408,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 4: // recharge
-            if (gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE)
+            if (gBattleMons[gBattleAttacker].status2 & STATUS2_RECHARGE)
             {
-                gBattleMons[gBankAttacker].status2 &= ~(STATUS2_RECHARGE);
-                gDisableStructs[gBankAttacker].rechargeCounter = 0;
-                CancelMultiTurnMoves(gBankAttacker);
+                gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_RECHARGE);
+                gDisableStructs[gBattleAttacker].rechargeCounter = 0;
+                CancelMultiTurnMoves(gBattleAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedMustRecharge;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1420,11 +1420,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 5: // flinch
-            if (gBattleMons[gBankAttacker].status2 & STATUS2_FLINCHED)
+            if (gBattleMons[gBattleAttacker].status2 & STATUS2_FLINCHED)
             {
-                gBattleMons[gBankAttacker].status2 &= ~(STATUS2_FLINCHED);
-                gProtectStructs[gBankAttacker].flinchImmobility = 1;
-                CancelMultiTurnMoves(gBankAttacker);
+                gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_FLINCHED);
+                gProtectStructs[gBattleAttacker].flinchImmobility = 1;
+                CancelMultiTurnMoves(gBattleAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedFlinched;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1432,11 +1432,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 6: // disabled move
-            if (gDisableStructs[gBankAttacker].disabledMove == gCurrentMove && gDisableStructs[gBankAttacker].disabledMove != 0)
+            if (gDisableStructs[gBattleAttacker].disabledMove == gCurrentMove && gDisableStructs[gBattleAttacker].disabledMove != 0)
             {
-                gProtectStructs[gBankAttacker].usedDisabledMove = 1;
-                gBattleScripting.bank = gBankAttacker;
-                CancelMultiTurnMoves(gBankAttacker);
+                gProtectStructs[gBattleAttacker].usedDisabledMove = 1;
+                gBattleScripting.battler = gBattleAttacker;
+                CancelMultiTurnMoves(gBattleAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsDisabled;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1444,10 +1444,10 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 7: // taunt
-            if (gDisableStructs[gBankAttacker].tauntTimer1 && gBattleMoves[gCurrentMove].power == 0)
+            if (gDisableStructs[gBattleAttacker].tauntTimer1 && gBattleMoves[gCurrentMove].power == 0)
             {
-                gProtectStructs[gBankAttacker].usedTauntedMove = 1;
-                CancelMultiTurnMoves(gBankAttacker);
+                gProtectStructs[gBattleAttacker].usedTauntedMove = 1;
+                CancelMultiTurnMoves(gBattleAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsTaunted;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1455,10 +1455,10 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 8: // imprisoned
-            if (GetImprisonedMovesCount(gBankAttacker, gCurrentMove))
+            if (GetImprisonedMovesCount(gBattleAttacker, gCurrentMove))
             {
-                gProtectStructs[gBankAttacker].usedImprisionedMove = 1;
-                CancelMultiTurnMoves(gBankAttacker);
+                gProtectStructs[gBattleAttacker].usedImprisionedMove = 1;
+                CancelMultiTurnMoves(gBattleAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsImprisoned;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1466,10 +1466,10 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 9: // confusion
-            if (gBattleMons[gBankAttacker].status2 & STATUS2_CONFUSION)
+            if (gBattleMons[gBattleAttacker].status2 & STATUS2_CONFUSION)
             {
-                gBattleMons[gBankAttacker].status2--;
-                if (gBattleMons[gBankAttacker].status2 & STATUS2_CONFUSION)
+                gBattleMons[gBattleAttacker].status2--;
+                if (gBattleMons[gBattleAttacker].status2 & STATUS2_CONFUSION)
                 {
                     if (Random() & 1)
                     {
@@ -1479,9 +1479,9 @@ u8 AtkCanceller_UnableToUseMove(void)
                     else // confusion dmg
                     {
                         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                        gBankDefender = gBankAttacker;
-                        gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankAttacker], MOVE_POUND, 0, 40, 0, gBankAttacker, gBankAttacker);
-                        gProtectStructs[gBankAttacker].confusionSelfDmg = 1;
+                        gBattleDefender = gBattleAttacker;
+                        gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleAttacker], &gBattleMons[gBattleAttacker], MOVE_POUND, 0, 40, 0, gBattleAttacker, gBattleAttacker);
+                        gProtectStructs[gBattleAttacker].confusionSelfDmg = 1;
                         gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                     }
                     gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfused;
@@ -1496,11 +1496,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 10: // paralysis
-            if ((gBattleMons[gBankAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0)
+            if ((gBattleMons[gBattleAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0)
             {
-                gProtectStructs[gBankAttacker].prlzImmobility = 1;
+                gProtectStructs[gBattleAttacker].prlzImmobility = 1;
                 // This is removed in Emerald for some reason
-                //CancelMultiTurnMoves(gBankAttacker);
+                //CancelMultiTurnMoves(gBattleAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsParalyzed;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1508,17 +1508,17 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 11: // infatuation
-            if (gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION)
+            if (gBattleMons[gBattleAttacker].status2 & STATUS2_INFATUATION)
             {
-                gBattleScripting.bank = CountTrailingZeroBits((gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) >> 0x10);
+                gBattleScripting.battler = CountTrailingZeroBits((gBattleMons[gBattleAttacker].status2 & STATUS2_INFATUATION) >> 0x10);
                 if (Random() & 1)
                     BattleScriptPushCursor();
                 else
                 {
                     BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack);
                     gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
-                    gProtectStructs[gBankAttacker].loveImmobility = 1;
-                    CancelMultiTurnMoves(gBankAttacker);
+                    gProtectStructs[gBattleAttacker].loveImmobility = 1;
+                    CancelMultiTurnMoves(gBattleAttacker);
                 }
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsInLove;
                 effect = 1;
@@ -1526,22 +1526,22 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 12: // bide
-            if (gBattleMons[gBankAttacker].status2 & STATUS2_BIDE)
+            if (gBattleMons[gBattleAttacker].status2 & STATUS2_BIDE)
             {
-                gBattleMons[gBankAttacker].status2 -= 0x100;
-                if (gBattleMons[gBankAttacker].status2 & STATUS2_BIDE)
+                gBattleMons[gBattleAttacker].status2 -= 0x100;
+                if (gBattleMons[gBattleAttacker].status2 & STATUS2_BIDE)
                     gBattlescriptCurrInstr = BattleScript_BideStoringEnergy;
                 else
                 {
                     // This is removed in Emerald for some reason
-                    //gBattleMons[gBankAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
-                    if (gTakenDmg[gBankAttacker])
+                    //gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
+                    if (gTakenDmg[gBattleAttacker])
                     {
                         gCurrentMove = MOVE_BIDE;
-                        *bideDmg = gTakenDmg[gBankAttacker] * 2;
-                        gBankDefender = gTakenDmgBanks[gBankAttacker];
-                        if (gAbsentBankFlags & gBitTable[gBankDefender])
-                            gBankDefender = GetMoveTarget(MOVE_BIDE, 1);
+                        *bideDmg = gTakenDmg[gBattleAttacker] * 2;
+                        gBattleDefender = gTakenDmgBanks[gBattleAttacker];
+                        if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
+                            gBattleDefender = GetMoveTarget(MOVE_BIDE, 1);
                         gBattlescriptCurrInstr = BattleScript_BideAttack;
                     }
                     else
@@ -1552,11 +1552,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 13: // move thawing
-            if (gBattleMons[gBankAttacker].status1 & STATUS1_FREEZE)
+            if (gBattleMons[gBattleAttacker].status1 & STATUS1_FREEZE)
             {
                 if (gBattleMoves[gCurrentMove].effect == EFFECT_THAW_HIT)
                 {
-                    gBattleMons[gBankAttacker].status1 &= ~(STATUS1_FREEZE);
+                    gBattleMons[gBattleAttacker].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -1573,14 +1573,14 @@ u8 AtkCanceller_UnableToUseMove(void)
 
     if (effect == 2)
     {
-        gActiveBank = gBankAttacker;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = gBattleAttacker;
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBufferBankForExecution(gActiveBattler);
     }
     return effect;
 }
 
-bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
+bool8 sub_80423F4(u8 battler, u8 r1, u8 r2)
 {
     struct Pokemon* party;
     u8 r7;
@@ -1590,11 +1590,11 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
         return FALSE;
     if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
     {
-        if (GetBankSide(bank) == SIDE_PLAYER)
+        if (GetBattlerSide(battler) == B_SIDE_PLAYER)
             party = gPlayerParty;
         else
             party = gEnemyParty;
-        r6 = ((bank & 2) / 2);
+        r6 = ((battler & 2) / 2);
         for (i = r6 * 3; i < r6 * 3 + 3; i++)
         {
             if (GetMonData(&party[i], MON_DATA_HP) != 0
@@ -1608,10 +1608,10 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_x800000)
         {
-            if (GetBankSide(bank) == SIDE_PLAYER)
+            if (GetBattlerSide(battler) == B_SIDE_PLAYER)
             {
                 party = gPlayerParty;
-                r7 = GetBankMultiplayerId(bank);
+                r7 = GetBankMultiplayerId(battler);
                 r6 = sub_806D82C(r7);
             }
             else
@@ -1624,14 +1624,14 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
                 #endif // NONMATCHING
 
                 party = gEnemyParty;
-                var = bank ^ 1;
+                var = battler ^ 1;
                 r6 = (var != 0) ? 1 : 0;
             }
         }
         else
         {
-            r7 = GetBankMultiplayerId(bank);
-            if (GetBankSide(bank) == SIDE_PLAYER)
+            r7 = GetBankMultiplayerId(battler);
+            if (GetBattlerSide(battler) == B_SIDE_PLAYER)
                 party = gPlayerParty;
             else
                 party = gEnemyParty;
@@ -1646,11 +1646,11 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
         }
         return (i == r6 * 3 + 3);
     }
-    else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && GetBankSide(bank) == SIDE_OPPONENT)
+    else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && GetBattlerSide(battler) == B_SIDE_OPPONENT)
     {
         party = gEnemyParty;
 
-        if (bank == 1)
+        if (battler == 1)
             r6 = 0;
         else
             r6 = 3;
@@ -1665,16 +1665,16 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2)
     }
     else
     {
-        if (GetBankSide(bank) == SIDE_OPPONENT)
+        if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
         {
-            r7 = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
-            r6 = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+            r7 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+            r6 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
             party = gEnemyParty;
         }
         else
         {
-            r7 = GetBankByPosition(B_POSITION_PLAYER_LEFT);
-            r6 = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+            r7 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+            r6 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
             party = gPlayerParty;
         }
         if (r1 == 6)
@@ -1703,48 +1703,48 @@ enum
     CASTFORM_TO_ICE,    //4
 };
 
-u8 CastformDataTypeChange(u8 bank)
+u8 CastformDataTypeChange(u8 battler)
 {
     u8 formChange = 0;
-    if (gBattleMons[bank].species != SPECIES_CASTFORM || gBattleMons[bank].ability != ABILITY_FORECAST || gBattleMons[bank].hp == 0)
+    if (gBattleMons[battler].species != SPECIES_CASTFORM || gBattleMons[battler].ability != ABILITY_FORECAST || gBattleMons[battler].hp == 0)
         return CASTFORM_NO_CHANGE;
-    if (!WEATHER_HAS_EFFECT && gBattleMons[bank].type1 != TYPE_NORMAL && gBattleMons[bank].type2 != TYPE_NORMAL)
+    if (!WEATHER_HAS_EFFECT && gBattleMons[battler].type1 != TYPE_NORMAL && gBattleMons[battler].type2 != TYPE_NORMAL)
     {
-        gBattleMons[bank].type1 = TYPE_NORMAL;
-        gBattleMons[bank].type2 = TYPE_NORMAL;
+        gBattleMons[battler].type1 = TYPE_NORMAL;
+        gBattleMons[battler].type2 = TYPE_NORMAL;
         return CASTFORM_TO_NORMAL;
     }
     if (!WEATHER_HAS_EFFECT)
         return CASTFORM_NO_CHANGE;
-    if (!(gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SUN_ANY | WEATHER_HAIL)) && gBattleMons[bank].type1 != TYPE_NORMAL && gBattleMons[bank].type2 != TYPE_NORMAL)
+    if (!(gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SUN_ANY | WEATHER_HAIL)) && gBattleMons[battler].type1 != TYPE_NORMAL && gBattleMons[battler].type2 != TYPE_NORMAL)
     {
-        gBattleMons[bank].type1 = TYPE_NORMAL;
-        gBattleMons[bank].type2 = TYPE_NORMAL;
+        gBattleMons[battler].type1 = TYPE_NORMAL;
+        gBattleMons[battler].type2 = TYPE_NORMAL;
         formChange = CASTFORM_TO_NORMAL;
     }
-    if (gBattleWeather & WEATHER_SUN_ANY && gBattleMons[bank].type1 != TYPE_FIRE && gBattleMons[bank].type2 != TYPE_FIRE)
+    if (gBattleWeather & WEATHER_SUN_ANY && gBattleMons[battler].type1 != TYPE_FIRE && gBattleMons[battler].type2 != TYPE_FIRE)
     {
-        gBattleMons[bank].type1 = TYPE_FIRE;
-        gBattleMons[bank].type2 = TYPE_FIRE;
+        gBattleMons[battler].type1 = TYPE_FIRE;
+        gBattleMons[battler].type2 = TYPE_FIRE;
         formChange = CASTFORM_TO_FIRE;
     }
-    if (gBattleWeather & WEATHER_RAIN_ANY && gBattleMons[bank].type1 != TYPE_WATER && gBattleMons[bank].type2 != TYPE_WATER)
+    if (gBattleWeather & WEATHER_RAIN_ANY && gBattleMons[battler].type1 != TYPE_WATER && gBattleMons[battler].type2 != TYPE_WATER)
     {
-        gBattleMons[bank].type1 = TYPE_WATER;
-        gBattleMons[bank].type2 = TYPE_WATER;
+        gBattleMons[battler].type1 = TYPE_WATER;
+        gBattleMons[battler].type2 = TYPE_WATER;
         formChange = CASTFORM_TO_WATER;
     }
-    if (gBattleWeather & WEATHER_HAIL && gBattleMons[bank].type1 != TYPE_ICE && gBattleMons[bank].type2 != TYPE_ICE)
+    if (gBattleWeather & WEATHER_HAIL && gBattleMons[battler].type1 != TYPE_ICE && gBattleMons[battler].type2 != TYPE_ICE)
     {
-        gBattleMons[bank].type1 = TYPE_ICE;
-        gBattleMons[bank].type2 = TYPE_ICE;
+        gBattleMons[battler].type1 = TYPE_ICE;
+        gBattleMons[battler].type2 = TYPE_ICE;
         formChange = CASTFORM_TO_ICE;
     }
     return formChange;
 }
 
 // The largest function in the game, but even it could not save itself from decompiling.
-u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
+u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveArg)
 {
     u8 effect = 0;
     struct Pokemon *pokeAtk;
@@ -1754,19 +1754,19 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
     u32 pidAtk;
     u32 pidDef;
 
-    if (gBankAttacker >= gBattleBanksCount)
-        gBankAttacker = bank;
-    if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
-        pokeAtk = &gPlayerParty[gBattlePartyID[gBankAttacker]];
+    if (gBattleAttacker >= gBattlersCount)
+        gBattleAttacker = battler;
+    if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+        pokeAtk = &gPlayerParty[gBattlePartyID[gBattleAttacker]];
     else
-        pokeAtk = &gEnemyParty[gBattlePartyID[gBankAttacker]];
+        pokeAtk = &gEnemyParty[gBattlePartyID[gBattleAttacker]];
 
-    if (gBankDefender >= gBattleBanksCount)
-        gBankDefender = bank;
-    if (GetBankSide(gBankDefender) == SIDE_PLAYER)
-        pokeDef = &gPlayerParty[gBattlePartyID[gBankDefender]];
+    if (gBattleDefender >= gBattlersCount)
+        gBattleDefender = battler;
+    if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
+        pokeDef = &gPlayerParty[gBattlePartyID[gBattleDefender]];
     else
-        pokeDef = &gEnemyParty[gBattlePartyID[gBankDefender]];
+        pokeDef = &gEnemyParty[gBattlePartyID[gBattleDefender]];
 
     speciesAtk = GetMonData(pokeAtk, MON_DATA_SPECIES);
     pidAtk = GetMonData(pokeAtk, MON_DATA_PERSONALITY);
@@ -1785,7 +1785,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
         if (special)
             gLastUsedAbility = special;
         else
-            gLastUsedAbility = gBattleMons[bank].ability;
+            gLastUsedAbility = gBattleMons[battler].ability;
 
         if (moveArg)
             move = moveArg;
@@ -1797,8 +1797,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
         switch (caseID)
         {
         case ABILITYEFFECT_ON_SWITCHIN: // 0
-            if (gBankAttacker >= gBattleBanksCount)
-                gBankAttacker = bank;
+            if (gBattleAttacker >= gBattlersCount)
+                gBattleAttacker = battler;
             switch (gLastUsedAbility)
             {
             case ABILITYEFFECT_SWITCH_IN_WEATHER:
@@ -1813,7 +1813,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         {
                             gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT);
                             gBattleScripting.animArg1 = B_ANIM_RAIN_CONTINUES;
-                            gBattleScripting.bank = bank;
+                            gBattleScripting.battler = battler;
                             effect++;
                         }
                         break;
@@ -1822,7 +1822,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         {
                             gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY);
                             gBattleScripting.animArg1 = B_ANIM_SANDSTORM_CONTINUES;
-                            gBattleScripting.bank = bank;
+                            gBattleScripting.battler = battler;
                             effect++;
                         }
                         break;
@@ -1831,7 +1831,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                         {
                             gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY);
                             gBattleScripting.animArg1 = B_ANIM_SUN_CONTINUES;
-                            gBattleScripting.bank = bank;
+                            gBattleScripting.battler = battler;
                             effect++;
                         }
                         break;
@@ -1848,7 +1848,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 {
                     gBattleWeather = (WEATHER_RAIN_PERMANENT | WEATHER_RAIN_TEMPORARY);
                     BattleScriptPushCursorAndCallback(BattleScript_DrizzleActivates);
-                    gBattleScripting.bank = bank;
+                    gBattleScripting.battler = battler;
                     effect++;
                 }
                 break;
@@ -1857,7 +1857,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 {
                     gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY);
                     BattleScriptPushCursorAndCallback(BattleScript_SandstreamActivates);
-                    gBattleScripting.bank = bank;
+                    gBattleScripting.battler = battler;
                     effect++;
                 }
                 break;
@@ -1866,44 +1866,44 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 {
                     gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY);
                     BattleScriptPushCursorAndCallback(BattleScript_DroughtActivates);
-                    gBattleScripting.bank = bank;
+                    gBattleScripting.battler = battler;
                     effect++;
                 }
                 break;
             case ABILITY_INTIMIDATE:
-                if (!(gSpecialStatuses[bank].intimidatedPoke))
+                if (!(gSpecialStatuses[battler].intimidatedPoke))
                 {
-                    gStatuses3[bank] |= STATUS3_INTIMIDATE_POKES;
-                    gSpecialStatuses[bank].intimidatedPoke = 1;
+                    gStatuses3[battler] |= STATUS3_INTIMIDATE_POKES;
+                    gSpecialStatuses[battler].intimidatedPoke = 1;
                 }
                 break;
             case ABILITY_FORECAST:
-                effect = CastformDataTypeChange(bank);
+                effect = CastformDataTypeChange(battler);
                 if (effect != 0)
                 {
                     BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
-                    gBattleScripting.bank = bank;
+                    gBattleScripting.battler = battler;
                     *(&gBattleStruct->formToChangeInto) = effect - 1;
                 }
                 break;
             case ABILITY_TRACE:
-                if (!(gSpecialStatuses[bank].traced))
+                if (!(gSpecialStatuses[battler].traced))
                 {
-                    gStatuses3[bank] |= STATUS3_TRACE;
-                    gSpecialStatuses[bank].traced = 1;
+                    gStatuses3[battler] |= STATUS3_TRACE;
+                    gSpecialStatuses[battler].traced = 1;
                 }
                 break;
             case ABILITY_CLOUD_NINE:
             case ABILITY_AIR_LOCK:
                 {
-                    // that's a weird choice for a variable, why not use i or bank?
-                    for (target1 = 0; target1 < gBattleBanksCount; target1++)
+                    // that's a weird choice for a variable, why not use i or battler?
+                    for (target1 = 0; target1 < gBattlersCount; target1++)
                     {
                         effect = CastformDataTypeChange(target1);
                         if (effect != 0)
                         {
                             BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
-                            gBattleScripting.bank = target1;
+                            gBattleScripting.battler = target1;
                             *(&gBattleStruct->formToChangeInto) = effect - 1;
                             break;
                         }
@@ -1913,18 +1913,18 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_ENDTURN: // 1
-            if (gBattleMons[bank].hp != 0)
+            if (gBattleMons[battler].hp != 0)
             {
-                gBankAttacker = bank;
+                gBattleAttacker = battler;
                 switch (gLastUsedAbility)
                 {
                 case ABILITY_RAIN_DISH:
                     if (WEATHER_HAS_EFFECT && (gBattleWeather & WEATHER_RAIN_ANY)
-                     && gBattleMons[bank].maxHP > gBattleMons[bank].hp)
+                     && gBattleMons[battler].maxHP > gBattleMons[battler].hp)
                     {
                         gLastUsedAbility = ABILITY_RAIN_DISH; // why
                         BattleScriptPushCursorAndCallback(BattleScript_RainDishActivates);
-                        gBattleMoveDamage = gBattleMons[bank].maxHP / 16;
+                        gBattleMoveDamage = gBattleMons[battler].maxHP / 16;
                         if (gBattleMoveDamage == 0)
                             gBattleMoveDamage = 1;
                         gBattleMoveDamage *= -1;
@@ -1932,40 +1932,40 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     }
                     break;
                 case ABILITY_SHED_SKIN:
-                    if ((gBattleMons[bank].status1 & STATUS1_ANY) && (Random() % 3) == 0)
+                    if ((gBattleMons[battler].status1 & STATUS1_ANY) && (Random() % 3) == 0)
                     {
-                        if (gBattleMons[bank].status1 & (STATUS1_POISON | STATUS1_TOXIC_POISON))
+                        if (gBattleMons[battler].status1 & (STATUS1_POISON | STATUS1_TOXIC_POISON))
                             StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
-                        if (gBattleMons[bank].status1 & STATUS1_SLEEP)
+                        if (gBattleMons[battler].status1 & STATUS1_SLEEP)
                             StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
-                        if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
+                        if (gBattleMons[battler].status1 & STATUS1_PARALYSIS)
                             StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
-                        if (gBattleMons[bank].status1 & STATUS1_BURN)
+                        if (gBattleMons[battler].status1 & STATUS1_BURN)
                             StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
-                        if (gBattleMons[bank].status1 & STATUS1_FREEZE)
+                        if (gBattleMons[battler].status1 & STATUS1_FREEZE)
                             StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
-                        gBattleMons[bank].status1 = 0;
-                        gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);  // fix nightmare glitch
-                        gBattleScripting.bank = gActiveBank = bank;
+                        gBattleMons[battler].status1 = 0;
+                        gBattleMons[battler].status2 &= ~(STATUS2_NIGHTMARE);  // fix nightmare glitch
+                        gBattleScripting.battler = gActiveBattler = battler;
                         BattleScriptPushCursorAndCallback(BattleScript_ShedSkinActivates);
-                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
-                        MarkBufferBankForExecution(gActiveBank);
+                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[battler].status1);
+                        MarkBufferBankForExecution(gActiveBattler);
                         effect++;
                     }
                     break;
                 case ABILITY_SPEED_BOOST:
-                    if (gBattleMons[bank].statStages[STAT_STAGE_SPEED] < 0xC && gDisableStructs[bank].isFirstTurn != 2)
+                    if (gBattleMons[battler].statStages[STAT_STAGE_SPEED] < 0xC && gDisableStructs[battler].isFirstTurn != 2)
                     {
-                        gBattleMons[bank].statStages[STAT_STAGE_SPEED]++;
+                        gBattleMons[battler].statStages[STAT_STAGE_SPEED]++;
                         gBattleScripting.animArg1 = 0x11;
                         gBattleScripting.animArg2 = 0;
                         BattleScriptPushCursorAndCallback(BattleScript_SpeedBoostActivates);
-                        gBattleScripting.bank = bank;
+                        gBattleScripting.battler = battler;
                         effect++;
                     }
                     break;
                 case ABILITY_TRUANT:
-                    gDisableStructs[gBankAttacker].truantCounter ^= 1;
+                    gDisableStructs[gBattleAttacker].truantCounter ^= 1;
                     break;
                 }
             }
@@ -1980,7 +1980,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 }
                 if (sSoundMovesTable[i] != 0xFFFF)
                 {
-                    if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS)
+                    if (gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS)
                         gHitMarker |= HITMARKER_NO_PPDEDUCT;
                     gBattlescriptCurrInstr = BattleScript_SoundproofProtected;
                     effect = 1;
@@ -1995,7 +1995,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 case ABILITY_VOLT_ABSORB:
                     if (moveType == TYPE_ELECTRIC && gBattleMoves[move].power != 0)
                     {
-                        if (gProtectStructs[gBankAttacker].notFirstStrike)
+                        if (gProtectStructs[gBattleAttacker].notFirstStrike)
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain;
                         else
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss;
@@ -2006,7 +2006,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 case ABILITY_WATER_ABSORB:
                     if (moveType == TYPE_WATER && gBattleMoves[move].power != 0)
                     {
-                        if (gProtectStructs[gBankAttacker].notFirstStrike)
+                        if (gProtectStructs[gBattleAttacker].notFirstStrike)
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain;
                         else
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss;
@@ -2015,23 +2015,23 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     }
                     break;
                 case ABILITY_FLASH_FIRE:
-                    if (moveType == TYPE_FIRE && !(gBattleMons[bank].status1 & STATUS1_FREEZE))
+                    if (moveType == TYPE_FIRE && !(gBattleMons[battler].status1 & STATUS1_FREEZE))
                     {
-                        if (!(gBattleResources->flags->flags[bank] & UNKNOWN_FLAG_FLASH_FIRE))
+                        if (!(gBattleResources->flags->flags[battler] & UNKNOWN_FLAG_FLASH_FIRE))
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-                            if (gProtectStructs[gBankAttacker].notFirstStrike)
+                            if (gProtectStructs[gBattleAttacker].notFirstStrike)
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost;
                             else
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
 
-                            gBattleResources->flags->flags[bank] |= UNKNOWN_FLAG_FLASH_FIRE;
+                            gBattleResources->flags->flags[battler] |= UNKNOWN_FLAG_FLASH_FIRE;
                             effect = 2;
                         }
                         else
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                            if (gProtectStructs[gBankAttacker].notFirstStrike)
+                            if (gProtectStructs[gBattleAttacker].notFirstStrike)
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost;
                             else
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
@@ -2043,16 +2043,16 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 }
                 if (effect == 1)
                 {
-                    if (gBattleMons[bank].maxHP == gBattleMons[bank].hp)
+                    if (gBattleMons[battler].maxHP == gBattleMons[battler].hp)
                     {
-                        if ((gProtectStructs[gBankAttacker].notFirstStrike))
+                        if ((gProtectStructs[gBattleAttacker].notFirstStrike))
                             gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless;
                         else
                             gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless_PPLoss;
                     }
                     else
                     {
-                        gBattleMoveDamage = gBattleMons[bank].maxHP / 4;
+                        gBattleMoveDamage = gBattleMons[battler].maxHP / 4;
                         if (gBattleMoveDamage == 0)
                             gBattleMoveDamage = 1;
                         gBattleMoveDamage *= -1;
@@ -2067,13 +2067,13 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && move != MOVE_STRUGGLE
                  && gBattleMoves[move].power != 0
-                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
-                 && gBattleMons[bank].type1 != moveType
-                 && gBattleMons[bank].type2 != moveType
-                 && gBattleMons[bank].hp != 0)
+                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
+                 && gBattleMons[battler].type1 != moveType
+                 && gBattleMons[battler].type2 != moveType
+                 && gBattleMons[battler].hp != 0)
                 {
-                    gBattleMons[bank].type1 = moveType;
-                    gBattleMons[bank].type2 = moveType;
+                    gBattleMons[battler].type1 = moveType;
+                    gBattleMons[battler].type2 = moveType;
                     PREPARE_TYPE_BUFFER(gBattleTextBuff1, moveType)
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ColorChangeActivates;
@@ -2082,12 +2082,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 break;
             case ABILITY_ROUGH_SKIN:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBankAttacker].hp != 0
-                 && !gProtectStructs[gBankAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
+                 && gBattleMons[gBattleAttacker].hp != 0
+                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT))
                 {
-                    gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 16;
+                    gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     BattleScriptPushCursor();
@@ -2097,9 +2097,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 break;
             case ABILITY_EFFECT_SPORE:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBankAttacker].hp != 0
-                 && !gProtectStructs[gBankAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
+                 && gBattleMons[gBattleAttacker].hp != 0
+                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 10) == 0)
                 {
@@ -2120,9 +2120,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 break;
             case ABILITY_POISON_POINT:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBankAttacker].hp != 0
-                 && !gProtectStructs[gBankAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
+                 && gBattleMons[gBattleAttacker].hp != 0
+                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 3) == 0)
                 {
@@ -2135,9 +2135,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 break;
             case ABILITY_STATIC:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBankAttacker].hp != 0
-                 && !gProtectStructs[gBankAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
+                 && gBattleMons[gBattleAttacker].hp != 0
+                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 3) == 0)
                 {
@@ -2150,10 +2150,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 break;
             case ABILITY_FLAME_BODY:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBankAttacker].hp != 0
-                 && !gProtectStructs[gBankAttacker].confusionSelfDmg
+                 && gBattleMons[gBattleAttacker].hp != 0
+                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
-                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
                  && (Random() % 3) == 0)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_BURN;
@@ -2165,19 +2165,19 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                 break;
             case ABILITY_CUTE_CHARM:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBankAttacker].hp != 0
-                 && !gProtectStructs[gBankAttacker].confusionSelfDmg
+                 && gBattleMons[gBattleAttacker].hp != 0
+                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
-                 && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
-                 && gBattleMons[gBankDefender].hp != 0
+                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
+                 && gBattleMons[gBattleDefender].hp != 0
                  && (Random() % 3) == 0
-                 && gBattleMons[gBankAttacker].ability != ABILITY_OBLIVIOUS
+                 && gBattleMons[gBattleAttacker].ability != ABILITY_OBLIVIOUS
                  && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != GetGenderFromSpeciesAndPersonality(speciesDef, pidDef)
-                 && !(gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION)
+                 && !(gBattleMons[gBattleAttacker].status2 & STATUS2_INFATUATION)
                  && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != MON_GENDERLESS
                  && GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != MON_GENDERLESS)
                 {
-                    gBattleMons[gBankAttacker].status2 |= STATUS2_INFATUATED_WITH(gBankDefender);
+                    gBattleMons[gBattleAttacker].status2 |= STATUS2_INFATUATED_WITH(gBattleDefender);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_CuteCharmActivates;
                     effect++;
@@ -2186,26 +2186,26 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_IMMUNITY: // 5
-            for (bank = 0; bank < gBattleBanksCount; bank++)
+            for (battler = 0; battler < gBattlersCount; battler++)
             {
-                switch (gBattleMons[bank].ability)
+                switch (gBattleMons[battler].ability)
                 {
                 case ABILITY_IMMUNITY:
-                    if (gBattleMons[bank].status1 & (STATUS1_POISON | STATUS1_TOXIC_POISON | STATUS1_TOXIC_COUNTER))
+                    if (gBattleMons[battler].status1 & (STATUS1_POISON | STATUS1_TOXIC_POISON | STATUS1_TOXIC_COUNTER))
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
                         effect = 1;
                     }
                     break;
                 case ABILITY_OWN_TEMPO:
-                    if (gBattleMons[bank].status2 & STATUS2_CONFUSION)
+                    if (gBattleMons[battler].status2 & STATUS2_CONFUSION)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn);
                         effect = 2;
                     }
                     break;
                 case ABILITY_LIMBER:
-                    if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
+                    if (gBattleMons[battler].status1 & STATUS1_PARALYSIS)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
                         effect = 1;
@@ -2213,29 +2213,29 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     break;
                 case ABILITY_INSOMNIA:
                 case ABILITY_VITAL_SPIRIT:
-                    if (gBattleMons[bank].status1 & STATUS1_SLEEP)
+                    if (gBattleMons[battler].status1 & STATUS1_SLEEP)
                     {
-                        gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
+                        gBattleMons[battler].status2 &= ~(STATUS2_NIGHTMARE);
                         StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
                         effect = 1;
                     }
                     break;
                 case ABILITY_WATER_VEIL:
-                    if (gBattleMons[bank].status1 & STATUS1_BURN)
+                    if (gBattleMons[battler].status1 & STATUS1_BURN)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
                         effect = 1;
                     }
                     break;
                 case ABILITY_MAGMA_ARMOR:
-                    if (gBattleMons[bank].status1 & STATUS1_FREEZE)
+                    if (gBattleMons[battler].status1 & STATUS1_FREEZE)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
                         effect = 1;
                     }
                     break;
                 case ABILITY_OBLIVIOUS:
-                    if (gBattleMons[bank].status2 & STATUS2_INFATUATION)
+                    if (gBattleMons[battler].status2 & STATUS2_INFATUATION)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
                         effect = 3;
@@ -2247,36 +2247,36 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     switch (effect)
                     {
                     case 1: // status cleared
-                        gBattleMons[bank].status1 = 0;
+                        gBattleMons[battler].status1 = 0;
                         break;
                     case 2: // get rid of confusion
-                        gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
+                        gBattleMons[battler].status2 &= ~(STATUS2_CONFUSION);
                         break;
                     case 3: // get rid of infatuation
-                        gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION);
+                        gBattleMons[battler].status2 &= ~(STATUS2_INFATUATION);
                         break;
                     }
 
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus;
-                    gBattleScripting.bank = bank;
-                    gActiveBank = bank;
-                    EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-                    MarkBufferBankForExecution(gActiveBank);
+                    gBattleScripting.battler = battler;
+                    gActiveBattler = battler;
+                    EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                    MarkBufferBankForExecution(gActiveBattler);
                     return effect;
                 }
             }
             break;
         case ABILITYEFFECT_FORECAST: // 6
-            for (bank = 0; bank < gBattleBanksCount; bank++)
+            for (battler = 0; battler < gBattlersCount; battler++)
             {
-                if (gBattleMons[bank].ability == ABILITY_FORECAST)
+                if (gBattleMons[battler].ability == ABILITY_FORECAST)
                 {
-                    effect = CastformDataTypeChange(bank);
+                    effect = CastformDataTypeChange(battler);
                     if (effect)
                     {
                         BattleScriptPushCursorAndCallback(BattleScript_CastformChange);
-                        gBattleScripting.bank = bank;
+                        gBattleScripting.battler = battler;
                         *(&gBattleStruct->formToChangeInto) = effect - 1;
                         return effect;
                     }
@@ -2292,7 +2292,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
 
                 gBattleCommunication[MOVE_EFFECT_BYTE] = gBattleStruct->synchronizeMoveEffect + MOVE_EFFECT_AFFECTS_USER;
-                gBattleScripting.bank = gBankDefender;
+                gBattleScripting.battler = gBattleDefender;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
                 gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
@@ -2308,7 +2308,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
 
                 gBattleCommunication[MOVE_EFFECT_BYTE] = gBattleStruct->synchronizeMoveEffect;
-                gBattleScripting.bank = gBankAttacker;
+                gBattleScripting.battler = gBattleAttacker;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
                 gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
@@ -2316,7 +2316,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_INTIMIDATE1: // 9
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].ability == ABILITY_INTIMIDATE && gStatuses3[i] & STATUS3_INTIMIDATE_POKES)
                 {
@@ -2330,42 +2330,42 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_TRACE: // 11
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].ability == ABILITY_TRACE && (gStatuses3[i] & STATUS3_TRACE))
                 {
                     u8 target2;
-                    side = (GetBankPosition(i) ^ BIT_SIDE) & BIT_SIDE; // side of the opposing pokemon
-                    target1 = GetBankByPosition(side);
-                    target2 = GetBankByPosition(side + BIT_MON);
+                    side = (GetBattlerPosition(i) ^ BIT_SIDE) & BIT_SIDE; // side of the opposing pokemon
+                    target1 = GetBattlerAtPosition(side);
+                    target2 = GetBattlerAtPosition(side + BIT_FLANK);
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
                     {
                         if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0
                          && gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0)
                         {
-                            gActiveBank = GetBankByPosition(((Random() & 1) * 2) | side);
-                            gBattleMons[i].ability = gBattleMons[gActiveBank].ability;
-                            gLastUsedAbility = gBattleMons[gActiveBank].ability;
+                            gActiveBattler = GetBattlerAtPosition(((Random() & 1) * 2) | side);
+                            gBattleMons[i].ability = gBattleMons[gActiveBattler].ability;
+                            gLastUsedAbility = gBattleMons[gActiveBattler].ability;
                             effect++;
                         }
                         else if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0)
                         {
-                            gActiveBank = target1;
-                            gBattleMons[i].ability = gBattleMons[gActiveBank].ability;
-                            gLastUsedAbility = gBattleMons[gActiveBank].ability;
+                            gActiveBattler = target1;
+                            gBattleMons[i].ability = gBattleMons[gActiveBattler].ability;
+                            gLastUsedAbility = gBattleMons[gActiveBattler].ability;
                             effect++;
                         }
                         else if (gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0)
                         {
-                            gActiveBank = target2;
-                            gBattleMons[i].ability = gBattleMons[gActiveBank].ability;
-                            gLastUsedAbility = gBattleMons[gActiveBank].ability;
+                            gActiveBattler = target2;
+                            gBattleMons[i].ability = gBattleMons[gActiveBattler].ability;
+                            gLastUsedAbility = gBattleMons[gActiveBattler].ability;
                             effect++;
                         }
                     }
                     else
                     {
-                        gActiveBank = target1;
+                        gActiveBattler = target1;
                         if (gBattleMons[target1].ability && gBattleMons[target1].hp)
                         {
                             gBattleMons[i].ability = gBattleMons[target1].ability;
@@ -2377,9 +2377,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
                     {
                         BattleScriptPushCursorAndCallback(BattleScript_TraceActivates);
                         gStatuses3[i] &= ~(STATUS3_TRACE);
-                        gBattleScripting.bank = i;
+                        gBattleScripting.battler = i;
 
-                        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBank, gBattlePartyID[gActiveBank])
+                        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattlePartyID[gActiveBattler])
                         PREPARE_ABILITY_BUFFER(gBattleTextBuff2, gLastUsedAbility)
                         break;
                     }
@@ -2387,7 +2387,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_INTIMIDATE2: // 10
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].ability == ABILITY_INTIMIDATE && (gStatuses3[i] & STATUS3_INTIMIDATE_POKES))
                 {
@@ -2402,10 +2402,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_CHECK_OTHER_SIDE: // 12
-            side = GetBankSide(bank);
-            for (i = 0; i < gBattleBanksCount; i++)
+            side = GetBattlerSide(battler);
+            for (i = 0; i < gBattlersCount; i++)
             {
-                if (GetBankSide(i) != side && gBattleMons[i].ability == ability)
+                if (GetBattlerSide(i) != side && gBattleMons[i].ability == ability)
                 {
                     gLastUsedAbility = ability;
                     effect = i + 1;
@@ -2413,10 +2413,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_CHECK_BANK_SIDE: // 13
-            side = GetBankSide(bank);
-            for (i = 0; i < gBattleBanksCount; i++)
+            side = GetBattlerSide(battler);
+            for (i = 0; i < gBattlersCount; i++)
             {
-                if (GetBankSide(i) == side && gBattleMons[i].ability == ability)
+                if (GetBattlerSide(i) == side && gBattleMons[i].ability == ability)
                 {
                     gLastUsedAbility = ability;
                     effect = i + 1;
@@ -2427,21 +2427,21 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             switch (gLastUsedAbility)
             {
             case 0xFD:
-                for (i = 0; i < gBattleBanksCount; i++)
+                for (i = 0; i < gBattlersCount; i++)
                 {
                     if (gStatuses3[i] & STATUS3_MUDSPORT)
                         effect = i + 1;
                 }
                 break;
             case 0xFE:
-                for (i = 0; i < gBattleBanksCount; i++)
+                for (i = 0; i < gBattlersCount; i++)
                 {
                     if (gStatuses3[i] & STATUS3_WATERSPORT)
                         effect = i + 1;
                 }
                 break;
             default:
-                for (i = 0; i < gBattleBanksCount; i++)
+                for (i = 0; i < gBattlersCount; i++)
                 {
                     if (gBattleMons[i].ability == ability)
                     {
@@ -2453,7 +2453,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_CHECK_ON_FIELD: // 19
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].ability == ability && gBattleMons[i].hp != 0)
                 {
@@ -2463,9 +2463,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK: // 15
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
-                if (gBattleMons[i].ability == ability && i != bank)
+                if (gBattleMons[i].ability == ability && i != battler)
                 {
                     gLastUsedAbility = ability;
                     effect = i + 1;
@@ -2473,10 +2473,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_COUNT_OTHER_SIDE: // 16
-            side = GetBankSide(bank);
-            for (i = 0; i < gBattleBanksCount; i++)
+            side = GetBattlerSide(battler);
+            for (i = 0; i < gBattlersCount; i++)
             {
-                if (GetBankSide(i) != side && gBattleMons[i].ability == ability)
+                if (GetBattlerSide(i) != side && gBattleMons[i].ability == ability)
                 {
                     gLastUsedAbility = ability;
                     effect++;
@@ -2484,10 +2484,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_COUNT_BANK_SIDE: // 17
-            side = GetBankSide(bank);
-            for (i = 0; i < gBattleBanksCount; i++)
+            side = GetBattlerSide(battler);
+            for (i = 0; i < gBattlersCount; i++)
             {
-                if (GetBankSide(i) == side && gBattleMons[i].ability == ability)
+                if (GetBattlerSide(i) == side && gBattleMons[i].ability == ability)
                 {
                     gLastUsedAbility = ability;
                     effect++;
@@ -2495,9 +2495,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
             }
             break;
         case ABILITYEFFECT_COUNT_ON_FIELD: // 18
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
-                if (gBattleMons[i].ability == ability && i != bank)
+                if (gBattleMons[i].ability == ability && i != battler)
                 {
                     gLastUsedAbility = ability;
                     effect++;
@@ -2507,7 +2507,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
         }
 
         if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != 0xFF)
-            RecordAbilityBattle(bank, gLastUsedAbility);
+            RecordAbilityBattle(battler, gLastUsedAbility);
     }
 
     return effect;
@@ -2560,11 +2560,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
         bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem);
     }
 
-    atkItem = gBattleMons[gBankAttacker].item;
+    atkItem = gBattleMons[gBattleAttacker].item;
     if (atkItem == ITEM_ENIGMA_BERRY)
     {
-        atkHoldEffect = gEnigmaBerries[gBankAttacker].holdEffect;
-        atkQuality = gEnigmaBerries[gBankAttacker].holdEffectParam;
+        atkHoldEffect = gEnigmaBerries[gBattleAttacker].holdEffect;
+        atkQuality = gEnigmaBerries[gBattleAttacker].holdEffectParam;
     }
     else
     {
@@ -2573,11 +2573,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     }
 
     // def variables are unused
-    defItem = gBattleMons[gBankDefender].item;
+    defItem = gBattleMons[gBattleDefender].item;
     if (defItem == ITEM_ENIGMA_BERRY)
     {
-        defHoldEffect = gEnigmaBerries[gBankDefender].holdEffect;
-        defQuality = gEnigmaBerries[gBankDefender].holdEffectParam;
+        defHoldEffect = gEnigmaBerries[gBattleDefender].holdEffect;
+        defQuality = gEnigmaBerries[gBattleDefender].holdEffectParam;
     }
     else
     {
@@ -2591,7 +2591,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
         switch (bankHoldEffect)
         {
         case HOLD_EFFECT_DOUBLE_PRIZE:
-            if (GetBankSide(bank) == SIDE_PLAYER)
+            if (GetBattlerSide(bank) == B_SIDE_PLAYER)
                 gBattleStruct->moneyMultiplier = 2;
             break;
         case HOLD_EFFECT_RESTORE_STATS:
@@ -2605,9 +2605,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             }
             if (effect)
             {
-                gBattleScripting.bank = bank;
+                gBattleScripting.battler = bank;
                 gStringBank = bank;
-                gActiveBank = gBankAttacker = bank;
+                gActiveBattler = gBattleAttacker = bank;
                 BattleScriptExecute(BattleScript_WhiteHerbEnd2);
             }
             break;
@@ -2636,7 +2636,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     u8 ppBonuses;
                     u16 move;
 
-                    if (GetBankSide(bank) == SIDE_PLAYER)
+                    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
                         mon = &gPlayerParty[gBattlePartyID[bank]];
                     else
                         mon = &gEnemyParty[gBattlePartyID[bank]];
@@ -2660,7 +2660,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
 
                         BattleScriptExecute(BattleScript_BerryPPHealEnd2);
                         EmitSetMonData(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
-                        MarkBufferBankForExecution(gActiveBank);
+                        MarkBufferBankForExecution(gActiveBattler);
                         effect = ITEM_PP_CHANGE;
                     }
                 }
@@ -2676,9 +2676,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 if (effect)
                 {
-                    gBattleScripting.bank = bank;
+                    gBattleScripting.battler = bank;
                     gStringBank = bank;
-                    gActiveBank = gBankAttacker = bank;
+                    gActiveBattler = gBattleAttacker = bank;
                     BattleScriptExecute(BattleScript_WhiteHerbEnd2);
                 }
                 break;
@@ -3004,14 +3004,14 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             }
             if (effect)
             {
-                gBattleScripting.bank = bank;
+                gBattleScripting.battler = bank;
                 gStringBank = bank;
-                gActiveBank = gBankAttacker = bank;
+                gActiveBattler = gBattleAttacker = bank;
                 switch (effect)
                 {
                 case ITEM_STATUS_CHANGE:
                     EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
-                    MarkBufferBankForExecution(gActiveBank);
+                    MarkBufferBankForExecution(gActiveBattler);
                     break;
                 case ITEM_PP_CHANGE:
                     if (!(gBattleMons[bank].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[bank].unk18_b & gBitTable[i]))
@@ -3024,7 +3024,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     case 2:
         break;
     case 3:
-        for (bank = 0; bank < gBattleBanksCount; bank++)
+        for (bank = 0; bank < gBattlersCount; bank++)
         {
             gLastUsedItem = gBattleMons[bank].item;
             if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY)
@@ -3152,7 +3152,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 if (effect)
                 {
-                    gBattleScripting.bank = bank;
+                    gBattleScripting.battler = bank;
                     gStringBank = bank;
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_WhiteHerbRet;
@@ -3162,11 +3162,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             }
             if (effect)
             {
-                gBattleScripting.bank = bank;
+                gBattleScripting.battler = bank;
                 gStringBank = bank;
-                gActiveBank = bank;
-                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-                MarkBufferBankForExecution(gActiveBank);
+                gActiveBattler = bank;
+                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                MarkBufferBankForExecution(gActiveBattler);
                 break;
             }
         }
@@ -3178,10 +3178,10 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             {
             case HOLD_EFFECT_FLINCH:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                    && (gSpecialStatuses[gBankDefender].moveturnLostHP_physical || gSpecialStatuses[gBankDefender].moveturnLostHP_special)
+                    && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
                     && (Random() % 100) < atkQuality
                     && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED
-                    && gBattleMons[gBankDefender].hp)
+                    && gBattleMons[gBattleDefender].hp)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_FLINCH;
                     BattleScriptPushCursor();
@@ -3191,19 +3191,19 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 break;
             case HOLD_EFFECT_SHELL_BELL:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                    && gSpecialStatuses[gBankDefender].moveturnLostHP != 0
-                    && gSpecialStatuses[gBankDefender].moveturnLostHP != 0xFFFF
-                    && gBankAttacker != gBankDefender
-                    && gBattleMons[gBankAttacker].hp != gBattleMons[gBankAttacker].maxHP
-                    && gBattleMons[gBankAttacker].hp != 0)
+                    && gSpecialStatuses[gBattleDefender].moveturnLostHP != 0
+                    && gSpecialStatuses[gBattleDefender].moveturnLostHP != 0xFFFF
+                    && gBattleAttacker != gBattleDefender
+                    && gBattleMons[gBattleAttacker].hp != gBattleMons[gBattleAttacker].maxHP
+                    && gBattleMons[gBattleAttacker].hp != 0)
                 {
                     gLastUsedItem = atkItem;
-                    gStringBank = gBankAttacker;
-                    gBattleScripting.bank = gBankAttacker;
-                    gBattleMoveDamage = (gSpecialStatuses[gBankDefender].moveturnLostHP / atkQuality) * -1;
+                    gStringBank = gBattleAttacker;
+                    gBattleScripting.battler = gBattleAttacker;
+                    gBattleMoveDamage = (gSpecialStatuses[gBattleDefender].moveturnLostHP / atkQuality) * -1;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = -1;
-                    gSpecialStatuses[gBankDefender].moveturnLostHP = 0;
+                    gSpecialStatuses[gBattleDefender].moveturnLostHP = 0;
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ItemHealHP_Ret;
                     effect++;
@@ -3244,21 +3244,21 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     switch (moveTarget)
     {
     case MOVE_TARGET_SELECTED:
-        side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
+        side = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
             targetBank = gSideTimers[side].followmeTarget;
         else
         {
-            side = GetBankSide(gBankAttacker);
+            side = GetBattlerSide(gBattleAttacker);
             do
             {
-                targetBank = Random() % gBattleBanksCount;
-            } while (targetBank == gBankAttacker || side == GetBankSide(targetBank) || gAbsentBankFlags & gBitTable[targetBank]);
+                targetBank = Random() % gBattlersCount;
+            } while (targetBank == gBattleAttacker || side == GetBattlerSide(targetBank) || gAbsentBattlerFlags & gBitTable[targetBank]);
             if (gBattleMoves[move].type == TYPE_ELECTRIC
-                && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBankAttacker, ABILITY_LIGHTNING_ROD, 0, 0)
+                && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattleAttacker, ABILITY_LIGHTNING_ROD, 0, 0)
                 && gBattleMons[targetBank].ability != ABILITY_LIGHTNING_ROD)
             {
-                targetBank ^= BIT_MON;
+                targetBank ^= BIT_FLANK;
                 RecordAbilityBattle(targetBank, gBattleMons[targetBank].ability);
                 gSpecialStatuses[targetBank].lightningRodRedirected = 1;
             }
@@ -3268,50 +3268,50 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     case MOVE_TARGET_BOTH:
     case MOVE_TARGET_FOES_AND_ALLY:
     case MOVE_TARGET_OPPONENTS_FIELD:
-        targetBank = GetBankByPosition((GetBankPosition(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
-        if (gAbsentBankFlags & gBitTable[targetBank])
-            targetBank ^= BIT_MON;
+        targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattleAttacker) & BIT_SIDE) ^ BIT_SIDE);
+        if (gAbsentBattlerFlags & gBitTable[targetBank])
+            targetBank ^= BIT_FLANK;
         break;
     case MOVE_TARGET_RANDOM:
-        side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
+        side = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
             targetBank = gSideTimers[side].followmeTarget;
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & MOVE_TARGET_RANDOM)
         {
-            if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
+            if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
             {
                 if (Random() & 1)
-                    targetBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+                    targetBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
                 else
-                    targetBank = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+                    targetBank = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
             }
             else
             {
                 if (Random() & 1)
-                    targetBank = GetBankByPosition(B_POSITION_PLAYER_LEFT);
+                    targetBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
                 else
-                    targetBank = GetBankByPosition(B_POSITION_PLAYER_RIGHT);
+                    targetBank = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
             }
-            if (gAbsentBankFlags & gBitTable[targetBank])
-                targetBank ^= BIT_MON;
+            if (gAbsentBattlerFlags & gBitTable[targetBank])
+                targetBank ^= BIT_FLANK;
         }
         else
-            targetBank = GetBankByPosition((GetBankPosition(gBankAttacker) & BIT_SIDE) ^ BIT_SIDE);
+            targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattleAttacker) & BIT_SIDE) ^ BIT_SIDE);
         break;
     case MOVE_TARGET_USER:
     case MOVE_TARGET_x10:
-        targetBank = gBankAttacker;
+        targetBank = gBattleAttacker;
         break;
     }
 
-    *(gBattleStruct->moveTarget + gBankAttacker) = targetBank;
+    *(gBattleStruct->moveTarget + gBattleAttacker) = targetBank;
 
     return targetBank;
 }
 
 static bool32 HasObedientBitSet(u8 bank)
 {
-    if (GetBankSide(bank) == SIDE_OPPONENT)
+    if (GetBattlerSide(bank) == B_SIDE_OPPONENT)
         return TRUE;
     if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS
         && GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES, NULL) != SPECIES_MEW)
@@ -3327,18 +3327,18 @@ u8 IsMonDisobedient(void)
 
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
         return 0;
-    if (GetBankSide(gBankAttacker) == SIDE_OPPONENT)
+    if (GetBattlerSide(gBattleAttacker) == B_SIDE_OPPONENT)
         return 0;
 
-    if (HasObedientBitSet(gBankAttacker)) // only if species is Mew or Deoxys
+    if (HasObedientBitSet(gBattleAttacker)) // only if species is Mew or Deoxys
     {
-        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBankPosition(gBankAttacker) == 2)
+        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(gBattleAttacker) == 2)
             return 0;
         if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
             return 0;
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
             return 0;
-        if (!IsOtherTrainer(gBattleMons[gBankAttacker].otId, gBattleMons[gBankAttacker].otName))
+        if (!IsOtherTrainer(gBattleMons[gBattleAttacker].otId, gBattleMons[gBattleAttacker].otName))
             return 0;
         if (FlagGet(FLAG_BADGE08_GET))
             return 0;
@@ -3353,27 +3353,27 @@ u8 IsMonDisobedient(void)
             obedienceLevel = 70;
     }
 
-    if (gBattleMons[gBankAttacker].level <= obedienceLevel)
+    if (gBattleMons[gBattleAttacker].level <= obedienceLevel)
         return 0;
     rnd = (Random() & 255);
-    calc = (gBattleMons[gBankAttacker].level + obedienceLevel) * rnd >> 8;
+    calc = (gBattleMons[gBattleAttacker].level + obedienceLevel) * rnd >> 8;
     if (calc < obedienceLevel)
         return 0;
 
     // is not obedient
     if (gCurrentMove == MOVE_RAGE)
-        gBattleMons[gBankAttacker].status2 &= ~(STATUS2_RAGE);
-    if (gBattleMons[gBankAttacker].status1 & STATUS1_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK))
+        gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_RAGE);
+    if (gBattleMons[gBattleAttacker].status1 & STATUS1_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK))
     {
         gBattlescriptCurrInstr = BattleScript_82DB695;
         return 1;
     }
 
     rnd = (Random() & 255);
-    calc = (gBattleMons[gBankAttacker].level + obedienceLevel) * rnd >> 8;
+    calc = (gBattleMons[gBattleAttacker].level + obedienceLevel) * rnd >> 8;
     if (calc < obedienceLevel)
     {
-        calc = CheckMoveLimitations(gBankAttacker, gBitTable[gCurrMovePos], 0xFF);
+        calc = CheckMoveLimitations(gBattleAttacker, gBitTable[gCurrMovePos], 0xFF);
         if (calc == 0xF) // all moves cannot be used
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3;
@@ -3387,28 +3387,28 @@ u8 IsMonDisobedient(void)
                 gCurrMovePos = gUnknown_020241E9 = Random() & 3;
             } while (gBitTable[gCurrMovePos] & calc);
 
-            gRandomMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+            gRandomMove = gBattleMons[gBattleAttacker].moves[gCurrMovePos];
             gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove;
-            gBankDefender = GetMoveTarget(gRandomMove, 0);
+            gBattleDefender = GetMoveTarget(gRandomMove, 0);
             gHitMarker |= HITMARKER_x200000;
             return 2;
         }
     }
     else
     {
-        obedienceLevel = gBattleMons[gBankAttacker].level - obedienceLevel;
+        obedienceLevel = gBattleMons[gBattleAttacker].level - obedienceLevel;
 
         calc = (Random() & 255);
-        if (calc < obedienceLevel && !(gBattleMons[gBankAttacker].status1 & STATUS1_ANY) && gBattleMons[gBankAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBankAttacker].ability != ABILITY_INSOMNIA)
+        if (calc < obedienceLevel && !(gBattleMons[gBattleAttacker].status1 & STATUS1_ANY) && gBattleMons[gBattleAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBattleAttacker].ability != ABILITY_INSOMNIA)
         {
             // try putting asleep
             int i;
-            for (i = 0; i < gBattleBanksCount; i++)
+            for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleMons[i].status2 & STATUS2_UPROAR)
                     break;
             }
-            if (i == gBattleBanksCount)
+            if (i == gBattlersCount)
             {
                 gBattlescriptCurrInstr = BattleScript_IgnoresAndFallsAsleep;
                 return 1;
@@ -3417,8 +3417,8 @@ u8 IsMonDisobedient(void)
         calc -= obedienceLevel;
         if (calc < obedienceLevel)
         {
-            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankAttacker], MOVE_POUND, 0, 40, 0, gBankAttacker, gBankAttacker);
-            gBankDefender = gBankAttacker;
+            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleAttacker], &gBattleMons[gBattleAttacker], MOVE_POUND, 0, 40, 0, gBattleAttacker, gBattleAttacker);
+            gBattleDefender = gBattleAttacker;
             gBattlescriptCurrInstr = BattleScript_82DB6F0;
             gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
             return 2;
diff --git a/src/battle_util2.c b/src/battle_util2.c
index fb01865a4..5c7434aa0 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -8,12 +8,12 @@
 #include "random.h"
 #include "battle_scripts.h"
 
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_0203CF00[];
 extern const u8 *gBattlescriptCurrInstr;
 extern u8 gBattleCommunication[];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 
 extern void sub_81D55D0(void);
 extern void sub_81D5694(void);
@@ -87,15 +87,15 @@ void AdjustFriendshipOnBattleFaint(u8 bank)
     {
         u8 opposingBank2;
 
-        opposingBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
-        opposingBank2 = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+        opposingBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        opposingBank2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
 
         if (gBattleMons[opposingBank2].level > gBattleMons[opposingBank].level)
             opposingBank = opposingBank2;
     }
     else
     {
-        opposingBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+        opposingBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
     }
 
     if (gBattleMons[opposingBank].level > gBattleMons[bank].level)
@@ -113,7 +113,7 @@ void AdjustFriendshipOnBattleFaint(u8 bank)
 
 void sub_80571DC(u8 bank, u8 arg1)
 {
-    if (GetBankSide(bank) != SIDE_OPPONENT)
+    if (GetBattlerSide(bank) != B_SIDE_OPPONENT)
     {
         s32 i;
 
@@ -206,9 +206,9 @@ u32 sub_805725C(u8 bank)
 
     if (effect == 2)
     {
-        gActiveBank = bank;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
-        MarkBufferBankForExecution(gActiveBank);
+        gActiveBattler = bank;
+        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBufferBankForExecution(gActiveBattler);
     }
 
     return effect;
diff --git a/src/pokeball.c b/src/pokeball.c
index f16096429..424ecb0eb 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -16,8 +16,8 @@
 #include "graphics.h"
 
 extern bool8 gDoingBattleAnim;
-extern u8 gActiveBank;
-extern u8 gBankDefender;
+extern u8 gActiveBattler;
+extern u8 gBattleDefender;
 extern u16 gBattlePartyID[];
 extern u8 gBankSpriteIds[];
 extern u8 gHealthBoxesIds[];
@@ -334,12 +334,12 @@ u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow)
     u8 taskId;
 
     gDoingBattleAnim = TRUE;
-    gBattleSpritesDataPtr->healthBoxesData[gActiveBank].ballAnimActive = 1;
+    gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive = 1;
 
     taskId = CreateTask(Task_DoPokeballSendOutAnim, 5);
     gTasks[taskId].tPan = pan;
     gTasks[taskId].tThrowId = kindOfThrow;
-    gTasks[taskId].tBank = gActiveBank;
+    gTasks[taskId].tBank = gActiveBattler;
 
     return 0;
 }
@@ -363,7 +363,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     throwCaseId = gTasks[taskId].tThrowId;
     bank = gTasks[taskId].tBank;
 
-    if (GetBankSide(bank) != SIDE_PLAYER)
+    if (GetBattlerSide(bank) != B_SIDE_PLAYER)
         itemId = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
     else
         itemId = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
@@ -378,7 +378,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     switch (throwCaseId)
     {
     case POKEBALL_PLAYER_SENDOUT:
-        gBankDefender = bank;
+        gBattleDefender = bank;
         gSprites[ballSpriteId].pos1.x = 24;
         gSprites[ballSpriteId].pos1.y = 68;
         gSprites[ballSpriteId].callback = SpriteCB_PlayerMonSendOut_1;
@@ -386,17 +386,17 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     case POKEBALL_OPPONENT_SENDOUT:
         gSprites[ballSpriteId].pos1.x = GetBankCoord(bank, BANK_X_POS);
         gSprites[ballSpriteId].pos1.y = GetBankCoord(bank, BANK_Y_POS) + 24;
-        gBankDefender = bank;
+        gBattleDefender = bank;
         gSprites[ballSpriteId].data[0] = 0;
         gSprites[ballSpriteId].callback = SpriteCB_OpponentMonSendOut;
         break;
     default:
-        gBankDefender = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+        gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         notSendOut = TRUE;
         break;
     }
 
-    gSprites[ballSpriteId].sBank = gBankDefender;
+    gSprites[ballSpriteId].sBank = gBattleDefender;
     if (!notSendOut)
     {
         DestroyTask(taskId);
@@ -405,12 +405,12 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
 
     // this will perform an unused ball throw animation
     gSprites[ballSpriteId].data[0] = 0x22;
-    gSprites[ballSpriteId].data[2] = GetBankCoord(gBankDefender, BANK_X_POS);
-    gSprites[ballSpriteId].data[4] = GetBankCoord(gBankDefender, BANK_Y_POS) - 16;
+    gSprites[ballSpriteId].data[2] = GetBankCoord(gBattleDefender, BANK_X_POS);
+    gSprites[ballSpriteId].data[4] = GetBankCoord(gBattleDefender, BANK_Y_POS) - 16;
     gSprites[ballSpriteId].data[5] = -40;
     sub_80A68D4(&gSprites[ballSpriteId]);
     gSprites[ballSpriteId].oam.affineParam = taskId;
-    gTasks[taskId].tOpponentBank = gBankDefender;
+    gTasks[taskId].tOpponentBank = gBattleDefender;
     gTasks[taskId].func = TaskDummy;
     PlaySE(SE_NAGERU);
 }
@@ -755,7 +755,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
         u16 wantedCryCase;
         u8 taskId;
 
-        if (GetBankSide(bank) != SIDE_PLAYER)
+        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
         {
             mon = &gEnemyParty[gBattlePartyID[bank]];
             pan = 25;
@@ -767,7 +767,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
         }
 
         species = GetMonData(mon, MON_DATA_SPECIES);
-        if ((bank == GetBankByPosition(B_POSITION_PLAYER_LEFT) || bank == GetBankByPosition(B_POSITION_OPPONENT_LEFT))
+        if ((bank == GetBattlerAtPosition(B_POSITION_PLAYER_LEFT) || bank == GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT))
          && IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
@@ -783,7 +783,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
 
         if (!IsDoubleBattle() || !gBattleSpritesDataPtr->animationData->field_9_x1)
             wantedCryCase = 0;
-        else if (bank == GetBankByPosition(B_POSITION_PLAYER_LEFT) || bank == GetBankByPosition(B_POSITION_OPPONENT_LEFT))
+        else if (bank == GetBattlerAtPosition(B_POSITION_PLAYER_LEFT) || bank == GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT))
             wantedCryCase = 1;
         else
             wantedCryCase = 2;
@@ -803,7 +803,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
 
     StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->sBank]], 1);
 
-    if (GetBankSide(sprite->sBank) == SIDE_OPPONENT)
+    if (GetBattlerSide(sprite->sBank) == B_SIDE_OPPONENT)
         gSprites[gBankSpriteIds[sprite->sBank]].callback = sub_8039B58;
     else
         gSprites[gBankSpriteIds[sprite->sBank]].callback = sub_8039E44;
@@ -859,12 +859,12 @@ static void HandleBallAnimEnd(struct Sprite *sprite)
         FreeSpriteOamMatrix(sprite);
         DestroySprite(sprite);
 
-        for (doneBanks = 0, i = 0; i < BATTLE_BANKS_COUNT; i++)
+        for (doneBanks = 0, i = 0; i < MAX_BATTLERS_COUNT; i++)
         {
             if (gBattleSpritesDataPtr->healthBoxesData[i].ballAnimActive == 0)
                 doneBanks++;
         }
-        if (doneBanks == BATTLE_BANKS_COUNT)
+        if (doneBanks == MAX_BATTLERS_COUNT)
         {
             for (i = 0; i < POKEBALL_COUNT; i++)
                 FreeBallGfx(i);
@@ -956,7 +956,7 @@ static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite)
             sprite->data[0] = 0;
 
             if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1
-             && sprite->sBank == GetBankByPosition(B_POSITION_PLAYER_RIGHT))
+             && sprite->sBank == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT))
                 sprite->callback = SpriteCB_ReleaseMon2FromBall;
             else
                 sprite->callback = SpriteCB_ReleaseMonFromBall;
@@ -982,7 +982,7 @@ static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite)
     {
         sprite->data[0] = 0;
         if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->field_9_x1
-         && sprite->sBank == GetBankByPosition(B_POSITION_OPPONENT_RIGHT))
+         && sprite->sBank == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT))
             sprite->callback = SpriteCB_ReleaseMon2FromBall;
         else
             sprite->callback = SpriteCB_ReleaseMonFromBall;
@@ -1190,7 +1190,7 @@ void sub_8076918(u8 bank)
     healthboxSprite->pos2.x = 0x73;
     healthboxSprite->pos2.y = 0;
     healthboxSprite->callback = sub_80769CC;
-    if (GetBankSide(bank) != SIDE_PLAYER)
+    if (GetBattlerSide(bank) != B_SIDE_PLAYER)
     {
         healthboxSprite->data[0] = -healthboxSprite->data[0];
         healthboxSprite->data[1] = -healthboxSprite->data[1];
@@ -1198,7 +1198,7 @@ void sub_8076918(u8 bank)
         healthboxSprite->pos2.y = -healthboxSprite->pos2.y;
     }
     gSprites[healthboxSprite->data[5]].callback(&gSprites[healthboxSprite->data[5]]);
-    if (GetBankPosition(bank) == B_POSITION_PLAYER_RIGHT)
+    if (GetBattlerPosition(bank) == B_POSITION_PLAYER_RIGHT)
         healthboxSprite->callback = sub_80769A8;
 }
 
@@ -1275,7 +1275,7 @@ void FreeBallGfx(u8 ballId)
 
 static u16 GetBankPokeballItemId(u8 bank)
 {
-    if (GetBankSide(bank) == SIDE_PLAYER)
+    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         return GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
     else
         return GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index f05453c52..d4ccd5ca1 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -14,10 +14,10 @@ struct Unknown_020249B4
     struct SpriteTemplate* templates;
 };
 
-extern u8 gAbsentBankFlags;
-extern u8 gActiveBank;
-extern u8 gBankAttacker;
-extern u8 gBankDefender;
+extern u8 gAbsentBattlerFlags;
+extern u8 gActiveBattler;
+extern u8 gBattleAttacker;
+extern u8 gBattleDefender;
 extern u8 gLastUsedAbility;
 extern u16 gTrainerBattleOpponent_A;
 extern u32 gBattleTypeFlags;
@@ -34,9 +34,9 @@ extern const union AnimCmd* const * const gUnknown_0830536C[];
 extern const u8 gText_BadEgg[];
 extern const u8 gText_EggNickname[];
 
-extern u8 GetBankSide(u8 bank);
-extern u8 GetBankByPosition(u8 bank);
-extern u8 GetBankPosition(u8 bank);
+extern u8 GetBattlerSide(u8 bank);
+extern u8 GetBattlerAtPosition(u8 bank);
+extern u8 GetBattlerPosition(u8 bank);
 
 u8 CountAliveMonsInBattle(u8 caseId)
 {
@@ -48,21 +48,21 @@ u8 CountAliveMonsInBattle(u8 caseId)
     case BATTLE_ALIVE_EXCEPT_ACTIVE:
         for (i = 0; i < 4; i++)
         {
-            if (i != gActiveBank && !(gAbsentBankFlags & gBitTable[i]))
+            if (i != gActiveBattler && !(gAbsentBattlerFlags & gBitTable[i]))
                 retVal++;
         }
         break;
     case BATTLE_ALIVE_ATK_SIDE:
         for (i = 0; i < 4; i++)
         {
-            if (GetBankSide(i) == GetBankSide(gBankAttacker) && !(gAbsentBankFlags & gBitTable[i]))
+            if (GetBattlerSide(i) == GetBattlerSide(gBattleAttacker) && !(gAbsentBattlerFlags & gBitTable[i]))
                 retVal++;
         }
         break;
     case BATTLE_ALIVE_DEF_SIDE:
         for (i = 0; i < 4; i++)
         {
-            if (GetBankSide(i) == GetBankSide(gBankDefender) && !(gAbsentBankFlags & gBitTable[i]))
+            if (GetBattlerSide(i) == GetBattlerSide(gBattleDefender) && !(gAbsentBattlerFlags & gBitTable[i]))
                 retVal++;
         }
         break;
@@ -75,7 +75,7 @@ bool8 ShouldGetStatBadgeBoost(u16 badgeFlag, u8 bank)
 {
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
         return FALSE;
-    if (GetBankSide(bank) != SIDE_PLAYER)
+    if (GetBattlerSide(bank) != B_SIDE_PLAYER)
         return FALSE;
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT)
         return FALSE;
@@ -86,11 +86,11 @@ bool8 ShouldGetStatBadgeBoost(u16 badgeFlag, u8 bank)
 
 u8 GetDefaultMoveTarget(u8 bank)
 {
-    u8 status = GetBankPosition(bank) & 1;
+    u8 status = GetBattlerPosition(bank) & 1;
 
     status ^= 1;
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
-        return GetBankByPosition(status);
+        return GetBattlerAtPosition(status);
     if (CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) > 1)
     {
         u8 val;
@@ -99,14 +99,14 @@ u8 GetDefaultMoveTarget(u8 bank)
             val = status ^ 2;
         else
             val = status;
-        return GetBankByPosition(val);
+        return GetBattlerAtPosition(val);
     }
     else
     {
-        if ((gAbsentBankFlags & gBitTable[status]))
-            return GetBankByPosition(status ^ 2);
+        if ((gAbsentBattlerFlags & gBitTable[status]))
+            return GetBattlerAtPosition(status ^ 2);
         else
-            return GetBankByPosition(status);
+            return GetBattlerAtPosition(status);
     }
 }
 
@@ -1353,7 +1353,7 @@ void CopyPlayerPartyMonToBattleData(u8 bank, u8 partyIndex)
     StringCopy10(gBattleMons[bank].nickname, nickname);
     GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_NAME, gBattleMons[bank].otName);
 
-    hpSwitchout = &gBattleStruct->hpOnSwitchout[GetBankSide(bank)];
+    hpSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(bank)];
     *hpSwitchout = gBattleMons[bank].hp;
 
     for (i = 0; i < 8; i++)
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 57b12501e..d6413c455 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -25,10 +25,10 @@
 
 extern struct BattlePokemon gBattleMons[4];
 extern struct BattleEnigmaBerry gEnigmaBerries[4];
-extern u8 gActiveBank;
+extern u8 gActiveBattler;
 extern u8 gBankInMenu;
-extern u8 gBankDefender;
-extern u8 gBankAttacker;
+extern u8 gBattleDefender;
+extern u8 gBattleAttacker;
 extern u8 gStringBank;
 extern u16 gTrainerBattleOpponent_A;
 extern u32 gBattleTypeFlags;
@@ -113,7 +113,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
 
     if (itemId == ITEM_ENIGMA_BERRY)
     {
-        temp = gEnigmaBerries[gActiveBank].itemEffect;
+        temp = gEnigmaBerries[gActiveBattler].itemEffect;
     }
 
     itemEffect = temp;
@@ -210,7 +210,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
 
 void sub_806CF24(s32 stat)
 {
-    gBankDefender = gBankInMenu;
+    gBattleDefender = gBankInMenu;
     StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_08329EC8[stat]]);
     StringCopy(gBattleTextBuff2, gText_StatRose);
     BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2);
@@ -247,7 +247,7 @@ u8 *sub_806CF78(u16 itemId)
             }
             else
             {
-                gBankAttacker = gBankInMenu;
+                gBattleAttacker = gBankInMenu;
                 BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnGettingPumped);
             }
         }
@@ -255,7 +255,7 @@ u8 *sub_806CF78(u16 itemId)
 
     if (itemEffect[3] & 0x80)
     {
-        gBankAttacker = gBankInMenu;
+        gBattleAttacker = gBankInMenu;
         BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnShroudedInMist);
     }
 
@@ -1366,7 +1366,7 @@ void sub_806E994(void)
     gBattleTextBuff1[2] = gBattleStruct->field_49;
     gBattleTextBuff1[4] = B_BUFF_EOS;
 
-    if (!GetBankSide(gBattleStruct->field_49))
+    if (!GetBattlerSide(gBattleStruct->field_49))
         gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[gBattleStruct->field_49]);
     else
         gBattleTextBuff1[3] = gBattlePartyID[gBattleStruct->field_49];
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index b785d1ea1..cd54495fc 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -25,11 +25,11 @@ extern u32 gBattleTypeFlags;
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u16 gPartnerTrainerId;
-extern u8 gActiveBank;
-extern u8 gBattleBanksCount;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
-extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
+extern u8 gActiveBattler;
+extern u8 gBattlersCount;
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
+extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_03001278;
 extern u8 gUnknown_03001279;
 
@@ -52,13 +52,13 @@ struct RecordedBattleSave
 {
     struct Pokemon playerParty[PARTY_SIZE];
     struct Pokemon opponentParty[PARTY_SIZE];
-    u8 playersName[BATTLE_BANKS_COUNT][PLAYER_NAME_LENGTH];
-    u8 playersGender[BATTLE_BANKS_COUNT];
-    u32 playersTrainerId[BATTLE_BANKS_COUNT];
-    u8 playersLanguage[BATTLE_BANKS_COUNT];
+    u8 playersName[MAX_BATTLERS_COUNT][PLAYER_NAME_LENGTH];
+    u8 playersGender[MAX_BATTLERS_COUNT];
+    u32 playersTrainerId[MAX_BATTLERS_COUNT];
+    u8 playersLanguage[MAX_BATTLERS_COUNT];
     u32 rngSeed;
     u32 battleFlags;
-    u8 playersBank[BATTLE_BANKS_COUNT];
+    u8 playersBank[MAX_BATTLERS_COUNT];
     u16 opponentA;
     u16 opponentB;
     u16 partnerId;
@@ -75,14 +75,14 @@ struct RecordedBattleSave
     u16 field_50E[6];
     u8 field_51A;
     u8 field_51B;
-    u8 battleRecord[BATTLE_BANKS_COUNT][BANK_RECORD_SIZE];
+    u8 battleRecord[MAX_BATTLERS_COUNT][BANK_RECORD_SIZE];
     u32 checksum;
 };
 
 EWRAM_DATA u32 gRecordedBattleRngSeed = 0;
 EWRAM_DATA u32 gBattlePalaceMoveSelectionRngValue = 0;
-EWRAM_DATA static u8 sBattleRecords[BATTLE_BANKS_COUNT][BANK_RECORD_SIZE] = {0};
-EWRAM_DATA static u16 sRecordedBytesNo[BATTLE_BANKS_COUNT] = {0};
+EWRAM_DATA static u8 sBattleRecords[MAX_BATTLERS_COUNT][BANK_RECORD_SIZE] = {0};
+EWRAM_DATA static u16 sRecordedBytesNo[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA static u16 sUnknown_0203C79C[4] = {0};
 EWRAM_DATA static u16 sUnknown_0203C7A4[4] = {0};
 EWRAM_DATA static u8 sUnknown_0203C7AC = 0;
@@ -99,7 +99,7 @@ EWRAM_DATA static u32 sRecordedBattle_AI_Scripts = 0;
 EWRAM_DATA static struct Pokemon sSavedPlayerParty[PARTY_SIZE] = {0};
 EWRAM_DATA static struct Pokemon sSavedOpponentParty[PARTY_SIZE] = {0};
 EWRAM_DATA static u16 sRecordedBattle_PlayerMonMoves[2][4] = {0};
-EWRAM_DATA static struct PlayerInfo sRecordedBattle_Players[BATTLE_BANKS_COUNT] = {0};
+EWRAM_DATA static struct PlayerInfo sRecordedBattle_Players[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA static u8 sUnknown_0203CCD0 = 0;
 EWRAM_DATA static u8 sUnknown_0203CCD1[8] = {0};
 EWRAM_DATA static u8 sUnknown_0203CCD9 = 0;
@@ -123,7 +123,7 @@ void sub_8184DA4(u8 arg0)
     sUnknown_0203C7AC = arg0;
     sUnknown_0203CCD0 = 0;
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         sRecordedBytesNo[i] = 0;
         sUnknown_0203C79C[i] = 0;
@@ -164,7 +164,7 @@ void sub_8184E58(void)
         gUnknown_0203C7B4 = GetMultiplayerId();
         linkPlayersCount = GetLinkPlayerCount();
 
-        for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+        for (i = 0; i < MAX_BATTLERS_COUNT; i++)
         {
             sRecordedBattle_Players[i].trainerId = gLinkPlayers[i].trainerId;
             sRecordedBattle_Players[i].gender = gLinkPlayers[i].gender;
@@ -248,7 +248,7 @@ u8 sub_81850DC(u8 *arg0)
     u8 i, j;
     u8 ret = 0;
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         if (sRecordedBytesNo[i] != sUnknown_0203C79C[i])
         {
@@ -350,7 +350,7 @@ u32 MoveRecordedBattleToSaveData(void)
         battleSave->opponentParty[i] = sSavedOpponentParty[i];
     }
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         for (j = 0; j < PLAYER_NAME_LENGTH; j++)
         {
@@ -1339,7 +1339,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src)
         gEnemyParty[i] = src->opponentParty[i];
     }
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         for (var = FALSE, j = 0; j < PLAYER_NAME_LENGTH; j++)
         {
@@ -1386,7 +1386,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src)
 
     gSaveBlock2Ptr->frontierChosenLvl = src->field_4FC;
 
-    for (i = 0; i < BATTLE_BANKS_COUNT; i++)
+    for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         for (j = 0; j < BANK_RECORD_SIZE; j++)
         {
@@ -1462,7 +1462,7 @@ u8 GetActiveBankLinkPlayerGender(void)
 
     for (i = 0; i < MAX_LINK_PLAYERS; i++)
     {
-        if (gLinkPlayers[i].lp_field_18 == gActiveBank)
+        if (gLinkPlayers[i].lp_field_18 == gActiveBattler)
             break;
     }
 
@@ -1501,7 +1501,7 @@ void RecordedBattle_CopyBankMoves(void)
 {
     s32 i;
 
-    if (GetBankSide(gActiveBank) == SIDE_OPPONENT)
+    if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT)
         return;
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
         return;
@@ -1510,7 +1510,7 @@ void RecordedBattle_CopyBankMoves(void)
 
     for (i = 0; i < 4; i++)
     {
-        sRecordedBattle_PlayerMonMoves[gActiveBank / 2][i] = gBattleMons[gActiveBank].moves[i];
+        sRecordedBattle_PlayerMonMoves[gActiveBattler / 2][i] = gBattleMons[gActiveBattler].moves[i];
     }
 }
 
@@ -1523,9 +1523,9 @@ void sub_818603C(u8 arg0)
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
         return;
 
-    for (bank = 0; bank < gBattleBanksCount; bank++)
+    for (bank = 0; bank < gBattlersCount; bank++)
     {
-        if (GetBankSide(bank) != SIDE_OPPONENT) // player's side only
+        if (GetBattlerSide(bank) != B_SIDE_OPPONENT) // player's side only
         {
             if (arg0 == 1)
             {
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 93d69b840..92a9c4074 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -22,14 +22,14 @@ extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG3_X;
 extern u16 gBattle_BG3_Y;
 extern u8 gReservedSpritePaletteCount;
-extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
+extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gBankInMenu;
-extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u8 gBattleBanksCount;
+extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u8 gBattlersCount;
 extern u32 gBattleTypeFlags;
-extern u8 gBankSpriteIds[BATTLE_BANKS_COUNT];
-extern u8 gBattleMonForms[BATTLE_BANKS_COUNT];
-extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT];
+extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
+extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 
 extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
@@ -164,13 +164,13 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
 
             LoadAndCreateEnemyShadowSprites();
 
-            opponentBank = GetBankByPosition(B_POSITION_OPPONENT_LEFT);
+            opponentBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
             species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
             SetBankEnemyShadowSpriteCallback(opponentBank, species);
 
             if (IsDoubleBattle())
             {
-                opponentBank = GetBankByPosition(B_POSITION_OPPONENT_RIGHT);
+                opponentBank = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
                 species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
                 SetBankEnemyShadowSpriteCallback(opponentBank, species);
             }
@@ -210,9 +210,9 @@ static void sub_80A95F4(void)
 
 static bool8 LoadBankSpriteGfx(u8 bank)
 {
-    if (bank < gBattleBanksCount)
+    if (bank < gBattlersCount)
     {
-        if (GetBankSide(bank) != SIDE_PLAYER)
+        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
         {
             if (!gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
                 BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
@@ -245,7 +245,7 @@ extern const struct MonCoords gTrainerBackPicCoords[];
 
 static void CreateBankSprite(u8 bank)
 {
-    if (bank < gBattleBanksCount)
+    if (bank < gBattlersCount)
     {
         u8 posY;
 
@@ -254,12 +254,12 @@ static void CreateBankSprite(u8 bank)
         else
             posY = GetBankSpriteDefault_Y(bank);
 
-        if (GetBankSide(bank) != SIDE_PLAYER)
+        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
         {
             if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
                 return;
 
-            sub_806A068(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankPosition(bank));
+            sub_806A068(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
             gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankCoord(bank, 2), posY, sub_80A82E4(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
@@ -272,7 +272,7 @@ static void CreateBankSprite(u8 bank)
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
         {
-            sub_806A12C(gSaveBlock2Ptr->playerGender, GetBankPosition(B_POSITION_PLAYER_LEFT));
+            sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(B_POSITION_PLAYER_LEFT));
             gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, 0x50,
                                                 (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80,
                                                  sub_80A82E4(0));
@@ -282,7 +282,7 @@ static void CreateBankSprite(u8 bank)
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
         {
-            sub_806A12C(BACK_PIC_WALLY, GetBankPosition(0));
+            sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(0));
             gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, 0x50,
                                                 (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords) * 4 + 80,
                                                  sub_80A82E4(0));
@@ -295,7 +295,7 @@ static void CreateBankSprite(u8 bank)
             if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
                 return;
 
-            sub_806A068(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankPosition(bank));
+            sub_806A068(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
             gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankCoord(bank, 2), posY, sub_80A82E4(bank));
             gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
             gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
@@ -313,7 +313,7 @@ static void CreateBankSprite(u8 bank)
 
 static void CreateHealthboxSprite(u8 bank)
 {
-    if (bank < gBattleBanksCount)
+    if (bank < gBattlersCount)
     {
         u8 healthboxSpriteId;
 
@@ -328,19 +328,19 @@ static void CreateHealthboxSprite(u8 bank)
         SetBankHealthboxSpritePos(bank);
         SetHealthboxSpriteVisible(healthboxSpriteId);
 
-        if (GetBankSide(bank) != SIDE_PLAYER)
+        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
             UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gEnemyParty[gBattlePartyID[bank]], HEALTHBOX_ALL);
         else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
             UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gPlayerParty[gBattlePartyID[bank]], HEALTHBOX_SAFARI_ALL_TEXT);
         else
             UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gPlayerParty[gBattlePartyID[bank]], HEALTHBOX_ALL);
 
-        if (GetBankPosition(bank) == B_POSITION_OPPONENT_RIGHT || GetBankPosition(bank) == B_POSITION_PLAYER_RIGHT)
+        if (GetBattlerPosition(bank) == B_POSITION_OPPONENT_RIGHT || GetBattlerPosition(bank) == B_POSITION_PLAYER_RIGHT)
             DummyBattleInterfaceFunc(gHealthBoxesIds[bank], TRUE);
         else
             DummyBattleInterfaceFunc(gHealthBoxesIds[bank], FALSE);
 
-        if (GetBankSide(bank) != SIDE_PLAYER)
+        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
         {
             if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
                 SetHealthboxSpriteInvisible(healthboxSpriteId);
-- 
cgit v1.2.3


From 06e1aca2ac72b8c766bf3e13aa0bc6f623170130 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Mon, 5 Feb 2018 23:12:34 -0600
Subject: Move start_menu EWRAM symbols into C file

---
 src/start_menu.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/start_menu.c b/src/start_menu.c
index a820cd992..cdabb0a56 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -62,6 +62,11 @@ EWRAM_DATA u8 sBattlePyramidFloorWindowId = 0;
 EWRAM_DATA u8 sStartMenuCursorPos = 0;
 EWRAM_DATA u8 sNumStartMenuActions = 0;
 EWRAM_DATA u8 sCurrentStartMenuActions[9] = {0};
+EWRAM_DATA u8 gUnknown_02037619[2] = {0};
+EWRAM_DATA bool8 (*gUnknown_0203761C)(void) = NULL;
+EWRAM_DATA u8 gUnknown_02037620 = 0;
+EWRAM_DATA u8 gUnknown_02037621 = 0;
+EWRAM_DATA u8 gUnknown_02037622 = 0;
 
 // const rom data
 static const struct WindowTemplate gSafariBallsWindowTemplate = {0, 1, 1, 9, 4, 0xF, 8};
-- 
cgit v1.2.3


From 1902ff023830d67a1b895ccf14a4202deaa02523 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 6 Feb 2018 15:31:04 +0100
Subject: match palette functions

---
 src/palette.c | 239 +++++++---------------------------------------------------
 1 file changed, 29 insertions(+), 210 deletions(-)

(limited to 'src')

diff --git a/src/palette.c b/src/palette.c
index cc2046b14..5e073e869 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -891,238 +891,57 @@ void TintPalette_GrayScale2(u16 *palette, u16 count)
     }
 }
 
-#ifdef NONMATCHING
 void TintPalette_SepiaTone(u16 *palette, u16 count)
 {
-    int red;
-    int green;
-    int blue;
-    u32 gray;
-    u32 sepia;
-    s8 r2;
-    s8 g2;
-    s8 b2;
+    s32 r, g, b, gray;
+    s32 i;
 
-    int i;
-    for (i = 0; i < count; i++)
+    for (i = 0; i < count; palette++, i++)
     {
-        r = *palette & 0x1F;
-        g = (*palette >> 5) & 0x1F;
+        r = (*palette >>  0) & 0x1F;
+        g = (*palette >>  5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
 
-        r *= 0x4C;
-        r += g * 0x97;
-        r += b * 0x1D;
-
-        gray = (s32)(r >> 8);
+        gray = (r * 76 + g * 151 + b * 29) >> 8;
 
-        sepia = (gray * 0x133);
+        r = (u16)((307 * gray)) >> 8;
+        g = (u16)((256 * gray)) >> 8;
+        b = (u16)((240 * gray)) >> 8;
 
-        r2 = (u16)sepia >> 8;
+        if (r > 31)
+            r = 31;
 
-        g2 = gray;
-
-        b2 = (gray * 15);
-
-        if (r2 > 0x1F)
-            r2 = 0x1F;
-
-        *palette++ = b2 << 10 | g2 << 5 | r2;
+        *palette = (b << 10) | (g << 5) | (r << 0);
     }
 }
-#else
-__attribute__((naked))
-void TintPalette_SepiaTone(u16 *palette, u16 count)
-{
-    asm("push {r4-r7,lr}\n\
-    add r5, r0, #0\n\
-    lsl r1, #16\n\
-    lsr r1, #16\n\
-    cmp r1, #0\n\
-    beq _080A2BA2\n\
-    mov r7, #0x1F\n\
-    add r6, r1, #0\n\
-_080A2B50:\n\
-    ldrh r0, [r5]\n\
-    mov r1, #0x1F\n\
-    and r1, r0\n\
-    lsl r0, #16\n\
-    lsr r2, r0, #21\n\
-    and r2, r7\n\
-    lsr r3, r0, #26\n\
-    and r3, r7\n\
-    mov r0, #0x4C\n\
-    mul r1, r0\n\
-    mov r0, #0x97\n\
-    mul r0, r2\n\
-    add r1, r0\n\
-    lsl r0, r3, #3\n\
-    sub r0, r3\n\
-    lsl r0, #2\n\
-    add r0, r3\n\
-    add r1, r0\n\
-    asr r1, #8\n\
-    ldr r0, =0x00000133\n\
-    mul r0, r1\n\
-    lsl r0, #16\n\
-    lsr r2, r0, #24\n\
-    lsl r0, r1, #24\n\
-    lsr r4, r0, #24\n\
-    lsl r0, r1, #4\n\
-    sub r0, r1\n\
-    lsl r0, #20\n\
-    lsr r3, r0, #24\n\
-    cmp r2, #0x1F\n\
-    ble _080A2B90\n\
-    mov r2, #0x1F\n\
-_080A2B90:\n\
-    lsl r0, r3, #10\n\
-    lsl r1, r4, #5\n\
-    orr r0, r1\n\
-    orr r0, r2\n\
-    strh r0, [r5]\n\
-    add r5, #0x2\n\
-    sub r6, #0x1\n\
-    cmp r6, #0\n\
-    bne _080A2B50\n\
-_080A2BA2:\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .pool");
-}
-#endif // NONMATCHING
 
-#ifdef NONMATCHING
-void TintPalette_CustomTone(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5)
+void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 bTone)
 {
-    s32 r;
-    s32 g;
-    s32 b;
-    s32 gray;
-    u8 r2;
-    u8 g2;
-    u8 b2;
+    s32 r, g, b, gray;
+    s32 i;
 
-    int i;
-    for (i = 0; i < count; i++)
+    for (i = 0; i < count; palette++, i++)
     {
-        r = *palette & 0x1F;
-        g = (*palette >> 5) & 0x1F;
+        r = (*palette >>  0) & 0x1F;
+        g = (*palette >>  5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
 
-        r *= 0x4C;
-        r += g * 0x97;
-        r += b * 0x1D;
-
-        gray = r >> 8;
-
-        r2 = (u16)(gray * a3) >> 8;
-
-        g2 = (u16)(gray * a4) >> 8;
-
-        b2 = (u16)(gray * a5) >> 8;
+        gray = (r * 76 + g * 151 + b * 29) >> 8;
 
-        if (r2 > 0x1F)
-            r2 = 0x1F;
+        r = (u16)((rTone * gray)) >> 8;
+        g = (u16)((gTone * gray)) >> 8;
+        b = (u16)((bTone * gray)) >> 8;
 
-        if (g2 > 0x1F)
-            g2 = 0x1F;
+        if (r > 31)
+            r = 31;
+        if (g > 31)
+            g = 31;
+        if (b > 31)
+            b = 31;
 
-        if (b2 > 0x1F)
-            b2 = 0x1F;
-
-        *palette++ = b2 << 10 | g2 << 5 | r2;
+        *palette = (b << 10) | (g << 5) | (r << 0);
     }
-    return;
-}
-#else
-__attribute__((naked))
-void TintPalette_CustomTone(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5)
-{
-    asm("push {r4-r7,lr}\n\
-    mov r7, r9\n\
-    mov r6, r8\n\
-    push {r6,r7}\n\
-    add r5, r0, #0\n\
-    ldr r0, [sp, #0x1C]\n\
-    lsl r1, #16\n\
-    lsr r1, #16\n\
-    lsl r2, #16\n\
-    lsr r2, #16\n\
-    mov r9, r2\n\
-    lsl r3, #16\n\
-    lsr r3, #16\n\
-    mov r8, r3\n\
-    lsl r0, #16\n\
-    lsr r0, #16\n\
-    mov r12, r0\n\
-    cmp r1, #0\n\
-    beq _080A2C38\n\
-    mov r7, #0x1F\n\
-    add r6, r1, #0\n\
-_080A2BD6:\n\
-    ldrh r0, [r5]\n\
-    mov r1, #0x1F\n\
-    and r1, r0\n\
-    lsl r0, #16\n\
-    lsr r2, r0, #21\n\
-    and r2, r7\n\
-    lsr r3, r0, #26\n\
-    and r3, r7\n\
-    mov r0, #0x4C\n\
-    mul r1, r0\n\
-    mov r0, #0x97\n\
-    mul r0, r2\n\
-    add r1, r0\n\
-    lsl r0, r3, #3\n\
-    sub r0, r3\n\
-    lsl r0, #2\n\
-    add r0, r3\n\
-    add r1, r0\n\
-    asr r1, #8\n\
-    mov r0, r9\n\
-    mul r0, r1\n\
-    lsl r0, #16\n\
-    lsr r4, r0, #24\n\
-    mov r0, r8\n\
-    mul r0, r1\n\
-    lsl r0, #16\n\
-    lsr r2, r0, #24\n\
-    mov r0, r12\n\
-    mul r0, r1\n\
-    lsl r0, #16\n\
-    lsr r3, r0, #24\n\
-    cmp r4, #0x1F\n\
-    ble _080A2C1A\n\
-    mov r4, #0x1F\n\
-_080A2C1A:\n\
-    cmp r2, #0x1F\n\
-    ble _080A2C20\n\
-    mov r2, #0x1F\n\
-_080A2C20:\n\
-    cmp r3, #0x1F\n\
-    ble _080A2C26\n\
-    mov r3, #0x1F\n\
-_080A2C26:\n\
-    lsl r0, r3, #10\n\
-    lsl r1, r2, #5\n\
-    orr r0, r1\n\
-    orr r0, r4\n\
-    strh r0, [r5]\n\
-    add r5, #0x2\n\
-    sub r6, #0x1\n\
-    cmp r6, #0\n\
-    bne _080A2BD6\n\
-_080A2C38:\n\
-    pop {r3,r4}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0");
 }
-#endif
 
 void sub_80A2C44(u32 a1, s8 a2, u8 a3, u8 a4, u16 a5, u8 a6, u8 a7)
 {
-- 
cgit v1.2.3


From 9e43b01a4cb37de903f78135769811bd646f6a3b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 6 Feb 2018 17:42:24 +0100
Subject: match obj update pos2

---
 src/sprite.c | 114 +++++++++++++----------------------------------------------
 1 file changed, 24 insertions(+), 90 deletions(-)

(limited to 'src')

diff --git a/src/sprite.c b/src/sprite.c
index 6d76b9854..8a4729b27 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -240,12 +240,26 @@ static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] =
     AffineAnimCmd_frame,
 };
 
-static const s32 sUnknown_082EC6F4[24] =
+static const s32 sUnknown_082EC6F4[3][4][2] =
 {
-    8,      8,      0x10,   0x10,   0x20,   0x20,
-    0x40,   0x40,   0x10,   8,      0x20,   8,
-    0x20,   0x10,   0x40,   0x20,   8,      0x10,
-    8,      0x20,   0x10,   0x20,   0x20,   0x40,
+    {
+        {8, 8},
+        {0x10, 0x10},
+        {0x20, 0x20},
+        {0x40, 0x40},
+    },
+    {
+        {0x10, 8},
+        {0x20, 8},
+        {0x20, 0x10},
+        {0x40, 0x20},
+    },
+    {
+        {8, 0x10},
+        {8, 0x20},
+        {0x10, 0x20},
+        {0x20, 0x40},
+    },
 };
 
 static const struct OamDimensions sOamDimensions[3][4] =
@@ -1207,106 +1221,26 @@ s32 sub_8007E28(s32 a0, s32 a1, s32 a2)
     return a2 - ((u32)(a2 * a1) / (u32)(a0) + var1);
 }
 
-#ifdef NONMATCHING
-void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
+void obj_update_pos2(struct Sprite *sprite, s32 a1, s32 a2)
 {
     s32 var0, var1, var2;
-    u8 matrixNum = sprite->oam.matrixNum;
+
+    u32 matrixNum = sprite->oam.matrixNum;
     if (a1 != 0x800)
     {
-        var0 = sUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32];
+        var0 = sUnknown_082EC6F4[sprite->oam.shape][sprite->oam.size][0];
         var1 = var0 << 8;
         var2 = (var0 << 16) / gOamMatrices[matrixNum].a;
         sprite->pos2.x = sub_8007E28(var1, var2, a1);
     }
     if (a2 != 0x800)
     {
-        var0 = sUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)];
+        var0 = sUnknown_082EC6F4[sprite->oam.shape][sprite->oam.size][1];
         var1 = var0 << 8;
         var2 = (var0 << 16) / gOamMatrices[matrixNum].d;
         sprite->pos2.y = sub_8007E28(var1, var2, a2);
     }
 }
-#else
-__attribute__((naked))
-void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
-{
-    asm(".syntax unified\n\
-	push {r4-r7,lr}\n\
-	mov r7, r9\n\
-	mov r6, r8\n\
-	push {r6,r7}\n\
-	adds r5, r0, 0\n\
-	adds r6, r1, 0\n\
-	mov r8, r2\n\
-	ldrb r1, [r5, 0x3]\n\
-	lsls r0, r1, 26\n\
-	lsrs r7, r0, 27\n\
-	movs r0, 0x80\n\
-	lsls r0, 4\n\
-	mov r9, r0\n\
-	cmp r6, r9\n\
-	beq _08007EA2\n\
-	ldr r2, =sUnknown_082EC6F4\n\
-	lsrs r1, 6\n\
-	lsls r1, 3\n\
-	ldrb r0, [r5, 0x1]\n\
-	lsrs r0, 6\n\
-	lsls r0, 5\n\
-	adds r1, r0\n\
-	adds r1, r2\n\
-	ldr r0, [r1]\n\
-	lsls r4, r0, 8\n\
-	lsls r0, 16\n\
-	ldr r2, =gOamMatrices\n\
-	lsls r1, r7, 3\n\
-	adds r1, r2\n\
-	movs r2, 0\n\
-	ldrsh r1, [r1, r2]\n\
-	bl __divsi3\n\
-	adds r1, r0, 0\n\
-	adds r0, r4, 0\n\
-	adds r2, r6, 0\n\
-	bl sub_8007E28\n\
-	strh r0, [r5, 0x24]\n\
-_08007EA2:\n\
-	cmp r8, r9\n\
-	beq _08007EDA\n\
-	ldr r2, =sUnknown_082EC6F4\n\
-	ldrb r1, [r5, 0x3]\n\
-	lsrs r1, 6\n\
-	lsls r1, 3\n\
-	ldrb r0, [r5, 0x1]\n\
-	lsrs r0, 6\n\
-	lsls r0, 5\n\
-	adds r1, r0\n\
-	adds r2, 0x4\n\
-	adds r1, r2\n\
-	ldr r0, [r1]\n\
-	lsls r4, r0, 8\n\
-	lsls r0, 16\n\
-	ldr r2, =gOamMatrices\n\
-	lsls r1, r7, 3\n\
-	adds r1, r2\n\
-	movs r2, 0x6\n\
-	ldrsh r1, [r1, r2]\n\
-	bl __divsi3\n\
-	adds r1, r0, 0\n\
-	adds r0, r4, 0\n\
-	mov r2, r8\n\
-	bl sub_8007E28\n\
-	strh r0, [r5, 0x26]\n\
-_08007EDA:\n\
-	pop {r3,r4}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n\
-        .syntax divided");
-}
-#endif // NONMATCHING
 
 void SetSpriteOamFlipBits(struct Sprite *sprite, u8 hFlip, u8 vFlip)
 {
-- 
cgit v1.2.3


From ab5977e7e4148afdb8b863d7b072b02f835ac831 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 6 Feb 2018 18:15:10 +0100
Subject: match item use func

---
 src/item_use.c | 165 ++++-----------------------------------------------------
 1 file changed, 9 insertions(+), 156 deletions(-)

(limited to 'src')

diff --git a/src/item_use.c b/src/item_use.c
index 8fe705a50..29676b13b 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -92,6 +92,7 @@ extern u8 gBankInMenu;
 extern u16 gBattlePartyID[];
 extern void sub_81B89F0(void);
 extern u8 GetItemEffectType(u16);
+extern struct MapConnection *sub_8088A8C(s16, s16);
 
 void MapPostLoadHook_UseItem(void);
 extern void sub_80AF6D4(void);
@@ -379,12 +380,12 @@ bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId)
             newDistanceX = distanceX - x;
             distanceY = (u16)events->bgEvents[i].y + 7;
             newDistanceY = distanceY - y;
-            
+
             if ((u16)(newDistanceX + 7) < 15 && (newDistanceY >= -5) && (newDistanceY < 6))
                 sub_80FD8E0(taskId, newDistanceX, newDistanceY);
         }
     }
-    
+
     sub_80FD7C8(taskId);
     if (gTasks[taskId].data[2] == TRUE)
         return TRUE;
@@ -453,8 +454,6 @@ bool8 sub_80FD730(struct MapConnection *connection, int x, int y)
     return sub_80FD6D4(mapHeader->events, localX, localY);
 }
 
-// weird math
-#ifdef NONMATCHING
 void sub_80FD7C8(u8 taskId)
 {
     s16 x, y;
@@ -462,15 +461,18 @@ void sub_80FD7C8(u8 taskId)
     s16 width = gMapHeader.mapData->width + 7;
     s16 height = gMapHeader.mapData->height + 7;
 
+    s16 var1 = 7;
+    s16 var2 = 7;
+
     PlayerGetDestCoords(&x, &y);
 
     for (curX = x - 7; curX <= x + 7; curX++)
     {
         for (curY = y - 5; curY <= y + 5; curY++)
         {
-            if (7 > curX
+            if (var1 > curX
              || curX >= width
-             || 7 > curY
+             || var2 > curY
              || curY >= height)
             {
                 struct MapConnection *conn = sub_8088A8C(curX, curY);
@@ -480,155 +482,6 @@ void sub_80FD7C8(u8 taskId)
         }
     }
 }
-#else
-__attribute__((naked))
-void sub_80FD7C8(u8 taskId)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x14\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	str r0, [sp, 0x4]\n\
-	ldr r0, =gMapHeader\n\
-	ldr r1, [r0]\n\
-	ldr r0, [r1]\n\
-	adds r0, 0x7\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	str r0, [sp, 0x8]\n\
-	ldr r0, [r1, 0x4]\n\
-	adds r0, 0x7\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	str r0, [sp, 0xC]\n\
-	mov r4, sp\n\
-	adds r4, 0x2\n\
-	mov r0, sp\n\
-	adds r1, r4, 0\n\
-	bl PlayerGetDestCoords\n\
-	mov r0, sp\n\
-	ldrh r0, [r0]\n\
-	subs r0, 0x7\n\
-	lsls r0, 16\n\
-	lsrs r3, r0, 16\n\
-	asrs r0, 16\n\
-	mov r1, sp\n\
-	movs r2, 0\n\
-	ldrsh r1, [r1, r2]\n\
-	adds r1, 0x7\n\
-	cmp r0, r1\n\
-	bgt _080FD8CC\n\
-_080FD816:\n\
-	mov r5, sp\n\
-	ldrh r0, [r5, 0x2]\n\
-	subs r0, 0x5\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	lsls r2, r4, 16\n\
-	asrs r1, r2, 16\n\
-	movs r6, 0x2\n\
-	ldrsh r0, [r5, r6]\n\
-	adds r0, 0x5\n\
-	lsls r3, 16\n\
-	mov r8, r3\n\
-	cmp r1, r0\n\
-	bgt _080FD8B6\n\
-	movs r0, 0x7\n\
-	str r0, [sp, 0x10]\n\
-	mov r1, r8\n\
-	asrs r1, 16\n\
-	mov r9, r1\n\
-	mov r10, r0\n\
-_080FD83E:\n\
-	ldr r3, [sp, 0x10]\n\
-	cmp r3, r9\n\
-	bgt _080FD860\n\
-	ldr r5, [sp, 0x8]\n\
-	lsls r0, r5, 16\n\
-	asrs r0, 16\n\
-	cmp r9, r0\n\
-	bge _080FD860\n\
-	asrs r1, r2, 16\n\
-	cmp r10, r1\n\
-	bgt _080FD860\n\
-	ldr r6, [sp, 0xC]\n\
-	lsls r0, r6, 16\n\
-	asrs r0, 16\n\
-	lsls r7, r4, 16\n\
-	cmp r1, r0\n\
-	blt _080FD89E\n\
-_080FD860:\n\
-	mov r0, r8\n\
-	asrs r5, r0, 16\n\
-	lsls r4, 16\n\
-	asrs r6, r4, 16\n\
-	adds r0, r5, 0\n\
-	adds r1, r6, 0\n\
-	bl sub_8088A8C\n\
-	adds r7, r4, 0\n\
-	cmp r0, 0\n\
-	beq _080FD89E\n\
-	adds r1, r5, 0\n\
-	adds r2, r6, 0\n\
-	bl sub_80FD730\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0x1\n\
-	bne _080FD89E\n\
-	mov r0, sp\n\
-	ldrh r1, [r0]\n\
-	subs r1, r5, r1\n\
-	lsls r1, 16\n\
-	asrs r1, 16\n\
-	ldrh r2, [r0, 0x2]\n\
-	subs r2, r6, r2\n\
-	lsls r2, 16\n\
-	asrs r2, 16\n\
-	ldr r0, [sp, 0x4]\n\
-	bl sub_80FD8E0\n\
-_080FD89E:\n\
-	movs r1, 0x80\n\
-	lsls r1, 9\n\
-	adds r0, r7, r1\n\
-	lsrs r4, r0, 16\n\
-	lsls r2, r4, 16\n\
-	asrs r1, r2, 16\n\
-	mov r3, sp\n\
-	movs r5, 0x2\n\
-	ldrsh r0, [r3, r5]\n\
-	adds r0, 0x5\n\
-	cmp r1, r0\n\
-	ble _080FD83E\n\
-_080FD8B6:\n\
-	movs r1, 0x80\n\
-	lsls r1, 9\n\
-	add r1, r8\n\
-	lsrs r3, r1, 16\n\
-	asrs r1, 16\n\
-	mov r0, sp\n\
-	movs r6, 0\n\
-	ldrsh r0, [r0, r6]\n\
-	adds r0, 0x7\n\
-	cmp r1, r0\n\
-	ble _080FD816\n\
-_080FD8CC:\n\
-	add sp, 0x14\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.pool\n\
-    .syntax divided\n");
-}
-#endif
 
 void sub_80FD8E0(u8 taskId, s16 x, s16 y)
 {
@@ -992,7 +845,7 @@ void ItemUseOutOfBattle_Repel(u8 taskId)
 void sub_80FE124(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    
+
     if (++data[8] > 7)
     {
         data[8] = 0;
-- 
cgit v1.2.3


From 4c6f6c47384da9a7c145fad620a0e5b40a994fa8 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 6 Feb 2018 12:47:09 -0600
Subject: Use fixed width types in TintPalette funcs

---
 src/palette.c | 62 +++++++++++++++++++++++------------------------------------
 1 file changed, 24 insertions(+), 38 deletions(-)

(limited to 'src')

diff --git a/src/palette.c b/src/palette.c
index 5e073e869..fd4ad32ad 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -840,93 +840,79 @@ void BlendPalettesUnfaded(u32 selectedPalettes, u8 coeff, u16 color)
 
 void TintPalette_GrayScale(u16 *palette, u16 count)
 {
-    int r;
-    int g;
-    int b;
+    s32 r, g, b, i;
     u32 gray;
 
-    int i;
     for (i = 0; i < count; i++)
     {
-        r = *palette & 0x1F;
-        g = (*palette >> 5) & 0x1F;
+        r = (*palette >>  0) & 0x1F;
+        g = (*palette >>  5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
 
-        r = r * Q_8_8(0.2969);
-        r += g * Q_8_8(0.5899);
-        r += b * Q_8_8(0.1133);
-
-        gray = r >> 8;
+        gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8;
 
-        *palette++ = gray << 10 | gray << 5 | gray;
+        *palette++ = (gray << 10) | (gray << 5) | (gray << 0);
     }
 }
 
 void TintPalette_GrayScale2(u16 *palette, u16 count)
 {
-    int r;
-    int g;
-    int b;
+    s32 r, g, b, i;
     u32 gray;
 
-    int i;
     for (i = 0; i < count; i++)
     {
-        r = *palette & 0x1F;
-        g = (*palette >> 5) & 0x1F;
+        r = (*palette >>  0) & 0x1F;
+        g = (*palette >>  5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
 
-        r = r * Q_8_8(0.2969);
-        r += g * Q_8_8(0.5899);
-        r += b * Q_8_8(0.1133);
-
-        gray = r >> 8;
+        gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8;
 
         if (gray > 0x1F)
             gray = 0x1F;
 
         gray = sRoundedDownGrayscaleMap[gray];
 
-        *palette++ = gray << 10 | gray << 5 | gray;
+        *palette++ = (gray << 10) | (gray << 5) | (gray << 0);
     }
 }
 
 void TintPalette_SepiaTone(u16 *palette, u16 count)
 {
-    s32 r, g, b, gray;
-    s32 i;
-
-    for (i = 0; i < count; palette++, i++)
+    s32 r, g, b, i;
+    u32 gray;
+    
+    for (i = 0; i < count; i++)
     {
         r = (*palette >>  0) & 0x1F;
         g = (*palette >>  5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
 
-        gray = (r * 76 + g * 151 + b * 29) >> 8;
+        gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8;
 
-        r = (u16)((307 * gray)) >> 8;
-        g = (u16)((256 * gray)) >> 8;
-        b = (u16)((240 * gray)) >> 8;
+        r = (u16)((Q_8_8(1.2) * gray)) >> 8;
+        g = (u16)((Q_8_8(1.0) * gray)) >> 8;
+        b = (u16)((Q_8_8(0.94) * gray)) >> 8;
 
         if (r > 31)
             r = 31;
 
-        *palette = (b << 10) | (g << 5) | (r << 0);
+        *palette++ = (b << 10) | (g << 5) | (r << 0);
     }
 }
 
 void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 bTone)
 {
-    s32 r, g, b, gray;
-    s32 i;
+    s32 r, g, b, i;
+    u32 gray;
 
-    for (i = 0; i < count; palette++, i++)
+    for (i = 0; i < count; i++)
     {
         r = (*palette >>  0) & 0x1F;
         g = (*palette >>  5) & 0x1F;
         b = (*palette >> 10) & 0x1F;
 
-        gray = (r * 76 + g * 151 + b * 29) >> 8;
+        gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8;
 
         r = (u16)((rTone * gray)) >> 8;
         g = (u16)((gTone * gray)) >> 8;
@@ -939,7 +925,7 @@ void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 b
         if (b > 31)
             b = 31;
 
-        *palette = (b << 10) | (g << 5) | (r << 0);
+        *palette++ = (b << 10) | (g << 5) | (r << 0);
     }
 }
 
-- 
cgit v1.2.3


From 6a4967689e62e6a3276bbe2372e8066cdfacb6fd Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 6 Feb 2018 13:48:02 -0600
Subject: more renaming

---
 src/battle_ai_script_commands.c           |  144 +-
 src/battle_ai_switch_items.c              |   48 +-
 src/battle_anim.c                         |  142 +-
 src/battle_controller_link_opponent.c     |  308 ++--
 src/battle_controller_link_partner.c      |  300 ++--
 src/battle_controller_opponent.c          |  332 ++---
 src/battle_controller_player.c            |  446 +++---
 src/battle_controller_player_partner.c    |  336 ++---
 src/battle_controller_recorded_opponent.c |  300 ++--
 src/battle_controller_recorded_player.c   |  328 ++--
 src/battle_controller_safari.c            |   72 +-
 src/battle_controller_wally.c             |  200 +--
 src/battle_controllers.c                  |  340 ++---
 src/battle_gfx_sfx_util.c                 |   95 +-
 src/battle_interface.c                    |   54 +-
 src/battle_main.c                         |  454 +++---
 src/battle_message.c                      |   66 +-
 src/battle_script_commands.c              | 2302 ++++++++++++++---------------
 src/battle_util.c                         |  464 +++---
 src/battle_util2.c                        |   14 +-
 src/item_use.c                            |    4 +-
 src/pokeball.c                            |   88 +-
 src/pokemon_2.c                           |    8 +-
 src/pokemon_3.c                           |   22 +-
 src/pokemon_animation.c                   |    4 +-
 src/recorded_battle.c                     |   28 +-
 src/reshow_battle_screen.c                |   98 +-
 27 files changed, 3497 insertions(+), 3500 deletions(-)

(limited to 'src')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 2ddc3fdfe..3e8d8d40e 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -48,14 +48,14 @@ extern u32 gBattleTypeFlags;
 extern u8 gActiveBattler;
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern u16 gCurrentMove;
-extern u8 gBattleDefender;
+extern u8 gBattleMoveTarget;
 extern u8 gAbsentBattlerFlags;
 extern u16 gLastMoves[MAX_BATTLERS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u32 gStatuses3[MAX_BATTLERS_COUNT];
 extern u16 gSideStatuses[2];
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u16 gDynamicBasePower;
 extern u8 gMoveResultFlags;
 extern s32 gBattleMoveDamage;
@@ -367,14 +367,14 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves)
     // decide a random target bank in doubles
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        gBattleDefender = (Random() & BIT_FLANK) + (GetBattlerSide(gActiveBattler) ^ BIT_SIDE);
-        if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
-            gBattleDefender ^= BIT_FLANK;
+        gBattleMoveTarget = (Random() & BIT_FLANK) + (GetBattlerSide(gActiveBattler) ^ BIT_SIDE);
+        if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
+            gBattleMoveTarget ^= BIT_FLANK;
     }
     // in singles there's only one choice
     else
     {
-        gBattleDefender = sBank_AI ^ BIT_SIDE;
+        gBattleMoveTarget = sBank_AI ^ BIT_SIDE;
     }
 
     if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
@@ -491,7 +491,7 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
             else
                 BattleAI_SetupAIData(0xF);
 
-            gBattleDefender = i;
+            gBattleMoveTarget = i;
 
             if ((i & BIT_SIDE) != (sBank_AI & BIT_SIDE))
                 RecordLastUsedMoveByTarget();
@@ -573,8 +573,8 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
         }
     }
 
-    gBattleDefender = mostViableTargetsArray[Random() % mostViableTargetsNo];
-    return actionOrMoveIndex[gBattleDefender];
+    gBattleMoveTarget = mostViableTargetsArray[Random() % mostViableTargetsNo];
+    return actionOrMoveIndex[gBattleMoveTarget];
 }
 
 static void BattleAI_DoAIProcessing(void)
@@ -627,12 +627,12 @@ static void RecordLastUsedMoveByTarget(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleResources->battleHistory->usedMoves[gBattleDefender].moves[i] == gLastMoves[gBattleDefender])
+        if (gBattleResources->battleHistory->usedMoves[gBattleMoveTarget].moves[i] == gLastMoves[gBattleMoveTarget])
             break;
-        if (gBattleResources->battleHistory->usedMoves[gBattleDefender].moves[i] != gLastMoves[gBattleDefender]  // HACK: This redundant condition is a hack to make the asm match.
-         && gBattleResources->battleHistory->usedMoves[gBattleDefender].moves[i] == 0)
+        if (gBattleResources->battleHistory->usedMoves[gBattleMoveTarget].moves[i] != gLastMoves[gBattleMoveTarget]  // HACK: This redundant condition is a hack to make the asm match.
+         && gBattleResources->battleHistory->usedMoves[gBattleMoveTarget].moves[i] == 0)
         {
-            gBattleResources->battleHistory->usedMoves[gBattleDefender].moves[i] = gLastMoves[gBattleDefender];
+            gBattleResources->battleHistory->usedMoves[gBattleMoveTarget].moves[i] = gLastMoves[gBattleMoveTarget];
             break;
         }
     }
@@ -723,7 +723,7 @@ static void BattleAICmd_if_hp_less_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) < gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -738,7 +738,7 @@ static void BattleAICmd_if_hp_more_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) > gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -753,7 +753,7 @@ static void BattleAICmd_if_hp_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) == gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -768,7 +768,7 @@ static void BattleAICmd_if_hp_not_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) != gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -784,7 +784,7 @@ static void BattleAICmd_if_status(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -802,7 +802,7 @@ static void BattleAICmd_if_not_status(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -820,7 +820,7 @@ static void BattleAICmd_if_status2(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -838,7 +838,7 @@ static void BattleAICmd_if_not_status2(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -856,7 +856,7 @@ static void BattleAICmd_if_status3(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -874,7 +874,7 @@ static void BattleAICmd_if_not_status3(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -892,7 +892,7 @@ static void BattleAICmd_if_side_affecting(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     side = GET_BATTLER_SIDE(bank);
     status = AIScriptRead32(gAIScriptPtr + 2);
@@ -911,7 +911,7 @@ static void BattleAICmd_if_not_side_affecting(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     side = GET_BATTLER_SIDE(bank);
     status = AIScriptRead32(gAIScriptPtr + 2);
@@ -1126,13 +1126,13 @@ static void BattleAICmd_get_type(void)
         AI_THINKING_STRUCT->funcResult = gBattleMons[sBank_AI].type1;
         break;
     case AI_TYPE1_TARGET: // target primary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattleDefender].type1;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattleMoveTarget].type1;
         break;
     case AI_TYPE2_USER: // AI user secondary type
         AI_THINKING_STRUCT->funcResult = gBattleMons[sBank_AI].type2;
         break;
     case AI_TYPE2_TARGET: // target secondary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattleDefender].type2;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattleMoveTarget].type2;
         break;
     case AI_TYPE_MOVE: // type of move being pointed to
         AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].type;
@@ -1149,11 +1149,11 @@ static u8 BattleAI_GetWantedBank(u8 bank)
             return sBank_AI;
         case AI_TARGET:
         default:
-            return gBattleDefender;
+            return gBattleMoveTarget;
         case AI_USER_PARTNER:
             return sBank_AI ^ BIT_FLANK;
         case AI_TARGET_PARTNER:
-            return gBattleDefender ^ BIT_FLANK;
+            return gBattleMoveTarget ^ BIT_FLANK;
     }
 }
 
@@ -1212,8 +1212,8 @@ static void BattleAICmd_get_how_powerful_move_is(void)
                 && gBattleMoves[gBattleMons[sBank_AI].moves[checkedMove]].power > 1)
             {
                 gCurrentMove = gBattleMons[sBank_AI].moves[checkedMove];
-                AI_CalcDmg(sBank_AI, gBattleDefender);
-                TypeCalc(gCurrentMove, sBank_AI, gBattleDefender);
+                AI_CalcDmg(sBank_AI, gBattleMoveTarget);
+                TypeCalc(gCurrentMove, sBank_AI, gBattleMoveTarget);
                 moveDmgs[checkedMove] = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[checkedMove] / 100;
                 if (moveDmgs[checkedMove] == 0)
                     moveDmgs[checkedMove] = 1;
@@ -1248,7 +1248,7 @@ static void BattleAICmd_get_last_used_bank_move(void)
     if (gAIScriptPtr[1] == AI_USER)
         AI_THINKING_STRUCT->funcResult = gLastMoves[sBank_AI];
     else
-        AI_THINKING_STRUCT->funcResult = gLastMoves[gBattleDefender];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[gBattleMoveTarget];
 
     gAIScriptPtr += 2;
 }
@@ -1271,7 +1271,7 @@ static void BattleAICmd_if_not_equal_(void) // same as if_not_equal
 
 static void BattleAICmd_if_user_goes(void)
 {
-    if (GetWhoStrikesFirst(sBank_AI, gBattleDefender, TRUE) == gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(sBank_AI, gBattleMoveTarget, TRUE) == gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1279,7 +1279,7 @@ static void BattleAICmd_if_user_goes(void)
 
 static void BattleAICmd_if_user_doesnt_go(void)
 {
-    if (GetWhoStrikesFirst(sBank_AI, gBattleDefender, TRUE) != gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(sBank_AI, gBattleMoveTarget, TRUE) != gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1305,7 +1305,7 @@ static void BattleAICmd_count_usable_party_mons(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         party = gPlayerParty;
@@ -1315,14 +1315,14 @@ static void BattleAICmd_count_usable_party_mons(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         u32 position;
-        bankOnField1 = gBattlePartyID[bank];
+        bankOnField1 = gBattlerPartyIndexes[bank];
         position = GetBattlerPosition(bank) ^ BIT_FLANK;
-        bankOnField2 = gBattlePartyID[GetBattlerAtPosition(position)];
+        bankOnField2 = gBattlerPartyIndexes[GetBattlerAtPosition(position)];
     }
     else // in singles there's only one bank by side
     {
-        bankOnField1 = gBattlePartyID[bank];
-        bankOnField2 = gBattlePartyID[bank];
+        bankOnField1 = gBattlerPartyIndexes[bank];
+        bankOnField2 = gBattlerPartyIndexes[bank];
     }
 
     for (i = 0; i < PARTY_SIZE; i++)
@@ -1358,7 +1358,7 @@ static void BattleAICmd_get_ability(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if (gActiveBattler != bank)
     {
@@ -1493,7 +1493,7 @@ static void BattleAICmd_get_highest_type_effectiveness(void)
 
         if (gCurrentMove)
         {
-            TypeCalc(gCurrentMove, sBank_AI, gBattleDefender);
+            TypeCalc(gCurrentMove, sBank_AI, gBattleMoveTarget);
 
             // reduce by 1/3.
             if (gBattleMoveDamage == 120)
@@ -1528,7 +1528,7 @@ static void BattleAICmd_if_type_effectiveness(void)
     gBattleMoveDamage = AI_EFFECTIVENESS_x1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
 
-    TypeCalc(gCurrentMove, sBank_AI, gBattleDefender);
+    TypeCalc(gCurrentMove, sBank_AI, gBattleMoveTarget);
 
     if (gBattleMoveDamage == 120)
         gBattleMoveDamage = AI_EFFECTIVENESS_x2;
@@ -1572,7 +1572,7 @@ static void BattleAICmd_if_status_in_party(void)
             bank = sBank_AI;
             break;
         default:
-            bank = gBattleDefender;
+            bank = gBattleMoveTarget;
             break;
     }
 
@@ -1609,7 +1609,7 @@ static void BattleAICmd_if_status_not_in_party(void)
             bank = sBank_AI;
             break;
         default:
-            bank = gBattleDefender;
+            bank = gBattleMoveTarget;
             break;
     }
 
@@ -1669,7 +1669,7 @@ static void BattleAICmd_if_stat_level_less_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] < gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1684,7 +1684,7 @@ static void BattleAICmd_if_stat_level_more_than(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] > gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1699,7 +1699,7 @@ static void BattleAICmd_if_stat_level_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] == gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1714,7 +1714,7 @@ static void BattleAICmd_if_stat_level_not_equal(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] != gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1736,8 +1736,8 @@ static void BattleAICmd_if_can_faint(void)
     gMoveResultFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    AI_CalcDmg(sBank_AI, gBattleDefender);
-    TypeCalc(gCurrentMove, sBank_AI, gBattleDefender);
+    AI_CalcDmg(sBank_AI, gBattleMoveTarget);
+    TypeCalc(gCurrentMove, sBank_AI, gBattleMoveTarget);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
@@ -1745,7 +1745,7 @@ static void BattleAICmd_if_can_faint(void)
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
 
-    if (gBattleMons[gBattleDefender].hp <= gBattleMoveDamage)
+    if (gBattleMons[gBattleMoveTarget].hp <= gBattleMoveDamage)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -1765,14 +1765,14 @@ static void BattleAICmd_if_cant_faint(void)
     gMoveResultFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    AI_CalcDmg(sBank_AI, gBattleDefender);
-    TypeCalc(gCurrentMove, sBank_AI, gBattleDefender);
+    AI_CalcDmg(sBank_AI, gBattleMoveTarget);
+    TypeCalc(gCurrentMove, sBank_AI, gBattleMoveTarget);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
     // this macro is missing the damage 0 = 1 assumption.
 
-    if (gBattleMons[gBattleDefender].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattleMoveTarget].hp > gBattleMoveDamage)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -1829,7 +1829,7 @@ static void BattleAICmd_if_has_move(void)
         case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
-                if (BATTLE_HISTORY->usedMoves[gBattleDefender].moves[i] == *movePtr)
+                if (BATTLE_HISTORY->usedMoves[gBattleMoveTarget].moves[i] == *movePtr)
                     break;
             }
             if (i == 4)
@@ -1873,7 +1873,7 @@ static void BattleAICmd_if_doesnt_have_move(void)
         case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
-                if (BATTLE_HISTORY->usedMoves[gBattleDefender].moves[i] == *movePtr)
+                if (BATTLE_HISTORY->usedMoves[gBattleMoveTarget].moves[i] == *movePtr)
                     break;
             }
             if (i != 4)
@@ -1911,8 +1911,8 @@ static void BattleAICmd_if_has_move_with_effect(void)
     case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            // UB: checks sBank_AI instead of gBattleDefender
-            if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattleDefender].moves[i]].effect == gAIScriptPtr[2])
+            // UB: checks sBank_AI instead of gBattleMoveTarget
+            if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattleMoveTarget].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i == 4)
@@ -1945,7 +1945,7 @@ static void BattleAICmd_if_doesnt_have_move_with_effect(void)
     case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            if (BATTLE_HISTORY->usedMoves[gBattleDefender].moves[i] && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattleDefender].moves[i]].effect == gAIScriptPtr[2])
+            if (BATTLE_HISTORY->usedMoves[gBattleMoveTarget].moves[i] && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattleMoveTarget].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i != 4)
@@ -1963,7 +1963,7 @@ static void BattleAICmd_if_any_move_disabled_or_encored(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if (gAIScriptPtr[2] == 0)
     {
@@ -2041,7 +2041,7 @@ static void BattleAICmd_get_hold_effect(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     if (gActiveBattler != bank)
         AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(BATTLE_HISTORY->itemEffects[bank]);
@@ -2079,7 +2079,7 @@ static void BattleAICmd_get_gender(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     AI_THINKING_STRUCT->funcResult = GetGenderFromSpeciesAndPersonality(gBattleMons[bank].species, gBattleMons[bank].personality);
 
@@ -2093,7 +2093,7 @@ static void BattleAICmd_is_first_turn_for(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].isFirstTurn;
 
@@ -2107,7 +2107,7 @@ static void BattleAICmd_get_stockpile_count(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].stockpileCounter;
 
@@ -2128,7 +2128,7 @@ static void BattleAICmd_get_used_held_item(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     // This is likely a leftover from Ruby's code and its ugly ewram access
     #ifdef NONMATCHING
@@ -2168,7 +2168,7 @@ static void BattleAICmd_get_protect_count(void)
     if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
-        bank = gBattleDefender;
+        bank = gBattleMoveTarget;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].protectUses;
 
@@ -2221,7 +2221,7 @@ static void BattleAICmd_if_level_cond(void)
     switch (gAIScriptPtr[1])
     {
     case 0: // greater than
-        if (gBattleMons[sBank_AI].level > gBattleMons[gBattleDefender].level)
+        if (gBattleMons[sBank_AI].level > gBattleMons[gBattleMoveTarget].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2229,7 +2229,7 @@ static void BattleAICmd_if_level_cond(void)
         gAIScriptPtr += 6;
         return;
     case 1: // less than
-        if (gBattleMons[sBank_AI].level < gBattleMons[gBattleDefender].level)
+        if (gBattleMons[sBank_AI].level < gBattleMons[gBattleMoveTarget].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2237,7 +2237,7 @@ static void BattleAICmd_if_level_cond(void)
         gAIScriptPtr += 6;
         return;
     case 2: // equal
-        if (gBattleMons[sBank_AI].level == gBattleMons[gBattleDefender].level)
+        if (gBattleMons[sBank_AI].level == gBattleMons[gBattleMoveTarget].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2249,7 +2249,7 @@ static void BattleAICmd_if_level_cond(void)
 
 static void BattleAICmd_if_target_taunted(void)
 {
-    if (gDisableStructs[gBattleDefender].tauntTimer1 != 0)
+    if (gDisableStructs[gBattleMoveTarget].tauntTimer1 != 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -2257,7 +2257,7 @@ static void BattleAICmd_if_target_taunted(void)
 
 static void BattleAICmd_if_target_not_taunted(void)
 {
-    if (gDisableStructs[gBattleDefender].tauntTimer1 == 0)
+    if (gDisableStructs[gBattleMoveTarget].tauntTimer1 == 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -2265,7 +2265,7 @@ static void BattleAICmd_if_target_not_taunted(void)
 
 static void BattleAICmd_if_target_is_ally(void)
 {
-    if ((sBank_AI & BIT_SIDE) == (gBattleDefender & BIT_SIDE))
+    if ((sBank_AI & BIT_SIDE) == (gBattleMoveTarget & BIT_SIDE))
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 7d187559b..1671fad7e 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -15,7 +15,7 @@ extern u8 gAbsentBattlerFlags;
 extern u32 gBattleTypeFlags;
 extern u32 gStatuses3[MAX_BATTLERS_COUNT];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u16 gLastLandedMoves[MAX_BATTLERS_COUNT];
 extern u8 gLastHitBy[MAX_BATTLERS_COUNT];
 extern u16 gDynamicBasePower;
@@ -39,7 +39,7 @@ static bool8 ShouldSwitchIfPerishSong(void)
         && gDisableStructs[gActiveBattler].perishSongTimer1 == 0)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
-        EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+        BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
 
@@ -104,7 +104,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
             continue;
         if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             continue;
-        if (i == gBattlePartyID[gActiveBattler])
+        if (i == gBattlerPartyIndexes[gActiveBattler])
             continue;
 
         GetMonData(&party[i], MON_DATA_SPECIES); // unused return value
@@ -121,7 +121,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
             {
                 // we found a mon
                 *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i;
-                EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+                BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
                 return TRUE;
             }
         }
@@ -202,9 +202,9 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
             continue;
         if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             continue;
-        if (i == gBattlePartyID[bankIn1])
+        if (i == gBattlerPartyIndexes[bankIn1])
             continue;
-        if (i == gBattlePartyID[bankIn2])
+        if (i == gBattlerPartyIndexes[bankIn2])
             continue;
         if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
             continue;
@@ -221,7 +221,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
         {
             // we found a mon
             *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i;
-            EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
             return TRUE;
         }
     }
@@ -241,13 +241,13 @@ static bool8 ShouldSwitchIfNaturalCure(void)
     if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
-        EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+        BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
     else if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0 && Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
-        EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+        BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
 
@@ -258,7 +258,7 @@ static bool8 ShouldSwitchIfNaturalCure(void)
     if (Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
-        EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+        BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
         return TRUE;
     }
 
@@ -396,9 +396,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
             continue;
         if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             continue;
-        if (i == gBattlePartyID[bankIn1])
+        if (i == gBattlerPartyIndexes[bankIn1])
             continue;
-        if (i == gBattlePartyID[bankIn2])
+        if (i == gBattlerPartyIndexes[bankIn2])
             continue;
         if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
             continue;
@@ -426,7 +426,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
                 if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % moduloPercent == 0)
                 {
                     *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i;
-                    EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+                    BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
                     return TRUE;
                 }
             }
@@ -504,9 +504,9 @@ static bool8 ShouldSwitch(void)
             continue;
         if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             continue;
-        if (i == gBattlePartyID[bankIn1])
+        if (i == gBattlerPartyIndexes[bankIn1])
             continue;
-        if (i == gBattlePartyID[bankIn2])
+        if (i == gBattlerPartyIndexes[bankIn2])
             continue;
         if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
             continue;
@@ -586,9 +586,9 @@ void AI_TrySwitchOrUseItem(void)
                     {
                         if (GetMonData(&party[monToSwitchId], MON_DATA_HP) == 0)
                             continue;
-                        if (monToSwitchId == gBattlePartyID[bankIn1])
+                        if (monToSwitchId == gBattlerPartyIndexes[bankIn1])
                             continue;
-                        if (monToSwitchId == gBattlePartyID[bankIn2])
+                        if (monToSwitchId == gBattlerPartyIndexes[bankIn2])
                             continue;
                         if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + bankIn1))
                             continue;
@@ -611,7 +611,7 @@ void AI_TrySwitchOrUseItem(void)
         }
     }
 
-    EmitTwoReturnValues(1, ACTION_USE_MOVE, (gActiveBattler ^ BIT_SIDE) << 8);
+    BtlController_EmitTwoReturnValues(1, ACTION_USE_MOVE, (gActiveBattler ^ BIT_SIDE) << 8);
 }
 
 static void ModulateByTypeEffectiveness(u8 atkType, u8 defType1, u8 defType2, u8 *var)
@@ -654,7 +654,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
     if (*(gBattleStruct->monToSwitchIntoId + gActiveBattler) != 6)
         return *(gBattleStruct->monToSwitchIntoId + gActiveBattler);
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-        return gBattlePartyID[gActiveBattler] + 1;
+        return gBattlerPartyIndexes[gActiveBattler] + 1;
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
@@ -706,8 +706,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
             if (species != SPECIES_NONE
                 && GetMonData(&party[i], MON_DATA_HP) != 0
                 && !(gBitTable[i] & invalidMons)
-                && gBattlePartyID[bankIn1] != i
-                && gBattlePartyID[bankIn2] != i
+                && gBattlerPartyIndexes[bankIn1] != i
+                && gBattlerPartyIndexes[bankIn2] != i
                 && i != *(gBattleStruct->monToSwitchIntoId + bankIn1)
                 && i != *(gBattleStruct->monToSwitchIntoId + bankIn2))
             {
@@ -764,9 +764,9 @@ u8 GetMostSuitableMonToSwitchInto(void)
             continue;
         if (GetMonData(&party[i], MON_DATA_HP) == 0)
             continue;
-        if (gBattlePartyID[bankIn1] == i)
+        if (gBattlerPartyIndexes[bankIn1] == i)
             continue;
-        if (gBattlePartyID[bankIn2] == i)
+        if (gBattlerPartyIndexes[bankIn2] == i)
             continue;
         if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
             continue;
@@ -937,7 +937,7 @@ static bool8 ShouldUseItem(void)
 
         if (shouldUse)
         {
-            EmitTwoReturnValues(1, ACTION_USE_ITEM, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_USE_ITEM, 0);
             *(gBattleStruct->chosenItem + (gActiveBattler / 2) * 2) = item;
             gBattleResources->battleHistory->trainerItems[i] = 0;
             return shouldUse;
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 93d4de7b3..f5de56610 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -25,8 +25,8 @@
 
 #define ANIM_SPRITE_INDEX_COUNT 8
 
-extern u8 gBattleAttacker;
-extern u8 gBattleDefender;
+extern u8 gBattleMoveAttacker;
+extern u8 gBattleMoveTarget;
 extern u16 gBattle_WIN0H;
 extern u16 gBattle_WIN0V;
 extern u16 gBattle_WIN1H;
@@ -35,8 +35,8 @@ extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
@@ -130,8 +130,8 @@ EWRAM_DATA static u8 sMonAnimTaskIdArray[2] = {0};
 EWRAM_DATA u8 gAnimMoveTurn = 0;
 EWRAM_DATA static u8 sAnimBackgroundFadeState = 0;
 EWRAM_DATA static u16 sAnimMoveIndex = 0; // set but unused.
-EWRAM_DATA u8 gAnimBankAttacker = 0;
-EWRAM_DATA u8 gAnimBankTarget = 0;
+EWRAM_DATA u8 gBattleAnimAttacker = 0;
+EWRAM_DATA u8 gBattleAnimTarget = 0;
 EWRAM_DATA u16 gAnimSpeciesByBanks[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gUnknown_02038440 = 0;
 
@@ -214,15 +214,15 @@ void ClearBattleAnimationVars(void)
     gAnimMoveTurn = 0;
     sAnimBackgroundFadeState = 0;
     sAnimMoveIndex = 0;
-    gAnimBankAttacker = 0;
-    gAnimBankTarget = 0;
+    gBattleAnimAttacker = 0;
+    gBattleAnimTarget = 0;
     gUnknown_02038440 = 0;
 }
 
 void DoMoveAnim(u16 move)
 {
-    gAnimBankAttacker = gBattleAttacker;
-    gAnimBankTarget = gBattleDefender;
+    gBattleAnimAttacker = gBattleMoveAttacker;
+    gBattleAnimTarget = gBattleMoveTarget;
     LaunchBattleAnimation(gBattleAnims_Moves, move, TRUE);
 }
 
@@ -237,9 +237,9 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
         for (i = 0; i < MAX_BATTLERS_COUNT; i++)
         {
             if (GetBattlerSide(i) != 0)
-                gAnimSpeciesByBanks[i] = GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_SPECIES);
+                gAnimSpeciesByBanks[i] = GetMonData(&gEnemyParty[gBattlerPartyIndexes[i]], MON_DATA_SPECIES);
             else
-                gAnimSpeciesByBanks[i] = GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_SPECIES);
+                gAnimSpeciesByBanks[i] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_SPECIES);
         }
     }
     else
@@ -409,7 +409,7 @@ static void ScriptCmd_createsprite(void)
         else
             argVar *= -1;
 
-        subpriority = sub_80A82E4(gAnimBankTarget) + (s8)(argVar);
+        subpriority = sub_80A82E4(gBattleAnimTarget) + (s8)(argVar);
     }
     else
     {
@@ -418,13 +418,13 @@ static void ScriptCmd_createsprite(void)
         else
             argVar *= -1;
 
-        subpriority = sub_80A82E4(gAnimBankAttacker) + (s8)(argVar);
+        subpriority = sub_80A82E4(gBattleAnimAttacker) + (s8)(argVar);
     }
 
     if (subpriority < 3)
         subpriority = 3;
 
-    CreateSpriteAndAnimate(template, GetBankCoord(gAnimBankTarget, 2), GetBankCoord(gAnimBankTarget, 3), subpriority);
+    CreateSpriteAndAnimate(template, GetBattlerSpriteCoord(gBattleAnimTarget, 2), GetBattlerSpriteCoord(gBattleAnimTarget, 3), subpriority);
     gAnimVisualTaskCount++;
 }
 
@@ -565,7 +565,7 @@ static void sub_80A40F4(u8 taskId)
     u8 newTaskId;
 
     s16 *selfData = gTasks[taskId].data;
-    u8 bankSpriteId = gBankSpriteIds[selfData[t1_MONBG_BANK]];
+    u8 bankSpriteId = gBattlerSpriteIds[selfData[t1_MONBG_BANK]];
     gSprites[bankSpriteId].invisible = 1;
 
     if (!selfData[t1_CREATE_ANOTHER_TASK])
@@ -607,11 +607,11 @@ static void ScriptCmd_monbg(void)
 
     animBank = sBattleAnimScriptPtr[0];
     if (animBank & ANIM_TARGET)
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
     else
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
 
-    if (IsAnimBankSpriteVisible(bank))
+    if (IsBattlerSpriteVisible(bank))
     {
         u8 position = GetBattlerPosition(bank);
         if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
@@ -630,7 +630,7 @@ static void ScriptCmd_monbg(void)
     }
 
     bank ^= BIT_FLANK;
-    if (IsAnimBankSpriteVisible(bank))
+    if (IsBattlerSpriteVisible(bank))
     {
         u8 position = GetBattlerPosition(bank);
         if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
@@ -652,20 +652,20 @@ static void ScriptCmd_monbg(void)
     gAnimScriptCallback = WaitAnimFrameCount;
 }
 
-bool8 IsAnimBankSpriteVisible(u8 bank)
+bool8 IsBattlerSpriteVisible(u8 bank)
 {
     if (IsContest())
     {
-        if (bank == gAnimBankAttacker)
+        if (bank == gBattleAnimAttacker)
             return TRUE;
         else
             return FALSE;
     }
-    if (!IsBankSpritePresent(bank))
+    if (!IsBattlerSpritePresent(bank))
         return FALSE;
     if (IsContest())
         return TRUE; // this line wont ever be reached.
-    if (!gBattleSpritesDataPtr->bankData[bank].invisible || !gSprites[gBankSpriteIds[bank]].invisible)
+    if (!gBattleSpritesDataPtr->bankData[bank].invisible || !gSprites[gBattlerSpriteIds[bank]].invisible)
         return TRUE;
 
     return FALSE;
@@ -699,7 +699,7 @@ void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible)
         SetAnimBgAttribute(1, BG_ANIM_SCREEN_SIZE, 1);
         SetAnimBgAttribute(1, BG_ANIM_AREA_OVERFLOW_MODE, 0);
 
-        bankSpriteId = gBankSpriteIds[bank];
+        bankSpriteId = gBattlerSpriteIds[bank];
 
         gBattle_BG1_X =  -(gSprites[bankSpriteId].pos1.x + gSprites[bankSpriteId].pos2.x) + 0x20;
         if (IsContest() && IsSpeciesNotUnown(gContestResources->field_18->field_0))
@@ -707,7 +707,7 @@ void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible)
 
         gBattle_BG1_Y =  -(gSprites[bankSpriteId].pos1.y + gSprites[bankSpriteId].pos2.y) + 0x20;
         if (setSpriteInvisible)
-            gSprites[gBankSpriteIds[bank]].invisible = 1;
+            gSprites[gBattlerSpriteIds[bank]].invisible = 1;
 
         SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
         SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
@@ -736,13 +736,13 @@ void sub_80A438C(u8 bank, bool8 toBG_2, bool8 setSpriteInvisible)
         SetAnimBgAttribute(2, BG_ANIM_SCREEN_SIZE, 1);
         SetAnimBgAttribute(2, BG_ANIM_AREA_OVERFLOW_MODE, 0);
 
-        bankSpriteId = gBankSpriteIds[bank];
+        bankSpriteId = gBattlerSpriteIds[bank];
 
         gBattle_BG2_X =  -(gSprites[bankSpriteId].pos1.x + gSprites[bankSpriteId].pos2.x) + 0x20;
         gBattle_BG2_Y =  -(gSprites[bankSpriteId].pos1.y + gSprites[bankSpriteId].pos2.y) + 0x20;
 
         if (setSpriteInvisible)
-            gSprites[gBankSpriteIds[bank]].invisible = 1;
+            gSprites[gBattlerSpriteIds[bank]].invisible = 1;
 
         SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X);
         SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y);
@@ -869,14 +869,14 @@ static void ScriptCmd_clearmonbg(void)
         animBankId = ANIM_DEF_PARTNER;
 
     if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
     if (sMonAnimTaskIdArray[0] != 0xFF)
-        gSprites[gBankSpriteIds[bank]].invisible = 0;
+        gSprites[gBattlerSpriteIds[bank]].invisible = 0;
     if (animBankId > 1 && sMonAnimTaskIdArray[1] != 0xFF)
-        gSprites[gBankSpriteIds[bank ^ BIT_FLANK]].invisible = 0;
+        gSprites[gBattlerSpriteIds[bank ^ BIT_FLANK]].invisible = 0;
     else
         animBankId = 0;
 
@@ -931,11 +931,11 @@ static void ScriptCmd_monbg_22(void)
         animBankId = ANIM_DEF_PARTNER;
 
     if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
-    if (IsAnimBankSpriteVisible(bank))
+    if (IsBattlerSpriteVisible(bank))
     {
         u8 position = GetBattlerPosition(bank);
         if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
@@ -947,7 +947,7 @@ static void ScriptCmd_monbg_22(void)
     }
 
     bank ^= BIT_FLANK;
-    if (animBankId > 1 && IsAnimBankSpriteVisible(bank))
+    if (animBankId > 1 && IsBattlerSpriteVisible(bank))
     {
         u8 position = GetBattlerPosition(bank);
         if (position == B_POSITION_OPPONENT_LEFT || position == B_POSITION_PLAYER_RIGHT || IsContest())
@@ -976,14 +976,14 @@ static void ScriptCmd_clearmonbg_23(void)
         animBankId = ANIM_DEF_PARTNER;
 
     if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER)
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
     else
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
 
-    if (IsAnimBankSpriteVisible(bank))
-        gSprites[gBankSpriteIds[bank]].invisible = 0;
-    if (animBankId > 1 && IsAnimBankSpriteVisible(bank ^ BIT_FLANK))
-        gSprites[gBankSpriteIds[bank ^ BIT_FLANK]].invisible = 0;
+    if (IsBattlerSpriteVisible(bank))
+        gSprites[gBattlerSpriteIds[bank]].invisible = 0;
+    if (animBankId > 1 && IsBattlerSpriteVisible(bank ^ BIT_FLANK))
+        gSprites[gBattlerSpriteIds[bank ^ BIT_FLANK]].invisible = 0;
     else
         animBankId = 0;
 
@@ -1007,9 +1007,9 @@ static void sub_80A4BB0(u8 taskId)
         else
             toBG_2 = TRUE;
 
-        if (IsAnimBankSpriteVisible(bank))
+        if (IsBattlerSpriteVisible(bank))
             sub_80A477C(toBG_2);
-        if (gTasks[taskId].data[0] > 1 && IsAnimBankSpriteVisible(bank ^ BIT_FLANK))
+        if (gTasks[taskId].data[0] > 1 && IsBattlerSpriteVisible(bank ^ BIT_FLANK))
             sub_80A477C(toBG_2 ^ 1);
 
         DestroyTask(taskId);
@@ -1145,7 +1145,7 @@ static void ScriptCmd_fadetobgfromset(void)
 
     if (IsContest())
         gTasks[taskId].tBackgroundId = bg3;
-    else if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
+    else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
         gTasks[taskId].tBackgroundId = bg2;
     else
         gTasks[taskId].tBackgroundId = bg1;
@@ -1270,21 +1270,21 @@ static void ScriptCmd_changebg(void)
 
 s8 BattleAnimAdjustPanning(s8 pan)
 {
-    if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gAnimBankAttacker].statusAnimActive)
+    if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive)
     {
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
             pan = PAN_SIDE_OPPONENT;
         else
             pan = PAN_SIDE_PLAYER;
     }
     else if (IsContest())
     {
-        if (gAnimBankAttacker != gAnimBankTarget || gAnimBankAttacker != 2 || pan != PAN_SIDE_OPPONENT)
+        if (gBattleAnimAttacker != gBattleAnimTarget || gBattleAnimAttacker != 2 || pan != PAN_SIDE_OPPONENT)
             pan *= -1;
     }
-    else if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+    else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
-        if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
         {
             if (pan == PAN_SIDE_OPPONENT)
                 pan = PAN_SIDE_PLAYER;
@@ -1292,7 +1292,7 @@ s8 BattleAnimAdjustPanning(s8 pan)
                 pan *= -1;
         }
     }
-    else if (GetBattlerSide(gAnimBankTarget) == B_SIDE_OPPONENT)
+    else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
     {
         if (pan == PAN_SIDE_PLAYER)
             pan = PAN_SIDE_OPPONENT;
@@ -1312,16 +1312,16 @@ s8 BattleAnimAdjustPanning(s8 pan)
 
 s8 BattleAnimAdjustPanning2(s8 pan)
 {
-    if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gAnimBankAttacker].statusAnimActive)
+    if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive)
     {
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
             pan = PAN_SIDE_OPPONENT;
         else
             pan = PAN_SIDE_PLAYER;
     }
     else
     {
-        if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER || IsContest())
+        if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER || IsContest())
             pan = -pan;
     }
     return pan;
@@ -1701,9 +1701,9 @@ static void ScriptCmd_monbgprio_28(void)
     sBattleAnimScriptPtr += 2;
 
     if (wantedBank != ANIM_ATTACKER)
-        bank = gAnimBankTarget;
+        bank = gBattleAnimTarget;
     else
-        bank = gAnimBankAttacker;
+        bank = gBattleAnimAttacker;
 
     bankIdentity = GetBattlerPosition(bank);
     if (!IsContest() && (bankIdentity == B_POSITION_PLAYER_LEFT || bankIdentity == B_POSITION_OPPONENT_RIGHT))
@@ -1731,12 +1731,12 @@ static void ScriptCmd_monbgprio_2A(void)
 
     wantedBank = sBattleAnimScriptPtr[1];
     sBattleAnimScriptPtr += 2;
-    if (GetBattlerSide(gAnimBankAttacker) != GetBattlerSide(gAnimBankTarget))
+    if (GetBattlerSide(gBattleAnimAttacker) != GetBattlerSide(gBattleAnimTarget))
     {
         if (wantedBank != ANIM_ATTACKER)
-            bank = gAnimBankTarget;
+            bank = gBattleAnimTarget;
         else
-            bank = gAnimBankAttacker;
+            bank = gBattleAnimAttacker;
 
         bankIdentity = GetBattlerPosition(bank);
         if (!IsContest() && (bankIdentity == B_POSITION_PLAYER_LEFT || bankIdentity == B_POSITION_OPPONENT_RIGHT))
@@ -1751,7 +1751,7 @@ static void ScriptCmd_invisible(void)
 {
     u8 spriteId;
 
-    spriteId = GetAnimBankSpriteId(sBattleAnimScriptPtr[1]);
+    spriteId = GetBattlerSpriteId(sBattleAnimScriptPtr[1]);
     if (spriteId != 0xFF)
         gSprites[spriteId].invisible = 1;
 
@@ -1762,7 +1762,7 @@ static void ScriptCmd_visible(void)
 {
     u8 spriteId;
 
-    spriteId = GetAnimBankSpriteId(sBattleAnimScriptPtr[1]);
+    spriteId = GetBattlerSpriteId(sBattleAnimScriptPtr[1]);
     if (spriteId != 0xFF)
         gSprites[spriteId].invisible = 0;
 
@@ -1778,17 +1778,17 @@ static void ScriptCmd_doublebattle_2D(void)
     wantedBank = sBattleAnimScriptPtr[1];
     sBattleAnimScriptPtr += 2;
     if (!IsContest() && IsDoubleBattle()
-     && GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
+     && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
     {
         if (wantedBank == ANIM_ATTACKER)
         {
-            r4 = sub_80A8364(gAnimBankAttacker);
-            spriteId = GetAnimBankSpriteId(ANIM_ATTACKER);
+            r4 = sub_80A8364(gBattleAnimAttacker);
+            spriteId = GetBattlerSpriteId(ANIM_ATTACKER);
         }
         else
         {
-            r4 = sub_80A8364(gAnimBankTarget);
-            spriteId = GetAnimBankSpriteId(ANIM_TARGET);
+            r4 = sub_80A8364(gBattleAnimTarget);
+            spriteId = GetBattlerSpriteId(ANIM_TARGET);
         }
         if (spriteId != 0xFF)
         {
@@ -1813,17 +1813,17 @@ static void ScriptCmd_doublebattle_2E(void)
     wantedBank = sBattleAnimScriptPtr[1];
     sBattleAnimScriptPtr += 2;
     if (!IsContest() && IsDoubleBattle()
-     && GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
+     && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
     {
         if (wantedBank == ANIM_ATTACKER)
         {
-            r4 = sub_80A8364(gAnimBankAttacker);
-            spriteId = GetAnimBankSpriteId(ANIM_ATTACKER);
+            r4 = sub_80A8364(gBattleAnimAttacker);
+            spriteId = GetBattlerSpriteId(ANIM_ATTACKER);
         }
         else
         {
-            r4 = sub_80A8364(gAnimBankTarget);
-            spriteId = GetAnimBankSpriteId(ANIM_TARGET);
+            r4 = sub_80A8364(gBattleAnimTarget);
+            spriteId = GetBattlerSpriteId(ANIM_TARGET);
         }
 
         if (spriteId != 0xFF && r4 == 2)
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 0c7d929a4..2ce9d8712 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -24,21 +24,21 @@
 #include "pokeball.h"
 #include "data2.h"
 
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gActiveBattler;
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
@@ -47,7 +47,7 @@ extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattleDefender;
+extern u8 gBattleMoveTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
@@ -203,12 +203,12 @@ static void nullsub_28(void)
 
 void SetControllerToLinkOpponent(void)
 {
-    gBattlerFuncs[gActiveBattler] = LinkOpponentBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = LinkOpponentBufferRunCommand;
 }
 
 static void LinkOpponentBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBattler])
+    if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
     {
         if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sLinkOpponentBufferCommands))
             sLinkOpponentBufferCommands[gBattleBufferA[gActiveBattler][0]]();
@@ -219,23 +219,23 @@ static void LinkOpponentBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         LinkOpponentBufferExecCompleted();
 }
 
 static void CompleteOnBankSpriteCallbackDummy2(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         LinkOpponentBufferExecCompleted();
 }
 
 static void sub_8064470(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        FreeTrainerFrontPicPalette(gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        FreeTrainerFrontPicPalette(gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
         LinkOpponentBufferExecCompleted();
     }
 }
@@ -256,13 +256,13 @@ static void sub_8064520(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
             r8 = TRUE;
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
@@ -271,7 +271,7 @@ static void sub_8064520(void)
 
     if (r8)
     {
-        if (r4 || !IsAnimBankSpriteVisible(gActiveBattler ^ BIT_FLANK))
+        if (r4 || !IsBattlerSpriteVisible(gActiveBattler ^ BIT_FLANK))
         {
             if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
                 return;
@@ -303,7 +303,7 @@ static void sub_8064520(void)
         }
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
-        gBattlerFuncs[gActiveBattler] = sub_80644D8;
+        gBattlerControllerFuncs[gActiveBattler] = sub_80644D8;
     }
 }
 
@@ -315,14 +315,14 @@ static void sub_8064734(void)
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
     {
-        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
     }
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
     {
-        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
+        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
     }
 
 
@@ -332,13 +332,13 @@ static void sub_8064734(void)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+                UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
                 sub_8076918(gActiveBattler ^ BIT_FLANK);
-                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
+                SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]);
             }
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
             sub_8076918(gActiveBattler);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+            SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 1;
     }
@@ -368,7 +368,7 @@ static void sub_8064734(void)
     if (r10)
     {
         if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+            && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI && GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_RIGHT)
             {
@@ -380,30 +380,30 @@ static void sub_8064734(void)
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
                 DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
-                SetBankEnemyShadowSpriteCallback(gActiveBattler ^ BIT_FLANK, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], MON_DATA_SPECIES));
+                SetBattlerShadowSpriteCallback(gActiveBattler ^ BIT_FLANK, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], MON_DATA_SPECIES));
             }
 
 
             DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-            SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+            SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
 
             gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 0;
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 0;
 
-            gBattlerFuncs[gActiveBattler] = sub_8064520;
+            gBattlerControllerFuncs[gActiveBattler] = sub_8064520;
         }
     }
 }
 
 static void sub_8064B04(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
-     && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+     && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80)
         {
-            sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+            sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
         }
         else
         {
@@ -421,13 +421,13 @@ static void sub_8064B04(void)
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+    SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
@@ -437,9 +437,9 @@ static void CompleteOnHealthbarDone(void)
 
 static void sub_8064C14(void)
 {
-    if (!gSprites[gBankSpriteIds[gActiveBattler]].inUse)
+    if (!gSprites[gBattlerSpriteIds[gActiveBattler]].inUse)
     {
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         LinkOpponentBufferExecCompleted();
     }
 }
@@ -448,10 +448,10 @@ static void sub_8064C58(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBattler);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        HideBattlerShadowSprite(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         LinkOpponentBufferExecCompleted();
     }
 }
@@ -464,7 +464,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBattler];
+    u8 spriteId = gBattlerSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -483,12 +483,12 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_8064D60(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattlerFuncs[gActiveBattler] = sub_8064DD0;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8064DD0;
     }
 }
 
@@ -496,8 +496,8 @@ static void sub_8064DD0(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs())
     {
-        if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
-            || gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
+        if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            || gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
         {
             m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             LinkOpponentBufferExecCompleted();
@@ -508,7 +508,7 @@ static void sub_8064DD0(void)
 static void sub_8064E50(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
-     && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+     && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
@@ -516,13 +516,13 @@ static void sub_8064E50(void)
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
+        StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 0);
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
         sub_8076918(gActiveBattler);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
         CopyBattleSpriteInvisibility(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = sub_8064D60;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8064D60;
     }
 }
 
@@ -531,15 +531,15 @@ static void sub_8064F40(void)
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80)
     {
-        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
-        gBattlerFuncs[gActiveBattler] = sub_8064E50;
+        SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
+        gBattlerControllerFuncs[gActiveBattler] = sub_8064E50;
     }
 }
 
@@ -557,7 +557,7 @@ static void CompleteOnFinishedBattleAnimation(void)
 
 static void LinkOpponentBufferExecCompleted(void)
 {
-    gBattlerFuncs[gActiveBattler] = LinkOpponentBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = LinkOpponentBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
@@ -567,7 +567,7 @@ static void LinkOpponentBufferExecCompleted(void)
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
+        gBattleControllerExecFlags &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -580,7 +580,7 @@ static void LinkOpponentHandleGetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyLinkOpponentMonData(gBattlePartyID[gActiveBattler], monData);
+        size += CopyLinkOpponentMonData(gBattlerPartyIndexes[gActiveBattler], monData);
     }
     else
     {
@@ -592,7 +592,7 @@ static void LinkOpponentHandleGetMonData(void)
             monToCheck >>= 1;
         }
     }
-    EmitDataTransfer(1, size, monData);
+    BtlController_EmitDataTransfer(1, size, monData);
     LinkOpponentBufferExecCompleted();
 }
 
@@ -914,7 +914,7 @@ static void LinkOpponentHandleSetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetLinkOpponentMonData(gBattlePartyID[gActiveBattler]);
+        SetLinkOpponentMonData(gBattlerPartyIndexes[gActiveBattler]);
     }
     else
     {
@@ -1147,7 +1147,7 @@ static void SetLinkOpponentMonData(u8 monId)
 
 static void LinkOpponentHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *dst = (u8 *)&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
     for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
@@ -1158,31 +1158,31 @@ static void LinkOpponentHandleSetRawMonData(void)
 
 static void LinkOpponentHandleLoadMonSprite(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
     sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBattler, 2),
-                                               GetBankSpriteDefault_Y(gActiveBattler),
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBattlerSpriteCoord(gActiveBattler, 2),
+                                               GetBattlerSpriteDefault_Y(gActiveBattler),
                                                sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
 
-    SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+    SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
 
-    gBattlerFuncs[gActiveBattler] = sub_8064B04;
+    gBattlerControllerFuncs[gActiveBattler] = sub_8064B04;
 }
 
 static void LinkOpponentHandleSwitchInAnim(void)
 {
-    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    gBattlerPartyIndexes[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
     sub_8066494(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlerFuncs[gActiveBattler] = sub_8064F40;
+    gBattlerControllerFuncs[gActiveBattler] = sub_8064F40;
 }
 
 static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
@@ -1190,29 +1190,29 @@ static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
     u16 species;
 
     ClearTemporarySpeciesSpriteData(bank, dontClearSubstituteBit);
-    gBattlePartyID[bank] = gBattleBufferA[bank][1];
-    species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+    gBattlerPartyIndexes[bank] = gBattleBufferA[bank][1];
+    species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
+    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[bank]], bank);
     sub_806A068(species, GetBattlerPosition(bank));
 
-    gBankSpriteIds[bank] = CreateSprite(
+    gBattlerSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      GetBankCoord(bank, 2),
-      GetBankSpriteDefault_Y(bank),
+      GetBattlerSpriteCoord(bank, 2),
+      GetBattlerSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBattlerSpriteIds[bank];
     gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data[0] = bank;
-    gSprites[gBankSpriteIds[bank]].data[2] = species;
-    gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[2] = species;
+    gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
 
-    StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
 
-    gSprites[gBankSpriteIds[bank]].invisible = TRUE;
-    gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+    gSprites[gBattlerSpriteIds[bank]].invisible = TRUE;
+    gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
 
     gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
 }
@@ -1222,14 +1222,14 @@ static void LinkOpponentHandleReturnMonToBall(void)
     if (gBattleBufferA[gActiveBattler][1] == 0)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBattler);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        HideBattlerShadowSprite(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         LinkOpponentBufferExecCompleted();
     }
 }
@@ -1249,7 +1249,7 @@ static void DoSwitchOutAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_OPPONENT_MON);
-            gBattlerFuncs[gActiveBattler] = sub_8064C58;
+            gBattlerControllerFuncs[gActiveBattler] = sub_8064C58;
         }
         break;
     }
@@ -1276,25 +1276,25 @@ static void LinkOpponentHandleDrawTrainerPic(void)
         }
         else
         {
-            if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED
-            || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
+            if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED
+            || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
             {
-                if (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender != 0)
+                if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != 0)
                     trainerPicId = gUnknown_0831F578[0x4F];
                 else
                     trainerPicId = gUnknown_0831F578[0x4E];
             }
-            else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
-                     || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
+            else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
+                     || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
             {
-                if (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender != 0)
+                if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != 0)
                     trainerPicId = gUnknown_0831F578[0x51];
                 else
                     trainerPicId = gUnknown_0831F578[0x50];
             }
             else
             {
-                trainerPicId = PlayerGenderToFrontTrainerPicId(gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender);
+                trainerPicId = PlayerGenderToFrontTrainerPicId(gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender);
             }
         }
     }
@@ -1329,18 +1329,18 @@ static void LinkOpponentHandleDrawTrainerPic(void)
 
     DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
     sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
                                                xPos,
                                                (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40,
                                                sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void LinkOpponentHandleTrainerSlide(void)
@@ -1354,28 +1354,28 @@ static void LinkOpponentHandleTrainerSlide(void)
 
     DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
     sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E);
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 96;
-    gSprites[gBankSpriteIds[gActiveBattler]].pos1.x += 32;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 96;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.x += 32;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2; // this line is redundant, because LinkOpponentBufferExecCompleted changes the battle bank function
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2; // this line is redundant, because LinkOpponentBufferExecCompleted changes the battle bank function
     LinkOpponentBufferExecCompleted();
 }
 
 static void LinkOpponentHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
-    gBattlerFuncs[gActiveBattler] = sub_8064470;
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerControllerFuncs[gActiveBattler] = sub_8064470;
 }
 
 static void LinkOpponentHandleFaintAnimation(void)
@@ -1392,8 +1392,8 @@ static void LinkOpponentHandleFaintAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT);
-            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039934;
-            gBattlerFuncs[gActiveBattler] = sub_8064C14;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039934;
+            gBattlerControllerFuncs[gActiveBattler] = sub_8064C14;
         }
     }
 }
@@ -1438,7 +1438,7 @@ static void LinkOpponentHandleMoveAnimation(void)
         else
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            gBattlerFuncs[gActiveBattler] = LinkOpponentDoMoveAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = LinkOpponentDoMoveAnimation;
             sub_817E0FC(move, gWeatherMoveAnim, gAnimDisableStructPtr);
         }
     }
@@ -1502,7 +1502,7 @@ static void LinkOpponentHandlePrintString(void)
     stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
     sub_817C95C(*stringId);
 }
 
@@ -1550,19 +1550,19 @@ static void LinkOpponentHandleHealthBarUpdate(void)
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, 0, hpVal);
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void LinkOpponentHandleExpUpdate(void)
@@ -1576,10 +1576,10 @@ static void LinkOpponentHandleStatusIconUpdate(void)
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_STATUS_ICON);
         bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1589,7 +1589,7 @@ static void LinkOpponentHandleStatusAnimation(void)
     {
         InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
                         gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1664,16 +1664,16 @@ static void LinkOpponentHandleCmd40(void)
 
 static void LinkOpponentHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         LinkOpponentBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
+        gBattlerControllerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1712,7 +1712,7 @@ static void LinkOpponentHandlePlayFanfareOrBGM(void)
 
 static void LinkOpponentHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, 25, 5);
     LinkOpponentBufferExecCompleted();
@@ -1730,14 +1730,14 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_80676FC);
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_80676FC);
 
     taskId = CreateTask(sub_8067618, 5);
     gTasks[taskId].data[0] = gActiveBattler;
@@ -1746,7 +1746,7 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void)
         gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattlerFuncs[gActiveBattler] = nullsub_28;
+    gBattlerControllerFuncs[gActiveBattler] = nullsub_28;
 }
 
 static void sub_8067618(u8 taskId)
@@ -1756,19 +1756,19 @@ static void sub_8067618(u8 taskId)
     gActiveBattler = gTasks[taskId].data[0];
     if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_8066494(gActiveBattler, FALSE);
     }
     else
     {
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_8066494(gActiveBattler, FALSE);
         gActiveBattler ^= BIT_FLANK;
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_8066494(gActiveBattler, FALSE);
         gActiveBattler ^= BIT_FLANK;
     }
-    gBattlerFuncs[gActiveBattler] = sub_8064734;
+    gBattlerControllerFuncs[gActiveBattler] = sub_8064734;
     gActiveBattler = savedActiveBank;
     DestroyTask(taskId);
 }
@@ -1809,7 +1809,7 @@ static void LinkOpponentHandleDrawPartyStatusSummary(void)
         if (gBattleBufferA[gActiveBattler][2] != 0)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattlerFuncs[gActiveBattler] = sub_806782C;
+        gBattlerControllerFuncs[gActiveBattler] = sub_806782C;
     }
 }
 
@@ -1836,9 +1836,9 @@ static void LinkOpponentHandleCmd50(void)
 
 static void LinkOpponentHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBattler))
+    if (IsBattlerSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        gSprites[gBattlerSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
         CopyBattleSpriteInvisibility(gActiveBattler);
     }
     LinkOpponentBufferExecCompleted();
@@ -1854,7 +1854,7 @@ static void LinkOpponentHandleBattleAnimation(void)
         if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             LinkOpponentBufferExecCompleted();
         else
-            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
 
         sub_817E32C(animationId);
     }
@@ -1884,7 +1884,7 @@ static void LinkOpponentHandleCmd55(void)
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     LinkOpponentBufferExecCompleted();
-    gBattlerFuncs[gActiveBattler] = sub_80587B0;
+    gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_92(void)
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index d184370f4..26f808620 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -24,21 +24,21 @@
 #include "pokeball.h"
 #include "data2.h"
 
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gActiveBattler;
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
@@ -47,7 +47,7 @@ extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattleDefender;
+extern u8 gBattleMoveTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
@@ -198,12 +198,12 @@ static void nullsub_112(void)
 
 void SetControllerToLinkPartner(void)
 {
-    gBattlerFuncs[gActiveBattler] = LinkPartnerBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = LinkPartnerBufferRunCommand;
 }
 
 static void LinkPartnerBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBattler])
+    if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
     {
         if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sLinkPartnerBufferCommands))
             sLinkPartnerBufferCommands[gBattleBufferA[gActiveBattler][0]]();
@@ -214,17 +214,17 @@ static void LinkPartnerBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         LinkPartnerBufferExecCompleted();
 }
 
 static void sub_814AF54(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         nullsub_25(0);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
         LinkPartnerBufferExecCompleted();
     }
 }
@@ -244,13 +244,13 @@ static void sub_814B004(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r6 = TRUE;
         }
@@ -262,7 +262,7 @@ static void sub_814B004(void)
     if (r6)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
-        gBattlerFuncs[gActiveBattler] = sub_814AFBC;
+        gBattlerControllerFuncs[gActiveBattler] = sub_814AFBC;
     }
 }
 
@@ -271,7 +271,7 @@ static void sub_814B0E8(void)
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive
         && gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+        && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
         && ++gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 != 1)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
@@ -279,55 +279,55 @@ static void sub_814B0E8(void)
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
             DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
             sub_8076918(gActiveBattler ^ BIT_FLANK);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
+            SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]);
         }
 
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
         sub_8076918(gActiveBattler);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
 
-        gBattlerFuncs[gActiveBattler] = sub_814B004;
+        gBattlerControllerFuncs[gActiveBattler] = sub_814B004;
     }
 }
 
 static void sub_814B290(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].animEnded && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
         LinkPartnerBufferExecCompleted();
 }
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+    SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
         LinkPartnerBufferExecCompleted();
     }
 }
 
 static void sub_814B340(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].pos1.y + gSprites[gBankSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y + gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
     {
-        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+        u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
         nullsub_24(species);
-        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBattler]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeOamMatrix(gSprites[gBattlerSpriteIds[gActiveBattler]].oam.matrixNum);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         LinkPartnerBufferExecCompleted();
     }
 }
@@ -336,9 +336,9 @@ static void sub_814B3DC(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         LinkPartnerBufferExecCompleted();
     }
 }
@@ -351,7 +351,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBattler];
+    u8 spriteId = gBattlerSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -370,20 +370,20 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_814B4E0(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         CopyBattleSpriteInvisibility(gActiveBattler);
         if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattlerFuncs[gActiveBattler] = sub_814B554;
+        gBattlerControllerFuncs[gActiveBattler] = sub_814B554;
     }
 }
 
 static void sub_814B554(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive
-        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+        && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         LinkPartnerBufferExecCompleted();
     }
@@ -400,13 +400,13 @@ static void sub_814B5A8(void)
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
+        StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 0);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
         sub_8076918(gActiveBattler);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-        gBattlerFuncs[gActiveBattler] = sub_814B4E0;
+        gBattlerControllerFuncs[gActiveBattler] = sub_814B4E0;
     }
 }
 
@@ -415,20 +415,20 @@ static void sub_814B69C(void)
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        gBattlerFuncs[gActiveBattler] = sub_814B5A8;
+        gBattlerControllerFuncs[gActiveBattler] = sub_814B5A8;
     }
 }
 
 static void LinkPartnerBufferExecCompleted(void)
 {
-    gBattlerFuncs[gActiveBattler] = LinkPartnerBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = LinkPartnerBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
@@ -438,7 +438,7 @@ static void LinkPartnerBufferExecCompleted(void)
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
+        gBattleControllerExecFlags &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -463,7 +463,7 @@ static void LinkPartnerHandleGetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyLinkPartnerMonData(gBattlePartyID[gActiveBattler], monData);
+        size += CopyLinkPartnerMonData(gBattlerPartyIndexes[gActiveBattler], monData);
     }
     else
     {
@@ -475,7 +475,7 @@ static void LinkPartnerHandleGetMonData(void)
             monToCheck >>= 1;
         }
     }
-    EmitDataTransfer(1, size, monData);
+    BtlController_EmitDataTransfer(1, size, monData);
     LinkPartnerBufferExecCompleted();
 }
 
@@ -797,7 +797,7 @@ static void LinkPartnerHandleSetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetLinkPartnerMonData(gBattlePartyID[gActiveBattler]);
+        SetLinkPartnerMonData(gBattlerPartyIndexes[gActiveBattler]);
     }
     else
     {
@@ -1027,12 +1027,12 @@ static void SetLinkPartnerMonData(u8 monId)
         break;
     }
 
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 }
 
 static void LinkPartnerHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *dst = (u8 *)&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
     for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
@@ -1045,28 +1045,28 @@ static void LinkPartnerHandleLoadMonSprite(void)
 {
     u16 species;
 
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
-    species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
+    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
     sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBattler, 2),
-                                               GetBankSpriteDefault_Y(gActiveBattler),
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBattlerSpriteCoord(gActiveBattler, 2),
+                                               GetBattlerSpriteDefault_Y(gActiveBattler),
                                                sub_80A82E4(gActiveBattler));
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
-    gBattlerFuncs[gActiveBattler] = sub_814B290;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    gBattlerControllerFuncs[gActiveBattler] = sub_814B290;
 }
 
 static void LinkPartnerHandleSwitchInAnim(void)
 {
     ClearTemporarySpeciesSpriteData(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    gBattlerPartyIndexes[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
     sub_814CC98(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlerFuncs[gActiveBattler] = sub_814B69C;
+    gBattlerControllerFuncs[gActiveBattler] = sub_814B69C;
 }
 
 static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
@@ -1074,28 +1074,28 @@ static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
     u16 species;
 
     ClearTemporarySpeciesSpriteData(bank, dontClearSubstituteBit);
-    gBattlePartyID[bank] = gBattleBufferA[bank][1];
-    species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+    gBattlerPartyIndexes[bank] = gBattleBufferA[bank][1];
+    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     sub_806A068(species, GetBattlerPosition(bank));
 
-    gBankSpriteIds[bank] = CreateSprite(
+    gBattlerSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      GetBankCoord(bank, 2),
-      GetBankSpriteDefault_Y(bank),
+      GetBattlerSpriteCoord(bank, 2),
+      GetBattlerSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBattlerSpriteIds[bank];
     gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data[0] = bank;
-    gSprites[gBankSpriteIds[bank]].data[2] = species;
-    gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[2] = species;
+    gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
 
-    StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
 
-    gSprites[gBankSpriteIds[bank]].invisible = TRUE;
-    gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+    gSprites[gBattlerSpriteIds[bank]].invisible = TRUE;
+    gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
 
     gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
@@ -1105,13 +1105,13 @@ static void LinkPartnerHandleReturnMonToBall(void)
     if (gBattleBufferA[gActiveBattler][1] == 0)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         LinkPartnerBufferExecCompleted();
     }
 }
@@ -1131,7 +1131,7 @@ static void DoSwitchOutAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_PLAYER_MON);
-            gBattlerFuncs[gActiveBattler] = sub_814B3DC;
+            gBattlerControllerFuncs[gActiveBattler] = sub_814B3DC;
         }
         break;
     }
@@ -1154,31 +1154,31 @@ static void LinkPartnerHandleDrawTrainerPic(void)
         xPos = 80;
     }
 
-    if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED
-        || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
+    if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED
+        || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender + BACK_PIC_RED;
+        trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RED;
     }
-    else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
-             || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
+    else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
+             || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender + BACK_PIC_RS_BRENDAN;
+        trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RS_BRENDAN;
     }
     else
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender;
+        trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender;
     }
 
     DecompressTrainerBackPic(trainerPicId, gActiveBattler);
     sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, sub_80A82E4(gActiveBattler));
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void LinkPartnerHandleTrainerSlide(void)
@@ -1188,13 +1188,13 @@ static void LinkPartnerHandleTrainerSlide(void)
 
 static void LinkPartnerHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
-    gBattlerFuncs[gActiveBattler] = sub_814AF54;
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerControllerFuncs[gActiveBattler] = sub_814AF54;
 }
 
 static void LinkPartnerHandleFaintAnimation(void)
@@ -1210,12 +1210,12 @@ static void LinkPartnerHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
-            gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
-            gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 5;
-            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039C00;
-            gBattlerFuncs[gActiveBattler] = sub_814B340;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
+            gBattlerControllerFuncs[gActiveBattler] = sub_814B340;
         }
     }
 }
@@ -1260,7 +1260,7 @@ static void LinkPartnerHandleMoveAnimation(void)
         else
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            gBattlerFuncs[gActiveBattler] = LinkPartnerDoMoveAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = LinkPartnerDoMoveAnimation;
             sub_817E0FC(move, gWeatherMoveAnim, gAnimDisableStructPtr);
         }
     }
@@ -1324,7 +1324,7 @@ static void LinkPartnerHandlePrintString(void)
     stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
     sub_817C95C(*stringId);
 }
 
@@ -1372,19 +1372,19 @@ static void LinkPartnerHandleHealthBarUpdate(void)
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, 0, hpVal);
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void LinkPartnerHandleExpUpdate(void)
@@ -1398,10 +1398,10 @@ static void LinkPartnerHandleStatusIconUpdate(void)
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_STATUS_ICON);
         bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1411,7 +1411,7 @@ static void LinkPartnerHandleStatusAnimation(void)
     {
         InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
                         gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1486,16 +1486,16 @@ static void LinkPartnerHandleCmd40(void)
 
 static void LinkPartnerHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         LinkPartnerBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
+        gBattlerControllerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1534,7 +1534,7 @@ static void LinkPartnerHandlePlayFanfareOrBGM(void)
 
 static void LinkPartnerHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, -25, 5);
     LinkPartnerBufferExecCompleted();
@@ -1553,37 +1553,37 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
     u8 taskId;
     u32 trainerPicId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_805CC00);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_805CC00);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F9);
 
-    if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED
-        || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
+    if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_FIRE_RED
+        || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_LEAF_GREEN)
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender + BACK_PIC_RED;
+        trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RED;
     }
-    else if ((gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
-             || (gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
+    else if ((gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_RUBY
+             || (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].version & 0xFF) == VERSION_SAPPHIRE)
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender + BACK_PIC_RS_BRENDAN;
+        trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender + BACK_PIC_RS_BRENDAN;
     }
     else
     {
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender;
+        trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender;
     }
 
     LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, 0x100 + paletteNum * 16, 32);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(sub_814DCCC, 5);
     gTasks[taskId].data[0] = gActiveBattler;
@@ -1592,7 +1592,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
         gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattlerFuncs[gActiveBattler] = nullsub_112;
+    gBattlerControllerFuncs[gActiveBattler] = nullsub_112;
 }
 
 static void sub_814DCCC(u8 taskId)
@@ -1608,20 +1608,20 @@ static void sub_814DCCC(u8 taskId)
         gActiveBattler = gTasks[taskId].data[0];
         if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
             sub_814CC98(gActiveBattler, FALSE);
         }
         else
         {
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
             sub_814CC98(gActiveBattler, FALSE);
             gActiveBattler ^= BIT_FLANK;
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
-            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
+            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
             sub_814CC98(gActiveBattler, FALSE);
             gActiveBattler ^= BIT_FLANK;
         }
-        gBattlerFuncs[gActiveBattler] = sub_814B0E8;
+        gBattlerControllerFuncs[gActiveBattler] = sub_814B0E8;
         gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
@@ -1642,7 +1642,7 @@ static void LinkPartnerHandleDrawPartyStatusSummary(void)
         if (gBattleBufferA[gActiveBattler][2] != 0)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattlerFuncs[gActiveBattler] = sub_814DE9C;
+        gBattlerControllerFuncs[gActiveBattler] = sub_814DE9C;
     }
 }
 
@@ -1669,9 +1669,9 @@ static void LinkPartnerHandleCmd50(void)
 
 static void LinkPartnerHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBattler))
+    if (IsBattlerSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        gSprites[gBattlerSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
         CopyBattleSpriteInvisibility(gActiveBattler);
     }
     LinkPartnerBufferExecCompleted();
@@ -1687,7 +1687,7 @@ static void LinkPartnerHandleBattleAnimation(void)
         if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             LinkPartnerBufferExecCompleted();
         else
-            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
 
         sub_817E32C(animationId);
     }
@@ -1712,7 +1712,7 @@ static void LinkPartnerHandleCmd55(void)
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     LinkPartnerBufferExecCompleted();
-    gBattlerFuncs[gActiveBattler] = sub_80587B0;
+    gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_113(void)
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 7131cbde6..2ce339732 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -28,19 +28,19 @@
 #include "pokeball.h"
 #include "data2.h"
 
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gActiveBattler;
-extern u8 gBattleDefender;
+extern u8 gBattleMoveTarget;
 extern u8 gAbsentBattlerFlags;
 extern bool8 gDoingBattleAnim;
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void *gUnknown_020244D8;
 extern void *gUnknown_020244DC;
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
@@ -207,12 +207,12 @@ static void nullsub_26(void)
 
 void SetControllerToOpponent(void)
 {
-    gBattlerFuncs[gActiveBattler] = OpponentBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = OpponentBufferRunCommand;
 }
 
 static void OpponentBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBattler])
+    if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
     {
         if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sOpponentBufferCommands))
             sOpponentBufferCommands[gBattleBufferA[gActiveBattler][0]]();
@@ -223,23 +223,23 @@ static void OpponentBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         OpponentBufferExecCompleted();
 }
 
 static void CompleteOnBankSpriteCallbackDummy2(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         OpponentBufferExecCompleted();
 }
 
 static void sub_805F240(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        FreeTrainerFrontPicPalette(gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        FreeTrainerFrontPicPalette(gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
         OpponentBufferExecCompleted();
     }
 }
@@ -260,14 +260,14 @@ static void sub_805F2F0(void)
 
     if (!IsDoubleBattle() || ((IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)) || (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
             var = TRUE;
         var2 = FALSE;
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
-         && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+         && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
             var = TRUE;
         var2 = TRUE;
     }
@@ -310,7 +310,7 @@ static void sub_805F2F0(void)
             return;
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
-        gBattlerFuncs[gActiveBattler] = sub_805F2A8;
+        gBattlerControllerFuncs[gActiveBattler] = sub_805F2A8;
     }
 }
 
@@ -320,22 +320,22 @@ static void sub_805F560(void)
     bool32 r10 = FALSE;
 
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
-        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
     if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI) && IsDoubleBattle() && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
-        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
+        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+                UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
                 sub_8076918(gActiveBattler ^ BIT_FLANK);
-                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
+                SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]);
             }
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
             sub_8076918(gActiveBattler);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+            SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 1;
     }
@@ -362,7 +362,7 @@ static void sub_805F560(void)
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
         if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+            && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         {
             r10 = TRUE;
         }
@@ -370,9 +370,9 @@ static void sub_805F560(void)
     else
     {
         if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
             && gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+            && gSprites[gBattlerSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r10 = TRUE;
         }
@@ -383,25 +383,25 @@ static void sub_805F560(void)
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
             DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
-            SetBankEnemyShadowSpriteCallback(gActiveBattler ^ BIT_FLANK, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], MON_DATA_SPECIES));
+            SetBattlerShadowSpriteCallback(gActiveBattler ^ BIT_FLANK, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], MON_DATA_SPECIES));
         }
 
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+        SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 0;
 
-        gBattlerFuncs[gActiveBattler] = sub_805F2F0;
+        gBattlerControllerFuncs[gActiveBattler] = sub_805F2F0;
     }
 }
 
 static void sub_805F994(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
-        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
 
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
@@ -413,11 +413,11 @@ static void sub_805F994(void)
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0);
+    SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
         OpponentBufferExecCompleted();
@@ -425,9 +425,9 @@ static void CompleteOnHealthbarDone(void)
 
 static void sub_805FAC4(void)
 {
-    if (!gSprites[gBankSpriteIds[gActiveBattler]].inUse)
+    if (!gSprites[gBattlerSpriteIds[gActiveBattler]].inUse)
     {
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         OpponentBufferExecCompleted();
     }
 }
@@ -436,10 +436,10 @@ static void sub_805FB08(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBattler);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        HideBattlerShadowSprite(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         OpponentBufferExecCompleted();
     }
 }
@@ -452,7 +452,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBattler];
+    u8 spriteId = gBattlerSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -471,11 +471,11 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_805FC10(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
-        gBattlerFuncs[gActiveBattler] = sub_805FC80;
+        gBattlerControllerFuncs[gActiveBattler] = sub_805FC80;
     }
 }
 
@@ -483,7 +483,7 @@ static void sub_805FC80(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs())
     {
-        if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy || gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
+        if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy || gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
         {
             m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             OpponentBufferExecCompleted();
@@ -493,32 +493,32 @@ static void sub_805FC80(void)
 
 static void sub_805FD00(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 0);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
         sub_8076918(gActiveBattler);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
         CopyBattleSpriteInvisibility(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = sub_805FC10;
+        gBattlerControllerFuncs[gActiveBattler] = sub_805FC10;
     }
 }
 
 static void sub_805FDF0(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
-        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
 
     if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
-        gBattlerFuncs[gActiveBattler] = sub_805FD00;
+        SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
+        gBattlerControllerFuncs[gActiveBattler] = sub_805FD00;
     }
 }
 
@@ -536,7 +536,7 @@ static void CompleteOnFinishedBattleAnimation(void)
 
 static void OpponentBufferExecCompleted(void)
 {
-    gBattlerFuncs[gActiveBattler] = OpponentBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = OpponentBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
@@ -546,7 +546,7 @@ static void OpponentBufferExecCompleted(void)
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
+        gBattleControllerExecFlags &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -559,7 +559,7 @@ static void OpponentHandleGetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += GetOpponentMonData(gBattlePartyID[gActiveBattler], monData);
+        size += GetOpponentMonData(gBattlerPartyIndexes[gActiveBattler], monData);
     }
     else
     {
@@ -571,7 +571,7 @@ static void OpponentHandleGetMonData(void)
             monToCheck >>= 1;
         }
     }
-    EmitDataTransfer(1, size, monData);
+    BtlController_EmitDataTransfer(1, size, monData);
     OpponentBufferExecCompleted();
 }
 
@@ -884,14 +884,14 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst)
 static void OpponentHandleGetRawMonData(void)
 {
     struct BattlePokemon battleMon;
-    u8 *src = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *src = (u8 *)&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 *dst = (u8 *)&battleMon + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
     for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
         dst[i] = src[i];
 
-    EmitDataTransfer(1, gBattleBufferA[gActiveBattler][2], dst);
+    BtlController_EmitDataTransfer(1, gBattleBufferA[gActiveBattler][2], dst);
     OpponentBufferExecCompleted();
 }
 
@@ -902,7 +902,7 @@ static void OpponentHandleSetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetOpponentMonData(gBattlePartyID[gActiveBattler]);
+        SetOpponentMonData(gBattlerPartyIndexes[gActiveBattler]);
     }
     else
     {
@@ -1135,7 +1135,7 @@ static void SetOpponentMonData(u8 monId)
 
 static void OpponentHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *dst = (u8 *)&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
     for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
@@ -1146,33 +1146,33 @@ static void OpponentHandleSetRawMonData(void)
 
 static void OpponentHandleLoadMonSprite(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
     sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBattler, 2),
-                                               GetBankSpriteDefault_Y(gActiveBattler),
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBattlerSpriteCoord(gActiveBattler, 2),
+                                               GetBattlerSpriteDefault_Y(gActiveBattler),
                                                sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = species;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = species;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
 
-    SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+    SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
 
-    gBattlerFuncs[gActiveBattler] = sub_805F994;
+    gBattlerControllerFuncs[gActiveBattler] = sub_805F994;
 }
 
 static void OpponentHandleSwitchInAnim(void)
 {
     *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
-    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    gBattlerPartyIndexes[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
     sub_80613DC(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlerFuncs[gActiveBattler] = sub_805FDF0;
+    gBattlerControllerFuncs[gActiveBattler] = sub_805FDF0;
 }
 
 static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
@@ -1180,29 +1180,29 @@ static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
     u16 species;
 
     ClearTemporarySpeciesSpriteData(bank, dontClearSubstituteBit);
-    gBattlePartyID[bank] = gBattleBufferA[bank][1];
-    species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+    gBattlerPartyIndexes[bank] = gBattleBufferA[bank][1];
+    species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
+    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[bank]], bank);
     sub_806A068(species, GetBattlerPosition(bank));
 
-    gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
-                                        GetBankCoord(bank, 2),
-                                        GetBankSpriteDefault_Y(bank),
+    gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
+                                        GetBattlerSpriteCoord(bank, 2),
+                                        GetBattlerSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
-    gSprites[gBankSpriteIds[bank]].data[0] = bank;
-    gSprites[gBankSpriteIds[bank]].data[2] = species;
+    gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[2] = species;
 
-    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBattlerSpriteIds[bank];
     gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+    gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
 
-    StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
 
-    gSprites[gBankSpriteIds[bank]].invisible = TRUE;
-    gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+    gSprites[gBattlerSpriteIds[bank]].invisible = TRUE;
+    gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
 
     gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
 }
@@ -1212,14 +1212,14 @@ static void OpponentHandleReturnMonToBall(void)
     if (gBattleBufferA[gActiveBattler][1] == 0)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBattler);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        HideBattlerShadowSprite(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         OpponentBufferExecCompleted();
     }
 }
@@ -1239,7 +1239,7 @@ static void DoSwitchOutAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_OPPONENT_MON);
-            gBattlerFuncs[gActiveBattler] = sub_805FB08;
+            gBattlerControllerFuncs[gActiveBattler] = sub_805FB08;
         }
         break;
     }
@@ -1316,18 +1316,18 @@ static void OpponentHandleDrawTrainerPic(void)
 
     DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
     sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
                                                xPos,
                                                (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40,
                                                sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void OpponentHandleTrainerSlide(void)
@@ -1388,27 +1388,27 @@ static void OpponentHandleTrainerSlide(void)
 
     DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
     sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E);
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 176, (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40, 0x1E);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 96;
-    gSprites[gBankSpriteIds[gActiveBattler]].pos1.x += 32;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 96;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.x += 32;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
 }
 
 static void OpponentHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
-    gBattlerFuncs[gActiveBattler] = sub_805F240;
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerControllerFuncs[gActiveBattler] = sub_805F240;
 }
 
 static void OpponentHandleFaintAnimation(void)
@@ -1425,8 +1425,8 @@ static void OpponentHandleFaintAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT);
-            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039934;
-            gBattlerFuncs[gActiveBattler] = sub_805FAC4;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039934;
+            gBattlerControllerFuncs[gActiveBattler] = sub_805FAC4;
         }
     }
 }
@@ -1471,7 +1471,7 @@ static void OpponentHandleMoveAnimation(void)
         else
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            gBattlerFuncs[gActiveBattler] = OpponentDoMoveAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = OpponentDoMoveAnimation;
         }
     }
 }
@@ -1534,7 +1534,7 @@ static void OpponentHandlePrintString(void)
     stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
     sub_81A57E4(gActiveBattler, *stringId);
 }
 
@@ -1558,7 +1558,7 @@ static void OpponentHandleChooseMove(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
     {
-        EmitTwoReturnValues(1, 10, ChooseMoveAndTargetInBattlePalace());
+        BtlController_EmitTwoReturnValues(1, 10, ChooseMoveAndTargetInBattlePalace());
         OpponentBufferExecCompleted();
     }
     else
@@ -1575,24 +1575,24 @@ static void OpponentHandleChooseMove(void)
             switch (chosenMoveId)
             {
             case 5:
-                EmitTwoReturnValues(1, ACTION_WATCHES_CAREFULLY, 0);
+                BtlController_EmitTwoReturnValues(1, ACTION_WATCHES_CAREFULLY, 0);
                 break;
             case 4:
-                EmitTwoReturnValues(1, ACTION_RUN, 0);
+                BtlController_EmitTwoReturnValues(1, ACTION_RUN, 0);
                 break;
             case 6:
-                EmitTwoReturnValues(1, 15, gBattleDefender);
+                BtlController_EmitTwoReturnValues(1, 15, gBattleMoveTarget);
                 break;
             default:
                 if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_USER | MOVE_TARGET_x10))
-                    gBattleDefender = gActiveBattler;
+                    gBattleMoveTarget = gActiveBattler;
                 if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH)
                 {
-                    gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
-                    if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
-                        gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
+                    gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+                    if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
+                        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
                 }
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (gBattleDefender << 8));
+                BtlController_EmitTwoReturnValues(1, 10, (chosenMoveId) | (gBattleMoveTarget << 8));
                 break;
             }
             OpponentBufferExecCompleted();
@@ -1607,11 +1607,11 @@ static void OpponentHandleChooseMove(void)
             } while (move == MOVE_NONE);
 
             if (gBattleMoves[move].target & (MOVE_TARGET_USER | MOVE_TARGET_x10))
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (gActiveBattler << 8));
+                BtlController_EmitTwoReturnValues(1, 10, (chosenMoveId) | (gActiveBattler << 8));
             else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBattlerAtPosition(Random() & 2) << 8));
+                BtlController_EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBattlerAtPosition(Random() & 2) << 8));
             else
-                EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBattlerAtPosition(B_POSITION_PLAYER_LEFT) << 8));
+                BtlController_EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBattlerAtPosition(B_POSITION_PLAYER_LEFT) << 8));
 
             OpponentBufferExecCompleted();
         }
@@ -1620,7 +1620,7 @@ static void OpponentHandleChooseMove(void)
 
 static void OpponentHandleChooseItem(void)
 {
-    EmitOneReturnValue(1, *(gBattleStruct->chosenItem + (gActiveBattler / 2) * 2));
+    BtlController_EmitOneReturnValue(1, *(gBattleStruct->chosenItem + (gActiveBattler / 2) * 2));
     OpponentBufferExecCompleted();
 }
 
@@ -1661,8 +1661,8 @@ static void OpponentHandleChoosePokemon(void)
             for (chosenMonId = firstId; chosenMonId < lastId; chosenMonId++)
             {
                 if (GetMonData(&gEnemyParty[chosenMonId], MON_DATA_HP) != 0
-                    && chosenMonId != gBattlePartyID[bank1]
-                    && chosenMonId != gBattlePartyID[bank2])
+                    && chosenMonId != gBattlerPartyIndexes[bank1]
+                    && chosenMonId != gBattlerPartyIndexes[bank2])
                 {
                     break;
                 }
@@ -1677,7 +1677,7 @@ static void OpponentHandleChoosePokemon(void)
 
 
     *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = chosenMonId;
-    EmitChosenMonReturnValue(1, chosenMonId, NULL);
+    BtlController_EmitChosenMonReturnValue(1, chosenMonId, NULL);
     OpponentBufferExecCompleted();
 }
 
@@ -1695,19 +1695,19 @@ static void OpponentHandleHealthBarUpdate(void)
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, 0, hpVal);
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void OpponentHandleExpUpdate(void)
@@ -1721,10 +1721,10 @@ static void OpponentHandleStatusIconUpdate(void)
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_STATUS_ICON);
         bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1734,7 +1734,7 @@ static void OpponentHandleStatusAnimation(void)
     {
         InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
                         gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1809,16 +1809,16 @@ static void OpponentHandleCmd40(void)
 
 static void OpponentHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         OpponentBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
+        gBattlerControllerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1857,7 +1857,7 @@ static void OpponentHandlePlayFanfareOrBGM(void)
 
 static void OpponentHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, 25, 5);
     OpponentBufferExecCompleted();
@@ -1875,14 +1875,14 @@ static void OpponentHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_806280C);
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_806280C);
 
     taskId = CreateTask(sub_8062828, 5);
     gTasks[taskId].data[0] = gActiveBattler;
@@ -1891,7 +1891,7 @@ static void OpponentHandleIntroTrainerBallThrow(void)
         gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattlerFuncs[gActiveBattler] = nullsub_26;
+    gBattlerControllerFuncs[gActiveBattler] = nullsub_26;
 }
 
 static void sub_806280C(struct Sprite *sprite)
@@ -1908,24 +1908,24 @@ static void sub_8062828(u8 taskId)
     gActiveBattler = gTasks[taskId].data[0];
     if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_80613DC(gActiveBattler, FALSE);
     }
     else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS))
     {
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_80613DC(gActiveBattler, FALSE);
     }
     else
     {
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_80613DC(gActiveBattler, FALSE);
         gActiveBattler ^= BIT_FLANK;
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_80613DC(gActiveBattler, FALSE);
         gActiveBattler ^= BIT_FLANK;
     }
-    gBattlerFuncs[gActiveBattler] = sub_805F560;
+    gBattlerControllerFuncs[gActiveBattler] = sub_805F560;
     gActiveBattler = savedActiveBank;
     DestroyTask(taskId);
 }
@@ -1959,7 +1959,7 @@ static void OpponentHandleDrawPartyStatusSummary(void)
         if (gBattleBufferA[gActiveBattler][2] != 0)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattlerFuncs[gActiveBattler] = sub_8062A2C;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8062A2C;
     }
 }
 
@@ -1986,9 +1986,9 @@ static void OpponentHandleCmd50(void)
 
 static void OpponentHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBattler))
+    if (IsBattlerSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        gSprites[gBattlerSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
         CopyBattleSpriteInvisibility(gActiveBattler);
     }
     OpponentBufferExecCompleted();
@@ -2004,7 +2004,7 @@ static void OpponentHandleBattleAnimation(void)
         if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             OpponentBufferExecCompleted();
         else
-            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
     }
 }
 
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 8d52ee377..7a7f87e55 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -27,18 +27,18 @@
 #include "pokeball.h"
 #include "data2.h"
 
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gActiveBattler;
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gAbsentBattlerFlags;
 extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
 extern u8 gPlayerDpadHoldFrames;
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u8 gMultiUsePlayerCursor;
@@ -52,7 +52,7 @@ extern u8 gUnknown_0203CEE8;
 extern u8 gUnknown_0203CEE9;
 extern u8 gUnknown_0203CF00[];
 extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u8 gNumberOfMovesToChoose;
 extern u16 gBattle_BG0_X;
@@ -243,14 +243,14 @@ void nullsub_21(void)
 
 void SetControllerToPlayer(void)
 {
-    gBattlerFuncs[gActiveBattler] = PlayerBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = PlayerBufferRunCommand;
     gDoingBattleAnim = FALSE;
     gPlayerDpadHoldFrames = 0;
 }
 
 static void PlayerBufferExecCompleted(void)
 {
-    gBattlerFuncs[gActiveBattler] = PlayerBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = PlayerBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
@@ -260,13 +260,13 @@ static void PlayerBufferExecCompleted(void)
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
+        gBattleControllerExecFlags &= ~gBitTable[gActiveBattler];
     }
 }
 
 static void PlayerBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBattler])
+    if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
     {
         if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sPlayerBufferCommands))
             sPlayerBufferCommands[gBattleBufferA[gActiveBattler][0]]();
@@ -277,7 +277,7 @@ static void PlayerBufferRunCommand(void)
 
 static void CompleteOnBankSpritePosX_0(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
         PlayerBufferExecCompleted();
 }
 
@@ -300,16 +300,16 @@ static void HandleInputChooseAction(void)
         switch (gActionSelectionCursor[gActiveBattler])
         {
         case 0:
-            EmitTwoReturnValues(1, ACTION_USE_MOVE, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_USE_MOVE, 0);
             break;
         case 1:
-            EmitTwoReturnValues(1, ACTION_USE_ITEM, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_USE_ITEM, 0);
             break;
         case 2:
-            EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
             break;
         case 3:
-            EmitTwoReturnValues(1, ACTION_RUN, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_RUN, 0);
             break;
         }
         PlayerBufferExecCompleted();
@@ -370,7 +370,7 @@ static void HandleInputChooseAction(void)
                     return;
             }
             PlaySE(SE_SELECT);
-            EmitTwoReturnValues(1, ACTION_CANCEL_PARTNER, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_CANCEL_PARTNER, 0);
             PlayerBufferExecCompleted();
         }
     }
@@ -384,7 +384,7 @@ static void sub_80577F0(void) // unused
 {
     dp11b_obj_free(gActiveBattler, 1);
     dp11b_obj_free(gActiveBattler, 0);
-    gBattlerFuncs[gActiveBattler] = HandleInputChooseTarget;
+    gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseTarget;
 }
 
 static void HandleInputChooseTarget(void)
@@ -415,16 +415,16 @@ static void HandleInputChooseTarget(void)
     if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
-        gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
-        EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8));
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
+        BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8));
         dp11b_obj_free(gMultiUsePlayerCursor, 1);
         PlayerBufferExecCompleted();
     }
     else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59)
     {
         PlaySE(SE_SELECT);
-        gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
-        gBattlerFuncs[gActiveBattler] = HandleInputChooseMove;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
+        gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseMove;
         dp11b_obj_instanciate(gActiveBattler, 1, 7, 1);
         dp11b_obj_instanciate(gActiveBattler, 0, 7, 1);
         dp11b_obj_free(gMultiUsePlayerCursor, 1);
@@ -432,7 +432,7 @@ static void HandleInputChooseTarget(void)
     else if (gMain.newKeys & (DPAD_LEFT | DPAD_UP))
     {
         PlaySE(SE_SELECT);
-        gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
 
         do
         {
@@ -457,7 +457,7 @@ static void HandleInputChooseTarget(void)
             case B_POSITION_PLAYER_RIGHT:
                 if (gActiveBattler != gMultiUsePlayerCursor)
                     i++;
-                else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler])].target & MOVE_TARGET_USER)
+                else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler])].target & MOVE_TARGET_USER)
                     i++;
                 break;
             case B_POSITION_OPPONENT_LEFT:
@@ -469,12 +469,12 @@ static void HandleInputChooseTarget(void)
             if (gAbsentBattlerFlags & gBitTable[gMultiUsePlayerCursor])
                 i = 0;
         } while (i == 0);
-        gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
     }
     else if (gMain.newKeys & (DPAD_RIGHT | DPAD_DOWN))
     {
         PlaySE(SE_SELECT);
-        gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039B2C;
 
         do
         {
@@ -499,7 +499,7 @@ static void HandleInputChooseTarget(void)
             case B_POSITION_PLAYER_RIGHT:
                 if (gActiveBattler != gMultiUsePlayerCursor)
                     i++;
-                else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler])].target & MOVE_TARGET_USER)
+                else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler])].target & MOVE_TARGET_USER)
                     i++;
                 break;
             case B_POSITION_OPPONENT_LEFT:
@@ -511,7 +511,7 @@ static void HandleInputChooseTarget(void)
             if (gAbsentBattlerFlags & gBitTable[gMultiUsePlayerCursor])
                 i = 0;
         } while (i == 0);
-        gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
+        gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
     }
 }
 
@@ -570,12 +570,12 @@ static void HandleInputChooseMove(void)
 
         if (!canSelectTarget)
         {
-            EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8));
+            BtlController_EmitTwoReturnValues(1, 10, gMoveSelectionCursor[gActiveBattler] | (gMultiUsePlayerCursor << 8));
             PlayerBufferExecCompleted();
         }
         else
         {
-            gBattlerFuncs[gActiveBattler] = HandleInputChooseTarget;
+            gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseTarget;
 
             if (moveTarget & (MOVE_TARGET_x10 | MOVE_TARGET_USER))
                 gMultiUsePlayerCursor = gActiveBattler;
@@ -584,13 +584,13 @@ static void HandleInputChooseMove(void)
             else
                 gMultiUsePlayerCursor = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
 
-            gSprites[gBankSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
+            gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = sub_8039AD8;
         }
     }
     else if (gMain.newKeys & B_BUTTON || gPlayerDpadHoldFrames > 59)
     {
         PlaySE(SE_SELECT);
-        EmitTwoReturnValues(1, 10, 0xFFFF);
+        BtlController_EmitTwoReturnValues(1, 10, 0xFFFF);
         PlayerBufferExecCompleted();
     }
     else if (gMain.newKeys & DPAD_LEFT)
@@ -656,7 +656,7 @@ static void HandleInputChooseMove(void)
 
             MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27);
             BattleHandleAddTextPrinter(gText_BattleSwitchWhich, 0xB);
-            gBattlerFuncs[gActiveBattler] = HandleMoveSwitchting;
+            gBattlerControllerFuncs[gActiveBattler] = HandleMoveSwitchting;
         }
     }
 }
@@ -770,11 +770,11 @@ static void HandleMoveSwitchting(void)
             {
                 for (i = 0; i < 4; i++)
                 {
-                    moveStruct.moves[i] = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + i);
-                    moveStruct.currentPp[i] = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP1 + i);
+                    moveStruct.moves[i] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MOVE1 + i);
+                    moveStruct.currentPp[i] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_PP1 + i);
                 }
 
-                totalPPBonuses = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP_BONUSES);
+                totalPPBonuses = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_PP_BONUSES);
                 for (i = 0; i < 4; i++)
                     perMovePPBonuses[i] = (totalPPBonuses & (3 << (i * 2))) >> (i * 2);
 
@@ -796,15 +796,15 @@ static void HandleMoveSwitchting(void)
 
                 for (i = 0; i < 4; i++)
                 {
-                    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MOVE1 + i, &moveStruct.moves[i]);
-                    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP1 + i, &moveStruct.currentPp[i]);
+                    SetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MOVE1 + i, &moveStruct.moves[i]);
+                    SetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_PP1 + i, &moveStruct.currentPp[i]);
                 }
 
-                SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_PP_BONUSES, &totalPPBonuses);
+                SetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_PP_BONUSES, &totalPPBonuses);
             }
         }
 
-        gBattlerFuncs[gActiveBattler] = HandleInputChooseMove;
+        gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseMove;
         gMoveSelectionCursor[gActiveBattler] = gMultiUsePlayerCursor;
         MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
         MoveSelectionDisplayPpString();
@@ -816,7 +816,7 @@ static void HandleMoveSwitchting(void)
         PlaySE(SE_SELECT);
         MoveSelectionDestroyCursorAt(gMultiUsePlayerCursor);
         MoveSelectionCreateCursorAt(gMoveSelectionCursor[gActiveBattler], 0);
-        gBattlerFuncs[gActiveBattler] = HandleInputChooseMove;
+        gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseMove;
         MoveSelectionDisplayPpString();
         MoveSelectionDisplayPpNumber();
         MoveSelectionDisplayMoveType();
@@ -938,7 +938,7 @@ void sub_80587B0(void)
                 else
                     sub_800ADF8();
 
-                gBattlerFuncs[gActiveBattler] = sub_80586F8;
+                gBattlerControllerFuncs[gActiveBattler] = sub_80586F8;
             }
         }
         else
@@ -953,23 +953,23 @@ void sub_80587B0(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         PlayerBufferExecCompleted();
 }
 
 static void CompleteOnBankSpriteCallbackDummy2(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         PlayerBufferExecCompleted();
 }
 
 static void sub_80588B4(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         nullsub_25(gSaveBlock2Ptr->playerGender);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
         PlayerBufferExecCompleted();
     }
 }
@@ -989,13 +989,13 @@ static void sub_805896C(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
             var = TRUE;
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
-         && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+         && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
             var = TRUE;
     }
 
@@ -1009,13 +1009,13 @@ static void sub_805896C(void)
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 
         if (IsDoubleBattle())
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], gActiveBattler ^ BIT_FLANK);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], gActiveBattler ^ BIT_FLANK);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
-        gBattlerFuncs[gActiveBattler] = sub_8058924;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8058924;
     }
 }
 
@@ -1025,9 +1025,9 @@ static void sub_8058B40(void)
     bool32 r8 = FALSE;
 
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
-        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]);
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
-        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
+        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
 
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
     {
@@ -1035,13 +1035,13 @@ static void sub_8058B40(void)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+                UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
                 sub_8076918(gActiveBattler ^ BIT_FLANK);
-                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
+                SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]);
             }
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
             sub_8076918(gActiveBattler);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+            SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 1;
     }
@@ -1065,7 +1065,7 @@ static void sub_8058B40(void)
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
         if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+            && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
@@ -1073,9 +1073,9 @@ static void sub_8058B40(void)
     else
     {
         if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
             && gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+            && gSprites[gBattlerSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
@@ -1091,15 +1091,15 @@ static void sub_8058B40(void)
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 0;
 
-        gBattlerFuncs[gActiveBattler] = sub_805896C;
+        gBattlerControllerFuncs[gActiveBattler] = sub_805896C;
     }
 }
 
 static void sub_8058EDC(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
+    if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
      && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
-     && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+     && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         CopyBattleSpriteInvisibility(gActiveBattler);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
@@ -1110,7 +1110,7 @@ static void sub_8058EDC(void)
         if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattlerFuncs[gActiveBattler] = sub_8058FC0;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8058FC0;
     }
 }
 
@@ -1120,7 +1120,7 @@ static void sub_8058FC0(void)
         && !IsCryPlayingOrClearCrySongs())
     {
         m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
         PlayerBufferExecCompleted();
     }
 }
@@ -1130,17 +1130,17 @@ static void sub_805902C(void)
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
         sub_8076918(gActiveBattler);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
-        gBattlerFuncs[gActiveBattler] = sub_8058EDC;
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
+        gBattlerControllerFuncs[gActiveBattler] = sub_8058EDC;
     }
 }
 
@@ -1155,17 +1155,17 @@ void c3_0802FDF4(u8 taskId)
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+    SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
         PlayerBufferExecCompleted();
     }
 }
@@ -1187,7 +1187,7 @@ static void Task_GiveExpToMon(u8 taskId)
     u8 bank = gTasks[taskId].tExpTask_bank;
     s16 gainedExp = gTasks[taskId].tExpTask_gainedExp;
 
-    if (IsDoubleBattle() == TRUE || monId != gBattlePartyID[bank]) // give exp without the expbar
+    if (IsDoubleBattle() == TRUE || monId != gBattlerPartyIndexes[bank]) // give exp without the expbar
     {
         struct Pokemon *mon = &gPlayerParty[monId];
         u16 species = GetMonData(mon, MON_DATA_SPECIES);
@@ -1204,11 +1204,11 @@ static void Task_GiveExpToMon(u8 taskId)
             gainedExp -= nextLvlExp - currExp;
             savedActiveBank = gActiveBattler;
             gActiveBattler = bank;
-            EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
+            BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
             gActiveBattler = savedActiveBank;
 
             if (IsDoubleBattle() == TRUE
-             && ((u16)(monId) == gBattlePartyID[bank] || (u16)(monId) == gBattlePartyID[bank ^ BIT_FLANK]))
+             && ((u16)(monId) == gBattlerPartyIndexes[bank] || (u16)(monId) == gBattlerPartyIndexes[bank ^ BIT_FLANK]))
                 gTasks[taskId].func = sub_8059544;
             else
                 gTasks[taskId].func = DestroyExpTaskAndCompleteOnInactiveTextPrinter;
@@ -1217,7 +1217,7 @@ static void Task_GiveExpToMon(u8 taskId)
         {
             currExp += gainedExp;
             SetMonData(mon, MON_DATA_EXP, &currExp);
-            gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
+            gBattlerControllerFuncs[bank] = CompleteOnInactiveTextPrinter;
             DestroyTask(taskId);
         }
     }
@@ -1241,7 +1241,7 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId)
 
     exp -= currLvlExp;
     expToNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLvlExp;
-    SetBattleBarStruct(bank, gHealthBoxesIds[bank], expToNextLvl, exp, -gainedExp);
+    SetBattleBarStruct(bank, gHealthboxSpriteIds[bank], expToNextLvl, exp, -gainedExp);
     PlaySE(SE_EXP);
     gTasks[taskId].func = sub_8059400;
 }
@@ -1259,8 +1259,8 @@ static void sub_8059400(u8 taskId)
         u8 bank = gTasks[taskId].tExpTask_bank;
         s16 r4;
 
-        r4 = sub_8074AA0(bank, gHealthBoxesIds[bank], EXP_BAR, 0);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[bank]);
+        r4 = sub_8074AA0(bank, gHealthboxSpriteIds[bank], EXP_BAR, 0);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[bank]);
         if (r4 == -1)
         {
             u8 level;
@@ -1283,7 +1283,7 @@ static void sub_8059400(u8 taskId)
                 gainedExp -= expOnNextLvl - currExp;
                 savedActiveBank = gActiveBattler;
                 gActiveBattler = bank;
-                EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
+                BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
                 gActiveBattler = savedActiveBank;
                 gTasks[taskId].func = sub_8059544;
             }
@@ -1291,7 +1291,7 @@ static void sub_8059400(u8 taskId)
             {
                 currExp += gainedExp;
                 SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &currExp);
-                gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
+                gBattlerControllerFuncs[bank] = CompleteOnInactiveTextPrinter;
                 DestroyTask(taskId);
             }
         }
@@ -1303,7 +1303,7 @@ static void sub_8059544(u8 taskId)
     u8 bank = gTasks[taskId].tExpTask_bank;
     u8 monIndex = gTasks[taskId].tExpTask_monId;
 
-    if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_FLANK])
+    if (IsDoubleBattle() == TRUE && monIndex == gBattlerPartyIndexes[bank ^ BIT_FLANK])
         bank ^= BIT_FLANK;
 
     InitAndLaunchSpecialAnimation(bank, bank, bank, B_ANIM_LVL_UP);
@@ -1320,10 +1320,10 @@ static void sub_80595A4(u8 taskId)
 
         GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL);  // Unused return value
 
-        if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_FLANK])
-            UpdateHealthboxAttribute(gHealthBoxesIds[bank ^ BIT_FLANK], &gPlayerParty[monIndex], HEALTHBOX_ALL);
+        if (IsDoubleBattle() == TRUE && monIndex == gBattlerPartyIndexes[bank ^ BIT_FLANK])
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[bank ^ BIT_FLANK], &gPlayerParty[monIndex], HEALTHBOX_ALL);
         else
-            UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gPlayerParty[monIndex], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[bank], &gPlayerParty[monIndex], HEALTHBOX_ALL);
 
         gTasks[taskId].func = DestroyExpTaskAndCompleteOnInactiveTextPrinter;
     }
@@ -1337,20 +1337,20 @@ static void DestroyExpTaskAndCompleteOnInactiveTextPrinter(u8 taskId)
     monIndex = gTasks[taskId].tExpTask_monId;
     GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL);  // Unused return value
     bank = gTasks[taskId].tExpTask_bank;
-    gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
+    gBattlerControllerFuncs[bank] = CompleteOnInactiveTextPrinter;
     DestroyTask(taskId);
 }
 
 static void sub_80596A8(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].pos1.y + gSprites[gBankSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y + gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
     {
-        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+        u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
         nullsub_24(species);
-        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBattler]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeOamMatrix(gSprites[gBattlerSpriteIds[gActiveBattler]].oam.matrixNum);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         PlayerBufferExecCompleted();
     }
 }
@@ -1359,9 +1359,9 @@ static void sub_8059744(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         PlayerBufferExecCompleted();
     }
 }
@@ -1378,7 +1378,7 @@ static void sub_80597CC(void)
     {
         u8 r4;
 
-        gBattlerFuncs[gActiveBattler] = sub_8059828;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8059828;
         r4 = gTasks[gUnknown_03005D7C[gActiveBattler]].data[0];
         DestroyTask(gUnknown_03005D7C[gActiveBattler]);
         FreeAllWindowBuffers();
@@ -1391,9 +1391,9 @@ static void sub_8059828(void)
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
         if (gUnknown_0203CEE8 == 1)
-            EmitChosenMonReturnValue(1, gUnknown_0203CEE9, gUnknown_0203CF00);
+            BtlController_EmitChosenMonReturnValue(1, gUnknown_0203CEE9, gUnknown_0203CF00);
         else
-            EmitChosenMonReturnValue(1, 6, NULL);
+            BtlController_EmitChosenMonReturnValue(1, 6, NULL);
 
         if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1)
             PrintLinkStandbyMsg();
@@ -1406,7 +1406,7 @@ static void OpenBagAndChooseItem(void)
 {
     if (!gPaletteFade.active)
     {
-        gBattlerFuncs[gActiveBattler] = CompleteWhenChoseItem;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteWhenChoseItem;
         nullsub_35();
         FreeAllWindowBuffers();
         sub_81AABB0();
@@ -1417,7 +1417,7 @@ static void CompleteWhenChoseItem(void)
 {
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
-        EmitOneReturnValue(1, gSpecialVar_ItemId);
+        BtlController_EmitOneReturnValue(1, gSpecialVar_ItemId);
         PlayerBufferExecCompleted();
     }
 }
@@ -1430,7 +1430,7 @@ static void CompleteOnSpecialAnimDone(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBattler];
+    u8 spriteId = gBattlerSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -1469,9 +1469,9 @@ static void PlayerHandleUnknownYesNoInput(void)
         PlaySE(SE_SELECT);
 
         if (gMultiUsePlayerCursor != 0)
-            EmitTwoReturnValues(1, 0xE, 0);
+            BtlController_EmitTwoReturnValues(1, 0xE, 0);
         else
-            EmitTwoReturnValues(1, 0xD, 0);
+            BtlController_EmitTwoReturnValues(1, 0xD, 0);
 
         PlayerBufferExecCompleted();
     }
@@ -1621,7 +1621,7 @@ static void PlayerHandleGetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyPlayerMonData(gBattlePartyID[gActiveBattler], monData);
+        size += CopyPlayerMonData(gBattlerPartyIndexes[gActiveBattler], monData);
     }
     else
     {
@@ -1633,7 +1633,7 @@ static void PlayerHandleGetMonData(void)
             monToCheck >>= 1;
         }
     }
-    EmitDataTransfer(1, size, monData);
+    BtlController_EmitDataTransfer(1, size, monData);
     PlayerBufferExecCompleted();
 }
 
@@ -1946,14 +1946,14 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
 void PlayerHandleGetRawMonData(void)
 {
     struct BattlePokemon battleMon;
-    u8 *src = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *src = (u8 *)&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 *dst = (u8 *)&battleMon + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
     for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
         dst[i] = src[i];
 
-    EmitDataTransfer(1, gBattleBufferA[gActiveBattler][2], dst);
+    BtlController_EmitDataTransfer(1, gBattleBufferA[gActiveBattler][2], dst);
     PlayerBufferExecCompleted();
 }
 
@@ -1964,7 +1964,7 @@ static void PlayerHandleSetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetPlayerMonData(gBattlePartyID[gActiveBattler]);
+        SetPlayerMonData(gBattlerPartyIndexes[gActiveBattler]);
     }
     else
     {
@@ -2194,12 +2194,12 @@ static void SetPlayerMonData(u8 monId)
         break;
     }
 
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 }
 
 static void PlayerHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *dst = (u8 *)&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
     for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
@@ -2210,20 +2210,20 @@ static void PlayerHandleSetRawMonData(void)
 
 static void PlayerHandleLoadMonSprite(void)
 {
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpritePosX_0;
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpritePosX_0;
 }
 
 static void PlayerHandleSwitchInAnim(void)
 {
     ClearTemporarySpeciesSpriteData(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    gBattlerPartyIndexes[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
     gActionSelectionCursor[gActiveBattler] = 0;
     gMoveSelectionCursor[gActiveBattler] = 0;
     sub_805B258(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlerFuncs[gActiveBattler] = sub_805902C;
+    gBattlerControllerFuncs[gActiveBattler] = sub_805902C;
 }
 
 static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
@@ -2231,28 +2231,28 @@ static void sub_805B258(u8 bank, bool8 dontClearSubstituteBit)
     u16 species;
 
     ClearTemporarySpeciesSpriteData(bank, dontClearSubstituteBit);
-    gBattlePartyID[bank] = gBattleBufferA[bank][1];
-    species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+    gBattlerPartyIndexes[bank] = gBattleBufferA[bank][1];
+    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     sub_806A068(species, GetBattlerPosition(bank));
 
-    gBankSpriteIds[bank] = CreateSprite(
+    gBattlerSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      GetBankCoord(bank, 2),
-      GetBankSpriteDefault_Y(bank),
+      GetBattlerSpriteCoord(bank, 2),
+      GetBattlerSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBattlerSpriteIds[bank];
     gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data[0] = bank;
-    gSprites[gBankSpriteIds[bank]].data[2] = species;
-    gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[2] = species;
+    gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
 
-    StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
 
-    gSprites[gBankSpriteIds[bank]].invisible = TRUE;
-    gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+    gSprites[gBattlerSpriteIds[bank]].invisible = TRUE;
+    gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
 
     gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
@@ -2262,13 +2262,13 @@ static void PlayerHandleReturnMonToBall(void)
     if (gBattleBufferA[gActiveBattler][1] == 0)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         PlayerBufferExecCompleted();
     }
 }
@@ -2288,7 +2288,7 @@ static void DoSwitchOutAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_PLAYER_MON);
-            gBattlerFuncs[gActiveBattler] = sub_8059744;
+            gBattlerControllerFuncs[gActiveBattler] = sub_8059744;
         }
         break;
     }
@@ -2354,30 +2354,30 @@ static void PlayerHandleDrawTrainerPic(void)
         trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender);
         DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
         sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler));
-        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+        gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
 
-        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBattler]].pos2.y = 48;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
-        gSprites[gBankSpriteIds[gActiveBattler]].oam.affineMode = 0;
-        gSprites[gBankSpriteIds[gActiveBattler]].hFlip = 1;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y = 48;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].hFlip = 1;
     }
     // use the back pic in any other scenario
     else
     {
         DecompressTrainerBackPic(trainerPicId, gActiveBattler);
         sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
-        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+        gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
 
-        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void PlayerHandleTrainerSlide(void)
@@ -2408,26 +2408,26 @@ static void PlayerHandleTrainerSlide(void)
 
     DecompressTrainerBackPic(trainerPicId, gActiveBattler);
     sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 80, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, 30);
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, 80, (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80, 30);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -96;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
 }
 
 static void PlayerHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
-    gBattlerFuncs[gActiveBattler] = sub_80588B4;
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1);
+    gBattlerControllerFuncs[gActiveBattler] = sub_80588B4;
 }
 
 static void PlayerHandleFaintAnimation(void)
@@ -2443,12 +2443,12 @@ static void PlayerHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
-            gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
-            gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 5;
-            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039C00;
-            gBattlerFuncs[gActiveBattler] = sub_80596A8;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
+            gBattlerControllerFuncs[gActiveBattler] = sub_80596A8;
         }
     }
 }
@@ -2464,7 +2464,7 @@ static void PlayerHandleSuccessBallThrowAnim(void)
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
     InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
-    gBattlerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
 }
 
 static void PlayerHandleBallThrowAnim(void)
@@ -2474,7 +2474,7 @@ static void PlayerHandleBallThrowAnim(void)
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
     InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_BALL_THROW);
-    gBattlerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
 }
 
 static void PlayerHandlePause(void)
@@ -2508,7 +2508,7 @@ static void PlayerHandleMoveAnimation(void)
         else
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            gBattlerFuncs[gActiveBattler] = PlayerDoMoveAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = PlayerDoMoveAnimation;
             sub_817E0FC(move, gWeatherMoveAnim, gAnimDisableStructPtr);
         }
     }
@@ -2572,7 +2572,7 @@ static void PlayerHandlePrintString(void)
     stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2;
     sub_817C95C(*stringId);
     sub_81A57E4(gActiveBattler, *stringId);
 }
@@ -2591,7 +2591,7 @@ static void HandleChooseActionAfterDma3(void)
     {
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 160;
-        gBattlerFuncs[gActiveBattler] = HandleInputChooseAction;
+        gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseAction;
     }
 }
 
@@ -2599,7 +2599,7 @@ static void PlayerHandleChooseAction(void)
 {
     s32 i;
 
-    gBattlerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
+    gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
     sub_817F2A8();
     BattleHandleAddTextPrinter(gText_BattleMenu, 2);
 
@@ -2619,7 +2619,7 @@ static void PlayerHandleUnknownYesNoBox(void)
         BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 12);
         gMultiUsePlayerCursor = 1;
         BattleCreateYesNoCursorAt(1);
-        gBattlerFuncs[gActiveBattler] = PlayerHandleUnknownYesNoInput;
+        gBattlerControllerFuncs[gActiveBattler] = PlayerHandleUnknownYesNoInput;
     }
     else
     {
@@ -2633,7 +2633,7 @@ static void HandleChooseMoveAfterDma3(void)
     {
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 320;
-        gBattlerFuncs[gActiveBattler] = HandleInputChooseMove;
+        gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseMove;
     }
 }
 
@@ -2642,7 +2642,7 @@ static void PlayerChooseMoveInBattlePalace(void)
     if (--*(gBattleStruct->field_298 + gActiveBattler) == 0)
     {
         gBattlePalaceMoveSelectionRngValue = gRngValue;
-        EmitTwoReturnValues(1, 10, ChooseMoveAndTargetInBattlePalace());
+        BtlController_EmitTwoReturnValues(1, 10, ChooseMoveAndTargetInBattlePalace());
         PlayerBufferExecCompleted();
     }
 }
@@ -2652,12 +2652,12 @@ static void PlayerHandleChooseMove(void)
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
     {
         *(gBattleStruct->field_298 + gActiveBattler) = 8;
-        gBattlerFuncs[gActiveBattler] = PlayerChooseMoveInBattlePalace;
+        gBattlerControllerFuncs[gActiveBattler] = PlayerChooseMoveInBattlePalace;
     }
     else
     {
         InitMoveSelectionsVarsAndStrings();
-        gBattlerFuncs[gActiveBattler] = HandleChooseMoveAfterDma3;
+        gBattlerControllerFuncs[gActiveBattler] = HandleChooseMoveAfterDma3;
     }
 }
 
@@ -2676,7 +2676,7 @@ static void PlayerHandleChooseItem(void)
     s32 i;
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-    gBattlerFuncs[gActiveBattler] = OpenBagAndChooseItem;
+    gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
     gBankInMenu = gActiveBattler;
 
     for (i = 0; i < 3; i++)
@@ -2692,7 +2692,7 @@ static void PlayerHandleChoosePokemon(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA && (gBattleBufferA[gActiveBattler][1] & 0xF) != 2)
     {
-        EmitChosenMonReturnValue(1, gBattlePartyID[gActiveBattler] + 1, gUnknown_0203CF00);
+        BtlController_EmitChosenMonReturnValue(1, gBattlerPartyIndexes[gActiveBattler] + 1, gUnknown_0203CF00);
         PlayerBufferExecCompleted();
     }
     else
@@ -2703,7 +2703,7 @@ static void PlayerHandleChoosePokemon(void)
         *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
         *(&gBattleStruct->field_B0) = gBattleBufferA[gActiveBattler][3];
         BeginNormalPaletteFade(-1, 0, 0, 16, 0);
-        gBattlerFuncs[gActiveBattler] = sub_80597CC;
+        gBattlerControllerFuncs[gActiveBattler] = sub_80597CC;
         gBankInMenu = gActiveBattler;
     }
 }
@@ -2727,20 +2727,20 @@ static void PlayerHandleHealthBarUpdate(void)
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], 0, HP_CURRENT);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, 0, hpVal);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], 0, HP_CURRENT);
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void PlayerHandleExpUpdate(void)
@@ -2763,7 +2763,7 @@ static void PlayerHandleExpUpdate(void)
         gTasks[taskId].tExpTask_monId = monId;
         gTasks[taskId].tExpTask_gainedExp = expPointsToGive;
         gTasks[taskId].tExpTask_bank = gActiveBattler;
-        gBattlerFuncs[gActiveBattler] = nullsub_21;
+        gBattlerControllerFuncs[gActiveBattler] = nullsub_21;
     }
 }
 
@@ -2778,10 +2778,10 @@ static void PlayerHandleStatusIconUpdate(void)
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_STATUS_ICON);
         bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -2791,15 +2791,15 @@ static void PlayerHandleStatusAnimation(void)
     {
         InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
                         gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
 static void PlayerHandleStatusXor(void)
 {
-    u8 val = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_STATUS) ^ gBattleBufferA[gActiveBattler][1];
+    u8 val = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_STATUS) ^ gBattleBufferA[gActiveBattler][1];
 
-    SetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_STATUS, &val);
+    SetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_STATUS, &val);
     PlayerBufferExecCompleted();
 }
 
@@ -2848,25 +2848,25 @@ static void PlayerHandleCmd32(void)
 
 static void PlayerHandleTwoReturnValues(void)
 {
-    EmitTwoReturnValues(1, 0, 0);
+    BtlController_EmitTwoReturnValues(1, 0, 0);
     PlayerBufferExecCompleted();
 }
 
 static void PlayerHandleChosenMonReturnValue(void)
 {
-    EmitChosenMonReturnValue(1, 0, NULL);
+    BtlController_EmitChosenMonReturnValue(1, 0, NULL);
     PlayerBufferExecCompleted();
 }
 
 static void PlayerHandleOneReturnValue(void)
 {
-    EmitOneReturnValue(1, 0);
+    BtlController_EmitOneReturnValue(1, 0);
     PlayerBufferExecCompleted();
 }
 
 static void PlayerHandleOneReturnValue_Duplicate(void)
 {
-    EmitOneReturnValue_Duplicate(1, 0);
+    BtlController_EmitOneReturnValue_Duplicate(1, 0);
     PlayerBufferExecCompleted();
 }
 
@@ -2896,16 +2896,16 @@ static void PlayerHandleCmd40(void)
 
 static void PlayerHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         PlayerBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
+        gBattlerControllerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -2944,7 +2944,7 @@ static void PlayerHandlePlayFanfareOrBGM(void)
 
 static void PlayerHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, -25, 5);
     PlayerBufferExecCompleted();
@@ -2962,20 +2962,20 @@ static void PlayerHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_805CC00);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_805CC00);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F8);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[gSaveBlock2Ptr->playerGender].data, 0x100 + paletteNum * 16, 32);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(task05_08033660, 5);
     gTasks[taskId].data[0] = gActiveBattler;
@@ -2984,7 +2984,7 @@ static void PlayerHandleIntroTrainerBallThrow(void)
         gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattlerFuncs[gActiveBattler] = nullsub_21;
+    gBattlerControllerFuncs[gActiveBattler] = nullsub_21;
 }
 
 void sub_805CC00(struct Sprite *sprite)
@@ -2994,8 +2994,8 @@ void sub_805CC00(struct Sprite *sprite)
     FreeSpriteOamMatrix(sprite);
     FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum));
     DestroySprite(sprite);
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[bank]], bank);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], 0);
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[bank]], bank);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], 0);
 }
 
 static void task05_08033660(u8 taskId)
@@ -3011,20 +3011,20 @@ static void task05_08033660(u8 taskId)
         gActiveBattler = gTasks[taskId].data[0];
         if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
             sub_805B258(gActiveBattler, FALSE);
         }
         else
         {
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
             sub_805B258(gActiveBattler, FALSE);
             gActiveBattler ^= BIT_FLANK;
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
-            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
+            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
             sub_805B258(gActiveBattler, FALSE);
             gActiveBattler ^= BIT_FLANK;
         }
-        gBattlerFuncs[gActiveBattler] = sub_8058B40;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8058B40;
         gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
@@ -3045,7 +3045,7 @@ static void PlayerHandleDrawPartyStatusSummary(void)
         if (gBattleBufferA[gActiveBattler][2] != 0)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattlerFuncs[gActiveBattler] = sub_805CE38;
+        gBattlerControllerFuncs[gActiveBattler] = sub_805CE38;
     }
 }
 
@@ -3074,9 +3074,9 @@ static void PlayerHandleCmd50(void)
 
 static void PlayerHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBattler))
+    if (IsBattlerSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        gSprites[gBattlerSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
         CopyBattleSpriteInvisibility(gActiveBattler);
     }
     PlayerBufferExecCompleted();
@@ -3092,7 +3092,7 @@ static void PlayerHandleBattleAnimation(void)
         if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             PlayerBufferExecCompleted();
         else
-            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
 
         sub_817E32C(animationId);
     }
@@ -3143,7 +3143,7 @@ static void PlayerHandleCmd55(void)
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     PlayerBufferExecCompleted();
-    gBattlerFuncs[gActiveBattler] = sub_80587B0;
+    gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_22(void)
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 2b21dab94..c44a8d31e 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -23,21 +23,21 @@
 #include "pokeball.h"
 #include "data2.h"
 
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gActiveBattler;
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
@@ -47,7 +47,7 @@ extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattleDefender;
+extern u8 gBattleMoveTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
@@ -213,12 +213,12 @@ static void nullsub_77(void)
 
 void SetControllerToPlayerPartner(void)
 {
-    gBattlerFuncs[gActiveBattler] = PlayerPartnerBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = PlayerPartnerBufferRunCommand;
 }
 
 static void PlayerPartnerBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBattler])
+    if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
     {
         if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sPlayerPartnerBufferCommands))
             sPlayerPartnerBufferCommands[gBattleBufferA[gActiveBattler][0]]();
@@ -229,17 +229,17 @@ static void PlayerPartnerBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         PlayerPartnerBufferExecCompleted();
 }
 
 static void sub_81BAE98(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         nullsub_25(0);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
         PlayerPartnerBufferExecCompleted();
     }
 }
@@ -259,13 +259,13 @@ static void sub_81BAF48(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
             r6 = TRUE;
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r6 = TRUE;
         }
@@ -277,7 +277,7 @@ static void sub_81BAF48(void)
     if (r6)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
-        gBattlerFuncs[gActiveBattler] = sub_81BAF00;
+        gBattlerControllerFuncs[gActiveBattler] = sub_81BAF00;
     }
 }
 
@@ -286,7 +286,7 @@ static void sub_81BB02C(void)
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive
         && gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+        && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
         && ++gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 != 1)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
@@ -294,41 +294,41 @@ static void sub_81BB02C(void)
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
             DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
             sub_8076918(gActiveBattler ^ BIT_FLANK);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
+            SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]);
         }
 
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
         sub_8076918(gActiveBattler);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
 
-        gBattlerFuncs[gActiveBattler] = sub_81BAF48;
+        gBattlerControllerFuncs[gActiveBattler] = sub_81BAF48;
     }
 }
 
 static void sub_81BB1D4(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].animEnded && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
         PlayerPartnerBufferExecCompleted();
 }
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+    SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
         PlayerPartnerBufferExecCompleted();
     }
 }
@@ -351,7 +351,7 @@ static void Task_GiveExpToMon(u8 taskId)
     u8 bank = gTasks[taskId].tExpTask_bank;
     s16 gainedExp = gTasks[taskId].tExpTask_gainedExp;
 
-    if (IsDoubleBattle() == TRUE || monId != gBattlePartyID[bank]) // give exp without the expbar
+    if (IsDoubleBattle() == TRUE || monId != gBattlerPartyIndexes[bank]) // give exp without the expbar
     {
         struct Pokemon *mon = &gPlayerParty[monId];
         u16 species = GetMonData(mon, MON_DATA_SPECIES);
@@ -368,11 +368,11 @@ static void Task_GiveExpToMon(u8 taskId)
             gainedExp -= nextLvlExp - currExp;
             savedActiveBank = gActiveBattler;
             gActiveBattler = bank;
-            EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
+            BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
             gActiveBattler = savedActiveBank;
 
             if (IsDoubleBattle() == TRUE
-             && ((u16)(monId) == gBattlePartyID[bank] || (u16)(monId) == gBattlePartyID[bank ^ BIT_FLANK]))
+             && ((u16)(monId) == gBattlerPartyIndexes[bank] || (u16)(monId) == gBattlerPartyIndexes[bank ^ BIT_FLANK]))
                 gTasks[taskId].func = sub_81BB628;
             else
                 gTasks[taskId].func = DestroyExpTaskAndCompleteOnInactiveTextPrinter;
@@ -381,7 +381,7 @@ static void Task_GiveExpToMon(u8 taskId)
         {
             currExp += gainedExp;
             SetMonData(mon, MON_DATA_EXP, &currExp);
-            gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
+            gBattlerControllerFuncs[bank] = CompleteOnInactiveTextPrinter;
             DestroyTask(taskId);
         }
     }
@@ -405,7 +405,7 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId)
 
     exp -= currLvlExp;
     expToNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLvlExp;
-    SetBattleBarStruct(bank, gHealthBoxesIds[bank], expToNextLvl, exp, -gainedExp);
+    SetBattleBarStruct(bank, gHealthboxSpriteIds[bank], expToNextLvl, exp, -gainedExp);
     PlaySE(SE_EXP);
     gTasks[taskId].func = sub_81BB4E4;
 }
@@ -423,8 +423,8 @@ static void sub_81BB4E4(u8 taskId)
         u8 bank = gTasks[taskId].tExpTask_bank;
         s16 r4;
 
-        r4 = sub_8074AA0(bank, gHealthBoxesIds[bank], EXP_BAR, 0);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[bank]);
+        r4 = sub_8074AA0(bank, gHealthboxSpriteIds[bank], EXP_BAR, 0);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[bank]);
         if (r4 == -1)
         {
             u8 level;
@@ -447,7 +447,7 @@ static void sub_81BB4E4(u8 taskId)
                 gainedExp -= expOnNextLvl - currExp;
                 savedActiveBank = gActiveBattler;
                 gActiveBattler = bank;
-                EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
+                BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELLED_UP, gainedExp);
                 gActiveBattler = savedActiveBank;
                 gTasks[taskId].func = sub_81BB628;
             }
@@ -455,7 +455,7 @@ static void sub_81BB4E4(u8 taskId)
             {
                 currExp += gainedExp;
                 SetMonData(&gPlayerParty[monId], MON_DATA_EXP, &currExp);
-                gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
+                gBattlerControllerFuncs[bank] = CompleteOnInactiveTextPrinter;
                 DestroyTask(taskId);
             }
         }
@@ -467,7 +467,7 @@ static void sub_81BB628(u8 taskId)
     u8 bank = gTasks[taskId].tExpTask_bank;
     u8 monIndex = gTasks[taskId].tExpTask_monId;
 
-    if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_FLANK])
+    if (IsDoubleBattle() == TRUE && monIndex == gBattlerPartyIndexes[bank ^ BIT_FLANK])
         bank ^= BIT_FLANK;
 
     InitAndLaunchSpecialAnimation(bank, bank, bank, B_ANIM_LVL_UP);
@@ -484,10 +484,10 @@ static void sub_81BB688(u8 taskId)
 
         GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL);  // Unused return value
 
-        if (IsDoubleBattle() == TRUE && monIndex == gBattlePartyID[bank ^ BIT_FLANK])
-            UpdateHealthboxAttribute(gHealthBoxesIds[bank ^ BIT_FLANK], &gPlayerParty[monIndex], HEALTHBOX_ALL);
+        if (IsDoubleBattle() == TRUE && monIndex == gBattlerPartyIndexes[bank ^ BIT_FLANK])
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[bank ^ BIT_FLANK], &gPlayerParty[monIndex], HEALTHBOX_ALL);
         else
-            UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gPlayerParty[monIndex], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[bank], &gPlayerParty[monIndex], HEALTHBOX_ALL);
 
         gTasks[taskId].func = DestroyExpTaskAndCompleteOnInactiveTextPrinter;
     }
@@ -501,20 +501,20 @@ static void DestroyExpTaskAndCompleteOnInactiveTextPrinter(u8 taskId)
     monIndex = gTasks[taskId].tExpTask_monId;
     GetMonData(&gPlayerParty[monIndex], MON_DATA_LEVEL);  // Unused return value
     bank = gTasks[taskId].tExpTask_bank;
-    gBattlerFuncs[bank] = CompleteOnInactiveTextPrinter;
+    gBattlerControllerFuncs[bank] = CompleteOnInactiveTextPrinter;
     DestroyTask(taskId);
 }
 
 static void sub_81BB78C(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].pos1.y + gSprites[gBankSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y + gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
     {
-        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+        u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
         nullsub_24(species);
-        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBattler]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeOamMatrix(gSprites[gBattlerSpriteIds[gActiveBattler]].oam.matrixNum);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         PlayerPartnerBufferExecCompleted();
     }
 }
@@ -523,9 +523,9 @@ static void sub_81BB828(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         PlayerPartnerBufferExecCompleted();
     }
 }
@@ -538,7 +538,7 @@ static void CompleteOnInactiveTextPrinter2(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBattler];
+    u8 spriteId = gBattlerSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -557,20 +557,20 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_81BB92C(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         CopyBattleSpriteInvisibility(gActiveBattler);
         if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattlerFuncs[gActiveBattler] = sub_81BB9A0;
+        gBattlerControllerFuncs[gActiveBattler] = sub_81BB9A0;
     }
 }
 
 static void sub_81BB9A0(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive
-        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+        && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         PlayerPartnerBufferExecCompleted();
     }
@@ -587,13 +587,13 @@ static void sub_81BB9F4(void)
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
+        StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 0);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
         sub_8076918(gActiveBattler);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-        gBattlerFuncs[gActiveBattler] = sub_81BB92C;
+        gBattlerControllerFuncs[gActiveBattler] = sub_81BB92C;
     }
 }
 
@@ -602,20 +602,20 @@ static void sub_81BBAE8(void)
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        gBattlerFuncs[gActiveBattler] = sub_81BB9F4;
+        gBattlerControllerFuncs[gActiveBattler] = sub_81BB9F4;
     }
 }
 
 static void PlayerPartnerBufferExecCompleted(void)
 {
-    gBattlerFuncs[gActiveBattler] = PlayerPartnerBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = PlayerPartnerBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
@@ -625,7 +625,7 @@ static void PlayerPartnerBufferExecCompleted(void)
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
+        gBattleControllerExecFlags &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -650,7 +650,7 @@ static void PlayerPartnerHandleGetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyPlayerPartnerMonData(gBattlePartyID[gActiveBattler], monData);
+        size += CopyPlayerPartnerMonData(gBattlerPartyIndexes[gActiveBattler], monData);
     }
     else
     {
@@ -662,7 +662,7 @@ static void PlayerPartnerHandleGetMonData(void)
             monToCheck >>= 1;
         }
     }
-    EmitDataTransfer(1, size, monData);
+    BtlController_EmitDataTransfer(1, size, monData);
     PlayerPartnerBufferExecCompleted();
 }
 
@@ -984,7 +984,7 @@ static void PlayerPartnerHandleSetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetPlayerPartnerMonData(gBattlePartyID[gActiveBattler]);
+        SetPlayerPartnerMonData(gBattlerPartyIndexes[gActiveBattler]);
     }
     else
     {
@@ -1214,12 +1214,12 @@ static void SetPlayerPartnerMonData(u8 monId)
         break;
     }
 
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 }
 
 static void PlayerPartnerHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *dst = (u8 *)&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
     for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
@@ -1232,28 +1232,28 @@ static void PlayerPartnerHandleLoadMonSprite(void)
 {
     u16 species;
 
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
-    species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
+    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
     sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBattler, 2),
-                                               GetBankSpriteDefault_Y(gActiveBattler),
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBattlerSpriteCoord(gActiveBattler, 2),
+                                               GetBattlerSpriteDefault_Y(gActiveBattler),
                                                sub_80A82E4(gActiveBattler));
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
-    gBattlerFuncs[gActiveBattler] = sub_81BB1D4;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    gBattlerControllerFuncs[gActiveBattler] = sub_81BB1D4;
 }
 
 static void PlayerPartnerHandleSwitchInAnim(void)
 {
     ClearTemporarySpeciesSpriteData(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    gBattlerPartyIndexes[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
     sub_81BD0E4(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlerFuncs[gActiveBattler] = sub_81BBAE8;
+    gBattlerControllerFuncs[gActiveBattler] = sub_81BBAE8;
 }
 
 static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
@@ -1261,28 +1261,28 @@ static void sub_81BD0E4(u8 bank, bool8 dontClearSubstituteBit)
     u16 species;
 
     ClearTemporarySpeciesSpriteData(bank, dontClearSubstituteBit);
-    gBattlePartyID[bank] = gBattleBufferA[bank][1];
-    species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+    gBattlerPartyIndexes[bank] = gBattleBufferA[bank][1];
+    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     sub_806A068(species, GetBattlerPosition(bank));
 
-    gBankSpriteIds[bank] = CreateSprite(
+    gBattlerSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      GetBankCoord(bank, 2),
-      GetBankSpriteDefault_Y(bank),
+      GetBattlerSpriteCoord(bank, 2),
+      GetBattlerSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBattlerSpriteIds[bank];
     gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data[0] = bank;
-    gSprites[gBankSpriteIds[bank]].data[2] = species;
-    gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[2] = species;
+    gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
 
-    StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
 
-    gSprites[gBankSpriteIds[bank]].invisible = TRUE;
-    gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+    gSprites[gBattlerSpriteIds[bank]].invisible = TRUE;
+    gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
 
     gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
@@ -1292,13 +1292,13 @@ static void PlayerPartnerHandleReturnMonToBall(void)
     if (gBattleBufferA[gActiveBattler][1] == 0)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         PlayerPartnerBufferExecCompleted();
     }
 }
@@ -1318,7 +1318,7 @@ static void DoSwitchOutAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_PLAYER_MON);
-            gBattlerFuncs[gActiveBattler] = sub_81BB828;
+            gBattlerControllerFuncs[gActiveBattler] = sub_81BB828;
         }
         break;
     }
@@ -1350,29 +1350,29 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
     {
         DecompressTrainerBackPic(trainerPicId, gActiveBattler);
         sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
-        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+        gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
 
-        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
     }
     else // otherwise use front sprite
     {
         DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
         sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler));
-        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
-
-        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBattler]].pos2.y = 48;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
-        gSprites[gBankSpriteIds[gActiveBattler]].oam.affineMode = 0;
-        gSprites[gBankSpriteIds[gActiveBattler]].hFlip = 1;
+        gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y = 48;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].hFlip = 1;
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void PlayerPartnerHandleTrainerSlide(void)
@@ -1382,13 +1382,13 @@ static void PlayerPartnerHandleTrainerSlide(void)
 
 static void PlayerPartnerHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
-    gBattlerFuncs[gActiveBattler] = sub_81BAE98;
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerControllerFuncs[gActiveBattler] = sub_81BAE98;
 }
 
 static void PlayerPartnerHandleFaintAnimation(void)
@@ -1404,12 +1404,12 @@ static void PlayerPartnerHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
-            gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
-            gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 5;
-            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039C00;
-            gBattlerFuncs[gActiveBattler] = sub_81BB78C;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
+            gBattlerControllerFuncs[gActiveBattler] = sub_81BB78C;
         }
     }
 }
@@ -1454,7 +1454,7 @@ static void PlayerPartnerHandleMoveAnimation(void)
         else
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            gBattlerFuncs[gActiveBattler] = PlayerPartnerDoMoveAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = PlayerPartnerDoMoveAnimation;
         }
     }
 }
@@ -1517,7 +1517,7 @@ static void PlayerPartnerHandlePrintString(void)
     stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2;
 }
 
 static void PlayerPartnerHandlePrintSelectionString(void)
@@ -1545,15 +1545,15 @@ static void PlayerPartnerHandleChooseMove(void)
     chosenMoveId = BattleAI_ChooseMoveOrAction();
 
     if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_x10 | MOVE_TARGET_USER))
-        gBattleDefender = gActiveBattler;
+        gBattleMoveTarget = gActiveBattler;
     if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH)
     {
-        gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
-        if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
-            gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
+            gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
     }
 
-    EmitTwoReturnValues(1, 10, chosenMoveId | (gBattleDefender << 8));
+    BtlController_EmitTwoReturnValues(1, 10, chosenMoveId | (gBattleMoveTarget << 8));
     PlayerPartnerBufferExecCompleted();
 }
 
@@ -1574,8 +1574,8 @@ static void PlayerPartnerHandleChoosePokemon(void)
         for (chosenMonId = 3; chosenMonId < 6; chosenMonId++)
         {
             if (GetMonData(&gPlayerParty[chosenMonId], MON_DATA_HP) != 0
-                && chosenMonId != gBattlePartyID[playerMonIdentity]
-                && chosenMonId != gBattlePartyID[selfIdentity])
+                && chosenMonId != gBattlerPartyIndexes[playerMonIdentity]
+                && chosenMonId != gBattlerPartyIndexes[selfIdentity])
             {
                 break;
             }
@@ -1583,7 +1583,7 @@ static void PlayerPartnerHandleChoosePokemon(void)
     }
 
     *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = chosenMonId;
-    EmitChosenMonReturnValue(1, chosenMonId, NULL);
+    BtlController_EmitChosenMonReturnValue(1, chosenMonId, NULL);
     PlayerPartnerBufferExecCompleted();
 }
 
@@ -1601,19 +1601,19 @@ static void PlayerPartnerHandleHealthBarUpdate(void)
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, 0, hpVal);
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void PlayerPartnerHandleExpUpdate(void)
@@ -1636,7 +1636,7 @@ static void PlayerPartnerHandleExpUpdate(void)
         gTasks[taskId].tExpTask_monId = monId;
         gTasks[taskId].tExpTask_gainedExp = expPointsToGive;
         gTasks[taskId].tExpTask_bank = gActiveBattler;
-        gBattlerFuncs[gActiveBattler] = nullsub_21;
+        gBattlerControllerFuncs[gActiveBattler] = nullsub_21;
     }
 }
 
@@ -1651,10 +1651,10 @@ static void PlayerPartnerHandleStatusIconUpdate(void)
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_STATUS_ICON);
         bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1664,7 +1664,7 @@ static void PlayerPartnerHandleStatusAnimation(void)
     {
         InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
                         gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1739,16 +1739,16 @@ static void PlayerPartnerHandleCmd40(void)
 
 static void PlayerPartnerHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         PlayerPartnerBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
+        gBattlerControllerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1787,7 +1787,7 @@ static void PlayerPartnerHandlePlayFanfareOrBGM(void)
 
 static void PlayerPartnerHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, -25, 5);
     PlayerPartnerBufferExecCompleted();
@@ -1805,16 +1805,16 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_805CC00);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_805CC00);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F9);
     if (gPartnerTrainerId == STEVEN_PARTNER_ID)
@@ -1829,7 +1829,7 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
     }
 
 
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(sub_81BE2C8, 5);
     gTasks[taskId].data[0] = gActiveBattler;
@@ -1838,7 +1838,7 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
         gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattlerFuncs[gActiveBattler] = nullsub_77;
+    gBattlerControllerFuncs[gActiveBattler] = nullsub_77;
 }
 
 static void sub_81BE2C8(u8 taskId)
@@ -1854,20 +1854,20 @@ static void sub_81BE2C8(u8 taskId)
         gActiveBattler = gTasks[taskId].data[0];
         if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
             sub_81BD0E4(gActiveBattler, FALSE);
         }
         else
         {
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
             sub_81BD0E4(gActiveBattler, FALSE);
             gActiveBattler ^= BIT_FLANK;
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
-            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
+            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
             sub_81BD0E4(gActiveBattler, FALSE);
             gActiveBattler ^= BIT_FLANK;
         }
-        gBattlerFuncs[gActiveBattler] = sub_81BB02C;
+        gBattlerControllerFuncs[gActiveBattler] = sub_81BB02C;
         gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
@@ -1888,7 +1888,7 @@ static void PlayerPartnerHandleDrawPartyStatusSummary(void)
         if (gBattleBufferA[gActiveBattler][2] != 0)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattlerFuncs[gActiveBattler] = sub_81BE498;
+        gBattlerControllerFuncs[gActiveBattler] = sub_81BE498;
     }
 }
 
@@ -1915,9 +1915,9 @@ static void PlayerPartnerHandleCmd50(void)
 
 static void PlayerPartnerHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBattler))
+    if (IsBattlerSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        gSprites[gBattlerSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
         CopyBattleSpriteInvisibility(gActiveBattler);
     }
     PlayerPartnerBufferExecCompleted();
@@ -1933,7 +1933,7 @@ static void PlayerPartnerHandleBattleAnimation(void)
         if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             PlayerPartnerBufferExecCompleted();
         else
-            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
     }
 }
 
@@ -1953,7 +1953,7 @@ static void PlayerPartnerHandleCmd55(void)
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     PlayerPartnerBufferExecCompleted();
-    gBattlerFuncs[gActiveBattler] = sub_80587B0;
+    gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_128(void)
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 290eee61b..22cd63fb3 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -25,21 +25,21 @@
 #include "pokeball.h"
 #include "data2.h"
 
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gActiveBattler;
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
@@ -48,7 +48,7 @@ extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattleDefender;
+extern u8 gBattleMoveTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
@@ -202,12 +202,12 @@ static void nullsub_70(void)
 
 void SetControllerToRecordedOpponent(void)
 {
-    gBattlerFuncs[gActiveBattler] = RecordedOpponentBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = RecordedOpponentBufferRunCommand;
 }
 
 static void RecordedOpponentBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBattler])
+    if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
     {
         if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sRecordedOpponentBufferCommands))
             sRecordedOpponentBufferCommands[gBattleBufferA[gActiveBattler][0]]();
@@ -218,23 +218,23 @@ static void RecordedOpponentBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         RecordedOpponentBufferExecCompleted();
 }
 
 static void CompleteOnBankSpriteCallbackDummy2(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         RecordedOpponentBufferExecCompleted();
 }
 
 static void sub_81865C8(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        FreeTrainerFrontPicPalette(gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        FreeTrainerFrontPicPalette(gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
         RecordedOpponentBufferExecCompleted();
     }
 }
@@ -254,8 +254,8 @@ static void sub_8186678(void)
 
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler]].animEnded)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded)
         {
             var = TRUE;
         }
@@ -263,10 +263,10 @@ static void sub_8186678(void)
     }
     else
     {
-        if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler]].animEnded
-            && gSprites[gBankSpriteIds[gActiveBattler ^ BIT_FLANK]].animEnded)
+        if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
+            && gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded
+            && gSprites[gBattlerSpriteIds[gActiveBattler ^ BIT_FLANK]].animEnded)
          {
              var = TRUE;
          }
@@ -290,7 +290,7 @@ static void sub_8186678(void)
         }
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
-        gBattlerFuncs[gActiveBattler] = sub_8186630;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8186630;
     }
 }
 
@@ -300,9 +300,9 @@ static void sub_818686C(void)
     bool32 r8 = FALSE;
 
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
-        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
-        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
+        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
 
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
     {
@@ -310,13 +310,13 @@ static void sub_818686C(void)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+                UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
                 sub_8076918(gActiveBattler ^ BIT_FLANK);
-                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
+                SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]);
             }
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
             sub_8076918(gActiveBattler);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+            SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 1;
     }
@@ -345,7 +345,7 @@ static void sub_818686C(void)
     if (!IsDoubleBattle())
     {
         if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+            && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
@@ -353,9 +353,9 @@ static void sub_818686C(void)
     else
     {
         if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
             && gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
-            && gSprites[gBankSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+            && gSprites[gBattlerSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
@@ -366,28 +366,28 @@ static void sub_818686C(void)
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
             DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
-            SetBankEnemyShadowSpriteCallback(gActiveBattler ^ BIT_FLANK, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], MON_DATA_SPECIES));
+            SetBattlerShadowSpriteCallback(gActiveBattler ^ BIT_FLANK, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], MON_DATA_SPECIES));
         }
 
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+        SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
 
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 0;
 
-        gBattlerFuncs[gActiveBattler] = sub_8186678;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8186678;
     }
 }
 
 static void sub_8186C48(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
-     && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+     && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80)
         {
-            sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+            sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
         }
         else
         {
@@ -405,13 +405,13 @@ static void sub_8186C48(void)
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+    SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
@@ -421,9 +421,9 @@ static void CompleteOnHealthbarDone(void)
 
 static void sub_8186D58(void)
 {
-    if (!gSprites[gBankSpriteIds[gActiveBattler]].inUse)
+    if (!gSprites[gBattlerSpriteIds[gActiveBattler]].inUse)
     {
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         RecordedOpponentBufferExecCompleted();
     }
 }
@@ -432,10 +432,10 @@ static void sub_8186D9C(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBattler);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        HideBattlerShadowSprite(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         RecordedOpponentBufferExecCompleted();
     }
 }
@@ -448,7 +448,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBattler];
+    u8 spriteId = gBattlerSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -467,12 +467,12 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_8186EA4(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattlerFuncs[gActiveBattler] = sub_8186F14;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8186F14;
     }
 }
 
@@ -481,8 +481,8 @@ static void sub_8186F14(void)
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive
         && !IsCryPlayingOrClearCrySongs())
     {
-        if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
-            || gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
+        if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+            || gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
         {
             m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
             RecordedOpponentBufferExecCompleted();
@@ -493,7 +493,7 @@ static void sub_8186F14(void)
 static void sub_8186F94(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
-     && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+     && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
@@ -501,13 +501,13 @@ static void sub_8186F94(void)
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
+        StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 0);
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
         sub_8076918(gActiveBattler);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
         CopyBattleSpriteInvisibility(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = sub_8186EA4;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8186EA4;
     }
 }
 
@@ -516,15 +516,15 @@ static void sub_8187084(void)
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80)
     {
-        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
-        gBattlerFuncs[gActiveBattler] = sub_8186F94;
+        SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
+        gBattlerControllerFuncs[gActiveBattler] = sub_8186F94;
     }
 }
 
@@ -542,7 +542,7 @@ static void CompleteOnFinishedBattleAnimation(void)
 
 static void RecordedOpponentBufferExecCompleted(void)
 {
-    gBattlerFuncs[gActiveBattler] = RecordedOpponentBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = RecordedOpponentBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
@@ -552,7 +552,7 @@ static void RecordedOpponentBufferExecCompleted(void)
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
+        gBattleControllerExecFlags &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -565,7 +565,7 @@ static void RecordedOpponentHandleGetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyRecordedOpponentMonData(gBattlePartyID[gActiveBattler], monData);
+        size += CopyRecordedOpponentMonData(gBattlerPartyIndexes[gActiveBattler], monData);
     }
     else
     {
@@ -577,7 +577,7 @@ static void RecordedOpponentHandleGetMonData(void)
             monToCheck >>= 1;
         }
     }
-    EmitDataTransfer(1, size, monData);
+    BtlController_EmitDataTransfer(1, size, monData);
     RecordedOpponentBufferExecCompleted();
 }
 
@@ -899,7 +899,7 @@ static void RecordedOpponentHandleSetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetRecordedOpponentMonData(gBattlePartyID[gActiveBattler]);
+        SetRecordedOpponentMonData(gBattlerPartyIndexes[gActiveBattler]);
     }
     else
     {
@@ -1132,7 +1132,7 @@ static void SetRecordedOpponentMonData(u8 monId)
 
 static void RecordedOpponentHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gEnemyParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *dst = (u8 *)&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
     for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
@@ -1143,33 +1143,33 @@ static void RecordedOpponentHandleSetRawMonData(void)
 
 static void RecordedOpponentHandleLoadMonSprite(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
     sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBattler, 2),
-                                               GetBankSpriteDefault_Y(gActiveBattler),
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBattlerSpriteCoord(gActiveBattler, 2),
+                                               GetBattlerSpriteDefault_Y(gActiveBattler),
                                                sub_80A82E4(gActiveBattler));
 
 
 
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
 
-    SetBankEnemyShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES));
+    SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES));
 
-    gBattlerFuncs[gActiveBattler] = sub_8186C48;
+    gBattlerControllerFuncs[gActiveBattler] = sub_8186C48;
 }
 
 static void RecordedOpponentHandleSwitchInAnim(void)
 {
-    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    gBattlerPartyIndexes[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
     sub_81885D8(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlerFuncs[gActiveBattler] = sub_8187084;
+    gBattlerControllerFuncs[gActiveBattler] = sub_8187084;
 }
 
 static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
@@ -1177,28 +1177,28 @@ static void sub_81885D8(u8 bank, bool8 dontClearSubstituteBit)
     u16 species;
 
     ClearTemporarySpeciesSpriteData(bank, dontClearSubstituteBit);
-    gBattlePartyID[bank] = gBattleBufferA[bank][1];
-    species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+    gBattlerPartyIndexes[bank] = gBattleBufferA[bank][1];
+    species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
-    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
+    BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[bank]], bank);
     sub_806A068(species, GetBattlerPosition(bank));
 
-    gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
-                                        GetBankCoord(bank, 2),
-                                        GetBankSpriteDefault_Y(bank),
+    gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
+                                        GetBattlerSpriteCoord(bank, 2),
+                                        GetBattlerSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBattlerSpriteIds[bank];
     gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data[0] = bank;
-    gSprites[gBankSpriteIds[bank]].data[2] = species;
-    gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[2] = species;
+    gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
 
-    StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
 
-    gSprites[gBankSpriteIds[bank]].invisible = TRUE;
-    gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+    gSprites[gBattlerSpriteIds[bank]].invisible = TRUE;
+    gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
 
     gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_OPPONENT_SENDOUT);
 }
@@ -1208,14 +1208,14 @@ static void RecordedOpponentHandleReturnMonToBall(void)
     if (gBattleBufferA[gActiveBattler][1] == 0)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        EnemyShadowCallbackToSetInvisible(gActiveBattler);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        HideBattlerShadowSprite(gActiveBattler);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         RecordedOpponentBufferExecCompleted();
     }
 }
@@ -1235,7 +1235,7 @@ static void DoSwitchOutAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_OPPONENT_MON);
-            gBattlerFuncs[gActiveBattler] = sub_8186D9C;
+            gBattlerControllerFuncs[gActiveBattler] = sub_8186D9C;
         }
         break;
     }
@@ -1280,18 +1280,18 @@ static void RecordedOpponentHandleDrawTrainerPic(void)
 
     DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
     sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
                                                xPos,
                                                (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 40,
                                                sub_80A82E4(gActiveBattler));
 
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void RecordedOpponentHandleTrainerSlide(void)
@@ -1301,13 +1301,13 @@ static void RecordedOpponentHandleTrainerSlide(void)
 
 static void RecordedOpponentHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
-    gBattlerFuncs[gActiveBattler] = sub_81865C8;
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerControllerFuncs[gActiveBattler] = sub_81865C8;
 }
 
 static void RecordedOpponentHandleFaintAnimation(void)
@@ -1324,8 +1324,8 @@ static void RecordedOpponentHandleFaintAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT);
-            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039934;
-            gBattlerFuncs[gActiveBattler] = sub_8186D58;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039934;
+            gBattlerControllerFuncs[gActiveBattler] = sub_8186D58;
         }
     }
 }
@@ -1370,7 +1370,7 @@ static void RecordedOpponentHandleMoveAnimation(void)
         else
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            gBattlerFuncs[gActiveBattler] = RecordedOpponentDoMoveAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = RecordedOpponentDoMoveAnimation;
         }
     }
 }
@@ -1433,7 +1433,7 @@ static void RecordedOpponentHandlePrintString(void)
     stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
 }
 
 static void RecordedOpponentHandlePrintSelectionString(void)
@@ -1443,7 +1443,7 @@ static void RecordedOpponentHandlePrintSelectionString(void)
 
 static void RecordedOpponentHandleChooseAction(void)
 {
-    EmitTwoReturnValues(1, RecordedBattle_ReadBankAction(gActiveBattler), 0);
+    BtlController_EmitTwoReturnValues(1, RecordedBattle_GetBankAction(gActiveBattler), 0);
     RecordedOpponentBufferExecCompleted();
 }
 
@@ -1456,13 +1456,13 @@ static void RecordedOpponentHandleChooseMove(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
     {
-        EmitTwoReturnValues(1, 10, ChooseMoveAndTargetInBattlePalace());
+        BtlController_EmitTwoReturnValues(1, 10, ChooseMoveAndTargetInBattlePalace());
     }
     else
     {
-        u8 moveId = RecordedBattle_ReadBankAction(gActiveBattler);
-        u8 target = RecordedBattle_ReadBankAction(gActiveBattler);
-        EmitTwoReturnValues(1, 10, moveId | (target << 8));
+        u8 moveId = RecordedBattle_GetBankAction(gActiveBattler);
+        u8 target = RecordedBattle_GetBankAction(gActiveBattler);
+        BtlController_EmitTwoReturnValues(1, 10, moveId | (target << 8));
     }
 
     RecordedOpponentBufferExecCompleted();
@@ -1475,8 +1475,8 @@ static void RecordedOpponentHandleChooseItem(void)
 
 static void RecordedOpponentHandleChoosePokemon(void)
 {
-    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = RecordedBattle_ReadBankAction(gActiveBattler);
-    EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBattler), NULL);
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = RecordedBattle_GetBankAction(gActiveBattler);
+    BtlController_EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBattler), NULL);
     RecordedOpponentBufferExecCompleted();
 }
 
@@ -1494,19 +1494,19 @@ static void RecordedOpponentHandleHealthBarUpdate(void)
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, 0, hpVal);
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void RecordedOpponentHandleExpUpdate(void)
@@ -1520,10 +1520,10 @@ static void RecordedOpponentHandleStatusIconUpdate(void)
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gEnemyParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_STATUS_ICON);
         bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1533,7 +1533,7 @@ static void RecordedOpponentHandleStatusAnimation(void)
     {
         InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
                         gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1608,16 +1608,16 @@ static void RecordedOpponentHandleCmd40(void)
 
 static void RecordedOpponentHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         RecordedOpponentBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
+        gBattlerControllerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1656,7 +1656,7 @@ static void RecordedOpponentHandlePlayFanfareOrBGM(void)
 
 static void RecordedOpponentHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, 25, 5);
     RecordedOpponentBufferExecCompleted();
@@ -1674,14 +1674,14 @@ static void RecordedOpponentHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_818962C);
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_818962C);
 
     taskId = CreateTask(sub_8189548, 5);
     gTasks[taskId].data[0] = gActiveBattler;
@@ -1690,7 +1690,7 @@ static void RecordedOpponentHandleIntroTrainerBallThrow(void)
         gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattlerFuncs[gActiveBattler] = nullsub_70;
+    gBattlerControllerFuncs[gActiveBattler] = nullsub_70;
 }
 
 static void sub_8189548(u8 taskId)
@@ -1700,19 +1700,19 @@ static void sub_8189548(u8 taskId)
     gActiveBattler = gTasks[taskId].data[0];
     if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
     {
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_81885D8(gActiveBattler, FALSE);
     }
     else
     {
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_81885D8(gActiveBattler, FALSE);
         gActiveBattler ^= BIT_FLANK;
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_81885D8(gActiveBattler, FALSE);
         gActiveBattler ^= BIT_FLANK;
     }
-    gBattlerFuncs[gActiveBattler] = sub_818686C;
+    gBattlerControllerFuncs[gActiveBattler] = sub_818686C;
     gActiveBattler = savedActiveBank;
     DestroyTask(taskId);
 }
@@ -1753,7 +1753,7 @@ static void RecordedOpponentHandleDrawPartyStatusSummary(void)
         if (gBattleBufferA[gActiveBattler][2] != 0)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattlerFuncs[gActiveBattler] = sub_818975C;
+        gBattlerControllerFuncs[gActiveBattler] = sub_818975C;
     }
 }
 
@@ -1780,9 +1780,9 @@ static void RecordedOpponentHandleCmd50(void)
 
 static void RecordedOpponentHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBattler))
+    if (IsBattlerSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        gSprites[gBattlerSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
         CopyBattleSpriteInvisibility(gActiveBattler);
     }
     RecordedOpponentBufferExecCompleted();
@@ -1798,7 +1798,7 @@ static void RecordedOpponentHandleBattleAnimation(void)
         if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             RecordedOpponentBufferExecCompleted();
         else
-            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
     }
 }
 
@@ -1822,7 +1822,7 @@ static void RecordedOpponentHandleCmd55(void)
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     RecordedOpponentBufferExecCompleted();
-    gBattlerFuncs[gActiveBattler] = sub_80587B0;
+    gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_119(void)
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index ad8cb3a05..109d71733 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -24,21 +24,21 @@
 #include "pokeball.h"
 #include "data2.h"
 
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gActiveBattler;
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
@@ -48,7 +48,7 @@ extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattleDefender;
+extern u8 gBattleMoveTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
@@ -201,12 +201,12 @@ static void nullsub_120(void)
 
 void SetControllerToRecordedPlayer(void)
 {
-    gBattlerFuncs[gActiveBattler] = RecordedPlayerBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = RecordedPlayerBufferRunCommand;
 }
 
 static void RecordedPlayerBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBattler])
+    if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
     {
         if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sRecordedPlayerBufferCommands))
             sRecordedPlayerBufferCommands[gBattleBufferA[gActiveBattler][0]]();
@@ -217,17 +217,17 @@ static void RecordedPlayerBufferRunCommand(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         RecordedPlayerBufferExecCompleted();
 }
 
 static void sub_81899F0(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         nullsub_25(0);
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -249,13 +249,13 @@ static void sub_8189AA0(void)
     {
         if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
         {
-            if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+            if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
                 r6 = TRUE;
         }
         else
         {
-            if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
-                && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+            if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+                && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
             {
                 r6 = TRUE;
             }
@@ -273,25 +273,25 @@ static void sub_8189AA0(void)
             FreeSpriteTilesByTag(0x27F9);
             FreeSpritePaletteByTag(0x27F9);
 
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
             if (IsDoubleBattle())
-                HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], gActiveBattler ^ BIT_FLANK);
+                HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], gActiveBattler ^ BIT_FLANK);
 
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
-            gBattlerFuncs[gActiveBattler] = sub_8189A58;
+            gBattlerControllerFuncs[gActiveBattler] = sub_8189A58;
         }
     }
     else
     {
         if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
         {
-            if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+            if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
                 r6 = TRUE;
         }
         else
         {
-            if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy
-                && gSprites[gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+            if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
+                && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
             {
                 r6 = TRUE;
             }
@@ -303,7 +303,7 @@ static void sub_8189AA0(void)
         if (r6)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 3;
-            gBattlerFuncs[gActiveBattler] = sub_8189A58;
+            gBattlerControllerFuncs[gActiveBattler] = sub_8189A58;
         }
     }
 }
@@ -317,12 +317,12 @@ static void sub_8189D40(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
         {
-            sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+            sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]);
         }
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
         {
-            sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
+            sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
         }
     }
 
@@ -333,13 +333,13 @@ static void sub_8189D40(void)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+                UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
                 sub_8076918(gActiveBattler ^ BIT_FLANK);
-                SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
+                SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]);
             }
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
             sub_8076918(gActiveBattler);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+            SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 1;
     }
@@ -367,7 +367,7 @@ static void sub_8189D40(void)
     }
 
     if (r10 && gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+        && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
@@ -376,43 +376,43 @@ static void sub_8189D40(void)
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20 = 0;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80 = 0;
-        gBattlerFuncs[gActiveBattler] = sub_8189AA0;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8189AA0;
     }
 }
 
 static void sub_818A064(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].animEnded && gSprites[gBankSpriteIds[gActiveBattler]].pos2.x == 0)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
         RecordedPlayerBufferExecCompleted();
 }
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+    SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
         RecordedPlayerBufferExecCompleted();
     }
 }
 
 static void sub_818A114(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].pos1.y + gSprites[gBankSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y + gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
     {
-        u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+        u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
         nullsub_24(species);
-        FreeOamMatrix(gSprites[gBankSpriteIds[gActiveBattler]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeOamMatrix(gSprites[gBattlerSpriteIds[gActiveBattler]].oam.matrixNum);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -421,9 +421,9 @@ static void sub_818A1B0(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -436,7 +436,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBattler];
+    u8 spriteId = gBattlerSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -455,20 +455,20 @@ static void DoHitAnimBlinkSpriteEffect(void)
 
 static void sub_818A2B4(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         CopyBattleSpriteInvisibility(gActiveBattler);
         if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
-        gBattlerFuncs[gActiveBattler] = sub_818A328;
+        gBattlerControllerFuncs[gActiveBattler] = sub_818A328;
     }
 }
 
 static void sub_818A328(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive
-        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+        && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         RecordedPlayerBufferExecCompleted();
     }
@@ -485,13 +485,13 @@ static void sub_818A37C(void)
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 0);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
+        StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 0);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
         sub_8076918(gActiveBattler);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-        gBattlerFuncs[gActiveBattler] = sub_818A2B4;
+        gBattlerControllerFuncs[gActiveBattler] = sub_818A2B4;
     }
 }
 
@@ -500,20 +500,20 @@ static void sub_818A470(void)
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
-        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]);
     }
 
     if (gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
     {
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        gBattlerFuncs[gActiveBattler] = sub_818A37C;
+        gBattlerControllerFuncs[gActiveBattler] = sub_818A37C;
     }
 }
 
 static void RecordedPlayerBufferExecCompleted(void)
 {
-    gBattlerFuncs[gActiveBattler] = RecordedPlayerBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = RecordedPlayerBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
@@ -523,7 +523,7 @@ static void RecordedPlayerBufferExecCompleted(void)
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
+        gBattleControllerExecFlags &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -548,7 +548,7 @@ static void RecordedPlayerHandleGetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyRecordedPlayerMonData(gBattlePartyID[gActiveBattler], monData);
+        size += CopyRecordedPlayerMonData(gBattlerPartyIndexes[gActiveBattler], monData);
     }
     else
     {
@@ -560,7 +560,7 @@ static void RecordedPlayerHandleGetMonData(void)
             monToCheck >>= 1;
         }
     }
-    EmitDataTransfer(1, size, monData);
+    BtlController_EmitDataTransfer(1, size, monData);
     RecordedPlayerBufferExecCompleted();
 }
 
@@ -882,7 +882,7 @@ static void RecordedPlayerHandleSetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetRecordedPlayerMonData(gBattlePartyID[gActiveBattler]);
+        SetRecordedPlayerMonData(gBattlerPartyIndexes[gActiveBattler]);
     }
     else
     {
@@ -1112,12 +1112,12 @@ static void SetRecordedPlayerMonData(u8 monId)
         break;
     }
 
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 }
 
 static void RecordedPlayerHandleSetRawMonData(void)
 {
-    u8 *dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
+    u8 *dst = (u8 *)&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1];
     u8 i;
 
     for (i = 0; i < gBattleBufferA[gActiveBattler][2]; i++)
@@ -1130,28 +1130,28 @@ static void RecordedPlayerHandleLoadMonSprite(void)
 {
     u16 species;
 
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
-    species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
+    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
     sub_806A068(species, GetBattlerPosition(gActiveBattler));
 
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
-                                               GetBankCoord(gActiveBattler, 2),
-                                               GetBankSpriteDefault_Y(gActiveBattler),
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+                                               GetBattlerSpriteCoord(gActiveBattler, 2),
+                                               GetBattlerSpriteDefault_Y(gActiveBattler),
                                                sub_80A82E4(gActiveBattler));
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
-    gBattlerFuncs[gActiveBattler] = sub_818A064;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
+    gBattlerControllerFuncs[gActiveBattler] = sub_818A064;
 }
 
 static void RecordedPlayerHandleSwitchInAnim(void)
 {
     ClearTemporarySpeciesSpriteData(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlePartyID[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
-    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    gBattlerPartyIndexes[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
+    BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
     sub_818BA6C(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
-    gBattlerFuncs[gActiveBattler] = sub_818A470;
+    gBattlerControllerFuncs[gActiveBattler] = sub_818A470;
 }
 
 static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
@@ -1159,28 +1159,28 @@ static void sub_818BA6C(u8 bank, bool8 dontClearSubstituteBit)
     u16 species;
 
     ClearTemporarySpeciesSpriteData(bank, dontClearSubstituteBit);
-    gBattlePartyID[bank] = gBattleBufferA[bank][1];
-    species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+    gBattlerPartyIndexes[bank] = gBattleBufferA[bank][1];
+    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     sub_806A068(species, GetBattlerPosition(bank));
 
-    gBankSpriteIds[bank] = CreateSprite(
+    gBattlerSpriteIds[bank] = CreateSprite(
       &gUnknown_0202499C,
-      GetBankCoord(bank, 2),
-      GetBankSpriteDefault_Y(bank),
+      GetBattlerSpriteCoord(bank, 2),
+      GetBattlerSpriteDefault_Y(bank),
       sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBattlerSpriteIds[bank];
     gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data[0] = bank;
-    gSprites[gBankSpriteIds[bank]].data[2] = species;
-    gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[2] = species;
+    gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
 
-    StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
 
-    gSprites[gBankSpriteIds[bank]].invisible = TRUE;
-    gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+    gSprites[gBattlerSpriteIds[bank]].invisible = TRUE;
+    gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
 
     gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
@@ -1190,13 +1190,13 @@ static void RecordedPlayerHandleReturnMonToBall(void)
     if (gBattleBufferA[gActiveBattler][1] == 0)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-        gBattlerFuncs[gActiveBattler] = DoSwitchOutAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = DoSwitchOutAnimation;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -1216,7 +1216,7 @@ static void DoSwitchOutAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_PLAYER_MON);
-            gBattlerFuncs[gActiveBattler] = sub_818A1B0;
+            gBattlerControllerFuncs[gActiveBattler] = sub_818A1B0;
         }
         break;
     }
@@ -1268,29 +1268,29 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
         trainerPicId = PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender);
         DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
         sub_806A1C0(trainerPicId, GetBattlerPosition(gActiveBattler));
-        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
-
-        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBattler]].pos2.y = 48;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
-        gSprites[gBankSpriteIds[gActiveBattler]].oam.affineMode = 0;
-        gSprites[gBankSpriteIds[gActiveBattler]].hFlip = 1;
+        gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
+        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y = 48;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].hFlip = 1;
     }
     else
     {
         DecompressTrainerBackPic(trainerPicId, gActiveBattler);
         sub_806A12C(trainerPicId, GetBattlerPosition(gActiveBattler));
-        gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
+        gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C, xPos, yPos, sub_80A82E4(gActiveBattler));
 
-        gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-        gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-        gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void RecordedPlayerHandleTrainerSlide(void)
@@ -1300,13 +1300,13 @@ static void RecordedPlayerHandleTrainerSlide(void)
 
 static void RecordedPlayerHandleTrainerSlideBack(void)
 {
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy);
-    gBattlerFuncs[gActiveBattler] = sub_81899F0;
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
+    gBattlerControllerFuncs[gActiveBattler] = sub_81899F0;
 }
 
 static void RecordedPlayerHandleFaintAnimation(void)
@@ -1322,12 +1322,12 @@ static void RecordedPlayerHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
             PlaySE12WithPanning(SE_POKE_DEAD, -64);
-            gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
-            gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 5;
-            gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_8039C00;
-            gBattlerFuncs[gActiveBattler] = sub_818A114;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
+            gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
+            gBattlerControllerFuncs[gActiveBattler] = sub_818A114;
         }
     }
 }
@@ -1372,7 +1372,7 @@ static void RecordedPlayerHandleMoveAnimation(void)
         else
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            gBattlerFuncs[gActiveBattler] = RecordedPlayerDoMoveAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = RecordedPlayerDoMoveAnimation;
         }
     }
 }
@@ -1435,7 +1435,7 @@ static void RecordedPlayerHandlePrintString(void)
     stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
 }
 
 static void RecordedPlayerHandlePrintSelectionString(void)
@@ -1447,7 +1447,7 @@ static void ChooseActionInBattlePalace(void)
 {
     if (gBattleCommunication[4] >= gBattlersCount / 2)
     {
-        EmitTwoReturnValues(1, RecordedBattle_ReadBankAction(gActiveBattler), 0);
+        BtlController_EmitTwoReturnValues(1, RecordedBattle_GetBankAction(gActiveBattler), 0);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -1456,11 +1456,11 @@ static void RecordedPlayerHandleChooseAction(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
     {
-        gBattlerFuncs[gActiveBattler] = ChooseActionInBattlePalace;
+        gBattlerControllerFuncs[gActiveBattler] = ChooseActionInBattlePalace;
     }
     else
     {
-        EmitTwoReturnValues(1, RecordedBattle_ReadBankAction(gActiveBattler), 0);
+        BtlController_EmitTwoReturnValues(1, RecordedBattle_GetBankAction(gActiveBattler), 0);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -1474,13 +1474,13 @@ static void RecordedPlayerHandleChooseMove(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
     {
-        EmitTwoReturnValues(1, 10, ChooseMoveAndTargetInBattlePalace());
+        BtlController_EmitTwoReturnValues(1, 10, ChooseMoveAndTargetInBattlePalace());
     }
     else
     {
-        u8 moveId = RecordedBattle_ReadBankAction(gActiveBattler);
-        u8 target = RecordedBattle_ReadBankAction(gActiveBattler);
-        EmitTwoReturnValues(1, 10, moveId | (target << 8));
+        u8 moveId = RecordedBattle_GetBankAction(gActiveBattler);
+        u8 target = RecordedBattle_GetBankAction(gActiveBattler);
+        BtlController_EmitTwoReturnValues(1, 10, moveId | (target << 8));
     }
 
     RecordedPlayerBufferExecCompleted();
@@ -1493,8 +1493,8 @@ static void RecordedPlayerHandleChooseItem(void)
 
 static void RecordedPlayerHandleChoosePokemon(void)
 {
-    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = RecordedBattle_ReadBankAction(gActiveBattler);
-    EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBattler), NULL);
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = RecordedBattle_GetBankAction(gActiveBattler);
+    BtlController_EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBattler), NULL);
     RecordedPlayerBufferExecCompleted();
 }
 
@@ -1512,20 +1512,20 @@ static void RecordedPlayerHandleHealthBarUpdate(void)
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], 0, HP_CURRENT);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, 0, hpVal);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], 0, HP_CURRENT);
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void RecordedPlayerHandleExpUpdate(void)
@@ -1539,10 +1539,10 @@ static void RecordedPlayerHandleStatusIconUpdate(void)
     {
         u8 bank;
 
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_STATUS_ICON);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_STATUS_ICON);
         bank = gActiveBattler;
         gBattleSpritesDataPtr->healthBoxesData[bank].statusAnimActive = 0;
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1552,7 +1552,7 @@ static void RecordedPlayerHandleStatusAnimation(void)
     {
         InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
                         gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation;
     }
 }
 
@@ -1627,16 +1627,16 @@ static void RecordedPlayerHandleCmd40(void)
 
 static void RecordedPlayerHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         RecordedPlayerBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
+        gBattlerControllerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1675,7 +1675,7 @@ static void RecordedPlayerHandlePlayFanfareOrBGM(void)
 
 static void RecordedPlayerHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry3(species, -25, 5);
     RecordedPlayerBufferExecCompleted();
@@ -1694,26 +1694,26 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void)
     u8 taskId;
     u32 trainerPicId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_805CC00);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_805CC00);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F9);
     if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
-        trainerPicId = gLinkPlayers[GetBankMultiplayerId(gActiveBattler)].gender;
+        trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender;
     else
         trainerPicId = gSaveBlock2Ptr->playerGender;
 
     LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, 0x100 + paletteNum * 16, 32);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(sub_818CC24, 5);
     gTasks[taskId].data[0] = gActiveBattler;
@@ -1722,7 +1722,7 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void)
         gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattlerFuncs[gActiveBattler] = nullsub_120;
+    gBattlerControllerFuncs[gActiveBattler] = nullsub_120;
 }
 
 static void sub_818CC24(u8 taskId)
@@ -1738,20 +1738,20 @@ static void sub_818CC24(u8 taskId)
         gActiveBattler = gTasks[taskId].data[0];
         if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
             sub_818BA6C(gActiveBattler, FALSE);
         }
         else
         {
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
             sub_818BA6C(gActiveBattler, FALSE);
             gActiveBattler ^= BIT_FLANK;
-            gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
-            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+            gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
+            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
             sub_818BA6C(gActiveBattler, FALSE);
             gActiveBattler ^= BIT_FLANK;
         }
-        gBattlerFuncs[gActiveBattler] = sub_8189D40;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8189D40;
         gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
@@ -1772,7 +1772,7 @@ static void RecordedPlayerHandleDrawPartyStatusSummary(void)
         if (gBattleBufferA[gActiveBattler][2] != 0)
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0x5D;
 
-        gBattlerFuncs[gActiveBattler] = sub_818CDF4;
+        gBattlerControllerFuncs[gActiveBattler] = sub_818CDF4;
     }
 }
 
@@ -1799,9 +1799,9 @@ static void RecordedPlayerHandleCmd50(void)
 
 static void RecordedPlayerHandleSpriteInvisibility(void)
 {
-    if (IsBankSpritePresent(gActiveBattler))
+    if (IsBattlerSpritePresent(gActiveBattler))
     {
-        gSprites[gBankSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
+        gSprites[gBattlerSpriteIds[gActiveBattler]].invisible = gBattleBufferA[gActiveBattler][1];
         CopyBattleSpriteInvisibility(gActiveBattler);
     }
     RecordedPlayerBufferExecCompleted();
@@ -1817,7 +1817,7 @@ static void RecordedPlayerHandleBattleAnimation(void)
         if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
             RecordedPlayerBufferExecCompleted();
         else
-            gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
+            gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
     }
 }
 
@@ -1837,7 +1837,7 @@ static void RecordedPlayerHandleCmd55(void)
     FadeOutMapMusic(5);
     BeginFastPaletteFade(3);
     RecordedPlayerBufferExecCompleted();
-    gBattlerFuncs[gActiveBattler] = sub_80587B0;
+    gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_121(void)
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 9e90d660c..814ee8076 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -22,21 +22,21 @@
 #include "data2.h"
 #include "pokeblock.h"
 
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gActiveBattler;
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gSpecialVar_ItemId;
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
@@ -180,12 +180,12 @@ static void nullsub_114(void)
 
 void SetControllerToSafari(void)
 {
-    gBattlerFuncs[gActiveBattler] = SafariBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = SafariBufferRunCommand;
 }
 
 static void SafariBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBattler])
+    if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
     {
         if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sSafariBufferCommands))
             sSafariBufferCommands[gBattleBufferA[gActiveBattler][0]]();
@@ -203,16 +203,16 @@ static void HandleInputChooseAction(void)
         switch (gActionSelectionCursor[gActiveBattler])
         {
         case 0:
-            EmitTwoReturnValues(1, ACTION_SAFARI_ZONE_BALL, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_SAFARI_ZONE_BALL, 0);
             break;
         case 1:
-            EmitTwoReturnValues(1, ACTION_POKEBLOCK_CASE, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_POKEBLOCK_CASE, 0);
             break;
         case 2:
-            EmitTwoReturnValues(1, ACTION_GO_NEAR, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_GO_NEAR, 0);
             break;
         case 3:
-            EmitTwoReturnValues(1, ACTION_SAFARI_ZONE_RUN, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_SAFARI_ZONE_RUN, 0);
             break;
         }
         SafariBufferExecCompleted();
@@ -261,7 +261,7 @@ static void HandleInputChooseAction(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         SafariBufferExecCompleted();
 }
 
@@ -273,7 +273,7 @@ static void CompleteOnInactiveTextPrinter(void)
 
 static void CompleteOnHealthboxSpriteCallbackDummy(void)
 {
-    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         SafariBufferExecCompleted();
 }
 
@@ -297,7 +297,7 @@ static void SafariOpenPokeblockCase(void)
 {
     if (!gPaletteFade.active)
     {
-        gBattlerFuncs[gActiveBattler] = CompleteWhenChosePokeblock;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteWhenChosePokeblock;
         FreeAllWindowBuffers();
         OpenPokeblockCaseInBattle();
     }
@@ -307,7 +307,7 @@ static void CompleteWhenChosePokeblock(void)
 {
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
-        EmitOneReturnValue(1, gSpecialVar_ItemId);
+        BtlController_EmitOneReturnValue(1, gSpecialVar_ItemId);
         SafariBufferExecCompleted();
     }
 }
@@ -320,7 +320,7 @@ static void CompleteOnFinishedBattleAnimation(void)
 
 static void SafariBufferExecCompleted(void)
 {
-    gBattlerFuncs[gActiveBattler] = SafariBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = SafariBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
@@ -330,7 +330,7 @@ static void SafariBufferExecCompleted(void)
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
+        gBattleControllerExecFlags &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -379,16 +379,16 @@ static void SafariHandleDrawTrainerPic(void)
 {
     DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, gActiveBattler);
     sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(gActiveBattler));
-    gBankSpriteIds[gActiveBattler] = CreateSprite(
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(
       &gUnknown_0202499C,
       80,
       (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80,
       30);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void SafariHandleTrainerSlide(void)
@@ -416,7 +416,7 @@ static void SafariHandleSuccessBallThrowAnim(void)
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
     InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
-    gBattlerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
 }
 
 static void SafariHandleBallThrowAnim(void)
@@ -426,7 +426,7 @@ static void SafariHandleBallThrowAnim(void)
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
     InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
-    gBattlerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnSpecialAnimDone;
 }
 
 static void SafariHandlePause(void)
@@ -448,7 +448,7 @@ static void SafariHandlePrintString(void)
     stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
 }
 
 static void SafariHandlePrintSelectionString(void)
@@ -465,7 +465,7 @@ static void HandleChooseActionAfterDma3(void)
     {
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 160;
-        gBattlerFuncs[gActiveBattler] = HandleInputChooseAction;
+        gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseAction;
     }
 }
 
@@ -473,7 +473,7 @@ static void SafariHandleChooseAction(void)
 {
     s32 i;
 
-    gBattlerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
+    gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
     BattleHandleAddTextPrinter(gText_SafariZoneMenu, 2);
 
     for (i = 0; i < 4; i++)
@@ -499,7 +499,7 @@ static void SafariHandleChooseItem(void)
     s32 i;
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-    gBattlerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
+    gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
     gBankInMenu = gActiveBattler;
 }
 
@@ -525,7 +525,7 @@ static void SafariHandleExpUpdate(void)
 
 static void SafariHandleStatusIconUpdate(void)
 {
-    UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_SAFARI_BALLS_TEXT);
+    UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_SAFARI_BALLS_TEXT);
     SafariBufferExecCompleted();
 }
 
@@ -639,7 +639,7 @@ static void SafariHandlePlayFanfareOrBGM(void)
 
 static void SafariHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry1(species, 25);
     SafariBufferExecCompleted();
@@ -654,10 +654,10 @@ static void SafariHandleIntroSlide(void)
 
 static void SafariHandleIntroTrainerBallThrow(void)
 {
-    UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_SAFARI_ALL_TEXT);
+    UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_SAFARI_ALL_TEXT);
     sub_8076918(gActiveBattler);
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
-    gBattlerFuncs[gActiveBattler] = CompleteOnHealthboxSpriteCallbackDummy;
+    SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthboxSpriteCallbackDummy;
 }
 
 static void SafariHandleDrawPartyStatusSummary(void)
@@ -688,7 +688,7 @@ static void SafariHandleBattleAnimation(void)
     if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
         SafariBufferExecCompleted();
     else
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
 }
 
 static void SafariHandleLinkStandbyMsg(void)
@@ -708,7 +708,7 @@ static void SafariHandleCmd55(void)
     BeginFastPaletteFade(3);
     SafariBufferExecCompleted();
     if ((gBattleTypeFlags & BATTLE_TYPE_LINK) && !(gBattleTypeFlags & BATTLE_TYPE_WILD))
-        gBattlerFuncs[gActiveBattler] = sub_81595E4;
+        gBattlerControllerFuncs[gActiveBattler] = sub_81595E4;
 }
 
 static void nullsub_115(void)
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index d12a0a907..7f5108b9b 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -28,16 +28,16 @@
 #include "data2.h"
 #include "party_menu.h"
 
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gActiveBattler;
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gAbsentBattlerFlags;
 extern u8 gBattlersCount;
 extern bool8 gDoingBattleAnim;
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u8 gMultiUsePlayerCursor;
@@ -48,7 +48,7 @@ extern struct SpriteTemplate gUnknown_0202499C;
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gSpecialVar_ItemId;
 extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u8 gNumberOfMovesToChoose;
 extern u16 gBattle_BG0_X;
@@ -204,7 +204,7 @@ static void nullsub_117(void)
 
 void SetControllerToWally(void)
 {
-    gBattlerFuncs[gActiveBattler] = WallyBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = WallyBufferRunCommand;
     gBattleStruct->wallyBattleState = 0;
     gBattleStruct->wallyMovesState = 0;
     gBattleStruct->wallyWaitFrames = 0;
@@ -213,7 +213,7 @@ void SetControllerToWally(void)
 
 static void WallyBufferRunCommand(void)
 {
-    if (gBattleExecBuffer & gBitTable[gActiveBattler])
+    if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
     {
         if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sWallyBufferCommands))
             sWallyBufferCommands[gBattleBufferA[gActiveBattler][0]]();
@@ -233,7 +233,7 @@ static void WallyHandleActions(void)
         if (--gBattleStruct->wallyWaitFrames == 0)
         {
             PlaySE(SE_SELECT);
-            EmitTwoReturnValues(1, ACTION_USE_MOVE, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_USE_MOVE, 0);
             WallyBufferExecCompleted();
             gBattleStruct->wallyBattleState++;
             gBattleStruct->wallyMovesState = 0;
@@ -244,7 +244,7 @@ static void WallyHandleActions(void)
         if (--gBattleStruct->wallyWaitFrames == 0)
         {
             PlaySE(SE_SELECT);
-            EmitTwoReturnValues(1, ACTION_USE_MOVE, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_USE_MOVE, 0);
             WallyBufferExecCompleted();
             gBattleStruct->wallyBattleState++;
             gBattleStruct->wallyMovesState = 0;
@@ -254,7 +254,7 @@ static void WallyHandleActions(void)
     case 3:
         if (--gBattleStruct->wallyWaitFrames == 0)
         {
-            EmitTwoReturnValues(1, 9, 0);
+            BtlController_EmitTwoReturnValues(1, 9, 0);
             WallyBufferExecCompleted();
             gBattleStruct->wallyBattleState++;
             gBattleStruct->wallyMovesState = 0;
@@ -275,7 +275,7 @@ static void WallyHandleActions(void)
         if (--gBattleStruct->wallyWaitFrames == 0)
         {
             PlaySE(SE_SELECT);
-            EmitTwoReturnValues(1, ACTION_USE_ITEM, 0);
+            BtlController_EmitTwoReturnValues(1, ACTION_USE_ITEM, 0);
             WallyBufferExecCompleted();
         }
         break;
@@ -284,7 +284,7 @@ static void WallyHandleActions(void)
 
 static void CompleteOnBankSpriteCallbackDummy(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         WallyBufferExecCompleted();
 }
 
@@ -304,7 +304,7 @@ static void OpenBagAfterPaletteFade(void)
 {
     if (!gPaletteFade.active)
     {
-        gBattlerFuncs[gActiveBattler] = CompleteOnChosenItem;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnChosenItem;
         nullsub_35();
         FreeAllWindowBuffers();
         DoWallyTutorialBagMenu();
@@ -315,7 +315,7 @@ static void CompleteOnChosenItem(void)
 {
     if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
     {
-        EmitOneReturnValue(1, gSpecialVar_ItemId);
+        BtlController_EmitOneReturnValue(1, gSpecialVar_ItemId);
         WallyBufferExecCompleted();
     }
 }
@@ -323,29 +323,29 @@ static void CompleteOnChosenItem(void)
 static void sub_816864C(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
-        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlePartyID[gActiveBattler]]);
+        sub_8172EF0(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]);
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
-        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]]);
+        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
 
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive
         && gSprites[gUnknown_03005D7C[gActiveBattler]].callback == SpriteCallbackDummy
-        && gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+        && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
             DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
-            UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlePartyID[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
             sub_8076918(gActiveBattler ^ BIT_FLANK);
-            SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler ^ BIT_FLANK]);
+            SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]);
         }
         DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler]]);
-        UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBattler], &gPlayerParty[gBattlePartyID[gActiveBattler]], HEALTHBOX_ALL);
+        UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
         sub_8076918(gActiveBattler);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
         gBattleSpritesDataPtr->animationData->field_9_x1 = 0;
-        gBattlerFuncs[gActiveBattler] = sub_8168818;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8168818;
     }
 
 }
@@ -354,7 +354,7 @@ static void sub_8168818(void)
 {
     bool32 r4 = FALSE;
 
-    if (gSprites[gHealthBoxesIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         r4 = TRUE;
 
     if (r4 && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
@@ -370,7 +370,7 @@ static void sub_8168818(void)
         FreeSpritePaletteByTag(0x27F9);
 
         CreateTask(c3_0802FDF4, 10);
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 
         WallyBufferExecCompleted();
     }
@@ -378,24 +378,24 @@ static void sub_8168818(void)
 
 static void CompleteOnHealthbarDone(void)
 {
-    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthBoxesIds[gActiveBattler], HEALTH_BAR, 0);
+    s16 hpValue = sub_8074AA0(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0);
 
-    SetHealthboxSpriteVisible(gHealthBoxesIds[gActiveBattler]);
+    SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
     if (hpValue != -1)
     {
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], hpValue, HP_CURRENT);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
     else
     {
-        HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+        HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
         WallyBufferExecCompleted();
     }
 }
 
 static void DoHitAnimBlinkSpriteEffect(void)
 {
-    u8 spriteId = gBankSpriteIds[gActiveBattler];
+    u8 spriteId = gBattlerSpriteIds[gActiveBattler];
 
     if (gSprites[spriteId].data[1] == 32)
     {
@@ -416,16 +416,16 @@ static void sub_8168A20(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         WallyBufferExecCompleted();
     }
 }
 
 static void CompleteOnBankSpriteCallbackDummy2(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
         WallyBufferExecCompleted();
 }
 
@@ -437,7 +437,7 @@ static void CompleteOnFinishedBattleAnimation(void)
 
 static void WallyBufferExecCompleted(void)
 {
-    gBattlerFuncs[gActiveBattler] = WallyBufferRunCommand;
+    gBattlerControllerFuncs[gActiveBattler] = WallyBufferRunCommand;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         u8 playerId = GetMultiplayerId();
@@ -447,7 +447,7 @@ static void WallyBufferExecCompleted(void)
     }
     else
     {
-        gBattleExecBuffer &= ~gBitTable[gActiveBattler];
+        gBattleControllerExecFlags &= ~gBitTable[gActiveBattler];
     }
 }
 
@@ -466,7 +466,7 @@ static void WallyHandleGetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        size += CopyWallyMonData(gBattlePartyID[gActiveBattler], monData);
+        size += CopyWallyMonData(gBattlerPartyIndexes[gActiveBattler], monData);
     }
     else
     {
@@ -478,7 +478,7 @@ static void WallyHandleGetMonData(void)
             monToCheck >>= 1;
         }
     }
-    EmitDataTransfer(1, size, monData);
+    BtlController_EmitDataTransfer(1, size, monData);
     WallyBufferExecCompleted();
 }
 
@@ -800,7 +800,7 @@ static void WallyHandleSetMonData(void)
 
     if (gBattleBufferA[gActiveBattler][2] == 0)
     {
-        SetWallyMonData(gBattlePartyID[gActiveBattler]);
+        SetWallyMonData(gBattlerPartyIndexes[gActiveBattler]);
     }
     else
     {
@@ -1030,7 +1030,7 @@ static void SetWallyMonData(u8 monId)
         break;
     }
 
-    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+    HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 }
 
 static void WallyHandleSetRawMonData(void)
@@ -1053,13 +1053,13 @@ static void WallyHandleReturnMonToBall(void)
     if (gBattleBufferA[gActiveBattler][1] == 0)
     {
         InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SWITCH_OUT_PLAYER_MON);
-        gBattlerFuncs[gActiveBattler] = sub_8168A20;
+        gBattlerControllerFuncs[gActiveBattler] = sub_8168A20;
     }
     else
     {
-        FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        DestroySprite(&gSprites[gBankSpriteIds[gActiveBattler]]);
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBattler]);
+        FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        DestroySprite(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[gActiveBattler]);
         WallyBufferExecCompleted();
     }
 }
@@ -1068,30 +1068,30 @@ static void WallyHandleDrawTrainerPic(void)
 {
     DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBattler);
     sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler));
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
                                                80,
                                                80 + 4 * (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords),
                                                30);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy;
 }
 
 static void WallyHandleTrainerSlide(void)
 {
     DecompressTrainerBackPic(BACK_PIC_WALLY, gActiveBattler);
     sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(gActiveBattler));
-    gBankSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
+    gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gUnknown_0202499C,
                                                80,
                                                80 + 4 * (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords),
                                                30);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -96;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_805D7AC;
-    gBattlerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_805D7AC;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
 }
 
 static void WallyHandleTrainerSlideBack(void)
@@ -1114,7 +1114,7 @@ static void WallyHandleSuccessBallThrowAnim(void)
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
     gDoingBattleAnim = TRUE;
     InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
-    gBattlerFuncs[gActiveBattler] = CompleteOnFinishedAnimation;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedAnimation;
 }
 
 static void WallyHandleBallThrowAnim(void)
@@ -1124,7 +1124,7 @@ static void WallyHandleBallThrowAnim(void)
     gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
     gDoingBattleAnim = TRUE;
     InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
-    gBattlerFuncs[gActiveBattler] = CompleteOnFinishedAnimation;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedAnimation;
 }
 
 static void WallyHandlePause(void)
@@ -1150,7 +1150,7 @@ static void WallyHandleMoveAnimation(void)
     else
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-        gBattlerFuncs[gActiveBattler] = WallyDoMoveAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = WallyDoMoveAnimation;
     }
 
 }
@@ -1209,7 +1209,7 @@ static void WallyHandlePrintString(void)
     stringId = (u16*)(&gBattleBufferA[gActiveBattler][2]);
     BufferStringBattle(*stringId);
     BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
-    gBattlerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
 }
 
 static void WallyHandlePrintSelectionString(void)
@@ -1226,7 +1226,7 @@ static void HandleChooseActionAfterDma3(void)
     {
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 160;
-        gBattlerFuncs[gActiveBattler] = WallyHandleActions;
+        gBattlerControllerFuncs[gActiveBattler] = WallyHandleActions;
     }
 }
 
@@ -1234,7 +1234,7 @@ static void WallyHandleChooseAction(void)
 {
     s32 i;
 
-    gBattlerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
+    gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
     BattleHandleAddTextPrinter(gText_BattleMenu, 2);
 
     for (i = 0; i < 4; i++)
@@ -1271,7 +1271,7 @@ static void WallyHandleChooseMove(void)
         if (--gBattleStruct->wallyMoveFrames == 0)
         {
             PlaySE(SE_SELECT);
-            EmitTwoReturnValues(1, 10, 0x100);
+            BtlController_EmitTwoReturnValues(1, 10, 0x100);
             WallyBufferExecCompleted();
         }
         break;
@@ -1281,7 +1281,7 @@ static void WallyHandleChooseMove(void)
 static void WallyHandleChooseItem(void)
 {
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-    gBattlerFuncs[gActiveBattler] = OpenBagAfterPaletteFade;
+    gBattlerControllerFuncs[gActiveBattler] = OpenBagAfterPaletteFade;
     gBankInMenu = gActiveBattler;
 }
 
@@ -1304,20 +1304,20 @@ static void WallyHandleHealthBarUpdate(void)
 
     if (hpVal != INSTANT_HP_BAR_DROP)
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
-        u32 curHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 curHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, curHP, hpVal);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, curHP, hpVal);
     }
     else
     {
-        u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_MAX_HP);
+        u32 maxHP = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MAX_HP);
 
-        SetBattleBarStruct(gActiveBattler, gHealthBoxesIds[gActiveBattler], maxHP, 0, hpVal);
-        UpdateHpTextInHealthbox(gHealthBoxesIds[gActiveBattler], 0, HP_CURRENT);
+        SetBattleBarStruct(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], maxHP, 0, hpVal);
+        UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], 0, HP_CURRENT);
     }
 
-    gBattlerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
+    gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
 }
 
 static void WallyHandleExpUpdate(void)
@@ -1402,16 +1402,16 @@ static void WallyHandleCmd40(void)
 
 static void WallyHandleHitAnimation(void)
 {
-    if (gSprites[gBankSpriteIds[gActiveBattler]].invisible == TRUE)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].invisible == TRUE)
     {
         WallyBufferExecCompleted();
     }
     else
     {
         gDoingBattleAnim = TRUE;
-        gSprites[gBankSpriteIds[gActiveBattler]].data[1] = 0;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
         DoHitAnimHealthboxEffect(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
+        gBattlerControllerFuncs[gActiveBattler] = DoHitAnimBlinkSpriteEffect;
     }
 }
 
@@ -1443,7 +1443,7 @@ static void WallyHandlePlayFanfareOrBGM(void)
 
 static void WallyHandleFaintingCry(void)
 {
-    u16 species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES);
+    u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
     PlayCry1(species, 25);
     WallyBufferExecCompleted();
@@ -1461,20 +1461,20 @@ static void WallyHandleIntroTrainerBallThrow(void)
     u8 paletteNum;
     u8 taskId;
 
-    oamt_add_pos2_onto_pos1(&gSprites[gBankSpriteIds[gActiveBattler]]);
+    oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
 
-    gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y;
-    gSprites[gBankSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
-    gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80A6EEC;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
-    StoreSpriteCallbackInData6(&gSprites[gBankSpriteIds[gActiveBattler]], sub_805CC00);
-    StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1);
+    StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_805CC00);
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F8);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[BACK_PIC_WALLY].data, 0x100 + paletteNum * 16, 32);
-    gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(sub_816AC04, 5);
     gTasks[taskId].data[0] = gActiveBattler;
@@ -1483,7 +1483,7 @@ static void WallyHandleIntroTrainerBallThrow(void)
         gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
-    gBattlerFuncs[gActiveBattler] = nullsub_21;
+    gBattlerControllerFuncs[gActiveBattler] = nullsub_21;
 }
 
 static void sub_816AA80(u8 bank)
@@ -1491,25 +1491,25 @@ static void sub_816AA80(u8 bank)
     u16 species;
 
     gBattleSpritesDataPtr->bankData[bank].transformSpecies = 0;
-    gBattlePartyID[bank] = gBattleBufferA[bank][1];
-    species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+    gBattlerPartyIndexes[bank] = gBattleBufferA[bank][1];
+    species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
     sub_806A068(species, GetBattlerPosition(bank));
-    gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
-                                        GetBankCoord(bank, 2),
-                                        GetBankSpriteDefault_Y(bank),
+    gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
+                                        GetBattlerSpriteCoord(bank, 2),
+                                        GetBattlerSpriteDefault_Y(bank),
                                         sub_80A82E4(bank));
 
-    gSprites[gUnknown_03005D7C[bank]].data[1] = gBankSpriteIds[bank];
+    gSprites[gUnknown_03005D7C[bank]].data[1] = gBattlerSpriteIds[bank];
     gSprites[gUnknown_03005D7C[bank]].data[2] = bank;
 
-    gSprites[gBankSpriteIds[bank]].data[0] = bank;
-    gSprites[gBankSpriteIds[bank]].data[2] = species;
-    gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+    gSprites[gBattlerSpriteIds[bank]].data[2] = species;
+    gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
 
-    StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
-    gSprites[gBankSpriteIds[bank]].invisible = TRUE;
-    gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
+    StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
+    gSprites[gBattlerSpriteIds[bank]].invisible = TRUE;
+    gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
     gSprites[gUnknown_03005D7C[bank]].data[0] = DoPokeballSendOutAnimation(0, POKEBALL_PLAYER_SENDOUT);
 }
 
@@ -1524,9 +1524,9 @@ static void sub_816AC04(u8 taskId)
         u8 savedActiveBank = gActiveBattler;
 
         gActiveBattler = gTasks[taskId].data[0];
-        gBattleBufferA[gActiveBattler][1] = gBattlePartyID[gActiveBattler];
+        gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_816AA80(gActiveBattler);
-        gBattlerFuncs[gActiveBattler] = sub_816864C;
+        gBattlerControllerFuncs[gActiveBattler] = sub_816864C;
         gActiveBattler = savedActiveBank;
         DestroyTask(taskId);
     }
@@ -1569,7 +1569,7 @@ static void WallyHandleBattleAnimation(void)
     if (TryHandleLaunchBattleTableAnimation(gActiveBattler, gActiveBattler, gActiveBattler, animationId, argument))
         WallyBufferExecCompleted();
     else
-        gBattlerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
+        gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedBattleAnimation;
 }
 
 static void WallyHandleLinkStandbyMsg(void)
@@ -1590,7 +1590,7 @@ static void WallyHandleCmd55(void)
     WallyBufferExecCompleted();
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_WILD) && gBattleTypeFlags & BATTLE_TYPE_LINK)
-        gBattlerFuncs[gActiveBattler] = sub_80587B0;
+        gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
 }
 
 static void nullsub_118(void)
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index aafc106aa..4d8b63c65 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -13,9 +13,9 @@
 #include "battle_message.h"
 
 extern u32 gBattleTypeFlags;
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern void (*gBattleMainFunc)(void);
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
@@ -24,15 +24,15 @@ extern u8 gActiveBattler;
 extern u8 gUnknown_0202428C;
 extern u32 gUnknown_02022FF4;
 extern u8 gUnknown_0203C7B4;
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBuffersTransferData[0x100];
 extern u8 gUnknown_02022D08;
 extern u8 gUnknown_02022D09;
 extern u8 gUnknown_02022D0A;
-extern u8 gBattleAttacker;
-extern u8 gBattleDefender;
+extern u8 gBattleMoveAttacker;
+extern u8 gBattleMoveTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gEffectBank;
 extern u16 gBattleWeather;
@@ -51,8 +51,8 @@ extern void sub_81B8D64(u8 bank, u8 arg1); // party_menu
 
 // this file's funcionts
 static void CreateTasksForSendRecvLinkBuffers(void);
-static void SetControllersVariablesInLinkBattle(void);
-static void SetControllersVariables(void);
+static void InitLinkBtlControllers(void);
+static void InitSinglePlayerBtlControllers(void);
 static void SetBattlePartyIds(void);
 static void Task_HandleSendLinkBuffersData(u8 taskId);
 static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId);
@@ -78,14 +78,14 @@ void SetUpBattleVarsAndBirchZigzagoon(void)
 
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
-        gBattlerFuncs[i] = nullsub_21;
+        gBattlerControllerFuncs[i] = nullsub_21;
         gBattlerPositions[i] = 0xFF;
         gActionSelectionCursor[i] = 0;
         gMoveSelectionCursor[i] = 0;
     }
 
     HandleLinkBattleSetup();
-    gBattleExecBuffer = 0;
+    gBattleControllerExecFlags = 0;
     ClearBattleAnimationVars();
     ClearBattleMonForms();
     BattleAI_HandleItemUseBeforeAISetup(0xF);
@@ -116,9 +116,9 @@ void sub_8032768(void)
         RecordedBattle_SaveParties();
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        SetControllersVariablesInLinkBattle();
+        InitLinkBtlControllers();
     else
-        SetControllersVariables();
+        InitSinglePlayerBtlControllers();
 
     SetBattlePartyIds();
 
@@ -135,7 +135,7 @@ void sub_8032768(void)
         *(gBattleStruct->field_204 + i) = 0;
 }
 
-static void SetControllersVariables(void)
+static void InitSinglePlayerBtlControllers(void)
 {
     s32 i;
 
@@ -145,30 +145,30 @@ static void SetControllersVariables(void)
 
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
         {
-            gBattlerFuncs[0] = SetControllerToRecordedPlayer;
+            gBattlerControllerFuncs[0] = SetControllerToRecordedPlayer;
             gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattlerFuncs[1] = SetControllerToOpponent;
+            gBattlerControllerFuncs[1] = SetControllerToOpponent;
             gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattlerFuncs[2] = SetControllerToPlayerPartner;
+            gBattlerControllerFuncs[2] = SetControllerToPlayerPartner;
             gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-            gBattlerFuncs[3] = SetControllerToOpponent;
+            gBattlerControllerFuncs[3] = SetControllerToOpponent;
             gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
         }
         else
         {
-            gBattlerFuncs[0] = SetControllerToPlayer;
+            gBattlerControllerFuncs[0] = SetControllerToPlayer;
             gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattlerFuncs[1] = SetControllerToOpponent;
+            gBattlerControllerFuncs[1] = SetControllerToOpponent;
             gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattlerFuncs[2] = SetControllerToPlayerPartner;
+            gBattlerControllerFuncs[2] = SetControllerToPlayerPartner;
             gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-            gBattlerFuncs[3] = SetControllerToOpponent;
+            gBattlerControllerFuncs[3] = SetControllerToOpponent;
             gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
         }
 
@@ -179,25 +179,25 @@ static void SetControllersVariables(void)
         sub_81B8D64(2, 1);
         sub_81B8D64(3, 1);
 
-        gBattlePartyID[0] = 0;
-        gBattlePartyID[1] = 0;
-        gBattlePartyID[2] = 3;
-        gBattlePartyID[3] = 3;
+        gBattlerPartyIndexes[0] = 0;
+        gBattlerPartyIndexes[1] = 0;
+        gBattlerPartyIndexes[2] = 3;
+        gBattlerPartyIndexes[3] = 3;
     }
     else if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
     {
         gBattleMainFunc = BeginBattleIntro;
 
         if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-            gBattlerFuncs[0] = SetControllerToSafari;
+            gBattlerControllerFuncs[0] = SetControllerToSafari;
         else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL)
-            gBattlerFuncs[0] = SetControllerToWally;
+            gBattlerControllerFuncs[0] = SetControllerToWally;
         else
-            gBattlerFuncs[0] = SetControllerToPlayer;
+            gBattlerControllerFuncs[0] = SetControllerToPlayer;
 
         gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-        gBattlerFuncs[1] = SetControllerToOpponent;
+        gBattlerControllerFuncs[1] = SetControllerToOpponent;
         gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
         gBattlersCount = 2;
@@ -210,20 +210,20 @@ static void SetControllersVariables(void)
                 {
                     gBattleMainFunc = BeginBattleIntro;
 
-                    gBattlerFuncs[0] = SetControllerToRecordedPlayer;
+                    gBattlerControllerFuncs[0] = SetControllerToRecordedPlayer;
                     gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-                    gBattlerFuncs[1] = SetControllerToRecordedOpponent;
+                    gBattlerControllerFuncs[1] = SetControllerToRecordedOpponent;
                     gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
                     gBattlersCount = 2;
                 }
                 else // see how the banks are switched
                 {
-                    gBattlerFuncs[1] = SetControllerToRecordedPlayer;
+                    gBattlerControllerFuncs[1] = SetControllerToRecordedPlayer;
                     gBattlerPositions[1] = B_POSITION_PLAYER_LEFT;
 
-                    gBattlerFuncs[0] = SetControllerToRecordedOpponent;
+                    gBattlerControllerFuncs[0] = SetControllerToRecordedOpponent;
                     gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT;
 
                     gBattlersCount = 2;
@@ -231,10 +231,10 @@ static void SetControllersVariables(void)
             }
             else
             {
-                gBattlerFuncs[0] = SetControllerToRecordedPlayer;
+                gBattlerControllerFuncs[0] = SetControllerToRecordedPlayer;
                 gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-                gBattlerFuncs[1] = SetControllerToOpponent;
+                gBattlerControllerFuncs[1] = SetControllerToOpponent;
                 gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
             }
         }
@@ -243,16 +243,16 @@ static void SetControllersVariables(void)
     {
         gBattleMainFunc = BeginBattleIntro;
 
-        gBattlerFuncs[0] = SetControllerToPlayer;
+        gBattlerControllerFuncs[0] = SetControllerToPlayer;
         gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-        gBattlerFuncs[1] = SetControllerToOpponent;
+        gBattlerControllerFuncs[1] = SetControllerToOpponent;
         gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-        gBattlerFuncs[2] = SetControllerToPlayer;
+        gBattlerControllerFuncs[2] = SetControllerToPlayer;
         gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-        gBattlerFuncs[3] = SetControllerToOpponent;
+        gBattlerControllerFuncs[3] = SetControllerToOpponent;
         gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
         gBattlersCount = 4;
@@ -263,16 +263,16 @@ static void SetControllersVariables(void)
             {
                 gBattleMainFunc = BeginBattleIntro;
 
-                gBattlerFuncs[0] = SetControllerToRecordedPlayer;
+                gBattlerControllerFuncs[0] = SetControllerToRecordedPlayer;
                 gBattlerPositions[0] = 0;
 
-                gBattlerFuncs[1] = SetControllerToOpponent;
+                gBattlerControllerFuncs[1] = SetControllerToOpponent;
                 gBattlerPositions[1] = 1;
 
-                gBattlerFuncs[2] = SetControllerToRecordedPlayer;
+                gBattlerControllerFuncs[2] = SetControllerToRecordedPlayer;
                 gBattlerPositions[2] = 2;
 
-                gBattlerFuncs[3] = SetControllerToOpponent;
+                gBattlerControllerFuncs[3] = SetControllerToOpponent;
                 gBattlerPositions[3] = 3;
 
                 gBattlersCount = 4;
@@ -282,10 +282,10 @@ static void SetControllersVariables(void)
                 sub_81B8D64(2, 1);
                 sub_81B8D64(3, 1);
 
-                gBattlePartyID[0] = 0;
-                gBattlePartyID[1] = 0;
-                gBattlePartyID[2] = 3;
-                gBattlePartyID[3] = 3;
+                gBattlerPartyIndexes[0] = 0;
+                gBattlerPartyIndexes[1] = 0;
+                gBattlerPartyIndexes[2] = 3;
+                gBattlerPartyIndexes[3] = 3;
             }
             else if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
             {
@@ -307,53 +307,53 @@ static void SetControllersVariables(void)
 
                     if (i == var)
                     {
-                        gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer;
+                        gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer;
                         switch (gLinkPlayers[i].lp_field_18)
                         {
                         case 0:
                         case 3:
                             gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
-                            gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
+                            gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
                             break;
                         case 1:
                         case 2:
                             gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
-                            gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
+                            gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
                             break;
                         }
                     }
                     else if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[var].lp_field_18 & 1))
                             || ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[var].lp_field_18 & 1)))
                     {
-                        gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer;
+                        gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer;
                         switch (gLinkPlayers[i].lp_field_18)
                         {
                         case 0:
                         case 3:
                             gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
-                            gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
+                            gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
                             break;
                         case 1:
                         case 2:
                             gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
-                            gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
+                            gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
                             break;
                         }
                     }
                     else
                     {
-                        gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedOpponent;
+                        gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedOpponent;
                         switch (gLinkPlayers[i].lp_field_18)
                         {
                         case 0:
                         case 3:
                             gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_LEFT;
-                            gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
+                            gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
                             break;
                         case 1:
                         case 2:
                             gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_RIGHT;
-                            gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
+                            gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
                             break;
                         }
                     }
@@ -361,51 +361,51 @@ static void SetControllersVariables(void)
             }
             else if (gBattleTypeFlags & BATTLE_TYPE_WILD)
             {
-                gBattlerFuncs[0] = SetControllerToRecordedPlayer;
+                gBattlerControllerFuncs[0] = SetControllerToRecordedPlayer;
                 gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-                gBattlerFuncs[2] = SetControllerToRecordedPlayer;
+                gBattlerControllerFuncs[2] = SetControllerToRecordedPlayer;
                 gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
                 if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
                 {
-                  gBattlerFuncs[1] = SetControllerToRecordedOpponent;
+                  gBattlerControllerFuncs[1] = SetControllerToRecordedOpponent;
                   gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-                  gBattlerFuncs[3] = SetControllerToRecordedOpponent;
+                  gBattlerControllerFuncs[3] = SetControllerToRecordedOpponent;
                   gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
                 }
                 else
                 {
-                  gBattlerFuncs[1] = SetControllerToOpponent;
+                  gBattlerControllerFuncs[1] = SetControllerToOpponent;
                   gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-                  gBattlerFuncs[3] = SetControllerToOpponent;
+                  gBattlerControllerFuncs[3] = SetControllerToOpponent;
                   gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
                 }
             }
             else
             {
-                gBattlerFuncs[1] = SetControllerToRecordedPlayer;
+                gBattlerControllerFuncs[1] = SetControllerToRecordedPlayer;
                 gBattlerPositions[1] = B_POSITION_PLAYER_LEFT;
 
-                gBattlerFuncs[3] = SetControllerToRecordedPlayer;
+                gBattlerControllerFuncs[3] = SetControllerToRecordedPlayer;
                 gBattlerPositions[3] = B_POSITION_PLAYER_RIGHT;
 
                 if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
                 {
-                    gBattlerFuncs[0] = SetControllerToRecordedOpponent;
+                    gBattlerControllerFuncs[0] = SetControllerToRecordedOpponent;
                     gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT;
 
-                    gBattlerFuncs[2] = SetControllerToRecordedOpponent;
+                    gBattlerControllerFuncs[2] = SetControllerToRecordedOpponent;
                     gBattlerPositions[2] = B_POSITION_OPPONENT_RIGHT;
                 }
                 else
                 {
-                    gBattlerFuncs[0] = SetControllerToOpponent;
+                    gBattlerControllerFuncs[0] = SetControllerToOpponent;
                     gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT;
 
-                    gBattlerFuncs[2] = SetControllerToOpponent;
+                    gBattlerControllerFuncs[2] = SetControllerToOpponent;
                     gBattlerPositions[2] = B_POSITION_OPPONENT_RIGHT;
                 }
             }
@@ -413,7 +413,7 @@ static void SetControllersVariables(void)
     }
 }
 
-static void SetControllersVariablesInLinkBattle(void)
+static void InitLinkBtlControllers(void)
 {
     s32 i;
     u8 multiplayerId;
@@ -424,20 +424,20 @@ static void SetControllersVariablesInLinkBattle(void)
         {
             gBattleMainFunc = BeginBattleIntro;
 
-            gBattlerFuncs[0] = SetControllerToPlayer;
+            gBattlerControllerFuncs[0] = SetControllerToPlayer;
             gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattlerFuncs[1] = SetControllerToLinkOpponent;
+            gBattlerControllerFuncs[1] = SetControllerToLinkOpponent;
             gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
             gBattlersCount = 2;
         }
         else
         {
-            gBattlerFuncs[1] = SetControllerToPlayer;
+            gBattlerControllerFuncs[1] = SetControllerToPlayer;
             gBattlerPositions[1] = B_POSITION_PLAYER_LEFT;
 
-            gBattlerFuncs[0] = SetControllerToLinkOpponent;
+            gBattlerControllerFuncs[0] = SetControllerToLinkOpponent;
             gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT;
 
             gBattlersCount = 2;
@@ -449,32 +449,32 @@ static void SetControllersVariablesInLinkBattle(void)
         {
             gBattleMainFunc = BeginBattleIntro;
 
-            gBattlerFuncs[0] = SetControllerToPlayer;
+            gBattlerControllerFuncs[0] = SetControllerToPlayer;
             gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattlerFuncs[1] = SetControllerToLinkOpponent;
+            gBattlerControllerFuncs[1] = SetControllerToLinkOpponent;
             gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattlerFuncs[2] = SetControllerToPlayer;
+            gBattlerControllerFuncs[2] = SetControllerToPlayer;
             gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-            gBattlerFuncs[3] = SetControllerToLinkOpponent;
+            gBattlerControllerFuncs[3] = SetControllerToLinkOpponent;
             gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
             gBattlersCount = 4;
         }
         else
         {
-            gBattlerFuncs[1] = SetControllerToPlayer;
+            gBattlerControllerFuncs[1] = SetControllerToPlayer;
             gBattlerPositions[1] = B_POSITION_PLAYER_LEFT;
 
-            gBattlerFuncs[0] = SetControllerToLinkOpponent;
+            gBattlerControllerFuncs[0] = SetControllerToLinkOpponent;
             gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT;
 
-            gBattlerFuncs[3] = SetControllerToPlayer;
+            gBattlerControllerFuncs[3] = SetControllerToPlayer;
             gBattlerPositions[3] = B_POSITION_PLAYER_RIGHT;
 
-            gBattlerFuncs[2] = SetControllerToLinkOpponent;
+            gBattlerControllerFuncs[2] = SetControllerToLinkOpponent;
             gBattlerPositions[2] = B_POSITION_OPPONENT_RIGHT;
 
             gBattlersCount = 4;
@@ -486,32 +486,32 @@ static void SetControllersVariablesInLinkBattle(void)
         {
             gBattleMainFunc = BeginBattleIntro;
 
-            gBattlerFuncs[0] = SetControllerToPlayer;
+            gBattlerControllerFuncs[0] = SetControllerToPlayer;
             gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattlerFuncs[1] = SetControllerToOpponent;
+            gBattlerControllerFuncs[1] = SetControllerToOpponent;
             gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattlerFuncs[2] = SetControllerToLinkPartner;
+            gBattlerControllerFuncs[2] = SetControllerToLinkPartner;
             gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-            gBattlerFuncs[3] = SetControllerToOpponent;
+            gBattlerControllerFuncs[3] = SetControllerToOpponent;
             gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
             gBattlersCount = 4;
         }
         else
         {
-            gBattlerFuncs[0] = SetControllerToLinkPartner;
+            gBattlerControllerFuncs[0] = SetControllerToLinkPartner;
             gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
 
-            gBattlerFuncs[1] = SetControllerToLinkOpponent;
+            gBattlerControllerFuncs[1] = SetControllerToLinkOpponent;
             gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
 
-            gBattlerFuncs[2] = SetControllerToPlayer;
+            gBattlerControllerFuncs[2] = SetControllerToPlayer;
             gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
 
-            gBattlerFuncs[3] = SetControllerToLinkOpponent;
+            gBattlerControllerFuncs[3] = SetControllerToLinkOpponent;
             gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
 
             gBattlersCount = 4;
@@ -521,10 +521,10 @@ static void SetControllersVariablesInLinkBattle(void)
         sub_81B8D64(1, 0);
         sub_81B8D64(2, 1);
         sub_81B8D64(3, 1);
-        gBattlePartyID[0] = 0;
-        gBattlePartyID[1] = 0;
-        gBattlePartyID[2] = 3;
-        gBattlePartyID[3] = 3;
+        gBattlerPartyIndexes[0] = 0;
+        gBattlerPartyIndexes[1] = 0;
+        gBattlerPartyIndexes[2] = 3;
+        gBattlerPartyIndexes[3] = 3;
     }
     else
     {
@@ -549,18 +549,18 @@ static void SetControllersVariablesInLinkBattle(void)
 
             if (i == multiplayerId)
             {
-                gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToPlayer;
+                gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToPlayer;
                 switch (gLinkPlayers[i].lp_field_18)
                 {
                 case 0:
                 case 3:
                     gBattlerPositions[gLinkPlayers[i].lp_field_18] = 0;
-                    gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
+                    gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
                     break;
                 case 1:
                 case 2:
                     gBattlerPositions[gLinkPlayers[i].lp_field_18] = 2;
-                    gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
+                    gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
                     break;
                 }
             }
@@ -569,35 +569,35 @@ static void SetControllersVariablesInLinkBattle(void)
                 if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[multiplayerId].lp_field_18 & 1))
                  || ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[multiplayerId].lp_field_18 & 1)))
                 {
-                    gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToLinkPartner;
+                    gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToLinkPartner;
                     switch (gLinkPlayers[i].lp_field_18)
                     {
                     case 0:
                     case 3:
                         gBattlerPositions[gLinkPlayers[i].lp_field_18] = 0;
-                        gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
+                        gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
                         break;
                     case 1:
                     case 2:
                         gBattlerPositions[gLinkPlayers[i].lp_field_18] = 2;
-                        gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
+                        gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
                         break;
                     }
                 }
                 else
                 {
-                    gBattlerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToLinkOpponent;
+                    gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToLinkOpponent;
                     switch (gLinkPlayers[i].lp_field_18)
                     {
                     case 0:
                     case 3:
                         gBattlerPositions[gLinkPlayers[i].lp_field_18] = 1;
-                        gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
+                        gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
                         break;
                     case 1:
                     case 2:
                         gBattlerPositions[gLinkPlayers[i].lp_field_18] = 3;
-                        gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
+                        gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
                         break;
                     }
                 }
@@ -627,7 +627,7 @@ static void SetBattlePartyIds(void)
                          && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES2) != SPECIES_EGG
                          && GetMonData(&gPlayerParty[j], MON_DATA_IS_EGG) == 0)
                         {
-                            gBattlePartyID[i] = j;
+                            gBattlerPartyIndexes[i] = j;
                             break;
                         }
                     }
@@ -638,7 +638,7 @@ static void SetBattlePartyIds(void)
                          && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != SPECIES_EGG
                          && GetMonData(&gEnemyParty[j], MON_DATA_IS_EGG) == 0)
                         {
-                            gBattlePartyID[i] = j;
+                            gBattlerPartyIndexes[i] = j;
                             break;
                         }
                     }
@@ -651,9 +651,9 @@ static void SetBattlePartyIds(void)
                          && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES) != SPECIES_NONE  // Probably a typo by Game Freak. The rest use SPECIES2.
                          && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES2) != SPECIES_EGG
                          && GetMonData(&gPlayerParty[j], MON_DATA_IS_EGG) == 0
-                         && gBattlePartyID[i - 2] != j)
+                         && gBattlerPartyIndexes[i - 2] != j)
                         {
-                            gBattlePartyID[i] = j;
+                            gBattlerPartyIndexes[i] = j;
                             break;
                         }
                     }
@@ -663,9 +663,9 @@ static void SetBattlePartyIds(void)
                          && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != SPECIES_NONE
                          && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != SPECIES_EGG
                          && GetMonData(&gEnemyParty[j], MON_DATA_IS_EGG) == 0
-                         && gBattlePartyID[i - 2] != j)
+                         && gBattlerPartyIndexes[i - 2] != j)
                         {
-                            gBattlePartyID[i] = j;
+                            gBattlerPartyIndexes[i] = j;
                             break;
                         }
                     }
@@ -674,7 +674,7 @@ static void SetBattlePartyIds(void)
         }
 
         if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
-            gBattlePartyID[1] = 0, gBattlePartyID[3] = 3;
+            gBattlerPartyIndexes[1] = 0, gBattlerPartyIndexes[3] = 3;
     }
 }
 
@@ -752,8 +752,8 @@ void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data)
     }
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_BUFFER_ID] = bufferId;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BANK] = gActiveBattler;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBattleAttacker;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBattleDefender;
+    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBattleMoveAttacker;
+    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBattleMoveTarget;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_LO] = alignedSize;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BANK_FLAGS] = gAbsentBattlerFlags;
@@ -912,7 +912,7 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
         switch (gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 0])
         {
         case 0:
-            if (gBattleExecBuffer & gBitTable[bank])
+            if (gBattleControllerExecFlags & gBitTable[bank])
                 return;
 
             memcpy(gBattleBufferA[bank], &gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 8], blockSize);
@@ -920,8 +920,8 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
 
             if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
             {
-                gBattleAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 2];
-                gBattleDefender = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
+                gBattleMoveAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 2];
+                gBattleMoveTarget = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
                 gAbsentBattlerFlags = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 6];
                 gEffectBank = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 7];
             }
@@ -931,7 +931,7 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
             break;
         case 2:
             var = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + LINK_BUFF_DATA];
-            gBattleExecBuffer &= ~(gBitTable[bank] << (var * 4));
+            gBattleControllerExecFlags &= ~(gBitTable[bank] << (var * 4));
             break;
         }
 
@@ -939,7 +939,7 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
     }
 }
 
-void EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck)
+void BtlController_EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_GETMONDATA;
     gBattleBuffersTransferData[1] = requestId;
@@ -948,7 +948,7 @@ void EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes)
+void BtlController_EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_GETRAWMONDATA;
     gBattleBuffersTransferData[1] = monId;
@@ -957,7 +957,7 @@ void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data)
+void BtlController_EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data)
 {
     s32 i;
 
@@ -969,7 +969,7 @@ void EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *da
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 3 + bytes);
 }
 
-void EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data)
+void BtlController_EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data)
 {
     s32 i;
 
@@ -981,7 +981,7 @@ void EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, bytes + 3);
 }
 
-void EmitLoadMonSprite(u8 bufferId)
+void BtlController_EmitLoadMonSprite(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_LOADMONSPRITE;
     gBattleBuffersTransferData[1] = CONTROLLER_LOADMONSPRITE;
@@ -990,7 +990,7 @@ void EmitLoadMonSprite(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit)
+void BtlController_EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_SWITCHINANIM;
     gBattleBuffersTransferData[1] = partyId;
@@ -999,14 +999,14 @@ void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitReturnMonToBall(u8 bufferId, u8 arg1)
+void BtlController_EmitReturnMonToBall(u8 bufferId, u8 arg1)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_RETURNMONTOBALL;
     gBattleBuffersTransferData[1] = arg1;
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 2);
 }
 
-void EmitDrawTrainerPic(u8 bufferId)
+void BtlController_EmitDrawTrainerPic(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_DRAWTRAINERPIC;
     gBattleBuffersTransferData[1] = CONTROLLER_DRAWTRAINERPIC;
@@ -1015,7 +1015,7 @@ void EmitDrawTrainerPic(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitTrainerSlide(u8 bufferId)
+void BtlController_EmitTrainerSlide(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_TRAINERSLIDE;
     gBattleBuffersTransferData[1] = CONTROLLER_TRAINERSLIDE;
@@ -1024,7 +1024,7 @@ void EmitTrainerSlide(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitTrainerSlideBack(u8 bufferId)
+void BtlController_EmitTrainerSlideBack(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_TRAINERSLIDEBACK;
     gBattleBuffersTransferData[1] = CONTROLLER_TRAINERSLIDEBACK;
@@ -1033,7 +1033,7 @@ void EmitTrainerSlideBack(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitFaintAnimation(u8 bufferId)
+void BtlController_EmitFaintAnimation(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_FAINTANIMATION;
     gBattleBuffersTransferData[1] = CONTROLLER_FAINTANIMATION;
@@ -1042,7 +1042,7 @@ void EmitFaintAnimation(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitPaletteFade(u8 bufferId)
+void BtlController_EmitPaletteFade(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_PALETTEFADE;
     gBattleBuffersTransferData[1] = CONTROLLER_PALETTEFADE;
@@ -1051,7 +1051,7 @@ void EmitPaletteFade(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitSuccessBallThrowAnim(u8 bufferId)
+void BtlController_EmitSuccessBallThrowAnim(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_SUCCESSBALLTHROWANIM;
     gBattleBuffersTransferData[1] = CONTROLLER_SUCCESSBALLTHROWANIM;
@@ -1060,14 +1060,14 @@ void EmitSuccessBallThrowAnim(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitBallThrowAnim(u8 bufferId, u8 caseId)
+void BtlController_EmitBallThrowAnim(u8 bufferId, u8 caseId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_BALLTHROWANIM;
     gBattleBuffersTransferData[1] = caseId;
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 2);
 }
 
-void EmitPause(u8 bufferId, u8 toWait, void *data)
+void BtlController_EmitPause(u8 bufferId, u8 toWait, void *data)
 {
     s32 i;
 
@@ -1078,7 +1078,7 @@ void EmitPause(u8 bufferId, u8 toWait, void *data)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, toWait * 3 + 2);
 }
 
-void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct *disableStructPtr, u8 multihit)
+void BtlController_EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct *disableStructPtr, u8 multihit)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_MOVEANIMATION;
     gBattleBuffersTransferData[1] = move;
@@ -1108,7 +1108,7 @@ void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 16 + sizeof(struct DisableStruct));
 }
 
-void EmitPrintString(u8 bufferId, u16 stringID)
+void BtlController_EmitPrintString(u8 bufferId, u16 stringID)
 {
     s32 i;
     struct StringInfoBattle* stringInfo;
@@ -1140,7 +1140,7 @@ void EmitPrintString(u8 bufferId, u16 stringID)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, sizeof(struct StringInfoBattle) + 4);
 }
 
-void EmitPrintSelectionString(u8 bufferId, u16 stringID)
+void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringID)
 {
     s32 i;
     struct StringInfoBattle *stringInfo;
@@ -1169,7 +1169,7 @@ void EmitPrintSelectionString(u8 bufferId, u16 stringID)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, sizeof(struct StringInfoBattle) + 4);
 }
 
-void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2)
+void BtlController_EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_CHOOSEACTION;
     gBattleBuffersTransferData[1] = arg1;
@@ -1178,7 +1178,7 @@ void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitUnknownYesNoBox(u8 bufferId)
+void BtlController_EmitUnknownYesNoBox(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_UNKNOWNYESNOBOX;
     gBattleBuffersTransferData[1] = CONTROLLER_UNKNOWNYESNOBOX;
@@ -1187,7 +1187,7 @@ void EmitUnknownYesNoBox(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData)
+void BtlController_EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData)
 {
     s32 i;
 
@@ -1200,7 +1200,7 @@ void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, sizeof(*movePpData) + 4);
 }
 
-void EmitChooseItem(u8 bufferId, u8 *arg1)
+void BtlController_EmitChooseItem(u8 bufferId, u8 *arg1)
 {
     s32 i;
 
@@ -1210,7 +1210,7 @@ void EmitChooseItem(u8 bufferId, u8 *arg1)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4)
+void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4)
 {
     s32 i;
 
@@ -1223,7 +1223,7 @@ void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 8);  // but only 7 bytes were written
 }
 
-void EmitCmd23(u8 bufferId)
+void BtlController_EmitCmd23(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_23;
     gBattleBuffersTransferData[1] = CONTROLLER_23;
@@ -1233,7 +1233,7 @@ void EmitCmd23(u8 bufferId)
 }
 
 // why is the argument u16 if it's being cast to s16 anyway?
-void EmitHealthBarUpdate(u8 bufferId, u16 hpValue)
+void BtlController_EmitHealthBarUpdate(u8 bufferId, u16 hpValue)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_HEALTHBARUPDATE;
     gBattleBuffersTransferData[1] = 0;
@@ -1243,7 +1243,7 @@ void EmitHealthBarUpdate(u8 bufferId, u16 hpValue)
 }
 
 // why is the argument u16 if it's being cast to s16 anyway?
-void EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints)
+void BtlController_EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_EXPUPDATE;
     gBattleBuffersTransferData[1] = partyId;
@@ -1252,7 +1252,7 @@ void EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2)
+void BtlController_EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_STATUSICONUPDATE;
     gBattleBuffersTransferData[1] = status1;
@@ -1266,7 +1266,7 @@ void EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 9);
 }
 
-void EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status)
+void BtlController_EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_STATUSANIMATION;
     gBattleBuffersTransferData[1] = status2;
@@ -1277,14 +1277,14 @@ void EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 6);
 }
 
-void EmitStatusXor(u8 bufferId, u8 b)
+void BtlController_EmitStatusXor(u8 bufferId, u8 b)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_STATUSXOR;
     gBattleBuffersTransferData[1] = b;
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 2);
 }
 
-void EmitDataTransfer(u8 bufferId, u16 size, void *data)
+void BtlController_EmitDataTransfer(u8 bufferId, u16 size, void *data)
 {
     s32 i;
 
@@ -1297,7 +1297,7 @@ void EmitDataTransfer(u8 bufferId, u16 size, void *data)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, size + 4);
 }
 
-void EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, void *data)
+void BtlController_EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, void *data)
 {
     s32 i;
 
@@ -1313,7 +1313,7 @@ void EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, void *data)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, size + 7);
 }
 
-void EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataParameter)
+void BtlController_EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataParameter)
 {
     s32 i;
 
@@ -1325,7 +1325,7 @@ void EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataParameter)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, songId + 3);
 }
 
-void EmitCmd32(u8 bufferId, u16 size, void *data)
+void BtlController_EmitCmd32(u8 bufferId, u16 size, void *data)
 {
     s32 i;
 
@@ -1337,7 +1337,7 @@ void EmitCmd32(u8 bufferId, u16 size, void *data)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, size + 3);
 }
 
-void EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2)
+void BtlController_EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_TWORETURNVALUES;
     gBattleBuffersTransferData[1] = arg1;
@@ -1346,7 +1346,7 @@ void EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c)
+void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c)
 {
     s32 i;
 
@@ -1357,7 +1357,7 @@ void EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 5);
 }
 
-void EmitOneReturnValue(u8 bufferId, u16 arg1)
+void BtlController_EmitOneReturnValue(u8 bufferId, u16 arg1)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_ONERETURNVALUE;
     gBattleBuffersTransferData[1] = arg1;
@@ -1366,7 +1366,7 @@ void EmitOneReturnValue(u8 bufferId, u16 arg1)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitOneReturnValue_Duplicate(u8 bufferId, u16 b)
+void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 b)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_ONERETURNVALUE_DUPLICATE;
     gBattleBuffersTransferData[1] = b;
@@ -1375,7 +1375,7 @@ void EmitOneReturnValue_Duplicate(u8 bufferId, u16 b)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitCmd37(u8 bufferId)
+void BtlController_EmitCmd37(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_37;
     gBattleBuffersTransferData[1] = CONTROLLER_37;
@@ -1384,14 +1384,14 @@ void EmitCmd37(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitCmd38(u8 bufferId, u8 b)
+void BtlController_EmitCmd38(u8 bufferId, u8 b)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_38;
     gBattleBuffersTransferData[1] = b;
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 2);
 }
 
-void EmitCmd39(u8 bufferId)
+void BtlController_EmitCmd39(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_39;
     gBattleBuffersTransferData[1] = CONTROLLER_39;
@@ -1400,7 +1400,7 @@ void EmitCmd39(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitCmd40(u8 bufferId)
+void BtlController_EmitCmd40(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_40;
     gBattleBuffersTransferData[1] = CONTROLLER_40;
@@ -1409,7 +1409,7 @@ void EmitCmd40(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitHitAnimation(u8 bufferId)
+void BtlController_EmitHitAnimation(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_HITANIMATION;
     gBattleBuffersTransferData[1] = CONTROLLER_HITANIMATION;
@@ -1418,7 +1418,7 @@ void EmitHitAnimation(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitCmd42(u8 bufferId)
+void BtlController_EmitCmd42(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_42;
     gBattleBuffersTransferData[1] = CONTROLLER_42;
@@ -1427,7 +1427,7 @@ void EmitCmd42(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitPlaySE(u8 bufferId, u16 songId)
+void BtlController_EmitPlaySE(u8 bufferId, u16 songId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_EFFECTIVENESSSOUND;
     gBattleBuffersTransferData[1] = songId;
@@ -1436,7 +1436,7 @@ void EmitPlaySE(u8 bufferId, u16 songId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitPlayFanfareOrBGM(u8 bufferId, u16 songId, bool8 playBGM)
+void BtlController_EmitPlayFanfareOrBGM(u8 bufferId, u16 songId, bool8 playBGM)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_PLAYFANFAREORBGM;
     gBattleBuffersTransferData[1] = songId;
@@ -1445,7 +1445,7 @@ void EmitPlayFanfareOrBGM(u8 bufferId, u16 songId, bool8 playBGM)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitFaintingCry(u8 bufferId)
+void BtlController_EmitFaintingCry(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_FAINTINGCRY;
     gBattleBuffersTransferData[1] = CONTROLLER_FAINTINGCRY;
@@ -1454,14 +1454,14 @@ void EmitFaintingCry(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitIntroSlide(u8 bufferId, u8 terrainId)
+void BtlController_EmitIntroSlide(u8 bufferId, u8 terrainId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_INTROSLIDE;
     gBattleBuffersTransferData[1] = terrainId;
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 2);
 }
 
-void EmitIntroTrainerBallThrow(u8 bufferId)
+void BtlController_EmitIntroTrainerBallThrow(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_INTROTRAINERBALLTHROW;
     gBattleBuffersTransferData[1] = CONTROLLER_INTROTRAINERBALLTHROW;
@@ -1470,7 +1470,7 @@ void EmitIntroTrainerBallThrow(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2)
+void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2)
 {
     s32 i;
 
@@ -1483,7 +1483,7 @@ void EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, sizeof(struct HpAndStatus) * 6 + 4);
 }
 
-void EmitCmd49(u8 bufferId)
+void BtlController_EmitCmd49(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_49;
     gBattleBuffersTransferData[1] = CONTROLLER_49;
@@ -1492,7 +1492,7 @@ void EmitCmd49(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitCmd50(u8 bufferId)
+void BtlController_EmitCmd50(u8 bufferId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_50;
     gBattleBuffersTransferData[1] = CONTROLLER_50;
@@ -1501,7 +1501,7 @@ void EmitCmd50(u8 bufferId)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible)
+void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_SPRITEINVISIBILITY;
     gBattleBuffersTransferData[1] = isInvisible;
@@ -1510,7 +1510,7 @@ void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument)
+void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_BATTLEANIMATION;
     gBattleBuffersTransferData[1] = animationId;
@@ -1519,7 +1519,7 @@ void EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }
 
-void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2)
+void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2)
 {
     bool8 arg2_ = arg2;
     gBattleBuffersTransferData[0] = CONTROLLER_LINKSTANDBYMSG;
@@ -1533,14 +1533,14 @@ void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2)
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, gBattleBuffersTransferData[2] + 4);
 }
 
-void EmitResetActionMoveSelection(u8 bufferId, u8 caseId)
+void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_RESETACTIONMOVESELECTION;
     gBattleBuffersTransferData[1] = caseId;
     PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 2);
 }
 
-void EmitCmd55(u8 bufferId, u8 arg1)
+void BtlController_EmitCmd55(u8 bufferId, u8 arg1)
 {
     gBattleBuffersTransferData[0] = CONTROLLER_55;
     gBattleBuffersTransferData[1] = arg1;
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index a6b6f7a09..d7806aee0 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -27,11 +27,11 @@ extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gActiveBattler;
 extern u8 gBattlersCount;
 extern u16 gUnknown_020243FC;
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
@@ -439,15 +439,15 @@ bool8 TryHandleLaunchBattleTableAnimation(u8 activeBank, u8 atkBank, u8 defBank,
     }
     if (gBattleSpritesDataPtr->bankData[activeBank].behindSubstitute
         && tableId == B_ANIM_SUBSTITUTE_FADE
-        && gSprites[gBankSpriteIds[activeBank]].invisible)
+        && gSprites[gBattlerSpriteIds[activeBank]].invisible)
     {
-        LoadBattleMonGfxAndAnimate(activeBank, TRUE, gBankSpriteIds[activeBank]);
+        LoadBattleMonGfxAndAnimate(activeBank, TRUE, gBattlerSpriteIds[activeBank]);
         ClearBehindSubstituteBit(activeBank);
         return TRUE;
     }
 
-    gAnimBankAttacker = atkBank;
-    gAnimBankTarget = defBank;
+    gBattleAnimAttacker = atkBank;
+    gBattleAnimTarget = defBank;
     gBattleSpritesDataPtr->animationData->animArg = argument;
     LaunchBattleAnimation(gBattleAnims_VariousTable, tableId, FALSE);
     taskId = CreateTask(Task_ClearBitWhenBattleTableAnimDone, 10);
@@ -491,8 +491,8 @@ void InitAndLaunchSpecialAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tab
 {
     u8 taskId;
 
-    gAnimBankAttacker = atkBank;
-    gAnimBankTarget = defBank;
+    gBattleAnimAttacker = atkBank;
+    gBattleAnimTarget = defBank;
     LaunchBattleAnimation(gBattleAnims_Special, tableId, FALSE);
     taskId = CreateTask(Task_ClearBitWhenSpecialAnimDone, 10);
     gTasks[taskId].tBank = activeBank;
@@ -802,9 +802,9 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
         break;
     case 3:
         if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) && *bank == 0)
-            gHealthBoxesIds[*bank] = CreateSafariPlayerHealthboxSprites();
+            gHealthboxSpriteIds[*bank] = CreateSafariPlayerHealthboxSprites();
         else
-            gHealthBoxesIds[*bank] = CreateBankHealthboxSprites(*bank);
+            gHealthboxSpriteIds[*bank] = CreateHealthboxSprites(*bank);
 
         (*bank)++;
         if (*bank == gBattlersCount)
@@ -814,11 +814,11 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
         }
         break;
     case 4:
-        SetBankHealthboxSpritePos(*bank);
+        InitBattlerHealthboxCoords(*bank);
         if (gBattlerPositions[*bank] <= 1)
-            DummyBattleInterfaceFunc(gHealthBoxesIds[*bank], FALSE);
+            DummyBattleInterfaceFunc(gHealthboxSpriteIds[*bank], FALSE);
         else
-            DummyBattleInterfaceFunc(gHealthBoxesIds[*bank], TRUE);
+            DummyBattleInterfaceFunc(gHealthboxSpriteIds[*bank], TRUE);
 
         (*bank)++;
         if (*bank == gBattlersCount)
@@ -831,13 +831,13 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
         if (GetBattlerSide(*bank) == B_SIDE_PLAYER)
         {
             if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
-                UpdateHealthboxAttribute(gHealthBoxesIds[*bank], &gPlayerParty[gBattlePartyID[*bank]], HEALTHBOX_ALL);
+                UpdateHealthboxAttribute(gHealthboxSpriteIds[*bank], &gPlayerParty[gBattlerPartyIndexes[*bank]], HEALTHBOX_ALL);
         }
         else
         {
-            UpdateHealthboxAttribute(gHealthBoxesIds[*bank], &gEnemyParty[gBattlePartyID[*bank]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[*bank], &gEnemyParty[gBattlerPartyIndexes[*bank]], HEALTHBOX_ALL);
         }
-        SetHealthboxSpriteInvisible(gHealthBoxesIds[*bank]);
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[*bank]);
         (*bank)++;
         if (*bank == gBattlersCount)
         {
@@ -872,12 +872,12 @@ void CopyAllBattleSpritesInvisibilities(void)
     s32 i;
 
     for (i = 0; i < gBattlersCount; i++)
-        gBattleSpritesDataPtr->bankData[i].invisible = gSprites[gBankSpriteIds[i]].invisible;
+        gBattleSpritesDataPtr->bankData[i].invisible = gSprites[gBattlerSpriteIds[i]].invisible;
 }
 
 void CopyBattleSpriteInvisibility(u8 bank)
 {
-    gBattleSpritesDataPtr->bankData[bank].invisible = gSprites[gBankSpriteIds[bank]].invisible;
+    gBattleSpritesDataPtr->bankData[bank].invisible = gSprites[gBattlerSpriteIds[bank]].invisible;
 }
 
 void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
@@ -890,7 +890,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
 
     if (notTransform)
     {
-        StartSpriteAnim(&gSprites[gBankSpriteIds[bankAtk]], gBattleSpritesDataPtr->animationData->animArg);
+        StartSpriteAnim(&gSprites[gBattlerSpriteIds[bankAtk]], gBattleSpritesDataPtr->animationData->animArg);
         paletteOffset = 0x100 + bankAtk * 16;
         LoadPalette(gBattleStruct->castformPalette[gBattleSpritesDataPtr->animationData->animArg], paletteOffset, 32);
         gBattleMonForms[bankAtk] = gBattleSpritesDataPtr->animationData->animArg;
@@ -899,7 +899,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
             BlendPalette(paletteOffset, 16, 6, 0x7FFF);
             CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
         }
-        gSprites[gBankSpriteIds[bankAtk]].pos1.y = GetBankSpriteDefault_Y(bankAtk);
+        gSprites[gBattlerSpriteIds[bankAtk]].pos1.y = GetBattlerSpriteDefault_Y(bankAtk);
     }
     else
     {
@@ -924,14 +924,14 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
             position = GetBattlerPosition(bankAtk);
 
             if (GetBattlerSide(bankDef) == B_SIDE_OPPONENT)
-                targetSpecies = GetMonData(&gEnemyParty[gBattlePartyID[bankDef]], MON_DATA_SPECIES);
+                targetSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bankDef]], MON_DATA_SPECIES);
             else
-                targetSpecies = GetMonData(&gPlayerParty[gBattlePartyID[bankDef]], MON_DATA_SPECIES);
+                targetSpecies = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bankDef]], MON_DATA_SPECIES);
 
             if (GetBattlerSide(bankAtk) == B_SIDE_PLAYER)
             {
-                personalityValue = GetMonData(&gPlayerParty[gBattlePartyID[bankAtk]], MON_DATA_PERSONALITY);
-                otId = GetMonData(&gPlayerParty[gBattlePartyID[bankAtk]], MON_DATA_OT_ID);
+                personalityValue = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_PERSONALITY);
+                otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_OT_ID);
 
                 HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[targetSpecies],
                                                           gMonSpritesGfxPtr->sprites[position],
@@ -940,8 +940,8 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
             }
             else
             {
-                personalityValue = GetMonData(&gEnemyParty[gBattlePartyID[bankAtk]], MON_DATA_PERSONALITY);
-                otId = GetMonData(&gEnemyParty[gBattlePartyID[bankAtk]], MON_DATA_OT_ID);
+                personalityValue = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_PERSONALITY);
+                otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bankAtk]], MON_DATA_OT_ID);
 
                 HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[targetSpecies],
                                                           gMonSpritesGfxPtr->sprites[position],
@@ -951,7 +951,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
         }
 
         src = gMonSpritesGfxPtr->sprites[position];
-        dst = (void *)(VRAM + 0x10000 + gSprites[gBankSpriteIds[bankAtk]].oam.tileNum * 32);
+        dst = (void *)(VRAM + 0x10000 + gSprites[gBattlerSpriteIds[bankAtk]].oam.tileNum * 32);
         DmaCopy32(3, src, dst, 0x800);
         paletteOffset = 0x100 + bankAtk * 16;
         lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue);
@@ -960,7 +960,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
 
         if (targetSpecies == SPECIES_CASTFORM)
         {
-            gSprites[gBankSpriteIds[bankAtk]].anims = gMonAnimationsSpriteAnimsPtrTable[targetSpecies];
+            gSprites[gBattlerSpriteIds[bankAtk]].anims = gMonAnimationsSpriteAnimsPtrTable[targetSpecies];
             LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]);
             LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[bankDef] * 16, paletteOffset, 32);
         }
@@ -974,8 +974,8 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
             gBattleMonForms[bankAtk] = gBattleMonForms[bankDef];
         }
 
-        gSprites[gBankSpriteIds[bankAtk]].pos1.y = GetBankSpriteDefault_Y(bankAtk);
-        StartSpriteAnim(&gSprites[gBankSpriteIds[bankAtk]], gBattleMonForms[bankAtk]);
+        gSprites[gBattlerSpriteIds[bankAtk]].pos1.y = GetBattlerSpriteDefault_Y(bankAtk);
+        StartSpriteAnim(&gSprites[gBattlerSpriteIds[bankAtk]], gBattleMonForms[bankAtk]);
     }
 }
 
@@ -1019,9 +1019,9 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
         if (!IsContest())
         {
             if (GetBattlerSide(bank) != B_SIDE_PLAYER)
-                BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
+                BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[bank]], bank);
             else
-                BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[bank]], bank);
+                BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[bank]], bank);
         }
     }
 }
@@ -1034,7 +1034,7 @@ void LoadBattleMonGfxAndAnimate(u8 bank, bool8 loadMonSprite, u8 spriteId)
     if (!loadMonSprite)
         gSprites[spriteId].pos1.y = GetSubstituteSpriteDefault_Y(bank);
     else
-        gSprites[spriteId].pos1.y = GetBankSpriteDefault_Y(bank);
+        gSprites[spriteId].pos1.y = GetBattlerSpriteDefault_Y(bank);
 }
 
 void TrySetBehindSubstituteSpriteBit(u8 bank, u16 move)
@@ -1103,8 +1103,8 @@ void sub_805EAE8(void)
     {
         u8 playerBank1 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         u8 playerBank2 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
-        u8 bank1PartyId = pokemon_order_func(gBattlePartyID[playerBank1]);
-        u8 bank2PartyId = pokemon_order_func(gBattlePartyID[playerBank2]);
+        u8 bank1PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBank1]);
+        u8 bank2PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBank2]);
 
         if (GetMonData(&gPlayerParty[bank1PartyId], MON_DATA_HP) != 0)
             HandleLowHpMusicChange(&gPlayerParty[bank1PartyId], playerBank1);
@@ -1119,17 +1119,17 @@ void sub_805EB9C(u8 affineMode)
 
     for (i = 0; i < gBattlersCount; i++)
     {
-        if (IsBankSpritePresent(i))
+        if (IsBattlerSpritePresent(i))
         {
-            gSprites[gBankSpriteIds[i]].oam.affineMode = affineMode;
+            gSprites[gBattlerSpriteIds[i]].oam.affineMode = affineMode;
             if (affineMode == 0)
             {
-                gBattleSpritesDataPtr->healthBoxesData[i].field_6 = gSprites[gBankSpriteIds[i]].oam.matrixNum;
-                gSprites[gBankSpriteIds[i]].oam.matrixNum = 0;
+                gBattleSpritesDataPtr->healthBoxesData[i].field_6 = gSprites[gBattlerSpriteIds[i]].oam.matrixNum;
+                gSprites[gBattlerSpriteIds[i]].oam.matrixNum = 0;
             }
             else
             {
-                gSprites[gBankSpriteIds[i]].oam.matrixNum = gBattleSpritesDataPtr->healthBoxesData[i].field_6;
+                gSprites[gBattlerSpriteIds[i]].oam.matrixNum = gBattleSpritesDataPtr->healthBoxesData[i].field_6;
             }
         }
     }
@@ -1144,13 +1144,13 @@ void LoadAndCreateEnemyShadowSprites(void)
     LoadCompressedObjectPic(&gSpriteSheet_EnemyShadow);
 
     bank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
-    gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankCoord(bank, 0), GetBankCoord(bank, 1) + 29, 0xC8);
+    gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBattlerSpriteCoord(bank, 0), GetBattlerSpriteCoord(bank, 1) + 29, 0xC8);
     gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
 
     if (IsDoubleBattle())
     {
         bank = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
-        gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBankCoord(bank, 0), GetBankCoord(bank, 1) + 29, 0xC8);
+        gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBattlerSpriteCoord(bank, 0), GetBattlerSpriteCoord(bank, 1) + 29, 0xC8);
         gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
     }
 }
@@ -1159,9 +1159,9 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
 {
     bool8 invisible = FALSE;
     u8 bank = shadowSprite->tBank;
-    struct Sprite *bankSprite = &gSprites[gBankSpriteIds[bank]];
+    struct Sprite *bankSprite = &gSprites[gBattlerSpriteIds[bank]];
 
-    if (!bankSprite->inUse || !IsBankSpritePresent(bank))
+    if (!bankSprite->inUse || !IsBattlerSpritePresent(bank))
     {
         shadowSprite->callback = SpriteCB_SetInvisible;
         return;
@@ -1187,8 +1187,9 @@ void SpriteCB_SetInvisible(struct Sprite *sprite)
     sprite->invisible = 1;
 }
 
-void SetBankEnemyShadowSpriteCallback(u8 bank, u16 species)
+void SetBattlerShadowSpriteCallback(u8 bank, u16 species)
 {
+    // The player's shadow is never seen
     if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         return;
 
@@ -1201,7 +1202,7 @@ void SetBankEnemyShadowSpriteCallback(u8 bank, u16 species)
         gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].callback = SpriteCB_SetInvisible;
 }
 
-void EnemyShadowCallbackToSetInvisible(u8 bank)
+void HideBattlerShadowSprite(u8 bank)
 {
     gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].callback = SpriteCB_SetInvisible;
 }
diff --git a/src/battle_interface.c b/src/battle_interface.c
index b006a9d31..941fd20d5 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -154,9 +154,9 @@ enum
 };
 
 extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattlersCount;
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 
 extern const u8 * const gNatureNamePointers[];
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
@@ -898,7 +898,7 @@ void sub_80724A8(s16 arg0, s16 arg1, u16 *arg2)
 // healthboxSpriteId_2 refers to the other part
 // there's also one other sprite that appears to be a black square? dont fully understand its role
 
-u8 CreateBankHealthboxSprites(u8 bank)
+u8 CreateHealthboxSprites(u8 bank)
 {
     s16 data6 = 0;
     u8 healthboxSpriteId_1, healthboxSpriteId_2;
@@ -1089,9 +1089,9 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority)
 
     for (i = 0; i < gBattlersCount; i++)
     {
-        u8 healthboxSpriteId_1 = gHealthBoxesIds[i];
-        u8 healthboxSpriteId_2 = gSprites[gHealthBoxesIds[i]].oam.affineParam;
-        u8 healthboxSpriteId_3 = gSprites[gHealthBoxesIds[i]].data[5];
+        u8 healthboxSpriteId_1 = gHealthboxSpriteIds[i];
+        u8 healthboxSpriteId_2 = gSprites[gHealthboxSpriteIds[i]].oam.affineParam;
+        u8 healthboxSpriteId_3 = gSprites[gHealthboxSpriteIds[i]].data[5];
 
         gSprites[healthboxSpriteId_1].oam.priority = priority;
         gSprites[healthboxSpriteId_2].oam.priority = priority;
@@ -1099,7 +1099,7 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority)
     }
 }
 
-void SetBankHealthboxSpritePos(u8 bank)
+void InitBattlerHealthboxCoords(u8 bank)
 {
     s16 x = 0, y = 0;
 
@@ -1129,7 +1129,7 @@ void SetBankHealthboxSpritePos(u8 bank)
         }
     }
 
-    UpdateSpritePos(gHealthBoxesIds[bank], x, y);
+    UpdateSpritePos(gHealthboxSpriteIds[bank], x, y);
 }
 
 static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl)
@@ -1417,7 +1417,7 @@ void SwapHpBarsWithHpText(void)
 
     for (i = 0; i < gBattlersCount; i++)
     {
-        if (gSprites[gHealthBoxesIds[i]].callback == SpriteCallbackDummy
+        if (gSprites[gHealthboxSpriteIds[i]].callback == SpriteCallbackDummy
          && GetBattlerSide(i) != B_SIDE_OPPONENT
          && (IsDoubleBattle() || GetBattlerSide(i) != B_SIDE_PLAYER))
         {
@@ -1434,17 +1434,17 @@ void SwapHpBarsWithHpText(void)
 
                 if (noBars == TRUE) // bars to text
                 {
-                    spriteId = gSprites[gHealthBoxesIds[i]].data[5];
+                    spriteId = gSprites[gHealthboxSpriteIds[i]].data[5];
 
                     CpuFill32(0, (void*)(OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32), 0x100);
-                    UpdateHpTextInHealthboxInDoubles(gHealthBoxesIds[i], GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_HP), HP_CURRENT);
-                    UpdateHpTextInHealthboxInDoubles(gHealthBoxesIds[i], GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_MAX_HP), HP_MAX);
+                    UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_HP), HP_CURRENT);
+                    UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_MAX_HP), HP_MAX);
                 }
                 else // text to bars
                 {
-                    UpdateStatusIconInHealthbox(gHealthBoxesIds[i]);
-                    UpdateHealthboxAttribute(gHealthBoxesIds[i], &gPlayerParty[gBattlePartyID[i]], HEALTHBOX_HEALTH_BAR);
-                    CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_117), (void*)(OBJ_VRAM0 + 0x680 + gSprites[gHealthBoxesIds[i]].oam.tileNum * 32), 32);
+                    UpdateStatusIconInHealthbox(gHealthboxSpriteIds[i]);
+                    UpdateHealthboxAttribute(gHealthboxSpriteIds[i], &gPlayerParty[gBattlerPartyIndexes[i]], HEALTHBOX_HEALTH_BAR);
+                    CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_117), (void*)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * 32), 32);
                 }
             }
             else
@@ -1453,26 +1453,26 @@ void SwapHpBarsWithHpText(void)
                 {
                     if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
                     {
-                        sub_80730D4(gHealthBoxesIds[i], &gEnemyParty[gBattlePartyID[i]]);
+                        sub_80730D4(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]]);
                     }
                     else
                     {
-                        spriteId = gSprites[gHealthBoxesIds[i]].data[5];
+                        spriteId = gSprites[gHealthboxSpriteIds[i]].data[5];
 
                         CpuFill32(0, (void *)(OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32), 0x100);
-                        UpdateHpTextInHealthboxInDoubles(gHealthBoxesIds[i], GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_HP), HP_CURRENT);
-                        UpdateHpTextInHealthboxInDoubles(gHealthBoxesIds[i], GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_MAX_HP), HP_MAX);
+                        UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gEnemyParty[gBattlerPartyIndexes[i]], MON_DATA_HP), HP_CURRENT);
+                        UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gEnemyParty[gBattlerPartyIndexes[i]], MON_DATA_MAX_HP), HP_MAX);
                     }
                 }
                 else // text to bars
                 {
-                    UpdateStatusIconInHealthbox(gHealthBoxesIds[i]);
-                    UpdateHealthboxAttribute(gHealthBoxesIds[i], &gEnemyParty[gBattlePartyID[i]], HEALTHBOX_HEALTH_BAR);
+                    UpdateStatusIconInHealthbox(gHealthboxSpriteIds[i]);
+                    UpdateHealthboxAttribute(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]], HEALTHBOX_HEALTH_BAR);
                     if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-                        UpdateHealthboxAttribute(gHealthBoxesIds[i], &gEnemyParty[gBattlePartyID[i]], HEALTHBOX_NICK);
+                        UpdateHealthboxAttribute(gHealthboxSpriteIds[i], &gEnemyParty[gBattlerPartyIndexes[i]], HEALTHBOX_NICK);
                 }
             }
-            gSprites[gHealthBoxesIds[i]].data[7] ^= 1;
+            gSprites[gHealthboxSpriteIds[i]].data[7] ^= 1;
         }
     }
 }
@@ -1994,7 +1994,7 @@ static void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus)
     bank = gSprites[healthboxSpriteId].data[6];
     if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         return;
-    if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES)), FLAG_GET_CAUGHT))
+    if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES)), FLAG_GET_CAUGHT))
         return;
 
     healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5];
@@ -2018,7 +2018,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
     healthboxSpriteId_2 = gSprites[healthboxSpriteId].data[5];
     if (GetBattlerSide(bank) == B_SIDE_PLAYER)
     {
-        status = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_STATUS);
+        status = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_STATUS);
         if (!IsDoubleBattle())
             tileNumAdder = 0x1A;
         else
@@ -2026,7 +2026,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
     }
     else
     {
-        status = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_STATUS);
+        status = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_STATUS);
         tileNumAdder = 0x11;
     }
 
@@ -2323,7 +2323,7 @@ static void sub_8074B9C(u8 bank, u8 whichBar)
                     gBattleSpritesDataPtr->battleBars[bank].receivedValue,
                     &gBattleSpritesDataPtr->battleBars[bank].field_10,
                     array, 8);
-        level = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_LEVEL);
+        level = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_LEVEL);
         if (level == MAX_MON_LEVEL)
         {
             for (i = 0; i < 8; i++)
diff --git a/src/battle_main.c b/src/battle_main.c
index a0f89f019..df3fc9378 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -87,27 +87,27 @@ extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern u8 gDecompressionBuffer[];
 extern u16 gUnknown_020243FC;
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
-extern void (*gBattlerFuncs[MAX_BATTLERS_COUNT])(void);
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
+extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u8 gStringBank;
 extern u32 gUnknown_02022F88;
 extern u32 gHitMarker;
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u16 gPaydayMoney;
 extern u16 gBattleWeather;
 extern u16 gPauseCounterBattle;
 extern u16 gRandomTurnNumber;
 extern u8 gActiveBattler;
 extern u8 gBattlersCount;
-extern u8 gBattleAttacker;
-extern u8 gBattleDefender;
+extern u8 gBattleMoveAttacker;
+extern u8 gBattleMoveTarget;
 extern u8 gLeveledUpInBattle;
 extern u8 gAbsentBattlerFlags;
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gMultiHitCounter;
 extern u8 gMoveResultFlags;
 extern s32 gBattleMoveDamage;
@@ -2398,7 +2398,7 @@ static void sub_8039838(struct Sprite *sprite)
     if (sprite->animEnded)
     {
         sub_8076918(sprite->tBank);
-        SetHealthboxSpriteVisible(gHealthBoxesIds[sprite->tBank]);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->tBank]);
         sprite->callback = sub_8039894;
         StartSpriteAnimIfDifferent(sprite, 0);
         BeginNormalPaletteFade(0x20000, 0, 10, 0, 0x2108);
@@ -2456,11 +2456,11 @@ void sub_8039934(struct Sprite *sprite)
     else
         species = sprite->tSpeciesId;
 
-    GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_PERSONALITY);  // Unused return value
+    GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_PERSONALITY);  // Unused return value
 
     if (species == SPECIES_UNOWN)
     {
-        u32 personalityValue = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_PERSONALITY);
+        u32 personalityValue = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_PERSONALITY);
         u16 unownForm = ((((personalityValue & 0x3000000) >> 18) | ((personalityValue & 0x30000) >> 12) | ((personalityValue & 0x300) >> 6) | (personalityValue & 3)) % 0x1C);
         u16 unownSpecies;
 
@@ -2608,14 +2608,14 @@ void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d)
     bounceHealthBoxSpriteId = CreateInvisibleSpriteWithCallback(SpriteCB_HealthBoxBounce);
     if (b == TRUE)
     {
-        spriteId2 = gHealthBoxesIds[bank];
+        spriteId2 = gHealthboxSpriteIds[bank];
         gBattleSpritesDataPtr->healthBoxesData[bank].field_2 = bounceHealthBoxSpriteId;
         gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2 = 1;
         gSprites[bounceHealthBoxSpriteId].data[0] = 0x80;
     }
     else
     {
-        spriteId2 = gBankSpriteIds[bank];
+        spriteId2 = gBattlerSpriteIds[bank];
         gBattleSpritesDataPtr->healthBoxesData[bank].field_3 = bounceHealthBoxSpriteId;
         gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4 = 1;
         gSprites[bounceHealthBoxSpriteId].data[0] = 0xC0;
@@ -2710,7 +2710,7 @@ static void BattleMainCB1(void)
     gBattleMainFunc();
 
     for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
-        gBattlerFuncs[gActiveBattler]();
+        gBattlerControllerFuncs[gActiveBattler]();
 }
 
 static void BattleStartClearSetData(void)
@@ -2752,8 +2752,8 @@ static void BattleStartClearSetData(void)
             dataPtr[j] = 0;
     }
 
-    gBattleAttacker = 0;
-    gBattleDefender = 0;
+    gBattleMoveAttacker = 0;
+    gBattleMoveTarget = 0;
     gBattleWeather = 0;
 
     dataPtr = (u8 *)&gWishFutureKnock;
@@ -2774,7 +2774,7 @@ static void BattleStartClearSetData(void)
 
     gMultiHitCounter = 0;
     gBattleOutcome = 0;
-    gBattleExecBuffer = 0;
+    gBattleControllerExecFlags = 0;
     gPaydayMoney = 0;
     gBattleResources->battleScriptsStack->size = 0;
     gBattleResources->battleCallbackStack->size = 0;
@@ -3040,12 +3040,12 @@ static void BattleIntroGetMonsData(void)
     {
     case 0:
         gActiveBattler = gBattleCommunication[1];
-        EmitGetMonData(0, 0, 0);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitGetMonData(0, 0, 0);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattleCommunication[MULTIUSE_STATE]++;
         break;
     case 1:
-        if (gBattleExecBuffer == 0)
+        if (gBattleControllerExecFlags == 0)
         {
             gBattleCommunication[1]++;
             if (gBattleCommunication[1] == gBattlersCount)
@@ -3059,11 +3059,11 @@ static void BattleIntroGetMonsData(void)
 
 static void BattleIntroPrepareBackgroundSlide(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         gActiveBattler = GetBattlerAtPosition(0);
-        EmitIntroSlide(0, gBattleTerrain);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitIntroSlide(0, gBattleTerrain);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattleMainFunc = BattleIntroDrawTrainersOrMonsSprites;
         gBattleCommunication[0] = 0;
         gBattleCommunication[1] = 0;
@@ -3075,7 +3075,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
     u8 *ptr;
     s32 i;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
@@ -3107,16 +3107,16 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
 
         if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_LEFT)
         {
-            EmitDrawTrainerPic(0);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitDrawTrainerPic(0);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
 
         if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
         {
             if (GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_LEFT)
             {
-                EmitDrawTrainerPic(0);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitDrawTrainerPic(0);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
             if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT
              && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER
@@ -3140,9 +3140,9 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
                 {
                     HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality);
                 }
-                EmitLoadMonSprite(0);
-                MarkBufferBankForExecution(gActiveBattler);
-                gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES, NULL);
+                BtlController_EmitLoadMonSprite(0);
+                MarkBattlerForControllerExec(gActiveBattler);
+                gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES, NULL);
             }
         }
 
@@ -3151,15 +3151,15 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
             if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_RIGHT
              || GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_RIGHT)
             {
-                EmitDrawTrainerPic(0);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitDrawTrainerPic(0);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
         }
 
         if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBattlerPosition(gActiveBattler) == B_POSITION_OPPONENT_RIGHT)
         {
-            EmitDrawTrainerPic(0);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitDrawTrainerPic(0);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
 
         if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
@@ -3173,7 +3173,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
     s32 i;
     struct HpAndStatus hpStatus[6];
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
@@ -3193,8 +3193,8 @@ static void BattleIntroDrawPartySummaryScreens(void)
             }
         }
         gActiveBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
-        EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
+        MarkBattlerForControllerExec(gActiveBattler);
 
         for (i = 0; i < PARTY_SIZE; i++)
         {
@@ -3211,8 +3211,8 @@ static void BattleIntroDrawPartySummaryScreens(void)
             }
         }
         gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
-        EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
+        MarkBattlerForControllerExec(gActiveBattler);
 
         gBattleMainFunc = BattleIntroPrintTrainerWantsToBattle;
     }
@@ -3244,7 +3244,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
 
 static void BattleIntroPrintTrainerWantsToBattle(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         gActiveBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         PrepareStringBattle(STRINGID_INTROMSG, gActiveBattler);
@@ -3254,7 +3254,7 @@ static void BattleIntroPrintTrainerWantsToBattle(void)
 
 static void BattleIntroPrintWildMonAttacked(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
         PrepareStringBattle(STRINGID_INTROMSG, 0);
@@ -3265,7 +3265,7 @@ static void BattleIntroPrintOpponentSendsOut(void)
 {
     u32 position;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
@@ -3304,8 +3304,8 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void)
     {
         if (GetBattlerPosition(gActiveBattler) == position)
         {
-            EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitIntroTrainerBallThrow(0);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
     }
 
@@ -3329,15 +3329,15 @@ static void BattleIntroOpponent1SendsOutMonAnimation(void)
     else
         position = B_POSITION_OPPONENT_LEFT;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
         if (GetBattlerPosition(gActiveBattler) == position)
         {
-            EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitIntroTrainerBallThrow(0);
+            MarkBattlerForControllerExec(gActiveBattler);
             if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS))
             {
                 gBattleMainFunc = BattleIntroOpponent2SendsOutMonAnimation;
@@ -3383,7 +3383,7 @@ _0803B288:\n\
 _0803B298:\n\
 	movs r5, 0x1\n\
 _0803B29A:\n\
-	ldr r0, =gBattleExecBuffer\n\
+	ldr r0, =gBattleControllerExecFlags\n\
 	ldr r2, [r0]\n\
 	cmp r2, 0\n\
 	bne _0803B2F2\n\
@@ -3403,9 +3403,9 @@ _0803B2B2:\n\
 	cmp r0, r5\n\
 	bne _0803B2D8\n\
 	movs r0, 0\n\
-	bl EmitIntroTrainerBallThrow\n\
+	bl BtlController_EmitIntroTrainerBallThrow\n\
 	ldrb r0, [r4]\n\
-	bl MarkBufferBankForExecution\n\
+	bl MarkBattlerForControllerExec\n\
 	ldr r0, =gBattleTypeFlags\n\
 	ldr r0, [r0]\n\
 	ldr r1, =0x00008040\n\
@@ -3440,7 +3440,7 @@ _0803B2F2:\n\
 
 static void BattleIntroRecordMonsToDex(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
@@ -3460,13 +3460,13 @@ static void BattleIntroRecordMonsToDex(void)
 
 void sub_803B3AC(void) // unused
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
         gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
 }
 
 static void BattleIntroPrintPlayerSendsOut(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         u8 position;
 
@@ -3509,8 +3509,8 @@ static void BattleIntroPlayer2SendsOutMonAnimation(void)
     {
         if (GetBattlerPosition(gActiveBattler) == position)
         {
-            EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitIntroTrainerBallThrow(0);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
     }
 
@@ -3537,15 +3537,15 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void)
     else
         position = B_POSITION_PLAYER_LEFT;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
     {
         if (GetBattlerPosition(gActiveBattler) == position)
         {
-            EmitIntroTrainerBallThrow(0);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitIntroTrainerBallThrow(0);
+            MarkBattlerForControllerExec(gActiveBattler);
             if (gBattleTypeFlags & (BATTLE_TYPE_MULTI))
             {
                 gBattleMainFunc = BattleIntroPlayer2SendsOutMonAnimation;
@@ -3563,14 +3563,14 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void)
 
 void sub_803B598(void) // unused
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
             {
-                EmitSwitchInAnim(0, gBattlePartyID[gActiveBattler], FALSE);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitSwitchInAnim(0, gBattlerPartyIndexes[gActiveBattler], FALSE);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
         }
 
@@ -3588,7 +3588,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     s32 j;
     u8 effect = 0;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     if (gBattleStruct->switchInAbilitiesCounter == 0)
@@ -3677,7 +3677,7 @@ static void HandleEndTurn_ContinueBattle(void)
 {
     s32 i;
 
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         gBattleMainFunc = BattleTurnPassed;
         for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; i++)
@@ -3839,7 +3839,7 @@ void sub_803BDA0(u8 bank)
     for (i = 0; i < 3; i++)
         gUnknown_0203CF00[i] = *(bank * 3 + i + (u8*)(gBattleStruct->field_60));
 
-    r4 = pokemon_order_func(gBattlePartyID[bank]);
+    r4 = pokemon_order_func(gBattlerPartyIndexes[bank]);
     r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + bank));
     sub_81B8FB0(r4, r1);
 
@@ -3912,17 +3912,17 @@ static void HandleTurnActionSelectionState(void)
                     }
                     else
                     {
-                        EmitChooseAction(0, gActionForBanks[0], gBattleBufferB[0][1] | (gBattleBufferB[0][2] << 8));
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitChooseAction(0, gActionForBanks[0], gBattleBufferB[0][1] | (gBattleBufferB[0][2] << 8));
+                        MarkBattlerForControllerExec(gActiveBattler);
                         gBattleCommunication[gActiveBattler]++;
                     }
                 }
             }
             break;
         case STATE_WAIT_ACTION_CHOSEN: // try to perform an action
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
+            if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
-                RecordedBattle_SetBankAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]);
+                RecordedBattle_SetBattlerAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]);
                 gActionForBanks[gActiveBattler] = gBattleBufferB[gActiveBattler][1];
 
                 switch (gBattleBufferB[gActiveBattler][1])
@@ -3961,8 +3961,8 @@ static void HandleTurnActionSelectionState(void)
                                                             i);
                         }
 
-                        EmitChooseMove(0, (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) != 0, FALSE, &moveInfo);
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitChooseMove(0, (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) != 0, FALSE, &moveInfo);
+                        MarkBattlerForControllerExec(gActiveBattler);
                     }
                     break;
                 case ACTION_USE_ITEM:
@@ -3971,7 +3971,7 @@ static void HandleTurnActionSelectionState(void)
                                             | BATTLE_TYPE_EREADER_TRAINER
                                             | BATTLE_TYPE_x2000000))
                     {
-                        RecordedBattle_ClearBankAction(gActiveBattler, 1);
+                        RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
                         gSelectionBattleScripts[gActiveBattler] = BattleScript_ActionSelectionItemsCantBeUsed;
                         gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
                         *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
@@ -3980,17 +3980,17 @@ static void HandleTurnActionSelectionState(void)
                     }
                     else
                     {
-                        EmitChooseItem(0, gBattleStruct->field_60[gActiveBattler]);
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitChooseItem(0, gBattleStruct->field_60[gActiveBattler]);
+                        MarkBattlerForControllerExec(gActiveBattler);
                     }
                     break;
                 case ACTION_SWITCH:
-                    *(gBattleStruct->field_58 + gActiveBattler) = gBattlePartyID[gActiveBattler];
+                    *(gBattleStruct->field_58 + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler];
                     if (gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)
                         || gBattleTypeFlags & BATTLE_TYPE_ARENA
                         || gStatuses3[gActiveBattler] & STATUS3_ROOTED)
                     {
-                        EmitChoosePokemon(0, 2, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
+                        BtlController_EmitChoosePokemon(0, 2, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                     }
                     else if ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBattler, ABILITY_SHADOW_TAG, 0, 0))
                              || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gActiveBattler, ABILITY_ARENA_TRAP, 0, 0))
@@ -4001,18 +4001,18 @@ static void HandleTurnActionSelectionState(void)
                                  && (gBattleMons[gActiveBattler].type1 == TYPE_STEEL
                                      || gBattleMons[gActiveBattler].type2 == TYPE_STEEL)))
                     {
-                        EmitChoosePokemon(0, ((i - 1) << 4) | 4, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]);
+                        BtlController_EmitChoosePokemon(0, ((i - 1) << 4) | 4, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]);
                     }
                     else
                     {
                         if (gActiveBattler == 2 && gActionForBanks[0] == ACTION_SWITCH)
-                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
+                            BtlController_EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                         else if (gActiveBattler == 3 && gActionForBanks[1] == ACTION_SWITCH)
-                            EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
+                            BtlController_EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                         else
-                            EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
+                            BtlController_EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                     }
-                    MarkBufferBankForExecution(gActiveBattler);
+                    MarkBattlerForControllerExec(gActiveBattler);
                     break;
                 case ACTION_SAFARI_ZONE_BALL:
                     if (IsPlayerPartyAndPokemonStorageFull())
@@ -4025,46 +4025,46 @@ static void HandleTurnActionSelectionState(void)
                     }
                     break;
                 case ACTION_POKEBLOCK_CASE:
-                    EmitChooseItem(0, gBattleStruct->field_60[gActiveBattler]);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitChooseItem(0, gBattleStruct->field_60[gActiveBattler]);
+                    MarkBattlerForControllerExec(gActiveBattler);
                     break;
                 case ACTION_CANCEL_PARTNER:
                     gBattleCommunication[gActiveBattler] = 7;
                     gBattleCommunication[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] = 1;
-                    RecordedBattle_ClearBankAction(gActiveBattler, 1);
+                    RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
                     if (gBattleMons[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].status2 & STATUS2_MULTIPLETURNS
                         || gBattleMons[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].status2 & STATUS2_RECHARGE)
                     {
-                        EmitCmd50(0);
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitCmd50(0);
+                        MarkBattlerForControllerExec(gActiveBattler);
                         return;
                     }
                     else if (gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_SWITCH)
                     {
-                        RecordedBattle_ClearBankAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 2);
+                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 2);
                     }
                     else if (gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_RUN)
                     {
-                        RecordedBattle_ClearBankAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
+                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
                     }
                     else if (gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_USE_MOVE
                              && (gProtectStructs[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].onlyStruggle
                                 || gDisableStructs[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].encoredMove))
                     {
-                        RecordedBattle_ClearBankAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
+                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
                     }
                     else if (gBattleTypeFlags & BATTLE_TYPE_PALACE
                              && gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_USE_MOVE)
                     {
                         gRngValue = gBattlePalaceMoveSelectionRngValue;
-                        RecordedBattle_ClearBankAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
+                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
                     }
                     else
                     {
-                        RecordedBattle_ClearBankAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 3);
+                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 3);
                     }
-                    EmitCmd50(0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitCmd50(0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                     return;
                 }
 
@@ -4101,7 +4101,7 @@ static void HandleTurnActionSelectionState(void)
             }
             break;
         case STATE_WAIT_ACTION_CASE_CHOSEN:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
+            if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
                 switch (gActionForBanks[gActiveBattler])
                 {
@@ -4126,11 +4126,11 @@ static void HandleTurnActionSelectionState(void)
                         if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == 0xFFFF)
                         {
                             gBattleCommunication[gActiveBattler] = 1;
-                            RecordedBattle_ClearBankAction(gActiveBattler, 1);
+                            RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
                         }
                         else if (TrySetCantSelectMoveBattleScript())
                         {
-                            RecordedBattle_ClearBankAction(gActiveBattler, 1);
+                            RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
                             gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
                             *(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
                             gBattleBufferB[gActiveBattler][1] = 0;
@@ -4141,8 +4141,8 @@ static void HandleTurnActionSelectionState(void)
                         {
                             if (!(gBattleTypeFlags & BATTLE_TYPE_PALACE))
                             {
-                                RecordedBattle_SetBankAction(gActiveBattler, gBattleBufferB[gActiveBattler][2]);
-                                RecordedBattle_SetBankAction(gActiveBattler, gBattleBufferB[gActiveBattler][3]);
+                                RecordedBattle_SetBattlerAction(gActiveBattler, gBattleBufferB[gActiveBattler][2]);
+                                RecordedBattle_SetBattlerAction(gActiveBattler, gBattleBufferB[gActiveBattler][3]);
                             }
                             *(gBattleStruct->chosenMovePositions + gActiveBattler) = gBattleBufferB[gActiveBattler][2];
                             gChosenMovesByBanks[gActiveBattler] = gBattleMons[gActiveBattler].moves[*(gBattleStruct->chosenMovePositions + gActiveBattler)];
@@ -4167,7 +4167,7 @@ static void HandleTurnActionSelectionState(void)
                     if (gBattleBufferB[gActiveBattler][1] == 6)
                     {
                         gBattleCommunication[gActiveBattler] = 1;
-                        RecordedBattle_ClearBankAction(gActiveBattler, 1);
+                        RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
                     }
                     else
                     {
@@ -4209,7 +4209,7 @@ static void HandleTurnActionSelectionState(void)
             }
             break;
         case STATE_WAIT_ACTION_CONFIRMED_STANDBY:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
+            if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
                 i = (sub_803CDB8() != 0);
 
@@ -4217,18 +4217,18 @@ static void HandleTurnActionSelectionState(void)
                     || (position & BIT_FLANK)
                     || (*(&gBattleStruct->field_91) & gBitTable[GetBattlerAtPosition(position ^ BIT_FLANK)]))
                 {
-                    EmitLinkStandbyMsg(0, 0, i);
+                    BtlController_EmitLinkStandbyMsg(0, 0, i);
                 }
                 else
                 {
-                    EmitLinkStandbyMsg(0, 1, i);
+                    BtlController_EmitLinkStandbyMsg(0, 1, i);
                 }
-                MarkBufferBankForExecution(gActiveBattler);
+                MarkBattlerForControllerExec(gActiveBattler);
                 gBattleCommunication[gActiveBattler]++;
             }
             break;
         case STATE_WAIT_ACTION_CONFIRMED:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
+            if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
                 gBattleCommunication[ACTIONS_CONFIRMED_COUNT]++;
             }
@@ -4240,9 +4240,9 @@ static void HandleTurnActionSelectionState(void)
             }
             else
             {
-                gBattleAttacker = gActiveBattler;
+                gBattleMoveAttacker = gActiveBattler;
                 gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBattler];
-                if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
+                if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
                 {
                     gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
                 }
@@ -4250,7 +4250,7 @@ static void HandleTurnActionSelectionState(void)
             }
             break;
         case STATE_WAIT_SET_BEFORE_ACTION:
-            if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
+            if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
                 gBattleCommunication[gActiveBattler] = 1;
             }
@@ -4266,15 +4266,15 @@ static void HandleTurnActionSelectionState(void)
                 }
                 else
                 {
-                    RecordedBattle_ClearBankAction(gActiveBattler, 1);
+                    RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
                     gBattleCommunication[gActiveBattler] = *(gBattleStruct->stateIdAfterSelScript + gActiveBattler);
                 }
             }
             else
             {
-                gBattleAttacker = gActiveBattler;
+                gBattleMoveAttacker = gActiveBattler;
                 gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBattler];
-                if (!(gBattleExecBuffer & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
+                if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
                 {
                     gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
                 }
@@ -4320,7 +4320,7 @@ static bool8 sub_803CDB8(void)
 static void sub_803CDF8(void)
 {
     *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = gBattleBufferB[gActiveBattler][1];
-    RecordedBattle_SetBankAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]);
+    RecordedBattle_SetBattlerAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]);
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
     {
@@ -4656,11 +4656,11 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
     {
         while (gBattleStruct->focusPunchBank < gBattlersCount)
         {
-            gActiveBattler = gBattleAttacker = gBattleStruct->focusPunchBank;
+            gActiveBattler = gBattleMoveAttacker = gBattleStruct->focusPunchBank;
             gBattleStruct->focusPunchBank++;
             if (gChosenMovesByBanks[gActiveBattler] == MOVE_FOCUS_PUNCH
                 && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
-                && !(gDisableStructs[gBattleAttacker].truantCounter)
+                && !(gDisableStructs[gBattleMoveAttacker].truantCounter)
                 && !(gProtectStructs[gActiveBattler].onlyStruggle))
             {
                 BattleScriptExecute(BattleScript_FocusPunchSetUp);
@@ -4716,7 +4716,7 @@ static void HandleEndTurn_BattleWon(void)
     {
         gSpecialVar_Result = gBattleOutcome;
         gBattleTextBuff1[0] = gBattleOutcome;
-        gBattleAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+        gBattleMoveAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
         gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
     }
@@ -4789,7 +4789,7 @@ static void HandleEndTurn_BattleLost(void)
         else
         {
             gBattleTextBuff1[0] = gBattleOutcome;
-            gBattleAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+            gBattleMoveAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
             gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
             gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
         }
@@ -4819,7 +4819,7 @@ static void HandleEndTurn_RanFromBattle(void)
     }
     else
     {
-        switch (gProtectStructs[gBattleAttacker].fleeFlag)
+        switch (gProtectStructs[gBattleMoveAttacker].fleeFlag)
         {
         default:
             gBattlescriptCurrInstr = BattleScript_GotAwaySafely;
@@ -4840,7 +4840,7 @@ static void HandleEndTurn_MonFled(void)
 {
     gCurrentActionFuncId = 0;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleAttacker, gBattlePartyID[gBattleAttacker]);
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleMoveAttacker, gBattlerPartyIndexes[gBattleMoveAttacker]);
     gBattlescriptCurrInstr = BattleScript_WildMonFled;
 
     gBattleMainFunc = HandleEndTurn_FinishBattle;
@@ -4864,13 +4864,13 @@ static void HandleEndTurn_FinishBattle(void)
                 {
                     if (gBattleResults.playerMon1Species == SPECIES_NONE)
                     {
-                        gBattleResults.playerMon1Species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES, NULL);
-                        GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_NICKNAME, gBattleResults.playerMon1Name);
+                        gBattleResults.playerMon1Species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES, NULL);
+                        GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_NICKNAME, gBattleResults.playerMon1Name);
                     }
                     else
                     {
-                        gBattleResults.playerMon2Species = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES, NULL);
-                        GetMonData(&gPlayerParty[gBattlePartyID[gActiveBattler]], MON_DATA_NICKNAME, gBattleResults.playerMon2Name);
+                        gBattleResults.playerMon2Species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES, NULL);
+                        GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_NICKNAME, gBattleResults.playerMon2Name);
                     }
                 }
             }
@@ -4898,7 +4898,7 @@ static void HandleEndTurn_FinishBattle(void)
     }
     else
     {
-        if (gBattleExecBuffer == 0)
+        if (gBattleControllerExecFlags == 0)
             gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
     }
 }
@@ -5001,14 +5001,14 @@ void RunBattleScriptCommands_PopCallbacksStack(void)
     }
     else
     {
-        if (gBattleExecBuffer == 0)
+        if (gBattleControllerExecFlags == 0)
             gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
     }
 }
 
 void RunBattleScriptCommands(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
         gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
 }
 
@@ -5017,9 +5017,9 @@ static void HandleAction_UseMove(void)
     u8 side;
     u8 var = 4;
 
-    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
 
-    if (*(&gBattleStruct->field_91) & gBitTable[gBattleAttacker])
+    if (*(&gBattleStruct->field_91) & gBitTable[gBattleMoveAttacker])
     {
         gCurrentActionFuncId = ACTION_FINISHED;
         return;
@@ -5031,119 +5031,119 @@ static void HandleAction_UseMove(void)
     gMoveResultFlags = 0;
     gMultiHitCounter = 0;
     gBattleCommunication[6] = 0;
-    gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattleAttacker);
+    gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattleMoveAttacker);
 
     // choose move
-    if (gProtectStructs[gBattleAttacker].onlyStruggle)
+    if (gProtectStructs[gBattleMoveAttacker].onlyStruggle)
     {
-        gProtectStructs[gBattleAttacker].onlyStruggle = 0;
+        gProtectStructs[gBattleMoveAttacker].onlyStruggle = 0;
         gCurrentMove = gChosenMove = MOVE_STRUGGLE;
         gHitMarker |= HITMARKER_NO_PPDEDUCT;
-        *(gBattleStruct->moveTarget + gBattleAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
+        *(gBattleStruct->moveTarget + gBattleMoveAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
     }
-    else if (gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBattleAttacker].status2 & STATUS2_RECHARGE)
+    else if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBattleMoveAttacker].status2 & STATUS2_RECHARGE)
     {
-        gCurrentMove = gChosenMove = gLockedMoves[gBattleAttacker];
+        gCurrentMove = gChosenMove = gLockedMoves[gBattleMoveAttacker];
     }
     // encore forces you to use the same move
-    else if (gDisableStructs[gBattleAttacker].encoredMove != MOVE_NONE
-             && gDisableStructs[gBattleAttacker].encoredMove == gBattleMons[gBattleAttacker].moves[gDisableStructs[gBattleAttacker].encoredMovePos])
+    else if (gDisableStructs[gBattleMoveAttacker].encoredMove != MOVE_NONE
+             && gDisableStructs[gBattleMoveAttacker].encoredMove == gBattleMons[gBattleMoveAttacker].moves[gDisableStructs[gBattleMoveAttacker].encoredMovePos])
     {
-        gCurrentMove = gChosenMove = gDisableStructs[gBattleAttacker].encoredMove;
-        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattleAttacker].encoredMovePos;
-        *(gBattleStruct->moveTarget + gBattleAttacker) = GetMoveTarget(gCurrentMove, 0);
+        gCurrentMove = gChosenMove = gDisableStructs[gBattleMoveAttacker].encoredMove;
+        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattleMoveAttacker].encoredMovePos;
+        *(gBattleStruct->moveTarget + gBattleMoveAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
     // check if the encored move wasn't overwritten
-    else if (gDisableStructs[gBattleAttacker].encoredMove != MOVE_NONE
-             && gDisableStructs[gBattleAttacker].encoredMove != gBattleMons[gBattleAttacker].moves[gDisableStructs[gBattleAttacker].encoredMovePos])
+    else if (gDisableStructs[gBattleMoveAttacker].encoredMove != MOVE_NONE
+             && gDisableStructs[gBattleMoveAttacker].encoredMove != gBattleMons[gBattleMoveAttacker].moves[gDisableStructs[gBattleMoveAttacker].encoredMovePos])
     {
-        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattleAttacker].encoredMovePos;
-        gCurrentMove = gChosenMove = gBattleMons[gBattleAttacker].moves[gCurrMovePos];
-        gDisableStructs[gBattleAttacker].encoredMove = MOVE_NONE;
-        gDisableStructs[gBattleAttacker].encoredMovePos = 0;
-        gDisableStructs[gBattleAttacker].encoreTimer1 = 0;
-        *(gBattleStruct->moveTarget + gBattleAttacker) = GetMoveTarget(gCurrentMove, 0);
+        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattleMoveAttacker].encoredMovePos;
+        gCurrentMove = gChosenMove = gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos];
+        gDisableStructs[gBattleMoveAttacker].encoredMove = MOVE_NONE;
+        gDisableStructs[gBattleMoveAttacker].encoredMovePos = 0;
+        gDisableStructs[gBattleMoveAttacker].encoreTimer1 = 0;
+        *(gBattleStruct->moveTarget + gBattleMoveAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
-    else if (gBattleMons[gBattleAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBattleAttacker])
+    else if (gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBattleMoveAttacker])
     {
-        gCurrentMove = gChosenMove = gBattleMons[gBattleAttacker].moves[gCurrMovePos];
-        *(gBattleStruct->moveTarget + gBattleAttacker) = GetMoveTarget(gCurrentMove, 0);
+        gCurrentMove = gChosenMove = gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos];
+        *(gBattleStruct->moveTarget + gBattleMoveAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
     else
     {
-        gCurrentMove = gChosenMove = gBattleMons[gBattleAttacker].moves[gCurrMovePos];
+        gCurrentMove = gChosenMove = gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos];
     }
 
-    if (gBattleMons[gBattleAttacker].hp != 0)
+    if (gBattleMons[gBattleMoveAttacker].hp != 0)
     {
-        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
             gBattleResults.lastUsedMovePlayer = gCurrentMove;
         else
             gBattleResults.lastUsedMoveOpponent = gCurrentMove;
     }
 
     // choose target
-    side = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
+    side = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
     if (gSideTimers[side].followmeTimer != 0
         && gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED
-        && GetBattlerSide(gBattleAttacker) != GetBattlerSide(gSideTimers[side].followmeTarget)
+        && GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gSideTimers[side].followmeTarget)
         && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
     {
-        gBattleDefender = gSideTimers[side].followmeTarget;
+        gBattleMoveTarget = gSideTimers[side].followmeTarget;
     }
     else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
              && gSideTimers[side].followmeTimer == 0
              && (gBattleMoves[gCurrentMove].power != 0
                  || gBattleMoves[gCurrentMove].target != MOVE_TARGET_x10)
-             && gBattleMons[*(gBattleStruct->moveTarget + gBattleAttacker)].ability != ABILITY_LIGHTNING_ROD
+             && gBattleMons[*(gBattleStruct->moveTarget + gBattleMoveAttacker)].ability != ABILITY_LIGHTNING_ROD
              && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
     {
-        side = GetBattlerSide(gBattleAttacker);
+        side = GetBattlerSide(gBattleMoveAttacker);
         for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             if (side != GetBattlerSide(gActiveBattler)
-                && *(gBattleStruct->moveTarget + gBattleAttacker) != gActiveBattler
+                && *(gBattleStruct->moveTarget + gBattleMoveAttacker) != gActiveBattler
                 && gBattleMons[gActiveBattler].ability == ABILITY_LIGHTNING_ROD
-                && BankGetTurnOrder(gActiveBattler) < var)
+                && GetBattlerTurnOrderNum(gActiveBattler) < var)
             {
-                var = BankGetTurnOrder(gActiveBattler);
+                var = GetBattlerTurnOrderNum(gActiveBattler);
             }
         }
         if (var == 4)
         {
             if (gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
             {
-                if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
                 {
                     if (Random() & 1)
-                        gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+                        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
                     else
-                        gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+                        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
                 }
                 else
                 {
                     if (Random() & 1)
-                        gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+                        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
                     else
-                        gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
+                        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
                 }
             }
             else
             {
-                gBattleDefender = *(gBattleStruct->moveTarget + gBattleAttacker);
+                gBattleMoveTarget = *(gBattleStruct->moveTarget + gBattleMoveAttacker);
             }
 
-            if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
+            if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
             {
-                if (GetBattlerSide(gBattleAttacker) != GetBattlerSide(gBattleDefender))
+                if (GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gBattleMoveTarget))
                 {
-                    gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleDefender) ^ BIT_FLANK);
+                    gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveTarget) ^ BIT_FLANK);
                 }
                 else
                 {
-                    gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_SIDE);
-                    if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
-                        gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleDefender) ^ BIT_FLANK);
+                    gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_SIDE);
+                    if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
+                        gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveTarget) ^ BIT_FLANK);
                 }
             }
         }
@@ -5152,65 +5152,65 @@ static void HandleAction_UseMove(void)
             gActiveBattler = gBattleTurnOrder[var];
             RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability);
             gSpecialStatuses[gActiveBattler].lightningRodRedirected = 1;
-            gBattleDefender = gActiveBattler;
+            gBattleMoveTarget = gActiveBattler;
         }
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
              && gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
     {
-        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
         {
             if (Random() & 1)
-                gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+                gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
             else
-                gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+                gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
         }
         else
         {
             if (Random() & 1)
-                gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+                gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
             else
-                gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
+                gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
         }
 
-        if (gAbsentBattlerFlags & gBitTable[gBattleDefender]
-            && GetBattlerSide(gBattleAttacker) != GetBattlerSide(gBattleDefender))
+        if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]
+            && GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gBattleMoveTarget))
         {
-            gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleDefender) ^ BIT_FLANK);
+            gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveTarget) ^ BIT_FLANK);
         }
     }
     else
     {
-        gBattleDefender = *(gBattleStruct->moveTarget + gBattleAttacker);
-        if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
+        gBattleMoveTarget = *(gBattleStruct->moveTarget + gBattleMoveAttacker);
+        if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
         {
-            if (GetBattlerSide(gBattleAttacker) != GetBattlerSide(gBattleDefender))
+            if (GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gBattleMoveTarget))
             {
-                gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleDefender) ^ BIT_FLANK);
+                gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveTarget) ^ BIT_FLANK);
             }
             else
             {
-                gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_SIDE);
-                if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
-                    gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleDefender) ^ BIT_FLANK);
+                gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_SIDE);
+                if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
+                    gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveTarget) ^ BIT_FLANK);
             }
         }
     }
 
     // choose battlescript
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-        && gProtectStructs[gBattleAttacker].flag_x10)
+        && gProtectStructs[gBattleMoveAttacker].flag_x10)
     {
-        if (gBattleMons[gBattleAttacker].hp == 0)
+        if (gBattleMons[gBattleMoveAttacker].hp == 0)
         {
             gCurrentActionFuncId = 12;
             return;
         }
-        else if (gPalaceSelectionBattleScripts[gBattleAttacker] != NULL)
+        else if (gPalaceSelectionBattleScripts[gBattleMoveAttacker] != NULL)
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBattleAttacker];
-            gPalaceSelectionBattleScripts[gBattleAttacker] = NULL;
+            gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBattleMoveAttacker];
+            gPalaceSelectionBattleScripts[gBattleMoveAttacker] = NULL;
         }
         else
         {
@@ -5224,22 +5224,22 @@ static void HandleAction_UseMove(void)
     }
 
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-        sub_81A56E8(gBattleAttacker);
+        sub_81A56E8(gBattleMoveAttacker);
 
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
 
 static void HandleAction_Switch(void)
 {
-    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    gActionSelectionCursor[gBattleAttacker] = 0;
-    gMoveSelectionCursor[gBattleAttacker] = 0;
+    gActionSelectionCursor[gBattleMoveAttacker] = 0;
+    gMoveSelectionCursor[gBattleMoveAttacker] = 0;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleAttacker, *(gBattleStruct->field_58 + gBattleAttacker))
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleMoveAttacker, *(gBattleStruct->field_58 + gBattleMoveAttacker))
 
-    gBattleScripting.battler = gBattleAttacker;
+    gBattleScripting.battler = gBattleMoveAttacker;
     gBattlescriptCurrInstr = BattleScript_ActionSwitch;
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 
@@ -5249,11 +5249,11 @@ static void HandleAction_Switch(void)
 
 static void HandleAction_UseItem(void)
 {
-    gBattleAttacker = gBattleDefender = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattleMoveAttacker = gBattleMoveTarget = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    ClearFuryCutterDestinyBondGrudge(gBattleAttacker);
-    gLastUsedItem = gBattleBufferB[gBattleAttacker][1] | (gBattleBufferB[gBattleAttacker][2] << 8);
+    ClearFuryCutterDestinyBondGrudge(gBattleMoveAttacker);
+    gLastUsedItem = gBattleBufferB[gBattleMoveAttacker][1] | (gBattleBufferB[gBattleMoveAttacker][2] << 8);
 
     if (gLastUsedItem <= ITEM_PREMIER_BALL) // is ball
     {
@@ -5263,38 +5263,38 @@ static void HandleAction_UseItem(void)
     {
         gBattlescriptCurrInstr = gBattlescriptsForRunningByItem[0];
     }
-    else if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+    else if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
     {
         gBattlescriptCurrInstr = gBattlescriptsForUsingItem[0];
     }
     else
     {
-        gBattleScripting.battler = gBattleAttacker;
+        gBattleScripting.battler = gBattleMoveAttacker;
 
-        switch (*(gBattleStruct->AI_itemType + (gBattleAttacker >> 1)))
+        switch (*(gBattleStruct->AI_itemType + (gBattleMoveAttacker >> 1)))
         {
         case AI_ITEM_FULL_RESTORE:
         case AI_ITEM_HEAL_HP:
             break;
         case AI_ITEM_CURE_CONDITION:
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-            if (*(gBattleStruct->AI_itemFlags + gBattleAttacker / 2) & 1)
+            if (*(gBattleStruct->AI_itemFlags + gBattleMoveAttacker / 2) & 1)
             {
-                if (*(gBattleStruct->AI_itemFlags + gBattleAttacker / 2) & 0x3E)
+                if (*(gBattleStruct->AI_itemFlags + gBattleMoveAttacker / 2) & 0x3E)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 5;
             }
             else
             {
-                while (!(*(gBattleStruct->AI_itemFlags + gBattleAttacker / 2) & 1))
+                while (!(*(gBattleStruct->AI_itemFlags + gBattleMoveAttacker / 2) & 1))
                 {
-                    *(gBattleStruct->AI_itemFlags + gBattleAttacker / 2) >>= 1;
+                    *(gBattleStruct->AI_itemFlags + gBattleMoveAttacker / 2) >>= 1;
                     gBattleCommunication[MULTISTRING_CHOOSER]++;
                 }
             }
             break;
         case AI_ITEM_X_STAT:
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            if (*(gBattleStruct->AI_itemFlags + (gBattleAttacker >> 1)) & 0x80)
+            if (*(gBattleStruct->AI_itemFlags + (gBattleMoveAttacker >> 1)) & 0x80)
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = 5;
             }
@@ -5303,9 +5303,9 @@ static void HandleAction_UseItem(void)
                 PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK)
                 PREPARE_STRING_BUFFER(gBattleTextBuff2, 0xD2)
 
-                while (!((*(gBattleStruct->AI_itemFlags + (gBattleAttacker >> 1))) & 1))
+                while (!((*(gBattleStruct->AI_itemFlags + (gBattleMoveAttacker >> 1))) & 1))
                 {
-                    *(gBattleStruct->AI_itemFlags + gBattleAttacker / 2) >>= 1;
+                    *(gBattleStruct->AI_itemFlags + gBattleMoveAttacker / 2) >>= 1;
                     gBattleTextBuff1[2]++;
                 }
 
@@ -5321,7 +5321,7 @@ static void HandleAction_UseItem(void)
             break;
         }
 
-        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[*(gBattleStruct->AI_itemType + gBattleAttacker / 2)];
+        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[*(gBattleStruct->AI_itemType + gBattleMoveAttacker / 2)];
     }
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
@@ -5408,7 +5408,7 @@ bool8 TryRunFromBattle(u8 bank)
 
 static void HandleAction_Run(void)
 {
-    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
 
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
     {
@@ -5433,11 +5433,11 @@ static void HandleAction_Run(void)
     }
     else
     {
-        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
         {
-            if (!TryRunFromBattle(gBattleAttacker)) // failed to run away
+            if (!TryRunFromBattle(gBattleMoveAttacker)) // failed to run away
             {
-                ClearFuryCutterDestinyBondGrudge(gBattleAttacker);
+                ClearFuryCutterDestinyBondGrudge(gBattleMoveAttacker);
                 gBattleCommunication[MULTISTRING_CHOOSER] = 3;
                 gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
                 gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
@@ -5445,7 +5445,7 @@ static void HandleAction_Run(void)
         }
         else
         {
-            if (gBattleMons[gBattleAttacker].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
+            if (gBattleMons[gBattleMoveAttacker].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = 4;
                 gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
@@ -5462,7 +5462,7 @@ static void HandleAction_Run(void)
 
 static void HandleAction_WatchesCarefully(void)
 {
-    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
     gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0];
@@ -5471,7 +5471,7 @@ static void HandleAction_WatchesCarefully(void)
 
 static void HandleAction_SafariZoneBallThrow(void)
 {
-    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
     gNumSafariBalls--;
@@ -5482,11 +5482,11 @@ static void HandleAction_SafariZoneBallThrow(void)
 
 static void HandleAction_ThrowPokeblock(void)
 {
-    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattleAttacker][1] - 1;
-    gLastUsedItem = gBattleBufferB[gBattleAttacker][2];
+    gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattleMoveAttacker][1] - 1;
+    gLastUsedItem = gBattleBufferB[gBattleMoveAttacker][2];
 
     if (gBattleResults.field_1F < 0xFF)
         gBattleResults.field_1F++;
@@ -5506,7 +5506,7 @@ static void HandleAction_ThrowPokeblock(void)
 
 static void HandleAction_GoNear(void)
 {
-    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
 
@@ -5533,7 +5533,7 @@ static void HandleAction_GoNear(void)
 
 static void HandleAction_SafriZoneRun(void)
 {
-    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     PlaySE(SE_NIGERU);
     gCurrentTurnActionNumber = gBattlersCount;
     gBattleOutcome = B_OUTCOME_RAN;
@@ -5541,11 +5541,11 @@ static void HandleAction_SafriZoneRun(void)
 
 static void HandleAction_Action9(void)
 {
-    gBattleAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleAttacker, gBattlePartyID[gBattleAttacker])
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleMoveAttacker, gBattlerPartyIndexes[gBattleMoveAttacker])
 
     gBattlescriptCurrInstr = gBattlescriptsForSafariActions[3];
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
@@ -5589,8 +5589,8 @@ static void HandleAction_ActionFinished(void)
     gMoveResultFlags = 0;
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
-    gLastLandedMoves[gBattleAttacker] = 0;
-    gLastHitByType[gBattleAttacker] = 0;
+    gLastLandedMoves[gBattleMoveAttacker] = 0;
+    gLastHitByType[gBattleMoveAttacker] = 0;
     gBattleStruct->dynamicMoveType = 0;
     gDynamicBasePower = 0;
     gBattleScripting.atk49_state = 0;
diff --git a/src/battle_message.c b/src/battle_message.c
index 3bfa5b48d..07e5b2d60 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -17,8 +17,8 @@
 extern u16 gLastUsedItem;
 extern u8 gLastUsedAbility;
 extern u8 gActiveBattler;
-extern u8 gBattleAttacker;
-extern u8 gBattleDefender;
+extern u8 gBattleMoveAttacker;
+extern u8 gBattleMoveTarget;
 extern u8 gStringBank;
 extern u8 gEffectBank;
 extern u8 gAbilitiesPerBank[MAX_BATTLERS_COUNT];
@@ -26,7 +26,7 @@ extern u32 gBattleTypeFlags;
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u16 gPartnerTrainerId;
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
@@ -1836,80 +1836,80 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gStringVar3;
                 break;
             case B_TXT_PLAYER_MON1_NAME: // first player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]],
+                GetMonData(&gPlayerParty[gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_OPPONENT_MON1_NAME: // first enemy poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)]],
+                GetMonData(&gEnemyParty[gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_PLAYER_MON2_NAME: // second player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)]],
+                GetMonData(&gPlayerParty[gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_OPPONENT_MON2_NAME: // second enemy poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]],
+                GetMonData(&gEnemyParty[gBattlerPartyIndexes[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_LINK_PLAYER_MON1_NAME: // link first player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[gLinkPlayers[multiplayerID].lp_field_18]],
+                GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_LINK_OPPONENT_MON1_NAME: // link first opponent poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[gLinkPlayers[multiplayerID].lp_field_18 ^ 1]],
+                GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18 ^ 1]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_LINK_PLAYER_MON2_NAME: // link second player poke name
-                GetMonData(&gPlayerParty[gBattlePartyID[gLinkPlayers[multiplayerID].lp_field_18 ^ 2]],
+                GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18 ^ 2]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_LINK_OPPONENT_MON2_NAME: // link second opponent poke name
-                GetMonData(&gEnemyParty[gBattlePartyID[gLinkPlayers[multiplayerID].lp_field_18 ^ 3]],
+                GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18 ^ 3]],
                            MON_DATA_NICKNAME, text);
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_ATK_NAME_WITH_PREFIX_MON1: // attacker name with prefix, only bank 0/1
-                HANDLE_NICKNAME_STRING_CASE(gBattleAttacker,
-                                            gBattlePartyID[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleAttacker))])
+                HANDLE_NICKNAME_STRING_CASE(gBattleMoveAttacker,
+                                            gBattlerPartyIndexes[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleMoveAttacker))])
                 break;
             case B_TXT_ATK_PARTNER_NAME: // attacker partner name
-                if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
-                    GetMonData(&gPlayerParty[gBattlePartyID[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleAttacker)) + 2]], MON_DATA_NICKNAME, text);
+                if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+                    GetMonData(&gPlayerParty[gBattlerPartyIndexes[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleMoveAttacker)) + 2]], MON_DATA_NICKNAME, text);
                 else
-                    GetMonData(&gEnemyParty[gBattlePartyID[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleAttacker)) + 2]], MON_DATA_NICKNAME, text);
+                    GetMonData(&gEnemyParty[gBattlerPartyIndexes[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleMoveAttacker)) + 2]], MON_DATA_NICKNAME, text);
 
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_ATK_NAME_WITH_PREFIX: // attacker name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gBattleAttacker, gBattlePartyID[gBattleAttacker])
+                HANDLE_NICKNAME_STRING_CASE(gBattleMoveAttacker, gBattlerPartyIndexes[gBattleMoveAttacker])
                 break;
             case B_TXT_DEF_NAME_WITH_PREFIX: // target name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gBattleDefender, gBattlePartyID[gBattleDefender])
+                HANDLE_NICKNAME_STRING_CASE(gBattleMoveTarget, gBattlerPartyIndexes[gBattleMoveTarget])
                 break;
             case B_TXT_EFF_NAME_WITH_PREFIX: // effect bank name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gEffectBank, gBattlePartyID[gEffectBank])
+                HANDLE_NICKNAME_STRING_CASE(gEffectBank, gBattlerPartyIndexes[gEffectBank])
                 break;
             case B_TXT_ACTIVE_NAME_WITH_PREFIX: // active bank name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gActiveBattler, gBattlePartyID[gActiveBattler])
+                HANDLE_NICKNAME_STRING_CASE(gActiveBattler, gBattlerPartyIndexes[gActiveBattler])
                 break;
             case B_TXT_SCR_ACTIVE_NAME_WITH_PREFIX: // scripting active bank name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler, gBattlePartyID[gBattleScripting.battler])
+                HANDLE_NICKNAME_STRING_CASE(gBattleScripting.battler, gBattlerPartyIndexes[gBattleScripting.battler])
                 break;
             case B_TXT_CURRENT_MOVE: // current move name
                 if (gStringInfo->currentMove > LAST_MOVE_INDEX)
@@ -1970,10 +1970,10 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gAbilityNames[gLastUsedAbility];
                 break;
             case B_TXT_ATK_ABILITY: // attacker ability
-                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleAttacker]];
+                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleMoveAttacker]];
                 break;
             case B_TXT_DEF_ABILITY: // target ability
-                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleDefender]];
+                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleMoveTarget]];
                 break;
             case B_TXT_SCR_ACTIVE_ABILITY: // scripting active ability
                 toCpy = gAbilityNames[gAbilitiesPerBank[gBattleScripting.battler]];
@@ -2039,16 +2039,16 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gLinkPlayers[multiplayerID].name;
                 break;
             case B_TXT_1F: // link partner name?
-                toCpy = gLinkPlayers[GetBankMultiplayerId(2 ^ gLinkPlayers[multiplayerID].lp_field_18)].name;
+                toCpy = gLinkPlayers[GetBattlerMultiplayerId(2 ^ gLinkPlayers[multiplayerID].lp_field_18)].name;
                 break;
             case B_TXT_20: // link opponent 1 name?
-                toCpy = gLinkPlayers[GetBankMultiplayerId(1 ^ gLinkPlayers[multiplayerID].lp_field_18)].name;
+                toCpy = gLinkPlayers[GetBattlerMultiplayerId(1 ^ gLinkPlayers[multiplayerID].lp_field_18)].name;
                 break;
             case B_TXT_21: // link opponent 2 name?
-                toCpy = gLinkPlayers[GetBankMultiplayerId(3 ^ gLinkPlayers[multiplayerID].lp_field_18)].name;
+                toCpy = gLinkPlayers[GetBattlerMultiplayerId(3 ^ gLinkPlayers[multiplayerID].lp_field_18)].name;
                 break;
             case B_TXT_22: // link scripting active name
-                toCpy = gLinkPlayers[GetBankMultiplayerId(gBattleScripting.battler)].name;
+                toCpy = gLinkPlayers[GetBattlerMultiplayerId(gBattleScripting.battler)].name;
                 break;
             case B_TXT_PLAYER_NAME: // player name
                 if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
@@ -2094,37 +2094,37 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                     toCpy = gText_Someones;
                 break;
             case B_TXT_ATK_PREFIX2:
-                if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix2;
                 else
                     toCpy = gText_FoePkmnPrefix3;
                 break;
             case B_TXT_DEF_PREFIX2:
-                if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix2;
                 else
                     toCpy = gText_FoePkmnPrefix3;
                 break;
             case B_TXT_ATK_PREFIX1:
-                if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix;
                 else
                     toCpy = gText_FoePkmnPrefix2;
                 break;
             case B_TXT_DEF_PREFIX1:
-                if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix;
                 else
                     toCpy = gText_FoePkmnPrefix2;
                 break;
             case B_TXT_ATK_PREFIX3:
-                if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix3;
                 else
                     toCpy = gText_FoePkmnPrefix4;
                 break;
             case B_TXT_DEF_PREFIX3:
-                if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix3;
                 else
                     toCpy = gText_FoePkmnPrefix4;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 8f3036028..c443c5449 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -47,9 +47,9 @@ extern s32 gBattleMoveDamage;
 extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern u8 gActiveBattler;
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u8 gBattlersCount;
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
 extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
 extern u16 gCurrentMove;
@@ -62,8 +62,8 @@ extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
 extern u16 gPauseCounterBattle;
 extern u16 gPaydayMoney;
 extern u16 gRandomTurnNumber;
-extern u8 gBattleAttacker;
-extern u8 gBattleDefender;
+extern u8 gBattleMoveAttacker;
+extern u8 gBattleMoveTarget;
 extern const u8* gBattlescriptCurrInstr;
 extern u8 gCurrMovePos;
 extern u8 gCurrentActionFuncId;
@@ -155,10 +155,10 @@ extern const u8 gText_BattleYesNoChoice[];
 #define BS2ScriptRead16(ptr) ((ptr)[0] + ((ptr)[1] << 8))
 #define BS2ScriptReadPtr(ptr) ((void *)BS2ScriptRead32(ptr))
 
-#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattleDefender].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
+#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattleMoveTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
 
-#define TARGET_TURN_DAMAGED (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical != 0 \
-                          || gSpecialStatuses[gBattleDefender].moveturnLostHP_special != 0)
+#define TARGET_TURN_DAMAGED (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical != 0 \
+                          || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special != 0)
 
 // this file's functions
 static bool8 IsTwoTurnsMove(u16 move);
@@ -1027,7 +1027,7 @@ static void atk00_attackcanceler(void)
         gCurrentActionFuncId = ACTION_FINISHED;
         return;
     }
-    if (gBattleMons[gBattleAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
+    if (gBattleMons[gBattleMoveAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
     {
         gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
         gBattlescriptCurrInstr = BattleScript_MoveEnd;
@@ -1035,10 +1035,10 @@ static void atk00_attackcanceler(void)
     }
     if (AtkCanceller_UnableToUseMove())
         return;
-    if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattleDefender, 0, 0, 0))
+    if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattleMoveTarget, 0, 0, 0))
         return;
-    if (!gBattleMons[gBattleAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200)
-     && !(gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS))
+    if (!gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200)
+     && !(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
         gBattlescriptCurrInstr = BattleScript_NoPPForMove;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
@@ -1047,7 +1047,7 @@ static void atk00_attackcanceler(void)
 
     gHitMarker &= ~(HITMARKER_x800000);
 
-    if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS))
+    if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
         i = IsMonDisobedient(); // why use the 'i' variable...?
         switch (i)
@@ -1065,10 +1065,10 @@ static void atk00_attackcanceler(void)
 
     gHitMarker |= HITMARKER_OBEYS;
 
-    if (gProtectStructs[gBattleDefender].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED)
+    if (gProtectStructs[gBattleMoveTarget].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED)
     {
-        PressurePPLose(gBattleAttacker, gBattleDefender, MOVE_MAGIC_COAT);
-        gProtectStructs[gBattleDefender].bounceMove = 0;
+        PressurePPLose(gBattleMoveAttacker, gBattleMoveTarget, MOVE_MAGIC_COAT);
+        gProtectStructs[gBattleMoveTarget].bounceMove = 0;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_MagicCoatBounce;
         return;
@@ -1078,7 +1078,7 @@ static void atk00_attackcanceler(void)
     {
         if ((gProtectStructs[gBattleTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
         {
-            PressurePPLose(gBattleAttacker, gBattleTurnOrder[i], MOVE_SNATCH);
+            PressurePPLose(gBattleMoveAttacker, gBattleTurnOrder[i], MOVE_SNATCH);
             gProtectStructs[gBattleTurnOrder[i]].stealMove = 0;
             gBattleScripting.battler = gBattleTurnOrder[i];
             BattleScriptPushCursor();
@@ -1087,22 +1087,22 @@ static void atk00_attackcanceler(void)
         }
     }
 
-    if (gSpecialStatuses[gBattleDefender].lightningRodRedirected)
+    if (gSpecialStatuses[gBattleMoveTarget].lightningRodRedirected)
     {
-        gSpecialStatuses[gBattleDefender].lightningRodRedirected = 0;
+        gSpecialStatuses[gBattleMoveTarget].lightningRodRedirected = 0;
         gLastUsedAbility = ABILITY_LIGHTNING_ROD;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_TookAttack;
-        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
     }
     else if (DEFENDER_IS_PROTECTED
-     && (gCurrentMove != MOVE_CURSE || (gBattleMons[gBattleAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleAttacker].type2 == TYPE_GHOST))
-     && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS))))
+     && (gCurrentMove != MOVE_CURSE || (gBattleMons[gBattleMoveAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleMoveAttacker].type2 == TYPE_GHOST))
+     && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS))))
     {
-        CancelMultiTurnMoves(gBattleAttacker);
+        CancelMultiTurnMoves(gBattleMoveAttacker);
         gMoveResultFlags |= MOVE_RESULT_MISSED;
-        gLastLandedMoves[gBattleDefender] = 0;
-        gLastHitByType[gBattleDefender] = 0;
+        gLastLandedMoves[gBattleMoveTarget] = 0;
+        gLastHitByType[gBattleMoveTarget] = 0;
         gBattleCommunication[6] = 1;
         gBattlescriptCurrInstr++;
     }
@@ -1117,14 +1117,14 @@ static void JumpIfMoveFailed(u8 adder, u16 move)
     const u8 *BS_ptr = gBattlescriptCurrInstr + adder;
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
-        gLastLandedMoves[gBattleDefender] = 0;
-        gLastHitByType[gBattleDefender] = 0;
+        gLastLandedMoves[gBattleMoveTarget] = 0;
+        gLastHitByType[gBattleMoveTarget] = 0;
         BS_ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
         TrySetDestinyBondToHappen();
-        if (AbilityBattleEffects(ABILITYEFFECT_ABSORBING, gBattleDefender, 0, 0, move))
+        if (AbilityBattleEffects(ABILITYEFFECT_ABSORBING, gBattleMoveTarget, 0, 0, move))
             return;
     }
     gBattlescriptCurrInstr = BS_ptr;
@@ -1159,13 +1159,13 @@ bool8 JumpIfMoveAffectedByProtect(u16 move)
 
 static bool8 AccuracyCalcHelper(u16 move)
 {
-    if (gStatuses3[gBattleDefender] & STATUS3_ALWAYS_HITS && gDisableStructs[gBattleDefender].bankWithSureHit == gBattleAttacker)
+    if (gStatuses3[gBattleMoveTarget] & STATUS3_ALWAYS_HITS && gDisableStructs[gBattleMoveTarget].bankWithSureHit == gBattleMoveAttacker)
     {
         JumpIfMoveFailed(7, move);
         return TRUE;
     }
 
-    if (!(gHitMarker & HITMARKER_IGNORE_ON_AIR) && gStatuses3[gBattleDefender] & STATUS3_ON_AIR)
+    if (!(gHitMarker & HITMARKER_IGNORE_ON_AIR) && gStatuses3[gBattleMoveTarget] & STATUS3_ON_AIR)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
@@ -1174,7 +1174,7 @@ static bool8 AccuracyCalcHelper(u16 move)
 
     gHitMarker &= ~HITMARKER_IGNORE_ON_AIR;
 
-    if (!(gHitMarker & HITMARKER_IGNORE_UNDERGROUND) && gStatuses3[gBattleDefender] & STATUS3_UNDERGROUND)
+    if (!(gHitMarker & HITMARKER_IGNORE_UNDERGROUND) && gStatuses3[gBattleMoveTarget] & STATUS3_UNDERGROUND)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
@@ -1183,7 +1183,7 @@ static bool8 AccuracyCalcHelper(u16 move)
 
     gHitMarker &= ~HITMARKER_IGNORE_UNDERGROUND;
 
-    if (!(gHitMarker & HITMARKER_IGNORE_UNDERWATER) && gStatuses3[gBattleDefender] & STATUS3_UNDERWATER)
+    if (!(gHitMarker & HITMARKER_IGNORE_UNDERWATER) && gStatuses3[gBattleMoveTarget] & STATUS3_UNDERWATER)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
@@ -1208,9 +1208,9 @@ static void atk01_accuracycheck(void)
 
     if (move == 0xFFFE || move == 0xFFFF)
     {
-        if (gStatuses3[gBattleDefender] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBattleDefender].bankWithSureHit == gBattleAttacker)
+        if (gStatuses3[gBattleMoveTarget] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBattleMoveTarget].bankWithSureHit == gBattleMoveAttacker)
             gBattlescriptCurrInstr += 7;
-        else if (gStatuses3[gBattleDefender] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
+        else if (gStatuses3[gBattleMoveTarget] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         else if (!JumpIfMoveAffectedByProtect(0))
             gBattlescriptCurrInstr += 7;
@@ -1231,15 +1231,15 @@ static void atk01_accuracycheck(void)
         if (AccuracyCalcHelper(move))
             return;
 
-        if (gBattleMons[gBattleDefender].status2 & STATUS2_FORESIGHT)
+        if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_FORESIGHT)
         {
-            u8 acc = gBattleMons[gBattleAttacker].statStages[STAT_STAGE_ACC];
+            u8 acc = gBattleMons[gBattleMoveAttacker].statStages[STAT_STAGE_ACC];
             buff = acc;
         }
         else
         {
-            u8 acc = gBattleMons[gBattleAttacker].statStages[STAT_STAGE_ACC];
-            buff = acc + 6 - gBattleMons[gBattleDefender].statStages[STAT_STAGE_EVASION];
+            u8 acc = gBattleMons[gBattleMoveAttacker].statStages[STAT_STAGE_ACC];
+            buff = acc + 6 - gBattleMons[gBattleMoveTarget].statStages[STAT_STAGE_EVASION];
         }
 
         if (buff < 0)
@@ -1255,25 +1255,25 @@ static void atk01_accuracycheck(void)
         calc = sAccuracyStageRatios[buff].dividend * moveAcc;
         calc /= sAccuracyStageRatios[buff].divisor;
 
-        if (gBattleMons[gBattleAttacker].ability == ABILITY_COMPOUND_EYES)
+        if (gBattleMons[gBattleMoveAttacker].ability == ABILITY_COMPOUND_EYES)
             calc = (calc * 130) / 100; // 1.3 compound eyes boost
-        if (WEATHER_HAS_EFFECT && gBattleMons[gBattleDefender].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY)
+        if (WEATHER_HAS_EFFECT && gBattleMons[gBattleMoveTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY)
             calc = (calc * 80) / 100; // 1.2 sand veil loss
-        if (gBattleMons[gBattleAttacker].ability == ABILITY_HUSTLE && type < 9)
+        if (gBattleMons[gBattleMoveAttacker].ability == ABILITY_HUSTLE && type < 9)
             calc = (calc * 80) / 100; // 1.2 hustle loss
 
-        if (gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY)
+        if (gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY)
         {
-            holdEffect = gEnigmaBerries[gBattleDefender].holdEffect;
-            quality = gEnigmaBerries[gBattleDefender].holdEffectParam;
+            holdEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect;
+            quality = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
         }
         else
         {
-            holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleDefender].item);
-            quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleDefender].item);
+            holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleMoveTarget].item);
+            quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleMoveTarget].item);
         }
 
-        gStringBank = gBattleDefender;
+        gStringBank = gBattleMoveTarget;
 
         if (holdEffect == HOLD_EFFECT_EVASION_UP)
             calc = (calc * (100 - quality)) / 100;
@@ -1296,11 +1296,11 @@ static void atk01_accuracycheck(void)
 
 static void atk02_attackstring(void)
 {
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
          return;
     if (!(gHitMarker & (HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED)))
     {
-        PrepareStringBattle(STRINGID_USEDMOVE, gBattleAttacker);
+        PrepareStringBattle(STRINGID_USEDMOVE, gBattleMoveAttacker);
         gHitMarker |= HITMARKER_ATTACKSTRING_PRINTED;
     }
     gBattlescriptCurrInstr++;
@@ -1311,42 +1311,42 @@ static void atk03_ppreduce(void)
 {
     s32 ppToDeduct = 1;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
-    if (!gSpecialStatuses[gBattleAttacker].flag20)
+    if (!gSpecialStatuses[gBattleMoveAttacker].flag20)
     {
         switch (gBattleMoves[gCurrentMove].target)
         {
         case MOVE_TARGET_FOES_AND_ALLY:
-            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBattleAttacker, ABILITY_PRESSURE, 0, 0);
+            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBattleMoveAttacker, ABILITY_PRESSURE, 0, 0);
             break;
         case MOVE_TARGET_BOTH:
         case MOVE_TARGET_OPPONENTS_FIELD:
-            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattleAttacker, ABILITY_PRESSURE, 0, 0);
+            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattleMoveAttacker, ABILITY_PRESSURE, 0, 0);
             break;
         default:
-            if (gBattleAttacker != gBattleDefender && gBattleMons[gBattleDefender].ability == ABILITY_PRESSURE)
+            if (gBattleMoveAttacker != gBattleMoveTarget && gBattleMons[gBattleMoveTarget].ability == ABILITY_PRESSURE)
                 ppToDeduct++;
             break;
         }
     }
 
-    if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBattleAttacker].pp[gCurrMovePos])
+    if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos])
     {
-        gProtectStructs[gBattleAttacker].notFirstStrike = 1;
+        gProtectStructs[gBattleMoveAttacker].notFirstStrike = 1;
 
-        if (gBattleMons[gBattleAttacker].pp[gCurrMovePos] > ppToDeduct)
-            gBattleMons[gBattleAttacker].pp[gCurrMovePos] -= ppToDeduct;
+        if (gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] > ppToDeduct)
+            gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] -= ppToDeduct;
         else
-            gBattleMons[gBattleAttacker].pp[gCurrMovePos] = 0;
+            gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] = 0;
 
-        if (!(gBattleMons[gBattleAttacker].status2 & STATUS2_TRANSFORMED)
-            && !((gDisableStructs[gBattleAttacker].unk18_b) & gBitTable[gCurrMovePos]))
+        if (!(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_TRANSFORMED)
+            && !((gDisableStructs[gBattleMoveAttacker].unk18_b) & gBitTable[gCurrMovePos]))
         {
-            gActiveBattler = gBattleAttacker;
-            EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattleAttacker].pp[gCurrMovePos]);
-            MarkBufferBankForExecution(gBattleAttacker);
+            gActiveBattler = gBattleMoveAttacker;
+            BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos]);
+            MarkBattlerForControllerExec(gBattleMoveAttacker);
         }
     }
 
@@ -1359,29 +1359,29 @@ static void atk04_critcalc(void)
     u8 holdEffect;
     u16 item, critChance;
 
-    item = gBattleMons[gBattleAttacker].item;
+    item = gBattleMons[gBattleMoveAttacker].item;
 
     if (item == ITEM_ENIGMA_BERRY)
-        holdEffect = gEnigmaBerries[gBattleAttacker].holdEffect;
+        holdEffect = gEnigmaBerries[gBattleMoveAttacker].holdEffect;
     else
         holdEffect = ItemId_GetHoldEffect(item);
 
-    gStringBank = gBattleAttacker;
+    gStringBank = gBattleMoveAttacker;
 
-    critChance  = 2 * ((gBattleMons[gBattleAttacker].status2 & STATUS2_FOCUS_ENERGY) != 0)
+    critChance  = 2 * ((gBattleMons[gBattleMoveAttacker].status2 & STATUS2_FOCUS_ENERGY) != 0)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_HIGH_CRITICAL)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_SKY_ATTACK)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_BLAZE_KICK)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_POISON_TAIL)
                 + (holdEffect == HOLD_EFFECT_SCOPE_LENS)
-                + 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBattleAttacker].species == SPECIES_CHANSEY)
-                + 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBattleAttacker].species == SPECIES_FARFETCHD);
+                + 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBattleMoveAttacker].species == SPECIES_CHANSEY)
+                + 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBattleMoveAttacker].species == SPECIES_FARFETCHD);
 
     if (critChance > 4)
         critChance = 4;
 
-    if ((gBattleMons[gBattleDefender].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBattleDefender].ability != ABILITY_SHELL_ARMOR)
-     && !(gStatuses3[gBattleAttacker] & STATUS3_CANT_SCORE_A_CRIT)
+    if ((gBattleMons[gBattleMoveTarget].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBattleMoveTarget].ability != ABILITY_SHELL_ARMOR)
+     && !(gStatuses3[gBattleMoveAttacker] & STATUS3_CANT_SCORE_A_CRIT)
      && !(gBattleTypeFlags & (BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_FIRST_BATTLE))
      && !(Random() % sCriticalHitChance[critChance]))
         gCritMultiplier = 2;
@@ -1393,15 +1393,15 @@ static void atk04_critcalc(void)
 
 static void atk05_damagecalc(void)
 {
-    u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(gBattleDefender)];
-    gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleAttacker], &gBattleMons[gBattleDefender], gCurrentMove,
+    u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(gBattleMoveTarget)];
+    gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleMoveAttacker], &gBattleMons[gBattleMoveTarget], gCurrentMove,
                                             sideStatus, gDynamicBasePower,
-                                            gBattleStruct->dynamicMoveType, gBattleAttacker, gBattleDefender);
+                                            gBattleStruct->dynamicMoveType, gBattleMoveAttacker, gBattleMoveTarget);
     gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleScripting.dmgMultiplier;
 
-    if (gStatuses3[gBattleAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
+    if (gStatuses3[gBattleMoveAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
         gBattleMoveDamage *= 2;
-    if (gProtectStructs[gBattleAttacker].helpingHand)
+    if (gProtectStructs[gBattleMoveAttacker].helpingHand)
         gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
 
     gBattlescriptCurrInstr++;
@@ -1470,20 +1470,20 @@ static void atk06_typecalc(void)
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
     // check stab
-    if (gBattleMons[gBattleAttacker].type1 == moveType || gBattleMons[gBattleAttacker].type2 == moveType)
+    if (gBattleMons[gBattleMoveAttacker].type1 == moveType || gBattleMons[gBattleMoveAttacker].type2 == moveType)
     {
         gBattleMoveDamage = gBattleMoveDamage * 15;
         gBattleMoveDamage = gBattleMoveDamage / 10;
     }
 
-    if (gBattleMons[gBattleDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
-        gLastUsedAbility = gBattleMons[gBattleDefender].ability;
+        gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
         gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
-        gLastLandedMoves[gBattleDefender] = 0;
-        gLastHitByType[gBattleDefender] = 0;
+        gLastLandedMoves[gBattleMoveTarget] = 0;
+        gLastHitByType[gBattleMoveTarget] = 0;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
     }
     else
     {
@@ -1491,7 +1491,7 @@ static void atk06_typecalc(void)
         {
             if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
-                if (gBattleMons[gBattleDefender].status2 & STATUS2_FORESIGHT)
+                if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_FORESIGHT)
                     break;
                 i += 3;
                 continue;
@@ -1499,30 +1499,30 @@ static void atk06_typecalc(void)
             else if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type1)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type1)
                     ModulateDmgByType(TYPE_EFFECT_MULTIPLIER(i));
                 // check type2
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2 &&
-                    gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2 &&
+                    gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2)
                     ModulateDmgByType(TYPE_EFFECT_MULTIPLIER(i));
             }
             i += 3;
         }
     }
 
-    if (gBattleMons[gBattleDefender].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattleAttacker, gCurrentMove) == 2
+    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattleMoveAttacker, gCurrentMove) == 2
      && (!(gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) || ((gMoveResultFlags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
      && gBattleMoves[gCurrentMove].power)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
-        gLastLandedMoves[gBattleDefender] = 0;
-        gLastHitByType[gBattleDefender] = 0;
+        gLastLandedMoves[gBattleMoveTarget] = 0;
+        gLastHitByType[gBattleMoveTarget] = 0;
         gBattleCommunication[6] = 3;
-        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
     }
     if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
-        gProtectStructs[gBattleAttacker].targetNotAffected = 1;
+        gProtectStructs[gBattleMoveAttacker].targetNotAffected = 1;
 
     gBattlescriptCurrInstr++;
 }
@@ -1538,11 +1538,11 @@ static void CheckWonderGuardAndLevitate(void)
 
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
-    if (gBattleMons[gBattleDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
         gLastUsedAbility = ABILITY_LEVITATE;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBattleDefender, ABILITY_LEVITATE);
+        RecordAbilityBattle(gBattleMoveTarget, ABILITY_LEVITATE);
         return;
     }
 
@@ -1550,7 +1550,7 @@ static void CheckWonderGuardAndLevitate(void)
     {
         if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
         {
-            if (gBattleMons[gBattleDefender].status2 & STATUS2_FORESIGHT)
+            if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_FORESIGHT)
                 break;
             i += 3;
             continue;
@@ -1558,46 +1558,46 @@ static void CheckWonderGuardAndLevitate(void)
         if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
         {
             // check no effect
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type1
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type1
                 && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
             {
                 gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
-                gProtectStructs[gBattleAttacker].targetNotAffected = 1;
+                gProtectStructs[gBattleMoveAttacker].targetNotAffected = 1;
             }
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2 &&
-                gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2 &&
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2 &&
+                gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2 &&
                 TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
             {
                 gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
-                gProtectStructs[gBattleAttacker].targetNotAffected = 1;
+                gProtectStructs[gBattleMoveAttacker].targetNotAffected = 1;
             }
 
             // check super effective
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type1 && TYPE_EFFECT_MULTIPLIER(i) == 20)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 20)
                 flags |= 1;
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2
-             && gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2
+             && gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2
              && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                 flags |= 1;
 
             // check not very effective
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type1 && TYPE_EFFECT_MULTIPLIER(i) == 5)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 5)
                 flags |= 2;
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2
-             && gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2
+             && gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2
              && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                 flags |= 2;
         }
         i += 3;
     }
 
-    if (gBattleMons[gBattleDefender].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattleAttacker, gCurrentMove) == 2)
+    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattleMoveAttacker, gCurrentMove) == 2)
     {
         if (((flags & 2) || !(flags & 1)) && gBattleMoves[gCurrentMove].power)
         {
             gLastUsedAbility = ABILITY_WONDER_GUARD;
             gBattleCommunication[6] = 3;
-            RecordAbilityBattle(gBattleDefender, ABILITY_WONDER_GUARD);
+            RecordAbilityBattle(gBattleMoveTarget, ABILITY_WONDER_GUARD);
         }
     }
 }
@@ -1764,42 +1764,42 @@ static void atk07_adjustnormaldamage(void)
 
     ApplyRandomDmgMultiplier();
 
-    if (gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBattleDefender].holdEffect, quality = gEnigmaBerries[gBattleDefender].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect, quality = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleDefender].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleDefender].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleMoveTarget].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleMoveTarget].item);
     }
 
-    gStringBank = gBattleDefender;
+    gStringBank = gBattleMoveTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBattleDefender, holdEffect);
-        gSpecialStatuses[gBattleDefender].focusBanded = 1;
+        RecordItemEffectBattle(gBattleMoveTarget, holdEffect);
+        gSpecialStatuses[gBattleMoveTarget].focusBanded = 1;
     }
-    if (gBattleMons[gBattleDefender].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattleDefender].endured
-     && !gSpecialStatuses[gBattleDefender].focusBanded)
+    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattleMoveTarget].endured
+     && !gSpecialStatuses[gBattleMoveTarget].focusBanded)
         goto END;
 
-    if (gBattleMons[gBattleDefender].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattleMoveTarget].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBattleDefender].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - 1;
 
-    if (gProtectStructs[gBattleDefender].endured)
+    if (gProtectStructs[gBattleMoveTarget].endured)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBattleDefender].focusBanded)
+    else if (gSpecialStatuses[gBattleMoveTarget].focusBanded)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-        gLastUsedItem = gBattleMons[gBattleDefender].item;
+        gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
     }
 
     END:
@@ -1812,40 +1812,40 @@ static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't
 
     ApplyRandomDmgMultiplier();
 
-    if (gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBattleDefender].holdEffect, quality = gEnigmaBerries[gBattleDefender].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect, quality = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleDefender].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleDefender].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleMoveTarget].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleMoveTarget].item);
     }
 
-    gStringBank = gBattleDefender;
+    gStringBank = gBattleMoveTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBattleDefender, holdEffect);
-        gSpecialStatuses[gBattleDefender].focusBanded = 1;
+        RecordItemEffectBattle(gBattleMoveTarget, holdEffect);
+        gSpecialStatuses[gBattleMoveTarget].focusBanded = 1;
     }
-    if (gBattleMons[gBattleDefender].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (!gProtectStructs[gBattleDefender].endured && !gSpecialStatuses[gBattleDefender].focusBanded)
+    if (!gProtectStructs[gBattleMoveTarget].endured && !gSpecialStatuses[gBattleMoveTarget].focusBanded)
         goto END;
-    if (gBattleMons[gBattleDefender].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattleMoveTarget].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBattleDefender].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - 1;
 
-    if (gProtectStructs[gBattleDefender].endured)
+    if (gProtectStructs[gBattleMoveTarget].endured)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBattleDefender].focusBanded)
+    else if (gSpecialStatuses[gBattleMoveTarget].focusBanded)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-        gLastUsedItem = gBattleMons[gBattleDefender].item;
+        gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
     }
 
     END:
@@ -1854,7 +1854,7 @@ static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't
 
 static void atk09_attackanimation(void)
 {
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     if ((gHitMarker & HITMARKER_NO_ANIMATIONS) && (gCurrentMove != MOVE_TRANSFORM && gCurrentMove != MOVE_SUBSTITUTE))
@@ -1878,13 +1878,13 @@ static void atk09_attackanimation(void)
         {
             u8 multihit;
 
-            gActiveBattler = gBattleAttacker;
+            gActiveBattler = gBattleMoveAttacker;
 
-            if (gBattleMons[gBattleDefender].status2 & STATUS2_SUBSTITUTE)
+            if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_SUBSTITUTE)
                 multihit = gMultiHitCounter;
             else if (gMultiHitCounter != 0 && gMultiHitCounter != 1)
             {
-                if (gBattleMons[gBattleDefender].hp <= gBattleMoveDamage)
+                if (gBattleMons[gBattleMoveTarget].hp <= gBattleMoveDamage)
                     multihit = 1;
                 else
                     multihit = gMultiHitCounter;
@@ -1892,10 +1892,10 @@ static void atk09_attackanimation(void)
             else
                 multihit = gMultiHitCounter;
 
-            EmitMoveAnimation(0, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBattleAttacker].friendship, &gDisableStructs[gBattleAttacker], multihit);
+            BtlController_EmitMoveAnimation(0, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBattleMoveAttacker].friendship, &gDisableStructs[gBattleMoveAttacker], multihit);
             gBattleScripting.animTurn += 1;
             gBattleScripting.animTargetsHit += 1;
-            MarkBufferBankForExecution(gBattleAttacker);
+            MarkBattlerForControllerExec(gBattleMoveAttacker);
             gBattlescriptCurrInstr++;
         }
         else
@@ -1908,13 +1908,13 @@ static void atk09_attackanimation(void)
 
 static void atk0A_waitanimation(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
         gBattlescriptCurrInstr++;
 }
 
 static void atk0B_healthbarupdate(void)
 {
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
@@ -1937,8 +1937,8 @@ static void atk0B_healthbarupdate(void)
             else
                 healthValue = maxPossibleDmgValue;
 
-            EmitHealthBarUpdate(0, healthValue);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitHealthBarUpdate(0, healthValue);
+            MarkBattlerForControllerExec(gActiveBattler);
 
             if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleMoveDamage > 0)
                 gBattleResults.unk5_0 = 1;
@@ -1952,7 +1952,7 @@ static void atk0C_datahpupdate(void)
 {
     u32 moveType;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     if (gBattleStruct->dynamicMoveType == 0)
@@ -2010,9 +2010,9 @@ static void atk0C_datahpupdate(void)
                 {
                     gTakenDmg[gActiveBattler] += gBattleMoveDamage;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
-                        gTakenDmgBanks[gActiveBattler] = gBattleAttacker;
+                        gTakenDmgBanks[gActiveBattler] = gBattleMoveAttacker;
                     else
-                        gTakenDmgBanks[gActiveBattler] = gBattleDefender;
+                        gTakenDmgBanks[gActiveBattler] = gBattleMoveTarget;
                 }
 
                 if (gBattleMons[gActiveBattler].hp > gBattleMoveDamage)
@@ -2035,13 +2035,13 @@ static void atk0C_datahpupdate(void)
                     gSpecialStatuses[gActiveBattler].moveturnLostHP_physical = gHpDealt;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                     {
-                        gProtectStructs[gActiveBattler].physicalBank = gBattleAttacker;
-                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattleAttacker;
+                        gProtectStructs[gActiveBattler].physicalBank = gBattleMoveAttacker;
+                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattleMoveAttacker;
                     }
                     else
                     {
-                        gProtectStructs[gActiveBattler].physicalBank = gBattleDefender;
-                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattleDefender;
+                        gProtectStructs[gActiveBattler].physicalBank = gBattleMoveTarget;
+                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattleMoveTarget;
                     }
                 }
                 else if (moveType > 8 && !(gHitMarker & HITMARKER_x100000))
@@ -2050,19 +2050,19 @@ static void atk0C_datahpupdate(void)
                     gSpecialStatuses[gActiveBattler].moveturnLostHP_special = gHpDealt;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                     {
-                        gProtectStructs[gActiveBattler].specialBank = gBattleAttacker;
-                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattleAttacker;
+                        gProtectStructs[gActiveBattler].specialBank = gBattleMoveAttacker;
+                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattleMoveAttacker;
                     }
                     else
                     {
-                        gProtectStructs[gActiveBattler].specialBank = gBattleDefender;
-                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattleDefender;
+                        gProtectStructs[gActiveBattler].specialBank = gBattleMoveTarget;
+                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattleMoveTarget;
                     }
                 }
             }
             gHitMarker &= ~(HITMARKER_x100000);
-            EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
     }
     else
@@ -2076,11 +2076,11 @@ static void atk0C_datahpupdate(void)
 
 static void atk0D_critmessage(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         if (gCritMultiplier == 2 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
         {
-            PrepareStringBattle(STRINGID_CRITICALHIT, gBattleAttacker);
+            PrepareStringBattle(STRINGID_CRITICALHIT, gBattleMoveAttacker);
             gBattleCommunication[MSG_DISPLAY] = 1;
         }
         gBattlescriptCurrInstr++;
@@ -2089,21 +2089,21 @@ static void atk0D_critmessage(void)
 
 static void atk0E_effectivenesssound(void)
 {
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = gBattleDefender;
+    gActiveBattler = gBattleMoveTarget;
     if (!(gMoveResultFlags & MOVE_RESULT_MISSED))
     {
         switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED)))
         {
         case MOVE_RESULT_SUPER_EFFECTIVE:
-            EmitPlaySE(0, SE_KOUKA_H);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitPlaySE(0, SE_KOUKA_H);
+            MarkBattlerForControllerExec(gActiveBattler);
             break;
         case MOVE_RESULT_NOT_VERY_EFFECTIVE:
-            EmitPlaySE(0, SE_KOUKA_L);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitPlaySE(0, SE_KOUKA_L);
+            MarkBattlerForControllerExec(gActiveBattler);
             break;
         case MOVE_RESULT_DOESNT_AFFECT_FOE:
         case MOVE_RESULT_FAILED:
@@ -2115,18 +2115,18 @@ static void atk0E_effectivenesssound(void)
         default:
             if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             {
-                EmitPlaySE(0, SE_KOUKA_H);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitPlaySE(0, SE_KOUKA_H);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
             else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE)
             {
-                EmitPlaySE(0, SE_KOUKA_L);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitPlaySE(0, SE_KOUKA_L);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
             else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)))
             {
-                EmitPlaySE(0, SE_KOUKA_M);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitPlaySE(0, SE_KOUKA_M);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
             break;
         }
@@ -2138,7 +2138,7 @@ static void atk0F_resultmessage(void)
 {
     u32 stringId = 0;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     if (gMoveResultFlags & MOVE_RESULT_MISSED && (!(gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) || gBattleCommunication[6] > 2))
@@ -2170,8 +2170,8 @@ static void atk0F_resultmessage(void)
             stringId = STRINGID_ITDOESNTAFFECT;
             break;
         case MOVE_RESULT_FOE_HUNG_ON:
-            gLastUsedItem = gBattleMons[gBattleDefender].item;
-            gStringBank = gBattleDefender;
+            gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
+            gStringBank = gBattleMoveTarget;
             gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
             BattleScriptPushCursor();
             gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
@@ -2199,8 +2199,8 @@ static void atk0F_resultmessage(void)
             }
             else if (gMoveResultFlags & MOVE_RESULT_FOE_HUNG_ON)
             {
-                gLastUsedItem = gBattleMons[gBattleDefender].item;
-                gStringBank = gBattleDefender;
+                gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
+                gStringBank = gBattleMoveTarget;
                 gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
@@ -2218,17 +2218,17 @@ static void atk0F_resultmessage(void)
     }
 
     if (stringId)
-        PrepareStringBattle(stringId, gBattleAttacker);
+        PrepareStringBattle(stringId, gBattleMoveAttacker);
 
     gBattlescriptCurrInstr++;
 }
 
 static void atk10_printstring(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         u16 var = BS2ScriptRead16(gBattlescriptCurrInstr + 1);
-        PrepareStringBattle(var, gBattleAttacker);
+        PrepareStringBattle(var, gBattleMoveAttacker);
         gBattlescriptCurrInstr += 3;
         gBattleCommunication[MSG_DISPLAY] = 1;
     }
@@ -2236,10 +2236,10 @@ static void atk10_printstring(void)
 
 static void atk11_printselectionstring(void)
 {
-    gActiveBattler = gBattleAttacker;
+    gActiveBattler = gBattleMoveAttacker;
 
-    EmitPrintSelectionString(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitPrintSelectionString(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 3;
     gBattleCommunication[MSG_DISPLAY] = 1;
@@ -2247,7 +2247,7 @@ static void atk11_printselectionstring(void)
 
 static void atk12_waitmessage(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         if (!gBattleCommunication[MSG_DISPLAY])
         {
@@ -2268,12 +2268,12 @@ static void atk12_waitmessage(void)
 
 static void atk13_printfromtable(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         const u16 *ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         ptr += gBattleCommunication[MULTISTRING_CHOOSER];
 
-        PrepareStringBattle(*ptr, gBattleAttacker);
+        PrepareStringBattle(*ptr, gBattleMoveAttacker);
 
         gBattlescriptCurrInstr += 5;
         gBattleCommunication[MSG_DISPLAY] = 1;
@@ -2282,21 +2282,21 @@ static void atk13_printfromtable(void)
 
 static void atk14_printselectionstringfromtable(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         const u16 *ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         ptr += gBattleCommunication[MULTISTRING_CHOOSER];
 
-        gActiveBattler = gBattleAttacker;
-        EmitPrintSelectionString(0, *ptr);
-        MarkBufferBankForExecution(gActiveBattler);
+        gActiveBattler = gBattleMoveAttacker;
+        BtlController_EmitPrintSelectionString(0, *ptr);
+        MarkBattlerForControllerExec(gActiveBattler);
 
         gBattlescriptCurrInstr += 5;
         gBattleCommunication[MSG_DISPLAY] = 1;
     }
 }
 
-u8 BankGetTurnOrder(u8 bank)
+u8 GetBattlerTurnOrderNum(u8 bank)
 {
     s32 i;
     for (i = 0; i < gBattlersCount; i++)
@@ -2328,15 +2328,15 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
     if (gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_AFFECTS_USER)
     {
-        gEffectBank = gBattleAttacker; // bank that effects get applied on
+        gEffectBank = gBattleMoveAttacker; // bank that effects get applied on
         gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_AFFECTS_USER);
         affectsUser = MOVE_EFFECT_AFFECTS_USER;
-        gBattleScripting.battler = gBattleDefender; // theoretically the attacker
+        gBattleScripting.battler = gBattleMoveTarget; // theoretically the attacker
     }
     else
     {
-        gEffectBank = gBattleDefender;
-        gBattleScripting.battler = gBattleAttacker;
+        gEffectBank = gBattleMoveTarget;
+        gBattleScripting.battler = gBattleMoveAttacker;
     }
 
     if (gBattleMons[gEffectBank].ability == ABILITY_SHIELD_DUST && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
@@ -2584,8 +2584,8 @@ void SetMoveEffect(bool8 primary, u8 certain)
             gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
 
             gActiveBattler = gEffectBank;
-            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBank].status1);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBank].status1);
+            MarkBattlerForControllerExec(gActiveBattler);
 
             if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
             {
@@ -2659,7 +2659,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 else
                 {
-                    if (BankGetTurnOrder(gEffectBank) > gCurrentTurnActionNumber)
+                    if (GetBattlerTurnOrderNum(gEffectBank) > gCurrentTurnActionNumber)
                         gBattleMons[gEffectBank].status2 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
                     gBattlescriptCurrInstr++;
                 }
@@ -2681,10 +2681,10 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 break;
             case MOVE_EFFECT_PAYDAY:
-                if (GET_BATTLER_SIDE(gBattleAttacker) == B_SIDE_PLAYER)
+                if (GET_BATTLER_SIDE(gBattleMoveAttacker) == B_SIDE_PLAYER)
                 {
                     u16 PayDay = gPaydayMoney;
-                    gPaydayMoney += (gBattleMons[gBattleAttacker].level * 5);
+                    gPaydayMoney += (gBattleMons[gBattleMoveAttacker].level * 5);
                     if (PayDay > gPaydayMoney)
                         gPaydayMoney = 0xFFFF;
                 }
@@ -2719,7 +2719,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
                     *(gBattleStruct->wrappedMove + gEffectBank * 2 + 0) = gCurrentMove;
                     *(gBattleStruct->wrappedMove + gEffectBank * 2 + 1) = gCurrentMove >> 8;
-                    *(gBattleStruct->wrappedBy + gEffectBank) = gBattleAttacker;
+                    *(gBattleStruct->wrappedBy + gEffectBank) = gBattleMoveAttacker;
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
@@ -2832,7 +2832,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_RAGE:
-                gBattleMons[gBattleAttacker].status2 |= STATUS2_RAGE;
+                gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_RAGE;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_STEAL_ITEM:
@@ -2843,8 +2843,8 @@ void SetMoveEffect(bool8 primary, u8 certain)
                         break;
                     }
 
-                    side = GetBattlerSide(gBattleAttacker);
-                    if (GetBattlerSide(gBattleAttacker) == B_SIDE_OPPONENT
+                    side = GetBattlerSide(gBattleMoveAttacker);
+                    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_OPPONENT
                         && !(gBattleTypeFlags &
                              (BATTLE_TYPE_EREADER_TRAINER
                               | BATTLE_TYPE_FRONTIER
@@ -2860,56 +2860,56 @@ void SetMoveEffect(bool8 primary, u8 certain)
                            | BATTLE_TYPE_LINK
                            | BATTLE_TYPE_x2000000
                            | BATTLE_TYPE_SECRET_BASE))
-                        && (gWishFutureKnock.knockedOffPokes[side] & gBitTable[gBattlePartyID[gBattleAttacker]]))
+                        && (gWishFutureKnock.knockedOffPokes[side] & gBitTable[gBattlerPartyIndexes[gBattleMoveAttacker]]))
                     {
                         gBattlescriptCurrInstr++;
                     }
-                    else if (gBattleMons[gBattleDefender].item
-                        && gBattleMons[gBattleDefender].ability == ABILITY_STICKY_HOLD)
+                    else if (gBattleMons[gBattleMoveTarget].item
+                        && gBattleMons[gBattleMoveTarget].ability == ABILITY_STICKY_HOLD)
                     {
                         BattleScriptPushCursor();
                         gBattlescriptCurrInstr = BattleScript_NoItemSteal;
 
-                        gLastUsedAbility = gBattleMons[gBattleDefender].ability;
-                        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
+                        gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
+                        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
                     }
-                    else if (gBattleMons[gBattleAttacker].item != 0
-                        || gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY
-                        || IS_ITEM_MAIL(gBattleMons[gBattleDefender].item)
-                        || gBattleMons[gBattleDefender].item == 0)
+                    else if (gBattleMons[gBattleMoveAttacker].item != 0
+                        || gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY
+                        || IS_ITEM_MAIL(gBattleMons[gBattleMoveTarget].item)
+                        || gBattleMons[gBattleMoveTarget].item == 0)
                     {
                         gBattlescriptCurrInstr++;
                     }
                     else
                     {
-                        u16* changedItem = &gBattleStruct->changedItems[gBattleAttacker];
-                        gLastUsedItem = *changedItem = gBattleMons[gBattleDefender].item;
-                        gBattleMons[gBattleDefender].item = 0;
+                        u16* changedItem = &gBattleStruct->changedItems[gBattleMoveAttacker];
+                        gLastUsedItem = *changedItem = gBattleMons[gBattleMoveTarget].item;
+                        gBattleMons[gBattleMoveTarget].item = 0;
 
-                        gActiveBattler = gBattleAttacker;
-                        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem);
-                        MarkBufferBankForExecution(gBattleAttacker);
+                        gActiveBattler = gBattleMoveAttacker;
+                        BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem);
+                        MarkBattlerForControllerExec(gBattleMoveAttacker);
 
-                        gActiveBattler = gBattleDefender;
-                        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattleDefender].item);
-                        MarkBufferBankForExecution(gBattleDefender);
+                        gActiveBattler = gBattleMoveTarget;
+                        BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattleMoveTarget].item);
+                        MarkBattlerForControllerExec(gBattleMoveTarget);
 
                         BattleScriptPush(gBattlescriptCurrInstr + 1);
                         gBattlescriptCurrInstr = BattleScript_ItemSteal;
 
-                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleDefender]) + 0) = 0;
-                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleDefender]) + 1) = 0;
+                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveTarget]) + 0) = 0;
+                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveTarget]) + 1) = 0;
                     }
 
                 }
                 break;
             case MOVE_EFFECT_PREVENT_ESCAPE:
-                gBattleMons[gBattleDefender].status2 |= STATUS2_ESCAPE_PREVENTION;
-                gDisableStructs[gBattleDefender].bankPreventingEscape = gBattleAttacker;
+                gBattleMons[gBattleMoveTarget].status2 |= STATUS2_ESCAPE_PREVENTION;
+                gDisableStructs[gBattleMoveTarget].bankPreventingEscape = gBattleMoveAttacker;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_NIGHTMARE:
-                gBattleMons[gBattleDefender].status2 |= STATUS2_NIGHTMARE;
+                gBattleMons[gBattleMoveTarget].status2 |= STATUS2_NIGHTMARE;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_ALL_STATS_UP:
@@ -2921,17 +2921,17 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattlescriptCurrInstr = BattleScript_RapidSpinAway;
                 break;
             case MOVE_EFFECT_REMOVE_PARALYSIS: // Smelling salts
-                if (!(gBattleMons[gBattleDefender].status1 & STATUS1_PARALYSIS))
+                if (!(gBattleMons[gBattleMoveTarget].status1 & STATUS1_PARALYSIS))
                 {
                     gBattlescriptCurrInstr++;
                 }
                 else
                 {
-                    gBattleMons[gBattleDefender].status1 &= ~(STATUS1_PARALYSIS);
+                    gBattleMons[gBattleMoveTarget].status1 &= ~(STATUS1_PARALYSIS);
 
-                    gActiveBattler = gBattleDefender;
-                    EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    gActiveBattler = gBattleMoveTarget;
+                    BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                    MarkBattlerForControllerExec(gActiveBattler);
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = BattleScript_TargetPRLZHeal;
@@ -2982,7 +2982,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
                     gLastUsedItem = gBattleMons[gEffectBank].item;
                     gBattleMons[gEffectBank].item = 0;
-                    gWishFutureKnock.knockedOffPokes[side] |= gBitTable[gBattlePartyID[gEffectBank]];
+                    gWishFutureKnock.knockedOffPokes[side] |= gBitTable[gBattlerPartyIndexes[gEffectBank]];
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = BattleScript_KnockedOff;
@@ -3010,7 +3010,7 @@ static void atk15_seteffectwithchance(void)
 {
     u32 percentChance;
 
-    if (gBattleMons[gBattleAttacker].ability == ABILITY_SERENE_GRACE)
+    if (gBattleMons[gBattleMoveAttacker].ability == ABILITY_SERENE_GRACE)
         percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance * 2;
     else
         percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance;
@@ -3089,14 +3089,14 @@ static void atk19_tryfaintmon(void)
 
         if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
         {
-            gActiveBattler = gBattleAttacker;
-            bank = gBattleDefender;
+            gActiveBattler = gBattleMoveAttacker;
+            bank = gBattleMoveTarget;
             BS_ptr = BattleScript_FaintAttacker;
         }
         else
         {
-            gActiveBattler = gBattleDefender;
-            bank = gBattleAttacker;
+            gActiveBattler = gBattleMoveTarget;
+            bank = gBattleMoveAttacker;
             BS_ptr = BattleScript_FaintTarget;
         }
         if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler])
@@ -3116,31 +3116,31 @@ static void atk19_tryfaintmon(void)
             {
                 if (gBattleResults.opponentFaintCounter < 0xFF)
                     gBattleResults.opponentFaintCounter++;
-                gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gActiveBattler]], MON_DATA_SPECIES, NULL);
+                gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES, NULL);
             }
-            if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBattleAttacker].hp != 0)
+            if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBattleMoveAttacker].hp != 0)
             {
                 gHitMarker &= ~(HITMARKER_DESTINYBOND);
                 BattleScriptPush(gBattlescriptCurrInstr);
                 gBattleMoveDamage = gBattleMons[bank].hp;
                 gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife;
             }
-            if ((gStatuses3[gBattleDefender] & STATUS3_GRUDGE)
+            if ((gStatuses3[gBattleMoveTarget] & STATUS3_GRUDGE)
              && !(gHitMarker & HITMARKER_GRUDGE)
-             && GetBattlerSide(gBattleAttacker) != GetBattlerSide(gBattleDefender)
-             && gBattleMons[gBattleAttacker].hp != 0
+             && GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gBattleMoveTarget)
+             && gBattleMons[gBattleMoveAttacker].hp != 0
              && gCurrentMove != MOVE_STRUGGLE)
             {
-                u8 moveIndex = *(gBattleStruct->chosenMovePositions + gBattleAttacker);
+                u8 moveIndex = *(gBattleStruct->chosenMovePositions + gBattleMoveAttacker);
 
-                gBattleMons[gBattleAttacker].pp[moveIndex] = 0;
+                gBattleMons[gBattleMoveAttacker].pp[moveIndex] = 0;
                 BattleScriptPush(gBattlescriptCurrInstr);
                 gBattlescriptCurrInstr = BattleScript_GrudgeTakesPp;
-                gActiveBattler = gBattleAttacker;
-                EmitSetMonData(0, moveIndex + REQUEST_PPMOVE1_BATTLE, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]);
-                MarkBufferBankForExecution(gActiveBattler);
+                gActiveBattler = gBattleMoveAttacker;
+                BtlController_EmitSetMonData(0, moveIndex + REQUEST_PPMOVE1_BATTLE, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]);
+                MarkBattlerForControllerExec(gActiveBattler);
 
-                PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattleAttacker].moves[moveIndex])
+                PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattleMoveAttacker].moves[moveIndex])
             }
         }
         else
@@ -3152,26 +3152,26 @@ static void atk19_tryfaintmon(void)
 
 static void atk1A_dofaintanimation(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
-        EmitFaintAnimation(0);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitFaintAnimation(0);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 2;
     }
 }
 
 static void atk1B_cleareffectsonfaint(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_ARENA) || gBattleMons[gActiveBattler].hp == 0)
         {
             gBattleMons[gActiveBattler].status1 = 0;
-            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBattler].status1);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBattler].status1);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
 
         FaintClearSetData(); // Effects like attractions, trapping, etc.
@@ -3211,7 +3211,7 @@ static void atk1E_jumpifability(void)
 
     if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER_SIDE)
     {
-        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattleAttacker, ability, 0, 0);
+        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattleMoveAttacker, ability, 0, 0);
         if (bank)
         {
             gLastUsedAbility = ability;
@@ -3224,7 +3224,7 @@ static void atk1E_jumpifability(void)
     }
     else if (gBattlescriptCurrInstr[1] == BS_GET_NOT_ATTACKER_SIDE)
     {
-        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBattleAttacker, ability, 0, 0);
+        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBattleMoveAttacker, ability, 0, 0);
         if (bank)
         {
             gLastUsedAbility = ability;
@@ -3257,9 +3257,9 @@ static void atk1F_jumpifsideaffecting(void)
     const u8* jumpPtr;
 
     if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
-        side = GET_BATTLER_SIDE(gBattleAttacker);
+        side = GET_BATTLER_SIDE(gBattleMoveAttacker);
     else
-        side = GET_BATTLER_SIDE(gBattleDefender);
+        side = GET_BATTLER_SIDE(gBattleMoveTarget);
 
     flags = BS2ScriptRead16(gBattlescriptCurrInstr + 2);
     jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 4);
@@ -3377,7 +3377,7 @@ static void atk23_getexp(void)
         else
         {
             gBattleScripting.atk23_state++;
-            gBattleStruct->field_DF |= gBitTable[gBattlePartyID[gBank1]];
+            gBattleStruct->field_DF |= gBitTable[gBattlerPartyIndexes[gBank1]];
         }
         break;
     case 1: // calculate experience points to redistribute
@@ -3429,7 +3429,7 @@ static void atk23_getexp(void)
         }
         // fall through
     case 2: // set exp value to the poke in expgetter_id and print message
-        if (gBattleExecBuffer == 0)
+        if (gBattleControllerExecFlags == 0)
         {
             item = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_HELD_ITEM);
 
@@ -3495,7 +3495,7 @@ static void atk23_getexp(void)
                     // get exp getter bank
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
                     {
-                        if (!(gBattlePartyID[2] != gBattleStruct->expGetterId) && !(gAbsentBattlerFlags & gBitTable[2]))
+                        if (!(gBattlerPartyIndexes[2] != gBattleStruct->expGetterId) && !(gAbsentBattlerFlags & gBitTable[2]))
                             gBattleStruct->expGetterBank = 2;
                         else
                         {
@@ -3524,7 +3524,7 @@ static void atk23_getexp(void)
         }
         break;
     case 3: // Set stats and give exp
-        if (gBattleExecBuffer == 0)
+        if (gBattleControllerExecFlags == 0)
         {
             gBattleBufferB[gBattleStruct->expGetterBank][0] = 0;
             if (GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL) != MAX_MON_LEVEL)
@@ -3537,20 +3537,20 @@ static void atk23_getexp(void)
                 BATTLE_LVLUP_STATS->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPDEF);
 
                 gActiveBattler = gBattleStruct->expGetterBank;
-                EmitExpUpdate(0, gBattleStruct->expGetterId, gBattleMoveDamage);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitExpUpdate(0, gBattleStruct->expGetterId, gBattleMoveDamage);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
             gBattleScripting.atk23_state++;
         }
         break;
     case 4: // lvl up if necessary
-        if (gBattleExecBuffer == 0)
+        if (gBattleControllerExecFlags == 0)
         {
             gActiveBattler = gBattleStruct->expGetterBank;
             if (gBattleBufferB[gActiveBattler][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBattler][1] == RET_VALUE_LEVELLED_UP)
             {
-                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlePartyID[gActiveBattler] == gBattleStruct->expGetterId)
-                    HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBattler]], gActiveBattler);
+                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterId)
+                    HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 
                 PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterId)
 
@@ -3563,7 +3563,7 @@ static void atk23_getexp(void)
                 AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterId], 0);
 
                 // update battle mon structure after level up
-                if (gBattlePartyID[0] == gBattleStruct->expGetterId && gBattleMons[0].hp)
+                if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterId && gBattleMons[0].hp)
                 {
                     gBattleMons[0].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL);
                     gBattleMons[0].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_HP);
@@ -3578,7 +3578,7 @@ static void atk23_getexp(void)
                     gBattleMons[0].spDefense = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPDEF);
                 }
                 // What is else if?
-                if (gBattlePartyID[2] == gBattleStruct->expGetterId && gBattleMons[2].hp && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
+                if (gBattlerPartyIndexes[2] == gBattleStruct->expGetterId && gBattleMons[2].hp && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
                 {
                     gBattleMons[2].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL);
                     gBattleMons[2].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_HP);
@@ -3613,7 +3613,7 @@ static void atk23_getexp(void)
         }
         break;
     case 6: // increment instruction
-        if (gBattleExecBuffer == 0)
+        if (gBattleControllerExecFlags == 0)
         {
             // not sure why gf clears the item and ability here
             gBattleMons[gBank1].item = 0;
@@ -3630,7 +3630,7 @@ static void atk24(void)
     u16 HP_count = 0;
     s32 i;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gPartnerTrainerId == STEVEN_PARTNER_ID)
@@ -3716,7 +3716,7 @@ static void atk24(void)
         mov r7, r8\n\
         push {r7}\n\
         movs r6, 0\n\
-        ldr r0, =gBattleExecBuffer\n\
+        ldr r0, =gBattleControllerExecFlags\n\
         ldr r0, [r0]\n\
         cmp r0, 0\n\
         beq _0804ACE2\n\
@@ -4303,7 +4303,7 @@ static void atk38_bicword(void)
 
 static void atk39_pause(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         u16 value = BS2ScriptRead16(gBattlescriptCurrInstr + 1);
         if (++gPauseCounterBattle >= value)
@@ -4316,19 +4316,19 @@ static void atk39_pause(void)
 
 static void atk3A_waitstate(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
         gBattlescriptCurrInstr++;
 }
 
 static void atk3B_healthbar_update(void)
 {
     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
-        gActiveBattler = gBattleDefender;
+        gActiveBattler = gBattleMoveTarget;
     else
-        gActiveBattler = gBattleAttacker;
+        gActiveBattler = gBattleMoveAttacker;
 
-    EmitHealthBarUpdate(0, gBattleMoveDamage);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitHealthBarUpdate(0, gBattleMoveDamage);
+    MarkBattlerForControllerExec(gActiveBattler);
     gBattlescriptCurrInstr += 2;
 }
 
@@ -4340,7 +4340,7 @@ static void atk3C_return(void)
 static void atk3D_end(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-        sub_81A5718(gBattleAttacker);
+        sub_81A5718(gBattleMoveAttacker);
 
     gMoveResultFlags = 0;
     gActiveBattler = 0;
@@ -4387,7 +4387,7 @@ static void atk43_jumpifabilitypresent(void)
 
 static void atk44_endselectionscript(void)
 {
-    *(gBattleAttacker + gBattleStruct->selectionScriptFinished) = TRUE;
+    *(gBattleMoveAttacker + gBattleStruct->selectionScriptFinished) = TRUE;
 }
 
 static void atk45_playanimation(void)
@@ -4401,8 +4401,8 @@ static void atk45_playanimation(void)
         || gBattlescriptCurrInstr[2] == B_ANIM_SNATCH_MOVE
         || gBattlescriptCurrInstr[2] == B_ANIM_SUBSTITUTE_FADE)
     {
-        EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 7;
     }
     else if (gHitMarker & HITMARKER_NO_ANIMATIONS)
@@ -4415,8 +4415,8 @@ static void atk45_playanimation(void)
              || gBattlescriptCurrInstr[2] == B_ANIM_SANDSTORM_CONTINUES
              || gBattlescriptCurrInstr[2] == B_ANIM_HAIL_CONTINUES)
     {
-        EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 7;
     }
     else if (gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
@@ -4425,8 +4425,8 @@ static void atk45_playanimation(void)
     }
     else
     {
-        EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 7;
     }
 }
@@ -4444,8 +4444,8 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
         || *animationIdPtr == B_ANIM_SNATCH_MOVE
         || *animationIdPtr == B_ANIM_SUBSTITUTE_FADE)
     {
-        EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 10;
     }
     else if (gHitMarker & HITMARKER_NO_ANIMATIONS)
@@ -4457,8 +4457,8 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
              || *animationIdPtr == B_ANIM_SANDSTORM_CONTINUES
              || *animationIdPtr == B_ANIM_HAIL_CONTINUES)
     {
-        EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 10;
     }
     else if (gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
@@ -4467,8 +4467,8 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
     }
     else
     {
-        EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitBattleAnimation(0, *animationIdPtr, *argumentPtr);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 10;
     }
 }
@@ -4575,8 +4575,8 @@ static void atk48_playstatchangeanimation(void)
     }
     else if (changeableStats != 0 && gBattleScripting.field_1B == 0)
     {
-        EmitBattleAnimation(0, B_ANIM_STATS_CHANGE, statAnimId);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitBattleAnimation(0, B_ANIM_STATS_CHANGE, statAnimId);
+        MarkBattlerForControllerExec(gActiveBattler);
         if (gBattlescriptCurrInstr[3] & ATK48_BIT_x4 && changeableStats > 1)
             gBattleScripting.field_1B = 1;
         gBattlescriptCurrInstr += 4;
@@ -4803,10 +4803,10 @@ _0804BB6C:\n\
 	movs r1, 0x1\n\
 	mov r2, r8\n\
 	str r3, [sp]\n\
-	bl EmitBattleAnimation\n\
+	bl BtlController_EmitBattleAnimation\n\
 	ldr r0, =gActiveBattler\n\
 	ldrb r0, [r0]\n\
-	bl MarkBufferBankForExecution\n\
+	bl MarkBattlerForControllerExec\n\
 	ldr r0, =gBattlescriptCurrInstr\n\
 	ldr r0, [r0]\n\
 	ldrb r1, [r0, 0x3]\n\
@@ -4864,12 +4864,12 @@ static void atk49_moveend(void)
     arg1 = gBattlescriptCurrInstr[1];
     arg2 = gBattlescriptCurrInstr[2];
 
-    if (gBattleMons[gBattleAttacker].item == ITEM_ENIGMA_BERRY)
-        holdEffectAtk = gEnigmaBerries[gBattleAttacker].holdEffect;
+    if (gBattleMons[gBattleMoveAttacker].item == ITEM_ENIGMA_BERRY)
+        holdEffectAtk = gEnigmaBerries[gBattleMoveAttacker].holdEffect;
     else
-        holdEffectAtk = ItemId_GetHoldEffect(gBattleMons[gBattleAttacker].item);
+        holdEffectAtk = ItemId_GetHoldEffect(gBattleMons[gBattleMoveAttacker].item);
 
-    choicedMoveAtk = &gBattleStruct->choicedMove[gBattleAttacker];
+    choicedMoveAtk = &gBattleStruct->choicedMove[gBattleMoveAttacker];
 
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
@@ -4878,13 +4878,13 @@ static void atk49_moveend(void)
         switch (gBattleScripting.atk49_state)
         {
         case 0: // rage check
-            if (gBattleMons[gBattleDefender].status2 & STATUS2_RAGE
-                && gBattleMons[gBattleDefender].hp != 0 && gBattleAttacker != gBattleDefender
-                && GetBattlerSide(gBattleAttacker) != GetBattlerSide(gBattleDefender)
+            if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_RAGE
+                && gBattleMons[gBattleMoveTarget].hp != 0 && gBattleMoveAttacker != gBattleMoveTarget
+                && GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gBattleMoveTarget)
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED
-                && gBattleMoves[gCurrentMove].power && gBattleMons[gBattleDefender].statStages[STAT_STAGE_ATK] <= 0xB)
+                && gBattleMoves[gCurrentMove].power && gBattleMons[gBattleMoveTarget].statStages[STAT_STAGE_ATK] <= 0xB)
             {
-                gBattleMons[gBattleDefender].statStages[STAT_STAGE_ATK]++;
+                gBattleMons[gBattleMoveTarget].statStages[STAT_STAGE_ATK]++;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_RageIsBuilding;
                 effect = TRUE;
@@ -4892,15 +4892,15 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 1: // defrosting check
-            if (gBattleMons[gBattleDefender].status1 & STATUS1_FREEZE
-                && gBattleMons[gBattleDefender].hp != 0 && gBattleAttacker != gBattleDefender
-                && gSpecialStatuses[gBattleDefender].moveturnLostHP_special
+            if (gBattleMons[gBattleMoveTarget].status1 & STATUS1_FREEZE
+                && gBattleMons[gBattleMoveTarget].hp != 0 && gBattleMoveAttacker != gBattleMoveTarget
+                && gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && moveType == TYPE_FIRE)
             {
-                gBattleMons[gBattleDefender].status1 &= ~(STATUS1_FREEZE);
-                gActiveBattler = gBattleDefender;
-                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBattleDefender].status1);
-                MarkBufferBankForExecution(gActiveBattler);
+                gBattleMons[gBattleMoveTarget].status1 &= ~(STATUS1_FREEZE);
+                gActiveBattler = gBattleMoveTarget;
+                BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBattleMoveTarget].status1);
+                MarkBattlerForControllerExec(gActiveBattler);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove;
                 effect = TRUE;
@@ -4908,12 +4908,12 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 2: // target synchronize
-            if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBattleDefender, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBattleMoveTarget, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
         case 3: // contact abilities
-            if (AbilityBattleEffects(ABILITYEFFECT_CONTACT, gBattleDefender, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_CONTACT, gBattleMoveTarget, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
@@ -4924,7 +4924,7 @@ static void atk49_moveend(void)
                 gBattleScripting.atk49_state++;
             break;
         case 5: // attacker synchronize
-            if (AbilityBattleEffects(ABILITYEFFECT_ATK_SYNCHRONIZE, gBattleAttacker, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_ATK_SYNCHRONIZE, gBattleMoveAttacker, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
@@ -4942,7 +4942,7 @@ static void atk49_moveend(void)
             {
                 for (i = 0; i < 4; i++)
                 {
-                    if (gBattleMons[gBattleAttacker].moves[i] == *choicedMoveAtk)
+                    if (gBattleMons[gBattleMoveAttacker].moves[i] == *choicedMoveAtk)
                         break;
                 }
                 if (i == 4)
@@ -4975,12 +4975,12 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 8: // make attacker sprite invisible
-            if (gStatuses3[gBattleAttacker] & (STATUS3_SEMI_INVULNERABLE)
+            if (gStatuses3[gBattleMoveAttacker] & (STATUS3_SEMI_INVULNERABLE)
                 && gHitMarker & HITMARKER_NO_ANIMATIONS)
             {
-                gActiveBattler = gBattleAttacker;
-                EmitSpriteInvisibility(0, TRUE);
-                MarkBufferBankForExecution(gActiveBattler);
+                gActiveBattler = gBattleMoveAttacker;
+                BtlController_EmitSpriteInvisibility(0, TRUE);
+                MarkBattlerForControllerExec(gActiveBattler);
                 gBattleScripting.atk49_state++;
                 return;
             }
@@ -4988,27 +4988,27 @@ static void atk49_moveend(void)
             break;
         case 9: // make attacker sprite visible
             if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT
-                || !(gStatuses3[gBattleAttacker] & (STATUS3_SEMI_INVULNERABLE))
-                || WasUnableToUseMove(gBattleAttacker))
-            {
-                gActiveBattler = gBattleAttacker;
-                EmitSpriteInvisibility(0, FALSE);
-                MarkBufferBankForExecution(gActiveBattler);
-                gStatuses3[gBattleAttacker] &= ~(STATUS3_SEMI_INVULNERABLE);
-                gSpecialStatuses[gBattleAttacker].restoredBankSprite = 1;
+                || !(gStatuses3[gBattleMoveAttacker] & (STATUS3_SEMI_INVULNERABLE))
+                || WasUnableToUseMove(gBattleMoveAttacker))
+            {
+                gActiveBattler = gBattleMoveAttacker;
+                BtlController_EmitSpriteInvisibility(0, FALSE);
+                MarkBattlerForControllerExec(gActiveBattler);
+                gStatuses3[gBattleMoveAttacker] &= ~(STATUS3_SEMI_INVULNERABLE);
+                gSpecialStatuses[gBattleMoveAttacker].restoredBankSprite = 1;
                 gBattleScripting.atk49_state++;
                 return;
             }
             gBattleScripting.atk49_state++;
             break;
         case 10: // make target sprite visible
-            if (!gSpecialStatuses[gBattleDefender].restoredBankSprite && gBattleDefender < gBattlersCount
-                && !(gStatuses3[gBattleDefender] & STATUS3_SEMI_INVULNERABLE))
+            if (!gSpecialStatuses[gBattleMoveTarget].restoredBankSprite && gBattleMoveTarget < gBattlersCount
+                && !(gStatuses3[gBattleMoveTarget] & STATUS3_SEMI_INVULNERABLE))
             {
-                gActiveBattler = gBattleDefender;
-                EmitSpriteInvisibility(0, FALSE);
-                MarkBufferBankForExecution(gActiveBattler);
-                gStatuses3[gBattleDefender] &= ~(STATUS3_SEMI_INVULNERABLE);
+                gActiveBattler = gBattleMoveTarget;
+                BtlController_EmitSpriteInvisibility(0, FALSE);
+                MarkBattlerForControllerExec(gActiveBattler);
+                gStatuses3[gBattleMoveTarget] &= ~(STATUS3_SEMI_INVULNERABLE);
                 gBattleScripting.atk49_state++;
                 return;
             }
@@ -5025,82 +5025,82 @@ static void atk49_moveend(void)
         case 14: // This case looks interesting, although I am not certain what it does. Probably fine tunes edge cases.
             if (gHitMarker & HITMARKER_PURSUIT_TRAP)
             {
-                gActiveBattler = gBattleAttacker;
-                gBattleAttacker = gBattleDefender;
-                gBattleDefender = gActiveBattler;
+                gActiveBattler = gBattleMoveAttacker;
+                gBattleMoveAttacker = gBattleMoveTarget;
+                gBattleMoveTarget = gActiveBattler;
                 gHitMarker &= ~(HITMARKER_PURSUIT_TRAP);
             }
             if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED)
             {
-                gLastPrintedMoves[gBattleAttacker] = gChosenMove;
+                gLastPrintedMoves[gBattleMoveAttacker] = gChosenMove;
             }
-            if (!(gAbsentBattlerFlags & gBitTable[gBattleAttacker])
-                && !(gBattleStruct->field_91 & gBitTable[gBattleAttacker])
+            if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveAttacker])
+                && !(gBattleStruct->field_91 & gBitTable[gBattleMoveAttacker])
                 && gBattleMoves[originallyUsedMove].effect != EFFECT_BATON_PASS)
             {
                 if (gHitMarker & HITMARKER_OBEYS)
                 {
-                    gLastMoves[gBattleAttacker] = gChosenMove;
-                    gLastResultingMoves[gBattleAttacker] = gCurrentMove;
+                    gLastMoves[gBattleMoveAttacker] = gChosenMove;
+                    gLastResultingMoves[gBattleMoveAttacker] = gCurrentMove;
                 }
                 else
                 {
-                    gLastMoves[gBattleAttacker] = 0xFFFF;
-                    gLastResultingMoves[gBattleAttacker] = 0xFFFF;
+                    gLastMoves[gBattleMoveAttacker] = 0xFFFF;
+                    gLastResultingMoves[gBattleMoveAttacker] = 0xFFFF;
                 }
 
-                if (!(gHitMarker & HITMARKER_FAINTED(gBattleDefender)))
-                    gLastHitBy[gBattleDefender] = gBattleAttacker;
+                if (!(gHitMarker & HITMARKER_FAINTED(gBattleMoveTarget)))
+                    gLastHitBy[gBattleMoveTarget] = gBattleMoveAttacker;
 
                 if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
                 {
                     if (gChosenMove == 0xFFFF)
                     {
-                        gLastLandedMoves[gBattleDefender] = gChosenMove;
+                        gLastLandedMoves[gBattleMoveTarget] = gChosenMove;
                     }
                     else
                     {
-                        gLastLandedMoves[gBattleDefender] = gCurrentMove;
-                        GET_MOVE_TYPE(gCurrentMove, gLastHitByType[gBattleDefender]);
+                        gLastLandedMoves[gBattleMoveTarget] = gCurrentMove;
+                        GET_MOVE_TYPE(gCurrentMove, gLastHitByType[gBattleMoveTarget]);
                     }
                 }
                 else
                 {
-                    gLastLandedMoves[gBattleDefender] = 0xFFFF;
+                    gLastLandedMoves[gBattleMoveTarget] = 0xFFFF;
                 }
             }
             gBattleScripting.atk49_state++;
             break;
         case 15: // mirror move
-            if (!(gAbsentBattlerFlags & gBitTable[gBattleAttacker]) && !(gBattleStruct->field_91 & gBitTable[gBattleAttacker])
+            if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveAttacker]) && !(gBattleStruct->field_91 & gBitTable[gBattleMoveAttacker])
                 && gBattleMoves[originallyUsedMove].flags & FLAG_MIRROR_MOVE_AFFECTED && gHitMarker & HITMARKER_OBEYS
-                && gBattleAttacker != gBattleDefender && !(gHitMarker & HITMARKER_FAINTED(gBattleDefender))
+                && gBattleMoveAttacker != gBattleMoveTarget && !(gHitMarker & HITMARKER_FAINTED(gBattleMoveTarget))
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
             {
                 u8 target, attacker;
 
-                *(gBattleStruct->mirrorMoves + gBattleDefender * 2 + 0) = gChosenMove;
-                *(gBattleStruct->mirrorMoves + gBattleDefender * 2 + 1) = gChosenMove >> 8;
+                *(gBattleStruct->mirrorMoves + gBattleMoveTarget * 2 + 0) = gChosenMove;
+                *(gBattleStruct->mirrorMoves + gBattleMoveTarget * 2 + 1) = gChosenMove >> 8;
 
-                target = gBattleDefender;
-                attacker = gBattleAttacker;
+                target = gBattleMoveTarget;
+                attacker = gBattleMoveAttacker;
                 *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = gChosenMove;
 
-                target = gBattleDefender;
-                attacker = gBattleAttacker;
+                target = gBattleMoveTarget;
+                attacker = gBattleMoveAttacker;
                 *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = gChosenMove >> 8;
             }
             gBattleScripting.atk49_state++;
             break;
         case 16: //
             if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-                && !gProtectStructs[gBattleAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
+                && !gProtectStructs[gBattleMoveAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
                 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
             {
-                u8 bank = GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gBattleDefender)));
+                u8 bank = GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gBattleMoveTarget)));
                 if (gBattleMons[bank].hp != 0)
                 {
-                    gBattleDefender = bank;
+                    gBattleMoveTarget = bank;
                     gHitMarker |= HITMARKER_NO_ATTACKSTRING;
                     gBattleScripting.atk49_state = 0;
                     MoveValuesCleanUp();
@@ -5136,13 +5136,13 @@ static void atk4A_typecalc2(void)
     s32 i = 0;
     u8 moveType = gBattleMoves[gCurrentMove].type;
 
-    if (gBattleMons[gBattleDefender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
-        gLastUsedAbility = gBattleMons[gBattleDefender].ability;
+        gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
         gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
-        gLastLandedMoves[gBattleDefender] = 0;
+        gLastLandedMoves[gBattleMoveTarget] = 0;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
     }
     else
     {
@@ -5150,7 +5150,7 @@ static void atk4A_typecalc2(void)
         {
             if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
-                if (gBattleMons[gBattleDefender].status2 & STATUS2_FORESIGHT)
+                if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_FORESIGHT)
                 {
                     break;
                 }
@@ -5164,7 +5164,7 @@ static void atk4A_typecalc2(void)
             if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type1)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type1)
                 {
                     if (TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
                     {
@@ -5181,22 +5181,22 @@ static void atk4A_typecalc2(void)
                     }
                 }
                 // check type2
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2)
                 {
-                    if (gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2
+                    if (gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
                     {
                         gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
                         break;
                     }
-                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2
-                        && gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2
+                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2
+                        && gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                     {
                         flags |= MOVE_RESULT_NOT_VERY_EFFECTIVE;
                     }
-                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleDefender].type2
-                        && gBattleMons[gBattleDefender].type1 != gBattleMons[gBattleDefender].type2
+                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2
+                        && gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                     {
                         flags |= MOVE_RESULT_SUPER_EFFECTIVE;
@@ -5207,46 +5207,46 @@ static void atk4A_typecalc2(void)
         }
     }
 
-    if (gBattleMons[gBattleDefender].ability == ABILITY_WONDER_GUARD
+    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_WONDER_GUARD
         && !(flags & MOVE_RESULT_NO_EFFECT)
-        && AttacksThisTurn(gBattleAttacker, gCurrentMove) == 2
+        && AttacksThisTurn(gBattleMoveAttacker, gCurrentMove) == 2
         && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
         && gBattleMoves[gCurrentMove].power)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
-        gLastLandedMoves[gBattleDefender] = 0;
+        gLastLandedMoves[gBattleMoveTarget] = 0;
         gBattleCommunication[6] = 3;
-        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
     }
     if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
-        gProtectStructs[gBattleAttacker].targetNotAffected = 1;
+        gProtectStructs[gBattleMoveAttacker].targetNotAffected = 1;
 
     gBattlescriptCurrInstr++;
 }
 
 static void atk4B_returnatktoball(void)
 {
-    gActiveBattler = gBattleAttacker;
+    gActiveBattler = gBattleMoveAttacker;
     if (!(gHitMarker & HITMARKER_FAINTED(gActiveBattler)))
     {
-        EmitReturnMonToBall(0, 0);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitReturnMonToBall(0, 0);
+        MarkBattlerForControllerExec(gActiveBattler);
     }
     gBattlescriptCurrInstr++;
 }
 
 static void atk4C_getswitchedmondata(void)
 {
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
 
-    gBattlePartyID[gActiveBattler] = *(gBattleStruct->monToSwitchIntoId + gActiveBattler);
+    gBattlerPartyIndexes[gActiveBattler] = *(gBattleStruct->monToSwitchIntoId + gActiveBattler);
 
-    EmitGetMonData(0, REQUEST_ALL_BATTLE, gBitTable[gBattlePartyID[gActiveBattler]]);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitGetMonData(0, REQUEST_ALL_BATTLE, gBitTable[gBattlerPartyIndexes[gActiveBattler]]);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -5257,7 +5257,7 @@ static void atk4D_switchindataupdate(void)
     s32 i;
     u8 *monData;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
@@ -5275,7 +5275,7 @@ static void atk4D_switchindataupdate(void)
 
     // check knocked off item
     i = GetBattlerSide(gActiveBattler);
-    if (gWishFutureKnock.knockedOffPokes[i] & gBitTable[gBattlePartyID[gActiveBattler]])
+    if (gWishFutureKnock.knockedOffPokes[i] & gBitTable[gBattlerPartyIndexes[gActiveBattler]])
     {
         gBattleMons[gActiveBattler].item = 0;
     }
@@ -5299,14 +5299,14 @@ static void atk4D_switchindataupdate(void)
 
     gBattleScripting.battler = gActiveBattler;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gActiveBattler, gBattlePartyID[gActiveBattler]);
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gActiveBattler, gBattlerPartyIndexes[gActiveBattler]);
 
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk4E_switchinanim(void)
 {
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
@@ -5321,8 +5321,8 @@ static void atk4E_switchinanim(void)
 
     gAbsentBattlerFlags &= ~(gBitTable[gActiveBattler]);
 
-    EmitSwitchInAnim(0, gBattlePartyID[gActiveBattler], gBattlescriptCurrInstr[2]);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitSwitchInAnim(0, gBattlerPartyIndexes[gActiveBattler], gBattlescriptCurrInstr[2]);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 3;
 
@@ -5364,7 +5364,7 @@ static void atk4F_jumpifcantswitch(void)
             if (GetMonData(&party[val], MON_DATA_SPECIES) != SPECIES_NONE
              && !GetMonData(&party[val], MON_DATA_IS_EGG)
              && GetMonData(&party[val], MON_DATA_HP) != 0
-             && gBattlePartyID[gActiveBattler] != val)
+             && gBattlerPartyIndexes[gActiveBattler] != val)
                 break;
         }
 
@@ -5382,7 +5382,7 @@ static void atk4F_jumpifcantswitch(void)
                 party = gPlayerParty;
 
                 val = 0;
-                if (sub_806D82C(GetBankMultiplayerId(gActiveBattler)) == TRUE)
+                if (sub_806D82C(GetBattlerMultiplayerId(gActiveBattler)) == TRUE)
                     val = 3;
             }
             else
@@ -5404,7 +5404,7 @@ static void atk4F_jumpifcantswitch(void)
 
 
             val = 0;
-            if (sub_806D82C(GetBankMultiplayerId(gActiveBattler)) == TRUE)
+            if (sub_806D82C(GetBattlerMultiplayerId(gActiveBattler)) == TRUE)
                 val = 3;
         }
 
@@ -5413,7 +5413,7 @@ static void atk4F_jumpifcantswitch(void)
             if (GetMonData(&party[val], MON_DATA_SPECIES) != SPECIES_NONE
              && !GetMonData(&party[val], MON_DATA_IS_EGG)
              && GetMonData(&party[val], MON_DATA_HP) != 0
-             && gBattlePartyID[gActiveBattler] != val)
+             && gBattlerPartyIndexes[gActiveBattler] != val)
                 break;
         }
 
@@ -5435,7 +5435,7 @@ static void atk4F_jumpifcantswitch(void)
             if (GetMonData(&party[val], MON_DATA_SPECIES) != SPECIES_NONE
              && !GetMonData(&party[val], MON_DATA_IS_EGG)
              && GetMonData(&party[val], MON_DATA_HP) != 0
-             && gBattlePartyID[gActiveBattler] != val)
+             && gBattlerPartyIndexes[gActiveBattler] != val)
                 break;
         }
 
@@ -5473,7 +5473,7 @@ static void atk4F_jumpifcantswitch(void)
             if (GetMonData(&party[val], MON_DATA_HP) != 0
              && GetMonData(&party[val], MON_DATA_SPECIES) != SPECIES_NONE
              && !GetMonData(&party[val], MON_DATA_IS_EGG)
-             && val != gBattlePartyID[r7] && val != gBattlePartyID[compareVar])
+             && val != gBattlerPartyIndexes[r7] && val != gBattlerPartyIndexes[compareVar])
                 break;
         }
 
@@ -5486,12 +5486,12 @@ static void atk4F_jumpifcantswitch(void)
 
 static void sub_804CF10(u8 arg0)
 {
-    *(gBattleStruct->field_58 + gActiveBattler) = gBattlePartyID[gActiveBattler];
+    *(gBattleStruct->field_58 + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler];
     *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
     gBattleStruct->field_93 &= ~(gBitTable[gActiveBattler]);
 
-    EmitChoosePokemon(0, 1, arg0, 0, gBattleStruct->field_60[gActiveBattler]);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitChoosePokemon(0, 1, arg0, 0, gBattleStruct->field_60[gActiveBattler]);
+    MarkBattlerForControllerExec(gActiveBattler);
 }
 
 static void atk50_openpartyscreen(void)
@@ -5517,8 +5517,8 @@ static void atk50_openpartyscreen(void)
                     {
                         gAbsentBattlerFlags |= gBitTable[gActiveBattler];
                         gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
-                        EmitLinkStandbyMsg(0, 2, 0);
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitLinkStandbyMsg(0, 2, 0);
+                        MarkBattlerForControllerExec(gActiveBattler);
                     }
                     else if (!gSpecialStatuses[gActiveBattler].flag40)
                     {
@@ -5528,8 +5528,8 @@ static void atk50_openpartyscreen(void)
                 }
                 else
                 {
-                    EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitLinkStandbyMsg(0, 2, 0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                 }
             }
         }
@@ -5546,8 +5546,8 @@ static void atk50_openpartyscreen(void)
                 {
                     gAbsentBattlerFlags |= gBitTable[gActiveBattler];
                     gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
-                    EmitCmd42(0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitCmd42(0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                 }
                 else if (!gSpecialStatuses[gActiveBattler].flag40)
                 {
@@ -5556,8 +5556,8 @@ static void atk50_openpartyscreen(void)
                 }
                 else
                 {
-                    EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitLinkStandbyMsg(0, 2, 0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                     flags |= 1;
                 }
             }
@@ -5568,8 +5568,8 @@ static void atk50_openpartyscreen(void)
                 {
                     gAbsentBattlerFlags |= gBitTable[gActiveBattler];
                     gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
-                    EmitCmd42(0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitCmd42(0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                 }
                 else if (!gSpecialStatuses[gActiveBattler].flag40)
                 {
@@ -5578,8 +5578,8 @@ static void atk50_openpartyscreen(void)
                 }
                 else if (!(flags & 1))
                 {
-                    EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitLinkStandbyMsg(0, 2, 0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                 }
             }
             if (gBitTable[1] & hitmarkerFaintBits)
@@ -5589,8 +5589,8 @@ static void atk50_openpartyscreen(void)
                 {
                     gAbsentBattlerFlags |= gBitTable[gActiveBattler];
                     gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
-                    EmitCmd42(0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitCmd42(0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                 }
                 else if (!gSpecialStatuses[gActiveBattler].flag40)
                 {
@@ -5599,8 +5599,8 @@ static void atk50_openpartyscreen(void)
                 }
                 else
                 {
-                    EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitLinkStandbyMsg(0, 2, 0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                     flags |= 2;
                 }
             }
@@ -5611,8 +5611,8 @@ static void atk50_openpartyscreen(void)
                 {
                     gAbsentBattlerFlags |= gBitTable[gActiveBattler];
                     gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
-                    EmitCmd42(0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitCmd42(0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                 }
                 else if (!gSpecialStatuses[gActiveBattler].flag40)
                 {
@@ -5621,8 +5621,8 @@ static void atk50_openpartyscreen(void)
                 }
                 else if (!(flags & 2))
                 {
-                    EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitLinkStandbyMsg(0, 2, 0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                 }
             }
 
@@ -5637,8 +5637,8 @@ static void atk50_openpartyscreen(void)
                     else
                         gActiveBattler = 0;
 
-                    EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitLinkStandbyMsg(0, 2, 0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                 }
 
             }
@@ -5653,8 +5653,8 @@ static void atk50_openpartyscreen(void)
                     else
                         gActiveBattler = 1;
 
-                    EmitLinkStandbyMsg(0, 2, 0);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitLinkStandbyMsg(0, 2, 0);
+                    MarkBattlerForControllerExec(gActiveBattler);
                 }
             }
         }
@@ -5674,8 +5674,8 @@ static void atk50_openpartyscreen(void)
                     {
                         gAbsentBattlerFlags |= gBitTable[gActiveBattler];
                         gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
-                        EmitCmd42(0);
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitCmd42(0);
+                        MarkBattlerForControllerExec(gActiveBattler);
                     }
                     else if (!gSpecialStatuses[gActiveBattler].flag40)
                     {
@@ -5690,8 +5690,8 @@ static void atk50_openpartyscreen(void)
                     {
                         gAbsentBattlerFlags |= gBitTable[gActiveBattler];
                         gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
-                        EmitCmd42(0);
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitCmd42(0);
+                        MarkBattlerForControllerExec(gActiveBattler);
                     }
                     else if (!gSpecialStatuses[gActiveBattler].flag40)
                     {
@@ -5748,12 +5748,12 @@ static void atk50_openpartyscreen(void)
         else
         {
             gActiveBattler = bank;
-            *(gBattleStruct->field_58 + gActiveBattler) = gBattlePartyID[gActiveBattler];
+            *(gBattleStruct->field_58 + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler];
             *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
             gBattleStruct->field_93 &= ~(gBitTable[gActiveBattler]);
 
-            EmitChoosePokemon(0, hitmarkerFaintBits, *(gBattleStruct->monToSwitchIntoId + (gActiveBattler ^ 2)), 0, gBattleStruct->field_60[gActiveBattler]);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitChoosePokemon(0, hitmarkerFaintBits, *(gBattleStruct->monToSwitchIntoId + (gActiveBattler ^ 2)), 0, gBattleStruct->field_60[gActiveBattler]);
+            MarkBattlerForControllerExec(gActiveBattler);
 
             gBattlescriptCurrInstr += 6;
 
@@ -5766,8 +5766,8 @@ static void atk50_openpartyscreen(void)
                 {
                     if (gActiveBattler != bank)
                     {
-                        EmitLinkStandbyMsg(0, 2, 0);
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitLinkStandbyMsg(0, 2, 0);
+                        MarkBattlerForControllerExec(gActiveBattler);
                     }
                 }
             }
@@ -5777,8 +5777,8 @@ static void atk50_openpartyscreen(void)
                 if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
                     gActiveBattler ^= BIT_FLANK;
 
-                EmitLinkStandbyMsg(0, 2, 0);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitLinkStandbyMsg(0, 2, 0);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
         }
     }
@@ -5787,7 +5787,7 @@ static void atk50_openpartyscreen(void)
 static void atk51_switchhandleorder(void)
 {
     s32 i;
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
@@ -5802,7 +5802,7 @@ static void atk51_switchhandleorder(void)
                 *(gBattleStruct->monToSwitchIntoId + i) = gBattleBufferB[i][1];
                 if (!(gBattleStruct->field_93 & gBitTable[i]))
                 {
-                    RecordedBattle_SetBankAction(i, gBattleBufferB[i][1]);
+                    RecordedBattle_SetBattlerAction(i, gBattleBufferB[i][1]);
                     gBattleStruct->field_93 |= gBitTable[i];
                 }
             }
@@ -5815,7 +5815,7 @@ static void atk51_switchhandleorder(void)
     case 2:
         if (!(gBattleStruct->field_93 & gBitTable[gActiveBattler]))
         {
-            RecordedBattle_SetBankAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]);
+            RecordedBattle_SetBattlerAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]);
             gBattleStruct->field_93 |= gBitTable[gActiveBattler];
         }
         // fall through
@@ -5842,7 +5842,7 @@ static void atk51_switchhandleorder(void)
             sub_803BDA0(gActiveBattler);
         }
 
-        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattleAttacker].species)
+        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattleMoveAttacker].species)
         PREPARE_MON_NICK_BUFFER(gBattleTextBuff2, gActiveBattler, gBattleBufferB[gActiveBattler][1])
 
         break;
@@ -5935,26 +5935,26 @@ static void atk52_switchineffects(void)
 static void atk53_trainerslidein(void)
 {
     gActiveBattler = GetBattlerAtPosition(gBattlescriptCurrInstr[1]);
-    EmitTrainerSlide(0);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitTrainerSlide(0);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk54_playse(void)
 {
-    gActiveBattler = gBattleAttacker;
-    EmitPlaySE(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
-    MarkBufferBankForExecution(gActiveBattler);
+    gActiveBattler = gBattleMoveAttacker;
+    BtlController_EmitPlaySE(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 3;
 }
 
 static void atk55_fanfare(void)
 {
-    gActiveBattler = gBattleAttacker;
-    EmitPlayFanfareOrBGM(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1), FALSE);
-    MarkBufferBankForExecution(gActiveBattler);
+    gActiveBattler = gBattleMoveAttacker;
+    BtlController_EmitPlayFanfareOrBGM(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1), FALSE);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 3;
 }
@@ -5962,8 +5962,8 @@ static void atk55_fanfare(void)
 static void atk56_playfaintcry(void)
 {
     gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
-    EmitFaintingCry(0);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitFaintingCry(0);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -5971,8 +5971,8 @@ static void atk56_playfaintcry(void)
 static void atk57(void)
 {
     gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
-    EmitCmd55(0, gBattleOutcome);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitCmd55(0, gBattleOutcome);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 1;
 }
@@ -5980,8 +5980,8 @@ static void atk57(void)
 static void atk58_returntoball(void)
 {
     gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
-    EmitReturnMonToBall(0, 1);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitReturnMonToBall(0, 1);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -6007,7 +6007,7 @@ static void atk59_handlelearnnewmove(void)
     {
         gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
 
-        if (gBattlePartyID[gActiveBattler] == gBattleStruct->expGetterId
+        if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterId
             && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
         {
             GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret);
@@ -6015,7 +6015,7 @@ static void atk59_handlelearnnewmove(void)
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
             gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
-            if (gBattlePartyID[gActiveBattler] == gBattleStruct->expGetterId
+            if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterId
                 && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
             {
                 GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret);
@@ -6113,7 +6113,7 @@ static void atk5A_yesnoboxlearnmove(void)
                     RemoveMonPPBonus(&gPlayerParty[gBattleStruct->expGetterId], movePosition);
                     SetMonMoveSlot(&gPlayerParty[gBattleStruct->expGetterId], gMoveToLearn, movePosition);
 
-                    if (gBattlePartyID[0] == gBattleStruct->expGetterId
+                    if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterId
                         && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED)
                         && !(gDisableStructs[0].unk18_b & gBitTable[movePosition]))
                     {
@@ -6121,7 +6121,7 @@ static void atk5A_yesnoboxlearnmove(void)
                         SetBattleMonMoveSlot(&gBattleMons[0], gMoveToLearn, movePosition);
                     }
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-                        && gBattlePartyID[2] == gBattleStruct->expGetterId
+                        && gBattlerPartyIndexes[2] == gBattleStruct->expGetterId
                         && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED)
                         && !(gDisableStructs[2].unk18_b & gBitTable[movePosition]))
                     {
@@ -6137,7 +6137,7 @@ static void atk5A_yesnoboxlearnmove(void)
         gBattlescriptCurrInstr += 5;
         break;
     case 6:
-        if (gBattleExecBuffer == 0)
+        if (gBattleControllerExecFlags == 0)
         {
             gBattleScripting.learnMoveState = 2;
         }
@@ -6202,8 +6202,8 @@ static void atk5C_hitanimation(void)
     }
     else if (!(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE) || !(gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE) || gDisableStructs[gActiveBattler].substituteHP == 0)
     {
-        EmitHitAnimation(0);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitHitAnimation(0);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 2;
     }
     else
@@ -6289,12 +6289,12 @@ static void atk5E(void)
     switch (gBattleCommunication[0])
     {
     case 0:
-        EmitGetMonData(0, REQUEST_ALL_BATTLE, 0);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitGetMonData(0, REQUEST_ALL_BATTLE, 0);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattleCommunication[0]++;
         break;
     case 1:
-         if (gBattleExecBuffer == 0)
+         if (gBattleControllerExecFlags == 0)
          {
             s32 i;
             struct BattlePokemon* bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBattler][4];
@@ -6311,9 +6311,9 @@ static void atk5E(void)
 
 static void atk5F(void)
 {
-    gActiveBattler = gBattleAttacker;
-    gBattleAttacker = gBattleDefender;
-    gBattleDefender = gActiveBattler;
+    gActiveBattler = gBattleMoveAttacker;
+    gBattleMoveAttacker = gBattleMoveTarget;
+    gBattleMoveTarget = gActiveBattler;
 
     if (gHitMarker & HITMARKER_PURSUIT_TRAP)
         gHitMarker &= ~(HITMARKER_PURSUIT_TRAP);
@@ -6325,7 +6325,7 @@ static void atk5F(void)
 
 static void atk60_incrementgamestat(void)
 {
-    if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
         IncrementGameStat(gBattlescriptCurrInstr[1]);
 
     gBattlescriptCurrInstr += 2;
@@ -6337,7 +6337,7 @@ static void atk61_drawpartystatussummary(void)
     struct Pokemon* party;
     struct HpAndStatus hpStatuses[6];
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
@@ -6362,8 +6362,8 @@ static void atk61_drawpartystatussummary(void)
         }
     }
 
-    EmitDrawPartyStatusSummary(0, hpStatuses, 1);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitDrawPartyStatusSummary(0, hpStatuses, 1);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -6371,8 +6371,8 @@ static void atk61_drawpartystatussummary(void)
 static void atk62(void)
 {
     gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
-    EmitCmd49(0);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitCmd49(0);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -6389,15 +6389,15 @@ static void atk63_jumptorandomattack(void)
 
 static void atk64_statusanimation(void)
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
         if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
             && gDisableStructs[gActiveBattler].substituteHP == 0
             && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
         {
-            EmitStatusAnimation(0, FALSE, gBattleMons[gActiveBattler].status1);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitStatusAnimation(0, FALSE, gBattleMons[gActiveBattler].status1);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
         gBattlescriptCurrInstr += 2;
     }
@@ -6407,7 +6407,7 @@ static void atk65_status2animation(void)
 {
     u32 wantedToAnimate;
 
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
         wantedToAnimate = BSScriptRead32(gBattlescriptCurrInstr + 2);
@@ -6415,8 +6415,8 @@ static void atk65_status2animation(void)
             && gDisableStructs[gActiveBattler].substituteHP == 0
             && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
         {
-            EmitStatusAnimation(0, TRUE, gBattleMons[gActiveBattler].status2 & wantedToAnimate);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitStatusAnimation(0, TRUE, gBattleMons[gActiveBattler].status2 & wantedToAnimate);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
         gBattlescriptCurrInstr += 6;
     }
@@ -6426,7 +6426,7 @@ static void atk66_chosenstatusanimation(void)
 {
     u32 wantedStatus;
 
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
     {
         gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
         wantedStatus = BSScriptRead32(gBattlescriptCurrInstr + 3);
@@ -6434,8 +6434,8 @@ static void atk66_chosenstatusanimation(void)
             && gDisableStructs[gActiveBattler].substituteHP == 0
             && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
         {
-            EmitStatusAnimation(0, gBattlescriptCurrInstr[2], wantedStatus);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitStatusAnimation(0, gBattlescriptCurrInstr[2], wantedStatus);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
         gBattlescriptCurrInstr += 7;
     }
@@ -6498,42 +6498,42 @@ static void atk69_adjustsetdamage(void) // The same as 0x7, except there's no ra
 {
     u8 holdEffect, quality;
 
-    if (gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBattleDefender].holdEffect, quality = gEnigmaBerries[gBattleDefender].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect, quality = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleDefender].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleDefender].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleMoveTarget].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleMoveTarget].item);
     }
 
-    gStringBank = gBattleDefender;
+    gStringBank = gBattleMoveTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBattleDefender, holdEffect);
-        gSpecialStatuses[gBattleDefender].focusBanded = 1;
+        RecordItemEffectBattle(gBattleMoveTarget, holdEffect);
+        gSpecialStatuses[gBattleMoveTarget].focusBanded = 1;
     }
-    if (gBattleMons[gBattleDefender].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattleDefender].endured
-     && !gSpecialStatuses[gBattleDefender].focusBanded)
+    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattleMoveTarget].endured
+     && !gSpecialStatuses[gBattleMoveTarget].focusBanded)
         goto END;
 
-    if (gBattleMons[gBattleDefender].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattleMoveTarget].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBattleDefender].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - 1;
 
-    if (gProtectStructs[gBattleDefender].endured)
+    if (gProtectStructs[gBattleMoveTarget].endured)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBattleDefender].focusBanded)
+    else if (gSpecialStatuses[gBattleMoveTarget].focusBanded)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-        gLastUsedItem = gBattleMons[gBattleDefender].item;
+        gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
     }
 
     END:
@@ -6550,15 +6550,15 @@ static void atk6A_removeitem(void)
     *usedHeldItem = gBattleMons[gActiveBattler].item;
     gBattleMons[gActiveBattler].item = 0;
 
-    EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
 
 static void atk6B_atknameinbuff1(void)
 {
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleAttacker, gBattlePartyID[gBattleAttacker])
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleMoveAttacker, gBattlerPartyIndexes[gBattleMoveAttacker])
 
     gBattlescriptCurrInstr++;
 }
@@ -6829,9 +6829,9 @@ static void SpriteCB_MonIconOnLvlUpBox(struct Sprite* sprite)
 
 static bool32 IsMonGettingExpSentOut(void)
 {
-    if (gBattlePartyID[0] == gBattleStruct->expGetterId)
+    if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterId)
         return TRUE;
-    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlePartyID[2] == gBattleStruct->expGetterId)
+    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlerPartyIndexes[2] == gBattleStruct->expGetterId)
         return TRUE;
 
     return FALSE;
@@ -6845,15 +6845,15 @@ static void atk6D_resetsentmonsvalue(void)
 
 static void atk6E_setatktoplayer0(void)
 {
-    gBattleAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+    gBattleMoveAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     gBattlescriptCurrInstr++;
 }
 
 static void atk6F_makevisible(void)
 {
     gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
-    EmitSpriteInvisibility(0, FALSE);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitSpriteInvisibility(0, FALSE);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
@@ -6939,8 +6939,8 @@ static void atk74_hpthresholds2(void)
 
 static void atk75_useitemonopponent(void)
 {
-    gBankInMenu = gBattleAttacker;
-    ExecuteTableBasedItemEffect(&gEnemyParty[gBattlePartyID[gBattleAttacker]], gLastUsedItem, gBattlePartyID[gBattleAttacker], 0, 1);
+    gBankInMenu = gBattleMoveAttacker;
+    ExecuteTableBasedItemEffect(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattleMoveAttacker], 0, 1);
 
     gBattlescriptCurrInstr += 1;
 }
@@ -6958,18 +6958,18 @@ static void atk76_various(void)
         CancelMultiTurnMoves(gActiveBattler);
         break;
     case VARIOUS_SET_MAGIC_COAT_TARGET:
-        gBattleAttacker = gBattleDefender;
-        side = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
+        gBattleMoveAttacker = gBattleMoveTarget;
+        side = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer != 0 && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
-            gBattleDefender = gSideTimers[side].followmeTarget;
+            gBattleMoveTarget = gSideTimers[side].followmeTarget;
         else
-            gBattleDefender = gActiveBattler;
+            gBattleMoveTarget = gActiveBattler;
         break;
     case VARIOUS_IS_RUNNING_IMPOSSIBLE:
         gBattleCommunication[0] = IsRunningFromBattleImpossible();
         break;
     case VARIOUS_GET_MOVE_TARGET:
-        gBattleDefender = GetMoveTarget(gCurrentMove, 0);
+        gBattleMoveTarget = GetMoveTarget(gCurrentMove, 0);
         break;
     case 4:
         if (gHitMarker & HITMARKER_FAINTED(gActiveBattler))
@@ -6982,11 +6982,11 @@ static void atk76_various(void)
         gSpecialStatuses[gActiveBattler].traced = 0;
         break;
     case VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP:
-        if (gBattlePartyID[0] == gBattleStruct->expGetterId || gBattlePartyID[2] == gBattleStruct->expGetterId)
+        if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterId || gBattlerPartyIndexes[2] == gBattleStruct->expGetterId)
         {
             u16 *choicedMove;
 
-            if (gBattlePartyID[0] == gBattleStruct->expGetterId)
+            if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterId)
                 gActiveBattler = 0;
             else
                 gActiveBattler = 2;
@@ -7034,14 +7034,14 @@ static void atk76_various(void)
     case 10:
         gBattleMons[1].hp = 0;
         gHitMarker |= HITMARKER_FAINTED(1);
-        gBattleStruct->field_2A1 |= gBitTable[gBattlePartyID[1]];
+        gBattleStruct->field_2A1 |= gBitTable[gBattlerPartyIndexes[1]];
         gDisableStructs[1].truantUnknownBit = 1;
         break;
     case 11:
         gBattleMons[0].hp = 0;
         gHitMarker |= HITMARKER_FAINTED(0);
         gHitMarker |= HITMARKER_x400000;
-        gBattleStruct->field_2A0 |= gBitTable[gBattlePartyID[0]];
+        gBattleStruct->field_2A0 |= gBitTable[gBattlerPartyIndexes[0]];
         gDisableStructs[0].truantUnknownBit = 1;
         break;
     case 12:
@@ -7050,14 +7050,14 @@ static void atk76_various(void)
         gHitMarker |= HITMARKER_FAINTED(0);
         gHitMarker |= HITMARKER_FAINTED(1);
         gHitMarker |= HITMARKER_x400000;
-        gBattleStruct->field_2A0 |= gBitTable[gBattlePartyID[0]];
-        gBattleStruct->field_2A1 |= gBitTable[gBattlePartyID[1]];
+        gBattleStruct->field_2A0 |= gBitTable[gBattlerPartyIndexes[0]];
+        gBattleStruct->field_2A1 |= gBitTable[gBattlerPartyIndexes[1]];
         gDisableStructs[0].truantUnknownBit = 1;
         gDisableStructs[1].truantUnknownBit = 1;
         break;
     case VARIOUS_EMIT_YESNOBOX:
-        EmitUnknownYesNoBox(0);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitUnknownYesNoBox(0);
+        MarkBattlerForControllerExec(gActiveBattler);
         break;
     case 14:
         sub_81A5BF8();
@@ -7081,8 +7081,8 @@ static void atk76_various(void)
         gActiveBattler = 1;
         if (gBattleMons[gActiveBattler].hp != 0)
         {
-            EmitReturnMonToBall(0, 0);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitReturnMonToBall(0, 0);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
         break;
     case VARIOUS_RETURN_OPPONENT_MON2:
@@ -7091,8 +7091,8 @@ static void atk76_various(void)
             gActiveBattler = 3;
             if (gBattleMons[gActiveBattler].hp != 0)
             {
-                EmitReturnMonToBall(0, 0);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitReturnMonToBall(0, 0);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
         }
         break;
@@ -7116,8 +7116,8 @@ static void atk76_various(void)
             gBattleOutcome = B_OUTCOME_POKE_TELEPORTED;
         break;
     case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC:
-        EmitPlayFanfareOrBGM(0, MUS_KACHI1, TRUE);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitPlayFanfareOrBGM(0, MUS_KACHI1, TRUE);
+        MarkBattlerForControllerExec(gActiveBattler);
         break;
     }
 
@@ -7127,31 +7127,31 @@ static void atk76_various(void)
 static void atk77_setprotectlike(void) // protect and endure
 {
     bool8 notLastTurn = TRUE;
-    u16 lastMove = gLastResultingMoves[gBattleAttacker];
+    u16 lastMove = gLastResultingMoves[gBattleMoveAttacker];
 
     if (lastMove != MOVE_PROTECT && lastMove != MOVE_DETECT && lastMove != MOVE_ENDURE)
-        gDisableStructs[gBattleAttacker].protectUses = 0;
+        gDisableStructs[gBattleMoveAttacker].protectUses = 0;
 
     if (gCurrentTurnActionNumber == (gBattlersCount - 1))
         notLastTurn = FALSE;
 
-    if (sProtectSuccessRates[gDisableStructs[gBattleAttacker].protectUses] >= Random() && notLastTurn)
+    if (sProtectSuccessRates[gDisableStructs[gBattleMoveAttacker].protectUses] >= Random() && notLastTurn)
     {
         if (gBattleMoves[gCurrentMove].effect == EFFECT_PROTECT)
         {
-            gProtectStructs[gBattleAttacker].protected = 1;
+            gProtectStructs[gBattleMoveAttacker].protected = 1;
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         }
         if (gBattleMoves[gCurrentMove].effect == EFFECT_ENDURE)
         {
-            gProtectStructs[gBattleAttacker].endured = 1;
+            gProtectStructs[gBattleMoveAttacker].endured = 1;
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
         }
-        gDisableStructs[gBattleAttacker].protectUses++;
+        gDisableStructs[gBattleMoveAttacker].protectUses++;
     }
     else
     {
-        gDisableStructs[gBattleAttacker].protectUses = 0;
+        gDisableStructs[gBattleMoveAttacker].protectUses = 0;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
     }
@@ -7161,48 +7161,48 @@ static void atk77_setprotectlike(void) // protect and endure
 
 static void atk78_faintifabilitynotdamp(void)
 {
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
-    for (gBattleDefender = 0; gBattleDefender < gBattlersCount; gBattleDefender++)
+    for (gBattleMoveTarget = 0; gBattleMoveTarget < gBattlersCount; gBattleMoveTarget++)
     {
-        if (gBattleMons[gBattleDefender].ability == ABILITY_DAMP)
+        if (gBattleMons[gBattleMoveTarget].ability == ABILITY_DAMP)
             break;
     }
 
-    if (gBattleDefender == gBattlersCount)
+    if (gBattleMoveTarget == gBattlersCount)
     {
-        gActiveBattler = gBattleAttacker;
+        gActiveBattler = gBattleMoveAttacker;
         gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
-        EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr++;
 
-        for (gBattleDefender = 0; gBattleDefender < gBattlersCount; gBattleDefender++)
+        for (gBattleMoveTarget = 0; gBattleMoveTarget < gBattlersCount; gBattleMoveTarget++)
         {
-            if (gBattleDefender == gBattleAttacker)
+            if (gBattleMoveTarget == gBattleMoveAttacker)
                 continue;
-            if (!(gAbsentBattlerFlags & gBitTable[gBattleDefender]))
+            if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]))
                 break;
         }
     }
     else
     {
         gLastUsedAbility = ABILITY_DAMP;
-        RecordAbilityBattle(gBattleDefender, gBattleMons[gBattleDefender].ability);
+        RecordAbilityBattle(gBattleMoveTarget, gBattleMons[gBattleMoveTarget].ability);
         gBattlescriptCurrInstr = BattleScript_DampStopsExplosion;
     }
 }
 
 static void atk79_setatkhptozero(void)
 {
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = gBattleAttacker;
+    gActiveBattler = gBattleMoveAttacker;
     gBattleMons[gActiveBattler].hp = 0;
-    EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr++;
 }
@@ -7213,15 +7213,15 @@ static void atk7A_jumpifnexttargetvalid(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        for (gBattleDefender++; ; gBattleDefender++)
+        for (gBattleMoveTarget++; ; gBattleMoveTarget++)
         {
-            if (gBattleDefender == gBattleAttacker)
+            if (gBattleMoveTarget == gBattleMoveAttacker)
                 continue;
-            if (!(gAbsentBattlerFlags & gBitTable[gBattleDefender]))
+            if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]))
                 break;
         }
 
-        if (gBattleDefender >= gBattlersCount)
+        if (gBattleMoveTarget >= gBattlersCount)
             gBattlescriptCurrInstr += 5;
         else
             gBattlescriptCurrInstr = jumpPtr;
@@ -7237,14 +7237,14 @@ static void atk7B_tryhealhalfhealth(void)
     const u8* failPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
     if (gBattlescriptCurrInstr[5] == BS_GET_ATTACKER)
-        gBattleDefender = gBattleAttacker;
+        gBattleMoveTarget = gBattleMoveAttacker;
 
-    gBattleMoveDamage = gBattleMons[gBattleDefender].maxHP / 2;
+    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].maxHP / 2;
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
     gBattleMoveDamage *= -1;
 
-    if (gBattleMons[gBattleDefender].hp == gBattleMons[gBattleDefender].maxHP)
+    if (gBattleMons[gBattleMoveTarget].hp == gBattleMons[gBattleMoveTarget].maxHP)
         gBattlescriptCurrInstr = failPtr;
     else
         gBattlescriptCurrInstr += 6;
@@ -7262,10 +7262,10 @@ static void atk7C_trymirrormove(void)
 
     for (validMovesCount = 0, i = 0; i < gBattlersCount; i++)
     {
-        if (i != gBattleAttacker)
+        if (i != gBattleMoveAttacker)
         {
-            move = *(i * 2 + gBattleAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0)
-                | (*(i * 2 + gBattleAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) << 8);
+            move = *(i * 2 + gBattleMoveAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0)
+                | (*(i * 2 + gBattleMoveAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) << 8);
 
             if (move != 0 && move != 0xFFFF)
             {
@@ -7275,14 +7275,14 @@ static void atk7C_trymirrormove(void)
         }
     }
 
-    move = *(gBattleStruct->mirrorMoves + gBattleAttacker * 2 + 0)
-        | (*(gBattleStruct->mirrorMoves + gBattleAttacker * 2 + 1) << 8);
+    move = *(gBattleStruct->mirrorMoves + gBattleMoveAttacker * 2 + 0)
+        | (*(gBattleStruct->mirrorMoves + gBattleMoveAttacker * 2 + 1) << 8);
 
     if (move != 0 && move != 0xFFFF)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gCurrentMove = move;
-        gBattleDefender = GetMoveTarget(gCurrentMove, 0);
+        gBattleMoveTarget = GetMoveTarget(gCurrentMove, 0);
         gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
     }
     else if (validMovesCount)
@@ -7290,12 +7290,12 @@ static void atk7C_trymirrormove(void)
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         i = Random() % validMovesCount;
         gCurrentMove = movesArray[i];
-        gBattleDefender = GetMoveTarget(gCurrentMove, 0);
+        gBattleMoveTarget = GetMoveTarget(gCurrentMove, 0);
         gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
     }
     else
     {
-        gSpecialStatuses[gBattleAttacker].flag20 = 1;
+        gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
         gBattlescriptCurrInstr++;
     }
 }
@@ -7318,16 +7318,16 @@ static void atk7D_setrain(void)
 
 static void atk7E_setreflect(void)
 {
-    if (gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] & SIDE_STATUS_REFLECT)
+    if (gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] & SIDE_STATUS_REFLECT)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] |= SIDE_STATUS_REFLECT;
-        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].reflectTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].reflectBank = gBattleAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] |= SIDE_STATUS_REFLECT;
+        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].reflectTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].reflectBank = gBattleMoveAttacker;
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMonsInBattle(BATTLE_ALIVE_ATK_SIDE) == 2)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
@@ -7339,20 +7339,20 @@ static void atk7E_setreflect(void)
 
 static void atk7F_setseeded(void)
 {
-    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBattleDefender] & STATUS3_LEECHSEED)
+    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBattleMoveTarget] & STATUS3_LEECHSEED)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
-    else if (gBattleMons[gBattleDefender].type1 == TYPE_GRASS || gBattleMons[gBattleDefender].type2 == TYPE_GRASS)
+    else if (gBattleMons[gBattleMoveTarget].type1 == TYPE_GRASS || gBattleMons[gBattleMoveTarget].type2 == TYPE_GRASS)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
     }
     else
     {
-        gStatuses3[gBattleDefender] |= gBattleAttacker;
-        gStatuses3[gBattleDefender] |= STATUS3_LEECHSEED;
+        gStatuses3[gBattleMoveTarget] |= gBattleMoveAttacker;
+        gStatuses3[gBattleMoveTarget] |= STATUS3_LEECHSEED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
 
@@ -7370,8 +7370,8 @@ static void atk80_manipulatedamage(void)
         gBattleMoveDamage /= 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
-        if ((gBattleMons[gBattleDefender].maxHP / 2) < gBattleMoveDamage)
-            gBattleMoveDamage = gBattleMons[gBattleDefender].maxHP / 2;
+        if ((gBattleMons[gBattleMoveTarget].maxHP / 2) < gBattleMoveDamage)
+            gBattleMoveDamage = gBattleMons[gBattleMoveTarget].maxHP / 2;
         break;
     case ATK80_DMG_DOUBLED:
         gBattleMoveDamage *= 2;
@@ -7384,23 +7384,23 @@ static void atk80_manipulatedamage(void)
 static void atk81_trysetrest(void)
 {
     const u8 *failJump = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
-    gActiveBattler = gBattleDefender = gBattleAttacker;
-    gBattleMoveDamage = gBattleMons[gBattleDefender].maxHP * (-1);
+    gActiveBattler = gBattleMoveTarget = gBattleMoveAttacker;
+    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].maxHP * (-1);
 
-    if (gBattleMons[gBattleDefender].hp == gBattleMons[gBattleDefender].maxHP)
+    if (gBattleMons[gBattleMoveTarget].hp == gBattleMons[gBattleMoveTarget].maxHP)
     {
         gBattlescriptCurrInstr = failJump;
     }
     else
     {
-        if (gBattleMons[gBattleDefender].status1 & ((u8)(~STATUS1_SLEEP)))
+        if (gBattleMons[gBattleMoveTarget].status1 & ((u8)(~STATUS1_SLEEP)))
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
         else
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
 
-        gBattleMons[gBattleDefender].status1 = 3;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
-        MarkBufferBankForExecution(gActiveBattler);
+        gBattleMons[gBattleMoveTarget].status1 = 3;
+        BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -7409,7 +7409,7 @@ static void atk82_jumpifnotfirstturn(void)
 {
     const u8* failJump = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (gDisableStructs[gBattleAttacker].isFirstTurn)
+    if (gDisableStructs[gBattleMoveAttacker].isFirstTurn)
         gBattlescriptCurrInstr += 5;
     else
         gBattlescriptCurrInstr = failJump;
@@ -7431,9 +7431,9 @@ bool8 UproarWakeUpCheck(u8 bank)
 
         gBattleScripting.battler = i;
 
-        if (gBattleDefender == 0xFF)
-            gBattleDefender = i;
-        else if (gBattleDefender == i)
+        if (gBattleMoveTarget == 0xFF)
+            gBattleMoveTarget = i;
+        else if (gBattleMoveTarget == i)
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         else
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -7451,17 +7451,17 @@ static void atk84_jumpifcantmakeasleep(void)
 {
     const u8 *jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (UproarWakeUpCheck(gBattleDefender))
+    if (UproarWakeUpCheck(gBattleMoveTarget))
     {
         gBattlescriptCurrInstr = jumpPtr;
     }
-    else if (gBattleMons[gBattleDefender].ability == ABILITY_INSOMNIA
-            || gBattleMons[gBattleDefender].ability == ABILITY_VITAL_SPIRIT)
+    else if (gBattleMons[gBattleMoveTarget].ability == ABILITY_INSOMNIA
+            || gBattleMons[gBattleMoveTarget].ability == ABILITY_VITAL_SPIRIT)
     {
-        gLastUsedAbility = gBattleMons[gBattleDefender].ability;
+        gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         gBattlescriptCurrInstr = jumpPtr;
-        RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
+        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
     }
     else
     {
@@ -7471,16 +7471,16 @@ static void atk84_jumpifcantmakeasleep(void)
 
 static void atk85_stockpile(void)
 {
-    if (gDisableStructs[gBattleAttacker].stockpileCounter == 3)
+    if (gDisableStructs[gBattleMoveAttacker].stockpileCounter == 3)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gDisableStructs[gBattleAttacker].stockpileCounter++;
+        gDisableStructs[gBattleMoveAttacker].stockpileCounter++;
 
-        PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gBattleAttacker].stockpileCounter)
+        PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gBattleMoveAttacker].stockpileCounter)
 
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
@@ -7490,7 +7490,7 @@ static void atk85_stockpile(void)
 static void atk86_stockpiletobasedamage(void)
 {
     const u8* jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
-    if (gDisableStructs[gBattleAttacker].stockpileCounter == 0)
+    if (gDisableStructs[gBattleMoveAttacker].stockpileCounter == 0)
     {
         gBattlescriptCurrInstr = jumpPtr;
     }
@@ -7498,17 +7498,17 @@ static void atk86_stockpiletobasedamage(void)
     {
         if (gBattleCommunication[6] != 1)
         {
-            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleAttacker], &gBattleMons[gBattleDefender], gCurrentMove,
-                                                    gSideStatuses[GET_BATTLER_SIDE(gBattleDefender)], 0,
-                                                    0, gBattleAttacker, gBattleDefender)
-                                * gDisableStructs[gBattleAttacker].stockpileCounter;
-            gBattleScripting.animTurn = gDisableStructs[gBattleAttacker].stockpileCounter;
+            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleMoveAttacker], &gBattleMons[gBattleMoveTarget], gCurrentMove,
+                                                    gSideStatuses[GET_BATTLER_SIDE(gBattleMoveTarget)], 0,
+                                                    0, gBattleMoveAttacker, gBattleMoveTarget)
+                                * gDisableStructs[gBattleMoveAttacker].stockpileCounter;
+            gBattleScripting.animTurn = gDisableStructs[gBattleMoveAttacker].stockpileCounter;
 
-            if (gProtectStructs[gBattleAttacker].helpingHand)
+            if (gProtectStructs[gBattleMoveAttacker].helpingHand)
                 gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
         }
 
-        gDisableStructs[gBattleAttacker].stockpileCounter = 0;
+        gDisableStructs[gBattleMoveAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -7517,30 +7517,30 @@ static void atk87_stockpiletohpheal(void)
 {
     const u8* jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (gDisableStructs[gBattleAttacker].stockpileCounter == 0)
+    if (gDisableStructs[gBattleMoveAttacker].stockpileCounter == 0)
     {
         gBattlescriptCurrInstr = jumpPtr;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
-    else if (gBattleMons[gBattleAttacker].maxHP == gBattleMons[gBattleAttacker].hp)
+    else if (gBattleMons[gBattleMoveAttacker].maxHP == gBattleMons[gBattleMoveAttacker].hp)
     {
-        gDisableStructs[gBattleAttacker].stockpileCounter = 0;
+        gDisableStructs[gBattleMoveAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr = jumpPtr;
-        gBattleDefender = gBattleAttacker;
+        gBattleMoveTarget = gBattleMoveAttacker;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / (1 << (3 - gDisableStructs[gBattleAttacker].stockpileCounter));
+        gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / (1 << (3 - gDisableStructs[gBattleMoveAttacker].stockpileCounter));
 
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
 
-        gBattleScripting.animTurn = gDisableStructs[gBattleAttacker].stockpileCounter;
-        gDisableStructs[gBattleAttacker].stockpileCounter = 0;
+        gBattleScripting.animTurn = gDisableStructs[gBattleMoveAttacker].stockpileCounter;
+        gDisableStructs[gBattleMoveAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr += 5;
-        gBattleDefender = gBattleAttacker;
+        gBattleMoveTarget = gBattleMoveAttacker;
     }
 }
 
@@ -7560,9 +7560,9 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
     u32 index;
 
     if (flags & MOVE_EFFECT_AFFECTS_USER)
-        gActiveBattler = gBattleAttacker;
+        gActiveBattler = gBattleMoveAttacker;
     else
-        gActiveBattler = gBattleDefender;
+        gActiveBattler = gBattleMoveTarget;
 
     flags &= ~(MOVE_EFFECT_AFFECTS_USER);
 
@@ -7678,7 +7678,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
             if (gBattleMons[gActiveBattler].statStages[statId] == 0)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
             else
-                gBattleCommunication[MULTISTRING_CHOOSER] = (gBattleDefender == gActiveBattler);
+                gBattleCommunication[MULTISTRING_CHOOSER] = (gBattleMoveTarget == gActiveBattler);
 
         }
     }
@@ -7705,7 +7705,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
         if (gBattleMons[gActiveBattler].statStages[statId] == 0xC)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         else
-            gBattleCommunication[MULTISTRING_CHOOSER] = (gBattleDefender == gActiveBattler);
+            gBattleCommunication[MULTISTRING_CHOOSER] = (gBattleMoveTarget == gActiveBattler);
     }
 
     gBattleMons[gActiveBattler].statStages[statId] += statValue;
@@ -7745,17 +7745,17 @@ static void atk8A_normalisebuffs(void) // haze
 
 static void atk8B_setbide(void)
 {
-    gBattleMons[gBattleAttacker].status2 |= STATUS2_MULTIPLETURNS;
-    gLockedMoves[gBattleAttacker] = gCurrentMove;
-    gTakenDmg[gBattleAttacker] = 0;
-    gBattleMons[gBattleAttacker].status2 |= (STATUS2_BIDE - 0x100); // 2 turns
+    gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_MULTIPLETURNS;
+    gLockedMoves[gBattleMoveAttacker] = gCurrentMove;
+    gTakenDmg[gBattleMoveAttacker] = 0;
+    gBattleMons[gBattleMoveAttacker].status2 |= (STATUS2_BIDE - 0x100); // 2 turns
 
     gBattlescriptCurrInstr++;
 }
 
 static void atk8C_confuseifrepeatingattackends(void)
 {
-    if (!(gBattleMons[gBattleAttacker].status2 & STATUS2_LOCK_CONFUSE))
+    if (!(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_LOCK_CONFUSE))
         gBattleCommunication[MOVE_EFFECT_BYTE] = (MOVE_EFFECT_THRASH | MOVE_EFFECT_AFFECTS_USER);
 
     gBattlescriptCurrInstr++;
@@ -7788,19 +7788,19 @@ static void atk8E_initmultihitstring(void)
 
 static bool8 TryDoForceSwitchOut(void)
 {
-    if (gBattleMons[gBattleAttacker].level >= gBattleMons[gBattleDefender].level)
+    if (gBattleMons[gBattleMoveAttacker].level >= gBattleMons[gBattleMoveTarget].level)
     {
-        *(gBattleStruct->field_58 + gBattleDefender) = gBattlePartyID[gBattleDefender];
+        *(gBattleStruct->field_58 + gBattleMoveTarget) = gBattlerPartyIndexes[gBattleMoveTarget];
     }
     else
     {
         u16 random = Random() & 0xFF;
-        if ((u32)((random * (gBattleMons[gBattleAttacker].level + gBattleMons[gBattleDefender].level) >> 8) + 1) <= (gBattleMons[gBattleDefender].level / 4))
+        if ((u32)((random * (gBattleMons[gBattleMoveAttacker].level + gBattleMons[gBattleMoveTarget].level) >> 8) + 1) <= (gBattleMons[gBattleMoveTarget].level / 4))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
             return FALSE;
         }
-        *(gBattleStruct->field_58 + gBattleDefender) = gBattlePartyID[gBattleDefender];
+        *(gBattleStruct->field_58 + gBattleMoveTarget) = gBattlerPartyIndexes[gBattleMoveTarget];
     }
 
     gBattlescriptCurrInstr = BattleScript_SuccessForceOut;
@@ -7827,7 +7827,7 @@ static void atk8F_forcerandomswitch(void)
 
     if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER))
     {
-        if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
             party = gPlayerParty;
         else
             party = gEnemyParty;
@@ -7836,7 +7836,7 @@ static void atk8F_forcerandomswitch(void)
             || (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER && gBattleTypeFlags & BATTLE_TYPE_x2000000)
             || (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER))
         {
-            if ((gBattleDefender & BIT_FLANK) != 0)
+            if ((gBattleMoveTarget & BIT_FLANK) != 0)
             {
                 firstMonId = 3;
                 lastMonId = 6;
@@ -7848,13 +7848,13 @@ static void atk8F_forcerandomswitch(void)
             }
             monsCount = 3;
             minNeeded = 1;
-            bank2PartyId = gBattlePartyID[gBattleDefender];
-            bank1PartyId = gBattlePartyID[gBattleDefender ^ BIT_FLANK];
+            bank2PartyId = gBattlerPartyIndexes[gBattleMoveTarget];
+            bank1PartyId = gBattlerPartyIndexes[gBattleMoveTarget ^ BIT_FLANK];
         }
         else if ((gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
                  || (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_x2000000))
         {
-            if (sub_806D82C(GetBankMultiplayerId(gBattleDefender)) == 1)
+            if (sub_806D82C(GetBattlerMultiplayerId(gBattleMoveTarget)) == 1)
             {
                 firstMonId = 3;
                 lastMonId = 6;
@@ -7866,12 +7866,12 @@ static void atk8F_forcerandomswitch(void)
             }
             monsCount = 3;
             minNeeded = 1;
-            bank2PartyId = gBattlePartyID[gBattleDefender];
-            bank1PartyId = gBattlePartyID[gBattleDefender ^ BIT_FLANK];
+            bank2PartyId = gBattlerPartyIndexes[gBattleMoveTarget];
+            bank1PartyId = gBattlerPartyIndexes[gBattleMoveTarget ^ BIT_FLANK];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
         {
-            if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
+            if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
             {
                 firstMonId = 0;
                 lastMonId = 6;
@@ -7880,7 +7880,7 @@ static void atk8F_forcerandomswitch(void)
             }
             else
             {
-                if ((gBattleDefender & BIT_FLANK) != 0)
+                if ((gBattleMoveTarget & BIT_FLANK) != 0)
                 {
                     firstMonId = 3;
                     lastMonId = 6;
@@ -7893,8 +7893,8 @@ static void atk8F_forcerandomswitch(void)
                 monsCount = 3;
                 minNeeded = 1;
             }
-            bank2PartyId = gBattlePartyID[gBattleDefender];
-            bank1PartyId = gBattlePartyID[gBattleDefender ^ BIT_FLANK];
+            bank2PartyId = gBattlerPartyIndexes[gBattleMoveTarget];
+            bank1PartyId = gBattlerPartyIndexes[gBattleMoveTarget ^ BIT_FLANK];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
@@ -7902,8 +7902,8 @@ static void atk8F_forcerandomswitch(void)
             lastMonId = 6;
             monsCount = 6;
             minNeeded = 2;
-            bank2PartyId = gBattlePartyID[gBattleDefender];
-            bank1PartyId = gBattlePartyID[gBattleDefender ^ BIT_FLANK];
+            bank2PartyId = gBattlerPartyIndexes[gBattleMoveTarget];
+            bank1PartyId = gBattlerPartyIndexes[gBattleMoveTarget ^ BIT_FLANK];
         }
         else
         {
@@ -7911,8 +7911,8 @@ static void atk8F_forcerandomswitch(void)
             lastMonId = 6;
             monsCount = 6;
             minNeeded = 1;
-            bank2PartyId = gBattlePartyID[gBattleDefender]; // there is only one pokemon out in single battles
-            bank1PartyId = gBattlePartyID[gBattleDefender];
+            bank2PartyId = gBattlerPartyIndexes[gBattleMoveTarget]; // there is only one pokemon out in single battles
+            bank1PartyId = gBattlerPartyIndexes[gBattleMoveTarget];
         }
 
         for (i = firstMonId; i < lastMonId; i++)
@@ -7944,22 +7944,22 @@ static void atk8F_forcerandomswitch(void)
                        || GetMonData(&party[i], MON_DATA_IS_EGG) == TRUE
                        || GetMonData(&party[i], MON_DATA_HP) == 0);
             }
-            *(gBattleStruct->monToSwitchIntoId + gBattleDefender) = i;
+            *(gBattleStruct->monToSwitchIntoId + gBattleMoveTarget) = i;
 
             if (!sub_81B1250())
-                sub_803BDA0(gBattleDefender);
+                sub_803BDA0(gBattleMoveTarget);
 
             if ((gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                 || (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
                 || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                 || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                sub_81B8E80(gBattleDefender, i, 0);
-                sub_81B8E80(gBattleDefender ^ BIT_FLANK, i, 1);
+                sub_81B8E80(gBattleMoveTarget, i, 0);
+                sub_81B8E80(gBattleMoveTarget ^ BIT_FLANK, i, 1);
             }
 
             if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
-                sub_80571DC(gBattleDefender, i);
+                sub_80571DC(gBattleMoveTarget, i);
         }
     }
     else
@@ -7976,7 +7976,7 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
 
     while (validMoves < 4)
     {
-        if (gBattleMons[gBattleAttacker].moves[validMoves] == 0)
+        if (gBattleMons[gBattleMoveAttacker].moves[validMoves] == 0)
             break;
 
         validMoves++;
@@ -7984,17 +7984,17 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
 
     for (moveChecked = 0; moveChecked < validMoves; moveChecked++)
     {
-        moveType = gBattleMoves[gBattleMons[gBattleAttacker].moves[moveChecked]].type;
+        moveType = gBattleMoves[gBattleMons[gBattleMoveAttacker].moves[moveChecked]].type;
 
         if (moveType == TYPE_MYSTERY)
         {
-            if (gBattleMons[gBattleAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleAttacker].type2 == TYPE_GHOST)
+            if (gBattleMons[gBattleMoveAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleMoveAttacker].type2 == TYPE_GHOST)
                 moveType = TYPE_GHOST;
             else
                 moveType = TYPE_NORMAL;
         }
-        if (moveType != gBattleMons[gBattleAttacker].type1
-            && moveType != gBattleMons[gBattleAttacker].type2)
+        if (moveType != gBattleMons[gBattleMoveAttacker].type1
+            && moveType != gBattleMons[gBattleMoveAttacker].type2)
         {
             break;
         }
@@ -8011,20 +8011,20 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
 
             while ((moveChecked = Random() & 3) >= validMoves);
 
-            moveType = gBattleMoves[gBattleMons[gBattleAttacker].moves[moveChecked]].type;
+            moveType = gBattleMoves[gBattleMons[gBattleMoveAttacker].moves[moveChecked]].type;
 
             if (moveType == TYPE_MYSTERY)
             {
-                if (gBattleMons[gBattleAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleAttacker].type2 == TYPE_GHOST)
+                if (gBattleMons[gBattleMoveAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleMoveAttacker].type2 == TYPE_GHOST)
                     moveType = TYPE_GHOST;
                 else
                     moveType = TYPE_NORMAL;
             }
         }
-        while (moveType == gBattleMons[gBattleAttacker].type1 || moveType == gBattleMons[gBattleAttacker].type2);
+        while (moveType == gBattleMons[gBattleMoveAttacker].type1 || moveType == gBattleMons[gBattleMoveAttacker].type2);
 
-        gBattleMons[gBattleAttacker].type1 = moveType;
-        gBattleMons[gBattleAttacker].type2 = moveType;
+        gBattleMons[gBattleMoveAttacker].type1 = moveType;
+        gBattleMons[gBattleMoveAttacker].type2 = moveType;
 
         PREPARE_TYPE_BUFFER(gBattleTextBuff1, moveType)
 
@@ -8052,16 +8052,16 @@ static void atk91_givepaydaymoney(void)
 
 static void atk92_setlightscreen(void)
 {
-    if (gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] & SIDE_STATUS_LIGHTSCREEN)
+    if (gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] & SIDE_STATUS_LIGHTSCREEN)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] |= SIDE_STATUS_LIGHTSCREEN;
-        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].lightscreenTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].lightscreenBank = gBattleAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] |= SIDE_STATUS_LIGHTSCREEN;
+        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].lightscreenTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].lightscreenBank = gBattleMoveAttacker;
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMonsInBattle(BATTLE_ALIVE_ATK_SIDE) == 2)
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
@@ -8076,72 +8076,72 @@ static void atk93_tryKO(void)
 {
     u8 holdEffect, param;
 
-    if (gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY)
     {
-       holdEffect = gEnigmaBerries[gBattleDefender].holdEffect;
-       param = gEnigmaBerries[gBattleDefender].holdEffectParam;
+       holdEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect;
+       param = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleDefender].item);
-        param = ItemId_GetHoldEffectParam(gBattleMons[gBattleDefender].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleMoveTarget].item);
+        param = ItemId_GetHoldEffectParam(gBattleMons[gBattleMoveTarget].item);
     }
 
-    gStringBank = gBattleDefender;
+    gStringBank = gBattleMoveTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
-        RecordItemEffectBattle(gBattleDefender, HOLD_EFFECT_FOCUS_BAND);
-        gSpecialStatuses[gBattleDefender].focusBanded = 1;
+        RecordItemEffectBattle(gBattleMoveTarget, HOLD_EFFECT_FOCUS_BAND);
+        gSpecialStatuses[gBattleMoveTarget].focusBanded = 1;
     }
 
-    if (gBattleMons[gBattleDefender].ability == ABILITY_STURDY)
+    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_STURDY)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gLastUsedAbility = ABILITY_STURDY;
         gBattlescriptCurrInstr = BattleScript_SturdyPreventsOHKO;
-        RecordAbilityBattle(gBattleDefender, ABILITY_STURDY);
+        RecordAbilityBattle(gBattleMoveTarget, ABILITY_STURDY);
     }
     else
     {
         u16 chance;
-        if (!(gStatuses3[gBattleDefender] & STATUS3_ALWAYS_HITS))
+        if (!(gStatuses3[gBattleMoveTarget] & STATUS3_ALWAYS_HITS))
         {
-            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattleAttacker].level - gBattleMons[gBattleDefender].level);
-            if (Random() % 100 + 1 < chance && gBattleMons[gBattleAttacker].level >= gBattleMons[gBattleDefender].level)
+            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattleMoveAttacker].level - gBattleMons[gBattleMoveTarget].level);
+            if (Random() % 100 + 1 < chance && gBattleMons[gBattleMoveAttacker].level >= gBattleMons[gBattleMoveTarget].level)
                 chance = TRUE;
             else
                 chance = FALSE;
         }
-        else if (gDisableStructs[gBattleDefender].bankWithSureHit == gBattleAttacker
-                 && gBattleMons[gBattleAttacker].level >= gBattleMons[gBattleDefender].level)
+        else if (gDisableStructs[gBattleMoveTarget].bankWithSureHit == gBattleMoveAttacker
+                 && gBattleMons[gBattleMoveAttacker].level >= gBattleMons[gBattleMoveTarget].level)
         {
             chance = TRUE;
         }
         else
         {
-            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattleAttacker].level - gBattleMons[gBattleDefender].level);
-            if (Random() % 100 + 1 < chance && gBattleMons[gBattleAttacker].level >= gBattleMons[gBattleDefender].level)
+            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattleMoveAttacker].level - gBattleMons[gBattleMoveTarget].level);
+            if (Random() % 100 + 1 < chance && gBattleMons[gBattleMoveAttacker].level >= gBattleMons[gBattleMoveTarget].level)
                 chance = TRUE;
             else
                 chance = FALSE;
         }
         if (chance)
         {
-            if (gProtectStructs[gBattleDefender].endured)
+            if (gProtectStructs[gBattleMoveTarget].endured)
             {
-                gBattleMoveDamage = gBattleMons[gBattleDefender].hp - 1;
+                gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - 1;
                 gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
             }
-            else if (gSpecialStatuses[gBattleDefender].focusBanded)
+            else if (gSpecialStatuses[gBattleMoveTarget].focusBanded)
             {
-                gBattleMoveDamage = gBattleMons[gBattleDefender].hp - 1;
+                gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - 1;
                 gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-                gLastUsedItem = gBattleMons[gBattleDefender].item;
+                gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
             }
             else
             {
-                gBattleMoveDamage = gBattleMons[gBattleDefender].hp;
+                gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp;
                 gMoveResultFlags |= MOVE_RESULT_ONE_HIT_KO;
             }
             gBattlescriptCurrInstr += 5;
@@ -8149,7 +8149,7 @@ static void atk93_tryKO(void)
         else
         {
             gMoveResultFlags |= MOVE_RESULT_MISSED;
-            if (gBattleMons[gBattleAttacker].level >= gBattleMons[gBattleDefender].level)
+            if (gBattleMons[gBattleMoveAttacker].level >= gBattleMons[gBattleMoveTarget].level)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             else
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -8160,7 +8160,7 @@ static void atk93_tryKO(void)
 
 static void atk94_damagetohalftargethp(void) // super fang
 {
-    gBattleMoveDamage = gBattleMons[gBattleDefender].hp / 2;
+    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp / 2;
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
 
@@ -8189,17 +8189,17 @@ static void atk96_weatherdamage(void)
     {
         if (gBattleWeather & WEATHER_SANDSTORM_ANY)
         {
-            if (gBattleMons[gBattleAttacker].type1 != TYPE_ROCK
-                && gBattleMons[gBattleAttacker].type1 != TYPE_STEEL
-                && gBattleMons[gBattleAttacker].type1 != TYPE_GROUND
-                && gBattleMons[gBattleAttacker].type2 != TYPE_ROCK
-                && gBattleMons[gBattleAttacker].type2 != TYPE_STEEL
-                && gBattleMons[gBattleAttacker].type2 != TYPE_GROUND
-                && gBattleMons[gBattleAttacker].ability != ABILITY_SAND_VEIL
-                && !(gStatuses3[gBattleAttacker] & STATUS3_UNDERGROUND)
-                && !(gStatuses3[gBattleAttacker] & STATUS3_UNDERWATER))
-            {
-                gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 16;
+            if (gBattleMons[gBattleMoveAttacker].type1 != TYPE_ROCK
+                && gBattleMons[gBattleMoveAttacker].type1 != TYPE_STEEL
+                && gBattleMons[gBattleMoveAttacker].type1 != TYPE_GROUND
+                && gBattleMons[gBattleMoveAttacker].type2 != TYPE_ROCK
+                && gBattleMons[gBattleMoveAttacker].type2 != TYPE_STEEL
+                && gBattleMons[gBattleMoveAttacker].type2 != TYPE_GROUND
+                && gBattleMons[gBattleMoveAttacker].ability != ABILITY_SAND_VEIL
+                && !(gStatuses3[gBattleMoveAttacker] & STATUS3_UNDERGROUND)
+                && !(gStatuses3[gBattleMoveAttacker] & STATUS3_UNDERWATER))
+            {
+                gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 16;
                 if (gBattleMoveDamage == 0)
                     gBattleMoveDamage = 1;
             }
@@ -8210,12 +8210,12 @@ static void atk96_weatherdamage(void)
         }
         if (gBattleWeather & WEATHER_HAIL)
         {
-            if (gBattleMons[gBattleAttacker].type1 != TYPE_ICE
-                && gBattleMons[gBattleAttacker].type2 != TYPE_ICE
-                && !(gStatuses3[gBattleAttacker] & STATUS3_UNDERGROUND)
-                && !(gStatuses3[gBattleAttacker] & STATUS3_UNDERWATER))
+            if (gBattleMons[gBattleMoveAttacker].type1 != TYPE_ICE
+                && gBattleMons[gBattleMoveAttacker].type2 != TYPE_ICE
+                && !(gStatuses3[gBattleMoveAttacker] & STATUS3_UNDERGROUND)
+                && !(gStatuses3[gBattleMoveAttacker] & STATUS3_UNDERWATER))
             {
-                gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 16;
+                gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 16;
                 if (gBattleMoveDamage == 0)
                     gBattleMoveDamage = 1;
             }
@@ -8230,7 +8230,7 @@ static void atk96_weatherdamage(void)
         gBattleMoveDamage = 0;
     }
 
-    if (gAbsentBattlerFlags & gBitTable[gBattleAttacker])
+    if (gAbsentBattlerFlags & gBitTable[gBattleMoveAttacker])
         gBattleMoveDamage = 0;
 
     gBattlescriptCurrInstr++;
@@ -8242,15 +8242,15 @@ static void atk97_tryinfatuating(void)
     u16 speciesAttacker, speciesTarget;
     u32 personalityAttacker, personalityTarget;
 
-    if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
-        monAttacker = &gPlayerParty[gBattlePartyID[gBattleAttacker]];
+    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+        monAttacker = &gPlayerParty[gBattlerPartyIndexes[gBattleMoveAttacker]];
     else
-        monAttacker = &gEnemyParty[gBattlePartyID[gBattleAttacker]];
+        monAttacker = &gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker]];
 
-    if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
-        monTarget = &gPlayerParty[gBattlePartyID[gBattleDefender]];
+    if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
+        monTarget = &gPlayerParty[gBattlerPartyIndexes[gBattleMoveTarget]];
     else
-        monTarget = &gEnemyParty[gBattlePartyID[gBattleDefender]];
+        monTarget = &gEnemyParty[gBattlerPartyIndexes[gBattleMoveTarget]];
 
     speciesAttacker = GetMonData(monAttacker, MON_DATA_SPECIES);
     personalityAttacker = GetMonData(monAttacker, MON_DATA_PERSONALITY);
@@ -8258,16 +8258,16 @@ static void atk97_tryinfatuating(void)
     speciesTarget = GetMonData(monTarget, MON_DATA_SPECIES);
     personalityTarget = GetMonData(monTarget, MON_DATA_PERSONALITY);
 
-    if (gBattleMons[gBattleDefender].ability == ABILITY_OBLIVIOUS)
+    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_OBLIVIOUS)
     {
         gBattlescriptCurrInstr = BattleScript_ObliviousPreventsAttraction;
         gLastUsedAbility = ABILITY_OBLIVIOUS;
-        RecordAbilityBattle(gBattleDefender, ABILITY_OBLIVIOUS);
+        RecordAbilityBattle(gBattleMoveTarget, ABILITY_OBLIVIOUS);
     }
     else
     {
         if (GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget)
-            || gBattleMons[gBattleDefender].status2 & STATUS2_INFATUATION
+            || gBattleMons[gBattleMoveTarget].status2 & STATUS2_INFATUATION
             || GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == MON_GENDERLESS
             || GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget) == MON_GENDERLESS)
         {
@@ -8275,7 +8275,7 @@ static void atk97_tryinfatuating(void)
         }
         else
         {
-            gBattleMons[gBattleDefender].status2 |= STATUS2_INFATUATED_WITH(gBattleAttacker);
+            gBattleMons[gBattleMoveTarget].status2 |= STATUS2_INFATUATED_WITH(gBattleMoveAttacker);
             gBattlescriptCurrInstr += 5;
         }
     }
@@ -8283,31 +8283,31 @@ static void atk97_tryinfatuating(void)
 
 static void atk98_updatestatusicon(void)
 {
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
     if (gBattlescriptCurrInstr[1] != BS_ATTACKER_WITH_PARTNER)
     {
         gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
-        EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 2;
     }
     else
     {
-        gActiveBattler = gBattleAttacker;
+        gActiveBattler = gBattleMoveAttacker;
         if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
         {
-            EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
+            MarkBattlerForControllerExec(gActiveBattler);
         }
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         {
-            gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_FLANK);
+            gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_FLANK);
             if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
             {
-                EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
         }
         gBattlescriptCurrInstr += 2;
@@ -8316,16 +8316,16 @@ static void atk98_updatestatusicon(void)
 
 static void atk99_setmist(void)
 {
-    if (gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].mistTimer)
+    if (gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].mistTimer)
     {
         gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].mistTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].mistBank = gBattleAttacker;
-        gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] |= SIDE_STATUS_MIST;
+        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].mistTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].mistBank = gBattleMoveAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] |= SIDE_STATUS_MIST;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     gBattlescriptCurrInstr++;
@@ -8333,14 +8333,14 @@ static void atk99_setmist(void)
 
 static void atk9A_setfocusenergy(void)
 {
-    if (gBattleMons[gBattleAttacker].status2 & STATUS2_FOCUS_ENERGY)
+    if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_FOCUS_ENERGY)
     {
         gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gBattleMons[gBattleAttacker].status2 |= STATUS2_FOCUS_ENERGY;
+        gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_FOCUS_ENERGY;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     gBattlescriptCurrInstr++;
@@ -8350,8 +8350,8 @@ static void atk9B_transformdataexecution(void)
 {
     gChosenMove = 0xFFFF;
     gBattlescriptCurrInstr++;
-    if (gBattleMons[gBattleDefender].status2 & STATUS2_TRANSFORMED
-        || gStatuses3[gBattleDefender] & STATUS3_SEMI_INVULNERABLE)
+    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_TRANSFORMED
+        || gStatuses3[gBattleMoveTarget] & STATUS3_SEMI_INVULNERABLE)
     {
         gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -8361,55 +8361,55 @@ static void atk9B_transformdataexecution(void)
         s32 i;
         u8 *battleMonAttacker, *battleMonTarget;
 
-        gBattleMons[gBattleAttacker].status2 |= STATUS2_TRANSFORMED;
-        gDisableStructs[gBattleAttacker].disabledMove = 0;
-        gDisableStructs[gBattleAttacker].disableTimer1 = 0;
-        gDisableStructs[gBattleAttacker].transformedMonPersonality = gBattleMons[gBattleDefender].personality;
-        gDisableStructs[gBattleAttacker].unk18_b = 0;
+        gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_TRANSFORMED;
+        gDisableStructs[gBattleMoveAttacker].disabledMove = 0;
+        gDisableStructs[gBattleMoveAttacker].disableTimer1 = 0;
+        gDisableStructs[gBattleMoveAttacker].transformedMonPersonality = gBattleMons[gBattleMoveTarget].personality;
+        gDisableStructs[gBattleMoveAttacker].unk18_b = 0;
 
-        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattleDefender].species)
+        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattleMoveTarget].species)
 
-        battleMonAttacker = (u8*)(&gBattleMons[gBattleAttacker]);
-        battleMonTarget = (u8*)(&gBattleMons[gBattleDefender]);
+        battleMonAttacker = (u8*)(&gBattleMons[gBattleMoveAttacker]);
+        battleMonTarget = (u8*)(&gBattleMons[gBattleMoveTarget]);
 
         for (i = 0; i < offsetof(struct BattlePokemon, pp); i++)
             battleMonAttacker[i] = battleMonTarget[i];
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMoves[gBattleMons[gBattleAttacker].moves[i]].pp < 5)
-                gBattleMons[gBattleAttacker].pp[i] = gBattleMoves[gBattleMons[gBattleAttacker].moves[i]].pp;
+            if (gBattleMoves[gBattleMons[gBattleMoveAttacker].moves[i]].pp < 5)
+                gBattleMons[gBattleMoveAttacker].pp[i] = gBattleMoves[gBattleMons[gBattleMoveAttacker].moves[i]].pp;
             else
-                gBattleMons[gBattleAttacker].pp[i] = 5;
+                gBattleMons[gBattleMoveAttacker].pp[i] = 5;
         }
 
-        gActiveBattler = gBattleAttacker;
-        EmitResetActionMoveSelection(0, RESET_MOVE_SELECTION);
-        MarkBufferBankForExecution(gActiveBattler);
+        gActiveBattler = gBattleMoveAttacker;
+        BtlController_EmitResetActionMoveSelection(0, RESET_MOVE_SELECTION);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
 }
 
 static void atk9C_setsubstitute(void)
 {
-    u32 hp = gBattleMons[gBattleAttacker].maxHP / 4;
-    if (gBattleMons[gBattleAttacker].maxHP / 4 == 0)
+    u32 hp = gBattleMons[gBattleMoveAttacker].maxHP / 4;
+    if (gBattleMons[gBattleMoveAttacker].maxHP / 4 == 0)
         hp = 1;
 
-    if (gBattleMons[gBattleAttacker].hp <= hp)
+    if (gBattleMons[gBattleMoveAttacker].hp <= hp)
     {
         gBattleMoveDamage = 0;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 4; // one bit value will only work for pokemon which max hp can go to 1020(which is more than possible in games)
+        gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 4; // one bit value will only work for pokemon which max hp can go to 1020(which is more than possible in games)
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
-        gBattleMons[gBattleAttacker].status2 |= STATUS2_SUBSTITUTE;
-        gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_WRAPPED);
-        gDisableStructs[gBattleAttacker].substituteHP = gBattleMoveDamage;
+        gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_SUBSTITUTE;
+        gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_WRAPPED);
+        gDisableStructs[gBattleMoveAttacker].substituteHP = gBattleMoveDamage;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         gHitMarker |= HITMARKER_IGNORE_SUBSTITUTE;
     }
@@ -8430,10 +8430,10 @@ static void atk9D_mimicattackcopy(void)
 {
     gChosenMove = 0xFFFF;
 
-    if (IsMoveUncopyableByMimic(gLastMoves[gBattleDefender])
-        || gBattleMons[gBattleAttacker].status2 & STATUS2_TRANSFORMED
-        || gLastMoves[gBattleDefender] == 0
-        || gLastMoves[gBattleDefender] == 0xFFFF)
+    if (IsMoveUncopyableByMimic(gLastMoves[gBattleMoveTarget])
+        || gBattleMons[gBattleMoveAttacker].status2 & STATUS2_TRANSFORMED
+        || gLastMoves[gBattleMoveTarget] == 0
+        || gLastMoves[gBattleMoveTarget] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8443,22 +8443,22 @@ static void atk9D_mimicattackcopy(void)
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMons[gBattleAttacker].moves[i] == gLastMoves[gBattleDefender])
+            if (gBattleMons[gBattleMoveAttacker].moves[i] == gLastMoves[gBattleMoveTarget])
                 break;
         }
 
         if (i == 4)
         {
-            gBattleMons[gBattleAttacker].moves[gCurrMovePos] = gLastMoves[gBattleDefender];
-            if (gBattleMoves[gLastMoves[gBattleDefender]].pp < 5)
-                gBattleMons[gBattleAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBattleDefender]].pp;
+            gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos] = gLastMoves[gBattleMoveTarget];
+            if (gBattleMoves[gLastMoves[gBattleMoveTarget]].pp < 5)
+                gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBattleMoveTarget]].pp;
             else
-                gBattleMons[gBattleAttacker].pp[gCurrMovePos] = 5;
+                gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] = 5;
 
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattleDefender])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattleMoveTarget])
 
-            gDisableStructs[gBattleAttacker].unk18_b |= gBitTable[gCurrMovePos];
+            gDisableStructs[gBattleMoveAttacker].unk18_b |= gBitTable[gCurrMovePos];
             gBattlescriptCurrInstr += 5;
         }
         else
@@ -8494,7 +8494,7 @@ static void atk9E_metronome(void)
         {
             gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
             gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
-            gBattleDefender = GetMoveTarget(gCurrentMove, 0);
+            gBattleMoveTarget = GetMoveTarget(gCurrentMove, 0);
             return;
         }
     }
@@ -8502,7 +8502,7 @@ static void atk9E_metronome(void)
 
 static void atk9F_dmgtolevel(void)
 {
-    gBattleMoveDamage = gBattleMons[gBattleAttacker].level;
+    gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].level;
     gBattlescriptCurrInstr++;
 }
 
@@ -8513,54 +8513,54 @@ static void atkA0_psywavedamageeffect(void)
     while ((randDamage = (Random() & 0xF)) > 10);
 
     randDamage *= 10;
-    gBattleMoveDamage = gBattleMons[gBattleAttacker].level * (randDamage + 50) / 100;
+    gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].level * (randDamage + 50) / 100;
     gBattlescriptCurrInstr++;
 }
 
 static void atkA1_counterdamagecalculator(void)
 {
-    u8 sideAttacker = GetBattlerSide(gBattleAttacker);
-    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattleAttacker].physicalBank);
+    u8 sideAttacker = GetBattlerSide(gBattleMoveAttacker);
+    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattleMoveAttacker].physicalBank);
 
-    if (gProtectStructs[gBattleAttacker].physicalDmg
+    if (gProtectStructs[gBattleMoveAttacker].physicalDmg
         && sideAttacker != sideTarget
-        && gBattleMons[gProtectStructs[gBattleAttacker].physicalBank].hp)
+        && gBattleMons[gProtectStructs[gBattleMoveAttacker].physicalBank].hp)
     {
-        gBattleMoveDamage = gProtectStructs[gBattleAttacker].physicalDmg * 2;
+        gBattleMoveDamage = gProtectStructs[gBattleMoveAttacker].physicalDmg * 2;
 
         if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp)
-            gBattleDefender = gSideTimers[sideTarget].followmeTarget;
+            gBattleMoveTarget = gSideTimers[sideTarget].followmeTarget;
         else
-            gBattleDefender = gProtectStructs[gBattleAttacker].physicalBank;
+            gBattleMoveTarget = gProtectStructs[gBattleMoveAttacker].physicalBank;
 
         gBattlescriptCurrInstr += 5;
     }
     else
     {
-        gSpecialStatuses[gBattleAttacker].flag20 = 1;
+        gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
 
 static void atkA2_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the physical -> special field changes
 {
-    u8 sideAttacker = GetBattlerSide(gBattleAttacker);
-    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattleAttacker].specialBank);
+    u8 sideAttacker = GetBattlerSide(gBattleMoveAttacker);
+    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattleMoveAttacker].specialBank);
 
-    if (gProtectStructs[gBattleAttacker].specialDmg && sideAttacker != sideTarget && gBattleMons[gProtectStructs[gBattleAttacker].specialBank].hp)
+    if (gProtectStructs[gBattleMoveAttacker].specialDmg && sideAttacker != sideTarget && gBattleMons[gProtectStructs[gBattleMoveAttacker].specialBank].hp)
     {
-        gBattleMoveDamage = gProtectStructs[gBattleAttacker].specialDmg * 2;
+        gBattleMoveDamage = gProtectStructs[gBattleMoveAttacker].specialDmg * 2;
 
         if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp)
-            gBattleDefender = gSideTimers[sideTarget].followmeTarget;
+            gBattleMoveTarget = gSideTimers[sideTarget].followmeTarget;
         else
-            gBattleDefender = gProtectStructs[gBattleAttacker].specialBank;
+            gBattleMoveTarget = gProtectStructs[gBattleMoveAttacker].specialBank;
 
         gBattlescriptCurrInstr += 5;
     }
     else
     {
-        gSpecialStatuses[gBattleAttacker].flag20 = 1;
+        gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
@@ -8571,17 +8571,17 @@ static void atkA3_disablelastusedattack(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBattleDefender].moves[i] == gLastMoves[gBattleDefender])
+        if (gBattleMons[gBattleMoveTarget].moves[i] == gLastMoves[gBattleMoveTarget])
             break;
     }
-    if (gDisableStructs[gBattleDefender].disabledMove == 0
-        && i != 4 && gBattleMons[gBattleDefender].pp[i] != 0)
+    if (gDisableStructs[gBattleMoveTarget].disabledMove == 0
+        && i != 4 && gBattleMons[gBattleMoveTarget].pp[i] != 0)
     {
-        PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattleDefender].moves[i])
+        PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattleMoveTarget].moves[i])
 
-        gDisableStructs[gBattleDefender].disabledMove = gBattleMons[gBattleDefender].moves[i];
-        gDisableStructs[gBattleDefender].disableTimer1 = (Random() & 3) + 2;
-        gDisableStructs[gBattleDefender].disableTimer2 = gDisableStructs[gBattleDefender].disableTimer1; // used to save the random amount of turns?
+        gDisableStructs[gBattleMoveTarget].disabledMove = gBattleMons[gBattleMoveTarget].moves[i];
+        gDisableStructs[gBattleMoveTarget].disableTimer1 = (Random() & 3) + 2;
+        gDisableStructs[gBattleMoveTarget].disableTimer2 = gDisableStructs[gBattleMoveTarget].disableTimer1; // used to save the random amount of turns?
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -8596,24 +8596,24 @@ static void atkA4_trysetencore(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBattleDefender].moves[i] == gLastMoves[gBattleDefender])
+        if (gBattleMons[gBattleMoveTarget].moves[i] == gLastMoves[gBattleMoveTarget])
             break;
     }
 
-    if (gLastMoves[gBattleDefender] == MOVE_STRUGGLE
-        || gLastMoves[gBattleDefender] == MOVE_ENCORE
-        || gLastMoves[gBattleDefender] == MOVE_MIRROR_MOVE)
+    if (gLastMoves[gBattleMoveTarget] == MOVE_STRUGGLE
+        || gLastMoves[gBattleMoveTarget] == MOVE_ENCORE
+        || gLastMoves[gBattleMoveTarget] == MOVE_MIRROR_MOVE)
     {
         i = 4;
     }
 
-    if (gDisableStructs[gBattleDefender].encoredMove == 0
-        && i != 4 && gBattleMons[gBattleDefender].pp[i] != 0)
+    if (gDisableStructs[gBattleMoveTarget].encoredMove == 0
+        && i != 4 && gBattleMons[gBattleMoveTarget].pp[i] != 0)
     {
-        gDisableStructs[gBattleDefender].encoredMove = gBattleMons[gBattleDefender].moves[i];
-        gDisableStructs[gBattleDefender].encoredMovePos = i;
-        gDisableStructs[gBattleDefender].encoreTimer1 = (Random() & 3) + 3;
-        gDisableStructs[gBattleDefender].encoreTimer2 = gDisableStructs[gBattleDefender].encoreTimer1;
+        gDisableStructs[gBattleMoveTarget].encoredMove = gBattleMons[gBattleMoveTarget].moves[i];
+        gDisableStructs[gBattleMoveTarget].encoredMovePos = i;
+        gDisableStructs[gBattleMoveTarget].encoreTimer1 = (Random() & 3) + 3;
+        gDisableStructs[gBattleMoveTarget].encoreTimer2 = gDisableStructs[gBattleMoveTarget].encoreTimer1;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -8624,10 +8624,10 @@ static void atkA4_trysetencore(void)
 
 static void atkA5_painsplitdmgcalc(void)
 {
-    if (!(gBattleMons[gBattleDefender].status2 & STATUS2_SUBSTITUTE))
+    if (!(gBattleMons[gBattleMoveTarget].status2 & STATUS2_SUBSTITUTE))
     {
-        s32 hpDiff = (gBattleMons[gBattleAttacker].hp + gBattleMons[gBattleDefender].hp) / 2;
-        s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBattleDefender].hp - hpDiff;
+        s32 hpDiff = (gBattleMons[gBattleMoveAttacker].hp + gBattleMons[gBattleMoveTarget].hp) / 2;
+        s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - hpDiff;
         u8* storeLoc = (void*)(&gBattleScripting.painSplitHp);
 
         storeLoc[0] = (painSplitHp);
@@ -8635,8 +8635,8 @@ static void atkA5_painsplitdmgcalc(void)
         storeLoc[2] = (painSplitHp & 0x00FF0000) >> 16;
         storeLoc[3] = (painSplitHp & 0xFF000000) >> 24;
 
-        gBattleMoveDamage = gBattleMons[gBattleAttacker].hp - hpDiff;
-        gSpecialStatuses[gBattleDefender].moveturnLostHP = 0xFFFF;
+        gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].hp - hpDiff;
+        gSpecialStatuses[gBattleMoveTarget].moveturnLostHP = 0xFFFF;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -8648,13 +8648,13 @@ static void atkA5_painsplitdmgcalc(void)
 
 static void atkA6_settypetorandomresistance(void) // conversion 2
 {
-    if (gLastLandedMoves[gBattleAttacker] == 0
-        || gLastLandedMoves[gBattleAttacker] == 0xFFFF)
+    if (gLastLandedMoves[gBattleMoveAttacker] == 0
+        || gLastLandedMoves[gBattleMoveAttacker] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
-    else if (IsTwoTurnsMove(gLastLandedMoves[gBattleAttacker])
-            && gBattleMons[gLastHitBy[gBattleAttacker]].status2 & STATUS2_MULTIPLETURNS)
+    else if (IsTwoTurnsMove(gLastLandedMoves[gBattleMoveAttacker])
+            && gBattleMons[gLastHitBy[gBattleMoveAttacker]].status2 & STATUS2_MULTIPLETURNS)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8668,13 +8668,13 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
 
             i *= 3;
 
-            if (TYPE_EFFECT_ATK_TYPE(i) == gLastHitByType[gBattleAttacker]
+            if (TYPE_EFFECT_ATK_TYPE(i) == gLastHitByType[gBattleMoveAttacker]
                 && TYPE_EFFECT_MULTIPLIER(i) <= TYPE_MUL_NOT_EFFECTIVE
-                && gBattleMons[gBattleAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
-                && gBattleMons[gBattleAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
+                && gBattleMons[gBattleMoveAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
+                && gBattleMons[gBattleMoveAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
             {
-                gBattleMons[gBattleAttacker].type1 = TYPE_EFFECT_DEF_TYPE(i);
-                gBattleMons[gBattleAttacker].type2 = TYPE_EFFECT_DEF_TYPE(i);
+                gBattleMons[gBattleMoveAttacker].type1 = TYPE_EFFECT_DEF_TYPE(i);
+                gBattleMons[gBattleMoveAttacker].type2 = TYPE_EFFECT_DEF_TYPE(i);
 
                 PREPARE_TYPE_BUFFER(gBattleTextBuff1, TYPE_EFFECT_DEF_TYPE(i))
 
@@ -8691,13 +8691,13 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
             case TYPE_FORESIGHT:
                 break;
             default:
-                if (TYPE_EFFECT_ATK_TYPE(j) == gLastHitByType[gBattleAttacker]
+                if (TYPE_EFFECT_ATK_TYPE(j) == gLastHitByType[gBattleMoveAttacker]
                     && TYPE_EFFECT_MULTIPLIER(j) <= 5
-                    && gBattleMons[gBattleAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
-                    && gBattleMons[gBattleAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
+                    && gBattleMons[gBattleMoveAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
+                    && gBattleMons[gBattleMoveAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
                 {
-                    gBattleMons[gBattleAttacker].type1 = TYPE_EFFECT_DEF_TYPE(rands);
-                    gBattleMons[gBattleAttacker].type2 = TYPE_EFFECT_DEF_TYPE(rands);
+                    gBattleMons[gBattleMoveAttacker].type1 = TYPE_EFFECT_DEF_TYPE(rands);
+                    gBattleMons[gBattleMoveAttacker].type2 = TYPE_EFFECT_DEF_TYPE(rands);
 
                     PREPARE_TYPE_BUFFER(gBattleTextBuff1, TYPE_EFFECT_DEF_TYPE(rands))
 
@@ -8714,9 +8714,9 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
 
 static void atkA7_setalwayshitflag(void)
 {
-    gStatuses3[gBattleDefender] &= ~(STATUS3_ALWAYS_HITS);
-    gStatuses3[gBattleDefender] |= 0x10;
-    gDisableStructs[gBattleDefender].bankWithSureHit = gBattleAttacker;
+    gStatuses3[gBattleMoveTarget] &= ~(STATUS3_ALWAYS_HITS);
+    gStatuses3[gBattleMoveTarget] |= 0x10;
+    gDisableStructs[gBattleMoveTarget].bankWithSureHit = gBattleMoveAttacker;
     gBattlescriptCurrInstr++;
 }
 
@@ -8724,19 +8724,19 @@ static void atkA8_copymovepermanently(void) // sketch
 {
     gChosenMove = 0xFFFF;
 
-    if (!(gBattleMons[gBattleAttacker].status2 & STATUS2_TRANSFORMED)
-        && gLastPrintedMoves[gBattleDefender] != MOVE_STRUGGLE
-        && gLastPrintedMoves[gBattleDefender] != 0
-        && gLastPrintedMoves[gBattleDefender] != 0xFFFF
-        && gLastPrintedMoves[gBattleDefender] != MOVE_SKETCH)
+    if (!(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_TRANSFORMED)
+        && gLastPrintedMoves[gBattleMoveTarget] != MOVE_STRUGGLE
+        && gLastPrintedMoves[gBattleMoveTarget] != 0
+        && gLastPrintedMoves[gBattleMoveTarget] != 0xFFFF
+        && gLastPrintedMoves[gBattleMoveTarget] != MOVE_SKETCH)
     {
         s32 i;
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMons[gBattleAttacker].moves[i] == MOVE_SKETCH)
+            if (gBattleMons[gBattleMoveAttacker].moves[i] == MOVE_SKETCH)
                 continue;
-            if (gBattleMons[gBattleAttacker].moves[i] == gLastPrintedMoves[gBattleDefender])
+            if (gBattleMons[gBattleMoveAttacker].moves[i] == gLastPrintedMoves[gBattleMoveTarget])
                 break;
         }
 
@@ -8748,21 +8748,21 @@ static void atkA8_copymovepermanently(void) // sketch
         {
             struct MovePpInfo movePpData;
 
-            gBattleMons[gBattleAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBattleDefender];
-            gBattleMons[gBattleAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBattleDefender]].pp;
-            gActiveBattler = gBattleAttacker;
+            gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBattleMoveTarget];
+            gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBattleMoveTarget]].pp;
+            gActiveBattler = gBattleMoveAttacker;
 
             for (i = 0; i < 4; i++)
             {
-                movePpData.moves[i] = gBattleMons[gBattleAttacker].moves[i];
-                movePpData.pp[i] = gBattleMons[gBattleAttacker].pp[i];
+                movePpData.moves[i] = gBattleMons[gBattleMoveAttacker].moves[i];
+                movePpData.pp[i] = gBattleMons[gBattleMoveAttacker].pp[i];
             }
-            movePpData.ppBonuses = gBattleMons[gBattleAttacker].ppBonuses;
+            movePpData.ppBonuses = gBattleMons[gBattleMoveAttacker].ppBonuses;
 
-            EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct MovePpInfo), &movePpData);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct MovePpInfo), &movePpData);
+            MarkBattlerForControllerExec(gActiveBattler);
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBattleDefender])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBattleMoveTarget])
 
             gBattlescriptCurrInstr += 5;
         }
@@ -8822,17 +8822,17 @@ static void atkA9_trychoosesleeptalkmove(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (IsInvalidForSleepTalkOrAssist(gBattleMons[gBattleAttacker].moves[i])
-            || gBattleMons[gBattleAttacker].moves[i] == MOVE_FOCUS_PUNCH
-            || gBattleMons[gBattleAttacker].moves[i] == MOVE_UPROAR
-            || IsTwoTurnsMove(gBattleMons[gBattleAttacker].moves[i]))
+        if (IsInvalidForSleepTalkOrAssist(gBattleMons[gBattleMoveAttacker].moves[i])
+            || gBattleMons[gBattleMoveAttacker].moves[i] == MOVE_FOCUS_PUNCH
+            || gBattleMons[gBattleMoveAttacker].moves[i] == MOVE_UPROAR
+            || IsTwoTurnsMove(gBattleMons[gBattleMoveAttacker].moves[i]))
         {
             unusableMovesBits |= gBitTable[i];
         }
 
     }
 
-    unusableMovesBits = CheckMoveLimitations(gBattleAttacker, unusableMovesBits, ~(MOVE_LIMITATION_PP));
+    unusableMovesBits = CheckMoveLimitations(gBattleMoveAttacker, unusableMovesBits, ~(MOVE_LIMITATION_PP));
     if (unusableMovesBits == 0xF) // all 4 moves cannot be chosen
     {
         gBattlescriptCurrInstr += 5;
@@ -8846,25 +8846,25 @@ static void atkA9_trychoosesleeptalkmove(void)
             movePosition = Random() & 3;
         } while ((gBitTable[movePosition] & unusableMovesBits));
 
-        gRandomMove = gBattleMons[gBattleAttacker].moves[movePosition];
+        gRandomMove = gBattleMons[gBattleMoveAttacker].moves[movePosition];
         gCurrMovePos = movePosition;
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
-        gBattleDefender = GetMoveTarget(gRandomMove, 0);
+        gBattleMoveTarget = GetMoveTarget(gRandomMove, 0);
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
 
 static void atkAA_setdestinybond(void)
 {
-    gBattleMons[gBattleAttacker].status2 |= STATUS2_DESTINY_BOND;
+    gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_DESTINY_BOND;
     gBattlescriptCurrInstr++;
 }
 
 static void TrySetDestinyBondToHappen(void)
 {
-    u8 sideAttacker = GetBattlerSide(gBattleAttacker);
-    u8 sideTarget = GetBattlerSide(gBattleDefender);
-    if (gBattleMons[gBattleDefender].status2 & STATUS2_DESTINY_BOND
+    u8 sideAttacker = GetBattlerSide(gBattleMoveAttacker);
+    u8 sideTarget = GetBattlerSide(gBattleMoveTarget);
+    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_DESTINY_BOND
         && sideAttacker != sideTarget
         && !(gHitMarker & HITMARKER_GRUDGE))
     {
@@ -8881,7 +8881,7 @@ static void atkAB_trysetdestinybondtohappen(void)
 static void atkAC_remaininghptopower(void)
 {
     s32 i;
-    s32 hpFraction = GetScaledHPFraction(gBattleMons[gBattleAttacker].hp, gBattleMons[gBattleAttacker].maxHP, 48);
+    s32 hpFraction = GetScaledHPFraction(gBattleMons[gBattleMoveAttacker].hp, gBattleMons[gBattleMoveAttacker].maxHP, 48);
 
     for (i = 0; i < (s32) sizeof(sFlailHpScaleToPowerTable); i += 2)
     {
@@ -8895,43 +8895,43 @@ static void atkAC_remaininghptopower(void)
 
 static void atkAD_tryspiteppreduce(void)
 {
-    if (gLastMoves[gBattleDefender] != 0
-        && gLastMoves[gBattleDefender] != 0xFFFF)
+    if (gLastMoves[gBattleMoveTarget] != 0
+        && gLastMoves[gBattleMoveTarget] != 0xFFFF)
     {
         s32 i;
 
         for (i = 0; i < 4; i++)
         {
-            if (gLastMoves[gBattleDefender] == gBattleMons[gBattleDefender].moves[i])
+            if (gLastMoves[gBattleMoveTarget] == gBattleMons[gBattleMoveTarget].moves[i])
                 break;
         }
 
-        if (i != 4 && gBattleMons[gBattleDefender].pp[i] > 1)
+        if (i != 4 && gBattleMons[gBattleMoveTarget].pp[i] > 1)
         {
             s32 ppToDeduct = (Random() & 3) + 2;
-            if (gBattleMons[gBattleDefender].pp[i] < ppToDeduct)
-                ppToDeduct = gBattleMons[gBattleDefender].pp[i];
+            if (gBattleMons[gBattleMoveTarget].pp[i] < ppToDeduct)
+                ppToDeduct = gBattleMons[gBattleMoveTarget].pp[i];
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattleDefender])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattleMoveTarget])
 
             ConvertIntToDecimalStringN(gBattleTextBuff2, ppToDeduct, 0, 1);
 
             PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 1, ppToDeduct)
 
-            gBattleMons[gBattleDefender].pp[i] -= ppToDeduct;
-            gActiveBattler = gBattleDefender;
+            gBattleMons[gBattleMoveTarget].pp[i] -= ppToDeduct;
+            gActiveBattler = gBattleMoveTarget;
 
             if (!(gDisableStructs[gActiveBattler].unk18_b & gBitTable[i])
                 && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
             {
-                EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]);
+                MarkBattlerForControllerExec(gActiveBattler);
             }
 
             gBattlescriptCurrInstr += 5;
 
-            if (gBattleMons[gBattleDefender].pp[i] == 0)
-                CancelMultiTurnMoves(gBattleDefender);
+            if (gBattleMons[gBattleMoveTarget].pp[i] == 0)
+                CancelMultiTurnMoves(gBattleMoveTarget);
         }
         else
         {
@@ -8956,23 +8956,23 @@ static void atkAE_healpartystatus(void)
 
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
 
-        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
             party = gPlayerParty;
         else
             party = gEnemyParty;
 
-        if (gBattleMons[gBattleAttacker].ability != ABILITY_SOUNDPROOF)
+        if (gBattleMons[gBattleMoveAttacker].ability != ABILITY_SOUNDPROOF)
         {
-            gBattleMons[gBattleAttacker].status1 = 0;
-            gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+            gBattleMons[gBattleMoveAttacker].status1 = 0;
+            gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_NIGHTMARE);
         }
         else
         {
-            RecordAbilityBattle(gBattleAttacker, gBattleMons[gBattleAttacker].ability);
+            RecordAbilityBattle(gBattleMoveAttacker, gBattleMons[gBattleMoveAttacker].ability);
             gBattleCommunication[MULTISTRING_CHOOSER] |= 1;
         }
 
-        gActiveBattler = gBattleScripting.battler = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_FLANK);
+        gActiveBattler = gBattleScripting.battler = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_FLANK);
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
             && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
@@ -8998,10 +8998,10 @@ static void atkAE_healpartystatus(void)
             {
                 u8 ability;
 
-                if (gBattlePartyID[gBattleAttacker] == i)
-                    ability = gBattleMons[gBattleAttacker].ability;
+                if (gBattlerPartyIndexes[gBattleMoveAttacker] == i)
+                    ability = gBattleMons[gBattleMoveAttacker].ability;
                 else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-                         && gBattlePartyID[gActiveBattler] == i
+                         && gBattlerPartyIndexes[gActiveBattler] == i
                          && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
                     ability = gBattleMons[gActiveBattler].ability;
                 else
@@ -9017,10 +9017,10 @@ static void atkAE_healpartystatus(void)
         gBattleCommunication[MULTISTRING_CHOOSER] = 4;
         toHeal = 0x3F;
 
-        gBattleMons[gBattleAttacker].status1 = 0;
-        gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+        gBattleMons[gBattleMoveAttacker].status1 = 0;
+        gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_NIGHTMARE);
 
-        gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_FLANK);
+        gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_FLANK);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
             && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
         {
@@ -9032,9 +9032,9 @@ static void atkAE_healpartystatus(void)
 
     if (toHeal)
     {
-        gActiveBattler = gBattleAttacker;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, toHeal, 4, &zero);
-        MarkBufferBankForExecution(gActiveBattler);
+        gActiveBattler = gBattleMoveAttacker;
+        BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, toHeal, 4, &zero);
+        MarkBattlerForControllerExec(gActiveBattler);
     }
 
     gBattlescriptCurrInstr++;
@@ -9042,14 +9042,14 @@ static void atkAE_healpartystatus(void)
 
 static void atkAF_cursetarget(void)
 {
-    if (gBattleMons[gBattleDefender].status2 & STATUS2_CURSED)
+    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_CURSED)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMons[gBattleDefender].status2 |= STATUS2_CURSED;
-        gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 2;
+        gBattleMons[gBattleMoveTarget].status2 |= STATUS2_CURSED;
+        gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
@@ -9059,11 +9059,11 @@ static void atkAF_cursetarget(void)
 
 static void atkB0_trysetspikes(void)
 {
-    u8 targetSide = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
+    u8 targetSide = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
 
     if (gSideTimers[targetSide].spikesAmount == 3)
     {
-        gSpecialStatuses[gBattleAttacker].flag20 = 1;
+        gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
@@ -9076,7 +9076,7 @@ static void atkB0_trysetspikes(void)
 
 static void atkB1_setforesight(void)
 {
-    gBattleMons[gBattleDefender].status2 |= STATUS2_FORESIGHT;
+    gBattleMons[gBattleMoveTarget].status2 |= STATUS2_FORESIGHT;
     gBattlescriptCurrInstr++;
 }
 
@@ -9100,7 +9100,7 @@ static void atkB2_trysetperishsong(void)
         }
     }
 
-    PressurePPLoseOnUsingPerishSong(gBattleAttacker);
+    PressurePPLoseOnUsingPerishSong(gBattleMoveAttacker);
 
     if (notAffectedCount == gBattlersCount)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
@@ -9112,31 +9112,31 @@ static void atkB3_rolloutdamagecalculation(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
-        CancelMultiTurnMoves(gBattleAttacker);
+        CancelMultiTurnMoves(gBattleMoveAttacker);
         gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
     }
     else
     {
         s32 i;
 
-        if (!(gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS)) // first hit
+        if (!(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS)) // first hit
         {
-            gDisableStructs[gBattleAttacker].rolloutCounter1 = 5;
-            gDisableStructs[gBattleAttacker].rolloutCounter2 = 5;
-            gBattleMons[gBattleAttacker].status2 |= STATUS2_MULTIPLETURNS;
-            gLockedMoves[gBattleAttacker] = gCurrentMove;
+            gDisableStructs[gBattleMoveAttacker].rolloutCounter1 = 5;
+            gDisableStructs[gBattleMoveAttacker].rolloutCounter2 = 5;
+            gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_MULTIPLETURNS;
+            gLockedMoves[gBattleMoveAttacker] = gCurrentMove;
         }
-        if (--gDisableStructs[gBattleAttacker].rolloutCounter1 == 0) // last hit
+        if (--gDisableStructs[gBattleMoveAttacker].rolloutCounter1 == 0) // last hit
         {
-            gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
+            gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
         }
 
         gDynamicBasePower = gBattleMoves[gCurrentMove].power;
 
-        for (i = 1; i < (5 - gDisableStructs[gBattleAttacker].rolloutCounter1); i++)
+        for (i = 1; i < (5 - gDisableStructs[gBattleMoveAttacker].rolloutCounter1); i++)
             gDynamicBasePower *= 2;
 
-        if (gBattleMons[gBattleAttacker].status2 & STATUS2_DEFENSE_CURL)
+        if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_DEFENSE_CURL)
             gDynamicBasePower *= 2;
 
         gBattlescriptCurrInstr++;
@@ -9145,8 +9145,8 @@ static void atkB3_rolloutdamagecalculation(void)
 
 static void atkB4_jumpifconfusedandstatmaxed(void)
 {
-    if (gBattleMons[gBattleDefender].status2 & STATUS2_CONFUSION
-        && gBattleMons[gBattleDefender].statStages[gBattlescriptCurrInstr[1]] == 0xC)
+    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_CONFUSION
+        && gBattleMons[gBattleMoveTarget].statStages[gBattlescriptCurrInstr[1]] == 0xC)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
     else
         gBattlescriptCurrInstr += 6;
@@ -9156,19 +9156,19 @@ static void atkB5_furycuttercalc(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
-        gDisableStructs[gBattleAttacker].furyCutterCounter = 0;
+        gDisableStructs[gBattleMoveAttacker].furyCutterCounter = 0;
         gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
     }
     else
     {
         s32 i;
 
-        if (gDisableStructs[gBattleAttacker].furyCutterCounter != 5)
-            gDisableStructs[gBattleAttacker].furyCutterCounter++;
+        if (gDisableStructs[gBattleMoveAttacker].furyCutterCounter != 5)
+            gDisableStructs[gBattleMoveAttacker].furyCutterCounter++;
 
         gDynamicBasePower = gBattleMoves[gCurrentMove].power;
 
-        for (i = 1; i < gDisableStructs[gBattleAttacker].furyCutterCounter; i++)
+        for (i = 1; i < gDisableStructs[gBattleMoveAttacker].furyCutterCounter; i++)
             gDynamicBasePower *= 2;
 
         gBattlescriptCurrInstr++;
@@ -9178,9 +9178,9 @@ static void atkB5_furycuttercalc(void)
 static void atkB6_happinesstodamagecalculation(void)
 {
     if (gBattleMoves[gCurrentMove].effect == EFFECT_RETURN)
-        gDynamicBasePower = 10 * (gBattleMons[gBattleAttacker].friendship) / 25;
+        gDynamicBasePower = 10 * (gBattleMons[gBattleMoveAttacker].friendship) / 25;
     else // EFFECT_FRUSTRATION
-        gDynamicBasePower = 10 * (255 - gBattleMons[gBattleAttacker].friendship) / 25;
+        gDynamicBasePower = 10 * (255 - gBattleMons[gBattleMoveAttacker].friendship) / 25;
 
     gBattlescriptCurrInstr++;
 }
@@ -9197,14 +9197,14 @@ static void atkB7_presentdamagecalculation(void)
         gDynamicBasePower = 120;
     else
     {
-        gBattleMoveDamage = gBattleMons[gBattleDefender].maxHP / 4;
+        gBattleMoveDamage = gBattleMons[gBattleMoveTarget].maxHP / 4;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
     }
     if (rand < 204)
         gBattlescriptCurrInstr = BattleScript_HitFromCritCalc;
-    else if (gBattleMons[gBattleDefender].maxHP == gBattleMons[gBattleDefender].hp)
+    else if (gBattleMons[gBattleMoveTarget].maxHP == gBattleMons[gBattleMoveTarget].hp)
         gBattlescriptCurrInstr = BattleScript_AlreadyAtFullHp;
     else
     {
@@ -9215,16 +9215,16 @@ static void atkB7_presentdamagecalculation(void)
 
 static void atkB8_setsafeguard(void)
 {
-    if (gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] & SIDE_STATUS_SAFEGUARD)
+    if (gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] & SIDE_STATUS_SAFEGUARD)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideStatuses[GET_BATTLER_SIDE(gBattleAttacker)] |= SIDE_STATUS_SAFEGUARD;
-        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].safeguardTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattleAttacker)].safeguardBank = gBattleAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] |= SIDE_STATUS_SAFEGUARD;
+        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].safeguardTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].safeguardBank = gBattleMoveAttacker;
         gBattleCommunication[MULTISTRING_CHOOSER] = 5;
     }
 
@@ -9274,11 +9274,11 @@ static void atkB9_magnitudedamagecalculation(void)
 
     PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 2, magnitude)
 
-    for (gBattleDefender = 0; gBattleDefender < gBattlersCount; gBattleDefender++)
+    for (gBattleMoveTarget = 0; gBattleMoveTarget < gBattlersCount; gBattleMoveTarget++)
     {
-        if (gBattleDefender == gBattleAttacker)
+        if (gBattleMoveTarget == gBattleMoveAttacker)
             continue;
-        if (!(gAbsentBattlerFlags & gBitTable[gBattleDefender])) // a valid target was found
+        if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])) // a valid target was found
             break;
     }
 
@@ -9289,36 +9289,36 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
 {
     if (gMultiHitCounter == 1)
     {
-        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
-            gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+            gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         else
-            gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+            gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     }
     else
     {
-        if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
-            gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+            gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
         else
-            gBattleDefender = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
+            gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
     }
 
-    if (gActionForBanks[gBattleDefender] == ACTION_USE_MOVE
-        && gBattleAttacker == *(gBattleStruct->moveTarget + gBattleDefender)
-        && !(gBattleMons[gBattleDefender].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
-        && gBattleMons[gBattleAttacker].hp
-        && !gDisableStructs[gBattleDefender].truantCounter
-        && gChosenMovesByBanks[gBattleDefender] == MOVE_PURSUIT)
+    if (gActionForBanks[gBattleMoveTarget] == ACTION_USE_MOVE
+        && gBattleMoveAttacker == *(gBattleStruct->moveTarget + gBattleMoveTarget)
+        && !(gBattleMons[gBattleMoveTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
+        && gBattleMons[gBattleMoveAttacker].hp
+        && !gDisableStructs[gBattleMoveTarget].truantCounter
+        && gChosenMovesByBanks[gBattleMoveTarget] == MOVE_PURSUIT)
     {
         s32 i;
 
         for (i = 0; i < gBattlersCount; i++)
         {
-            if (gBattleTurnOrder[i] == gBattleDefender)
+            if (gBattleTurnOrder[i] == gBattleMoveTarget)
                 gActionsByTurnOrder[i] = 11;
         }
 
         gCurrentMove = MOVE_PURSUIT;
-        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattleDefender);
+        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattleMoveTarget);
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
@@ -9348,16 +9348,16 @@ static void atkBB_setsunny(void)
 
 static void atkBC_maxattackhalvehp(void) // belly drum
 {
-    u32 halfHp = gBattleMons[gBattleAttacker].maxHP / 2;
+    u32 halfHp = gBattleMons[gBattleMoveAttacker].maxHP / 2;
 
-    if (!(gBattleMons[gBattleAttacker].maxHP / 2))
+    if (!(gBattleMons[gBattleMoveAttacker].maxHP / 2))
         halfHp = 1;
 
-    if (gBattleMons[gBattleAttacker].statStages[STAT_STAGE_ATK] < 12
-        && gBattleMons[gBattleAttacker].hp > halfHp)
+    if (gBattleMons[gBattleMoveAttacker].statStages[STAT_STAGE_ATK] < 12
+        && gBattleMons[gBattleMoveAttacker].hp > halfHp)
     {
-        gBattleMons[gBattleAttacker].statStages[STAT_STAGE_ATK] = 12;
-        gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 2;
+        gBattleMons[gBattleMoveAttacker].statStages[STAT_STAGE_ATK] = 12;
+        gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
@@ -9375,7 +9375,7 @@ static void atkBD_copyfoestats(void) // psych up
 
     for (i = 0; i < BATTLE_STATS_NO; i++)
     {
-        gBattleMons[gBattleAttacker].statStages[i] = gBattleMons[gBattleDefender].statStages[i];
+        gBattleMons[gBattleMoveAttacker].statStages[i] = gBattleMons[gBattleMoveTarget].statStages[i];
     }
 
     gBattlescriptCurrInstr += 5; // Has an unused jump ptr(possibly for a failed attempt) parameter.
@@ -9383,32 +9383,32 @@ static void atkBD_copyfoestats(void) // psych up
 
 static void atkBE_rapidspinfree(void)
 {
-    if (gBattleMons[gBattleAttacker].status2 & STATUS2_WRAPPED)
+    if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_WRAPPED)
     {
-        gBattleScripting.battler = gBattleDefender;
-        gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_WRAPPED);
-        gBattleDefender = *(gBattleStruct->wrappedBy + gBattleAttacker);
+        gBattleScripting.battler = gBattleMoveTarget;
+        gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_WRAPPED);
+        gBattleMoveTarget = *(gBattleStruct->wrappedBy + gBattleMoveAttacker);
 
         gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN;
         gBattleTextBuff1[1] = B_BUFF_MOVE;
-        gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gBattleAttacker * 2 + 0);
-        gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gBattleAttacker * 2 + 1);
+        gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gBattleMoveAttacker * 2 + 0);
+        gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gBattleMoveAttacker * 2 + 1);
         gBattleTextBuff1[4] = B_BUFF_EOS;
 
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_WrapFree;
     }
-    else if (gStatuses3[gBattleAttacker] & STATUS3_LEECHSEED)
+    else if (gStatuses3[gBattleMoveAttacker] & STATUS3_LEECHSEED)
     {
-        gStatuses3[gBattleAttacker] &= ~(STATUS3_LEECHSEED);
-        gStatuses3[gBattleAttacker] &= ~(STATUS3_LEECHSEED_BANK);
+        gStatuses3[gBattleMoveAttacker] &= ~(STATUS3_LEECHSEED);
+        gStatuses3[gBattleMoveAttacker] &= ~(STATUS3_LEECHSEED_BANK);
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_LeechSeedFree;
     }
-    else if (gSideStatuses[GetBattlerSide(gBattleAttacker)] & SIDE_STATUS_SPIKES)
+    else if (gSideStatuses[GetBattlerSide(gBattleMoveAttacker)] & SIDE_STATUS_SPIKES)
     {
-        gSideStatuses[GetBattlerSide(gBattleAttacker)] &= ~(SIDE_STATUS_SPIKES);
-        gSideTimers[GetBattlerSide(gBattleAttacker)].spikesAmount = 0;
+        gSideStatuses[GetBattlerSide(gBattleMoveAttacker)] &= ~(SIDE_STATUS_SPIKES);
+        gSideTimers[GetBattlerSide(gBattleMoveAttacker)].spikesAmount = 0;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_SpikesFree;
     }
@@ -9420,22 +9420,22 @@ static void atkBE_rapidspinfree(void)
 
 static void atkBF_setdefensecurlbit(void)
 {
-    gBattleMons[gBattleAttacker].status2 |= STATUS2_DEFENSE_CURL;
+    gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_DEFENSE_CURL;
     gBattlescriptCurrInstr++;
 }
 
 static void atkC0_recoverbasedonsunlight(void)
 {
-    gBattleDefender = gBattleAttacker;
+    gBattleMoveTarget = gBattleMoveAttacker;
 
-    if (gBattleMons[gBattleAttacker].hp != gBattleMons[gBattleAttacker].maxHP)
+    if (gBattleMons[gBattleMoveAttacker].hp != gBattleMons[gBattleMoveAttacker].maxHP)
     {
         if (gBattleWeather == 0 || !WEATHER_HAS_EFFECT)
-            gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 2;
+            gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 2;
         else if (gBattleWeather & WEATHER_SUN_ANY)
-            gBattleMoveDamage = 20 * gBattleMons[gBattleAttacker].maxHP / 30;
+            gBattleMoveDamage = 20 * gBattleMons[gBattleMoveAttacker].maxHP / 30;
         else // not sunny weather
-            gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 4;
+            gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 4;
 
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
@@ -9455,19 +9455,19 @@ static void atkC1_hiddenpowercalc(void)
     u32 powerBits = 0;
     u32 typeBits = 0;
 
-    powerBits |= ((gBattleMons[gBattleAttacker].hpIV & 2) >> 1);
-    powerBits |= ((gBattleMons[gBattleAttacker].attackIV & 2) << 0);
-    powerBits |= ((gBattleMons[gBattleAttacker].defenseIV & 2) << 1);
-    powerBits |= ((gBattleMons[gBattleAttacker].speedIV & 2) << 2);
-    powerBits |= ((gBattleMons[gBattleAttacker].spAttackIV & 2) << 3);
-    powerBits |= ((gBattleMons[gBattleAttacker].spDefenseIV & 2) << 4);
+    powerBits |= ((gBattleMons[gBattleMoveAttacker].hpIV & 2) >> 1);
+    powerBits |= ((gBattleMons[gBattleMoveAttacker].attackIV & 2) << 0);
+    powerBits |= ((gBattleMons[gBattleMoveAttacker].defenseIV & 2) << 1);
+    powerBits |= ((gBattleMons[gBattleMoveAttacker].speedIV & 2) << 2);
+    powerBits |= ((gBattleMons[gBattleMoveAttacker].spAttackIV & 2) << 3);
+    powerBits |= ((gBattleMons[gBattleMoveAttacker].spDefenseIV & 2) << 4);
 
-    typeBits |= ((gBattleMons[gBattleAttacker].hpIV & 1) << 0);
-    typeBits |= ((gBattleMons[gBattleAttacker].attackIV & 1) << 1);
-    typeBits |= ((gBattleMons[gBattleAttacker].defenseIV & 1) << 2);
-    typeBits |= ((gBattleMons[gBattleAttacker].speedIV & 1) << 3);
-    typeBits |= ((gBattleMons[gBattleAttacker].spAttackIV & 1) << 4);
-    typeBits |= ((gBattleMons[gBattleAttacker].spDefenseIV & 1) << 5);
+    typeBits |= ((gBattleMons[gBattleMoveAttacker].hpIV & 1) << 0);
+    typeBits |= ((gBattleMons[gBattleMoveAttacker].attackIV & 1) << 1);
+    typeBits |= ((gBattleMons[gBattleMoveAttacker].defenseIV & 1) << 2);
+    typeBits |= ((gBattleMons[gBattleMoveAttacker].speedIV & 1) << 3);
+    typeBits |= ((gBattleMons[gBattleMoveAttacker].spAttackIV & 1) << 4);
+    typeBits |= ((gBattleMons[gBattleMoveAttacker].spDefenseIV & 1) << 5);
 
     gDynamicBasePower = (40 * powerBits) / 63 + 30;
 
@@ -9490,7 +9490,7 @@ static void atkC1_hiddenpowercalc(void)
 	mov r5, r8\n\
 	push {r5-r7}\n\
 	ldr r2, =gBattleMons\n\
-	ldr r0, =gBattleAttacker\n\
+	ldr r0, =gBattleMoveAttacker\n\
 	ldrb r1, [r0]\n\
 	movs r0, 0x58\n\
 	adds r4, r1, 0\n\
@@ -9626,11 +9626,11 @@ _080544F0:\n\
 
 static void atkC2_selectfirstvalidtarget(void)
 {
-    for (gBattleDefender = 0; gBattleDefender < gBattlersCount; gBattleDefender++)
+    for (gBattleMoveTarget = 0; gBattleMoveTarget < gBattlersCount; gBattleMoveTarget++)
     {
-        if (gBattleDefender == gBattleAttacker)
+        if (gBattleMoveTarget == gBattleMoveAttacker)
             continue;
-        if (!(gAbsentBattlerFlags & gBitTable[gBattleDefender]))
+        if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]))
             break;
     }
     gBattlescriptCurrInstr++;
@@ -9638,22 +9638,22 @@ static void atkC2_selectfirstvalidtarget(void)
 
 static void atkC3_trysetfutureattack(void)
 {
-    if (gWishFutureKnock.futureSightCounter[gBattleDefender] != 0)
+    if (gWishFutureKnock.futureSightCounter[gBattleMoveTarget] != 0)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gSideStatuses[GET_BATTLER_SIDE(gBattleDefender)] |= SIDE_STATUS_FUTUREATTACK;
-        gWishFutureKnock.futureSightMove[gBattleDefender] = gCurrentMove;
-        gWishFutureKnock.futureSightAttacker[gBattleDefender] = gBattleAttacker;
-        gWishFutureKnock.futureSightCounter[gBattleDefender] = 3;
-        gWishFutureKnock.futureSightDmg[gBattleDefender] = CalculateBaseDamage(&gBattleMons[gBattleAttacker], &gBattleMons[gBattleDefender], gCurrentMove,
-                                                    gSideStatuses[GET_BATTLER_SIDE(gBattleDefender)], 0,
-                                                    0, gBattleAttacker, gBattleDefender);
+        gSideStatuses[GET_BATTLER_SIDE(gBattleMoveTarget)] |= SIDE_STATUS_FUTUREATTACK;
+        gWishFutureKnock.futureSightMove[gBattleMoveTarget] = gCurrentMove;
+        gWishFutureKnock.futureSightAttacker[gBattleMoveTarget] = gBattleMoveAttacker;
+        gWishFutureKnock.futureSightCounter[gBattleMoveTarget] = 3;
+        gWishFutureKnock.futureSightDmg[gBattleMoveTarget] = CalculateBaseDamage(&gBattleMons[gBattleMoveAttacker], &gBattleMons[gBattleMoveTarget], gCurrentMove,
+                                                    gSideStatuses[GET_BATTLER_SIDE(gBattleMoveTarget)], 0,
+                                                    0, gBattleMoveAttacker, gBattleMoveTarget);
 
-        if (gProtectStructs[gBattleAttacker].helpingHand)
-            gWishFutureKnock.futureSightDmg[gBattleDefender] = gWishFutureKnock.futureSightDmg[gBattleDefender] * 15 / 10;
+        if (gProtectStructs[gBattleMoveAttacker].helpingHand)
+            gWishFutureKnock.futureSightDmg[gBattleMoveTarget] = gWishFutureKnock.futureSightDmg[gBattleMoveTarget] * 15 / 10;
 
         if (gCurrentMove == MOVE_DOOM_DESIRE)
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -9668,12 +9668,12 @@ static void atkC4_trydobeatup(void)
 {
     struct Pokemon *party;
 
-    if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
 
-    if (gBattleMons[gBattleDefender].hp == 0)
+    if (gBattleMons[gBattleMoveTarget].hp == 0)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -9690,16 +9690,16 @@ static void atkC4_trydobeatup(void)
         }
         if (gBattleCommunication[0] < 6)
         {
-            PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleAttacker, gBattleCommunication[0])
+            PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleMoveAttacker, gBattleCommunication[0])
 
             gBattlescriptCurrInstr += 9;
 
             gBattleMoveDamage = gBaseStats[GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES)].baseAttack;
             gBattleMoveDamage *= gBattleMoves[gCurrentMove].power;
             gBattleMoveDamage *= (GetMonData(&party[gBattleCommunication[0]], MON_DATA_LEVEL) * 2 / 5 + 2);
-            gBattleMoveDamage /= gBaseStats[gBattleMons[gBattleDefender].species].baseDefense;
+            gBattleMoveDamage /= gBaseStats[gBattleMons[gBattleMoveTarget].species].baseDefense;
             gBattleMoveDamage = (gBattleMoveDamage / 50) + 2;
-            if (gProtectStructs[gBattleAttacker].helpingHand)
+            if (gProtectStructs[gBattleMoveAttacker].helpingHand)
                 gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
 
             gBattleCommunication[0]++;
@@ -9717,13 +9717,13 @@ static void atkC5_setsemiinvulnerablebit(void)
     {
     case MOVE_FLY:
     case MOVE_BOUNCE:
-        gStatuses3[gBattleAttacker] |= STATUS3_ON_AIR;
+        gStatuses3[gBattleMoveAttacker] |= STATUS3_ON_AIR;
         break;
     case MOVE_DIG:
-        gStatuses3[gBattleAttacker] |= STATUS3_UNDERGROUND;
+        gStatuses3[gBattleMoveAttacker] |= STATUS3_UNDERGROUND;
         break;
     case MOVE_DIVE:
-        gStatuses3[gBattleAttacker] |= STATUS3_UNDERWATER;
+        gStatuses3[gBattleMoveAttacker] |= STATUS3_UNDERWATER;
         break;
     }
 
@@ -9736,13 +9736,13 @@ static void atkC6_clearsemiinvulnerablebit(void)
     {
     case MOVE_FLY:
     case MOVE_BOUNCE:
-        gStatuses3[gBattleAttacker] &= ~STATUS3_ON_AIR;
+        gStatuses3[gBattleMoveAttacker] &= ~STATUS3_ON_AIR;
         break;
     case MOVE_DIG:
-        gStatuses3[gBattleAttacker] &= ~STATUS3_UNDERGROUND;
+        gStatuses3[gBattleMoveAttacker] &= ~STATUS3_UNDERGROUND;
         break;
     case MOVE_DIVE:
-        gStatuses3[gBattleAttacker] &= ~STATUS3_UNDERWATER;
+        gStatuses3[gBattleMoveAttacker] &= ~STATUS3_UNDERWATER;
         break;
     }
 
@@ -9752,7 +9752,7 @@ static void atkC6_clearsemiinvulnerablebit(void)
 static void atkC7_setminimize(void)
 {
     if (gHitMarker & HITMARKER_OBEYS)
-        gStatuses3[gBattleAttacker] |= STATUS3_MINIMIZED;
+        gStatuses3[gBattleMoveAttacker] |= STATUS3_MINIMIZED;
 
     gBattlescriptCurrInstr++;
 }
@@ -9776,34 +9776,34 @@ static void atkC8_sethail(void)
 
 static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento
 {
-    if (gBattleMons[gBattleDefender].statStages[STAT_STAGE_ATK] == 0
-        && gBattleMons[gBattleDefender].statStages[STAT_STAGE_SPATK] == 0
+    if (gBattleMons[gBattleMoveTarget].statStages[STAT_STAGE_ATK] == 0
+        && gBattleMons[gBattleMoveTarget].statStages[STAT_STAGE_SPATK] == 0
         && gBattleCommunication[6] != 1)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gActiveBattler = gBattleAttacker;
+        gActiveBattler = gBattleMoveAttacker;
         gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
-        EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkCA_setforcedtarget(void) // follow me
 {
-    gSideTimers[GetBattlerSide(gBattleAttacker)].followmeTimer = 1;
-    gSideTimers[GetBattlerSide(gBattleAttacker)].followmeTarget = gBattleAttacker;
+    gSideTimers[GetBattlerSide(gBattleMoveAttacker)].followmeTimer = 1;
+    gSideTimers[GetBattlerSide(gBattleMoveAttacker)].followmeTarget = gBattleMoveAttacker;
     gBattlescriptCurrInstr++;
 }
 
 static void atkCB_setcharge(void)
 {
-    gStatuses3[gBattleAttacker] |= STATUS3_CHARGED_UP;
-    gDisableStructs[gBattleAttacker].chargeTimer1 = 2;
-    gDisableStructs[gBattleAttacker].chargeTimer2 = 2;
+    gStatuses3[gBattleMoveAttacker] |= STATUS3_CHARGED_UP;
+    gDisableStructs[gBattleMoveAttacker].chargeTimer1 = 2;
+    gDisableStructs[gBattleMoveAttacker].chargeTimer2 = 2;
     gBattlescriptCurrInstr++;
 }
 
@@ -9811,20 +9811,20 @@ static void atkCC_callterrainattack(void) // nature power
 {
     gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
     gCurrentMove = sNaturePowerMoves[gBattleTerrain];
-    gBattleDefender = GetMoveTarget(gCurrentMove, 0);
+    gBattleMoveTarget = GetMoveTarget(gCurrentMove, 0);
     BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
     gBattlescriptCurrInstr++;
 }
 
 static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
 {
-    if (gBattleMons[gBattleAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
+    if (gBattleMons[gBattleMoveAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
     {
-        gBattleMons[gBattleAttacker].status1 = 0;
+        gBattleMons[gBattleMoveAttacker].status1 = 0;
         gBattlescriptCurrInstr += 5;
-        gActiveBattler = gBattleAttacker;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
-        MarkBufferBankForExecution(gActiveBattler);
+        gActiveBattler = gBattleMoveAttacker;
+        BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBattlerForControllerExec(gActiveBattler);
     }
     else
     {
@@ -9834,20 +9834,20 @@ static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
 
 static void atkCE_settorment(void)
 {
-    if (gBattleMons[gBattleDefender].status2 & STATUS2_TORMENT)
+    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_TORMENT)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMons[gBattleDefender].status2 |= STATUS2_TORMENT;
+        gBattleMons[gBattleMoveTarget].status2 |= STATUS2_TORMENT;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkCF_jumpifnodamage(void)
 {
-    if (gProtectStructs[gBattleAttacker].physicalDmg || gProtectStructs[gBattleAttacker].specialDmg)
+    if (gProtectStructs[gBattleMoveAttacker].physicalDmg || gProtectStructs[gBattleMoveAttacker].specialDmg)
         gBattlescriptCurrInstr += 5;
     else
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
@@ -9855,10 +9855,10 @@ static void atkCF_jumpifnodamage(void)
 
 static void atkD0_settaunt(void)
 {
-    if (gDisableStructs[gBattleDefender].tauntTimer1 == 0)
+    if (gDisableStructs[gBattleMoveTarget].tauntTimer1 == 0)
     {
-        gDisableStructs[gBattleDefender].tauntTimer1 = 2;
-        gDisableStructs[gBattleDefender].tauntTimer2 = 2;
+        gDisableStructs[gBattleMoveTarget].tauntTimer1 = 2;
+        gDisableStructs[gBattleMoveTarget].tauntTimer2 = 2;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9869,14 +9869,14 @@ static void atkD0_settaunt(void)
 
 static void atkD1_trysethelpinghand(void)
 {
-    gBattleDefender = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_FLANK);
+    gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_FLANK);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-        && !(gAbsentBattlerFlags & gBitTable[gBattleDefender])
-        && !gProtectStructs[gBattleAttacker].helpingHand
-        && !gProtectStructs[gBattleDefender].helpingHand)
+        && !(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
+        && !gProtectStructs[gBattleMoveAttacker].helpingHand
+        && !gProtectStructs[gBattleMoveTarget].helpingHand)
     {
-        gProtectStructs[gBattleDefender].helpingHand = 1;
+        gProtectStructs[gBattleMoveTarget].helpingHand = 1;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9889,7 +9889,7 @@ static void atkD2_tryswapitems(void) // trick
 {
     // opponent can't swap items with player in regular battles
     if (gBattleTypeFlags & BATTLE_TYPE_x4000000
-        || (GetBattlerSide(gBattleAttacker) == B_SIDE_OPPONENT
+        || (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_OPPONENT
             && !(gBattleTypeFlags & (BATTLE_TYPE_LINK
                                   | BATTLE_TYPE_EREADER_TRAINER
                                   | BATTLE_TYPE_FRONTIER
@@ -9900,8 +9900,8 @@ static void atkD2_tryswapitems(void) // trick
     }
     else
     {
-        u8 sideAttacker = GetBattlerSide(gBattleAttacker);
-        u8 sideTarget = GetBattlerSide(gBattleDefender);
+        u8 sideAttacker = GetBattlerSide(gBattleMoveAttacker);
+        u8 sideTarget = GetBattlerSide(gBattleMoveTarget);
 
         // you can't swap items if they were knocked off in regular battles
         if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
@@ -9909,53 +9909,53 @@ static void atkD2_tryswapitems(void) // trick
                              | BATTLE_TYPE_FRONTIER
                              | BATTLE_TYPE_SECRET_BASE
                              | BATTLE_TYPE_x2000000))
-            && (gWishFutureKnock.knockedOffPokes[sideAttacker] & gBitTable[gBattlePartyID[gBattleAttacker]]
-                || gWishFutureKnock.knockedOffPokes[sideTarget] & gBitTable[gBattlePartyID[gBattleDefender]]))
+            && (gWishFutureKnock.knockedOffPokes[sideAttacker] & gBitTable[gBattlerPartyIndexes[gBattleMoveAttacker]]
+                || gWishFutureKnock.knockedOffPokes[sideTarget] & gBitTable[gBattlerPartyIndexes[gBattleMoveTarget]]))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         // can't swap if two pokemon don't have an item
         // or if either of them is an enigma berry or a mail
-        else if ((gBattleMons[gBattleAttacker].item == 0 && gBattleMons[gBattleDefender].item == 0)
-                 || gBattleMons[gBattleAttacker].item == ITEM_ENIGMA_BERRY
-                 || gBattleMons[gBattleDefender].item == ITEM_ENIGMA_BERRY
-                 || IS_ITEM_MAIL(gBattleMons[gBattleAttacker].item)
-                 || IS_ITEM_MAIL(gBattleMons[gBattleDefender].item))
+        else if ((gBattleMons[gBattleMoveAttacker].item == 0 && gBattleMons[gBattleMoveTarget].item == 0)
+                 || gBattleMons[gBattleMoveAttacker].item == ITEM_ENIGMA_BERRY
+                 || gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY
+                 || IS_ITEM_MAIL(gBattleMons[gBattleMoveAttacker].item)
+                 || IS_ITEM_MAIL(gBattleMons[gBattleMoveTarget].item))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         // check if ability prevents swapping
-        else if (gBattleMons[gBattleDefender].ability == ABILITY_STICKY_HOLD)
+        else if (gBattleMons[gBattleMoveTarget].ability == ABILITY_STICKY_HOLD)
         {
             gBattlescriptCurrInstr = BattleScript_StickyHoldActivates;
-            gLastUsedAbility = gBattleMons[gBattleDefender].ability;
-            RecordAbilityBattle(gBattleDefender, gLastUsedAbility);
+            gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
+            RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
         }
         // took a while, but all checks passed and items can be safely swapped
         else
         {
             u16 oldItemAtk, *newItemAtk;
 
-            newItemAtk = &gBattleStruct->changedItems[gBattleAttacker];
-            oldItemAtk = gBattleMons[gBattleAttacker].item;
-            *newItemAtk = gBattleMons[gBattleDefender].item;
+            newItemAtk = &gBattleStruct->changedItems[gBattleMoveAttacker];
+            oldItemAtk = gBattleMons[gBattleMoveAttacker].item;
+            *newItemAtk = gBattleMons[gBattleMoveTarget].item;
 
-            gBattleMons[gBattleAttacker].item = 0;
-            gBattleMons[gBattleDefender].item = oldItemAtk;
+            gBattleMons[gBattleMoveAttacker].item = 0;
+            gBattleMons[gBattleMoveTarget].item = oldItemAtk;
 
-            gActiveBattler = gBattleAttacker;
-            EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, newItemAtk);
-            MarkBufferBankForExecution(gBattleAttacker);
+            gActiveBattler = gBattleMoveAttacker;
+            BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, newItemAtk);
+            MarkBattlerForControllerExec(gBattleMoveAttacker);
 
-            gActiveBattler = gBattleDefender;
-            EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattleDefender].item);
-            MarkBufferBankForExecution(gBattleDefender);
+            gActiveBattler = gBattleMoveTarget;
+            BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattleMoveTarget].item);
+            MarkBattlerForControllerExec(gBattleMoveTarget);
 
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleDefender]) + 0) = 0;
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleDefender]) + 1) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveTarget]) + 0) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveTarget]) + 1) = 0;
 
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleAttacker]) + 0) = 0;
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleAttacker]) + 1) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveAttacker]) + 0) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveAttacker]) + 1) = 0;
 
             gBattlescriptCurrInstr += 5;
 
@@ -9974,11 +9974,11 @@ static void atkD2_tryswapitems(void) // trick
 
 static void atkD3_trycopyability(void) // role play
 {
-    if (gBattleMons[gBattleDefender].ability != 0
-        && gBattleMons[gBattleDefender].ability != ABILITY_WONDER_GUARD)
+    if (gBattleMons[gBattleMoveTarget].ability != 0
+        && gBattleMons[gBattleMoveTarget].ability != ABILITY_WONDER_GUARD)
     {
-        gBattleMons[gBattleAttacker].ability = gBattleMons[gBattleDefender].ability;
-        gLastUsedAbility = gBattleMons[gBattleDefender].ability;
+        gBattleMons[gBattleMoveAttacker].ability = gBattleMons[gBattleMoveTarget].ability;
+        gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9992,10 +9992,10 @@ static void atkD4_trywish(void)
     switch (gBattlescriptCurrInstr[1])
     {
     case 0: // use wish
-        if (gWishFutureKnock.wishCounter[gBattleAttacker] == 0)
+        if (gWishFutureKnock.wishCounter[gBattleMoveAttacker] == 0)
         {
-            gWishFutureKnock.wishCounter[gBattleAttacker] = 2;
-            gWishFutureKnock.wishUserID[gBattleAttacker] = gBattlePartyID[gBattleAttacker];
+            gWishFutureKnock.wishCounter[gBattleMoveAttacker] = 2;
+            gWishFutureKnock.wishUserID[gBattleMoveAttacker] = gBattlerPartyIndexes[gBattleMoveAttacker];
             gBattlescriptCurrInstr += 6;
         }
         else
@@ -10004,14 +10004,14 @@ static void atkD4_trywish(void)
         }
         break;
     case 1: // heal effect
-        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleDefender, gWishFutureKnock.wishUserID[gBattleDefender])
+        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleMoveTarget, gWishFutureKnock.wishUserID[gBattleMoveTarget])
 
-        gBattleMoveDamage = gBattleMons[gBattleDefender].maxHP / 2;
+        gBattleMoveDamage = gBattleMons[gBattleMoveTarget].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
 
-        if (gBattleMons[gBattleDefender].hp == gBattleMons[gBattleDefender].maxHP)
+        if (gBattleMons[gBattleMoveTarget].hp == gBattleMons[gBattleMoveTarget].maxHP)
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
         else
             gBattlescriptCurrInstr += 6;
@@ -10022,23 +10022,23 @@ static void atkD4_trywish(void)
 
 static void atkD5_trysetroots(void) // ingrain
 {
-    if (gStatuses3[gBattleAttacker] & STATUS3_ROOTED)
+    if (gStatuses3[gBattleMoveAttacker] & STATUS3_ROOTED)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gStatuses3[gBattleAttacker] |= STATUS3_ROOTED;
+        gStatuses3[gBattleMoveAttacker] |= STATUS3_ROOTED;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkD6_doubledamagedealtifdamaged(void)
 {
-    if ((gProtectStructs[gBattleAttacker].physicalDmg
-         && gProtectStructs[gBattleAttacker].physicalBank == gBattleDefender)
-        || (gProtectStructs[gBattleAttacker].specialDmg
-            && gProtectStructs[gBattleAttacker].specialBank == gBattleDefender))
+    if ((gProtectStructs[gBattleMoveAttacker].physicalDmg
+         && gProtectStructs[gBattleMoveAttacker].physicalBank == gBattleMoveTarget)
+        || (gProtectStructs[gBattleMoveAttacker].specialDmg
+            && gProtectStructs[gBattleMoveAttacker].specialBank == gBattleMoveTarget))
     {
         gBattleScripting.dmgMultiplier = 2;
     }
@@ -10048,27 +10048,27 @@ static void atkD6_doubledamagedealtifdamaged(void)
 
 static void atkD7_setyawn(void)
 {
-    if (gStatuses3[gBattleDefender] & STATUS3_YAWN
-        || gBattleMons[gBattleDefender].status1 & STATUS1_ANY)
+    if (gStatuses3[gBattleMoveTarget] & STATUS3_YAWN
+        || gBattleMons[gBattleMoveTarget].status1 & STATUS1_ANY)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gStatuses3[gBattleDefender] |= 0x1000;
+        gStatuses3[gBattleMoveTarget] |= 0x1000;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkD8_setdamagetohealthdifference(void)
 {
-    if (gBattleMons[gBattleDefender].hp <= gBattleMons[gBattleAttacker].hp)
+    if (gBattleMons[gBattleMoveTarget].hp <= gBattleMons[gBattleMoveAttacker].hp)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMoveDamage = gBattleMons[gBattleDefender].hp - gBattleMons[gBattleAttacker].hp;
+        gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - gBattleMons[gBattleMoveAttacker].hp;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -10078,7 +10078,7 @@ static void atkD9_scaledamagebyhealthratio(void)
     if (gDynamicBasePower == 0)
     {
         u8 power = gBattleMoves[gCurrentMove].power;
-        gDynamicBasePower = gBattleMons[gBattleAttacker].hp * power / gBattleMons[gBattleAttacker].maxHP;
+        gDynamicBasePower = gBattleMons[gBattleMoveAttacker].hp * power / gBattleMons[gBattleMoveAttacker].maxHP;
         if (gDynamicBasePower == 0)
             gDynamicBasePower = 1;
     }
@@ -10087,19 +10087,19 @@ static void atkD9_scaledamagebyhealthratio(void)
 
 static void atkDA_tryswapabilities(void) // skill swap
 {
-    if ((gBattleMons[gBattleAttacker].ability == 0
-         && gBattleMons[gBattleDefender].ability == 0)
-     || gBattleMons[gBattleAttacker].ability == ABILITY_WONDER_GUARD
-     || gBattleMons[gBattleDefender].ability == ABILITY_WONDER_GUARD
+    if ((gBattleMons[gBattleMoveAttacker].ability == 0
+         && gBattleMons[gBattleMoveTarget].ability == 0)
+     || gBattleMons[gBattleMoveAttacker].ability == ABILITY_WONDER_GUARD
+     || gBattleMons[gBattleMoveTarget].ability == ABILITY_WONDER_GUARD
      || gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
      {
          gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
      }
     else
     {
-        u8 abilityAtk = gBattleMons[gBattleAttacker].ability;
-        gBattleMons[gBattleAttacker].ability = gBattleMons[gBattleDefender].ability;
-        gBattleMons[gBattleDefender].ability = abilityAtk;
+        u8 abilityAtk = gBattleMons[gBattleMoveAttacker].ability;
+        gBattleMons[gBattleMoveAttacker].ability = gBattleMons[gBattleMoveTarget].ability;
+        gBattleMons[gBattleMoveTarget].ability = abilityAtk;
 
             gBattlescriptCurrInstr += 5;
     }
@@ -10107,7 +10107,7 @@ static void atkDA_tryswapabilities(void) // skill swap
 
 static void atkDB_tryimprision(void)
 {
-    if ((gStatuses3[gBattleAttacker] & STATUS3_IMPRISONED_OTHERS))
+    if ((gStatuses3[gBattleMoveAttacker] & STATUS3_IMPRISONED_OTHERS))
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -10115,8 +10115,8 @@ static void atkDB_tryimprision(void)
     {
         u8 bank, sideAttacker;
 
-        sideAttacker = GetBattlerSide(gBattleAttacker);
-        PressurePPLoseOnUsingImprision(gBattleAttacker);
+        sideAttacker = GetBattlerSide(gBattleMoveAttacker);
+        PressurePPLoseOnUsingImprision(gBattleMoveAttacker);
         for (bank = 0; bank < gBattlersCount; bank++)
         {
             if (sideAttacker != GetBattlerSide(bank))
@@ -10127,8 +10127,8 @@ static void atkDB_tryimprision(void)
                     s32 i;
                     for (i = 0; i < 4; i++)
                     {
-                        if (gBattleMons[gBattleAttacker].moves[attackerMoveId] == gBattleMons[bank].moves[i]
-                            && gBattleMons[gBattleAttacker].moves[attackerMoveId] != MOVE_NONE)
+                        if (gBattleMons[gBattleMoveAttacker].moves[attackerMoveId] == gBattleMons[bank].moves[i]
+                            && gBattleMons[gBattleMoveAttacker].moves[attackerMoveId] != MOVE_NONE)
                             break;
                     }
                     if (i != 4)
@@ -10136,7 +10136,7 @@ static void atkDB_tryimprision(void)
                 }
                 if (attackerMoveId != 4)
                 {
-                    gStatuses3[gBattleAttacker] |= STATUS3_IMPRISONED_OTHERS;
+                    gStatuses3[gBattleMoveAttacker] |= STATUS3_IMPRISONED_OTHERS;
                     gBattlescriptCurrInstr += 5;
                     break;
                 }
@@ -10149,13 +10149,13 @@ static void atkDB_tryimprision(void)
 
 static void atkDC_trysetgrudge(void)
 {
-    if (gStatuses3[gBattleAttacker] & STATUS3_GRUDGE)
+    if (gStatuses3[gBattleMoveAttacker] & STATUS3_GRUDGE)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gStatuses3[gBattleAttacker] |= STATUS3_GRUDGE;
+        gStatuses3[gBattleMoveAttacker] |= STATUS3_GRUDGE;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -10165,7 +10165,7 @@ static void atkDD_weightdamagecalculation(void)
     s32 i;
     for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2)
     {
-        if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattleDefender].species), 1))
+        if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattleMoveTarget].species), 1))
             break;
     }
 
@@ -10184,14 +10184,14 @@ static void atkDE_asistattackselect(void)
     s32 monId, moveId;
     u16* movesArray = gBattleStruct->assistPossibleMoves;
 
-    if (GET_BATTLER_SIDE(gBattleAttacker) != B_SIDE_PLAYER)
+    if (GET_BATTLER_SIDE(gBattleMoveAttacker) != B_SIDE_PLAYER)
         party = gEnemyParty;
     else
         party = gPlayerParty;
 
     for (monId = 0; monId < 6; monId++)
     {
-        if (monId == gBattlePartyID[gBattleAttacker])
+        if (monId == gBattlerPartyIndexes[gBattleMoveAttacker])
             continue;
         if (GetMonData(&party[monId], MON_DATA_SPECIES2) == SPECIES_NONE)
             continue;
@@ -10221,7 +10221,7 @@ static void atkDE_asistattackselect(void)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gRandomMove = movesArray[((Random() & 0xFF) * chooseableMovesNo) >> 8];
-        gBattleDefender = GetMoveTarget(gRandomMove, 0);
+        gBattleMoveTarget = GetMoveTarget(gRandomMove, 0);
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -10232,29 +10232,29 @@ static void atkDE_asistattackselect(void)
 
 static void atkDF_trysetmagiccoat(void)
 {
-    gBattleDefender = gBattleAttacker;
-    gSpecialStatuses[gBattleAttacker].flag20 = 1;
+    gBattleMoveTarget = gBattleMoveAttacker;
+    gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
     if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gProtectStructs[gBattleAttacker].bounceMove = 1;
+        gProtectStructs[gBattleMoveAttacker].bounceMove = 1;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkE0_trysetsnatch(void) // snatch
 {
-    gSpecialStatuses[gBattleAttacker].flag20 = 1;
+    gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
     if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gProtectStructs[gBattleAttacker].stealMove = 1;
+        gProtectStructs[gBattleMoveAttacker].stealMove = 1;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -10268,15 +10268,15 @@ static void atkE1_trygetintimidatetarget(void)
 
     PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gBattleMons[gBattleScripting.battler].ability)
 
-    for (;gBattleDefender < gBattlersCount; gBattleDefender++)
+    for (;gBattleMoveTarget < gBattlersCount; gBattleMoveTarget++)
     {
-        if (GetBattlerSide(gBattleDefender) == side)
+        if (GetBattlerSide(gBattleMoveTarget) == side)
             continue;
-        if (!(gAbsentBattlerFlags & gBitTable[gBattleDefender]))
+        if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]))
             break;
     }
 
-    if (gBattleDefender >= gBattlersCount)
+    if (gBattleMoveTarget >= gBattlersCount)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -10290,8 +10290,8 @@ static void atkE2_switchoutabilities(void)
     {
     case ABILITY_NATURAL_CURE:
         gBattleMons[gActiveBattler].status1 = 0;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[*(gBattleStruct->field_58 + gActiveBattler)], 4, &gBattleMons[gActiveBattler].status1);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[*(gBattleStruct->field_58 + gActiveBattler)], 4, &gBattleMons[gActiveBattler].status1);
+        MarkBattlerForControllerExec(gActiveBattler);
         break;
     }
 
@@ -10426,8 +10426,8 @@ static void atkE6_docastformchangeanimation(void)
     if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE)
         *(&gBattleStruct->formToChangeInto) |= 0x80;
 
-    EmitBattleAnimation(0, B_ANIM_CASTFORM_CHANGE, gBattleStruct->formToChangeInto);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitBattleAnimation(0, B_ANIM_CASTFORM_CHANGE, gBattleStruct->formToChangeInto);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr++;
 }
@@ -10451,18 +10451,18 @@ static void atkE8_settypebasedhalvers(void) // water and mud sport
 
     if (gBattleMoves[gCurrentMove].effect == EFFECT_MUD_SPORT)
     {
-        if (!(gStatuses3[gBattleAttacker] & STATUS3_MUDSPORT))
+        if (!(gStatuses3[gBattleMoveAttacker] & STATUS3_MUDSPORT))
         {
-            gStatuses3[gBattleAttacker] |= STATUS3_MUDSPORT;
+            gStatuses3[gBattleMoveAttacker] |= STATUS3_MUDSPORT;
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             worked = TRUE;
         }
     }
     else // water sport
     {
-        if (!(gStatuses3[gBattleAttacker] & STATUS3_WATERSPORT))
+        if (!(gStatuses3[gBattleMoveAttacker] & STATUS3_WATERSPORT))
         {
-            gStatuses3[gBattleAttacker] |= STATUS3_WATERSPORT;
+            gStatuses3[gBattleMoveAttacker] |= STATUS3_WATERSPORT;
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
             worked = TRUE;
         }
@@ -10499,7 +10499,7 @@ static void atkEA_tryrecycleitem(void)
 {
     u16 *usedHeldItem;
 
-    gActiveBattler = gBattleAttacker;
+    gActiveBattler = gBattleMoveAttacker;
     usedHeldItem = &gBattleStruct->usedHeldItems[gActiveBattler];
     if (*usedHeldItem != 0 && gBattleMons[gActiveBattler].item == 0)
     {
@@ -10507,8 +10507,8 @@ static void atkEA_tryrecycleitem(void)
         *usedHeldItem = 0;
         gBattleMons[gActiveBattler].item = gLastUsedItem;
 
-        EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item);
+        MarkBattlerForControllerExec(gActiveBattler);
 
         gBattlescriptCurrInstr += 5;
     }
@@ -10520,11 +10520,11 @@ static void atkEA_tryrecycleitem(void)
 
 static void atkEB_settypetoterrain(void)
 {
-    if (gBattleMons[gBattleAttacker].type1 != sTerrainToType[gBattleTerrain]
-        && gBattleMons[gBattleAttacker].type2 != sTerrainToType[gBattleTerrain])
+    if (gBattleMons[gBattleMoveAttacker].type1 != sTerrainToType[gBattleTerrain]
+        && gBattleMons[gBattleMoveAttacker].type2 != sTerrainToType[gBattleTerrain])
     {
-        gBattleMons[gBattleAttacker].type1 = sTerrainToType[gBattleTerrain];
-        gBattleMons[gBattleAttacker].type2 = sTerrainToType[gBattleTerrain];
+        gBattleMons[gBattleMoveAttacker].type1 = sTerrainToType[gBattleTerrain];
+        gBattleMons[gBattleMoveAttacker].type2 = sTerrainToType[gBattleTerrain];
 
         PREPARE_TYPE_BUFFER(gBattleTextBuff1, sTerrainToType[gBattleTerrain])
 
@@ -10538,7 +10538,7 @@ static void atkEB_settypetoterrain(void)
 
 static void atkEC_pursuitrelated(void)
 {
-    gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleAttacker) ^ BIT_FLANK);
+    gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_FLANK);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
         && !(gAbsentBattlerFlags & gBitTable[gActiveBattler])
@@ -10549,8 +10549,8 @@ static void atkEC_pursuitrelated(void)
         gCurrentMove = MOVE_PURSUIT;
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
-        gBattleScripting.field_20 = gBattleAttacker;
-        gBattleAttacker = gActiveBattler;
+        gBattleScripting.field_20 = gBattleMoveAttacker;
+        gBattleMoveAttacker = gActiveBattler;
     }
     else
     {
@@ -10560,12 +10560,12 @@ static void atkEC_pursuitrelated(void)
 
 static void atkEF_snatchsetbanks(void)
 {
-    gEffectBank = gBattleAttacker;
+    gEffectBank = gBattleMoveAttacker;
 
-    if (gBattleAttacker == gBattleDefender)
-        gBattleAttacker = gBattleDefender = gBattleScripting.battler;
+    if (gBattleMoveAttacker == gBattleMoveTarget)
+        gBattleMoveAttacker = gBattleMoveTarget = gBattleScripting.battler;
     else
-        gBattleDefender = gBattleScripting.battler;
+        gBattleMoveTarget = gBattleScripting.battler;
 
     gBattleScripting.battler = gEffectBank;
     gBattlescriptCurrInstr++;
@@ -10573,7 +10573,7 @@ static void atkEF_snatchsetbanks(void)
 
 static void atkEE_removelightscreenreflect(void) // brick break
 {
-    u8 opposingSide = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
+    u8 opposingSide = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
 
     if (gSideTimers[opposingSide].reflectTimer || gSideTimers[opposingSide].lightscreenTimer)
     {
@@ -10597,22 +10597,22 @@ static void atkEF_handleballthrow(void)
 {
     u8 ballMultiplier = 0;
 
-    if (gBattleExecBuffer)
+    if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = gBattleAttacker;
-    gBattleDefender = gBattleAttacker ^ BIT_SIDE;
+    gActiveBattler = gBattleMoveAttacker;
+    gBattleMoveTarget = gBattleMoveAttacker ^ BIT_SIDE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
-        EmitBallThrowAnim(0, BALL_TRAINER_BLOCK);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitBallThrowAnim(0, BALL_TRAINER_BLOCK);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr = BattleScript_TrainerBallBlock;
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL)
     {
-        EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS);
+        MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr = BattleScript_WallyBallThrow;
     }
     else
@@ -10623,17 +10623,17 @@ static void atkEF_handleballthrow(void)
         if (gLastUsedItem == ITEM_SAFARI_BALL)
             catchRate = gBattleStruct->field_7C * 1275 / 100;
         else
-            catchRate = gBaseStats[gBattleMons[gBattleDefender].species].catchRate;
+            catchRate = gBaseStats[gBattleMons[gBattleMoveTarget].species].catchRate;
 
         if (gLastUsedItem > ITEM_SAFARI_BALL)
         {
             switch (gLastUsedItem)
             {
             case ITEM_NET_BALL:
-                if (gBattleMons[gBattleDefender].type1 == TYPE_WATER
-                    || gBattleMons[gBattleDefender].type2 == TYPE_WATER
-                    || gBattleMons[gBattleDefender].type1 == TYPE_BUG
-                    || gBattleMons[gBattleDefender].type2 == TYPE_BUG)
+                if (gBattleMons[gBattleMoveTarget].type1 == TYPE_WATER
+                    || gBattleMons[gBattleMoveTarget].type2 == TYPE_WATER
+                    || gBattleMons[gBattleMoveTarget].type1 == TYPE_BUG
+                    || gBattleMons[gBattleMoveTarget].type2 == TYPE_BUG)
                     ballMultiplier = 30;
                 else
                     ballMultiplier = 10;
@@ -10645,9 +10645,9 @@ static void atkEF_handleballthrow(void)
                     ballMultiplier = 10;
                 break;
             case ITEM_NEST_BALL:
-                if (gBattleMons[gBattleDefender].level < 40)
+                if (gBattleMons[gBattleMoveTarget].level < 40)
                 {
-                    ballMultiplier = 40 - gBattleMons[gBattleDefender].level;
+                    ballMultiplier = 40 - gBattleMons[gBattleMoveTarget].level;
                     if (ballMultiplier <= 9)
                         ballMultiplier = 10;
                 }
@@ -10657,7 +10657,7 @@ static void atkEF_handleballthrow(void)
                 }
                 break;
             case ITEM_REPEAT_BALL:
-                if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBattleDefender].species), FLAG_GET_CAUGHT))
+                if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBattleMoveTarget].species), FLAG_GET_CAUGHT))
                     ballMultiplier = 30;
                 else
                     ballMultiplier = 10;
@@ -10677,12 +10677,12 @@ static void atkEF_handleballthrow(void)
             ballMultiplier = sBallCatchBonuses[gLastUsedItem - 2];
 
         odds = (catchRate * ballMultiplier / 10)
-            * (gBattleMons[gBattleDefender].maxHP * 3 - gBattleMons[gBattleDefender].hp * 2)
-            / (3 * gBattleMons[gBattleDefender].maxHP);
+            * (gBattleMons[gBattleMoveTarget].maxHP * 3 - gBattleMons[gBattleMoveTarget].hp * 2)
+            / (3 * gBattleMons[gBattleMoveTarget].maxHP);
 
-        if (gBattleMons[gBattleDefender].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
+        if (gBattleMons[gBattleMoveTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
             odds *= 2;
-        if (gBattleMons[gBattleDefender].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
+        if (gBattleMons[gBattleMoveTarget].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
             odds = (odds * 15) / 10;
 
         if (gLastUsedItem != ITEM_SAFARI_BALL)
@@ -10700,10 +10700,10 @@ static void atkEF_handleballthrow(void)
 
         if (odds > 254) // mon caught
         {
-            EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS);
+            MarkBattlerForControllerExec(gActiveBattler);
             gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
-            SetMonData(&gEnemyParty[gBattlePartyID[gBattleDefender]], MON_DATA_POKEBALL, &gLastUsedItem);
+            SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveTarget]], MON_DATA_POKEBALL, &gLastUsedItem);
 
             if (CalculatePlayerPartyCount() == 6)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -10722,13 +10722,13 @@ static void atkEF_handleballthrow(void)
             if (gLastUsedItem == ITEM_MASTER_BALL)
                 shakes = BALL_3_SHAKES_SUCCESS; // why calculate the shakes before that check?
 
-            EmitBallThrowAnim(0, shakes);
-            MarkBufferBankForExecution(gActiveBattler);
+            BtlController_EmitBallThrowAnim(0, shakes);
+            MarkBattlerForControllerExec(gActiveBattler);
 
             if (shakes == BALL_3_SHAKES_SUCCESS) // mon caught, copy of the code above
             {
                 gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
-                SetMonData(&gEnemyParty[gBattlePartyID[gBattleDefender]], MON_DATA_POKEBALL, &gLastUsedItem);
+                SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveTarget]], MON_DATA_POKEBALL, &gLastUsedItem);
 
                 if (CalculatePlayerPartyCount() == 6)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -10746,18 +10746,18 @@ static void atkEF_handleballthrow(void)
 
 static void atkF0_givecaughtmon(void)
 {
-    if (GiveMonToPlayer(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY)
+    if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY)
     {
         if (!sub_813B21C())
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN)));
-            GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
+            GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
         }
         else
         {
             StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN)));
-            GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
+            GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
             StringCopy(gStringVar3, GetBoxNamePtr(get_unknown_box_id()));
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         }
@@ -10766,9 +10766,9 @@ static void atkF0_givecaughtmon(void)
             gBattleCommunication[MULTISTRING_CHOOSER]++;
     }
 
-    gBattleResults.caughtMonSpecies = GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_SPECIES, NULL);
-    GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleResults.caughtMonNick);
-    gBattleResults.caughtMonBall = GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_POKEBALL, NULL);
+    gBattleResults.caughtMonSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_SPECIES, NULL);
+    GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleResults.caughtMonNick);
+    gBattleResults.caughtMonBall = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_POKEBALL, NULL);
 
     gBattlescriptCurrInstr++;
 }
@@ -10804,8 +10804,8 @@ static void atkF2_displaydexinfo(void)
         {
             FreeAllWindowBuffers();
             gBattleCommunication[TASK_ID] = CreateDexDisplayMonDataTask(SpeciesToNationalPokedexNum(species),
-                                                                        gBattleMons[gBattleDefender].otId,
-                                                                        gBattleMons[gBattleDefender].personality);
+                                                                        gBattleMons[gBattleMoveTarget].otId,
+                                                                        gBattleMons[gBattleMoveTarget].personality);
             gBattleCommunication[0]++;
         }
         break;
@@ -10956,13 +10956,13 @@ static void atkF3_trygivecaughtmonnick(void)
     case 2:
         if (!gPaletteFade.active)
         {
-            GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
+            GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
             FreeAllWindowBuffers();
 
             DoNamingScreen(NAMING_SCREEN_CAUGHT_MON, gBattleStruct->caughtMonNick,
-                           GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_SPECIES),
-                           GetMonGender(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]]),
-                           GetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_PERSONALITY, NULL),
+                           GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_SPECIES),
+                           GetMonGender(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]]),
+                           GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_PERSONALITY, NULL),
                            BattleMainCB2);
 
             gBattleCommunication[MULTIUSE_STATE]++;
@@ -10971,7 +10971,7 @@ static void atkF3_trygivecaughtmonnick(void)
     case 3:
         if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active )
         {
-            SetMonData(&gEnemyParty[gBattlePartyID[gBattleAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
+            SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         break;
@@ -10986,13 +10986,13 @@ static void atkF3_trygivecaughtmonnick(void)
 
 static void atkF4_subattackerhpbydmg(void)
 {
-    gBattleMons[gBattleAttacker].hp -= gBattleMoveDamage;
+    gBattleMons[gBattleMoveAttacker].hp -= gBattleMoveDamage;
     gBattlescriptCurrInstr++;
 }
 
 static void atkF5_removeattackerstatus1(void)
 {
-    gBattleMons[gBattleAttacker].status1 = 0;
+    gBattleMons[gBattleMoveAttacker].status1 = 0;
     gBattlescriptCurrInstr++;
 }
 
@@ -11010,8 +11010,8 @@ static void atkF7_finishturn(void)
 static void atkF8_trainerslideout(void)
 {
     gActiveBattler = GetBattlerAtPosition(gBattlescriptCurrInstr[1]);
-    EmitTrainerSlideBack(0);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitTrainerSlideBack(0);
+    MarkBattlerForControllerExec(gActiveBattler);
 
     gBattlescriptCurrInstr += 2;
 }
diff --git a/src/battle_util.c b/src/battle_util.c
index 135f4f7f2..228727585 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -33,8 +33,8 @@ extern u16 gCurrentMove;
 extern u16 gLastUsedItem;
 extern u8 gBattlersCount;
 extern u32 gStatuses3[MAX_BATTLERS_COUNT];
-extern u8 gBattleAttacker;
-extern u8 gBattleDefender;
+extern u8 gBattleMoveAttacker;
+extern u8 gBattleMoveTarget;
 extern u8 gAbsentBattlerFlags;
 extern u16 gBattleWeather;
 extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
@@ -48,7 +48,7 @@ extern u32 gBattleTypeFlags;
 extern u16 gLastMoves[MAX_BATTLERS_COUNT];
 extern u32 gHitMarker;
 extern u8 gEffectBank;
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBank1;
 extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
 extern u8 gMoveResultFlags;
@@ -56,7 +56,7 @@ extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
 extern u8 gTakenDmgBanks[MAX_BATTLERS_COUNT];
 extern u8 gLastUsedAbility;
 extern u8 gCurrentActionFuncId;
-extern u32 gBattleExecBuffer;
+extern u32 gBattleControllerExecFlags;
 extern u16 gRandomMove;
 extern u8 gCurrMovePos;
 extern u8 gUnknown_020241E9;
@@ -79,10 +79,10 @@ u8 GetBattleBank(u8 caseId)
     switch (caseId)
     {
     case BS_GET_TARGET:
-        ret = gBattleDefender;
+        ret = gBattleMoveTarget;
         break;
     case BS_GET_ATTACKER:
-        ret = gBattleAttacker;
+        ret = gBattleMoveAttacker;
         break;
     case BS_GET_EFFECT_BANK:
         ret = gEffectBank;
@@ -142,8 +142,8 @@ void PressurePPLose(u8 defender, u8 attacker, u16 move)
         && !(gDisableStructs[attacker].unk18_b & gBitTable[i]))
     {
         gActiveBattler = attacker;
-        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]);
+        MarkBattlerForControllerExec(gActiveBattler);
     }
 }
 
@@ -176,8 +176,8 @@ void PressurePPLoseOnUsingImprision(u8 attacker)
         && !(gDisableStructs[attacker].unk18_b & gBitTable[imprisionPos]))
     {
         gActiveBattler = attacker;
-        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisionPos]);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisionPos]);
+        MarkBattlerForControllerExec(gActiveBattler);
     }
 }
 
@@ -209,37 +209,33 @@ void PressurePPLoseOnUsingPerishSong(u8 attacker)
         && !(gDisableStructs[attacker].unk18_b & gBitTable[perishSongPos]))
     {
         gActiveBattler = attacker;
-        EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBattler].pp[perishSongPos]);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBattler].pp[perishSongPos]);
+        MarkBattlerForControllerExec(gActiveBattler);
     }
 }
 
-void MarkAllBufferBanksForExecution(void) // unused
+void MarkAllBattlersForControllerExec(void) // unused
 {
     s32 i;
 
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
     {
         for (i = 0; i < gBattlersCount; i++)
-            gBattleExecBuffer |= gBitTable[i] << 0x1C;
+            gBattleControllerExecFlags |= gBitTable[i] << 0x1C;
     }
     else
     {
         for (i = 0; i < gBattlersCount; i++)
-            gBattleExecBuffer |= gBitTable[i];
+            gBattleControllerExecFlags |= gBitTable[i];
     }
 }
 
-void MarkBufferBankForExecution(u8 battler)
+void MarkBattlerForControllerExec(u8 battlerId)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-    {
-        gBattleExecBuffer |= gBitTable[battler] << 0x1C;
-    }
+        gBattleControllerExecFlags |= gBitTable[battlerId] << 0x1C;
     else
-    {
-        gBattleExecBuffer |= gBitTable[battler];
-    }
+        gBattleControllerExecFlags |= gBitTable[battlerId];
 }
 
 void sub_803F850(u8 arg0)
@@ -247,9 +243,9 @@ void sub_803F850(u8 arg0)
     s32 i;
 
     for (i = 0; i < GetLinkPlayerCount(); i++)
-        gBattleExecBuffer |= gBitTable[arg0] << (i << 2);
+        gBattleControllerExecFlags |= gBitTable[arg0] << (i << 2);
 
-    gBattleExecBuffer &= ~(0x10000000 << arg0);
+    gBattleControllerExecFlags &= ~(0x10000000 << arg0);
 }
 
 void CancelMultiTurnMoves(u8 battler)
@@ -284,8 +280,8 @@ bool8 WasUnableToUseMove(u8 battler)
 void PrepareStringBattle(u16 stringId, u8 battler)
 {
     gActiveBattler = battler;
-    EmitPrintString(0, stringId);
-    MarkBufferBankForExecution(gActiveBattler);
+    BtlController_EmitPrintString(0, stringId);
+    MarkBattlerForControllerExec(gActiveBattler);
 }
 
 void ResetSentPokesToOpponentValue(void)
@@ -297,7 +293,7 @@ void ResetSentPokesToOpponentValue(void)
     gSentPokesToOpponent[1] = 0;
 
     for (i = 0; i < gBattlersCount; i += 2)
-        bits |= gBitTable[gBattlePartyID[i]];
+        bits |= gBitTable[gBattlerPartyIndexes[i]];
 
     for (i = 1; i < gBattlersCount; i += 2)
         gSentPokesToOpponent[(i & BIT_FLANK) >> 1] = bits;
@@ -316,7 +312,7 @@ void sub_803F9EC(u8 battler)
         for (i = 0; i < gBattlersCount; i += 2)
         {
             if (!(gAbsentBattlerFlags & gBitTable[i]))
-                bits |= gBitTable[gBattlePartyID[i]];
+                bits |= gBitTable[gBattlerPartyIndexes[i]];
         }
 
         gSentPokesToOpponent[flank] = bits;
@@ -333,7 +329,7 @@ void sub_803FA70(u8 battler)
     {
         s32 i;
         for (i = 1; i < gBattlersCount; i++)
-            gSentPokesToOpponent[(i & BIT_FLANK) >> 1] |= gBitTable[gBattlePartyID[battler]];
+            gSentPokesToOpponent[(i & BIT_FLANK) >> 1] |= gBitTable[gBattlerPartyIndexes[battler]];
     }
 }
 
@@ -540,10 +536,10 @@ u8 UpdateTurnCounters(void)
     u8 effect = 0;
     s32 i;
 
-    for (gBattleAttacker = 0; gBattleAttacker < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattleAttacker]; gBattleAttacker++)
+    for (gBattleMoveAttacker = 0; gBattleMoveAttacker < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattleMoveAttacker]; gBattleMoveAttacker++)
     {
     }
-    for (gBattleDefender = 0; gBattleDefender < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattleDefender]; gBattleDefender++)
+    for (gBattleMoveTarget = 0; gBattleMoveTarget < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]; gBattleMoveTarget++)
     {
     }
 
@@ -579,7 +575,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattleAttacker = gSideTimers[sideBank].reflectBank;
+                gActiveBattler = gBattleMoveAttacker = gSideTimers[sideBank].reflectBank;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_REFLECT)
                 {
                     if (--gSideTimers[sideBank].reflectTimer == 0)
@@ -604,7 +600,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattleAttacker = gSideTimers[sideBank].lightscreenBank;
+                gActiveBattler = gBattleMoveAttacker = gSideTimers[sideBank].lightscreenBank;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_LIGHTSCREEN)
                 {
                     if (--gSideTimers[sideBank].lightscreenTimer == 0)
@@ -630,7 +626,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattleAttacker = gSideTimers[sideBank].mistBank;
+                gActiveBattler = gBattleMoveAttacker = gSideTimers[sideBank].mistBank;
                 if (gSideTimers[sideBank].mistTimer != 0
                  && --gSideTimers[sideBank].mistTimer == 0)
                 {
@@ -654,7 +650,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattleAttacker = gSideTimers[sideBank].safeguardBank;
+                gActiveBattler = gBattleMoveAttacker = gSideTimers[sideBank].safeguardBank;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_SAFEGUARD)
                 {
                     if (--gSideTimers[sideBank].safeguardTimer == 0)
@@ -682,7 +678,7 @@ u8 UpdateTurnCounters(void)
                  && --gWishFutureKnock.wishCounter[gActiveBattler] == 0
                  && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleDefender = gActiveBattler;
+                    gBattleMoveTarget = gActiveBattler;
                     BattleScriptExecute(BattleScript_WishComesTrue);
                     effect++;
                 }
@@ -800,7 +796,7 @@ u8 TurnBasedEffects(void)
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
     while (gBattleStruct->turnEffectsBank < gBattlersCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
     {
-        gActiveBattler = gBattleAttacker = gBattleTurnOrder[gBattleStruct->turnEffectsBank];
+        gActiveBattler = gBattleMoveAttacker = gBattleTurnOrder[gBattleStruct->turnEffectsBank];
         if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
         {
             gBattleStruct->turnEffectsBank++;
@@ -843,12 +839,12 @@ u8 TurnBasedEffects(void)
                  && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK].hp != 0
                  && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleDefender = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
+                    gBattleMoveTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
                     gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    gBattleScripting.animArg1 = gBattleDefender;
-                    gBattleScripting.animArg2 = gBattleAttacker;
+                    gBattleScripting.animArg1 = gBattleMoveTarget;
+                    gBattleScripting.animArg2 = gBattleMoveAttacker;
                     BattleScriptExecute(BattleScript_LeechSeedTurnDrain);
                     effect++;
                 }
@@ -957,29 +953,29 @@ u8 TurnBasedEffects(void)
             case 10:  // uproar
                 if (gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR)
                 {
-                    for (gBattleAttacker = 0; gBattleAttacker < gBattlersCount; gBattleAttacker++)
+                    for (gBattleMoveAttacker = 0; gBattleMoveAttacker < gBattlersCount; gBattleMoveAttacker++)
                     {
-                        if ((gBattleMons[gBattleAttacker].status1 & STATUS1_SLEEP)
-                         && gBattleMons[gBattleAttacker].ability != ABILITY_SOUNDPROOF)
+                        if ((gBattleMons[gBattleMoveAttacker].status1 & STATUS1_SLEEP)
+                         && gBattleMons[gBattleMoveAttacker].ability != ABILITY_SOUNDPROOF)
                         {
-                            gBattleMons[gBattleAttacker].status1 &= ~(STATUS1_SLEEP);
-                            gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+                            gBattleMons[gBattleMoveAttacker].status1 &= ~(STATUS1_SLEEP);
+                            gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                             BattleScriptExecute(BattleScript_MonWokeUpInUproar);
-                            gActiveBattler = gBattleAttacker;
-                            EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
-                            MarkBufferBankForExecution(gActiveBattler);
+                            gActiveBattler = gBattleMoveAttacker;
+                            BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                            MarkBattlerForControllerExec(gActiveBattler);
                             break;
                         }
                     }
-                    if (gBattleAttacker != gBattlersCount)
+                    if (gBattleMoveAttacker != gBattlersCount)
                     {
                         effect = 2;  // a pokemon was awaken
                         break;
                     }
                     else
                     {
-                        gBattleAttacker = gActiveBattler;
+                        gBattleMoveAttacker = gActiveBattler;
                         gBattleMons[gActiveBattler].status2 -= 0x10;  // uproar timer goes down
                         if (WasUnableToUseMove(gActiveBattler))
                         {
@@ -1092,8 +1088,8 @@ u8 TurnBasedEffects(void)
                     {
                         CancelMultiTurnMoves(gActiveBattler);
                         gBattleMons[gActiveBattler].status1 |= (Random() & 3) + 2;
-                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                        MarkBattlerForControllerExec(gActiveBattler);
                         gEffectBank = gActiveBattler;
                         BattleScriptExecute(BattleScript_YawnMakesAsleep);
                         effect++;
@@ -1142,16 +1138,16 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
 
                 PREPARE_MOVE_BUFFER(gBattleTextBuff1, gWishFutureKnock.futureSightMove[gActiveBattler]);
 
-                gBattleDefender = gActiveBattler;
-                gBattleAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler];
+                gBattleMoveTarget = gActiveBattler;
+                gBattleMoveAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler];
                 gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler];
-                gSpecialStatuses[gBattleDefender].moveturnLostHP = 0xFFFF;
+                gSpecialStatuses[gBattleMoveTarget].moveturnLostHP = 0xFFFF;
                 BattleScriptExecute(BattleScript_MonTookFutureAttack);
 
                 if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0
                  && gWishFutureKnock.futureSightCounter[gActiveBattler ^ BIT_FLANK] == 0)
                 {
-                    gSideStatuses[GET_BATTLER_SIDE(gBattleDefender)] &= ~(SIDE_STATUS_FUTUREATTACK);
+                    gSideStatuses[GET_BATTLER_SIDE(gBattleMoveTarget)] &= ~(SIDE_STATUS_FUTUREATTACK);
                 }
                 return TRUE;
             }
@@ -1166,7 +1162,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
     case 1:
         while (gBattleStruct->wishPerishSongBank < gBattlersCount)
         {
-            gActiveBattler = gBattleAttacker = gBattleTurnOrder[gBattleStruct->wishPerishSongBank];
+            gActiveBattler = gBattleMoveAttacker = gBattleTurnOrder[gBattleStruct->wishPerishSongBank];
             if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
             {
                 gBattleStruct->wishPerishSongBank++;
@@ -1244,9 +1240,9 @@ bool8 HandleFaintedMonActions(void)
         case 1:
             do
             {
-                gBank1 = gBattleDefender = gBattleStruct->faintedActionsBank;
+                gBank1 = gBattleMoveTarget = gBattleStruct->faintedActionsBank;
                 if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
-                 && !(gBattleStruct->field_DF & gBitTable[gBattlePartyID[gBattleStruct->faintedActionsBank]])
+                 && !(gBattleStruct->field_DF & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBank]])
                  && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBank]))
                 {
                     BattleScriptExecute(BattleScript_GiveExp);
@@ -1270,7 +1266,7 @@ bool8 HandleFaintedMonActions(void)
         case 4:
             do
             {
-                gBank1 = gBattleDefender = gBattleStruct->faintedActionsBank;
+                gBank1 = gBattleMoveTarget = gBattleStruct->faintedActionsBank;
                 if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
                  && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBank]))
                 {
@@ -1320,17 +1316,17 @@ u8 AtkCanceller_UnableToUseMove(void)
         switch (gBattleStruct->atkCancellerTracker)
         {
         case 0: // flags clear
-            gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_DESTINY_BOND);
-            gStatuses3[gBattleAttacker] &= ~(STATUS3_GRUDGE);
+            gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_DESTINY_BOND);
+            gStatuses3[gBattleMoveAttacker] &= ~(STATUS3_GRUDGE);
             gBattleStruct->atkCancellerTracker++;
             break;
         case 1: // check being asleep
-            if (gBattleMons[gBattleAttacker].status1 & STATUS1_SLEEP)
+            if (gBattleMons[gBattleMoveAttacker].status1 & STATUS1_SLEEP)
             {
-                if (UproarWakeUpCheck(gBattleAttacker))
+                if (UproarWakeUpCheck(gBattleMoveAttacker))
                 {
-                    gBattleMons[gBattleAttacker].status1 &= ~(STATUS1_SLEEP);
-                    gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+                    gBattleMons[gBattleMoveAttacker].status1 &= ~(STATUS1_SLEEP);
+                    gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                     gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
@@ -1339,15 +1335,15 @@ u8 AtkCanceller_UnableToUseMove(void)
                 else
                 {
                     u8 toSub;
-                    if (gBattleMons[gBattleAttacker].ability == ABILITY_EARLY_BIRD)
+                    if (gBattleMons[gBattleMoveAttacker].ability == ABILITY_EARLY_BIRD)
                         toSub = 2;
                     else
                         toSub = 1;
-                    if ((gBattleMons[gBattleAttacker].status1 & STATUS1_SLEEP) < toSub)
-                        gBattleMons[gBattleAttacker].status1 &= ~(STATUS1_SLEEP);
+                    if ((gBattleMons[gBattleMoveAttacker].status1 & STATUS1_SLEEP) < toSub)
+                        gBattleMons[gBattleMoveAttacker].status1 &= ~(STATUS1_SLEEP);
                     else
-                        gBattleMons[gBattleAttacker].status1 -= toSub;
-                    if (gBattleMons[gBattleAttacker].status1 & STATUS1_SLEEP)
+                        gBattleMons[gBattleMoveAttacker].status1 -= toSub;
+                    if (gBattleMons[gBattleMoveAttacker].status1 & STATUS1_SLEEP)
                     {
                         if (gCurrentMove != MOVE_SNORE && gCurrentMove != MOVE_SLEEP_TALK)
                         {
@@ -1358,7 +1354,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                     }
                     else
                     {
-                        gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+                        gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                         BattleScriptPushCursor();
                         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                         gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
@@ -1369,7 +1365,7 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 2: // check being frozen
-            if (gBattleMons[gBattleAttacker].status1 & STATUS1_FREEZE)
+            if (gBattleMons[gBattleMoveAttacker].status1 & STATUS1_FREEZE)
             {
                 if (Random() % 5)
                 {
@@ -1386,7 +1382,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                 }
                 else // unfreeze
                 {
-                    gBattleMons[gBattleAttacker].status1 &= ~(STATUS1_FREEZE);
+                    gBattleMons[gBattleMoveAttacker].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -1396,9 +1392,9 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 3: // truant
-            if (gBattleMons[gBattleAttacker].ability == ABILITY_TRUANT && gDisableStructs[gBattleAttacker].truantCounter)
+            if (gBattleMons[gBattleMoveAttacker].ability == ABILITY_TRUANT && gDisableStructs[gBattleMoveAttacker].truantCounter)
             {
-                CancelMultiTurnMoves(gBattleAttacker);
+                CancelMultiTurnMoves(gBattleMoveAttacker);
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                 gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround;
@@ -1408,11 +1404,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 4: // recharge
-            if (gBattleMons[gBattleAttacker].status2 & STATUS2_RECHARGE)
+            if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_RECHARGE)
             {
-                gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_RECHARGE);
-                gDisableStructs[gBattleAttacker].rechargeCounter = 0;
-                CancelMultiTurnMoves(gBattleAttacker);
+                gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_RECHARGE);
+                gDisableStructs[gBattleMoveAttacker].rechargeCounter = 0;
+                CancelMultiTurnMoves(gBattleMoveAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedMustRecharge;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1420,11 +1416,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 5: // flinch
-            if (gBattleMons[gBattleAttacker].status2 & STATUS2_FLINCHED)
+            if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_FLINCHED)
             {
-                gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_FLINCHED);
-                gProtectStructs[gBattleAttacker].flinchImmobility = 1;
-                CancelMultiTurnMoves(gBattleAttacker);
+                gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_FLINCHED);
+                gProtectStructs[gBattleMoveAttacker].flinchImmobility = 1;
+                CancelMultiTurnMoves(gBattleMoveAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedFlinched;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1432,11 +1428,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 6: // disabled move
-            if (gDisableStructs[gBattleAttacker].disabledMove == gCurrentMove && gDisableStructs[gBattleAttacker].disabledMove != 0)
+            if (gDisableStructs[gBattleMoveAttacker].disabledMove == gCurrentMove && gDisableStructs[gBattleMoveAttacker].disabledMove != 0)
             {
-                gProtectStructs[gBattleAttacker].usedDisabledMove = 1;
-                gBattleScripting.battler = gBattleAttacker;
-                CancelMultiTurnMoves(gBattleAttacker);
+                gProtectStructs[gBattleMoveAttacker].usedDisabledMove = 1;
+                gBattleScripting.battler = gBattleMoveAttacker;
+                CancelMultiTurnMoves(gBattleMoveAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsDisabled;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1444,10 +1440,10 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 7: // taunt
-            if (gDisableStructs[gBattleAttacker].tauntTimer1 && gBattleMoves[gCurrentMove].power == 0)
+            if (gDisableStructs[gBattleMoveAttacker].tauntTimer1 && gBattleMoves[gCurrentMove].power == 0)
             {
-                gProtectStructs[gBattleAttacker].usedTauntedMove = 1;
-                CancelMultiTurnMoves(gBattleAttacker);
+                gProtectStructs[gBattleMoveAttacker].usedTauntedMove = 1;
+                CancelMultiTurnMoves(gBattleMoveAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsTaunted;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1455,10 +1451,10 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 8: // imprisoned
-            if (GetImprisonedMovesCount(gBattleAttacker, gCurrentMove))
+            if (GetImprisonedMovesCount(gBattleMoveAttacker, gCurrentMove))
             {
-                gProtectStructs[gBattleAttacker].usedImprisionedMove = 1;
-                CancelMultiTurnMoves(gBattleAttacker);
+                gProtectStructs[gBattleMoveAttacker].usedImprisionedMove = 1;
+                CancelMultiTurnMoves(gBattleMoveAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsImprisoned;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1466,10 +1462,10 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 9: // confusion
-            if (gBattleMons[gBattleAttacker].status2 & STATUS2_CONFUSION)
+            if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_CONFUSION)
             {
-                gBattleMons[gBattleAttacker].status2--;
-                if (gBattleMons[gBattleAttacker].status2 & STATUS2_CONFUSION)
+                gBattleMons[gBattleMoveAttacker].status2--;
+                if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_CONFUSION)
                 {
                     if (Random() & 1)
                     {
@@ -1479,9 +1475,9 @@ u8 AtkCanceller_UnableToUseMove(void)
                     else // confusion dmg
                     {
                         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                        gBattleDefender = gBattleAttacker;
-                        gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleAttacker], &gBattleMons[gBattleAttacker], MOVE_POUND, 0, 40, 0, gBattleAttacker, gBattleAttacker);
-                        gProtectStructs[gBattleAttacker].confusionSelfDmg = 1;
+                        gBattleMoveTarget = gBattleMoveAttacker;
+                        gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleMoveAttacker], &gBattleMons[gBattleMoveAttacker], MOVE_POUND, 0, 40, 0, gBattleMoveAttacker, gBattleMoveAttacker);
+                        gProtectStructs[gBattleMoveAttacker].confusionSelfDmg = 1;
                         gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                     }
                     gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfused;
@@ -1496,11 +1492,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 10: // paralysis
-            if ((gBattleMons[gBattleAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0)
+            if ((gBattleMons[gBattleMoveAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0)
             {
-                gProtectStructs[gBattleAttacker].prlzImmobility = 1;
+                gProtectStructs[gBattleMoveAttacker].prlzImmobility = 1;
                 // This is removed in Emerald for some reason
-                //CancelMultiTurnMoves(gBattleAttacker);
+                //CancelMultiTurnMoves(gBattleMoveAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsParalyzed;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1508,17 +1504,17 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 11: // infatuation
-            if (gBattleMons[gBattleAttacker].status2 & STATUS2_INFATUATION)
+            if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_INFATUATION)
             {
-                gBattleScripting.battler = CountTrailingZeroBits((gBattleMons[gBattleAttacker].status2 & STATUS2_INFATUATION) >> 0x10);
+                gBattleScripting.battler = CountTrailingZeroBits((gBattleMons[gBattleMoveAttacker].status2 & STATUS2_INFATUATION) >> 0x10);
                 if (Random() & 1)
                     BattleScriptPushCursor();
                 else
                 {
                     BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack);
                     gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
-                    gProtectStructs[gBattleAttacker].loveImmobility = 1;
-                    CancelMultiTurnMoves(gBattleAttacker);
+                    gProtectStructs[gBattleMoveAttacker].loveImmobility = 1;
+                    CancelMultiTurnMoves(gBattleMoveAttacker);
                 }
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsInLove;
                 effect = 1;
@@ -1526,22 +1522,22 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 12: // bide
-            if (gBattleMons[gBattleAttacker].status2 & STATUS2_BIDE)
+            if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_BIDE)
             {
-                gBattleMons[gBattleAttacker].status2 -= 0x100;
-                if (gBattleMons[gBattleAttacker].status2 & STATUS2_BIDE)
+                gBattleMons[gBattleMoveAttacker].status2 -= 0x100;
+                if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_BIDE)
                     gBattlescriptCurrInstr = BattleScript_BideStoringEnergy;
                 else
                 {
                     // This is removed in Emerald for some reason
-                    //gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
-                    if (gTakenDmg[gBattleAttacker])
+                    //gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
+                    if (gTakenDmg[gBattleMoveAttacker])
                     {
                         gCurrentMove = MOVE_BIDE;
-                        *bideDmg = gTakenDmg[gBattleAttacker] * 2;
-                        gBattleDefender = gTakenDmgBanks[gBattleAttacker];
-                        if (gAbsentBattlerFlags & gBitTable[gBattleDefender])
-                            gBattleDefender = GetMoveTarget(MOVE_BIDE, 1);
+                        *bideDmg = gTakenDmg[gBattleMoveAttacker] * 2;
+                        gBattleMoveTarget = gTakenDmgBanks[gBattleMoveAttacker];
+                        if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
+                            gBattleMoveTarget = GetMoveTarget(MOVE_BIDE, 1);
                         gBattlescriptCurrInstr = BattleScript_BideAttack;
                     }
                     else
@@ -1552,11 +1548,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 13: // move thawing
-            if (gBattleMons[gBattleAttacker].status1 & STATUS1_FREEZE)
+            if (gBattleMons[gBattleMoveAttacker].status1 & STATUS1_FREEZE)
             {
                 if (gBattleMoves[gCurrentMove].effect == EFFECT_THAW_HIT)
                 {
-                    gBattleMons[gBattleAttacker].status1 &= ~(STATUS1_FREEZE);
+                    gBattleMons[gBattleMoveAttacker].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -1573,9 +1569,9 @@ u8 AtkCanceller_UnableToUseMove(void)
 
     if (effect == 2)
     {
-        gActiveBattler = gBattleAttacker;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
-        MarkBufferBankForExecution(gActiveBattler);
+        gActiveBattler = gBattleMoveAttacker;
+        BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBattlerForControllerExec(gActiveBattler);
     }
     return effect;
 }
@@ -1611,7 +1607,7 @@ bool8 sub_80423F4(u8 battler, u8 r1, u8 r2)
             if (GetBattlerSide(battler) == B_SIDE_PLAYER)
             {
                 party = gPlayerParty;
-                r7 = GetBankMultiplayerId(battler);
+                r7 = GetBattlerMultiplayerId(battler);
                 r6 = sub_806D82C(r7);
             }
             else
@@ -1630,7 +1626,7 @@ bool8 sub_80423F4(u8 battler, u8 r1, u8 r2)
         }
         else
         {
-            r7 = GetBankMultiplayerId(battler);
+            r7 = GetBattlerMultiplayerId(battler);
             if (GetBattlerSide(battler) == B_SIDE_PLAYER)
                 party = gPlayerParty;
             else
@@ -1678,9 +1674,9 @@ bool8 sub_80423F4(u8 battler, u8 r1, u8 r2)
             party = gPlayerParty;
         }
         if (r1 == 6)
-            r1 = gBattlePartyID[r7];
+            r1 = gBattlerPartyIndexes[r7];
         if (r2 == 6)
-            r2 = gBattlePartyID[r6];
+            r2 = gBattlerPartyIndexes[r6];
         for (i = 0; i < 6; i++)
         {
             if (GetMonData(&party[i], MON_DATA_HP) != 0
@@ -1754,19 +1750,19 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
     u32 pidAtk;
     u32 pidDef;
 
-    if (gBattleAttacker >= gBattlersCount)
-        gBattleAttacker = battler;
-    if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
-        pokeAtk = &gPlayerParty[gBattlePartyID[gBattleAttacker]];
+    if (gBattleMoveAttacker >= gBattlersCount)
+        gBattleMoveAttacker = battler;
+    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+        pokeAtk = &gPlayerParty[gBattlerPartyIndexes[gBattleMoveAttacker]];
     else
-        pokeAtk = &gEnemyParty[gBattlePartyID[gBattleAttacker]];
+        pokeAtk = &gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker]];
 
-    if (gBattleDefender >= gBattlersCount)
-        gBattleDefender = battler;
-    if (GetBattlerSide(gBattleDefender) == B_SIDE_PLAYER)
-        pokeDef = &gPlayerParty[gBattlePartyID[gBattleDefender]];
+    if (gBattleMoveTarget >= gBattlersCount)
+        gBattleMoveTarget = battler;
+    if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
+        pokeDef = &gPlayerParty[gBattlerPartyIndexes[gBattleMoveTarget]];
     else
-        pokeDef = &gEnemyParty[gBattlePartyID[gBattleDefender]];
+        pokeDef = &gEnemyParty[gBattlerPartyIndexes[gBattleMoveTarget]];
 
     speciesAtk = GetMonData(pokeAtk, MON_DATA_SPECIES);
     pidAtk = GetMonData(pokeAtk, MON_DATA_PERSONALITY);
@@ -1797,8 +1793,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
         switch (caseID)
         {
         case ABILITYEFFECT_ON_SWITCHIN: // 0
-            if (gBattleAttacker >= gBattlersCount)
-                gBattleAttacker = battler;
+            if (gBattleMoveAttacker >= gBattlersCount)
+                gBattleMoveAttacker = battler;
             switch (gLastUsedAbility)
             {
             case ABILITYEFFECT_SWITCH_IN_WEATHER:
@@ -1915,7 +1911,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
         case ABILITYEFFECT_ENDTURN: // 1
             if (gBattleMons[battler].hp != 0)
             {
-                gBattleAttacker = battler;
+                gBattleMoveAttacker = battler;
                 switch (gLastUsedAbility)
                 {
                 case ABILITY_RAIN_DISH:
@@ -1948,8 +1944,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                         gBattleMons[battler].status2 &= ~(STATUS2_NIGHTMARE);  // fix nightmare glitch
                         gBattleScripting.battler = gActiveBattler = battler;
                         BattleScriptPushCursorAndCallback(BattleScript_ShedSkinActivates);
-                        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[battler].status1);
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[battler].status1);
+                        MarkBattlerForControllerExec(gActiveBattler);
                         effect++;
                     }
                     break;
@@ -1965,7 +1961,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                     }
                     break;
                 case ABILITY_TRUANT:
-                    gDisableStructs[gBattleAttacker].truantCounter ^= 1;
+                    gDisableStructs[gBattleMoveAttacker].truantCounter ^= 1;
                     break;
                 }
             }
@@ -1980,7 +1976,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 }
                 if (sSoundMovesTable[i] != 0xFFFF)
                 {
-                    if (gBattleMons[gBattleAttacker].status2 & STATUS2_MULTIPLETURNS)
+                    if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS)
                         gHitMarker |= HITMARKER_NO_PPDEDUCT;
                     gBattlescriptCurrInstr = BattleScript_SoundproofProtected;
                     effect = 1;
@@ -1995,7 +1991,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 case ABILITY_VOLT_ABSORB:
                     if (moveType == TYPE_ELECTRIC && gBattleMoves[move].power != 0)
                     {
-                        if (gProtectStructs[gBattleAttacker].notFirstStrike)
+                        if (gProtectStructs[gBattleMoveAttacker].notFirstStrike)
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain;
                         else
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss;
@@ -2006,7 +2002,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 case ABILITY_WATER_ABSORB:
                     if (moveType == TYPE_WATER && gBattleMoves[move].power != 0)
                     {
-                        if (gProtectStructs[gBattleAttacker].notFirstStrike)
+                        if (gProtectStructs[gBattleMoveAttacker].notFirstStrike)
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain;
                         else
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss;
@@ -2020,7 +2016,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                         if (!(gBattleResources->flags->flags[battler] & UNKNOWN_FLAG_FLASH_FIRE))
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-                            if (gProtectStructs[gBattleAttacker].notFirstStrike)
+                            if (gProtectStructs[gBattleMoveAttacker].notFirstStrike)
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost;
                             else
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
@@ -2031,7 +2027,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                         else
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                            if (gProtectStructs[gBattleAttacker].notFirstStrike)
+                            if (gProtectStructs[gBattleMoveAttacker].notFirstStrike)
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost;
                             else
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
@@ -2045,7 +2041,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 {
                     if (gBattleMons[battler].maxHP == gBattleMons[battler].hp)
                     {
-                        if ((gProtectStructs[gBattleAttacker].notFirstStrike))
+                        if ((gProtectStructs[gBattleMoveAttacker].notFirstStrike))
                             gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless;
                         else
                             gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless_PPLoss;
@@ -2067,7 +2063,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && move != MOVE_STRUGGLE
                  && gBattleMoves[move].power != 0
-                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
                  && gBattleMons[battler].type1 != moveType
                  && gBattleMons[battler].type2 != moveType
                  && gBattleMons[battler].hp != 0)
@@ -2082,12 +2078,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_ROUGH_SKIN:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleAttacker].hp != 0
-                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
+                 && gBattleMons[gBattleMoveAttacker].hp != 0
+                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT))
                 {
-                    gBattleMoveDamage = gBattleMons[gBattleAttacker].maxHP / 16;
+                    gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     BattleScriptPushCursor();
@@ -2097,9 +2093,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_EFFECT_SPORE:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleAttacker].hp != 0
-                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
+                 && gBattleMons[gBattleMoveAttacker].hp != 0
+                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 10) == 0)
                 {
@@ -2120,9 +2116,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_POISON_POINT:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleAttacker].hp != 0
-                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
+                 && gBattleMons[gBattleMoveAttacker].hp != 0
+                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 3) == 0)
                 {
@@ -2135,9 +2131,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_STATIC:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleAttacker].hp != 0
-                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
+                 && gBattleMons[gBattleMoveAttacker].hp != 0
+                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 3) == 0)
                 {
@@ -2150,10 +2146,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_FLAME_BODY:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleAttacker].hp != 0
-                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
+                 && gBattleMons[gBattleMoveAttacker].hp != 0
+                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
-                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
                  && (Random() % 3) == 0)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_BURN;
@@ -2165,19 +2161,19 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_CUTE_CHARM:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleAttacker].hp != 0
-                 && !gProtectStructs[gBattleAttacker].confusionSelfDmg
+                 && gBattleMons[gBattleMoveAttacker].hp != 0
+                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
-                 && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
-                 && gBattleMons[gBattleDefender].hp != 0
+                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
+                 && gBattleMons[gBattleMoveTarget].hp != 0
                  && (Random() % 3) == 0
-                 && gBattleMons[gBattleAttacker].ability != ABILITY_OBLIVIOUS
+                 && gBattleMons[gBattleMoveAttacker].ability != ABILITY_OBLIVIOUS
                  && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != GetGenderFromSpeciesAndPersonality(speciesDef, pidDef)
-                 && !(gBattleMons[gBattleAttacker].status2 & STATUS2_INFATUATION)
+                 && !(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_INFATUATION)
                  && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != MON_GENDERLESS
                  && GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != MON_GENDERLESS)
                 {
-                    gBattleMons[gBattleAttacker].status2 |= STATUS2_INFATUATED_WITH(gBattleDefender);
+                    gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_INFATUATED_WITH(gBattleMoveTarget);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_CuteCharmActivates;
                     effect++;
@@ -2261,8 +2257,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                     gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus;
                     gBattleScripting.battler = battler;
                     gActiveBattler = battler;
-                    EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                    MarkBattlerForControllerExec(gActiveBattler);
                     return effect;
                 }
             }
@@ -2292,7 +2288,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                     gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
 
                 gBattleCommunication[MOVE_EFFECT_BYTE] = gBattleStruct->synchronizeMoveEffect + MOVE_EFFECT_AFFECTS_USER;
-                gBattleScripting.battler = gBattleDefender;
+                gBattleScripting.battler = gBattleMoveTarget;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
                 gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
@@ -2308,7 +2304,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                     gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
 
                 gBattleCommunication[MOVE_EFFECT_BYTE] = gBattleStruct->synchronizeMoveEffect;
-                gBattleScripting.battler = gBattleAttacker;
+                gBattleScripting.battler = gBattleMoveAttacker;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
                 gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
@@ -2379,7 +2375,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                         gStatuses3[i] &= ~(STATUS3_TRACE);
                         gBattleScripting.battler = i;
 
-                        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattlePartyID[gActiveBattler])
+                        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattlerPartyIndexes[gActiveBattler])
                         PREPARE_ABILITY_BUFFER(gBattleTextBuff2, gLastUsedAbility)
                         break;
                     }
@@ -2560,11 +2556,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
         bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem);
     }
 
-    atkItem = gBattleMons[gBattleAttacker].item;
+    atkItem = gBattleMons[gBattleMoveAttacker].item;
     if (atkItem == ITEM_ENIGMA_BERRY)
     {
-        atkHoldEffect = gEnigmaBerries[gBattleAttacker].holdEffect;
-        atkQuality = gEnigmaBerries[gBattleAttacker].holdEffectParam;
+        atkHoldEffect = gEnigmaBerries[gBattleMoveAttacker].holdEffect;
+        atkQuality = gEnigmaBerries[gBattleMoveAttacker].holdEffectParam;
     }
     else
     {
@@ -2573,11 +2569,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     }
 
     // def variables are unused
-    defItem = gBattleMons[gBattleDefender].item;
+    defItem = gBattleMons[gBattleMoveTarget].item;
     if (defItem == ITEM_ENIGMA_BERRY)
     {
-        defHoldEffect = gEnigmaBerries[gBattleDefender].holdEffect;
-        defQuality = gEnigmaBerries[gBattleDefender].holdEffectParam;
+        defHoldEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect;
+        defQuality = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
     }
     else
     {
@@ -2607,7 +2603,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             {
                 gBattleScripting.battler = bank;
                 gStringBank = bank;
-                gActiveBattler = gBattleAttacker = bank;
+                gActiveBattler = gBattleMoveAttacker = bank;
                 BattleScriptExecute(BattleScript_WhiteHerbEnd2);
             }
             break;
@@ -2637,9 +2633,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     u16 move;
 
                     if (GetBattlerSide(bank) == B_SIDE_PLAYER)
-                        mon = &gPlayerParty[gBattlePartyID[bank]];
+                        mon = &gPlayerParty[gBattlerPartyIndexes[bank]];
                     else
-                        mon = &gEnemyParty[gBattlePartyID[bank]];
+                        mon = &gEnemyParty[gBattlerPartyIndexes[bank]];
                     for (i = 0; i < 4; i++)
                     {
                         move = GetMonData(mon, MON_DATA_MOVE1 + i);
@@ -2659,8 +2655,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         PREPARE_MOVE_BUFFER(gBattleTextBuff1, move);
 
                         BattleScriptExecute(BattleScript_BerryPPHealEnd2);
-                        EmitSetMonData(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
-                        MarkBufferBankForExecution(gActiveBattler);
+                        BtlController_EmitSetMonData(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
+                        MarkBattlerForControllerExec(gActiveBattler);
                         effect = ITEM_PP_CHANGE;
                     }
                 }
@@ -2678,7 +2674,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 {
                     gBattleScripting.battler = bank;
                     gStringBank = bank;
-                    gActiveBattler = gBattleAttacker = bank;
+                    gActiveBattler = gBattleMoveAttacker = bank;
                     BattleScriptExecute(BattleScript_WhiteHerbEnd2);
                 }
                 break;
@@ -3006,12 +3002,12 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             {
                 gBattleScripting.battler = bank;
                 gStringBank = bank;
-                gActiveBattler = gBattleAttacker = bank;
+                gActiveBattler = gBattleMoveAttacker = bank;
                 switch (effect)
                 {
                 case ITEM_STATUS_CHANGE:
-                    EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
-                    MarkBufferBankForExecution(gActiveBattler);
+                    BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
+                    MarkBattlerForControllerExec(gActiveBattler);
                     break;
                 case ITEM_PP_CHANGE:
                     if (!(gBattleMons[bank].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[bank].unk18_b & gBitTable[i]))
@@ -3165,8 +3161,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 gBattleScripting.battler = bank;
                 gStringBank = bank;
                 gActiveBattler = bank;
-                EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
-                MarkBufferBankForExecution(gActiveBattler);
+                BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+                MarkBattlerForControllerExec(gActiveBattler);
                 break;
             }
         }
@@ -3178,10 +3174,10 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             {
             case HOLD_EFFECT_FLINCH:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                    && (gSpecialStatuses[gBattleDefender].moveturnLostHP_physical || gSpecialStatuses[gBattleDefender].moveturnLostHP_special)
+                    && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
                     && (Random() % 100) < atkQuality
                     && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED
-                    && gBattleMons[gBattleDefender].hp)
+                    && gBattleMons[gBattleMoveTarget].hp)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_FLINCH;
                     BattleScriptPushCursor();
@@ -3191,19 +3187,19 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 break;
             case HOLD_EFFECT_SHELL_BELL:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                    && gSpecialStatuses[gBattleDefender].moveturnLostHP != 0
-                    && gSpecialStatuses[gBattleDefender].moveturnLostHP != 0xFFFF
-                    && gBattleAttacker != gBattleDefender
-                    && gBattleMons[gBattleAttacker].hp != gBattleMons[gBattleAttacker].maxHP
-                    && gBattleMons[gBattleAttacker].hp != 0)
+                    && gSpecialStatuses[gBattleMoveTarget].moveturnLostHP != 0
+                    && gSpecialStatuses[gBattleMoveTarget].moveturnLostHP != 0xFFFF
+                    && gBattleMoveAttacker != gBattleMoveTarget
+                    && gBattleMons[gBattleMoveAttacker].hp != gBattleMons[gBattleMoveAttacker].maxHP
+                    && gBattleMons[gBattleMoveAttacker].hp != 0)
                 {
                     gLastUsedItem = atkItem;
-                    gStringBank = gBattleAttacker;
-                    gBattleScripting.battler = gBattleAttacker;
-                    gBattleMoveDamage = (gSpecialStatuses[gBattleDefender].moveturnLostHP / atkQuality) * -1;
+                    gStringBank = gBattleMoveAttacker;
+                    gBattleScripting.battler = gBattleMoveAttacker;
+                    gBattleMoveDamage = (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP / atkQuality) * -1;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = -1;
-                    gSpecialStatuses[gBattleDefender].moveturnLostHP = 0;
+                    gSpecialStatuses[gBattleMoveTarget].moveturnLostHP = 0;
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ItemHealHP_Ret;
                     effect++;
@@ -3226,7 +3222,7 @@ void ClearFuryCutterDestinyBondGrudge(u8 bank)
 
 void HandleAction_RunBattleScript(void) // identical to RunBattleScriptCommands
 {
-    if (gBattleExecBuffer == 0)
+    if (gBattleControllerExecFlags == 0)
         gBattleScriptingCommandsTable[*gBattlescriptCurrInstr]();
 }
 
@@ -3244,18 +3240,18 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     switch (moveTarget)
     {
     case MOVE_TARGET_SELECTED:
-        side = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
+        side = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
             targetBank = gSideTimers[side].followmeTarget;
         else
         {
-            side = GetBattlerSide(gBattleAttacker);
+            side = GetBattlerSide(gBattleMoveAttacker);
             do
             {
                 targetBank = Random() % gBattlersCount;
-            } while (targetBank == gBattleAttacker || side == GetBattlerSide(targetBank) || gAbsentBattlerFlags & gBitTable[targetBank]);
+            } while (targetBank == gBattleMoveAttacker || side == GetBattlerSide(targetBank) || gAbsentBattlerFlags & gBitTable[targetBank]);
             if (gBattleMoves[move].type == TYPE_ELECTRIC
-                && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattleAttacker, ABILITY_LIGHTNING_ROD, 0, 0)
+                && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattleMoveAttacker, ABILITY_LIGHTNING_ROD, 0, 0)
                 && gBattleMons[targetBank].ability != ABILITY_LIGHTNING_ROD)
             {
                 targetBank ^= BIT_FLANK;
@@ -3268,17 +3264,17 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     case MOVE_TARGET_BOTH:
     case MOVE_TARGET_FOES_AND_ALLY:
     case MOVE_TARGET_OPPONENTS_FIELD:
-        targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattleAttacker) & BIT_SIDE) ^ BIT_SIDE);
+        targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattleMoveAttacker) & BIT_SIDE) ^ BIT_SIDE);
         if (gAbsentBattlerFlags & gBitTable[targetBank])
             targetBank ^= BIT_FLANK;
         break;
     case MOVE_TARGET_RANDOM:
-        side = GetBattlerSide(gBattleAttacker) ^ BIT_SIDE;
+        side = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
             targetBank = gSideTimers[side].followmeTarget;
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & MOVE_TARGET_RANDOM)
         {
-            if (GetBattlerSide(gBattleAttacker) == B_SIDE_PLAYER)
+            if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
             {
                 if (Random() & 1)
                     targetBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
@@ -3296,15 +3292,15 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
                 targetBank ^= BIT_FLANK;
         }
         else
-            targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattleAttacker) & BIT_SIDE) ^ BIT_SIDE);
+            targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattleMoveAttacker) & BIT_SIDE) ^ BIT_SIDE);
         break;
     case MOVE_TARGET_USER:
     case MOVE_TARGET_x10:
-        targetBank = gBattleAttacker;
+        targetBank = gBattleMoveAttacker;
         break;
     }
 
-    *(gBattleStruct->moveTarget + gBattleAttacker) = targetBank;
+    *(gBattleStruct->moveTarget + gBattleMoveAttacker) = targetBank;
 
     return targetBank;
 }
@@ -3313,10 +3309,10 @@ static bool32 HasObedientBitSet(u8 bank)
 {
     if (GetBattlerSide(bank) == B_SIDE_OPPONENT)
         return TRUE;
-    if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS
-        && GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES, NULL) != SPECIES_MEW)
+    if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS
+        && GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES, NULL) != SPECIES_MEW)
             return TRUE;
-    return GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_OBEDIENCE, NULL);
+    return GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_OBEDIENCE, NULL);
 }
 
 u8 IsMonDisobedient(void)
@@ -3327,18 +3323,18 @@ u8 IsMonDisobedient(void)
 
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
         return 0;
-    if (GetBattlerSide(gBattleAttacker) == B_SIDE_OPPONENT)
+    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_OPPONENT)
         return 0;
 
-    if (HasObedientBitSet(gBattleAttacker)) // only if species is Mew or Deoxys
+    if (HasObedientBitSet(gBattleMoveAttacker)) // only if species is Mew or Deoxys
     {
-        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(gBattleAttacker) == 2)
+        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(gBattleMoveAttacker) == 2)
             return 0;
         if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
             return 0;
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
             return 0;
-        if (!IsOtherTrainer(gBattleMons[gBattleAttacker].otId, gBattleMons[gBattleAttacker].otName))
+        if (!IsOtherTrainer(gBattleMons[gBattleMoveAttacker].otId, gBattleMons[gBattleMoveAttacker].otName))
             return 0;
         if (FlagGet(FLAG_BADGE08_GET))
             return 0;
@@ -3353,27 +3349,27 @@ u8 IsMonDisobedient(void)
             obedienceLevel = 70;
     }
 
-    if (gBattleMons[gBattleAttacker].level <= obedienceLevel)
+    if (gBattleMons[gBattleMoveAttacker].level <= obedienceLevel)
         return 0;
     rnd = (Random() & 255);
-    calc = (gBattleMons[gBattleAttacker].level + obedienceLevel) * rnd >> 8;
+    calc = (gBattleMons[gBattleMoveAttacker].level + obedienceLevel) * rnd >> 8;
     if (calc < obedienceLevel)
         return 0;
 
     // is not obedient
     if (gCurrentMove == MOVE_RAGE)
-        gBattleMons[gBattleAttacker].status2 &= ~(STATUS2_RAGE);
-    if (gBattleMons[gBattleAttacker].status1 & STATUS1_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK))
+        gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_RAGE);
+    if (gBattleMons[gBattleMoveAttacker].status1 & STATUS1_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK))
     {
         gBattlescriptCurrInstr = BattleScript_82DB695;
         return 1;
     }
 
     rnd = (Random() & 255);
-    calc = (gBattleMons[gBattleAttacker].level + obedienceLevel) * rnd >> 8;
+    calc = (gBattleMons[gBattleMoveAttacker].level + obedienceLevel) * rnd >> 8;
     if (calc < obedienceLevel)
     {
-        calc = CheckMoveLimitations(gBattleAttacker, gBitTable[gCurrMovePos], 0xFF);
+        calc = CheckMoveLimitations(gBattleMoveAttacker, gBitTable[gCurrMovePos], 0xFF);
         if (calc == 0xF) // all moves cannot be used
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3;
@@ -3387,19 +3383,19 @@ u8 IsMonDisobedient(void)
                 gCurrMovePos = gUnknown_020241E9 = Random() & 3;
             } while (gBitTable[gCurrMovePos] & calc);
 
-            gRandomMove = gBattleMons[gBattleAttacker].moves[gCurrMovePos];
+            gRandomMove = gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos];
             gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove;
-            gBattleDefender = GetMoveTarget(gRandomMove, 0);
+            gBattleMoveTarget = GetMoveTarget(gRandomMove, 0);
             gHitMarker |= HITMARKER_x200000;
             return 2;
         }
     }
     else
     {
-        obedienceLevel = gBattleMons[gBattleAttacker].level - obedienceLevel;
+        obedienceLevel = gBattleMons[gBattleMoveAttacker].level - obedienceLevel;
 
         calc = (Random() & 255);
-        if (calc < obedienceLevel && !(gBattleMons[gBattleAttacker].status1 & STATUS1_ANY) && gBattleMons[gBattleAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBattleAttacker].ability != ABILITY_INSOMNIA)
+        if (calc < obedienceLevel && !(gBattleMons[gBattleMoveAttacker].status1 & STATUS1_ANY) && gBattleMons[gBattleMoveAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBattleMoveAttacker].ability != ABILITY_INSOMNIA)
         {
             // try putting asleep
             int i;
@@ -3417,8 +3413,8 @@ u8 IsMonDisobedient(void)
         calc -= obedienceLevel;
         if (calc < obedienceLevel)
         {
-            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleAttacker], &gBattleMons[gBattleAttacker], MOVE_POUND, 0, 40, 0, gBattleAttacker, gBattleAttacker);
-            gBattleDefender = gBattleAttacker;
+            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleMoveAttacker], &gBattleMons[gBattleMoveAttacker], MOVE_POUND, 0, 40, 0, gBattleMoveAttacker, gBattleMoveAttacker);
+            gBattleMoveTarget = gBattleMoveAttacker;
             gBattlescriptCurrInstr = BattleScript_82DB6F0;
             gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
             return 2;
diff --git a/src/battle_util2.c b/src/battle_util2.c
index 5c7434aa0..ba42d4ea9 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -9,7 +9,7 @@
 #include "battle_scripts.h"
 
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_0203CF00[];
 extern const u8 *gBattlescriptCurrInstr;
 extern u8 gBattleCommunication[];
@@ -101,13 +101,13 @@ void AdjustFriendshipOnBattleFaint(u8 bank)
     if (gBattleMons[opposingBank].level > gBattleMons[bank].level)
     {
         if (gBattleMons[opposingBank].level - gBattleMons[bank].level > 29)
-            AdjustFriendship(&gPlayerParty[gBattlePartyID[bank]], 8);
+            AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[bank]], 8);
         else
-            AdjustFriendship(&gPlayerParty[gBattlePartyID[bank]], 6);
+            AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[bank]], 6);
     }
     else
     {
-        AdjustFriendship(&gPlayerParty[gBattlePartyID[bank]], 6);
+        AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[bank]], 6);
     }
 }
 
@@ -122,7 +122,7 @@ void sub_80571DC(u8 bank, u8 arg1)
         for (i = 0; i < 3; i++)
             gUnknown_0203CF00[i] = *(0 * 3 + i + (u8*)(gBattleStruct->field_60));
 
-        sub_81B8FB0(pokemon_order_func(gBattlePartyID[bank]), pokemon_order_func(arg1));
+        sub_81B8FB0(pokemon_order_func(gBattlerPartyIndexes[bank]), pokemon_order_func(arg1));
 
         for (i = 0; i < 3; i++)
             *(0 * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
@@ -207,8 +207,8 @@ u32 sub_805725C(u8 bank)
     if (effect == 2)
     {
         gActiveBattler = bank;
-        EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
-        MarkBufferBankForExecution(gActiveBattler);
+        BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
+        MarkBattlerForControllerExec(gActiveBattler);
     }
 
     return effect;
diff --git a/src/item_use.c b/src/item_use.c
index 8fe705a50..9cb2a4546 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -89,7 +89,7 @@ extern void flagmods_08054D70(void);
 extern u8* sub_806CF78(u16);
 extern bool8 ExecuteTableBasedItemEffect_(struct Pokemon*, u16, u8, u8);
 extern u8 gBankInMenu;
-extern u16 gBattlePartyID[];
+extern u16 gBattlerPartyIndexes[];
 extern void sub_81B89F0(void);
 extern u8 GetItemEffectType(u16);
 
@@ -1131,7 +1131,7 @@ void sub_80FE440(u8 taskId)
 
 void ItemUseInBattle_StatIncrease(u8 taskId)
 {
-    u16 partyId = gBattlePartyID[gBankInMenu];
+    u16 partyId = gBattlerPartyIndexes[gBankInMenu];
 
     if (ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gSpecialVar_ItemId, partyId, 0) != FALSE)
     {
diff --git a/src/pokeball.c b/src/pokeball.c
index 424ecb0eb..87802d6ba 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -17,10 +17,10 @@
 
 extern bool8 gDoingBattleAnim;
 extern u8 gActiveBattler;
-extern u8 gBattleDefender;
-extern u16 gBattlePartyID[];
-extern u8 gBankSpriteIds[];
-extern u8 gHealthBoxesIds[];
+extern u8 gBattleMoveTarget;
+extern u16 gBattlerPartyIndexes[];
+extern u8 gBattlerSpriteIds[];
+extern u8 gHealthboxSpriteIds[];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 // this file's functions
@@ -364,9 +364,9 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     bank = gTasks[taskId].tBank;
 
     if (GetBattlerSide(bank) != B_SIDE_PLAYER)
-        itemId = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
+        itemId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_POKEBALL);
     else
-        itemId = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
+        itemId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_POKEBALL);
 
     ballId = ItemIdToBallId(itemId);
     LoadBallGfx(ballId);
@@ -378,25 +378,25 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     switch (throwCaseId)
     {
     case POKEBALL_PLAYER_SENDOUT:
-        gBattleDefender = bank;
+        gBattleMoveTarget = bank;
         gSprites[ballSpriteId].pos1.x = 24;
         gSprites[ballSpriteId].pos1.y = 68;
         gSprites[ballSpriteId].callback = SpriteCB_PlayerMonSendOut_1;
         break;
     case POKEBALL_OPPONENT_SENDOUT:
-        gSprites[ballSpriteId].pos1.x = GetBankCoord(bank, BANK_X_POS);
-        gSprites[ballSpriteId].pos1.y = GetBankCoord(bank, BANK_Y_POS) + 24;
-        gBattleDefender = bank;
+        gSprites[ballSpriteId].pos1.x = GetBattlerSpriteCoord(bank, BANK_X_POS);
+        gSprites[ballSpriteId].pos1.y = GetBattlerSpriteCoord(bank, BANK_Y_POS) + 24;
+        gBattleMoveTarget = bank;
         gSprites[ballSpriteId].data[0] = 0;
         gSprites[ballSpriteId].callback = SpriteCB_OpponentMonSendOut;
         break;
     default:
-        gBattleDefender = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         notSendOut = TRUE;
         break;
     }
 
-    gSprites[ballSpriteId].sBank = gBattleDefender;
+    gSprites[ballSpriteId].sBank = gBattleMoveTarget;
     if (!notSendOut)
     {
         DestroyTask(taskId);
@@ -405,12 +405,12 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
 
     // this will perform an unused ball throw animation
     gSprites[ballSpriteId].data[0] = 0x22;
-    gSprites[ballSpriteId].data[2] = GetBankCoord(gBattleDefender, BANK_X_POS);
-    gSprites[ballSpriteId].data[4] = GetBankCoord(gBattleDefender, BANK_Y_POS) - 16;
+    gSprites[ballSpriteId].data[2] = GetBattlerSpriteCoord(gBattleMoveTarget, BANK_X_POS);
+    gSprites[ballSpriteId].data[4] = GetBattlerSpriteCoord(gBattleMoveTarget, BANK_Y_POS) - 16;
     gSprites[ballSpriteId].data[5] = -40;
     sub_80A68D4(&gSprites[ballSpriteId]);
     gSprites[ballSpriteId].oam.affineParam = taskId;
-    gTasks[taskId].tOpponentBank = gBattleDefender;
+    gTasks[taskId].tOpponentBank = gBattleMoveTarget;
     gTasks[taskId].func = TaskDummy;
     PlaySE(SE_NAGERU);
 }
@@ -458,9 +458,9 @@ static void sub_80756E0(struct Sprite *sprite)
     {
         sprite->data[5] = 0;
         sprite->callback = sub_807574C;
-        StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->sBank]], 2);
-        AnimateSprite(&gSprites[gBankSpriteIds[sprite->sBank]]);
-        gSprites[gBankSpriteIds[sprite->sBank]].data[1] = 0;
+        StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[sprite->sBank]], 2);
+        AnimateSprite(&gSprites[gBattlerSpriteIds[sprite->sBank]]);
+        gSprites[gBattlerSpriteIds[sprite->sBank]].data[1] = 0;
     }
 }
 
@@ -469,17 +469,17 @@ static void sub_807574C(struct Sprite *sprite)
     sprite->data[5]++;
     if (sprite->data[5] == 11)
         PlaySE(SE_SUIKOMU);
-    if (gSprites[gBankSpriteIds[sprite->sBank]].affineAnimEnded)
+    if (gSprites[gBattlerSpriteIds[sprite->sBank]].affineAnimEnded)
     {
         StartSpriteAnim(sprite, 2);
-        gSprites[gBankSpriteIds[sprite->sBank]].invisible = TRUE;
+        gSprites[gBattlerSpriteIds[sprite->sBank]].invisible = TRUE;
         sprite->data[5] = 0;
         sprite->callback = sub_80757E4;
     }
     else
     {
-        gSprites[gBankSpriteIds[sprite->sBank]].data[1] += 0x60;
-        gSprites[gBankSpriteIds[sprite->sBank]].pos2.y = -gSprites[gBankSpriteIds[sprite->sBank]].data[1] >> 8;
+        gSprites[gBattlerSpriteIds[sprite->sBank]].data[1] += 0x60;
+        gSprites[gBattlerSpriteIds[sprite->sBank]].pos2.y = -gSprites[gBattlerSpriteIds[sprite->sBank]].data[1] >> 8;
     }
 }
 
@@ -757,12 +757,12 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
 
         if (GetBattlerSide(bank) != B_SIDE_PLAYER)
         {
-            mon = &gEnemyParty[gBattlePartyID[bank]];
+            mon = &gEnemyParty[gBattlerPartyIndexes[bank]];
             pan = 25;
         }
         else
         {
-            mon = &gPlayerParty[gBattlePartyID[bank]];
+            mon = &gPlayerParty[gBattlerPartyIndexes[bank]];
             pan = -25;
         }
 
@@ -795,21 +795,21 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
         gTasks[taskId].tCryTaskPan = pan;
         gTasks[taskId].tCryTaskWantedCry = wantedCryCase;
         gTasks[taskId].tCryTaskBank = bank;
-        gTasks[taskId].tCryTaskMonSpriteId = gBankSpriteIds[sprite->sBank];
+        gTasks[taskId].tCryTaskMonSpriteId = gBattlerSpriteIds[sprite->sBank];
         gTasks[taskId].tCryTaskMonPtr1 = (u32)(mon) >> 0x10;
         gTasks[taskId].tCryTaskMonPtr2 = (u32)(mon);
         gTasks[taskId].tCryTaskState = 0;
     }
 
-    StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->sBank]], 1);
+    StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[sprite->sBank]], 1);
 
     if (GetBattlerSide(sprite->sBank) == B_SIDE_OPPONENT)
-        gSprites[gBankSpriteIds[sprite->sBank]].callback = sub_8039B58;
+        gSprites[gBattlerSpriteIds[sprite->sBank]].callback = sub_8039B58;
     else
-        gSprites[gBankSpriteIds[sprite->sBank]].callback = sub_8039E44;
+        gSprites[gBattlerSpriteIds[sprite->sBank]].callback = sub_8039E44;
 
-    AnimateSprite(&gSprites[gBankSpriteIds[sprite->sBank]]);
-    gSprites[gBankSpriteIds[sprite->sBank]].data[1] = 0x1000;
+    AnimateSprite(&gSprites[gBattlerSpriteIds[sprite->sBank]]);
+    gSprites[gBattlerSpriteIds[sprite->sBank]].data[1] = 0x1000;
 }
 
 #undef tCryTaskSpecies
@@ -836,24 +836,24 @@ static void HandleBallAnimEnd(struct Sprite *sprite)
     bool8 affineAnimEnded = FALSE;
     u8 bank = sprite->sBank;
 
-    gSprites[gBankSpriteIds[bank]].invisible = FALSE;
+    gSprites[gBattlerSpriteIds[bank]].invisible = FALSE;
     if (sprite->animEnded)
         sprite->invisible = TRUE;
-    if (gSprites[gBankSpriteIds[bank]].affineAnimEnded)
+    if (gSprites[gBattlerSpriteIds[bank]].affineAnimEnded)
     {
-        StartSpriteAffineAnim(&gSprites[gBankSpriteIds[bank]], 0);
+        StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[bank]], 0);
         affineAnimEnded = TRUE;
     }
     else
     {
-        gSprites[gBankSpriteIds[bank]].data[1] -= 288;
-        gSprites[gBankSpriteIds[bank]].pos2.y = gSprites[gBankSpriteIds[bank]].data[1] >> 8;
+        gSprites[gBattlerSpriteIds[bank]].data[1] -= 288;
+        gSprites[gBattlerSpriteIds[bank]].pos2.y = gSprites[gBattlerSpriteIds[bank]].data[1] >> 8;
     }
     if (sprite->animEnded && affineAnimEnded)
     {
         s32 i, doneBanks;
 
-        gSprites[gBankSpriteIds[bank]].pos2.y = 0;
+        gSprites[gBattlerSpriteIds[bank]].pos2.y = 0;
         gDoingBattleAnim = FALSE;
         gBattleSpritesDataPtr->healthBoxesData[bank].ballAnimActive = 0;
         FreeSpriteOamMatrix(sprite);
@@ -889,8 +889,8 @@ static void sub_80760F8(struct Sprite *sprite)
     }
     else if (sprite->data[4] == 315)
     {
-        FreeOamMatrix(gSprites[gBankSpriteIds[sprite->sBank]].oam.matrixNum);
-        DestroySprite(&gSprites[gBankSpriteIds[sprite->sBank]]);
+        FreeOamMatrix(gSprites[gBattlerSpriteIds[sprite->sBank]].oam.matrixNum);
+        DestroySprite(&gSprites[gBattlerSpriteIds[sprite->sBank]]);
         DestroySpriteAndFreeResources(sprite);
         if (gMain.inBattle)
             gBattleSpritesDataPtr->healthBoxesData[bank].ballAnimActive = 0;
@@ -900,8 +900,8 @@ static void sub_80760F8(struct Sprite *sprite)
 static void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite)
 {
     sprite->data[0] = 25;
-    sprite->data[2] = GetBankCoord(sprite->sBank, 2);
-    sprite->data[4] = GetBankCoord(sprite->sBank, 3) + 24;
+    sprite->data[2] = GetBattlerSpriteCoord(sprite->sBank, 2);
+    sprite->data[4] = GetBattlerSpriteCoord(sprite->sBank, 3) + 24;
     sprite->data[5] = -30;
     sprite->oam.affineParam = sprite->sBank;
     sub_80A68D4(sprite);
@@ -1183,7 +1183,7 @@ static void DestroySpriteAndFreeResources_(struct Sprite *sprite)
 
 void sub_8076918(u8 bank)
 {
-    struct Sprite *healthboxSprite = &gSprites[gHealthBoxesIds[bank]];
+    struct Sprite *healthboxSprite = &gSprites[gHealthboxSpriteIds[bank]];
 
     healthboxSprite->data[0] = 5;
     healthboxSprite->data[1] = 0;
@@ -1226,7 +1226,7 @@ void DoHitAnimHealthboxEffect(u8 bank)
 
     spriteId = CreateInvisibleSpriteWithCallback(SpriteCB_HitAnimHealthoxEffect);
     gSprites[spriteId].data[0] = 1;
-    gSprites[spriteId].data[1] = gHealthBoxesIds[bank];
+    gSprites[spriteId].data[1] = gHealthboxSpriteIds[bank];
     gSprites[spriteId].callback = SpriteCB_HitAnimHealthoxEffect;
 }
 
@@ -1276,7 +1276,7 @@ void FreeBallGfx(u8 ballId)
 static u16 GetBankPokeballItemId(u8 bank)
 {
     if (GetBattlerSide(bank) == B_SIDE_PLAYER)
-        return GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
+        return GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_POKEBALL);
     else
-        return GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_POKEBALL);
+        return GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_POKEBALL);
 }
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index d4ccd5ca1..4e3364486 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -16,8 +16,8 @@ struct Unknown_020249B4
 
 extern u8 gAbsentBattlerFlags;
 extern u8 gActiveBattler;
-extern u8 gBattleAttacker;
-extern u8 gBattleDefender;
+extern u8 gBattleMoveAttacker;
+extern u8 gBattleMoveTarget;
 extern u8 gLastUsedAbility;
 extern u16 gTrainerBattleOpponent_A;
 extern u32 gBattleTypeFlags;
@@ -55,14 +55,14 @@ u8 CountAliveMonsInBattle(u8 caseId)
     case BATTLE_ALIVE_ATK_SIDE:
         for (i = 0; i < 4; i++)
         {
-            if (GetBattlerSide(i) == GetBattlerSide(gBattleAttacker) && !(gAbsentBattlerFlags & gBitTable[i]))
+            if (GetBattlerSide(i) == GetBattlerSide(gBattleMoveAttacker) && !(gAbsentBattlerFlags & gBitTable[i]))
                 retVal++;
         }
         break;
     case BATTLE_ALIVE_DEF_SIDE:
         for (i = 0; i < 4; i++)
         {
-            if (GetBattlerSide(i) == GetBattlerSide(gBattleDefender) && !(gAbsentBattlerFlags & gBitTable[i]))
+            if (GetBattlerSide(i) == GetBattlerSide(gBattleMoveTarget) && !(gAbsentBattlerFlags & gBitTable[i]))
                 retVal++;
         }
         break;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index d6413c455..e11afa91e 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -27,13 +27,13 @@ extern struct BattlePokemon gBattleMons[4];
 extern struct BattleEnigmaBerry gEnigmaBerries[4];
 extern u8 gActiveBattler;
 extern u8 gBankInMenu;
-extern u8 gBattleDefender;
-extern u8 gBattleAttacker;
+extern u8 gBattleMoveTarget;
+extern u8 gBattleMoveAttacker;
 extern u8 gStringBank;
 extern u16 gTrainerBattleOpponent_A;
 extern u32 gBattleTypeFlags;
 extern u8 gBattleMonForms[4];
-extern u16 gBattlePartyID[4];
+extern u16 gBattlerPartyIndexes[4];
 extern u8 gLastUsedAbility;
 extern u16 gPartnerTrainerId;
 extern u32 gHitMarker;
@@ -210,7 +210,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
 
 void sub_806CF24(s32 stat)
 {
-    gBattleDefender = gBankInMenu;
+    gBattleMoveTarget = gBankInMenu;
     StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_08329EC8[stat]]);
     StringCopy(gBattleTextBuff2, gText_StatRose);
     BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2);
@@ -247,7 +247,7 @@ u8 *sub_806CF78(u16 itemId)
             }
             else
             {
-                gBattleAttacker = gBankInMenu;
+                gBattleMoveAttacker = gBankInMenu;
                 BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnGettingPumped);
             }
         }
@@ -255,7 +255,7 @@ u8 *sub_806CF78(u16 itemId)
 
     if (itemEffect[3] & 0x80)
     {
-        gBattleAttacker = gBankInMenu;
+        gBattleMoveAttacker = gBankInMenu;
         BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnShroudedInMist);
     }
 
@@ -615,7 +615,7 @@ bool16 sub_806D82C(u8 id)
     return retVal;
 }
 
-s32 GetBankMultiplayerId(u16 a1)
+s32 GetBattlerMultiplayerId(u16 a1)
 {
     s32 id;
     for (id = 0; id < MAX_LINK_PLAYERS; id++)
@@ -1367,11 +1367,11 @@ void sub_806E994(void)
     gBattleTextBuff1[4] = B_BUFF_EOS;
 
     if (!GetBattlerSide(gBattleStruct->field_49))
-        gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[gBattleStruct->field_49]);
+        gBattleTextBuff1[3] = pokemon_order_func(gBattlerPartyIndexes[gBattleStruct->field_49]);
     else
-        gBattleTextBuff1[3] = gBattlePartyID[gBattleStruct->field_49];
+        gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->field_49];
 
-    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBankInMenu, pokemon_order_func(gBattlePartyID[gBankInMenu]))
+    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBankInMenu, pokemon_order_func(gBattlerPartyIndexes[gBankInMenu]))
 
     BattleStringExpandPlaceholders(gText_PkmnsXPreventsSwitching, gStringVar4);
 }
@@ -1478,7 +1478,7 @@ const u8 *GetTrainerPartnerName(void)
     else
     {
         u8 id = GetMultiplayerId();
-        return gLinkPlayers[GetBankMultiplayerId(gLinkPlayers[id].lp_field_18 ^ 2)].name;
+        return gLinkPlayers[GetBattlerMultiplayerId(gLinkPlayers[id].lp_field_18 ^ 2)].name;
     }
 }
 
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 2bd4e3ef9..02755fe40 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -16,7 +16,7 @@ struct UnkAnimStruct
     s16 field_8;
 };
 
-extern u16 gBattlePartyID[];
+extern u16 gBattlerPartyIndexes[];
 
 // this file's functions
 static void pokemonanimfunc_00(struct Sprite *sprite);
@@ -945,7 +945,7 @@ void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimSet)
     gTasks[taskId].tPtrHI = (u32)(sprite);
 
     bank = sprite->data[0];
-    nature = GetNature(&gPlayerParty[gBattlePartyID[bank]]);
+    nature = GetNature(&gPlayerParty[gBattlerPartyIndexes[bank]]);
 
     animId = 3 * backAnimSet + sBackAnimNatureModTable[nature];
     gTasks[taskId].tAnimId = sBackAnimationIds[animId];
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index cd54495fc..34611b509 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -27,7 +27,7 @@ extern u16 gTrainerBattleOpponent_B;
 extern u16 gPartnerTrainerId;
 extern u8 gActiveBattler;
 extern u8 gBattlersCount;
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_03001278;
@@ -200,7 +200,7 @@ void sub_8184E58(void)
     }
 }
 
-void RecordedBattle_SetBankAction(u8 bank, u8 action)
+void RecordedBattle_SetBattlerAction(u8 bank, u8 action)
 {
     if (sRecordedBytesNo[bank] < BANK_RECORD_SIZE && sUnknown_0203C7AC != 2)
     {
@@ -208,7 +208,7 @@ void RecordedBattle_SetBankAction(u8 bank, u8 action)
     }
 }
 
-void RecordedBattle_ClearBankAction(u8 bank, u8 bytesToClear)
+void RecordedBattle_ClearBattlerAction(u8 bank, u8 bytesToClear)
 {
     s32 i;
 
@@ -221,7 +221,7 @@ void RecordedBattle_ClearBankAction(u8 bank, u8 bytesToClear)
     }
 }
 
-u8 RecordedBattle_ReadBankAction(u8 bank)
+u8 RecordedBattle_GetBankAction(u8 bank)
 {
     // trying to read past array or invalid action byte, battle is over
     if (sRecordedBytesNo[bank] >= BANK_RECORD_SIZE || sBattleRecords[bank][sRecordedBytesNo[bank]] == 0xFF)
@@ -1536,14 +1536,14 @@ void sub_818603C(u8 arg0)
                 }
                 if (j != 4) // player's mon's move has been changed
                 {
-                    RecordedBattle_SetBankAction(bank, ACTION_MOVE_CHANGE);
+                    RecordedBattle_SetBattlerAction(bank, ACTION_MOVE_CHANGE);
                     for (j = 0; j < 4; j++)
                     {
                         for (k = 0; k < 4; k++)
                         {
                             if (gBattleMons[bank].moves[j] == sRecordedBattle_PlayerMonMoves[bank / 2][k])
                             {
-                                RecordedBattle_SetBankAction(bank, k);
+                                RecordedBattle_SetBattlerAction(bank, k);
                                 break;
                             }
                         }
@@ -1561,14 +1561,14 @@ void sub_818603C(u8 arg0)
                     u8 array3[8];
                     u8 var;
 
-                    RecordedBattle_ReadBankAction(bank);
+                    RecordedBattle_GetBankAction(bank);
                     for (j = 0; j < 4; j++)
                     {
                         ppBonuses[j] = ((gBattleMons[bank].ppBonuses & ((3 << (j << 1)))) >> (j << 1));
                     }
                     for (j = 0; j < 4; j++)
                     {
-                        array1[j] = RecordedBattle_ReadBankAction(bank);
+                        array1[j] = RecordedBattle_GetBankAction(bank);
                         movePp.moves[j] = gBattleMons[bank].moves[array1[j]];
                         movePp.pp[j] = gBattleMons[bank].pp[array1[j]];
                         array3[j] = ppBonuses[array1[j]];
@@ -1591,25 +1591,25 @@ void sub_818603C(u8 arg0)
                     {
                         for (j = 0; j < 4; j++)
                         {
-                            ppBonuses[j] = ((GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_PP_BONUSES, NULL) & ((3 << (j << 1)))) >> (j << 1));
+                            ppBonuses[j] = ((GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_PP_BONUSES, NULL) & ((3 << (j << 1)))) >> (j << 1));
                         }
                         for (j = 0; j < 4; j++)
                         {
-                            movePp.moves[j] = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_MOVE1 + array1[j], NULL);
-                            movePp.pp[j] = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_PP1 + array1[j], NULL);
+                            movePp.moves[j] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_MOVE1 + array1[j], NULL);
+                            movePp.pp[j] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_PP1 + array1[j], NULL);
                             array3[j] = ppBonuses[array1[j]];
                         }
                         for (j = 0; j < 4; j++)
                         {
-                            SetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_MOVE1 + j, &movePp.moves[j]);
-                            SetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_PP1 + j, &movePp.pp[j]);
+                            SetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_MOVE1 + j, &movePp.moves[j]);
+                            SetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_PP1 + j, &movePp.pp[j]);
                         }
                         var = 0;
                         for (j = 0; j < 4; j++)
                         {
                             var |= (array3[j]) << (j << 1);
                         }
-                        SetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_PP_BONUSES, &var);
+                        SetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_PP_BONUSES, &var);
                     }
 
                     gChosenMovesByBanks[bank] = gBattleMons[bank].moves[*(gBattleStruct->chosenMovePositions + bank)];
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 92a9c4074..c1e37a9ac 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -24,12 +24,12 @@ extern u16 gBattle_BG3_Y;
 extern u8 gReservedSpritePaletteCount;
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gBankInMenu;
-extern u16 gBattlePartyID[MAX_BATTLERS_COUNT];
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattlersCount;
 extern u32 gBattleTypeFlags;
-extern u8 gBankSpriteIds[MAX_BATTLERS_COUNT];
+extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u8 gHealthBoxesIds[MAX_BATTLERS_COUNT];
+extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 
 extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
@@ -38,11 +38,11 @@ extern void ScanlineEffect_Clear(void);
 extern void sub_8035658(void);
 extern bool8 IsDoubleBattle(void);
 extern u8 GetSubstituteSpriteDefault_Y(u8 bank);
-extern u8 GetBankSpriteDefault_Y(u8 bank);
+extern u8 GetBattlerSpriteDefault_Y(u8 bank);
 extern u8 sub_80A82E4(u8 bank);
 extern void sub_806A068(u16 species, u8 bankIdentity);
 extern void sub_806A12C(u16 backPicId, u8 bankIdentity);
-extern u8 GetBankCoord(u8 bank, u8 caseId);
+extern u8 GetBattlerSpriteCoord(u8 bank, u8 caseId);
 
 // this file's functions
 static void CB2_ReshowBattleScreenAfterMenu(void);
@@ -165,14 +165,14 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
             LoadAndCreateEnemyShadowSprites();
 
             opponentBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
-            species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
-            SetBankEnemyShadowSpriteCallback(opponentBank, species);
+            species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBank]], MON_DATA_SPECIES);
+            SetBattlerShadowSpriteCallback(opponentBank, species);
 
             if (IsDoubleBattle())
             {
                 opponentBank = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
-                species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
-                SetBankEnemyShadowSpriteCallback(opponentBank, species);
+                species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBank]], MON_DATA_SPECIES);
+                SetBattlerShadowSpriteCallback(opponentBank, species);
             }
 
             ActionSelectionCreateCursorAt(gActionSelectionCursor[gBankInMenu], 0);
@@ -215,7 +215,7 @@ static bool8 LoadBankSpriteGfx(u8 bank)
         if (GetBattlerSide(bank) != B_SIDE_PLAYER)
         {
             if (!gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
-                BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlePartyID[bank]], bank);
+                BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[bank]], bank);
             else
                 BattleLoadSubstituteOrMonSpriteGfx(bank, FALSE);
         }
@@ -224,7 +224,7 @@ static bool8 LoadBankSpriteGfx(u8 bank)
         else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
             DecompressTrainerBackPic(BACK_PIC_WALLY, bank);
         else if (!gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
-            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[bank]], bank);
+            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[bank]], bank);
         else
             BattleLoadSubstituteOrMonSpriteGfx(bank, FALSE);
 
@@ -252,62 +252,62 @@ static void CreateBankSprite(u8 bank)
         if (gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
             posY = GetSubstituteSpriteDefault_Y(bank);
         else
-            posY = GetBankSpriteDefault_Y(bank);
+            posY = GetBattlerSpriteDefault_Y(bank);
 
         if (GetBattlerSide(bank) != B_SIDE_PLAYER)
         {
-            if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+            if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
                 return;
 
-            sub_806A068(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankCoord(bank, 2), posY, sub_80A82E4(bank));
-            gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
-            gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBankSpriteIds[bank]].data[0] = bank;
-            gSprites[gBankSpriteIds[bank]].data[2] = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+            sub_806A068(GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
+            gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBattlerSpriteCoord(bank, 2), posY, sub_80A82E4(bank));
+            gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
+            gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
+            gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+            gSprites[gBattlerSpriteIds[bank]].data[2] = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
 
-            StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+            StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
             if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_CASTFORM)
-                gSprites[gBankSpriteIds[bank]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM];
+                gSprites[gBattlerSpriteIds[bank]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
         {
             sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(B_POSITION_PLAYER_LEFT));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, 0x50,
+            gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, 0x50,
                                                 (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80,
                                                  sub_80A82E4(0));
-            gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
-            gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBankSpriteIds[bank]].data[0] = bank;
+            gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
+            gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
+            gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
         {
             sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(0));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, 0x50,
+            gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, 0x50,
                                                 (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords) * 4 + 80,
                                                  sub_80A82E4(0));
-            gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
-            gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBankSpriteIds[bank]].data[0] = bank;
+            gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
+            gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
+            gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
         }
         else
         {
-            if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+            if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
                 return;
 
-            sub_806A068(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
-            gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBankCoord(bank, 2), posY, sub_80A82E4(bank));
-            gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
-            gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBankSpriteIds[bank]].data[0] = bank;
-            gSprites[gBankSpriteIds[bank]].data[2] = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+            sub_806A068(GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
+            gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBattlerSpriteCoord(bank, 2), posY, sub_80A82E4(bank));
+            gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
+            gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
+            gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+            gSprites[gBattlerSpriteIds[bank]].data[2] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
 
-            StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
+            StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
             if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_CASTFORM)
-                gSprites[gBankSpriteIds[bank]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM];
+                gSprites[gBattlerSpriteIds[bank]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM];
         }
 
-        gSprites[gBankSpriteIds[bank]].invisible = gBattleSpritesDataPtr->bankData[bank].invisible;
+        gSprites[gBattlerSpriteIds[bank]].invisible = gBattleSpritesDataPtr->bankData[bank].invisible;
     }
 }
 
@@ -322,32 +322,32 @@ static void CreateHealthboxSprite(u8 bank)
         else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
             return;
         else
-            healthboxSpriteId = CreateBankHealthboxSprites(bank);
+            healthboxSpriteId = CreateHealthboxSprites(bank);
 
-        gHealthBoxesIds[bank] = healthboxSpriteId;
-        SetBankHealthboxSpritePos(bank);
+        gHealthboxSpriteIds[bank] = healthboxSpriteId;
+        InitBattlerHealthboxCoords(bank);
         SetHealthboxSpriteVisible(healthboxSpriteId);
 
         if (GetBattlerSide(bank) != B_SIDE_PLAYER)
-            UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gEnemyParty[gBattlePartyID[bank]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[bank], &gEnemyParty[gBattlerPartyIndexes[bank]], HEALTHBOX_ALL);
         else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-            UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gPlayerParty[gBattlePartyID[bank]], HEALTHBOX_SAFARI_ALL_TEXT);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[bank], &gPlayerParty[gBattlerPartyIndexes[bank]], HEALTHBOX_SAFARI_ALL_TEXT);
         else
-            UpdateHealthboxAttribute(gHealthBoxesIds[bank], &gPlayerParty[gBattlePartyID[bank]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[bank], &gPlayerParty[gBattlerPartyIndexes[bank]], HEALTHBOX_ALL);
 
         if (GetBattlerPosition(bank) == B_POSITION_OPPONENT_RIGHT || GetBattlerPosition(bank) == B_POSITION_PLAYER_RIGHT)
-            DummyBattleInterfaceFunc(gHealthBoxesIds[bank], TRUE);
+            DummyBattleInterfaceFunc(gHealthboxSpriteIds[bank], TRUE);
         else
-            DummyBattleInterfaceFunc(gHealthBoxesIds[bank], FALSE);
+            DummyBattleInterfaceFunc(gHealthboxSpriteIds[bank], FALSE);
 
         if (GetBattlerSide(bank) != B_SIDE_PLAYER)
         {
-            if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+            if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
                 SetHealthboxSpriteInvisible(healthboxSpriteId);
         }
         else if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
         {
-            if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+            if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
                 SetHealthboxSpriteInvisible(healthboxSpriteId);
         }
     }
-- 
cgit v1.2.3


From aba388d3322806467a5ef1adb4e3159cf1793db1 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 6 Feb 2018 14:00:01 -0600
Subject: GetBattlerSpriteId -> GetAnimBattlerSpriteId

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

(limited to 'src')

diff --git a/src/battle_anim.c b/src/battle_anim.c
index f5de56610..ab9569dcf 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1751,7 +1751,7 @@ static void ScriptCmd_invisible(void)
 {
     u8 spriteId;
 
-    spriteId = GetBattlerSpriteId(sBattleAnimScriptPtr[1]);
+    spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
     if (spriteId != 0xFF)
         gSprites[spriteId].invisible = 1;
 
@@ -1762,7 +1762,7 @@ static void ScriptCmd_visible(void)
 {
     u8 spriteId;
 
-    spriteId = GetBattlerSpriteId(sBattleAnimScriptPtr[1]);
+    spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
     if (spriteId != 0xFF)
         gSprites[spriteId].invisible = 0;
 
@@ -1783,12 +1783,12 @@ static void ScriptCmd_doublebattle_2D(void)
         if (wantedBank == ANIM_ATTACKER)
         {
             r4 = sub_80A8364(gBattleAnimAttacker);
-            spriteId = GetBattlerSpriteId(ANIM_ATTACKER);
+            spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
         }
         else
         {
             r4 = sub_80A8364(gBattleAnimTarget);
-            spriteId = GetBattlerSpriteId(ANIM_TARGET);
+            spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         }
         if (spriteId != 0xFF)
         {
@@ -1818,12 +1818,12 @@ static void ScriptCmd_doublebattle_2E(void)
         if (wantedBank == ANIM_ATTACKER)
         {
             r4 = sub_80A8364(gBattleAnimAttacker);
-            spriteId = GetBattlerSpriteId(ANIM_ATTACKER);
+            spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
         }
         else
         {
             r4 = sub_80A8364(gBattleAnimTarget);
-            spriteId = GetBattlerSpriteId(ANIM_TARGET);
+            spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         }
 
         if (spriteId != 0xFF && r4 == 2)
-- 
cgit v1.2.3


From 97c9a4ec22a479c5a98226c9333e9bffcf1fd4e0 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 6 Feb 2018 14:35:23 -0600
Subject: Skip sub_819A080

---
 src/menu.c | 447 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 435 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/menu.c b/src/menu.c
index b5ff565fe..bcbc21a3b 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -11,6 +11,8 @@
 #include "malloc.h"
 #include "task.h"
 #include "dma3.h"
+#include "string_util.h"
+#include "pokemon_icon.h"
 
 struct SomeUnkStruct
 {
@@ -45,7 +47,7 @@ extern EWRAM_DATA u16 gUnknown_0203CDA8;
 extern EWRAM_DATA void *gUnknown_0203CDAC[0x20];
 
 const u16 gUnknown_0860F0B0[] = INCBIN_U16("graphics/interface/860F0B0.gbapal");
-const u8 gUnknown_0860F0D0[] = { 15, 1, 2 };
+const struct TextColor gUnknown_0860F0D0[] = { 15, 1, 2 };
 const struct SomeUnkStruct gUnknown_0860F0D4[] = 
 {
     { 12, 12, 0x00 },
@@ -78,6 +80,10 @@ const struct SomeUnkStruct gUnknown_0860F0D4[] =
 
 extern const u8 gText_SelectorArrow3[];
 extern const u8 gText_YesNo[];
+extern const u16 gFireRedMenuElements1_Pal[16];
+extern const u16 gFireRedMenuElements2_Pal[16];
+extern const u16 gFireRedMenuElements3_Pal[16];
+extern const u8 gFireRedMenuElements_Gfx[];
 
 extern void sub_8197BB4(u8, u8, u8, u8, u8, u8);
 extern void sub_8197E30(u8, u8, u8, u8, u8, u8);
@@ -85,7 +91,7 @@ extern void DrawWindowBorder(u8, u8, u8, u8, u8, u8);
 extern void sub_81980A8(u8, u8, u8, u8, u8, u8);
 extern u8 MoveMenuCursor(s8);
 extern u8 sub_8199134(s8, s8);
-extern void sub_8199F74(u8, u8, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8, u8);
+extern void sub_8199F74(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing);
 extern void sub_8198C78(void);
 extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
 
@@ -687,7 +693,7 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l
         printer.current_text_offset = strs[a8[i]].text;
         printer.y = (lineHeight * i) + top;
         printer.currentY = printer.y;
-        AddTextPrinter(&printer, 0xFF, 0);
+        AddTextPrinter(&printer, 0xFF, NULL);
     }
     
     CopyWindowToVram(windowId, 2);
@@ -744,7 +750,7 @@ void sub_8198AF8(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top
     printer.letterSpacing = GetFontAttribute(fontId, 2);
     printer.lineSpacing = GetFontAttribute(fontId, 3);
     
-    AddTextPrinter(&printer, 0xFF, 0);
+    AddTextPrinter(&printer, 0xFF, NULL);
     
     sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, 1), 2, initialCursorPos);
 }
@@ -811,7 +817,7 @@ void sub_8198DBC(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 itemCount, u
             printer.y = (GetFontAttribute(fontId, 1) * i) + top;
             printer.currentX = printer.x;
             printer.currentY = printer.y;
-            AddTextPrinter(&printer, 0xFF, 0);
+            AddTextPrinter(&printer, 0xFF, NULL);
         }
     }
     
@@ -1182,7 +1188,7 @@ void sub_81995E4(u8 windowId, u8 itemCount, const struct MenuAction *strs, const
         printer.current_text_offset = strs[a8[i]].text;
         printer.y = (i * 16) + 1;
         printer.currentY = (i * 16) + 1;
-        AddTextPrinter(&printer, 0xFF, 0);
+        AddTextPrinter(&printer, 0xFF, NULL);
     }
     
     CopyWindowToVram(windowId, 2);
@@ -1209,7 +1215,7 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 pa
     printer.letterSpacing = 0;
     printer.lineSpacing = 0;
     
-    AddTextPrinter(&printer, 0xFF, 0);
+    AddTextPrinter(&printer, 0xFF, NULL);
     InitMenuInUpperLeftCornerPlaySoundWhenAPressed(gUnknown_0203CD9F, 2, initialCursorPos);
 }
 
@@ -1251,7 +1257,7 @@ void sub_819983C(u8 windowId, u8 a4, u8 itemCount, u8 itemCount2, const struct M
             printer.y = (16 * i) + 1;
             printer.currentX = printer.x;
             printer.currentY = printer.y;
-            AddTextPrinter(&printer, 0xFF, 0);
+            AddTextPrinter(&printer, 0xFF, NULL);
         }
     }
     
@@ -1436,18 +1442,435 @@ void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette)
     }
 }
 
-void sub_8199CBC(u8 bgId, void *dest, u8 left, u8 top, u8 width, u8 height)
+void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height)
 {
     u8 i;
     u8 j;
-    u16 *ptr = GetBgTilemapBuffer(bgId);
-    u16 *destAsU16 = dest;
+    const u16 *src = GetBgTilemapBuffer(bgId);
     
     for (i = 0; i < height; i++)
     {
         for (j = 0; j < width; j++)
         {
-            destAsU16[(i * height) + j] = ptr[(i * height) + j];
+            dest[(i * width) + j] = src[(i + top) * 32 + j + left];
         }
     }
 }
+
+void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP)
+{
+    int i;
+    int area = width * height;
+    if (is8BPP == TRUE)
+    {
+        u8 *as8BPP = ptr;
+        for (i = 0; i < area; i++)
+        {
+            as8BPP[i] += delta;
+        }
+    }
+    else
+    {
+        u16 *as4BPP = ptr;
+        for (i = 0; i < area; i++)
+        {
+            as4BPP[i] = (as4BPP[i] & 0xFC00) | ((as4BPP[i] + delta) & 0x3FF);
+        }
+    }
+}
+
+void sub_8199D98(void)
+{
+    ChangeBgX(0, 0, 0);
+    ChangeBgX(1, 0, 0);
+    ChangeBgX(2, 0, 0);
+    ChangeBgX(3, 0, 0);
+    ChangeBgY(0, 0, 0);
+    ChangeBgY(1, 0, 0);
+    ChangeBgY(2, 0, 0);
+    ChangeBgY(3, 0, 0);
+}
+
+void sub_8199DF0(u32 bg, u8 a1, int a2, int a3)
+{
+    int temp = (!GetBgAttribute(bg, 4)) ? 0x20 : 0x40;
+    void *addr = (void *)((GetBgAttribute(bg, 1) * 0x4000) + (GetBgAttribute(bg, 10) + a2) * temp);
+    RequestDma3Fill(a1 << 24 | a1 << 16 | a1 << 8 | a1, addr + VRAM, a3 * temp, 1);
+}
+
+void box_print(u8 windowId, u8 fontId, u8 left, u8 top, const struct TextColor *color, s8 speed, const u8 *str)
+{
+    struct TextSubPrinter printer;
+    
+    printer.current_text_offset = str;
+    printer.windowId = windowId;
+    printer.fontId = fontId;
+    printer.x = left;
+    printer.y = top;
+    printer.currentX = printer.x;
+    printer.currentY = printer.y;
+    printer.letterSpacing = GetFontAttribute(fontId, 2);
+    printer.lineSpacing = GetFontAttribute(fontId, 3);
+    printer.fontColor_l = 0;
+    printer.fgColor = color->bgColor;
+    printer.bgColor = color->fgColor;
+    printer.shadowColor = color->shadowColor;
+    
+    AddTextPrinter(&printer, speed, NULL);
+}
+
+void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str)
+{
+    struct TextSubPrinter printer;
+    
+    printer.current_text_offset = str;
+    printer.windowId = windowId;
+    printer.fontId = fontId;
+    printer.x = left;
+    printer.y = top;
+    printer.currentX = printer.x;
+    printer.currentY = printer.y;
+    printer.letterSpacing = letterSpacing;
+    printer.lineSpacing = lineSpacing;
+    printer.fontColor_l = 0;
+    printer.fgColor = color->bgColor;
+    printer.bgColor = color->fgColor;
+    printer.shadowColor = color->shadowColor;
+    
+    AddTextPrinter(&printer, speed, NULL);
+}
+
+void sub_8199F74(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing)
+{
+    struct TextSubPrinter printer;
+    
+    printer.current_text_offset = str;
+    printer.windowId = windowId;
+    printer.fontId = fontId;
+    printer.x = left;
+    printer.y = top;
+    printer.currentX = left;
+    printer.currentY = top;
+    printer.letterSpacing = letterSpacing;
+    printer.lineSpacing = lineSpacing;
+    printer.fontColor_l = 0;
+    
+    printer.fgColor = GetFontAttribute(fontId, 5);
+    printer.bgColor = GetFontAttribute(fontId, 6);
+    printer.shadowColor = GetFontAttribute(fontId, 7);
+    
+    AddTextPrinter(&printer, speed, callback);
+}
+
+void sub_819A024(u8 windowId, const u8 *src, u16 a2, u16 a3)
+{
+    int count = 0;
+    while (gSaveBlock2Ptr->playerName[count] != EOS)
+        count++;
+    
+    StringExpandPlaceholders(gStringVar4, src);
+    
+    PrintTextOnWindow(windowId, 1, gStringVar4, a2, a3, 0xFF, 0);
+}
+
+//Screw this function, it's long and unreferenced and ugh
+/*void sub_819A080(u16 *a0, u16 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
+{
+    int v1 = ((a0[2] - a4) > a6) ? (a6 + a2) : (a0[2] - a4);
+    int v2;
+    
+    if (a0[3] - a5 < a7)
+        v2 = a3 + a0[3] - a5;
+    else
+        v2 = a3 + a7;
+    
+    
+}*/
+
+__attribute__((naked))
+void sub_819A080(u16 *a0, u16 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
+{
+	asm("push {r4-r7,lr}\n\
+	mov r7, r10\n\
+	mov r6, r9\n\
+	mov r5, r8\n\
+	push {r5-r7}\n\
+	sub sp, #0x28\n\
+	str r0, [sp]\n\
+	str r1, [sp, #0x4]\n\
+	ldr r0, [sp, #0x48]\n\
+	ldr r4, [sp, #0x4C]\n\
+	ldr r1, [sp, #0x50]\n\
+	ldr r5, [sp, #0x54]\n\
+	lsl r2, #16\n\
+	lsr r2, #16\n\
+	str r2, [sp, #0x8]\n\
+	lsl r3, #16\n\
+	lsr r3, #16\n\
+	lsl r0, #16\n\
+	lsr r0, #16\n\
+	str r0, [sp, #0xC]\n\
+	lsl r4, #16\n\
+	lsr r4, #16\n\
+	lsl r1, #16\n\
+	lsr r1, #16\n\
+	lsl r5, #16\n\
+	lsr r5, #16\n\
+	ldr r2, [sp, #0x4]\n\
+	ldrh r0, [r2, #0x4]\n\
+	ldr r2, [sp, #0xC]\n\
+	sub r0, r2\n\
+	ldr r2, [sp, #0x8]\n\
+	add r2, r1, r2\n\
+	str r2, [sp, #0x10]\n\
+	cmp r0, r1\n\
+	bge _0819A0CC\n\
+	ldr r1, [sp, #0x8]\n\
+	add r0, r1\n\
+	str r0, [sp, #0x10]\n\
+_0819A0CC:\n\
+	ldr r2, [sp, #0x4]\n\
+	ldrh r1, [r2, #0x6]\n\
+	sub r0, r1, r4\n\
+	cmp r0, r5\n\
+	bge _0819A0DE\n\
+	add r0, r3, r1\n\
+	sub r0, r4\n\
+	str r0, [sp, #0x14]\n\
+	b _0819A0E2\n\
+_0819A0DE:\n\
+	add r5, r3, r5\n\
+	str r5, [sp, #0x14]\n\
+_0819A0E2:\n\
+	ldr r0, [sp]\n\
+	ldrh r1, [r0, #0x4]\n\
+	mov r2, #0x7\n\
+	add r0, r1, #0\n\
+	and r0, r2\n\
+	add r1, r0\n\
+	asr r1, #3\n\
+	str r1, [sp, #0x18]\n\
+	ldr r0, [sp, #0x4]\n\
+	ldrh r1, [r0, #0x4]\n\
+	add r0, r1, #0\n\
+	and r0, r2\n\
+	add r1, r0\n\
+	asr r1, #3\n\
+	str r1, [sp, #0x1C]\n\
+	mov r12, r3\n\
+	mov r8, r4\n\
+	ldr r1, [sp, #0x14]\n\
+	cmp r12, r1\n\
+	blt _0819A10C\n\
+	b _0819A24A\n\
+_0819A10C:\n\
+	ldr r5, [sp, #0x8]\n\
+	ldr r6, [sp, #0xC]\n\
+	mov r2, r12\n\
+	add r2, #0x1\n\
+	str r2, [sp, #0x20]\n\
+	mov r0, r8\n\
+	add r0, #0x1\n\
+	str r0, [sp, #0x24]\n\
+	ldr r1, [sp, #0x10]\n\
+	cmp r5, r1\n\
+	blt _0819A124\n\
+	b _0819A23A\n\
+_0819A124:\n\
+	mov r7, #0x1\n\
+	mov r2, #0xF0\n\
+	mov r10, r2\n\
+	mov r0, #0xF\n\
+	mov r9, r0\n\
+_0819A12E:\n\
+	asr r0, r5, #1\n\
+	mov r1, #0x3\n\
+	and r0, r1\n\
+	ldr r2, [sp]\n\
+	ldr r1, [r2]\n\
+	add r1, r0\n\
+	asr r0, r5, #3\n\
+	lsl r0, #5\n\
+	add r1, r0\n\
+	mov r2, r12\n\
+	asr r0, r2, #3\n\
+	ldr r2, [sp, #0x18]\n\
+	mul r0, r2\n\
+	lsl r0, #5\n\
+	add r1, r0\n\
+	mov r2, r12\n\
+	lsl r0, r2, #29\n\
+	lsr r0, #27\n\
+	add r3, r1, r0\n\
+	asr r0, r6, #1\n\
+	mov r1, #0x3\n\
+	and r0, r1\n\
+	ldr r2, [sp, #0x4]\n\
+	ldr r1, [r2]\n\
+	add r1, r0\n\
+	asr r0, r6, #3\n\
+	lsl r0, #5\n\
+	add r1, r0\n\
+	mov r2, r8\n\
+	asr r0, r2, #3\n\
+	ldr r2, [sp, #0x1C]\n\
+	mul r0, r2\n\
+	lsl r0, #5\n\
+	add r1, r0\n\
+	mov r2, r8\n\
+	lsl r0, r2, #29\n\
+	lsr r0, #27\n\
+	add r4, r1, r0\n\
+	add r0, r4, #0\n\
+	and r0, r7\n\
+	cmp r0, #0\n\
+	beq _0819A1DA\n\
+	sub r4, #0x1\n\
+	add r0, r6, #0\n\
+	and r0, r7\n\
+	cmp r0, #0\n\
+	beq _0819A1B2\n\
+	ldrh r0, [r4]\n\
+	ldr r2, =0x00000fff\n\
+	and r2, r0\n\
+	add r0, r5, #0\n\
+	and r0, r7\n\
+	cmp r0, #0\n\
+	beq _0819A1A8\n\
+	ldrb r1, [r3]\n\
+	mov r0, r10\n\
+	and r0, r1\n\
+	lsl r0, #8\n\
+	b _0819A22A\n\
+	.pool\n\
+_0819A1A8:\n\
+	ldrb r1, [r3]\n\
+	mov r0, r9\n\
+	and r0, r1\n\
+	lsl r0, #12\n\
+	b _0819A22A\n\
+_0819A1B2:\n\
+	ldrh r0, [r4]\n\
+	ldr r2, =0x0000f0ff\n\
+	and r2, r0\n\
+	add r0, r5, #0\n\
+	and r0, r7\n\
+	cmp r0, #0\n\
+	beq _0819A1D0\n\
+	ldrb r1, [r3]\n\
+	mov r0, r10\n\
+	and r0, r1\n\
+	lsl r0, #4\n\
+	b _0819A22A\n\
+	.pool\n\
+_0819A1D0:\n\
+	ldrb r1, [r3]\n\
+	mov r0, r9\n\
+	and r0, r1\n\
+	lsl r0, #8\n\
+	b _0819A22A\n\
+_0819A1DA:\n\
+	add r0, r6, #0\n\
+	and r0, r7\n\
+	cmp r0, #0\n\
+	beq _0819A206\n\
+	ldrh r0, [r4]\n\
+	ldr r2, =0x0000ff0f\n\
+	and r2, r0\n\
+	add r0, r5, #0\n\
+	and r0, r7\n\
+	cmp r0, #0\n\
+	beq _0819A1FC\n\
+	ldrb r1, [r3]\n\
+	mov r0, r10\n\
+	b _0819A228\n\
+	.pool\n\
+_0819A1FC:\n\
+	ldrb r1, [r3]\n\
+	mov r0, r9\n\
+	and r0, r1\n\
+	lsl r0, #4\n\
+	b _0819A22A\n\
+_0819A206:\n\
+	ldrh r0, [r4]\n\
+	ldr r2, =0x0000fff0\n\
+	and r2, r0\n\
+	add r0, r5, #0\n\
+	and r0, r7\n\
+	cmp r0, #0\n\
+	beq _0819A224\n\
+	ldrb r1, [r3]\n\
+	mov r0, r10\n\
+	and r0, r1\n\
+	lsr r0, #4\n\
+	b _0819A22A\n\
+	.pool\n\
+_0819A224:\n\
+	ldrb r1, [r3]\n\
+	mov r0, r9\n\
+_0819A228:\n\
+	and r0, r1\n\
+_0819A22A:\n\
+	orr r2, r0\n\
+	strh r2, [r4]\n\
+	add r5, #0x1\n\
+	add r6, #0x1\n\
+	ldr r0, [sp, #0x10]\n\
+	cmp r5, r0\n\
+	bge _0819A23A\n\
+	b _0819A12E\n\
+_0819A23A:\n\
+	ldr r1, [sp, #0x20]\n\
+	mov r12, r1\n\
+	ldr r2, [sp, #0x24]\n\
+	mov r8, r2\n\
+	ldr r0, [sp, #0x14]\n\
+	cmp r12, r0\n\
+	bge _0819A24A\n\
+	b _0819A10C\n\
+_0819A24A:\n\
+	add sp, #0x28\n\
+	pop {r3-r5}\n\
+	mov r8, r3\n\
+	mov r9, r4\n\
+	mov r10, r5\n\
+	pop {r4-r7}\n\
+	pop {r0}\n\
+	bx r0\n");
+}
+
+void sub_819A25C(u8 palOffset, u16 speciesId)
+{
+    LoadPalette(GetValidMonIconPalettePtr(speciesId), palOffset, 0x20);
+}
+
+void sub_819A27C(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y)
+{
+    BlitBitmapToWindow(windowId, GetMonIconPtr(speciesId, personality, 1), x, y, 32, 32);
+}
+
+void sub_819A2BC(u8 palOffset, u8 palId)
+{
+    const u16 *palette;
+    
+    switch (palId)
+    {
+        case 0:
+        default:
+            palette = gFireRedMenuElements1_Pal;
+            break;
+        case 1:
+            palette = gFireRedMenuElements2_Pal;
+            break;
+        case 2:
+            palette = gFireRedMenuElements3_Pal;
+            break;
+    }
+    
+    LoadPalette(palette, palOffset, 0x20);
+}
+
+void blit_move_info_icon(u8 windowId, u8 iconId, u16 x, u16 y)
+{
+    BlitBitmapRectToWindow(windowId, gFireRedMenuElements_Gfx + gUnknown_0860F0D4[iconId].unk3 * 32, 0, 0, 128, 128, x, y, gUnknown_0860F0D4[iconId].unk1, gUnknown_0860F0D4[iconId].unk2);
+}
-- 
cgit v1.2.3


From 08516ae12ce1f1c6f8d906eed41a0f27991e704d Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 6 Feb 2018 16:29:12 -0500
Subject: take a sharp knife and jam it into sub_819A080

---
 src/menu.c | 244 +++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 155 insertions(+), 89 deletions(-)

(limited to 'src')

diff --git a/src/menu.c b/src/menu.c
index bcbc21a3b..675cc6c19 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -48,7 +48,7 @@ extern EWRAM_DATA void *gUnknown_0203CDAC[0x20];
 
 const u16 gUnknown_0860F0B0[] = INCBIN_U16("graphics/interface/860F0B0.gbapal");
 const struct TextColor gUnknown_0860F0D0[] = { 15, 1, 2 };
-const struct SomeUnkStruct gUnknown_0860F0D4[] = 
+const struct SomeUnkStruct gUnknown_0860F0D4[] =
 {
     { 12, 12, 0x00 },
     { 32, 12, 0x20 },
@@ -339,26 +339,26 @@ u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile)
 {
     struct WindowTemplate window;
     memset(&window, 0, sizeof(window));
-    
+
     if (bg > 3)
         window.priority = 0;
     else
         window.priority = bg;
-    
+
     window.tilemapTop = yPos;
     window.height = 2;
     window.tilemapLeft = 0x1E - xPos;
     window.width = xPos;
     window.paletteNum = palette;
     window.baseBlock = baseTile;
-    
+
     gUnknown_0203CDA0 = AddWindow(&window);
-    
+
     if (palette > 15)
         palette = 15 * 16;
     else
         palette *= 16;
-    
+
     LoadPalette(gUnknown_0860F0B0, palette, sizeof(gUnknown_0860F0B0));
     return gUnknown_0203CDA0;
 }
@@ -366,7 +366,7 @@ u8 sub_81980F0(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile)
 void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram)
 {
     u16 width = 0;
-    
+
     if (gUnknown_0203CDA0 != 0xFF)
     {
         PutWindowTilemap(gUnknown_0203CDA0);
@@ -388,7 +388,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo
 {
     struct TextColor color;
     u16 width = 0;
-    
+
     if (gUnknown_0203CDA0 != 0xFF)
     {
         if (a3 != 0)
@@ -452,7 +452,7 @@ void sub_8198314(void)
 u8 sub_8198348(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos, u8 a7)
 {
     s32 pos;
-    
+
     gUnknown_0203CD90.left = left;
     gUnknown_0203CD90.top = top;
     gUnknown_0203CD90.minCursorPos = 0;
@@ -461,14 +461,14 @@ u8 sub_8198348(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numC
     gUnknown_0203CD90.fontId = fontId;
     gUnknown_0203CD90.optionHeight = cursorHeight;
     gUnknown_0203CD90.APressMuted = a7;
-    
+
     pos = initialCursorPos;
-    
+
     if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
         gUnknown_0203CD90.cursorPos = 0;
     else
         gUnknown_0203CD90.cursorPos = pos;
-    
+
     MoveMenuCursor(0);
     return gUnknown_0203CD90.cursorPos;
 }
@@ -487,7 +487,7 @@ u8 sub_81983EC(u8 windowId, u8 fontId, u8 left, u8 top, u8 numChoices, u8 initia
 void RedrawMenuCursor(u8 oldPos, u8 newPos)
 {
     u8 width, height;
-    
+
     width = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 0);
     height = GetMenuCursorDimensionByFont(gUnknown_0203CD90.fontId, 1);
     FillWindowPixelRect(gUnknown_0203CD90.windowId, 0x11, gUnknown_0203CD90.left, gUnknown_0203CD90.optionHeight * oldPos + gUnknown_0203CD90.top, width, height);
@@ -498,14 +498,14 @@ u8 MoveMenuCursor(s8 cursorDelta)
 {
     u8 oldPos = gUnknown_0203CD90.cursorPos;
     int newPos = gUnknown_0203CD90.cursorPos + cursorDelta;
-    
+
     if (newPos < gUnknown_0203CD90.minCursorPos)
         gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.maxCursorPos;
     else if (newPos > gUnknown_0203CD90.maxCursorPos)
         gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.minCursorPos;
     else
         gUnknown_0203CD90.cursorPos += cursorDelta;
-    
+
     RedrawMenuCursor(oldPos, gUnknown_0203CD90.cursorPos);
     return gUnknown_0203CD90.cursorPos;
 }
@@ -514,14 +514,14 @@ u8 MoveMenuCursorNoWrapAround(s8 cursorDelta)
 {
     u8 oldPos = gUnknown_0203CD90.cursorPos;
     int newPos = gUnknown_0203CD90.cursorPos + cursorDelta;
-    
+
     if (newPos < gUnknown_0203CD90.minCursorPos)
         gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.minCursorPos;
     else if (newPos > gUnknown_0203CD90.maxCursorPos)
         gUnknown_0203CD90.cursorPos = gUnknown_0203CD90.maxCursorPos;
     else
         gUnknown_0203CD90.cursorPos += cursorDelta;
-    
+
     RedrawMenuCursor(oldPos, gUnknown_0203CD90.cursorPos);
     return gUnknown_0203CD90.cursorPos;
 }
@@ -562,7 +562,7 @@ s8 ProcessMenuInput(void)
 s8 ProcessMenuInputNoWrapAround(void)
 {
     u8 oldPos = gUnknown_0203CD90.cursorPos;
-    
+
     if (gMain.newKeys & A_BUTTON)
     {
         if (!gUnknown_0203CD90.APressMuted)
@@ -620,7 +620,7 @@ s8 ProcessMenuInput_other(void)
 s8 ProcessMenuInputNoWrapAround_other(void)
 {
     u8 oldPos = gUnknown_0203CD90.cursorPos;
-    
+
     if (gMain.newKeys & A_BUTTON)
     {
         if (!gUnknown_0203CD90.APressMuted)
@@ -676,7 +676,7 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l
 {
     u8 i;
     struct TextSubPrinter printer;
-    
+
     printer.windowId = windowId;
     printer.fontId = fontId;
     printer.fgColor = GetFontAttribute(fontId, 5);
@@ -687,7 +687,7 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l
     printer.lineSpacing = GetFontAttribute(fontId, 3);
     printer.x = left;
     printer.currentX = left;
-    
+
     for (i = 0; i < itemCount; i++)
     {
         printer.current_text_offset = strs[a8[i]].text;
@@ -695,7 +695,7 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l
         printer.currentY = printer.y;
         AddTextPrinter(&printer, 0xFF, NULL);
     }
-    
+
     CopyWindowToVram(windowId, 2);
 }
 
@@ -732,10 +732,10 @@ u16 sub_8198AA4(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16
 void sub_8198AF8(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16 baseTileNum, u8 paletteNum, u8 initialCursorPos)
 {
     struct TextSubPrinter printer;
-    
+
     gUnknown_0203CD9F = AddWindow(window);
     SetWindowBorderStyle(gUnknown_0203CD9F, TRUE, baseTileNum, paletteNum);
-    
+
     printer.current_text_offset = gText_YesNo;
     printer.windowId = gUnknown_0203CD9F;
     printer.fontId = fontId;
@@ -749,9 +749,9 @@ void sub_8198AF8(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top
     printer.fontColor_l = GetFontAttribute(fontId, 4);
     printer.letterSpacing = GetFontAttribute(fontId, 2);
     printer.lineSpacing = GetFontAttribute(fontId, 3);
-    
+
     AddTextPrinter(&printer, 0xFF, NULL);
-    
+
     sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, 1), 2, initialCursorPos);
 }
 
@@ -798,7 +798,7 @@ void sub_8198DBC(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 itemCount, u
     u8 i;
     u8 j;
     struct TextSubPrinter printer;
-    
+
     printer.windowId = windowId;
     printer.fontId = fontId;
     printer.fgColor = GetFontAttribute(fontId, 5);
@@ -807,7 +807,7 @@ void sub_8198DBC(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 itemCount, u
     printer.fontColor_l = GetFontAttribute(fontId, 4);
     printer.letterSpacing = GetFontAttribute(fontId, 2);
     printer.lineSpacing = GetFontAttribute(fontId, 3);
-    
+
     for (i = 0; i < itemCount2; i++)
     {
         for (j = 0; j < itemCount; j++)
@@ -820,7 +820,7 @@ void sub_8198DBC(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 itemCount, u
             AddTextPrinter(&printer, 0xFF, NULL);
         }
     }
-    
+
     CopyWindowToVram(windowId, 2);
 }
 
@@ -832,7 +832,7 @@ void sub_8198EF8(u8 windowId, u8 fontId, u8 a2, u8 a3, u8 a4, u8 a5, const struc
 u8 sub_8198F58(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 cursorHeight, u8 a6, u8 a7, u8 numChoices, u8 a9)
 {
     s32 pos;
-    
+
     gUnknown_0203CD90.left = left;
     gUnknown_0203CD90.top = top;
     gUnknown_0203CD90.minCursorPos = 0;
@@ -843,14 +843,14 @@ u8 sub_8198F58(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 cursorHeight,
     gUnknown_0203CD90.optionHeight = cursorHeight;
     gUnknown_0203CD90.horizontalCount = a6;
     gUnknown_0203CD90.verticalCount = a7;
-    
+
     pos = a9;
-    
+
     if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
         gUnknown_0203CD90.cursorPos = 0;
     else
         gUnknown_0203CD90.cursorPos = pos;
-    
+
     sub_8199134(0, 0);
     return gUnknown_0203CD90.cursorPos;
 }
@@ -888,7 +888,7 @@ void sub_8199060(u8 oldCursorPos, u8 newCursorPos)
 u8 sub_8199134(s8 deltaX, s8 deltaY)
 {
     u8 oldPos = gUnknown_0203CD90.cursorPos;
-    
+
     if (deltaX != 0)
     {
         if ((gUnknown_0203CD90.cursorPos % gUnknown_0203CD90.horizontalCount) + deltaX < 0)
@@ -904,7 +904,7 @@ u8 sub_8199134(s8 deltaX, s8 deltaY)
             gUnknown_0203CD90.cursorPos += deltaX;
         }
     }
-    
+
     if (deltaY != 0)
     {
         if ((gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) + deltaY < 0)
@@ -920,7 +920,7 @@ u8 sub_8199134(s8 deltaX, s8 deltaY)
             gUnknown_0203CD90.cursorPos += (gUnknown_0203CD90.horizontalCount * deltaY);
         }
     }
-    
+
     if (gUnknown_0203CD90.cursorPos > gUnknown_0203CD90.maxCursorPos)
     {
         gUnknown_0203CD90.cursorPos = oldPos;
@@ -936,7 +936,7 @@ u8 sub_8199134(s8 deltaX, s8 deltaY)
 u8 sub_81991F8(s8 deltaX, s8 deltaY)
 {
     u8 oldPos = gUnknown_0203CD90.cursorPos;
-    
+
     if (deltaX != 0)
     {
         if (((gUnknown_0203CD90.cursorPos % gUnknown_0203CD90.horizontalCount) + deltaX >= 0) &&
@@ -945,7 +945,7 @@ u8 sub_81991F8(s8 deltaX, s8 deltaY)
             gUnknown_0203CD90.cursorPos += deltaX;
         }
     }
-    
+
     if (deltaY != 0)
     {
         if (((gUnknown_0203CD90.cursorPos / gUnknown_0203CD90.horizontalCount) + deltaY >= 0) &&
@@ -954,7 +954,7 @@ u8 sub_81991F8(s8 deltaX, s8 deltaY)
             gUnknown_0203CD90.cursorPos += (gUnknown_0203CD90.horizontalCount * deltaY);
         }
     }
-    
+
     if (gUnknown_0203CD90.cursorPos > gUnknown_0203CD90.maxCursorPos)
     {
         gUnknown_0203CD90.cursorPos = oldPos;
@@ -1009,7 +1009,7 @@ s8 sub_8199284(void)
 s8 sub_8199334(void)
 {
     u8 oldPos = gUnknown_0203CD90.cursorPos;
-    
+
     if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
@@ -1089,7 +1089,7 @@ s8 sub_81993D8(void)
 s8 sub_8199484(void)
 {
     u8 oldPos = gUnknown_0203CD90.cursorPos;
-    
+
     if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
@@ -1130,7 +1130,7 @@ s8 sub_8199484(void)
 u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted)
 {
     s32 pos;
-    
+
     gUnknown_0203CD90.left = 0;
     gUnknown_0203CD90.top = 1;
     gUnknown_0203CD90.minCursorPos = 0;
@@ -1139,14 +1139,14 @@ u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, boo
     gUnknown_0203CD90.fontId = 1;
     gUnknown_0203CD90.optionHeight = 16;
     gUnknown_0203CD90.APressMuted = APressMuted;
-    
+
     pos = initialCursorPos;
-    
+
     if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
         gUnknown_0203CD90.cursorPos = 0;
     else
         gUnknown_0203CD90.cursorPos = pos;
-    
+
     return MoveMenuCursor(0);
 }
 
@@ -1158,12 +1158,12 @@ u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 itemCount, u8
 void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs)
 {
     u32 i;
-    
+
     for (i = 0; i < itemCount; i++)
     {
         PrintTextOnWindow(windowId, 1, strs[i].text, 8, (i * 16) + 1, 0xFF, NULL);
     }
-    
+
     CopyWindowToVram(windowId, 2);
 }
 
@@ -1171,7 +1171,7 @@ void sub_81995E4(u8 windowId, u8 itemCount, const struct MenuAction *strs, const
 {
     u8 i;
     struct TextSubPrinter printer;
-    
+
     printer.windowId = windowId;
     printer.fontId = 1;
     printer.fgColor = GetFontAttribute(1, 5);
@@ -1182,7 +1182,7 @@ void sub_81995E4(u8 windowId, u8 itemCount, const struct MenuAction *strs, const
     printer.lineSpacing = 0;
     printer.x = 8;
     printer.currentX = 8;
-    
+
     for (i = 0; i < itemCount; i++)
     {
         printer.current_text_offset = strs[a8[i]].text;
@@ -1190,17 +1190,17 @@ void sub_81995E4(u8 windowId, u8 itemCount, const struct MenuAction *strs, const
         printer.currentY = (i * 16) + 1;
         AddTextPrinter(&printer, 0xFF, NULL);
     }
-    
+
     CopyWindowToVram(windowId, 2);
 }
 
 void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 paletteNum, u8 initialCursorPos)
 {
     struct TextSubPrinter printer;
-    
+
     gUnknown_0203CD9F = AddWindow(window);
     SetWindowBorderStyle(gUnknown_0203CD9F, TRUE, baseTileNum, paletteNum);
-    
+
     printer.current_text_offset = gText_YesNo;
     printer.windowId = gUnknown_0203CD9F;
     printer.fontId = 1;
@@ -1214,7 +1214,7 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 pa
     printer.fontColor_l = GetFontAttribute(1, 4);
     printer.letterSpacing = 0;
     printer.lineSpacing = 0;
-    
+
     AddTextPrinter(&printer, 0xFF, NULL);
     InitMenuInUpperLeftCornerPlaySoundWhenAPressed(gUnknown_0203CD9F, 2, initialCursorPos);
 }
@@ -1238,7 +1238,7 @@ void sub_819983C(u8 windowId, u8 a4, u8 itemCount, u8 itemCount2, const struct M
     u8 i;
     u8 j;
     struct TextSubPrinter printer;
-    
+
     printer.windowId = windowId;
     printer.fontId = 1;
     printer.fgColor = GetFontAttribute(1, 5);
@@ -1247,7 +1247,7 @@ void sub_819983C(u8 windowId, u8 a4, u8 itemCount, u8 itemCount2, const struct M
     printer.fontColor_l = GetFontAttribute(1, 4);
     printer.letterSpacing = 0;
     printer.lineSpacing = 0;
-    
+
     for (i = 0; i < itemCount2; i++)
     {
         for (j = 0; j < itemCount; j++)
@@ -1260,14 +1260,14 @@ void sub_819983C(u8 windowId, u8 a4, u8 itemCount, u8 itemCount2, const struct M
             AddTextPrinter(&printer, 0xFF, NULL);
         }
     }
-    
+
     CopyWindowToVram(windowId, 2);
 }
 
 u8 sub_8199944(u8 windowId, u8 optionWidth, u8 horizontalCount, u8 verticalCount, u8 initialCursorPos)
 {
     s32 pos;
-    
+
     gUnknown_0203CD90.left = 0;
     gUnknown_0203CD90.top = 1;
     gUnknown_0203CD90.minCursorPos = 0;
@@ -1278,14 +1278,14 @@ u8 sub_8199944(u8 windowId, u8 optionWidth, u8 horizontalCount, u8 verticalCount
     gUnknown_0203CD90.optionHeight = 16;
     gUnknown_0203CD90.horizontalCount = horizontalCount;
     gUnknown_0203CD90.verticalCount = verticalCount;
-    
+
     pos = initialCursorPos;
-    
+
     if (pos < 0 || pos > gUnknown_0203CD90.maxCursorPos)
         gUnknown_0203CD90.cursorPos = 0;
     else
         gUnknown_0203CD90.cursorPos = pos;
-    
+
     sub_8199134(0, 0);
     return gUnknown_0203CD90.cursorPos;
 }
@@ -1337,7 +1337,7 @@ void reset_temp_tile_data_buffers(void)
 bool8 free_temp_tile_data_buffers_if_possible(void)
 {
     int i;
-    
+
     if (!IsDma3ManagerBusyWithBgCopy())
     {
         if (gUnknown_0203CDA8)
@@ -1402,12 +1402,12 @@ void *malloc_and_decompress(const void *src, int *size)
     void *ptr;
     u8 *sizeAsBytes = (u8 *)size;
     u8 *srcAsBytes = (u8 *)src;
-    
+
     sizeAsBytes[0] = srcAsBytes[1];
     sizeAsBytes[1] = srcAsBytes[2];
     sizeAsBytes[2] = srcAsBytes[3];
     sizeAsBytes[3] = 0;
-    
+
     ptr = Alloc(*size);
     if (ptr)
         LZ77UnCompWram(src, ptr);
@@ -1432,7 +1432,7 @@ void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette)
     u8 i;
     u8 j;
     u16 *ptr = GetBgTilemapBuffer(bgId);
-    
+
     for (i = top; i < top + height; i++)
     {
         for (j = left; j < left + width; j++)
@@ -1447,7 +1447,7 @@ void sub_8199CBC(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height)
     u8 i;
     u8 j;
     const u16 *src = GetBgTilemapBuffer(bgId);
-    
+
     for (i = 0; i < height; i++)
     {
         for (j = 0; j < width; j++)
@@ -1501,7 +1501,7 @@ void sub_8199DF0(u32 bg, u8 a1, int a2, int a3)
 void box_print(u8 windowId, u8 fontId, u8 left, u8 top, const struct TextColor *color, s8 speed, const u8 *str)
 {
     struct TextSubPrinter printer;
-    
+
     printer.current_text_offset = str;
     printer.windowId = windowId;
     printer.fontId = fontId;
@@ -1515,14 +1515,14 @@ void box_print(u8 windowId, u8 fontId, u8 left, u8 top, const struct TextColor *
     printer.fgColor = color->bgColor;
     printer.bgColor = color->fgColor;
     printer.shadowColor = color->shadowColor;
-    
+
     AddTextPrinter(&printer, speed, NULL);
 }
 
 void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str)
 {
     struct TextSubPrinter printer;
-    
+
     printer.current_text_offset = str;
     printer.windowId = windowId;
     printer.fontId = fontId;
@@ -1536,14 +1536,14 @@ void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 left, u8 top, u8 le
     printer.fgColor = color->bgColor;
     printer.bgColor = color->fgColor;
     printer.shadowColor = color->shadowColor;
-    
+
     AddTextPrinter(&printer, speed, NULL);
 }
 
 void sub_8199F74(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing)
 {
     struct TextSubPrinter printer;
-    
+
     printer.current_text_offset = str;
     printer.windowId = windowId;
     printer.fontId = fontId;
@@ -1554,11 +1554,11 @@ void sub_8199F74(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 spee
     printer.letterSpacing = letterSpacing;
     printer.lineSpacing = lineSpacing;
     printer.fontColor_l = 0;
-    
+
     printer.fgColor = GetFontAttribute(fontId, 5);
     printer.bgColor = GetFontAttribute(fontId, 6);
     printer.shadowColor = GetFontAttribute(fontId, 7);
-    
+
     AddTextPrinter(&printer, speed, callback);
 }
 
@@ -1567,28 +1567,93 @@ void sub_819A024(u8 windowId, const u8 *src, u16 a2, u16 a3)
     int count = 0;
     while (gSaveBlock2Ptr->playerName[count] != EOS)
         count++;
-    
+
     StringExpandPlaceholders(gStringVar4, src);
-    
+
     PrintTextOnWindow(windowId, 1, gStringVar4, a2, a3, 0xFF, 0);
 }
 
 //Screw this function, it's long and unreferenced and ugh
-/*void sub_819A080(u16 *a0, u16 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
-{
-    int v1 = ((a0[2] - a4) > a6) ? (a6 + a2) : (a0[2] - a4);
-    int v2;
-    
-    if (a0[3] - a5 < a7)
-        v2 = a3 + a0[3] - a5;
-    else
-        v2 = a3 + a7;
-    
-    
-}*/
 
+struct UnkStruct_819A080 {
+    u8 *unk00;
+    u16 unk04;
+    u16 unk06;
+};
+
+#ifdef NONMATCHING
+void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
+{
+    // r3 = a3
+    // r4 = a5
+    // r1 = a6
+    // r5 = a7
+    // sp+00 = a0
+    // sp+04 = a1
+    // sp+08 = a2
+    // sp+0c = a4
+    int sp10 = a1->unk04 - a4 > a6 ? a6 + a2 : a1->unk04 - a4;
+    int sp14 = a0->unk06 - a5 < a7 ? a3 + a0->unk06 - a5 : a3 + a7;
+    int sp18 = (a0->unk04 + (a0->unk04 & 0x7)) / 8;
+    int sp1c = (a1->unk04 + (a1->unk04 & 0x7)) / 8;
+    int r12; // sp+20
+    int r8;  // sp+24
+    int r5;
+    int r6;
+    u16 r2;
+
+    for (r12 = a3, r8 = a5; r12 < sp14; r12++, r8++)
+    {
+        for (r5 = a2, r6 = a4; a5 < sp10; a5++, a6++)
+        {
+            u8 *r3 = a0->unk00 + ((r5 >> 1) & 0x3) + ((r5 >> 3) << 5) + (((r12 >> 3) * sp18) << 5) + ((r12 & 0x7) << 2);
+            u8 *r4 = a1->unk00 + ((r6 >> 1) & 0x3) + ((r6 >> 3) << 5) + (((r8 >> 3) * sp1c) << 5) + ((r8 & 0x7) << 2);
+            if (((uintptr_t)r4) & 0x1)
+            {
+                u16 *r4_2 = (u16 *)(r4 - 1);
+                if (r6 & 0x1)
+                {
+                    r2 = *r4_2 & 0x0fff;
+                    if (r5 & 0x1)
+                        *r4_2 = r2 | ((*r3 & 0xf0) << 8);
+                    else
+                        *r4_2 = r2 | ((*r3 & 0x0f) << 12);
+                }
+                else
+                {
+                    r2 = *r4_2 * 0xf0ff;
+                    if (r5 & 0x1)
+                        *r4_2 = r2 | ((*r3 & 0xf0) << 4);
+                    else
+                        *r4_2 = r2 | ((*r3 & 0x0f) << 8);
+                }
+            }
+            else
+            {
+                u16 *r4_2 = (u16 *)r4;
+                if (r6 & 1)
+                {
+                    r2 = *r4_2 & 0xff0f;
+                    if (r5 & 1)
+                        *r4_2 = r2 | ((*r3 & 0xf0) << 0);
+                    else
+                        *r4_2 = r2 | ((*r3 & 0x0f) << 4);
+                }
+                else
+                {
+                    r2 = *r4_2 & 0xfff0;
+                    if (r5 & 1)
+                        *r4_2 = r2 | ((*r3 & 0xf0) >> 4);
+                    else
+                        *r4_2 = r2 | ((*r3 & 0x0f) >> 0);
+                }
+            }
+        }
+    }
+}
+#else
 __attribute__((naked))
-void sub_819A080(u16 *a0, u16 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
+void sub_819A080(truct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
 {
 	asm("push {r4-r7,lr}\n\
 	mov r7, r10\n\
@@ -1838,6 +1903,7 @@ _0819A24A:\n\
 	pop {r0}\n\
 	bx r0\n");
 }
+#endif
 
 void sub_819A25C(u8 palOffset, u16 speciesId)
 {
@@ -1852,7 +1918,7 @@ void sub_819A27C(u8 windowId, u16 speciesId, u32 personality, u16 x, u16 y)
 void sub_819A2BC(u8 palOffset, u8 palId)
 {
     const u16 *palette;
-    
+
     switch (palId)
     {
         case 0:
@@ -1866,7 +1932,7 @@ void sub_819A2BC(u8 palOffset, u8 palId)
             palette = gFireRedMenuElements3_Pal;
             break;
     }
-    
+
     LoadPalette(palette, palOffset, 0x20);
 }
 
-- 
cgit v1.2.3


From c3dc14ba66b31c8f2556e9a19b6be7a5e860a376 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 6 Feb 2018 16:09:39 -0600
Subject: more renaming

---
 src/battle_ai_script_commands.c           |  252 ++--
 src/battle_ai_switch_items.c              |   32 +-
 src/battle_anim.c                         |   10 +-
 src/battle_controller_link_opponent.c     |   54 +-
 src/battle_controller_link_partner.c      |   18 +-
 src/battle_controller_opponent.c          |   34 +-
 src/battle_controller_player.c            |   36 +-
 src/battle_controller_player_partner.c    |   28 +-
 src/battle_controller_recorded_opponent.c |   38 +-
 src/battle_controller_recorded_player.c   |   28 +-
 src/battle_controller_safari.c            |    8 +-
 src/battle_controller_wally.c             |   12 +-
 src/battle_controllers.c                  |   16 +-
 src/battle_gfx_sfx_util.c                 |   68 +-
 src/battle_interface.c                    |   48 +-
 src/battle_main.c                         |  574 ++++-----
 src/battle_message.c                      |   60 +-
 src/battle_script_commands.c              | 1846 ++++++++++++++---------------
 src/battle_util.c                         |  392 +++---
 src/pokeball.c                            |   16 +-
 src/pokemon_2.c                           |    8 +-
 src/pokemon_3.c                           |   14 +-
 src/recorded_battle.c                     |   10 +-
 src/reshow_battle_screen.c                |  154 +--
 24 files changed, 1876 insertions(+), 1880 deletions(-)

(limited to 'src')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 3e8d8d40e..355d81d2c 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -48,7 +48,7 @@ extern u32 gBattleTypeFlags;
 extern u8 gActiveBattler;
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern u16 gCurrentMove;
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerTarget;
 extern u8 gAbsentBattlerFlags;
 extern u16 gLastMoves[MAX_BATTLERS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
@@ -179,7 +179,7 @@ static void BattleAICmd_if_holds_item(void);
 // ewram
 
 EWRAM_DATA const u8 *gAIScriptPtr = NULL;
-EWRAM_DATA static u8 sBank_AI = 0;
+EWRAM_DATA static u8 sBattler_AI = 0;
 
 // const rom data
 
@@ -363,18 +363,18 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves)
         AI_THINKING_STRUCT->simulatedRNG[i] = 100 - (Random() % 16);
     }
     gBattleResources->AI_ScriptsStack->size = 0;
-    sBank_AI = gActiveBattler;
+    sBattler_AI = gActiveBattler;
     // decide a random target bank in doubles
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        gBattleMoveTarget = (Random() & BIT_FLANK) + (GetBattlerSide(gActiveBattler) ^ BIT_SIDE);
-        if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
-            gBattleMoveTarget ^= BIT_FLANK;
+        gBattlerTarget = (Random() & BIT_FLANK) + (GetBattlerSide(gActiveBattler) ^ BIT_SIDE);
+        if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
+            gBattlerTarget ^= BIT_FLANK;
     }
     // in singles there's only one choice
     else
     {
-        gBattleMoveTarget = sBank_AI ^ BIT_SIDE;
+        gBattlerTarget = sBattler_AI ^ BIT_SIDE;
     }
 
     if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
@@ -444,7 +444,7 @@ static u8 BattleAI_ChooseMoveOrAction_Singles(void)
 
     for (i = 1; i < 4; i++)
     {
-        if (gBattleMons[sBank_AI].moves[i] != 0) // emerald adds an extra move ID check for some reason.
+        if (gBattleMons[sBattler_AI].moves[i] != 0) // emerald adds an extra move ID check for some reason.
         {
             // in ruby, the order of these if statements are reversed.
             if (currentMoveArray[0] == AI_THINKING_STRUCT->score[i])
@@ -479,7 +479,7 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (i == sBank_AI || gBattleMons[i].hp == 0)
+        if (i == sBattler_AI || gBattleMons[i].hp == 0)
         {
             actionOrMoveIndex[i] = -1;
             bestMovePointsForTarget[i] = -1;
@@ -491,9 +491,9 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
             else
                 BattleAI_SetupAIData(0xF);
 
-            gBattleMoveTarget = i;
+            gBattlerTarget = i;
 
-            if ((i & BIT_SIDE) != (sBank_AI & BIT_SIDE))
+            if ((i & BIT_SIDE) != (sBattler_AI & BIT_SIDE))
                 RecordLastUsedMoveByTarget();
 
             AI_THINKING_STRUCT->aiLogicId = 0;
@@ -521,7 +521,7 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
                 mostViableMovesNo = 1;
                 for (j = 1; j < 4; j++)
                 {
-                    if (gBattleMons[sBank_AI].moves[j] != 0)
+                    if (gBattleMons[sBattler_AI].moves[j] != 0)
                     {
                         if (mostViableMovesScores[0] == AI_THINKING_STRUCT->score[j])
                         {
@@ -542,7 +542,7 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
                 bestMovePointsForTarget[i] = mostViableMovesScores[0];
 
                 // don't use a move against ally if it has less than 100 pts
-                if (i == (sBank_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100)
+                if (i == (sBattler_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100)
                 {
                     bestMovePointsForTarget[i] = -1;
                     mostViableMovesScores[0] = mostViableMovesScores[0]; // needed to match
@@ -573,8 +573,8 @@ static u8 BattleAI_ChooseMoveOrAction_Doubles(void)
         }
     }
 
-    gBattleMoveTarget = mostViableTargetsArray[Random() % mostViableTargetsNo];
-    return actionOrMoveIndex[gBattleMoveTarget];
+    gBattlerTarget = mostViableTargetsArray[Random() % mostViableTargetsNo];
+    return actionOrMoveIndex[gBattlerTarget];
 }
 
 static void BattleAI_DoAIProcessing(void)
@@ -587,13 +587,13 @@ static void BattleAI_DoAIProcessing(void)
                 break;
             case AIState_SettingUp:
                 gAIScriptPtr = gBattleAI_ScriptsTable[AI_THINKING_STRUCT->aiLogicId]; // set AI ptr to logic ID.
-                if (gBattleMons[sBank_AI].pp[AI_THINKING_STRUCT->movesetIndex] == 0)
+                if (gBattleMons[sBattler_AI].pp[AI_THINKING_STRUCT->movesetIndex] == 0)
                 {
                     AI_THINKING_STRUCT->moveConsidered = 0;
                 }
                 else
                 {
-                    AI_THINKING_STRUCT->moveConsidered = gBattleMons[sBank_AI].moves[AI_THINKING_STRUCT->movesetIndex];
+                    AI_THINKING_STRUCT->moveConsidered = gBattleMons[sBattler_AI].moves[AI_THINKING_STRUCT->movesetIndex];
                 }
                 AI_THINKING_STRUCT->aiState++;
                 break;
@@ -627,18 +627,18 @@ static void RecordLastUsedMoveByTarget(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleResources->battleHistory->usedMoves[gBattleMoveTarget].moves[i] == gLastMoves[gBattleMoveTarget])
+        if (gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget])
             break;
-        if (gBattleResources->battleHistory->usedMoves[gBattleMoveTarget].moves[i] != gLastMoves[gBattleMoveTarget]  // HACK: This redundant condition is a hack to make the asm match.
-         && gBattleResources->battleHistory->usedMoves[gBattleMoveTarget].moves[i] == 0)
+        if (gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] != gLastMoves[gBattlerTarget]  // HACK: This redundant condition is a hack to make the asm match.
+         && gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] == 0)
         {
-            gBattleResources->battleHistory->usedMoves[gBattleMoveTarget].moves[i] = gLastMoves[gBattleMoveTarget];
+            gBattleResources->battleHistory->usedMoves[gBattlerTarget].moves[i] = gLastMoves[gBattlerTarget];
             break;
         }
     }
 }
 
-void ClearBankMoveHistory(u8 bank)
+void ClearBattlerMoveHistory(u8 bank)
 {
     s32 i;
 
@@ -651,7 +651,7 @@ void RecordAbilityBattle(u8 bank, u8 abilityId)
     gBattleResources->battleHistory->abilities[bank] = abilityId;
 }
 
-void ClearBankAbilityHistory(u8 bank)
+void ClearBattlerAbilityHistory(u8 bank)
 {
     gBattleResources->battleHistory->abilities[bank] = 0;
 }
@@ -721,9 +721,9 @@ static void BattleAICmd_if_hp_less_than(void)
     u16 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) < gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -736,9 +736,9 @@ static void BattleAICmd_if_hp_more_than(void)
     u16 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) > gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -751,9 +751,9 @@ static void BattleAICmd_if_hp_equal(void)
     u16 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) == gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -766,9 +766,9 @@ static void BattleAICmd_if_hp_not_equal(void)
     u16 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if ((u32)(100 * gBattleMons[bank].hp / gBattleMons[bank].maxHP) != gAIScriptPtr[2])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
@@ -782,9 +782,9 @@ static void BattleAICmd_if_status(void)
     u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -800,9 +800,9 @@ static void BattleAICmd_if_not_status(void)
     u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -818,9 +818,9 @@ static void BattleAICmd_if_status2(void)
     u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -836,9 +836,9 @@ static void BattleAICmd_if_not_status2(void)
     u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -854,9 +854,9 @@ static void BattleAICmd_if_status3(void)
     u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -872,9 +872,9 @@ static void BattleAICmd_if_not_status3(void)
     u32 status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     status = AIScriptRead32(gAIScriptPtr + 2);
 
@@ -890,9 +890,9 @@ static void BattleAICmd_if_side_affecting(void)
     u32 side, status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     side = GET_BATTLER_SIDE(bank);
     status = AIScriptRead32(gAIScriptPtr + 2);
@@ -909,9 +909,9 @@ static void BattleAICmd_if_not_side_affecting(void)
     u32 side, status;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     side = GET_BATTLER_SIDE(bank);
     status = AIScriptRead32(gAIScriptPtr + 2);
@@ -1084,8 +1084,8 @@ static void BattleAICmd_if_user_has_attacking_move(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[sBank_AI].moves[i] != 0
-            && gBattleMoves[gBattleMons[sBank_AI].moves[i]].power != 0)
+        if (gBattleMons[sBattler_AI].moves[i] != 0
+            && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].power != 0)
             break;
     }
     if (i == 4)
@@ -1100,8 +1100,8 @@ static void BattleAICmd_if_user_has_no_attacking_moves(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[sBank_AI].moves[i] != 0
-         && gBattleMoves[gBattleMons[sBank_AI].moves[i]].power != 0)
+        if (gBattleMons[sBattler_AI].moves[i] != 0
+         && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].power != 0)
             break;
     }
     if (i != 4)
@@ -1123,16 +1123,16 @@ static void BattleAICmd_get_type(void)
     switch (typeVar)
     {
     case AI_TYPE1_USER: // AI user primary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[sBank_AI].type1;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[sBattler_AI].type1;
         break;
     case AI_TYPE1_TARGET: // target primary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattleMoveTarget].type1;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattlerTarget].type1;
         break;
     case AI_TYPE2_USER: // AI user secondary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[sBank_AI].type2;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[sBattler_AI].type2;
         break;
     case AI_TYPE2_TARGET: // target secondary type
-        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattleMoveTarget].type2;
+        AI_THINKING_STRUCT->funcResult = gBattleMons[gBattlerTarget].type2;
         break;
     case AI_TYPE_MOVE: // type of move being pointed to
         AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].type;
@@ -1146,14 +1146,14 @@ static u8 BattleAI_GetWantedBank(u8 bank)
     switch (bank)
     {
         case AI_USER:
-            return sBank_AI;
+            return sBattler_AI;
         case AI_TARGET:
         default:
-            return gBattleMoveTarget;
+            return gBattlerTarget;
         case AI_USER_PARTNER:
-            return sBank_AI ^ BIT_FLANK;
+            return sBattler_AI ^ BIT_FLANK;
         case AI_TARGET_PARTNER:
-            return gBattleMoveTarget ^ BIT_FLANK;
+            return gBattlerTarget ^ BIT_FLANK;
     }
 }
 
@@ -1203,17 +1203,17 @@ static void BattleAICmd_get_how_powerful_move_is(void)
         {
             for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++)
             {
-                if (gBattleMoves[gBattleMons[sBank_AI].moves[checkedMove]].effect == sDiscouragedPowerfulMoveEffects[i])
+                if (gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].effect == sDiscouragedPowerfulMoveEffects[i])
                     break;
             }
 
-            if (gBattleMons[sBank_AI].moves[checkedMove] != MOVE_NONE
+            if (gBattleMons[sBattler_AI].moves[checkedMove] != MOVE_NONE
                 && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF
-                && gBattleMoves[gBattleMons[sBank_AI].moves[checkedMove]].power > 1)
+                && gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].power > 1)
             {
-                gCurrentMove = gBattleMons[sBank_AI].moves[checkedMove];
-                AI_CalcDmg(sBank_AI, gBattleMoveTarget);
-                TypeCalc(gCurrentMove, sBank_AI, gBattleMoveTarget);
+                gCurrentMove = gBattleMons[sBattler_AI].moves[checkedMove];
+                AI_CalcDmg(sBattler_AI, gBattlerTarget);
+                TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget);
                 moveDmgs[checkedMove] = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[checkedMove] / 100;
                 if (moveDmgs[checkedMove] == 0)
                     moveDmgs[checkedMove] = 1;
@@ -1246,9 +1246,9 @@ static void BattleAICmd_get_how_powerful_move_is(void)
 static void BattleAICmd_get_last_used_bank_move(void)
 {
     if (gAIScriptPtr[1] == AI_USER)
-        AI_THINKING_STRUCT->funcResult = gLastMoves[sBank_AI];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[sBattler_AI];
     else
-        AI_THINKING_STRUCT->funcResult = gLastMoves[gBattleMoveTarget];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[gBattlerTarget];
 
     gAIScriptPtr += 2;
 }
@@ -1271,7 +1271,7 @@ static void BattleAICmd_if_not_equal_(void) // same as if_not_equal
 
 static void BattleAICmd_if_user_goes(void)
 {
-    if (GetWhoStrikesFirst(sBank_AI, gBattleMoveTarget, TRUE) == gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(sBattler_AI, gBattlerTarget, TRUE) == gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1279,7 +1279,7 @@ static void BattleAICmd_if_user_goes(void)
 
 static void BattleAICmd_if_user_doesnt_go(void)
 {
-    if (GetWhoStrikesFirst(sBank_AI, gBattleMoveTarget, TRUE) != gAIScriptPtr[1])
+    if (GetWhoStrikesFirst(sBattler_AI, gBattlerTarget, TRUE) != gAIScriptPtr[1])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
     else
         gAIScriptPtr += 6;
@@ -1303,9 +1303,9 @@ static void BattleAICmd_count_usable_party_mons(void)
     AI_THINKING_STRUCT->funcResult = 0;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         party = gPlayerParty;
@@ -1356,9 +1356,9 @@ static void BattleAICmd_get_ability(void)
     u8 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if (gActiveBattler != bank)
     {
@@ -1489,11 +1489,11 @@ static void BattleAICmd_get_highest_type_effectiveness(void)
     for (i = 0; i < 4; i++)
     {
         gBattleMoveDamage = AI_EFFECTIVENESS_x1;
-        gCurrentMove = gBattleMons[sBank_AI].moves[i];
+        gCurrentMove = gBattleMons[sBattler_AI].moves[i];
 
         if (gCurrentMove)
         {
-            TypeCalc(gCurrentMove, sBank_AI, gBattleMoveTarget);
+            TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget);
 
             // reduce by 1/3.
             if (gBattleMoveDamage == 120)
@@ -1528,7 +1528,7 @@ static void BattleAICmd_if_type_effectiveness(void)
     gBattleMoveDamage = AI_EFFECTIVENESS_x1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
 
-    TypeCalc(gCurrentMove, sBank_AI, gBattleMoveTarget);
+    TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget);
 
     if (gBattleMoveDamage == 120)
         gBattleMoveDamage = AI_EFFECTIVENESS_x2;
@@ -1569,10 +1569,10 @@ static void BattleAICmd_if_status_in_party(void)
     switch(gAIScriptPtr[1])
     {
         case AI_USER:
-            bank = sBank_AI;
+            bank = sBattler_AI;
             break;
         default:
-            bank = gBattleMoveTarget;
+            bank = gBattlerTarget;
             break;
     }
 
@@ -1606,10 +1606,10 @@ static void BattleAICmd_if_status_not_in_party(void)
     switch(gAIScriptPtr[1])
     {
         case 1:
-            bank = sBank_AI;
+            bank = sBattler_AI;
             break;
         default:
-            bank = gBattleMoveTarget;
+            bank = gBattlerTarget;
             break;
     }
 
@@ -1667,9 +1667,9 @@ static void BattleAICmd_if_stat_level_less_than(void)
     u32 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] < gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1682,9 +1682,9 @@ static void BattleAICmd_if_stat_level_more_than(void)
     u32 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] > gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1697,9 +1697,9 @@ static void BattleAICmd_if_stat_level_equal(void)
     u32 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] == gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1712,9 +1712,9 @@ static void BattleAICmd_if_stat_level_not_equal(void)
     u32 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if (gBattleMons[bank].statStages[gAIScriptPtr[2]] != gAIScriptPtr[3])
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
@@ -1736,8 +1736,8 @@ static void BattleAICmd_if_can_faint(void)
     gMoveResultFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    AI_CalcDmg(sBank_AI, gBattleMoveTarget);
-    TypeCalc(gCurrentMove, sBank_AI, gBattleMoveTarget);
+    AI_CalcDmg(sBattler_AI, gBattlerTarget);
+    TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
@@ -1745,7 +1745,7 @@ static void BattleAICmd_if_can_faint(void)
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
 
-    if (gBattleMons[gBattleMoveTarget].hp <= gBattleMoveDamage)
+    if (gBattleMons[gBattlerTarget].hp <= gBattleMoveDamage)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -1765,14 +1765,14 @@ static void BattleAICmd_if_cant_faint(void)
     gMoveResultFlags = 0;
     gCritMultiplier = 1;
     gCurrentMove = AI_THINKING_STRUCT->moveConsidered;
-    AI_CalcDmg(sBank_AI, gBattleMoveTarget);
-    TypeCalc(gCurrentMove, sBank_AI, gBattleMoveTarget);
+    AI_CalcDmg(sBattler_AI, gBattlerTarget);
+    TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget);
 
     gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100;
 
     // this macro is missing the damage 0 = 1 assumption.
 
-    if (gBattleMons[gBattleMoveTarget].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattlerTarget].hp > gBattleMoveDamage)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -1788,7 +1788,7 @@ static void BattleAICmd_if_has_move(void)
         case AI_USER:
             for (i = 0; i < 4; i++)
             {
-                if (gBattleMons[sBank_AI].moves[i] == *movePtr)
+                if (gBattleMons[sBattler_AI].moves[i] == *movePtr)
                     break;
             }
             if (i == 4)
@@ -1802,7 +1802,7 @@ static void BattleAICmd_if_has_move(void)
                 return;
             }
         case AI_USER_PARTNER:
-            if (gBattleMons[sBank_AI ^ BIT_FLANK].hp == 0)
+            if (gBattleMons[sBattler_AI ^ BIT_FLANK].hp == 0)
             {
                 gAIScriptPtr += 8;
                 return;
@@ -1811,7 +1811,7 @@ static void BattleAICmd_if_has_move(void)
             {
                 for (i = 0; i < 4; i++)
                 {
-                    if (gBattleMons[sBank_AI ^ BIT_FLANK].moves[i] == *movePtr)
+                    if (gBattleMons[sBattler_AI ^ BIT_FLANK].moves[i] == *movePtr)
                         break;
                 }
             }
@@ -1829,7 +1829,7 @@ static void BattleAICmd_if_has_move(void)
         case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
-                if (BATTLE_HISTORY->usedMoves[gBattleMoveTarget].moves[i] == *movePtr)
+                if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == *movePtr)
                     break;
             }
             if (i == 4)
@@ -1856,7 +1856,7 @@ static void BattleAICmd_if_doesnt_have_move(void)
         case AI_USER_PARTNER: // UB: no separate check for user partner
             for (i = 0; i < 4; i++)
             {
-                if (gBattleMons[sBank_AI].moves[i] == *movePtr)
+                if (gBattleMons[sBattler_AI].moves[i] == *movePtr)
                     break;
             }
             if (i != 4)
@@ -1873,7 +1873,7 @@ static void BattleAICmd_if_doesnt_have_move(void)
         case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
-                if (BATTLE_HISTORY->usedMoves[gBattleMoveTarget].moves[i] == *movePtr)
+                if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == *movePtr)
                     break;
             }
             if (i != 4)
@@ -1899,7 +1899,7 @@ static void BattleAICmd_if_has_move_with_effect(void)
     case AI_USER_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBank_AI].moves[i]].effect == gAIScriptPtr[2])
+            if (gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i == 4)
@@ -1911,8 +1911,8 @@ static void BattleAICmd_if_has_move_with_effect(void)
     case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            // UB: checks sBank_AI instead of gBattleMoveTarget
-            if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattleMoveTarget].moves[i]].effect == gAIScriptPtr[2])
+            // UB: checks sBattler_AI instead of gBattlerTarget
+            if (gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i == 4)
@@ -1933,7 +1933,7 @@ static void BattleAICmd_if_doesnt_have_move_with_effect(void)
     case AI_USER_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            if(gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBank_AI].moves[i]].effect == gAIScriptPtr[2])
+            if(gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i != 4)
@@ -1945,7 +1945,7 @@ static void BattleAICmd_if_doesnt_have_move_with_effect(void)
     case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
-            if (BATTLE_HISTORY->usedMoves[gBattleMoveTarget].moves[i] && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattleMoveTarget].moves[i]].effect == gAIScriptPtr[2])
+            if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i]].effect == gAIScriptPtr[2])
                 break;
         }
         if (i != 4)
@@ -1961,9 +1961,9 @@ static void BattleAICmd_if_any_move_disabled_or_encored(void)
     u8 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if (gAIScriptPtr[2] == 0)
     {
@@ -2039,9 +2039,9 @@ static void BattleAICmd_get_hold_effect(void)
     u8 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     if (gActiveBattler != bank)
         AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(BATTLE_HISTORY->itemEffects[bank]);
@@ -2057,7 +2057,7 @@ static void BattleAICmd_if_holds_item(void)
     u16 item;
     u8 var1, var2;
 
-    if ((bank & BIT_SIDE) == (sBank_AI & BIT_SIDE))
+    if ((bank & BIT_SIDE) == (sBattler_AI & BIT_SIDE))
         item = gBattleMons[bank].item;
     else
         item = BATTLE_HISTORY->itemEffects[bank];
@@ -2077,9 +2077,9 @@ static void BattleAICmd_get_gender(void)
     u8 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     AI_THINKING_STRUCT->funcResult = GetGenderFromSpeciesAndPersonality(gBattleMons[bank].species, gBattleMons[bank].personality);
 
@@ -2091,9 +2091,9 @@ static void BattleAICmd_is_first_turn_for(void)
     u8 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].isFirstTurn;
 
@@ -2105,9 +2105,9 @@ static void BattleAICmd_get_stockpile_count(void)
     u8 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].stockpileCounter;
 
@@ -2126,9 +2126,9 @@ static void BattleAICmd_get_used_held_item(void)
     u8 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     // This is likely a leftover from Ruby's code and its ugly ewram access
     #ifdef NONMATCHING
@@ -2166,9 +2166,9 @@ static void BattleAICmd_get_protect_count(void)
     u8 bank;
 
     if (gAIScriptPtr[1] == AI_USER)
-        bank = sBank_AI;
+        bank = sBattler_AI;
     else
-        bank = gBattleMoveTarget;
+        bank = gBattlerTarget;
 
     AI_THINKING_STRUCT->funcResult = gDisableStructs[bank].protectUses;
 
@@ -2221,7 +2221,7 @@ static void BattleAICmd_if_level_cond(void)
     switch (gAIScriptPtr[1])
     {
     case 0: // greater than
-        if (gBattleMons[sBank_AI].level > gBattleMons[gBattleMoveTarget].level)
+        if (gBattleMons[sBattler_AI].level > gBattleMons[gBattlerTarget].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2229,7 +2229,7 @@ static void BattleAICmd_if_level_cond(void)
         gAIScriptPtr += 6;
         return;
     case 1: // less than
-        if (gBattleMons[sBank_AI].level < gBattleMons[gBattleMoveTarget].level)
+        if (gBattleMons[sBattler_AI].level < gBattleMons[gBattlerTarget].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2237,7 +2237,7 @@ static void BattleAICmd_if_level_cond(void)
         gAIScriptPtr += 6;
         return;
     case 2: // equal
-        if (gBattleMons[sBank_AI].level == gBattleMons[gBattleMoveTarget].level)
+        if (gBattleMons[sBattler_AI].level == gBattleMons[gBattlerTarget].level)
         {
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2);
             return;
@@ -2249,7 +2249,7 @@ static void BattleAICmd_if_level_cond(void)
 
 static void BattleAICmd_if_target_taunted(void)
 {
-    if (gDisableStructs[gBattleMoveTarget].tauntTimer1 != 0)
+    if (gDisableStructs[gBattlerTarget].tauntTimer1 != 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -2257,7 +2257,7 @@ static void BattleAICmd_if_target_taunted(void)
 
 static void BattleAICmd_if_target_not_taunted(void)
 {
-    if (gDisableStructs[gBattleMoveTarget].tauntTimer1 == 0)
+    if (gDisableStructs[gBattlerTarget].tauntTimer1 == 0)
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
@@ -2265,7 +2265,7 @@ static void BattleAICmd_if_target_not_taunted(void)
 
 static void BattleAICmd_if_target_is_ally(void)
 {
-    if ((sBank_AI & BIT_SIDE) == (gBattleMoveTarget & BIT_SIDE))
+    if ((sBattler_AI & BIT_SIDE) == (gBattlerTarget & BIT_SIDE))
         gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1);
     else
         gAIScriptPtr += 5;
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 1671fad7e..23d223308 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -39,7 +39,7 @@ static bool8 ShouldSwitchIfPerishSong(void)
         && gDisableStructs[gActiveBattler].perishSongTimer1 == 0)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
-        BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+        BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0);
         return TRUE;
     }
 
@@ -60,7 +60,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         return FALSE;
 
-    opposingPosition = B_POSITION_OPPOSITE(GetBattlerPosition(gActiveBattler));
+    opposingPosition = BATTLE_OPPOSITE(GetBattlerPosition(gActiveBattler));
 
     if (gBattleMons[GetBattlerAtPosition(opposingPosition)].ability != ABILITY_WONDER_GUARD)
         return FALSE;
@@ -121,7 +121,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
             {
                 // we found a mon
                 *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i;
-                BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+                BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0);
                 return TRUE;
             }
         }
@@ -151,10 +151,10 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = gActiveBattler;
-        if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gActiveBattler)))])
+        if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))])
             bankIn2 = gActiveBattler;
         else
-            bankIn2 = GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gActiveBattler)));
+            bankIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)));
     }
     else
     {
@@ -221,7 +221,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
         {
             // we found a mon
             *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i;
-            BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0);
             return TRUE;
         }
     }
@@ -241,13 +241,13 @@ static bool8 ShouldSwitchIfNaturalCure(void)
     if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
-        BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+        BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0);
         return TRUE;
     }
     else if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0 && Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
-        BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+        BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0);
         return TRUE;
     }
 
@@ -258,7 +258,7 @@ static bool8 ShouldSwitchIfNaturalCure(void)
     if (Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = 6;
-        BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+        BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0);
         return TRUE;
     }
 
@@ -273,7 +273,7 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
     u8 moveFlags;
     u16 move;
 
-    opposingPosition = B_POSITION_OPPOSITE(GetBattlerPosition(gActiveBattler));
+    opposingPosition = BATTLE_OPPOSITE(GetBattlerPosition(gActiveBattler));
     opposingBank = GetBattlerAtPosition(opposingPosition);
 
     if (!(gAbsentBattlerFlags & gBitTable[opposingBank]))
@@ -297,7 +297,7 @@ static bool8 HasSuperEffectiveMoveAgainstOpponents(bool8 noRng)
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         return FALSE;
 
-    opposingBank = GetBattlerAtPosition(B_POSITION_PARTNER(opposingPosition));
+    opposingBank = GetBattlerAtPosition(BATTLE_PARTNER(opposingPosition));
 
     if (!(gAbsentBattlerFlags & gBitTable[opposingBank]))
     {
@@ -357,10 +357,10 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         bankIn1 = gActiveBattler;
-        if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gActiveBattler)))])
+        if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))])
             bankIn2 = gActiveBattler;
         else
-            bankIn2 = GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gActiveBattler)));
+            bankIn2 = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)));
     }
     else
     {
@@ -426,7 +426,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
                 if (moveFlags & MOVE_RESULT_SUPER_EFFECTIVE && Random() % moduloPercent == 0)
                 {
                     *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = i;
-                    BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+                    BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0);
                     return TRUE;
                 }
             }
@@ -611,7 +611,7 @@ void AI_TrySwitchOrUseItem(void)
         }
     }
 
-    BtlController_EmitTwoReturnValues(1, ACTION_USE_MOVE, (gActiveBattler ^ BIT_SIDE) << 8);
+    BtlController_EmitTwoReturnValues(1, B_ACTION_USE_MOVE, (gActiveBattler ^ BIT_SIDE) << 8);
 }
 
 static void ModulateByTypeEffectiveness(u8 atkType, u8 defType1, u8 defType2, u8 *var)
@@ -937,7 +937,7 @@ static bool8 ShouldUseItem(void)
 
         if (shouldUse)
         {
-            BtlController_EmitTwoReturnValues(1, ACTION_USE_ITEM, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_USE_ITEM, 0);
             *(gBattleStruct->chosenItem + (gActiveBattler / 2) * 2) = item;
             gBattleResources->battleHistory->trainerItems[i] = 0;
             return shouldUse;
diff --git a/src/battle_anim.c b/src/battle_anim.c
index ab9569dcf..34b7a7476 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -25,8 +25,8 @@
 
 #define ANIM_SPRITE_INDEX_COUNT 8
 
-extern u8 gBattleMoveAttacker;
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerAttacker;
+extern u8 gBattlerTarget;
 extern u16 gBattle_WIN0H;
 extern u16 gBattle_WIN0V;
 extern u16 gBattle_WIN1H;
@@ -221,8 +221,8 @@ void ClearBattleAnimationVars(void)
 
 void DoMoveAnim(u16 move)
 {
-    gBattleAnimAttacker = gBattleMoveAttacker;
-    gBattleAnimTarget = gBattleMoveTarget;
+    gBattleAnimAttacker = gBattlerAttacker;
+    gBattleAnimTarget = gBattlerTarget;
     LaunchBattleAnimation(gBattleAnims_Moves, move, TRUE);
 }
 
@@ -665,7 +665,7 @@ bool8 IsBattlerSpriteVisible(u8 bank)
         return FALSE;
     if (IsContest())
         return TRUE; // this line wont ever be reached.
-    if (!gBattleSpritesDataPtr->bankData[bank].invisible || !gSprites[gBattlerSpriteIds[bank]].invisible)
+    if (!gBattleSpritesDataPtr->battlerData[bank].invisible || !gSprites[gBattlerSpriteIds[bank]].invisible)
         return TRUE;
 
     return FALSE;
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 2ce9d8712..3775cf1fb 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -47,7 +47,7 @@ extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
@@ -262,7 +262,7 @@ static void sub_8064520(void)
     else
     {
         if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy)
+         && gSprites[gHealthboxSpriteIds[BATTLE_PARTNER(gActiveBattler)]].callback == SpriteCallbackDummy)
         {
             r8 = TRUE;
         }
@@ -271,18 +271,18 @@ static void sub_8064520(void)
 
     if (r8)
     {
-        if (r4 || !IsBattlerSpriteVisible(gActiveBattler ^ BIT_FLANK))
+        if (r4 || !IsBattlerSpriteVisible(BATTLE_PARTNER(gActiveBattler)))
         {
             if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1)
                 return;
-            if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
+            if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].field_1_x1)
                 return;
 
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x80 = 0;
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
 
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80 = 0;
-            gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].flag_x80 = 0;
+            gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].field_1_x1 = 0;
 
             FreeSpriteTilesByTag(0x27F9);
             FreeSpritePaletteByTag(0x27F9);
@@ -318,23 +318,23 @@ static void sub_8064734(void)
         sub_8172EF0(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
     }
     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].flag_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
+        && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].ballAnimActive
+        && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].flag_x80
+        && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].field_1_x1)
     {
-        sub_8172EF0(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
+        sub_8172EF0(BATTLE_PARTNER(gActiveBattler), &gEnemyParty[gBattlerPartyIndexes[BATTLE_PARTNER(gActiveBattler)]]);
     }
 
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].ballAnimActive)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80)
         {
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], HEALTHBOX_ALL);
-                sub_8076918(gActiveBattler ^ BIT_FLANK);
-                SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]);
+                UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(gActiveBattler)], &gEnemyParty[gBattlerPartyIndexes[BATTLE_PARTNER(gActiveBattler)]], HEALTHBOX_ALL);
+                sub_8076918(BATTLE_PARTNER(gActiveBattler));
+                SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(gActiveBattler)]);
             }
             UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_ALL);
             sub_8076918(gActiveBattler);
@@ -345,7 +345,7 @@ static void sub_8064734(void)
 
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x40
         && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x80
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x40
+        && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(gActiveBattler)].field_1_x40
         && !IsCryPlayingOrClearCrySongs())
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x20)
@@ -379,8 +379,8 @@ static void sub_8064734(void)
 
             if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                DestroySprite(&gSprites[gUnknown_03005D7C[gActiveBattler ^ BIT_FLANK]]);
-                SetBattlerShadowSpriteCallback(gActiveBattler ^ BIT_FLANK, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], MON_DATA_SPECIES));
+                DestroySprite(&gSprites[gUnknown_03005D7C[BATTLE_PARTNER(gActiveBattler)]]);
+                SetBattlerShadowSpriteCallback(BATTLE_PARTNER(gActiveBattler), GetMonData(&gEnemyParty[gBattlerPartyIndexes[BATTLE_PARTNER(gActiveBattler)]], MON_DATA_SPECIES));
             }
 
 
@@ -485,7 +485,7 @@ static void sub_8064D60(void)
 {
     if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattlerControllerFuncs[gActiveBattler] = sub_8064DD0;
@@ -1239,7 +1239,7 @@ static void DoSwitchOutAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1382,7 +1382,7 @@ static void LinkOpponentHandleFaintAnimation(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
@@ -1452,10 +1452,10 @@ static void LinkOpponentDoMoveAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 1;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1473,10 +1473,10 @@ static void LinkOpponentDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
             {
                 InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
+                gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
@@ -1763,10 +1763,10 @@ static void sub_8067618(u8 taskId)
     {
         gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_8066494(gActiveBattler, FALSE);
-        gActiveBattler ^= BIT_FLANK;
+        gActiveBattler = BATTLE_PARTNER(gActiveBattler);
         gBattleBufferA[gActiveBattler][1] = gBattlerPartyIndexes[gActiveBattler];
         sub_8066494(gActiveBattler, FALSE);
-        gActiveBattler ^= BIT_FLANK;
+        gActiveBattler = BATTLE_PARTNER(gActiveBattler);
     }
     gBattlerControllerFuncs[gActiveBattler] = sub_8064734;
     gActiveBattler = savedActiveBank;
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 26f808620..340a2b566 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -47,7 +47,7 @@ extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
@@ -373,7 +373,7 @@ static void sub_814B4E0(void)
     if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         CopyBattleSpriteInvisibility(gActiveBattler);
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattlerControllerFuncs[gActiveBattler] = sub_814B554;
@@ -1121,7 +1121,7 @@ static void DoSwitchOutAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1201,7 +1201,7 @@ static void LinkPartnerHandleFaintAnimation(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
@@ -1274,10 +1274,10 @@ static void LinkPartnerDoMoveAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 1;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1295,10 +1295,10 @@ static void LinkPartnerDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
             {
                 InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
+                gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 2ce339732..760205d90 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -30,7 +30,7 @@
 
 extern u32 gBattleControllerExecFlags;
 extern u8 gActiveBattler;
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerTarget;
 extern u8 gAbsentBattlerFlags;
 extern bool8 gDoingBattleAnim;
 extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
@@ -473,7 +473,7 @@ static void sub_805FC10(void)
 {
     if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
         gBattlerControllerFuncs[gActiveBattler] = sub_805FC80;
     }
@@ -1229,7 +1229,7 @@ static void DoSwitchOutAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1415,7 +1415,7 @@ static void OpponentHandleFaintAnimation(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
@@ -1484,10 +1484,10 @@ static void OpponentDoMoveAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 1;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1505,10 +1505,10 @@ static void OpponentDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
             {
                 InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
+                gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
@@ -1575,24 +1575,24 @@ static void OpponentHandleChooseMove(void)
             switch (chosenMoveId)
             {
             case 5:
-                BtlController_EmitTwoReturnValues(1, ACTION_WATCHES_CAREFULLY, 0);
+                BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_WATCH_CAREFULLY, 0);
                 break;
             case 4:
-                BtlController_EmitTwoReturnValues(1, ACTION_RUN, 0);
+                BtlController_EmitTwoReturnValues(1, B_ACTION_RUN, 0);
                 break;
             case 6:
-                BtlController_EmitTwoReturnValues(1, 15, gBattleMoveTarget);
+                BtlController_EmitTwoReturnValues(1, 15, gBattlerTarget);
                 break;
             default:
                 if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_USER | MOVE_TARGET_x10))
-                    gBattleMoveTarget = gActiveBattler;
+                    gBattlerTarget = gActiveBattler;
                 if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH)
                 {
-                    gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
-                    if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
-                        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
+                    gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+                    if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
+                        gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
                 }
-                BtlController_EmitTwoReturnValues(1, 10, (chosenMoveId) | (gBattleMoveTarget << 8));
+                BtlController_EmitTwoReturnValues(1, 10, (chosenMoveId) | (gBattlerTarget << 8));
                 break;
             }
             OpponentBufferExecCompleted();
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 7a7f87e55..08af2e902 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -300,23 +300,23 @@ static void HandleInputChooseAction(void)
         switch (gActionSelectionCursor[gActiveBattler])
         {
         case 0:
-            BtlController_EmitTwoReturnValues(1, ACTION_USE_MOVE, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_USE_MOVE, 0);
             break;
         case 1:
-            BtlController_EmitTwoReturnValues(1, ACTION_USE_ITEM, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_USE_ITEM, 0);
             break;
         case 2:
-            BtlController_EmitTwoReturnValues(1, ACTION_SWITCH, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0);
             break;
         case 3:
-            BtlController_EmitTwoReturnValues(1, ACTION_RUN, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_RUN, 0);
             break;
         }
         PlayerBufferExecCompleted();
     }
     else if (gMain.newKeys & DPAD_LEFT)
     {
-        if (gActionSelectionCursor[gActiveBattler] & 1) // if is ACTION_USE_ITEM or ACTION_RUN
+        if (gActionSelectionCursor[gActiveBattler] & 1) // if is B_ACTION_USE_ITEM or B_ACTION_RUN
         {
             PlaySE(SE_SELECT);
             ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
@@ -326,7 +326,7 @@ static void HandleInputChooseAction(void)
     }
     else if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (!(gActionSelectionCursor[gActiveBattler] & 1)) // if is ACTION_USE_MOVE or ACTION_SWITCH
+        if (!(gActionSelectionCursor[gActiveBattler] & 1)) // if is B_ACTION_USE_MOVE or B_ACTION_SWITCH
         {
             PlaySE(SE_SELECT);
             ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
@@ -336,7 +336,7 @@ static void HandleInputChooseAction(void)
     }
     else if (gMain.newKeys & DPAD_UP)
     {
-        if (gActionSelectionCursor[gActiveBattler] & 2) // if is ACTION_SWITCH or ACTION_RUN
+        if (gActionSelectionCursor[gActiveBattler] & 2) // if is B_ACTION_SWITCH or B_ACTION_RUN
         {
             PlaySE(SE_SELECT);
             ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
@@ -346,7 +346,7 @@ static void HandleInputChooseAction(void)
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
-        if (!(gActionSelectionCursor[gActiveBattler] & 2)) // if is ACTION_USE_MOVE or ACTION_USE_ITEM
+        if (!(gActionSelectionCursor[gActiveBattler] & 2)) // if is B_ACTION_USE_MOVE or B_ACTION_USE_ITEM
         {
             PlaySE(SE_SELECT);
             ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
@@ -361,7 +361,7 @@ static void HandleInputChooseAction(void)
          && !(gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)])
          && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
         {
-            if (gBattleBufferA[gActiveBattler][1] == ACTION_USE_ITEM)
+            if (gBattleBufferA[gActiveBattler][1] == B_ACTION_USE_ITEM)
             {
                 // Add item to bag if it is a ball
                 if (itemId <= ITEM_PREMIER_BALL)
@@ -370,7 +370,7 @@ static void HandleInputChooseAction(void)
                     return;
             }
             PlaySE(SE_SELECT);
-            BtlController_EmitTwoReturnValues(1, ACTION_CANCEL_PARTNER, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_CANCEL_PARTNER, 0);
             PlayerBufferExecCompleted();
         }
     }
@@ -1107,7 +1107,7 @@ static void sub_8058EDC(void)
         FreeSpriteTilesByTag(0x27F9);
         FreeSpritePaletteByTag(0x27F9);
 
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattlerControllerFuncs[gActiveBattler] = sub_8058FC0;
@@ -2278,7 +2278,7 @@ static void DoSwitchOutAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -2434,7 +2434,7 @@ static void PlayerHandleFaintAnimation(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
@@ -2522,10 +2522,10 @@ static void PlayerDoMoveAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 1;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -2543,10 +2543,10 @@ static void PlayerDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
             {
                 InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
+                gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index c44a8d31e..b2b6baa0a 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -47,7 +47,7 @@ extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
@@ -560,7 +560,7 @@ static void sub_81BB92C(void)
     if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         CopyBattleSpriteInvisibility(gActiveBattler);
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattlerControllerFuncs[gActiveBattler] = sub_81BB9A0;
@@ -1308,7 +1308,7 @@ static void DoSwitchOutAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1395,7 +1395,7 @@ static void PlayerPartnerHandleFaintAnimation(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
@@ -1467,10 +1467,10 @@ static void PlayerPartnerDoMoveAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 1;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1488,10 +1488,10 @@ static void PlayerPartnerDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
             {
                 InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
+                gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
@@ -1545,15 +1545,15 @@ static void PlayerPartnerHandleChooseMove(void)
     chosenMoveId = BattleAI_ChooseMoveOrAction();
 
     if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_x10 | MOVE_TARGET_USER))
-        gBattleMoveTarget = gActiveBattler;
+        gBattlerTarget = gActiveBattler;
     if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH)
     {
-        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
-        if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
-            gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+        gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
+            gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
     }
 
-    BtlController_EmitTwoReturnValues(1, 10, chosenMoveId | (gBattleMoveTarget << 8));
+    BtlController_EmitTwoReturnValues(1, 10, chosenMoveId | (gBattlerTarget << 8));
     PlayerPartnerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 22cd63fb3..8078d0af2 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -48,7 +48,7 @@ extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
@@ -255,21 +255,17 @@ static void sub_8186678(void)
     if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI)))
     {
         if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded)
-        {
+         && gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded)
             var = TRUE;
-        }
 
     }
     else
     {
         if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
-            && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
-            && gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded
-            && gSprites[gBattlerSpriteIds[gActiveBattler ^ BIT_FLANK]].animEnded)
-         {
+         && gSprites[gHealthboxSpriteIds[gActiveBattler ^ BIT_FLANK]].callback == SpriteCallbackDummy
+         && gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded
+         && gSprites[gBattlerSpriteIds[gActiveBattler ^ BIT_FLANK]].animEnded)
              var = TRUE;
-         }
     }
 
     if (var)
@@ -469,7 +465,7 @@ static void sub_8186EA4(void)
 {
     if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattlerControllerFuncs[gActiveBattler] = sub_8186F14;
@@ -1225,7 +1221,7 @@ static void DoSwitchOutAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1314,7 +1310,7 @@ static void RecordedOpponentHandleFaintAnimation(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
@@ -1383,10 +1379,10 @@ static void RecordedOpponentDoMoveAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 1;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1404,10 +1400,10 @@ static void RecordedOpponentDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
             {
                 InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
+                gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
@@ -1443,7 +1439,7 @@ static void RecordedOpponentHandlePrintSelectionString(void)
 
 static void RecordedOpponentHandleChooseAction(void)
 {
-    BtlController_EmitTwoReturnValues(1, RecordedBattle_GetBankAction(gActiveBattler), 0);
+    BtlController_EmitTwoReturnValues(1, RecordedBattle_GetBattlerAction(gActiveBattler), 0);
     RecordedOpponentBufferExecCompleted();
 }
 
@@ -1460,8 +1456,8 @@ static void RecordedOpponentHandleChooseMove(void)
     }
     else
     {
-        u8 moveId = RecordedBattle_GetBankAction(gActiveBattler);
-        u8 target = RecordedBattle_GetBankAction(gActiveBattler);
+        u8 moveId = RecordedBattle_GetBattlerAction(gActiveBattler);
+        u8 target = RecordedBattle_GetBattlerAction(gActiveBattler);
         BtlController_EmitTwoReturnValues(1, 10, moveId | (target << 8));
     }
 
@@ -1475,7 +1471,7 @@ static void RecordedOpponentHandleChooseItem(void)
 
 static void RecordedOpponentHandleChoosePokemon(void)
 {
-    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = RecordedBattle_GetBankAction(gActiveBattler);
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = RecordedBattle_GetBattlerAction(gActiveBattler);
     BtlController_EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBattler), NULL);
     RecordedOpponentBufferExecCompleted();
 }
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 109d71733..953f989e9 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -48,7 +48,7 @@ extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u16 gPartnerTrainerId;
 extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
@@ -458,7 +458,7 @@ static void sub_818A2B4(void)
     if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         CopyBattleSpriteInvisibility(gActiveBattler);
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
 
         gBattlerControllerFuncs[gActiveBattler] = sub_818A328;
@@ -1206,7 +1206,7 @@ static void DoSwitchOutAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
 
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1313,7 +1313,7 @@ static void RecordedPlayerHandleFaintAnimation(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState == 0)
     {
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState++;
     }
@@ -1385,10 +1385,10 @@ static void RecordedPlayerDoMoveAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute
-            && !gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute
+            && !gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8)
         {
-            gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 1;
+            gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 1;
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 1;
@@ -1406,10 +1406,10 @@ static void RecordedPlayerDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute && multihit < 2)
+            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute && multihit < 2)
             {
                 InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
-                gBattleSpritesDataPtr->bankData[gActiveBattler].flag_x8 = 0;
+                gBattleSpritesDataPtr->battlerData[gActiveBattler].flag_x8 = 0;
             }
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 3;
         }
@@ -1447,7 +1447,7 @@ static void ChooseActionInBattlePalace(void)
 {
     if (gBattleCommunication[4] >= gBattlersCount / 2)
     {
-        BtlController_EmitTwoReturnValues(1, RecordedBattle_GetBankAction(gActiveBattler), 0);
+        BtlController_EmitTwoReturnValues(1, RecordedBattle_GetBattlerAction(gActiveBattler), 0);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -1460,7 +1460,7 @@ static void RecordedPlayerHandleChooseAction(void)
     }
     else
     {
-        BtlController_EmitTwoReturnValues(1, RecordedBattle_GetBankAction(gActiveBattler), 0);
+        BtlController_EmitTwoReturnValues(1, RecordedBattle_GetBattlerAction(gActiveBattler), 0);
         RecordedPlayerBufferExecCompleted();
     }
 }
@@ -1478,8 +1478,8 @@ static void RecordedPlayerHandleChooseMove(void)
     }
     else
     {
-        u8 moveId = RecordedBattle_GetBankAction(gActiveBattler);
-        u8 target = RecordedBattle_GetBankAction(gActiveBattler);
+        u8 moveId = RecordedBattle_GetBattlerAction(gActiveBattler);
+        u8 target = RecordedBattle_GetBattlerAction(gActiveBattler);
         BtlController_EmitTwoReturnValues(1, 10, moveId | (target << 8));
     }
 
@@ -1493,7 +1493,7 @@ static void RecordedPlayerHandleChooseItem(void)
 
 static void RecordedPlayerHandleChoosePokemon(void)
 {
-    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = RecordedBattle_GetBankAction(gActiveBattler);
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = RecordedBattle_GetBattlerAction(gActiveBattler);
     BtlController_EmitChosenMonReturnValue(1, *(gBattleStruct->monToSwitchIntoId + gActiveBattler), NULL);
     RecordedPlayerBufferExecCompleted();
 }
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 814ee8076..608d59418 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -203,16 +203,16 @@ static void HandleInputChooseAction(void)
         switch (gActionSelectionCursor[gActiveBattler])
         {
         case 0:
-            BtlController_EmitTwoReturnValues(1, ACTION_SAFARI_ZONE_BALL, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_BALL, 0);
             break;
         case 1:
-            BtlController_EmitTwoReturnValues(1, ACTION_POKEBLOCK_CASE, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_POKEBLOCK, 0);
             break;
         case 2:
-            BtlController_EmitTwoReturnValues(1, ACTION_GO_NEAR, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_GO_NEAR, 0);
             break;
         case 3:
-            BtlController_EmitTwoReturnValues(1, ACTION_SAFARI_ZONE_RUN, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_SAFARI_RUN, 0);
             break;
         }
         SafariBufferExecCompleted();
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 7f5108b9b..dd01e5996 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -233,7 +233,7 @@ static void WallyHandleActions(void)
         if (--gBattleStruct->wallyWaitFrames == 0)
         {
             PlaySE(SE_SELECT);
-            BtlController_EmitTwoReturnValues(1, ACTION_USE_MOVE, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_USE_MOVE, 0);
             WallyBufferExecCompleted();
             gBattleStruct->wallyBattleState++;
             gBattleStruct->wallyMovesState = 0;
@@ -244,7 +244,7 @@ static void WallyHandleActions(void)
         if (--gBattleStruct->wallyWaitFrames == 0)
         {
             PlaySE(SE_SELECT);
-            BtlController_EmitTwoReturnValues(1, ACTION_USE_MOVE, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_USE_MOVE, 0);
             WallyBufferExecCompleted();
             gBattleStruct->wallyBattleState++;
             gBattleStruct->wallyMovesState = 0;
@@ -275,7 +275,7 @@ static void WallyHandleActions(void)
         if (--gBattleStruct->wallyWaitFrames == 0)
         {
             PlaySE(SE_SELECT);
-            BtlController_EmitTwoReturnValues(1, ACTION_USE_ITEM, 0);
+            BtlController_EmitTwoReturnValues(1, B_ACTION_USE_ITEM, 0);
             WallyBufferExecCompleted();
         }
         break;
@@ -1162,7 +1162,7 @@ static void WallyDoMoveAnimation(void)
     switch (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState)
     {
     case 0:
-        if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+        if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
         {
             InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_SUBSTITUTE_TO_MON);
         }
@@ -1181,7 +1181,7 @@ static void WallyDoMoveAnimation(void)
         if (!gAnimScriptActive)
         {
             sub_805EB9C(1);
-            if (gBattleSpritesDataPtr->bankData[gActiveBattler].behindSubstitute)
+            if (gBattleSpritesDataPtr->battlerData[gActiveBattler].behindSubstitute)
             {
                 InitAndLaunchSpecialAnimation(gActiveBattler, gActiveBattler, gActiveBattler, B_ANIM_MON_TO_SUBSTITUTE);
             }
@@ -1490,7 +1490,7 @@ static void sub_816AA80(u8 bank)
 {
     u16 species;
 
-    gBattleSpritesDataPtr->bankData[bank].transformSpecies = 0;
+    gBattleSpritesDataPtr->battlerData[bank].transformSpecies = 0;
     gBattlerPartyIndexes[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
     gUnknown_03005D7C[bank] = CreateInvisibleSpriteWithCallback(sub_805D714);
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 4d8b63c65..4f523cfa0 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -31,8 +31,8 @@ extern u8 gBattleBuffersTransferData[0x100];
 extern u8 gUnknown_02022D08;
 extern u8 gUnknown_02022D09;
 extern u8 gUnknown_02022D0A;
-extern u8 gBattleMoveAttacker;
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerAttacker;
+extern u8 gBattlerTarget;
 extern u8 gAbsentBattlerFlags;
 extern u8 gEffectBank;
 extern u16 gBattleWeather;
@@ -42,7 +42,7 @@ extern u16 gChosenMove;
 extern u16 gLastUsedItem;
 extern u8 gBattleOutcome;
 extern u8 gLastUsedAbility;
-extern u8 gStringBank;
+extern u8 gStringBattler;
 
 extern const struct BattleMove gBattleMoves[];
 
@@ -752,8 +752,8 @@ void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data)
     }
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_BUFFER_ID] = bufferId;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BANK] = gActiveBattler;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBattleMoveAttacker;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBattleMoveTarget;
+    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBattlerAttacker;
+    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBattlerTarget;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_LO] = alignedSize;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BANK_FLAGS] = gAbsentBattlerFlags;
@@ -920,8 +920,8 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
 
             if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
             {
-                gBattleMoveAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 2];
-                gBattleMoveTarget = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
+                gBattlerAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 2];
+                gBattlerTarget = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
                 gAbsentBattlerFlags = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 6];
                 gEffectBank = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 7];
             }
@@ -1126,7 +1126,7 @@ void BtlController_EmitPrintString(u8 bufferId, u16 stringID)
     stringInfo->scrActive = gBattleScripting.battler;
     stringInfo->unk1605E = gBattleStruct->field_52;
     stringInfo->hpScale = gBattleStruct->hpScale;
-    stringInfo->StringBank = gStringBank;
+    stringInfo->StringBank = gStringBattler;
     stringInfo->moveType = gBattleMoves[gCurrentMove].type;
 
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index d7806aee0..7958d07b3 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -127,7 +127,7 @@ static const struct SpritePalette gUnknown_0832C128[2] =
 void AllocateBattleSpritesData(void)
 {
     gBattleSpritesDataPtr = AllocZeroed(sizeof(struct BattleSpriteData));
-    gBattleSpritesDataPtr->bankData = AllocZeroed(sizeof(struct BattleSpriteInfo) * MAX_BATTLERS_COUNT);
+    gBattleSpritesDataPtr->battlerData = AllocZeroed(sizeof(struct BattleSpriteInfo) * MAX_BATTLERS_COUNT);
     gBattleSpritesDataPtr->healthBoxesData = AllocZeroed(sizeof(struct BattleHealthboxInfo) * MAX_BATTLERS_COUNT);
     gBattleSpritesDataPtr->animationData = AllocZeroed(sizeof(struct BattleAnimationInfo));
     gBattleSpritesDataPtr->battleBars = AllocZeroed(sizeof(struct BattleBarInfo) * MAX_BATTLERS_COUNT);
@@ -141,7 +141,7 @@ void FreeBattleSpritesData(void)
     FREE_AND_SET_NULL(gBattleSpritesDataPtr->battleBars);
     FREE_AND_SET_NULL(gBattleSpritesDataPtr->animationData);
     FREE_AND_SET_NULL(gBattleSpritesDataPtr->healthBoxesData);
-    FREE_AND_SET_NULL(gBattleSpritesDataPtr->bankData);
+    FREE_AND_SET_NULL(gBattleSpritesDataPtr->battlerData);
     FREE_AND_SET_NULL(gBattleSpritesDataPtr);
 }
 
@@ -432,12 +432,12 @@ bool8 TryHandleLaunchBattleTableAnimation(u8 activeBank, u8 atkBank, u8 defBank,
         gBattleMonForms[activeBank] = (argument & ~(0x80));
         return TRUE;
     }
-    if (gBattleSpritesDataPtr->bankData[activeBank].behindSubstitute
+    if (gBattleSpritesDataPtr->battlerData[activeBank].behindSubstitute
         && !ShouldAnimBeDoneRegardlessOfSubsitute(tableId))
     {
         return TRUE;
     }
-    if (gBattleSpritesDataPtr->bankData[activeBank].behindSubstitute
+    if (gBattleSpritesDataPtr->battlerData[activeBank].behindSubstitute
         && tableId == B_ANIM_SUBSTITUTE_FADE
         && gSprites[gBattlerSpriteIds[activeBank]].invisible)
     {
@@ -549,14 +549,14 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
 
     monsPersonality = GetMonData(mon, MON_DATA_PERSONALITY);
 
-    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies == SPECIES_NONE)
     {
         species = GetMonData(mon, MON_DATA_SPECIES);
         currentPersonality = monsPersonality;
     }
     else
     {
-        species = gBattleSpritesDataPtr->bankData[bank].transformSpecies;
+        species = gBattleSpritesDataPtr->battlerData[bank].transformSpecies;
         currentPersonality = gTransformedPersonalities[bank];
     }
 
@@ -568,7 +568,7 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
 
     paletteOffset = 0x100 + bank * 16;
 
-    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies == SPECIES_NONE)
         lzPaletteData = GetMonFrontSpritePal(mon);
     else
         lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
@@ -585,7 +585,7 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
     }
 
     // transform's pink color
-    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies != SPECIES_NONE)
     {
         BlendPalette(paletteOffset, 16, 6, 0x7FFF);
         CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
@@ -602,21 +602,21 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
 
     monsPersonality = GetMonData(mon, MON_DATA_PERSONALITY);
 
-    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies == SPECIES_NONE)
     {
         species = GetMonData(mon, MON_DATA_SPECIES);
         currentPersonality = monsPersonality;
     }
     else
     {
-        species = gBattleSpritesDataPtr->bankData[bank].transformSpecies;
+        species = gBattleSpritesDataPtr->battlerData[bank].transformSpecies;
         currentPersonality = gTransformedPersonalities[bank];
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
     position = GetBattlerPosition(bank);
 
-    if (sub_80688F8(1, bank) == 1 || gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
+    if (sub_80688F8(1, bank) == 1 || gBattleSpritesDataPtr->battlerData[bank].transformSpecies != SPECIES_NONE)
     {
         HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species],
                                                   gMonSpritesGfxPtr->sprites[position],
@@ -631,7 +631,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
 
     paletteOffset = 0x100 + bank * 16;
 
-    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies == SPECIES_NONE)
         lzPaletteData = GetMonFrontSpritePal(mon);
     else
         lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
@@ -648,7 +648,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
     }
 
     // transform's pink color
-    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies != SPECIES_NONE)
     {
         BlendPalette(paletteOffset, 16, 6, 0x7FFF);
         CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
@@ -804,7 +804,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
         if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) && *bank == 0)
             gHealthboxSpriteIds[*bank] = CreateSafariPlayerHealthboxSprites();
         else
-            gHealthboxSpriteIds[*bank] = CreateHealthboxSprites(*bank);
+            gHealthboxSpriteIds[*bank] = CreateBattlerHealthboxSprites(*bank);
 
         (*bank)++;
         if (*bank == gBattlersCount)
@@ -864,7 +864,7 @@ void ClearSpritesHealthboxAnimData(void)
 static void ClearSpritesBankHealthboxAnimData(void)
 {
     ClearSpritesHealthboxAnimData();
-    memset(gBattleSpritesDataPtr->bankData, 0, sizeof(struct BattleSpriteInfo) * MAX_BATTLERS_COUNT);
+    memset(gBattleSpritesDataPtr->battlerData, 0, sizeof(struct BattleSpriteInfo) * MAX_BATTLERS_COUNT);
 }
 
 void CopyAllBattleSpritesInvisibilities(void)
@@ -872,12 +872,12 @@ void CopyAllBattleSpritesInvisibilities(void)
     s32 i;
 
     for (i = 0; i < gBattlersCount; i++)
-        gBattleSpritesDataPtr->bankData[i].invisible = gSprites[gBattlerSpriteIds[i]].invisible;
+        gBattleSpritesDataPtr->battlerData[i].invisible = gSprites[gBattlerSpriteIds[i]].invisible;
 }
 
 void CopyBattleSpriteInvisibility(u8 bank)
 {
-    gBattleSpritesDataPtr->bankData[bank].invisible = gSprites[gBattlerSpriteIds[bank]].invisible;
+    gBattleSpritesDataPtr->battlerData[bank].invisible = gSprites[gBattlerSpriteIds[bank]].invisible;
 }
 
 void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
@@ -894,7 +894,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
         paletteOffset = 0x100 + bankAtk * 16;
         LoadPalette(gBattleStruct->castformPalette[gBattleSpritesDataPtr->animationData->animArg], paletteOffset, 32);
         gBattleMonForms[bankAtk] = gBattleSpritesDataPtr->animationData->animArg;
-        if (gBattleSpritesDataPtr->bankData[bankAtk].transformSpecies != SPECIES_NONE)
+        if (gBattleSpritesDataPtr->battlerData[bankAtk].transformSpecies != SPECIES_NONE)
         {
             BlendPalette(paletteOffset, 16, 6, 0x7FFF);
             CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
@@ -970,7 +970,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
 
         if (!IsContest())
         {
-            gBattleSpritesDataPtr->bankData[bankAtk].transformSpecies = targetSpecies;
+            gBattleSpritesDataPtr->battlerData[bankAtk].transformSpecies = targetSpecies;
             gBattleMonForms[bankAtk] = gBattleMonForms[bankDef];
         }
 
@@ -1040,12 +1040,12 @@ void LoadBattleMonGfxAndAnimate(u8 bank, bool8 loadMonSprite, u8 spriteId)
 void TrySetBehindSubstituteSpriteBit(u8 bank, u16 move)
 {
     if (move == MOVE_SUBSTITUTE)
-        gBattleSpritesDataPtr->bankData[bank].behindSubstitute = 1;
+        gBattleSpritesDataPtr->battlerData[bank].behindSubstitute = 1;
 }
 
 void ClearBehindSubstituteBit(u8 bank)
 {
-    gBattleSpritesDataPtr->bankData[bank].behindSubstitute = 0;
+    gBattleSpritesDataPtr->battlerData[bank].behindSubstitute = 0;
 }
 
 void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank)
@@ -1055,22 +1055,22 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank)
 
     if (GetHPBarLevel(hp, maxHP) == HP_BAR_RED)
     {
-        if (!gBattleSpritesDataPtr->bankData[bank].lowHpSong)
+        if (!gBattleSpritesDataPtr->battlerData[bank].lowHpSong)
         {
-            if (!gBattleSpritesDataPtr->bankData[bank ^ BIT_FLANK].lowHpSong)
+            if (!gBattleSpritesDataPtr->battlerData[bank ^ BIT_FLANK].lowHpSong)
                 PlaySE(SE_HINSI);
-            gBattleSpritesDataPtr->bankData[bank].lowHpSong = 1;
+            gBattleSpritesDataPtr->battlerData[bank].lowHpSong = 1;
         }
     }
     else
     {
-        gBattleSpritesDataPtr->bankData[bank].lowHpSong = 0;
+        gBattleSpritesDataPtr->battlerData[bank].lowHpSong = 0;
         if (!IsDoubleBattle())
         {
             m4aSongNumStop(SE_HINSI);
             return;
         }
-        if (IsDoubleBattle() && !gBattleSpritesDataPtr->bankData[bank ^ BIT_FLANK].lowHpSong)
+        if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[bank ^ BIT_FLANK].lowHpSong)
         {
             m4aSongNumStop(SE_HINSI);
             return;
@@ -1082,9 +1082,9 @@ void BattleStopLowHpSound(void)
 {
     u8 playerBank = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
 
-    gBattleSpritesDataPtr->bankData[playerBank].lowHpSong = 0;
+    gBattleSpritesDataPtr->battlerData[playerBank].lowHpSong = 0;
     if (IsDoubleBattle())
-        gBattleSpritesDataPtr->bankData[playerBank ^ BIT_FLANK].lowHpSong = 0;
+        gBattleSpritesDataPtr->battlerData[playerBank ^ BIT_FLANK].lowHpSong = 0;
 
     m4aSongNumStop(SE_HINSI);
 }
@@ -1168,11 +1168,11 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
     }
     if (gAnimScriptActive || bankSprite->invisible)
         invisible = TRUE;
-    else if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE
-             && gEnemyMonElevation[gBattleSpritesDataPtr->bankData[bank].transformSpecies] == 0)
+    else if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies != SPECIES_NONE
+             && gEnemyMonElevation[gBattleSpritesDataPtr->battlerData[bank].transformSpecies] == 0)
         invisible = TRUE;
 
-    if (gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
+    if (gBattleSpritesDataPtr->battlerData[bank].behindSubstitute)
         invisible = TRUE;
 
     shadowSprite->pos1.x = bankSprite->pos1.x;
@@ -1193,8 +1193,8 @@ void SetBattlerShadowSpriteCallback(u8 bank, u16 species)
     if (GetBattlerSide(bank) == B_SIDE_PLAYER)
         return;
 
-    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != SPECIES_NONE)
-        species = gBattleSpritesDataPtr->bankData[bank].transformSpecies;
+    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies != SPECIES_NONE)
+        species = gBattleSpritesDataPtr->battlerData[bank].transformSpecies;
 
     if (gEnemyMonElevation[species] != 0)
         gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].callback = SpriteCB_EnemyShadow;
@@ -1232,7 +1232,7 @@ void sub_805EF14(void)
 
 void ClearTemporarySpeciesSpriteData(u8 bank, bool8 dontClearSubstitute)
 {
-    gBattleSpritesDataPtr->bankData[bank].transformSpecies = SPECIES_NONE;
+    gBattleSpritesDataPtr->battlerData[bank].transformSpecies = SPECIES_NONE;
     gBattleMonForms[bank] = 0;
     if (!dontClearSubstitute)
         ClearBehindSubstituteBit(bank);
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 941fd20d5..debbc8eb7 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -898,7 +898,7 @@ void sub_80724A8(s16 arg0, s16 arg1, u16 *arg2)
 // healthboxSpriteId_2 refers to the other part
 // there's also one other sprite that appears to be a black square? dont fully understand its role
 
-u8 CreateHealthboxSprites(u8 bank)
+u8 CreateBattlerHealthboxSprites(u8 battler)
 {
     s16 data6 = 0;
     u8 healthboxSpriteId_1, healthboxSpriteId_2;
@@ -907,7 +907,7 @@ u8 CreateHealthboxSprites(u8 bank)
 
     if (!IsDoubleBattle())
     {
-        if (GetBattlerSide(bank) == B_SIDE_PLAYER)
+        if (GetBattlerSide(battler) == B_SIDE_PLAYER)
         {
             healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1);
             healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[0], 240, 160, 1);
@@ -932,10 +932,10 @@ u8 CreateHealthboxSprites(u8 bank)
     }
     else
     {
-        if (GetBattlerSide(bank) == B_SIDE_PLAYER)
+        if (GetBattlerSide(battler) == B_SIDE_PLAYER)
         {
-            healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(bank) / 2], 240, 160, 1);
-            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(bank) / 2], 240, 160, 1);
+            healthboxSpriteId_1 = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1);
+            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1);
 
             gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2;
 
@@ -947,8 +947,8 @@ u8 CreateHealthboxSprites(u8 bank)
         }
         else
         {
-            healthboxSpriteId_1 = CreateSprite(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(bank) / 2], 240, 160, 1);
-            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(bank) / 2], 240, 160, 1);
+            healthboxSpriteId_1 = CreateSprite(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1);
+            healthboxSpriteId_2 = CreateSpriteAtEnd(&sHealthboxOpponentSpriteTemplates[GetBattlerPosition(battler) / 2], 240, 160, 1);
 
             gSprites[healthboxSpriteId_1].oam.affineParam = healthboxSpriteId_2;
 
@@ -960,16 +960,16 @@ u8 CreateHealthboxSprites(u8 bank)
         }
     }
 
-    unkSpriteId = CreateSpriteAtEnd(&sUnknown_0832C1C0[gBattlerPositions[bank]], 140, 60, 0);
+    unkSpriteId = CreateSpriteAtEnd(&sUnknown_0832C1C0[gBattlerPositions[battler]], 140, 60, 0);
     unkSpritePtr = &gSprites[unkSpriteId];
-    SetSubspriteTables(unkSpritePtr, &sUnknown_0832C28C[GetBattlerSide(bank)]);
+    SetSubspriteTables(unkSpritePtr, &sUnknown_0832C28C[GetBattlerSide(battler)]);
     unkSpritePtr->subspriteMode = 2;
     unkSpritePtr->oam.priority = 1;
 
     CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void*)(OBJ_VRAM0 + unkSpritePtr->oam.tileNum * 32), 64);
 
     gSprites[healthboxSpriteId_1].data[5] = unkSpriteId;
-    gSprites[healthboxSpriteId_1].data[6] = bank;
+    gSprites[healthboxSpriteId_1].data[6] = battler;
     gSprites[healthboxSpriteId_1].invisible = 1;
 
     gSprites[healthboxSpriteId_2].invisible = 1;
@@ -1099,20 +1099,20 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority)
     }
 }
 
-void InitBattlerHealthboxCoords(u8 bank)
+void InitBattlerHealthboxCoords(u8 battler)
 {
     s16 x = 0, y = 0;
 
     if (!IsDoubleBattle())
     {
-        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
+        if (GetBattlerSide(battler) != B_SIDE_PLAYER)
             x = 44, y = 30;
         else
             x = 158, y = 88;
     }
     else
     {
-        switch (GetBattlerPosition(bank))
+        switch (GetBattlerPosition(battler))
         {
         case B_POSITION_PLAYER_LEFT:
             x = 159, y = 76;
@@ -1129,7 +1129,7 @@ void InitBattlerHealthboxCoords(u8 bank)
         }
     }
 
-    UpdateSpritePos(gHealthboxSpriteIds[bank], x, y);
+    UpdateSpritePos(gHealthboxSpriteIds[battler], x, y);
 }
 
 static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl)
@@ -1210,11 +1210,11 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent)
     }
     else
     {
-        u8 bank;
+        u8 battler;
 
         memcpy(text, sUnknown_0832C3C4, sizeof(sUnknown_0832C3C4));
-        bank = gSprites[healthboxSpriteId].data[6];
-        if (IsDoubleBattle() == TRUE || GetBattlerSide(bank) == B_SIDE_OPPONENT)
+        battler = gSprites[healthboxSpriteId].data[6];
+        if (IsDoubleBattle() == TRUE || GetBattlerSide(battler) == B_SIDE_OPPONENT)
         {
             UpdateHpTextInHealthboxInDoubles(healthboxSpriteId, value, maxOrCurrent);
         }
@@ -1260,7 +1260,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
 
     if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER)
     {
-        if (gBattleSpritesDataPtr->bankData[gSprites[healthboxSpriteId].data[6]].hpNumbersNoBars) // don't print text if only bars are visible
+        if (gBattleSpritesDataPtr->battlerData[gSprites[healthboxSpriteId].data[6]].hpNumbersNoBars) // don't print text if only bars are visible
         {
             spriteTileNum = gSprites[gSprites[healthboxSpriteId].data[5]].oam.tileNum * 32;
             objVram = (void*)(OBJ_VRAM0) + spriteTileNum;
@@ -1294,7 +1294,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
         memcpy(text, sUnknown_0832C3D8, sizeof(sUnknown_0832C3D8));
         bank = gSprites[healthboxSpriteId].data[6];
 
-        if (gBattleSpritesDataPtr->bankData[bank].hpNumbersNoBars) // don't print text if only bars are visible
+        if (gBattleSpritesDataPtr->battlerData[bank].hpNumbersNoBars) // don't print text if only bars are visible
         {
             u8 var = 4;
             u8 r7;
@@ -1423,8 +1423,8 @@ void SwapHpBarsWithHpText(void)
         {
             bool8 noBars;
 
-            gBattleSpritesDataPtr->bankData[i].hpNumbersNoBars ^= 1;
-            noBars = gBattleSpritesDataPtr->bankData[i].hpNumbersNoBars;
+            gBattleSpritesDataPtr->battlerData[i].hpNumbersNoBars ^= 1;
+            noBars = gBattleSpritesDataPtr->battlerData[i].hpNumbersNoBars;
             if (GetBattlerSide(i) == B_SIDE_PLAYER)
             {
                 if (!IsDoubleBattle())
@@ -2062,7 +2062,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
         for (i = 0; i < 3; i++)
             CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder + i) * 32), 32);
 
-        if (!gBattleSpritesDataPtr->bankData[bank].hpNumbersNoBars)
+        if (!gBattleSpritesDataPtr->battlerData[bank].hpNumbersNoBars)
             CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void *)(OBJ_VRAM0 + gSprites[healthboxSpriteId_2].oam.tileNum * 32), 64);
 
         TryAddPokeballIconToHealthbox(healthboxSpriteId, TRUE);
@@ -2077,7 +2077,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
     CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * 32), 96);
     if (IsDoubleBattle() == TRUE || GetBattlerSide(bank) == B_SIDE_OPPONENT)
     {
-        if (!gBattleSpritesDataPtr->bankData[bank].hpNumbersNoBars)
+        if (!gBattleSpritesDataPtr->battlerData[bank].hpNumbersNoBars)
         {
             CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_0), (void*)(OBJ_VRAM0 + gSprites[healthboxSpriteId_2].oam.tileNum * 32), 32);
             CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_65), (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId_2].oam.tileNum + 1) * 32), 32);
@@ -2275,7 +2275,7 @@ s32 sub_8074AA0(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3)
                     8, expFraction);
     }
 
-    if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->bankData[bank].hpNumbersNoBars))
+    if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[bank].hpNumbersNoBars))
         sub_8074B9C(bank, whichBar);
 
     if (var == -1)
diff --git a/src/battle_main.c b/src/battle_main.c
index df3fc9378..3704ff3b4 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -91,7 +91,7 @@ extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern u8 gStringBank;
+extern u8 gStringBattler;
 extern u32 gUnknown_02022F88;
 extern u32 gHitMarker;
 extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
@@ -103,8 +103,8 @@ extern u16 gPauseCounterBattle;
 extern u16 gRandomTurnNumber;
 extern u8 gActiveBattler;
 extern u8 gBattlersCount;
-extern u8 gBattleMoveAttacker;
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerAttacker;
+extern u8 gBattlerTarget;
 extern u8 gLeveledUpInBattle;
 extern u8 gAbsentBattlerFlags;
 extern u32 gBattleControllerExecFlags;
@@ -127,8 +127,8 @@ extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
-extern u8 gActionForBanks[MAX_BATTLERS_COUNT];
-extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
+extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
+extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT];
 extern u8 gCurrentActionFuncId;
 extern u8 gLastUsedAbility;
 extern u8 gUnknown_0203CF00[];
@@ -264,20 +264,20 @@ static void HandleAction_ActionFinished(void);
 // rom const data
 static void (* const sTurnActionsFuncsTable[])(void) =
 {
-    HandleAction_UseMove,               // ACTION_USE_MOVE
-    HandleAction_UseItem,               // ACTION_USE_ITEM
-    HandleAction_Switch,                // ACTION_SWITCH
-    HandleAction_Run,                   // ACTION_RUN
-    HandleAction_WatchesCarefully,      // ACTION_WATCHES_CAREFULLY
-    HandleAction_SafariZoneBallThrow,   // ACTION_SAFARI_ZONE_BALL
-    HandleAction_ThrowPokeblock,        // ACTION_POKEBLOCK_CASE
-    HandleAction_GoNear,                // ACTION_GO_NEAR
-    HandleAction_SafriZoneRun,          // ACTION_SAFARI_ZONE_RUN
-    HandleAction_Action9,               // ACTION_9
-    HandleAction_RunBattleScript,       // ACTION_RUN_BATTLESCRIPT
+    HandleAction_UseMove,               // B_ACTION_USE_MOVE
+    HandleAction_UseItem,               // B_ACTION_USE_ITEM
+    HandleAction_Switch,                // B_ACTION_SWITCH
+    HandleAction_Run,                   // B_ACTION_RUN
+    HandleAction_WatchesCarefully,      // B_ACTION_SAFARI_WATCH_CAREFULLY
+    HandleAction_SafariZoneBallThrow,   // B_ACTION_SAFARI_BALL
+    HandleAction_ThrowPokeblock,        // B_ACTION_SAFARI_POKEBLOCK
+    HandleAction_GoNear,                // B_ACTION_SAFARI_GO_NEAR
+    HandleAction_SafriZoneRun,          // B_ACTION_SAFARI_RUN
+    HandleAction_Action9,               // B_ACTION_UNKNOWN9
+    HandleAction_RunBattleScript,       // B_ACTION_EXEC_SCRIPT
     HandleAction_Action11,              // not sure about this one
-    HandleAction_ActionFinished,        // ACTION_FINISHED
-    HandleAction_NothingIsFainted,      // ACTION_NOTHING_FAINTED
+    HandleAction_ActionFinished,        // B_ACTION_FINISHED
+    HandleAction_NothingIsFainted,      // B_ACTION_NOTHING_FAINTED
 };
 
 static void (* const sEndTurnFuncsTable[])(void) =
@@ -2371,8 +2371,8 @@ u32 sub_80397C4(u32 setId, u32 tableId)
     return gUnknown_0831ABA0[setId][tableId].width * 8;
 }
 
-#define tBank               data[0]
-#define tSpeciesId          data[2]
+#define sBattler            data[0]
+#define sSpeciesId          data[2]
 
 void oac_poke_opponent(struct Sprite *sprite)
 {
@@ -2397,8 +2397,8 @@ static void sub_8039838(struct Sprite *sprite)
 {
     if (sprite->animEnded)
     {
-        sub_8076918(sprite->tBank);
-        SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->tBank]);
+        sub_8076918(sprite->sBattler);
+        SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->sBattler]);
         sprite->callback = sub_8039894;
         StartSpriteAnimIfDifferent(sprite, 0);
         BeginNormalPaletteFade(0x20000, 0, 10, 0, 0x2108);
@@ -2409,7 +2409,7 @@ static void sub_8039894(struct Sprite *sprite)
 {
     if (!gPaletteFade.active)
     {
-        BattleAnimateFrontSprite(sprite, sprite->tSpeciesId, FALSE, 1);
+        BattleAnimateFrontSprite(sprite, sprite->sSpeciesId, FALSE, 1);
     }
 }
 
@@ -2447,20 +2447,20 @@ extern const struct MonCoords gCastformFrontSpriteCoords[];
 
 void sub_8039934(struct Sprite *sprite)
 {
-    u8 bank = sprite->tBank;
+    u8 battler = sprite->sBattler;
     u16 species;
     u8 yOffset;
 
-    if (gBattleSpritesDataPtr->bankData[bank].transformSpecies != 0)
-        species = gBattleSpritesDataPtr->bankData[bank].transformSpecies;
+    if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies != 0)
+        species = gBattleSpritesDataPtr->battlerData[battler].transformSpecies;
     else
-        species = sprite->tSpeciesId;
+        species = sprite->sSpeciesId;
 
-    GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_PERSONALITY);  // Unused return value
+    GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_PERSONALITY);  // Unused return value
 
     if (species == SPECIES_UNOWN)
     {
-        u32 personalityValue = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_PERSONALITY);
+        u32 personalityValue = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_PERSONALITY);
         u16 unownForm = ((((personalityValue & 0x3000000) >> 18) | ((personalityValue & 0x30000) >> 12) | ((personalityValue & 0x300) >> 6) | (personalityValue & 3)) % 0x1C);
         u16 unownSpecies;
 
@@ -2473,7 +2473,7 @@ void sub_8039934(struct Sprite *sprite)
     }
     else if (species == SPECIES_CASTFORM)
     {
-        yOffset = gCastformFrontSpriteCoords[gBattleMonForms[bank]].y_offset;
+        yOffset = gCastformFrontSpriteCoords[gBattleMonForms[battler]].y_offset;
     }
     else if (species > NUM_SPECIES)
     {
@@ -2506,12 +2506,12 @@ static void sub_8039A48(struct Sprite *sprite)
         }
         else
         {
-            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBattlerPosition(sprite->tBank)] + (gBattleMonForms[sprite->tBank] << 11) + (sprite->data[3] << 8);
+            u8 *dst = (u8 *)gMonSpritesGfxPtr->sprites[GetBattlerPosition(sprite->sBattler)] + (gBattleMonForms[sprite->sBattler] << 11) + (sprite->data[3] << 8);
 
             for (i = 0; i < 0x100; i++)
                 *(dst++) = 0;
 
-            StartSpriteAnim(sprite, gBattleMonForms[sprite->tBank]);
+            StartSpriteAnim(sprite, gBattleMonForms[sprite->sBattler]);
         }
     }
 }
@@ -2546,10 +2546,10 @@ void sub_8039B58(struct Sprite *sprite)
     {
         if (!(gHitMarker & HITMARKER_NO_ANIMATIONS) || gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
         {
-            if (HasTwoFramesAnimation(sprite->tSpeciesId))
+            if (HasTwoFramesAnimation(sprite->sSpeciesId))
                 StartSpriteAnim(sprite, 1);
         }
-        BattleAnimateFrontSprite(sprite, sprite->tSpeciesId, TRUE, 1);
+        BattleAnimateFrontSprite(sprite, sprite->sSpeciesId, TRUE, 1);
     }
 }
 
@@ -2589,35 +2589,35 @@ void sub_8039C00(struct Sprite *sprite)
     }
 }
 
-void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d)
+void dp11b_obj_instanciate(u8 battler, u8 b, s8 c, s8 d)
 {
     u8 bounceHealthBoxSpriteId;
     u8 spriteId2;
 
     if (b)
     {
-        if (gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2)
+        if (gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2)
             return;
     }
     else
     {
-        if (gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4)
+        if (gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4)
             return;
     }
 
     bounceHealthBoxSpriteId = CreateInvisibleSpriteWithCallback(SpriteCB_HealthBoxBounce);
     if (b == TRUE)
     {
-        spriteId2 = gHealthboxSpriteIds[bank];
-        gBattleSpritesDataPtr->healthBoxesData[bank].field_2 = bounceHealthBoxSpriteId;
-        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2 = 1;
+        spriteId2 = gHealthboxSpriteIds[battler];
+        gBattleSpritesDataPtr->healthBoxesData[battler].field_2 = bounceHealthBoxSpriteId;
+        gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2 = 1;
         gSprites[bounceHealthBoxSpriteId].data[0] = 0x80;
     }
     else
     {
-        spriteId2 = gBattlerSpriteIds[bank];
-        gBattleSpritesDataPtr->healthBoxesData[bank].field_3 = bounceHealthBoxSpriteId;
-        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4 = 1;
+        spriteId2 = gBattlerSpriteIds[battler];
+        gBattleSpritesDataPtr->healthBoxesData[battler].field_3 = bounceHealthBoxSpriteId;
+        gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4 = 1;
         gSprites[bounceHealthBoxSpriteId].data[0] = 0xC0;
     }
     gSprites[bounceHealthBoxSpriteId].data[1] = c;
@@ -2628,27 +2628,27 @@ void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d)
     gSprites[spriteId2].pos2.y = 0;
 }
 
-void dp11b_obj_free(u8 bank, bool8 b)
+void dp11b_obj_free(u8 battler, bool8 b)
 {
     u8 r4;
 
     if (b == TRUE)
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2)
+        if (!gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2)
             return;
 
-        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_2].data[3];
-        DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_2]);
-        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x2 = 0;
+        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_2].data[3];
+        DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_2]);
+        gBattleSpritesDataPtr->healthBoxesData[battler].flag_x2 = 0;
     }
     else
     {
-        if (!gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4)
+        if (!gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4)
             return;
 
-        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_3].data[3];
-        DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].field_3]);
-        gBattleSpritesDataPtr->healthBoxesData[bank].flag_x4 = 0;
+        r4 = gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_3].data[3];
+        DestroySprite(&gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].field_3]);
+        gBattleSpritesDataPtr->healthBoxesData[battler].flag_x4 = 0;
     }
     gSprites[r4].pos2.x = 0;
     gSprites[r4].pos2.y = 0;
@@ -2671,7 +2671,7 @@ static void SpriteCB_HealthBoxBounce(struct Sprite *sprite)
 void sub_8039E44(struct Sprite *sprite)
 {
     if (sprite->affineAnimEnded)
-        BattleAnimateBackSprite(sprite, sprite->tSpeciesId);
+        BattleAnimateBackSprite(sprite, sprite->sSpeciesId);
 }
 
 void sub_8039E60(struct Sprite *sprite)
@@ -2752,8 +2752,8 @@ static void BattleStartClearSetData(void)
             dataPtr[j] = 0;
     }
 
-    gBattleMoveAttacker = 0;
-    gBattleMoveTarget = 0;
+    gBattlerAttacker = 0;
+    gBattlerTarget = 0;
     gBattleWeather = 0;
 
     dataPtr = (u8 *)&gWishFutureKnock;
@@ -2841,12 +2841,12 @@ void SwitchInClearSetData(void)
             gBattleMons[gActiveBattler].statStages[i] = 6;
         for (i = 0; i < gBattlersCount; i++)
         {
-            if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBattler)
+            if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].battlerPreventingEscape == gActiveBattler)
                 gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
-            if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].bankWithSureHit == gActiveBattler)
+            if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].battlerWithSureHit == gActiveBattler)
             {
                 gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
-                gDisableStructs[i].bankWithSureHit = 0;
+                gDisableStructs[i].battlerWithSureHit = 0;
             }
         }
     }
@@ -2859,7 +2859,7 @@ void SwitchInClearSetData(void)
         {
             if (GetBattlerSide(gActiveBattler) != GetBattlerSide(i)
              && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
-             && (gDisableStructs[i].bankWithSureHit == gActiveBattler))
+             && (gDisableStructs[i].battlerWithSureHit == gActiveBattler))
             {
                 gStatuses3[i] &= ~(STATUS3_ALWAYS_HITS);
                 gStatuses3[i] |= 0x10;
@@ -2890,10 +2890,10 @@ void SwitchInClearSetData(void)
     if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS)
     {
         gDisableStructs[gActiveBattler].substituteHP = disableStructCopy.substituteHP;
-        gDisableStructs[gActiveBattler].bankWithSureHit = disableStructCopy.bankWithSureHit;
+        gDisableStructs[gActiveBattler].battlerWithSureHit = disableStructCopy.battlerWithSureHit;
         gDisableStructs[gActiveBattler].perishSongTimer1 = disableStructCopy.perishSongTimer1;
         gDisableStructs[gActiveBattler].perishSongTimer2 = disableStructCopy.perishSongTimer2;
-        gDisableStructs[gActiveBattler].bankPreventingEscape = disableStructCopy.bankPreventingEscape;
+        gDisableStructs[gActiveBattler].battlerPreventingEscape = disableStructCopy.battlerPreventingEscape;
     }
 
     gMoveResultFlags = 0;
@@ -2937,8 +2937,8 @@ void SwitchInClearSetData(void)
     gCurrentMove = 0;
     gBattleStruct->field_DA = 0xFF;
 
-    ClearBankMoveHistory(gActiveBattler);
-    ClearBankAbilityHistory(gActiveBattler);
+    ClearBattlerMoveHistory(gActiveBattler);
+    ClearBattlerAbilityHistory(gActiveBattler);
 }
 
 void FaintClearSetData(void)
@@ -2954,7 +2954,7 @@ void FaintClearSetData(void)
 
     for (i = 0; i < gBattlersCount; i++)
     {
-        if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBattler)
+        if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].battlerPreventingEscape == gActiveBattler)
             gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
         if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBattler))
             gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBattler));
@@ -3030,8 +3030,8 @@ void FaintClearSetData(void)
     gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
     gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
 
-    ClearBankMoveHistory(gActiveBattler);
-    ClearBankAbilityHistory(gActiveBattler);
+    ClearBattlerMoveHistory(gActiveBattler);
+    ClearBattlerAbilityHistory(gActiveBattler);
 }
 
 static void BattleIntroGetMonsData(void)
@@ -3639,8 +3639,8 @@ static void TryDoEventsBeforeFirstTurn(void)
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         *(gBattleStruct->monToSwitchIntoId + i) = 6;
-        gActionForBanks[i] = ACTION_INIT_VALUE;
-        gChosenMovesByBanks[i] = MOVE_NONE;
+        gChosenActionByBattler[i] = B_ACTION_NONE;
+        gChosenMoveByBattler[i] = MOVE_NONE;
     }
     TurnValuesCleanUp(FALSE);
     SpecialStatusesClear();
@@ -3744,8 +3744,8 @@ void BattleTurnPassed(void)
 
     for (i = 0; i < gBattlersCount; i++)
     {
-        gActionForBanks[i] = ACTION_INIT_VALUE;
-        gChosenMovesByBanks[i] = MOVE_NONE;
+        gChosenActionByBattler[i] = B_ACTION_NONE;
+        gChosenMoveByBattler[i] = MOVE_NONE;
     }
 
     for (i = 0; i < 4; i++)
@@ -3773,7 +3773,7 @@ u8 IsRunningFromBattleImpossible(void)
     else
         holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
 
-    gStringBank = gActiveBattler;
+    gStringBattler = gActiveBattler;
 
     if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
         return 0;
@@ -3828,34 +3828,34 @@ u8 IsRunningFromBattleImpossible(void)
     return 0;
 }
 
-void sub_803BDA0(u8 bank)
+void sub_803BDA0(u8 battler)
 {
     s32 i;
     u8 r4;
     u8 r1;
 
-    // gBattleStruct->field_60[bank][i]
+    // gBattleStruct->field_60[battler][i]
 
     for (i = 0; i < 3; i++)
-        gUnknown_0203CF00[i] = *(bank * 3 + i + (u8*)(gBattleStruct->field_60));
+        gUnknown_0203CF00[i] = *(battler * 3 + i + (u8*)(gBattleStruct->field_60));
 
-    r4 = pokemon_order_func(gBattlerPartyIndexes[bank]);
-    r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + bank));
+    r4 = pokemon_order_func(gBattlerPartyIndexes[battler]);
+    r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + battler));
     sub_81B8FB0(r4, r1);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
         for (i = 0; i < 3; i++)
         {
-            *(bank * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
-            *((bank ^ BIT_FLANK) * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+            *(battler * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+            *(BATTLE_PARTNER(battler) * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
         }
     }
     else
     {
         for (i = 0; i < 3; i++)
         {
-            *(bank * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+            *(battler * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
         }
     }
 }
@@ -3891,12 +3891,12 @@ static void HandleTurnActionSelectionState(void)
             *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI
                 || !(position & BIT_FLANK)
-                || gBattleStruct->field_91 & gBitTable[GetBattlerAtPosition(position ^ BIT_FLANK)]
-                || gBattleCommunication[GetBattlerAtPosition(position ^ BIT_FLANK)] == 5)
+                || gBattleStruct->field_91 & gBitTable[GetBattlerAtPosition(BATTLE_PARTNER(position))]
+                || gBattleCommunication[GetBattlerAtPosition(BATTLE_PARTNER(position))] == 5)
             {
                 if (gBattleStruct->field_91 & gBitTable[gActiveBattler])
                 {
-                    gActionForBanks[gActiveBattler] = ACTION_NOTHING_FAINTED;
+                    gChosenActionByBattler[gActiveBattler] = B_ACTION_NOTHING_FAINTED;
                     if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
                         gBattleCommunication[gActiveBattler] = STATE_WAIT_ACTION_CONFIRMED;
                     else
@@ -3907,12 +3907,12 @@ static void HandleTurnActionSelectionState(void)
                     if (gBattleMons[gActiveBattler].status2 & STATUS2_MULTIPLETURNS
                         || gBattleMons[gActiveBattler].status2 & STATUS2_RECHARGE)
                     {
-                        gActionForBanks[gActiveBattler] = ACTION_USE_MOVE;
+                        gChosenActionByBattler[gActiveBattler] = B_ACTION_USE_MOVE;
                         gBattleCommunication[gActiveBattler] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                     }
                     else
                     {
-                        BtlController_EmitChooseAction(0, gActionForBanks[0], gBattleBufferB[0][1] | (gBattleBufferB[0][2] << 8));
+                        BtlController_EmitChooseAction(0, gChosenActionByBattler[0], gBattleBufferB[0][1] | (gBattleBufferB[0][2] << 8));
                         MarkBattlerForControllerExec(gActiveBattler);
                         gBattleCommunication[gActiveBattler]++;
                     }
@@ -3923,11 +3923,11 @@ static void HandleTurnActionSelectionState(void)
             if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
                 RecordedBattle_SetBattlerAction(gActiveBattler, gBattleBufferB[gActiveBattler][1]);
-                gActionForBanks[gActiveBattler] = gBattleBufferB[gActiveBattler][1];
+                gChosenActionByBattler[gActiveBattler] = gBattleBufferB[gActiveBattler][1];
 
                 switch (gBattleBufferB[gActiveBattler][1])
                 {
-                case ACTION_USE_MOVE:
+                case B_ACTION_USE_MOVE:
                     if (AreAllMovesUnusable())
                     {
                         gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
@@ -3938,7 +3938,7 @@ static void HandleTurnActionSelectionState(void)
                     }
                     else if (gDisableStructs[gActiveBattler].encoredMove != 0)
                     {
-                        gChosenMovesByBanks[gActiveBattler] = gDisableStructs[gActiveBattler].encoredMove;
+                        gChosenMoveByBattler[gActiveBattler] = gDisableStructs[gActiveBattler].encoredMove;
                         *(gBattleStruct->chosenMovePositions + gActiveBattler) = gDisableStructs[gActiveBattler].encoredMovePos;
                         gBattleCommunication[gActiveBattler] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                         return;
@@ -3965,7 +3965,7 @@ static void HandleTurnActionSelectionState(void)
                         MarkBattlerForControllerExec(gActiveBattler);
                     }
                     break;
-                case ACTION_USE_ITEM:
+                case B_ACTION_USE_ITEM:
                     if (gBattleTypeFlags & (BATTLE_TYPE_LINK
                                             | BATTLE_TYPE_FRONTIER_NO_PYRAMID
                                             | BATTLE_TYPE_EREADER_TRAINER
@@ -3984,7 +3984,7 @@ static void HandleTurnActionSelectionState(void)
                         MarkBattlerForControllerExec(gActiveBattler);
                     }
                     break;
-                case ACTION_SWITCH:
+                case B_ACTION_SWITCH:
                     *(gBattleStruct->field_58 + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler];
                     if (gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)
                         || gBattleTypeFlags & BATTLE_TYPE_ARENA
@@ -4005,16 +4005,16 @@ static void HandleTurnActionSelectionState(void)
                     }
                     else
                     {
-                        if (gActiveBattler == 2 && gActionForBanks[0] == ACTION_SWITCH)
+                        if (gActiveBattler == 2 && gChosenActionByBattler[0] == B_ACTION_SWITCH)
                             BtlController_EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
-                        else if (gActiveBattler == 3 && gActionForBanks[1] == ACTION_SWITCH)
+                        else if (gActiveBattler == 3 && gChosenActionByBattler[1] == B_ACTION_SWITCH)
                             BtlController_EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                         else
                             BtlController_EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
                     }
                     MarkBattlerForControllerExec(gActiveBattler);
                     break;
-                case ACTION_SAFARI_ZONE_BALL:
+                case B_ACTION_SAFARI_BALL:
                     if (IsPlayerPartyAndPokemonStorageFull())
                     {
                         gSelectionBattleScripts[gActiveBattler] = BattleScript_PrintFullBox;
@@ -4024,44 +4024,44 @@ static void HandleTurnActionSelectionState(void)
                         return;
                     }
                     break;
-                case ACTION_POKEBLOCK_CASE:
+                case B_ACTION_SAFARI_POKEBLOCK:
                     BtlController_EmitChooseItem(0, gBattleStruct->field_60[gActiveBattler]);
                     MarkBattlerForControllerExec(gActiveBattler);
                     break;
-                case ACTION_CANCEL_PARTNER:
+                case B_ACTION_CANCEL_PARTNER:
                     gBattleCommunication[gActiveBattler] = 7;
-                    gBattleCommunication[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] = 1;
+                    gBattleCommunication[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] = 1;
                     RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
-                    if (gBattleMons[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].status2 & STATUS2_MULTIPLETURNS
-                        || gBattleMons[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].status2 & STATUS2_RECHARGE)
+                    if (gBattleMons[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].status2 & STATUS2_MULTIPLETURNS
+                        || gBattleMons[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].status2 & STATUS2_RECHARGE)
                     {
                         BtlController_EmitCmd50(0);
                         MarkBattlerForControllerExec(gActiveBattler);
                         return;
                     }
-                    else if (gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_SWITCH)
+                    else if (gChosenActionByBattler[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] == B_ACTION_SWITCH)
                     {
-                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 2);
+                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 2);
                     }
-                    else if (gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_RUN)
+                    else if (gChosenActionByBattler[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] == B_ACTION_RUN)
                     {
-                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
+                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 1);
                     }
-                    else if (gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_USE_MOVE
-                             && (gProtectStructs[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].onlyStruggle
-                                || gDisableStructs[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)].encoredMove))
+                    else if (gChosenActionByBattler[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] == B_ACTION_USE_MOVE
+                             && (gProtectStructs[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].onlyStruggle
+                                || gDisableStructs[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))].encoredMove))
                     {
-                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
+                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 1);
                     }
                     else if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-                             && gActionForBanks[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] == ACTION_USE_MOVE)
+                             && gChosenActionByBattler[GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler)))] == B_ACTION_USE_MOVE)
                     {
                         gRngValue = gBattlePalaceMoveSelectionRngValue;
-                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 1);
+                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 1);
                     }
                     else
                     {
-                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK), 3);
+                        RecordedBattle_ClearBattlerAction(GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gActiveBattler))), 3);
                     }
                     BtlController_EmitCmd50(0);
                     MarkBattlerForControllerExec(gActiveBattler);
@@ -4070,7 +4070,7 @@ static void HandleTurnActionSelectionState(void)
 
                 if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
                     && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000)
-                    && gBattleBufferB[gActiveBattler][1] == ACTION_RUN)
+                    && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN)
                 {
                     gSelectionBattleScripts[gActiveBattler] = BattleScript_AskIfWantsToForfeitMatch;
                     gBattleCommunication[gActiveBattler] = 8;
@@ -4080,13 +4080,13 @@ static void HandleTurnActionSelectionState(void)
                 }
                 else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
                          && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-                         && gBattleBufferB[gActiveBattler][1] == ACTION_RUN)
+                         && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN)
                 {
                     BattleScriptExecute(BattleScript_PrintCantRunFromTrainer);
                     gBattleCommunication[gActiveBattler] = 1;
                 }
                 else if (IsRunningFromBattleImpossible()
-                         && gBattleBufferB[gActiveBattler][1] == ACTION_RUN)
+                         && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN)
                 {
                     gSelectionBattleScripts[gActiveBattler] = BattleScript_PrintCantEscapeFromBattle;
                     gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
@@ -4103,9 +4103,9 @@ static void HandleTurnActionSelectionState(void)
         case STATE_WAIT_ACTION_CASE_CHOSEN:
             if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
             {
-                switch (gActionForBanks[gActiveBattler])
+                switch (gChosenActionByBattler[gActiveBattler])
                 {
-                case ACTION_USE_MOVE:
+                case B_ACTION_USE_MOVE:
                     switch (gBattleBufferB[gActiveBattler][1])
                     {
                     case 3:
@@ -4115,10 +4115,10 @@ static void HandleTurnActionSelectionState(void)
                     case 7:
                     case 8:
                     case 9:
-                        gActionForBanks[gActiveBattler] = gBattleBufferB[gActiveBattler][1];
+                        gChosenActionByBattler[gActiveBattler] = gBattleBufferB[gActiveBattler][1];
                         return;
                     case 15:
-                        gActionForBanks[gActiveBattler] = ACTION_SWITCH;
+                        gChosenActionByBattler[gActiveBattler] = B_ACTION_SWITCH;
                         sub_803CDF8();
                         return;
                     default:
@@ -4145,14 +4145,14 @@ static void HandleTurnActionSelectionState(void)
                                 RecordedBattle_SetBattlerAction(gActiveBattler, gBattleBufferB[gActiveBattler][3]);
                             }
                             *(gBattleStruct->chosenMovePositions + gActiveBattler) = gBattleBufferB[gActiveBattler][2];
-                            gChosenMovesByBanks[gActiveBattler] = gBattleMons[gActiveBattler].moves[*(gBattleStruct->chosenMovePositions + gActiveBattler)];
+                            gChosenMoveByBattler[gActiveBattler] = gBattleMons[gActiveBattler].moves[*(gBattleStruct->chosenMovePositions + gActiveBattler)];
                             *(gBattleStruct->moveTarget + gActiveBattler) = gBattleBufferB[gActiveBattler][3];
                             gBattleCommunication[gActiveBattler]++;
                         }
                         break;
                     }
                     break;
-                case ACTION_USE_ITEM:
+                case B_ACTION_USE_ITEM:
                     if ((gBattleBufferB[gActiveBattler][1] | (gBattleBufferB[gActiveBattler][2] << 8)) == 0)
                     {
                         gBattleCommunication[gActiveBattler] = 1;
@@ -4163,7 +4163,7 @@ static void HandleTurnActionSelectionState(void)
                         gBattleCommunication[gActiveBattler]++;
                     }
                     break;
-                case ACTION_SWITCH:
+                case B_ACTION_SWITCH:
                     if (gBattleBufferB[gActiveBattler][1] == 6)
                     {
                         gBattleCommunication[gActiveBattler] = 1;
@@ -4175,17 +4175,17 @@ static void HandleTurnActionSelectionState(void)
                         gBattleCommunication[gActiveBattler]++;
                     }
                     break;
-                case ACTION_RUN:
+                case B_ACTION_RUN:
                     gHitMarker |= HITMARKER_RUN;
                     gBattleCommunication[gActiveBattler]++;
                     break;
-                case ACTION_WATCHES_CAREFULLY:
+                case B_ACTION_SAFARI_WATCH_CAREFULLY:
                     gBattleCommunication[gActiveBattler]++;
                     break;
-                case ACTION_SAFARI_ZONE_BALL:
+                case B_ACTION_SAFARI_BALL:
                     gBattleCommunication[gActiveBattler]++;
                     break;
-                case ACTION_POKEBLOCK_CASE:
+                case B_ACTION_SAFARI_POKEBLOCK:
                     if ((gBattleBufferB[gActiveBattler][1] | (gBattleBufferB[gActiveBattler][2] << 8)) != 0)
                     {
                         gBattleCommunication[gActiveBattler]++;
@@ -4195,14 +4195,14 @@ static void HandleTurnActionSelectionState(void)
                         gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN;
                     }
                     break;
-                case ACTION_GO_NEAR:
+                case B_ACTION_SAFARI_GO_NEAR:
                     gBattleCommunication[gActiveBattler]++;
                     break;
-                case ACTION_SAFARI_ZONE_RUN:
+                case B_ACTION_SAFARI_RUN:
                     gHitMarker |= HITMARKER_RUN;
                     gBattleCommunication[gActiveBattler]++;
                     break;
-                case ACTION_9:
+                case B_ACTION_UNKNOWN9:
                     gBattleCommunication[gActiveBattler]++;
                     break;
                 }
@@ -4240,7 +4240,7 @@ static void HandleTurnActionSelectionState(void)
             }
             else
             {
-                gBattleMoveAttacker = gActiveBattler;
+                gBattlerAttacker = gActiveBattler;
                 gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBattler];
                 if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
                 {
@@ -4261,7 +4261,7 @@ static void HandleTurnActionSelectionState(void)
                 if (gBattleBufferB[gActiveBattler][1] == 13)
                 {
                     gHitMarker |= HITMARKER_RUN;
-                    gActionForBanks[gActiveBattler] = ACTION_RUN;
+                    gChosenActionByBattler[gActiveBattler] = B_ACTION_RUN;
                     gBattleCommunication[gActiveBattler] = STATE_WAIT_ACTION_CONFIRMED_STANDBY;
                 }
                 else
@@ -4272,7 +4272,7 @@ static void HandleTurnActionSelectionState(void)
             }
             else
             {
-                gBattleMoveAttacker = gActiveBattler;
+                gBattlerAttacker = gActiveBattler;
                 gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBattler];
                 if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) | (0xF0000000) | (gBitTable[gActiveBattler] << 4) | (gBitTable[gActiveBattler] << 8) | (gBitTable[gActiveBattler] << 0xC))))
                 {
@@ -4294,7 +4294,7 @@ static void HandleTurnActionSelectionState(void)
         {
             for (i = 0; i < gBattlersCount; i++)
             {
-                if (gActionForBanks[i] == ACTION_SWITCH)
+                if (gChosenActionByBattler[i] == B_ACTION_SWITCH)
                     sub_80571DC(i, *(gBattleStruct->monToSwitchIntoId + i));
             }
         }
@@ -4447,7 +4447,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
     }
     else
     {
-        if (gActionForBanks[bank1] == ACTION_USE_MOVE)
+        if (gChosenActionByBattler[bank1] == B_ACTION_USE_MOVE)
         {
             if (gProtectStructs[bank1].onlyStruggle)
                 moveBank1 = MOVE_STRUGGLE;
@@ -4457,7 +4457,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
         else
             moveBank1 = MOVE_NONE;
 
-        if (gActionForBanks[bank2] == ACTION_USE_MOVE)
+        if (gChosenActionByBattler[bank2] == B_ACTION_USE_MOVE)
         {
             if (gProtectStructs[bank2].onlyStruggle)
                 moveBank2 = MOVE_STRUGGLE;
@@ -4509,7 +4509,7 @@ static void SetActionsAndBanksTurnOrder(void)
     {
         for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
-            gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
+            gActionsByTurnOrder[var] = gChosenActionByBattler[gActiveBattler];
             gBattleTurnOrder[var] = gActiveBattler;
             var++;
         }
@@ -4520,7 +4520,7 @@ static void SetActionsAndBanksTurnOrder(void)
         {
             for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
-                if (gActionForBanks[gActiveBattler] == ACTION_RUN)
+                if (gChosenActionByBattler[gActiveBattler] == B_ACTION_RUN)
                 {
                     var = 5;
                     break;
@@ -4529,12 +4529,12 @@ static void SetActionsAndBanksTurnOrder(void)
         }
         else
         {
-            if (gActionForBanks[0] == ACTION_RUN)
+            if (gChosenActionByBattler[0] == B_ACTION_RUN)
             {
                 gActiveBattler = 0;
                 var = 5;
             }
-            if (gActionForBanks[2] == ACTION_RUN)
+            if (gChosenActionByBattler[2] == B_ACTION_RUN)
             {
                 gActiveBattler = 2;
                 var = 5;
@@ -4543,14 +4543,14 @@ static void SetActionsAndBanksTurnOrder(void)
 
         if (var == 5)
         {
-            gActionsByTurnOrder[0] = gActionForBanks[gActiveBattler];
+            gActionsByTurnOrder[0] = gChosenActionByBattler[gActiveBattler];
             gBattleTurnOrder[0] = gActiveBattler;
             var = 1;
             for (i = 0; i < gBattlersCount; i++)
             {
                 if (i != gActiveBattler)
                 {
-                    gActionsByTurnOrder[var] = gActionForBanks[i];
+                    gActionsByTurnOrder[var] = gChosenActionByBattler[i];
                     gBattleTurnOrder[var] = i;
                     var++;
                 }
@@ -4563,18 +4563,18 @@ static void SetActionsAndBanksTurnOrder(void)
         {
             for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
-                if (gActionForBanks[gActiveBattler] == ACTION_USE_ITEM || gActionForBanks[gActiveBattler] == ACTION_SWITCH)
+                if (gChosenActionByBattler[gActiveBattler] == B_ACTION_USE_ITEM || gChosenActionByBattler[gActiveBattler] == B_ACTION_SWITCH)
                 {
-                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
+                    gActionsByTurnOrder[var] = gChosenActionByBattler[gActiveBattler];
                     gBattleTurnOrder[var] = gActiveBattler;
                     var++;
                 }
             }
             for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
             {
-                if (gActionForBanks[gActiveBattler] != ACTION_USE_ITEM && gActionForBanks[gActiveBattler] != ACTION_SWITCH)
+                if (gChosenActionByBattler[gActiveBattler] != B_ACTION_USE_ITEM && gChosenActionByBattler[gActiveBattler] != B_ACTION_SWITCH)
                 {
-                    gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler];
+                    gActionsByTurnOrder[var] = gChosenActionByBattler[gActiveBattler];
                     gBattleTurnOrder[var] = gActiveBattler;
                     var++;
                 }
@@ -4585,10 +4585,10 @@ static void SetActionsAndBanksTurnOrder(void)
                 {
                     u8 bank1 = gBattleTurnOrder[i];
                     u8 bank2 = gBattleTurnOrder[j];
-                    if (gActionsByTurnOrder[i] != ACTION_USE_ITEM
-                        && gActionsByTurnOrder[j] != ACTION_USE_ITEM
-                        && gActionsByTurnOrder[i] != ACTION_SWITCH
-                        && gActionsByTurnOrder[j] != ACTION_SWITCH)
+                    if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM
+                        && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM
+                        && gActionsByTurnOrder[i] != B_ACTION_SWITCH
+                        && gActionsByTurnOrder[j] != B_ACTION_SWITCH)
                     {
                         if (GetWhoStrikesFirst(bank1, bank2, FALSE))
                             SwapTurnOrder(i, j);
@@ -4656,11 +4656,11 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
     {
         while (gBattleStruct->focusPunchBank < gBattlersCount)
         {
-            gActiveBattler = gBattleMoveAttacker = gBattleStruct->focusPunchBank;
+            gActiveBattler = gBattlerAttacker = gBattleStruct->focusPunchBank;
             gBattleStruct->focusPunchBank++;
-            if (gChosenMovesByBanks[gActiveBattler] == MOVE_FOCUS_PUNCH
+            if (gChosenMoveByBattler[gActiveBattler] == MOVE_FOCUS_PUNCH
                 && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
-                && !(gDisableStructs[gBattleMoveAttacker].truantCounter)
+                && !(gDisableStructs[gBattlerAttacker].truantCounter)
                 && !(gProtectStructs[gActiveBattler].onlyStruggle))
             {
                 BattleScriptExecute(BattleScript_FocusPunchSetUp);
@@ -4716,7 +4716,7 @@ static void HandleEndTurn_BattleWon(void)
     {
         gSpecialVar_Result = gBattleOutcome;
         gBattleTextBuff1[0] = gBattleOutcome;
-        gBattleMoveAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+        gBattlerAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
         gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
     }
@@ -4789,7 +4789,7 @@ static void HandleEndTurn_BattleLost(void)
         else
         {
             gBattleTextBuff1[0] = gBattleOutcome;
-            gBattleMoveAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+            gBattlerAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
             gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
             gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
         }
@@ -4819,7 +4819,7 @@ static void HandleEndTurn_RanFromBattle(void)
     }
     else
     {
-        switch (gProtectStructs[gBattleMoveAttacker].fleeFlag)
+        switch (gProtectStructs[gBattlerAttacker].fleeFlag)
         {
         default:
             gBattlescriptCurrInstr = BattleScript_GotAwaySafely;
@@ -4840,7 +4840,7 @@ static void HandleEndTurn_MonFled(void)
 {
     gCurrentActionFuncId = 0;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleMoveAttacker, gBattlerPartyIndexes[gBattleMoveAttacker]);
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattlerPartyIndexes[gBattlerAttacker]);
     gBattlescriptCurrInstr = BattleScript_WildMonFled;
 
     gBattleMainFunc = HandleEndTurn_FinishBattle;
@@ -4995,9 +4995,9 @@ void RunBattleScriptCommands_PopCallbacksStack(void)
 {
     if (gCurrentActionFuncId == 0xB || gCurrentActionFuncId == 0xC)
     {
-        if (BATTLE_CALLBACKS_STACK->size != 0)
-            BATTLE_CALLBACKS_STACK->size--;
-        gBattleMainFunc = BATTLE_CALLBACKS_STACK->function[BATTLE_CALLBACKS_STACK->size];
+        if (gBattleResources->battleCallbackStack->size != 0)
+            gBattleResources->battleCallbackStack->size--;
+        gBattleMainFunc = gBattleResources->battleCallbackStack->function[gBattleResources->battleCallbackStack->size];
     }
     else
     {
@@ -5017,11 +5017,11 @@ static void HandleAction_UseMove(void)
     u8 side;
     u8 var = 4;
 
-    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
 
-    if (*(&gBattleStruct->field_91) & gBitTable[gBattleMoveAttacker])
+    if (*(&gBattleStruct->field_91) & gBitTable[gBattlerAttacker])
     {
-        gCurrentActionFuncId = ACTION_FINISHED;
+        gCurrentActionFuncId = B_ACTION_FINISHED;
         return;
     }
 
@@ -5031,78 +5031,78 @@ static void HandleAction_UseMove(void)
     gMoveResultFlags = 0;
     gMultiHitCounter = 0;
     gBattleCommunication[6] = 0;
-    gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattleMoveAttacker);
+    gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattlerAttacker);
 
     // choose move
-    if (gProtectStructs[gBattleMoveAttacker].onlyStruggle)
+    if (gProtectStructs[gBattlerAttacker].onlyStruggle)
     {
-        gProtectStructs[gBattleMoveAttacker].onlyStruggle = 0;
+        gProtectStructs[gBattlerAttacker].onlyStruggle = 0;
         gCurrentMove = gChosenMove = MOVE_STRUGGLE;
         gHitMarker |= HITMARKER_NO_PPDEDUCT;
-        *(gBattleStruct->moveTarget + gBattleMoveAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
+        *(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
     }
-    else if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBattleMoveAttacker].status2 & STATUS2_RECHARGE)
+    else if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBattlerAttacker].status2 & STATUS2_RECHARGE)
     {
-        gCurrentMove = gChosenMove = gLockedMoves[gBattleMoveAttacker];
+        gCurrentMove = gChosenMove = gLockedMoves[gBattlerAttacker];
     }
     // encore forces you to use the same move
-    else if (gDisableStructs[gBattleMoveAttacker].encoredMove != MOVE_NONE
-             && gDisableStructs[gBattleMoveAttacker].encoredMove == gBattleMons[gBattleMoveAttacker].moves[gDisableStructs[gBattleMoveAttacker].encoredMovePos])
+    else if (gDisableStructs[gBattlerAttacker].encoredMove != MOVE_NONE
+             && gDisableStructs[gBattlerAttacker].encoredMove == gBattleMons[gBattlerAttacker].moves[gDisableStructs[gBattlerAttacker].encoredMovePos])
     {
-        gCurrentMove = gChosenMove = gDisableStructs[gBattleMoveAttacker].encoredMove;
-        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattleMoveAttacker].encoredMovePos;
-        *(gBattleStruct->moveTarget + gBattleMoveAttacker) = GetMoveTarget(gCurrentMove, 0);
+        gCurrentMove = gChosenMove = gDisableStructs[gBattlerAttacker].encoredMove;
+        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattlerAttacker].encoredMovePos;
+        *(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
     // check if the encored move wasn't overwritten
-    else if (gDisableStructs[gBattleMoveAttacker].encoredMove != MOVE_NONE
-             && gDisableStructs[gBattleMoveAttacker].encoredMove != gBattleMons[gBattleMoveAttacker].moves[gDisableStructs[gBattleMoveAttacker].encoredMovePos])
+    else if (gDisableStructs[gBattlerAttacker].encoredMove != MOVE_NONE
+             && gDisableStructs[gBattlerAttacker].encoredMove != gBattleMons[gBattlerAttacker].moves[gDisableStructs[gBattlerAttacker].encoredMovePos])
     {
-        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattleMoveAttacker].encoredMovePos;
-        gCurrentMove = gChosenMove = gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos];
-        gDisableStructs[gBattleMoveAttacker].encoredMove = MOVE_NONE;
-        gDisableStructs[gBattleMoveAttacker].encoredMovePos = 0;
-        gDisableStructs[gBattleMoveAttacker].encoreTimer1 = 0;
-        *(gBattleStruct->moveTarget + gBattleMoveAttacker) = GetMoveTarget(gCurrentMove, 0);
+        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattlerAttacker].encoredMovePos;
+        gCurrentMove = gChosenMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
+        gDisableStructs[gBattlerAttacker].encoredMove = MOVE_NONE;
+        gDisableStructs[gBattlerAttacker].encoredMovePos = 0;
+        gDisableStructs[gBattlerAttacker].encoreTimer1 = 0;
+        *(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
-    else if (gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBattleMoveAttacker])
+    else if (gBattleMons[gBattlerAttacker].moves[gCurrMovePos] != gChosenMoveByBattler[gBattlerAttacker])
     {
-        gCurrentMove = gChosenMove = gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos];
-        *(gBattleStruct->moveTarget + gBattleMoveAttacker) = GetMoveTarget(gCurrentMove, 0);
+        gCurrentMove = gChosenMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
+        *(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
     else
     {
-        gCurrentMove = gChosenMove = gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos];
+        gCurrentMove = gChosenMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
     }
 
-    if (gBattleMons[gBattleMoveAttacker].hp != 0)
+    if (gBattleMons[gBattlerAttacker].hp != 0)
     {
-        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
             gBattleResults.lastUsedMovePlayer = gCurrentMove;
         else
             gBattleResults.lastUsedMoveOpponent = gCurrentMove;
     }
 
     // choose target
-    side = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
+    side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
     if (gSideTimers[side].followmeTimer != 0
         && gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED
-        && GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gSideTimers[side].followmeTarget)
+        && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gSideTimers[side].followmeTarget)
         && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
     {
-        gBattleMoveTarget = gSideTimers[side].followmeTarget;
+        gBattlerTarget = gSideTimers[side].followmeTarget;
     }
     else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
              && gSideTimers[side].followmeTimer == 0
              && (gBattleMoves[gCurrentMove].power != 0
                  || gBattleMoves[gCurrentMove].target != MOVE_TARGET_x10)
-             && gBattleMons[*(gBattleStruct->moveTarget + gBattleMoveAttacker)].ability != ABILITY_LIGHTNING_ROD
+             && gBattleMons[*(gBattleStruct->moveTarget + gBattlerAttacker)].ability != ABILITY_LIGHTNING_ROD
              && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
     {
-        side = GetBattlerSide(gBattleMoveAttacker);
+        side = GetBattlerSide(gBattlerAttacker);
         for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
         {
             if (side != GetBattlerSide(gActiveBattler)
-                && *(gBattleStruct->moveTarget + gBattleMoveAttacker) != gActiveBattler
+                && *(gBattleStruct->moveTarget + gBattlerAttacker) != gActiveBattler
                 && gBattleMons[gActiveBattler].ability == ABILITY_LIGHTNING_ROD
                 && GetBattlerTurnOrderNum(gActiveBattler) < var)
             {
@@ -5113,37 +5113,37 @@ static void HandleAction_UseMove(void)
         {
             if (gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
             {
-                if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
                 {
                     if (Random() & 1)
-                        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+                        gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
                     else
-                        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+                        gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
                 }
                 else
                 {
                     if (Random() & 1)
-                        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+                        gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
                     else
-                        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
+                        gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
                 }
             }
             else
             {
-                gBattleMoveTarget = *(gBattleStruct->moveTarget + gBattleMoveAttacker);
+                gBattlerTarget = *(gBattleStruct->moveTarget + gBattlerAttacker);
             }
 
-            if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
+            if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
             {
-                if (GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gBattleMoveTarget))
+                if (GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
                 {
-                    gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveTarget) ^ BIT_FLANK);
+                    gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerTarget) ^ BIT_FLANK);
                 }
                 else
                 {
-                    gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_SIDE);
-                    if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
-                        gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveTarget) ^ BIT_FLANK);
+                    gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_SIDE);
+                    if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
+                        gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerTarget) ^ BIT_FLANK);
                 }
             }
         }
@@ -5152,65 +5152,65 @@ static void HandleAction_UseMove(void)
             gActiveBattler = gBattleTurnOrder[var];
             RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability);
             gSpecialStatuses[gActiveBattler].lightningRodRedirected = 1;
-            gBattleMoveTarget = gActiveBattler;
+            gBattlerTarget = gActiveBattler;
         }
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
              && gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
     {
-        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
         {
             if (Random() & 1)
-                gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+                gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
             else
-                gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+                gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
         }
         else
         {
             if (Random() & 1)
-                gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+                gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
             else
-                gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
+                gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
         }
 
-        if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]
-            && GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gBattleMoveTarget))
+        if (gAbsentBattlerFlags & gBitTable[gBattlerTarget]
+            && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
         {
-            gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveTarget) ^ BIT_FLANK);
+            gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerTarget) ^ BIT_FLANK);
         }
     }
     else
     {
-        gBattleMoveTarget = *(gBattleStruct->moveTarget + gBattleMoveAttacker);
-        if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
+        gBattlerTarget = *(gBattleStruct->moveTarget + gBattlerAttacker);
+        if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
         {
-            if (GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gBattleMoveTarget))
+            if (GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
             {
-                gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveTarget) ^ BIT_FLANK);
+                gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerTarget) ^ BIT_FLANK);
             }
             else
             {
-                gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_SIDE);
-                if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
-                    gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveTarget) ^ BIT_FLANK);
+                gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_SIDE);
+                if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
+                    gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerTarget) ^ BIT_FLANK);
             }
         }
     }
 
     // choose battlescript
     if (gBattleTypeFlags & BATTLE_TYPE_PALACE
-        && gProtectStructs[gBattleMoveAttacker].flag_x10)
+        && gProtectStructs[gBattlerAttacker].flag_x10)
     {
-        if (gBattleMons[gBattleMoveAttacker].hp == 0)
+        if (gBattleMons[gBattlerAttacker].hp == 0)
         {
-            gCurrentActionFuncId = 12;
+            gCurrentActionFuncId = B_ACTION_FINISHED;
             return;
         }
-        else if (gPalaceSelectionBattleScripts[gBattleMoveAttacker] != NULL)
+        else if (gPalaceSelectionBattleScripts[gBattlerAttacker] != NULL)
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBattleMoveAttacker];
-            gPalaceSelectionBattleScripts[gBattleMoveAttacker] = NULL;
+            gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBattlerAttacker];
+            gPalaceSelectionBattleScripts[gBattlerAttacker] = NULL;
         }
         else
         {
@@ -5224,24 +5224,24 @@ static void HandleAction_UseMove(void)
     }
 
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-        sub_81A56E8(gBattleMoveAttacker);
+        sub_81A56E8(gBattlerAttacker);
 
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+    gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
 }
 
 static void HandleAction_Switch(void)
 {
-    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    gActionSelectionCursor[gBattleMoveAttacker] = 0;
-    gMoveSelectionCursor[gBattleMoveAttacker] = 0;
+    gActionSelectionCursor[gBattlerAttacker] = 0;
+    gMoveSelectionCursor[gBattlerAttacker] = 0;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleMoveAttacker, *(gBattleStruct->field_58 + gBattleMoveAttacker))
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattlerAttacker, *(gBattleStruct->field_58 + gBattlerAttacker))
 
-    gBattleScripting.battler = gBattleMoveAttacker;
+    gBattleScripting.battler = gBattlerAttacker;
     gBattlescriptCurrInstr = BattleScript_ActionSwitch;
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+    gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
 
     if (gBattleResults.playerSwitchesCounter < 255)
         gBattleResults.playerSwitchesCounter++;
@@ -5249,11 +5249,11 @@ static void HandleAction_Switch(void)
 
 static void HandleAction_UseItem(void)
 {
-    gBattleMoveAttacker = gBattleMoveTarget = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattlerAttacker = gBattlerTarget = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    ClearFuryCutterDestinyBondGrudge(gBattleMoveAttacker);
-    gLastUsedItem = gBattleBufferB[gBattleMoveAttacker][1] | (gBattleBufferB[gBattleMoveAttacker][2] << 8);
+    ClearFuryCutterDestinyBondGrudge(gBattlerAttacker);
+    gLastUsedItem = gBattleBufferB[gBattlerAttacker][1] | (gBattleBufferB[gBattlerAttacker][2] << 8);
 
     if (gLastUsedItem <= ITEM_PREMIER_BALL) // is ball
     {
@@ -5263,38 +5263,38 @@ static void HandleAction_UseItem(void)
     {
         gBattlescriptCurrInstr = gBattlescriptsForRunningByItem[0];
     }
-    else if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+    else if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
     {
         gBattlescriptCurrInstr = gBattlescriptsForUsingItem[0];
     }
     else
     {
-        gBattleScripting.battler = gBattleMoveAttacker;
+        gBattleScripting.battler = gBattlerAttacker;
 
-        switch (*(gBattleStruct->AI_itemType + (gBattleMoveAttacker >> 1)))
+        switch (*(gBattleStruct->AI_itemType + (gBattlerAttacker >> 1)))
         {
         case AI_ITEM_FULL_RESTORE:
         case AI_ITEM_HEAL_HP:
             break;
         case AI_ITEM_CURE_CONDITION:
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-            if (*(gBattleStruct->AI_itemFlags + gBattleMoveAttacker / 2) & 1)
+            if (*(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) & 1)
             {
-                if (*(gBattleStruct->AI_itemFlags + gBattleMoveAttacker / 2) & 0x3E)
+                if (*(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) & 0x3E)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 5;
             }
             else
             {
-                while (!(*(gBattleStruct->AI_itemFlags + gBattleMoveAttacker / 2) & 1))
+                while (!(*(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) & 1))
                 {
-                    *(gBattleStruct->AI_itemFlags + gBattleMoveAttacker / 2) >>= 1;
+                    *(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) >>= 1;
                     gBattleCommunication[MULTISTRING_CHOOSER]++;
                 }
             }
             break;
         case AI_ITEM_X_STAT:
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            if (*(gBattleStruct->AI_itemFlags + (gBattleMoveAttacker >> 1)) & 0x80)
+            if (*(gBattleStruct->AI_itemFlags + (gBattlerAttacker >> 1)) & 0x80)
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = 5;
             }
@@ -5303,9 +5303,9 @@ static void HandleAction_UseItem(void)
                 PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK)
                 PREPARE_STRING_BUFFER(gBattleTextBuff2, 0xD2)
 
-                while (!((*(gBattleStruct->AI_itemFlags + (gBattleMoveAttacker >> 1))) & 1))
+                while (!((*(gBattleStruct->AI_itemFlags + (gBattlerAttacker >> 1))) & 1))
                 {
-                    *(gBattleStruct->AI_itemFlags + gBattleMoveAttacker / 2) >>= 1;
+                    *(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) >>= 1;
                     gBattleTextBuff1[2]++;
                 }
 
@@ -5321,49 +5321,49 @@ static void HandleAction_UseItem(void)
             break;
         }
 
-        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[*(gBattleStruct->AI_itemType + gBattleMoveAttacker / 2)];
+        gBattlescriptCurrInstr = gBattlescriptsForUsingItem[*(gBattleStruct->AI_itemType + gBattlerAttacker / 2)];
     }
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+    gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
 }
 
-bool8 TryRunFromBattle(u8 bank)
+bool8 TryRunFromBattle(u8 battler)
 {
     bool8 effect = FALSE;
     u8 holdEffect;
     u8 pyramidMultiplier;
     u8 speedVar;
 
-    if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY)
-        holdEffect = gEnigmaBerries[bank].holdEffect;
+    if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY)
+        holdEffect = gEnigmaBerries[battler].holdEffect;
     else
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[battler].item);
 
-    gStringBank = bank;
+    gStringBattler = battler;
 
     if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
     {
-        gLastUsedItem = gBattleMons[bank].item ;
-        gProtectStructs[bank].fleeFlag = 1;
+        gLastUsedItem = gBattleMons[battler].item ;
+        gProtectStructs[battler].fleeFlag = 1;
         effect++;
     }
-    else if (gBattleMons[bank].ability == ABILITY_RUN_AWAY)
+    else if (gBattleMons[battler].ability == ABILITY_RUN_AWAY)
     {
         if (InBattlePyramid())
         {
             gBattleStruct->runTries++;
             pyramidMultiplier = sub_81A9E28();
-            speedVar = (gBattleMons[bank].speed * pyramidMultiplier) / (gBattleMons[bank ^ BIT_SIDE].speed) + (gBattleStruct->runTries * 30);
+            speedVar = (gBattleMons[battler].speed * pyramidMultiplier) / (gBattleMons[BATTLE_OPPOSITE(battler)].speed) + (gBattleStruct->runTries * 30);
             if (speedVar > (Random() & 0xFF))
             {
                 gLastUsedAbility = ABILITY_RUN_AWAY;
-                gProtectStructs[bank].fleeFlag = 2;
+                gProtectStructs[battler].fleeFlag = 2;
                 effect++;
             }
         }
         else
         {
             gLastUsedAbility = ABILITY_RUN_AWAY;
-            gProtectStructs[bank].fleeFlag = 2;
+            gProtectStructs[battler].fleeFlag = 2;
             effect++;
         }
     }
@@ -5378,13 +5378,13 @@ bool8 TryRunFromBattle(u8 bank)
             if (InBattlePyramid())
             {
                 pyramidMultiplier = sub_81A9E28();
-                speedVar = (gBattleMons[bank].speed * pyramidMultiplier) / (gBattleMons[bank ^ BIT_SIDE].speed) + (gBattleStruct->runTries * 30);
+                speedVar = (gBattleMons[battler].speed * pyramidMultiplier) / (gBattleMons[BATTLE_OPPOSITE(battler)].speed) + (gBattleStruct->runTries * 30);
                 if (speedVar > (Random() & 0xFF))
                     effect++;
             }
-            else if (gBattleMons[bank].speed < gBattleMons[bank ^ BIT_SIDE].speed)
+            else if (gBattleMons[battler].speed < gBattleMons[BATTLE_OPPOSITE(battler)].speed)
             {
-                speedVar = (gBattleMons[bank].speed * 128) / (gBattleMons[bank ^ BIT_SIDE].speed) + (gBattleStruct->runTries * 30);
+                speedVar = (gBattleMons[battler].speed * 128) / (gBattleMons[BATTLE_OPPOSITE(battler)].speed) + (gBattleStruct->runTries * 30);
                 if (speedVar > (Random() & 0xFF))
                     effect++;
             }
@@ -5408,7 +5408,7 @@ bool8 TryRunFromBattle(u8 bank)
 
 static void HandleAction_Run(void)
 {
-    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
 
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
     {
@@ -5418,12 +5418,12 @@ static void HandleAction_Run(void)
         {
             if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
             {
-                if (gActionForBanks[gActiveBattler] == ACTION_RUN)
+                if (gChosenActionByBattler[gActiveBattler] == B_ACTION_RUN)
                     gBattleOutcome |= B_OUTCOME_LOST;
             }
             else
             {
-                if (gActionForBanks[gActiveBattler] == ACTION_RUN)
+                if (gChosenActionByBattler[gActiveBattler] == B_ACTION_RUN)
                     gBattleOutcome |= B_OUTCOME_WON;
             }
         }
@@ -5433,23 +5433,23 @@ static void HandleAction_Run(void)
     }
     else
     {
-        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
         {
-            if (!TryRunFromBattle(gBattleMoveAttacker)) // failed to run away
+            if (!TryRunFromBattle(gBattlerAttacker)) // failed to run away
             {
-                ClearFuryCutterDestinyBondGrudge(gBattleMoveAttacker);
+                ClearFuryCutterDestinyBondGrudge(gBattlerAttacker);
                 gBattleCommunication[MULTISTRING_CHOOSER] = 3;
                 gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
-                gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+                gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
             }
         }
         else
         {
-            if (gBattleMons[gBattleMoveAttacker].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
+            if (gBattleMons[gBattlerAttacker].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = 4;
                 gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString;
-                gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+                gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
             }
             else
             {
@@ -5462,31 +5462,31 @@ static void HandleAction_Run(void)
 
 static void HandleAction_WatchesCarefully(void)
 {
-    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
     gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0];
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+    gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
 }
 
 static void HandleAction_SafariZoneBallThrow(void)
 {
-    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
     gNumSafariBalls--;
     gLastUsedItem = ITEM_SAFARI_BALL;
     gBattlescriptCurrInstr = gBattlescriptsForBallThrow[ITEM_SAFARI_BALL];
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+    gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
 }
 
 static void HandleAction_ThrowPokeblock(void)
 {
-    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
-    gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattleMoveAttacker][1] - 1;
-    gLastUsedItem = gBattleBufferB[gBattleMoveAttacker][2];
+    gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattlerAttacker][1] - 1;
+    gLastUsedItem = gBattleBufferB[gBattlerAttacker][2];
 
     if (gBattleResults.field_1F < 0xFF)
         gBattleResults.field_1F++;
@@ -5501,12 +5501,12 @@ static void HandleAction_ThrowPokeblock(void)
     }
 
     gBattlescriptCurrInstr = gBattlescriptsForSafariActions[2];
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+    gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
 }
 
 static void HandleAction_GoNear(void)
 {
-    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
 
@@ -5528,12 +5528,12 @@ static void HandleAction_GoNear(void)
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     gBattlescriptCurrInstr = gBattlescriptsForSafariActions[1];
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
+    gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
 }
 
 static void HandleAction_SafriZoneRun(void)
 {
-    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     PlaySE(SE_NIGERU);
     gCurrentTurnActionNumber = gBattlersCount;
     gBattleOutcome = B_OUTCOME_RAN;
@@ -5541,15 +5541,15 @@ static void HandleAction_SafriZoneRun(void)
 
 static void HandleAction_Action9(void)
 {
-    gBattleMoveAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
+    gBattlerAttacker = gBattleTurnOrder[gCurrentTurnActionNumber];
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
 
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleMoveAttacker, gBattlerPartyIndexes[gBattleMoveAttacker])
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattlerPartyIndexes[gBattlerAttacker])
 
     gBattlescriptCurrInstr = gBattlescriptsForSafariActions[3];
-    gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
-    gActionsByTurnOrder[1] = ACTION_FINISHED;
+    gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT;
+    gActionsByTurnOrder[1] = B_ACTION_FINISHED;
 }
 
 static void HandleAction_Action11(void)
@@ -5557,7 +5557,7 @@ static void HandleAction_Action11(void)
     if (!HandleFaintedMonActions())
     {
         gBattleStruct->faintedActionsState = 0;
-        gCurrentActionFuncId = ACTION_FINISHED;
+        gCurrentActionFuncId = B_ACTION_FINISHED;
     }
 }
 
@@ -5589,8 +5589,8 @@ static void HandleAction_ActionFinished(void)
     gMoveResultFlags = 0;
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
-    gLastLandedMoves[gBattleMoveAttacker] = 0;
-    gLastHitByType[gBattleMoveAttacker] = 0;
+    gLastLandedMoves[gBattlerAttacker] = 0;
+    gLastHitByType[gBattlerAttacker] = 0;
     gBattleStruct->dynamicMoveType = 0;
     gDynamicBasePower = 0;
     gBattleScripting.atk49_state = 0;
diff --git a/src/battle_message.c b/src/battle_message.c
index 07e5b2d60..88d11163d 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -17,11 +17,11 @@
 extern u16 gLastUsedItem;
 extern u8 gLastUsedAbility;
 extern u8 gActiveBattler;
-extern u8 gBattleMoveAttacker;
-extern u8 gBattleMoveTarget;
-extern u8 gStringBank;
+extern u8 gBattlerAttacker;
+extern u8 gBattlerTarget;
+extern u8 gStringBattler;
 extern u8 gEffectBank;
-extern u8 gAbilitiesPerBank[MAX_BATTLERS_COUNT];
+extern u8 gBattlerAbilities[MAX_BATTLERS_COUNT];
 extern u32 gBattleTypeFlags;
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
@@ -1436,12 +1436,12 @@ void BufferStringBattle(u16 stringID)
     gBattleScripting.battler = gStringInfo->scrActive;
     *(&gBattleStruct->field_52) = gStringInfo->unk1605E;
     *(&gBattleStruct->hpScale) = gStringInfo->hpScale;
-    gStringBank = gStringInfo->StringBank;
+    gStringBattler = gStringInfo->StringBank;
     *(&gBattleStruct->stringMoveType) = gStringInfo->moveType;
 
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
-        gAbilitiesPerBank[i] = gStringInfo->abilities[i];
+        gBattlerAbilities[i] = gStringInfo->abilities[i];
     }
     for (i = 0; i < TEXT_BUFF_ARRAY_COUNT; i++)
     {
@@ -1884,23 +1884,23 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = text;
                 break;
             case B_TXT_ATK_NAME_WITH_PREFIX_MON1: // attacker name with prefix, only bank 0/1
-                HANDLE_NICKNAME_STRING_CASE(gBattleMoveAttacker,
-                                            gBattlerPartyIndexes[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleMoveAttacker))])
+                HANDLE_NICKNAME_STRING_CASE(gBattlerAttacker,
+                                            gBattlerPartyIndexes[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattlerAttacker))])
                 break;
             case B_TXT_ATK_PARTNER_NAME: // attacker partner name
-                if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
-                    GetMonData(&gPlayerParty[gBattlerPartyIndexes[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleMoveAttacker)) + 2]], MON_DATA_NICKNAME, text);
+                if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
+                    GetMonData(&gPlayerParty[gBattlerPartyIndexes[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattlerAttacker)) + 2]], MON_DATA_NICKNAME, text);
                 else
-                    GetMonData(&gEnemyParty[gBattlerPartyIndexes[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattleMoveAttacker)) + 2]], MON_DATA_NICKNAME, text);
+                    GetMonData(&gEnemyParty[gBattlerPartyIndexes[GetBattlerAtPosition(GET_BATTLER_SIDE(gBattlerAttacker)) + 2]], MON_DATA_NICKNAME, text);
 
                 StringGetEnd10(text);
                 toCpy = text;
                 break;
             case B_TXT_ATK_NAME_WITH_PREFIX: // attacker name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gBattleMoveAttacker, gBattlerPartyIndexes[gBattleMoveAttacker])
+                HANDLE_NICKNAME_STRING_CASE(gBattlerAttacker, gBattlerPartyIndexes[gBattlerAttacker])
                 break;
             case B_TXT_DEF_NAME_WITH_PREFIX: // target name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gBattleMoveTarget, gBattlerPartyIndexes[gBattleMoveTarget])
+                HANDLE_NICKNAME_STRING_CASE(gBattlerTarget, gBattlerPartyIndexes[gBattlerTarget])
                 break;
             case B_TXT_EFF_NAME_WITH_PREFIX: // effect bank name with prefix
                 HANDLE_NICKNAME_STRING_CASE(gEffectBank, gBattlerPartyIndexes[gEffectBank])
@@ -1930,10 +1930,10 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                     {
                         if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
                         {
-                            if ((gBattleScripting.multiplayerId != 0 && (gStringBank & BIT_SIDE))
-                                || (gBattleScripting.multiplayerId == 0 && !(gStringBank & BIT_SIDE)))
+                            if ((gBattleScripting.multiplayerId != 0 && (gStringBattler & BIT_SIDE))
+                                || (gBattleScripting.multiplayerId == 0 && !(gStringBattler & BIT_SIDE)))
                             {
-                                StringCopy(text, gEnigmaBerries[gStringBank].name);
+                                StringCopy(text, gEnigmaBerries[gStringBattler].name);
                                 StringAppend(text, gText_BerrySuffix);
                                 toCpy = text;
                             }
@@ -1944,9 +1944,9 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                         }
                         else
                         {
-                            if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gStringBank)
+                            if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gStringBattler)
                             {
-                                StringCopy(text, gEnigmaBerries[gStringBank].name);
+                                StringCopy(text, gEnigmaBerries[gStringBattler].name);
                                 StringAppend(text, gText_BerrySuffix);
                                 toCpy = text;
                             }
@@ -1970,16 +1970,16 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gAbilityNames[gLastUsedAbility];
                 break;
             case B_TXT_ATK_ABILITY: // attacker ability
-                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleMoveAttacker]];
+                toCpy = gAbilityNames[gBattlerAbilities[gBattlerAttacker]];
                 break;
             case B_TXT_DEF_ABILITY: // target ability
-                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleMoveTarget]];
+                toCpy = gAbilityNames[gBattlerAbilities[gBattlerTarget]];
                 break;
             case B_TXT_SCR_ACTIVE_ABILITY: // scripting active ability
-                toCpy = gAbilityNames[gAbilitiesPerBank[gBattleScripting.battler]];
+                toCpy = gAbilityNames[gBattlerAbilities[gBattleScripting.battler]];
                 break;
             case B_TXT_EFF_ABILITY: // effect bank ability
-                toCpy = gAbilityNames[gAbilitiesPerBank[gEffectBank]];
+                toCpy = gAbilityNames[gBattlerAbilities[gEffectBank]];
                 break;
             case B_TXT_TRAINER1_CLASS: // trainer class name
                 if (gBattleTypeFlags & BATTLE_TYPE_SECRET_BASE)
@@ -2094,37 +2094,37 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                     toCpy = gText_Someones;
                 break;
             case B_TXT_ATK_PREFIX2:
-                if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix2;
                 else
                     toCpy = gText_FoePkmnPrefix3;
                 break;
             case B_TXT_DEF_PREFIX2:
-                if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix2;
                 else
                     toCpy = gText_FoePkmnPrefix3;
                 break;
             case B_TXT_ATK_PREFIX1:
-                if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix;
                 else
                     toCpy = gText_FoePkmnPrefix2;
                 break;
             case B_TXT_DEF_PREFIX1:
-                if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix;
                 else
                     toCpy = gText_FoePkmnPrefix2;
                 break;
             case B_TXT_ATK_PREFIX3:
-                if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix3;
                 else
                     toCpy = gText_FoePkmnPrefix4;
                 break;
             case B_TXT_DEF_PREFIX3:
-                if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
+                if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER)
                     toCpy = gText_AllyPkmnPrefix3;
                 else
                     toCpy = gText_FoePkmnPrefix4;
@@ -2313,9 +2313,9 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
             {
                 if (hword == ITEM_ENIGMA_BERRY)
                 {
-                    if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gStringBank)
+                    if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gStringBattler)
                     {
-                        StringCopy(dst, gEnigmaBerries[gStringBank].name);
+                        StringCopy(dst, gEnigmaBerries[gStringBattler].name);
                         StringAppend(dst, gText_BerrySuffix);
                     }
                     else
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c443c5449..a751cf5e7 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -54,16 +54,16 @@ extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
 extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
 extern u16 gCurrentMove;
 extern u8 gLastUsedAbility;
-extern u8 gStringBank;
+extern u8 gStringBattler;
 extern u8 gEffectBank;
 extern u8 gAbsentBattlerFlags;
 extern u8 gMultiHitCounter;
-extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
+extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT];
 extern u16 gPauseCounterBattle;
 extern u16 gPaydayMoney;
 extern u16 gRandomTurnNumber;
-extern u8 gBattleMoveAttacker;
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerAttacker;
+extern u8 gBattlerTarget;
 extern const u8* gBattlescriptCurrInstr;
 extern u8 gCurrMovePos;
 extern u8 gCurrentActionFuncId;
@@ -73,7 +73,7 @@ extern u16 gLastLandedMoves[4];
 extern u16 gLastHitByType[4];
 extern u16 gLastResultingMoves[4];
 extern u8 gLastHitBy[4];
-extern u8 gStringBank;
+extern u8 gStringBattler;
 extern u16 gDynamicBasePower;
 extern u16 gLastUsedItem;
 extern u16 gBattleMovePower;
@@ -89,7 +89,7 @@ extern u8 gPlayerPartyCount;
 extern u16 gMoveToLearn;
 extern u16 gRandomMove;
 extern u8 gBankInMenu;
-extern u8 gActionForBanks[MAX_BATTLERS_COUNT];
+extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
 extern u8 gCurrentTurnActionNumber;
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u16 gLockedMoves[MAX_BATTLERS_COUNT];
@@ -155,10 +155,10 @@ extern const u8 gText_BattleYesNoChoice[];
 #define BS2ScriptRead16(ptr) ((ptr)[0] + ((ptr)[1] << 8))
 #define BS2ScriptReadPtr(ptr) ((void *)BS2ScriptRead32(ptr))
 
-#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattleMoveTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
+#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
 
-#define TARGET_TURN_DAMAGED (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical != 0 \
-                          || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special != 0)
+#define TARGET_TURN_DAMAGED (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical != 0 \
+                          || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special != 0)
 
 // this file's functions
 static bool8 IsTwoTurnsMove(u16 move);
@@ -1024,10 +1024,10 @@ static void atk00_attackcanceler(void)
 
     if (gBattleOutcome != 0)
     {
-        gCurrentActionFuncId = ACTION_FINISHED;
+        gCurrentActionFuncId = B_ACTION_FINISHED;
         return;
     }
-    if (gBattleMons[gBattleMoveAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
+    if (gBattleMons[gBattlerAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
     {
         gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
         gBattlescriptCurrInstr = BattleScript_MoveEnd;
@@ -1035,10 +1035,10 @@ static void atk00_attackcanceler(void)
     }
     if (AtkCanceller_UnableToUseMove())
         return;
-    if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattleMoveTarget, 0, 0, 0))
+    if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattlerTarget, 0, 0, 0))
         return;
-    if (!gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200)
-     && !(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS))
+    if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200)
+     && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
         gBattlescriptCurrInstr = BattleScript_NoPPForMove;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
@@ -1047,7 +1047,7 @@ static void atk00_attackcanceler(void)
 
     gHitMarker &= ~(HITMARKER_x800000);
 
-    if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS))
+    if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
         i = IsMonDisobedient(); // why use the 'i' variable...?
         switch (i)
@@ -1065,10 +1065,10 @@ static void atk00_attackcanceler(void)
 
     gHitMarker |= HITMARKER_OBEYS;
 
-    if (gProtectStructs[gBattleMoveTarget].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED)
+    if (gProtectStructs[gBattlerTarget].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED)
     {
-        PressurePPLose(gBattleMoveAttacker, gBattleMoveTarget, MOVE_MAGIC_COAT);
-        gProtectStructs[gBattleMoveTarget].bounceMove = 0;
+        PressurePPLose(gBattlerAttacker, gBattlerTarget, MOVE_MAGIC_COAT);
+        gProtectStructs[gBattlerTarget].bounceMove = 0;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_MagicCoatBounce;
         return;
@@ -1078,7 +1078,7 @@ static void atk00_attackcanceler(void)
     {
         if ((gProtectStructs[gBattleTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED)
         {
-            PressurePPLose(gBattleMoveAttacker, gBattleTurnOrder[i], MOVE_SNATCH);
+            PressurePPLose(gBattlerAttacker, gBattleTurnOrder[i], MOVE_SNATCH);
             gProtectStructs[gBattleTurnOrder[i]].stealMove = 0;
             gBattleScripting.battler = gBattleTurnOrder[i];
             BattleScriptPushCursor();
@@ -1087,22 +1087,22 @@ static void atk00_attackcanceler(void)
         }
     }
 
-    if (gSpecialStatuses[gBattleMoveTarget].lightningRodRedirected)
+    if (gSpecialStatuses[gBattlerTarget].lightningRodRedirected)
     {
-        gSpecialStatuses[gBattleMoveTarget].lightningRodRedirected = 0;
+        gSpecialStatuses[gBattlerTarget].lightningRodRedirected = 0;
         gLastUsedAbility = ABILITY_LIGHTNING_ROD;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_TookAttack;
-        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBattlerTarget, gLastUsedAbility);
     }
     else if (DEFENDER_IS_PROTECTED
-     && (gCurrentMove != MOVE_CURSE || (gBattleMons[gBattleMoveAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleMoveAttacker].type2 == TYPE_GHOST))
-     && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS))))
+     && (gCurrentMove != MOVE_CURSE || (gBattleMons[gBattlerAttacker].type1 == TYPE_GHOST || gBattleMons[gBattlerAttacker].type2 == TYPE_GHOST))
+     && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))))
     {
-        CancelMultiTurnMoves(gBattleMoveAttacker);
+        CancelMultiTurnMoves(gBattlerAttacker);
         gMoveResultFlags |= MOVE_RESULT_MISSED;
-        gLastLandedMoves[gBattleMoveTarget] = 0;
-        gLastHitByType[gBattleMoveTarget] = 0;
+        gLastLandedMoves[gBattlerTarget] = 0;
+        gLastHitByType[gBattlerTarget] = 0;
         gBattleCommunication[6] = 1;
         gBattlescriptCurrInstr++;
     }
@@ -1117,14 +1117,14 @@ static void JumpIfMoveFailed(u8 adder, u16 move)
     const u8 *BS_ptr = gBattlescriptCurrInstr + adder;
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
-        gLastLandedMoves[gBattleMoveTarget] = 0;
-        gLastHitByType[gBattleMoveTarget] = 0;
+        gLastLandedMoves[gBattlerTarget] = 0;
+        gLastHitByType[gBattlerTarget] = 0;
         BS_ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
         TrySetDestinyBondToHappen();
-        if (AbilityBattleEffects(ABILITYEFFECT_ABSORBING, gBattleMoveTarget, 0, 0, move))
+        if (AbilityBattleEffects(ABILITYEFFECT_ABSORBING, gBattlerTarget, 0, 0, move))
             return;
     }
     gBattlescriptCurrInstr = BS_ptr;
@@ -1159,13 +1159,13 @@ bool8 JumpIfMoveAffectedByProtect(u16 move)
 
 static bool8 AccuracyCalcHelper(u16 move)
 {
-    if (gStatuses3[gBattleMoveTarget] & STATUS3_ALWAYS_HITS && gDisableStructs[gBattleMoveTarget].bankWithSureHit == gBattleMoveAttacker)
+    if (gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS && gDisableStructs[gBattlerTarget].battlerWithSureHit == gBattlerAttacker)
     {
         JumpIfMoveFailed(7, move);
         return TRUE;
     }
 
-    if (!(gHitMarker & HITMARKER_IGNORE_ON_AIR) && gStatuses3[gBattleMoveTarget] & STATUS3_ON_AIR)
+    if (!(gHitMarker & HITMARKER_IGNORE_ON_AIR) && gStatuses3[gBattlerTarget] & STATUS3_ON_AIR)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
@@ -1174,7 +1174,7 @@ static bool8 AccuracyCalcHelper(u16 move)
 
     gHitMarker &= ~HITMARKER_IGNORE_ON_AIR;
 
-    if (!(gHitMarker & HITMARKER_IGNORE_UNDERGROUND) && gStatuses3[gBattleMoveTarget] & STATUS3_UNDERGROUND)
+    if (!(gHitMarker & HITMARKER_IGNORE_UNDERGROUND) && gStatuses3[gBattlerTarget] & STATUS3_UNDERGROUND)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
@@ -1183,7 +1183,7 @@ static bool8 AccuracyCalcHelper(u16 move)
 
     gHitMarker &= ~HITMARKER_IGNORE_UNDERGROUND;
 
-    if (!(gHitMarker & HITMARKER_IGNORE_UNDERWATER) && gStatuses3[gBattleMoveTarget] & STATUS3_UNDERWATER)
+    if (!(gHitMarker & HITMARKER_IGNORE_UNDERWATER) && gStatuses3[gBattlerTarget] & STATUS3_UNDERWATER)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         JumpIfMoveFailed(7, move);
@@ -1208,9 +1208,9 @@ static void atk01_accuracycheck(void)
 
     if (move == 0xFFFE || move == 0xFFFF)
     {
-        if (gStatuses3[gBattleMoveTarget] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBattleMoveTarget].bankWithSureHit == gBattleMoveAttacker)
+        if (gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBattlerTarget].battlerWithSureHit == gBattlerAttacker)
             gBattlescriptCurrInstr += 7;
-        else if (gStatuses3[gBattleMoveTarget] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
+        else if (gStatuses3[gBattlerTarget] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER))
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         else if (!JumpIfMoveAffectedByProtect(0))
             gBattlescriptCurrInstr += 7;
@@ -1231,15 +1231,15 @@ static void atk01_accuracycheck(void)
         if (AccuracyCalcHelper(move))
             return;
 
-        if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_FORESIGHT)
+        if (gBattleMons[gBattlerTarget].status2 & STATUS2_FORESIGHT)
         {
-            u8 acc = gBattleMons[gBattleMoveAttacker].statStages[STAT_STAGE_ACC];
+            u8 acc = gBattleMons[gBattlerAttacker].statStages[STAT_STAGE_ACC];
             buff = acc;
         }
         else
         {
-            u8 acc = gBattleMons[gBattleMoveAttacker].statStages[STAT_STAGE_ACC];
-            buff = acc + 6 - gBattleMons[gBattleMoveTarget].statStages[STAT_STAGE_EVASION];
+            u8 acc = gBattleMons[gBattlerAttacker].statStages[STAT_STAGE_ACC];
+            buff = acc + 6 - gBattleMons[gBattlerTarget].statStages[STAT_STAGE_EVASION];
         }
 
         if (buff < 0)
@@ -1255,25 +1255,25 @@ static void atk01_accuracycheck(void)
         calc = sAccuracyStageRatios[buff].dividend * moveAcc;
         calc /= sAccuracyStageRatios[buff].divisor;
 
-        if (gBattleMons[gBattleMoveAttacker].ability == ABILITY_COMPOUND_EYES)
+        if (gBattleMons[gBattlerAttacker].ability == ABILITY_COMPOUND_EYES)
             calc = (calc * 130) / 100; // 1.3 compound eyes boost
-        if (WEATHER_HAS_EFFECT && gBattleMons[gBattleMoveTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY)
+        if (WEATHER_HAS_EFFECT && gBattleMons[gBattlerTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY)
             calc = (calc * 80) / 100; // 1.2 sand veil loss
-        if (gBattleMons[gBattleMoveAttacker].ability == ABILITY_HUSTLE && type < 9)
+        if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && type < 9)
             calc = (calc * 80) / 100; // 1.2 hustle loss
 
-        if (gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY)
+        if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
         {
-            holdEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect;
-            quality = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
+            holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
+            quality = gEnigmaBerries[gBattlerTarget].holdEffectParam;
         }
         else
         {
-            holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleMoveTarget].item);
-            quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleMoveTarget].item);
+            holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
+            quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
         }
 
-        gStringBank = gBattleMoveTarget;
+        gStringBattler = gBattlerTarget;
 
         if (holdEffect == HOLD_EFFECT_EVASION_UP)
             calc = (calc * (100 - quality)) / 100;
@@ -1300,7 +1300,7 @@ static void atk02_attackstring(void)
          return;
     if (!(gHitMarker & (HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED)))
     {
-        PrepareStringBattle(STRINGID_USEDMOVE, gBattleMoveAttacker);
+        PrepareStringBattle(STRINGID_USEDMOVE, gBattlerAttacker);
         gHitMarker |= HITMARKER_ATTACKSTRING_PRINTED;
     }
     gBattlescriptCurrInstr++;
@@ -1314,39 +1314,39 @@ static void atk03_ppreduce(void)
     if (gBattleControllerExecFlags)
         return;
 
-    if (!gSpecialStatuses[gBattleMoveAttacker].flag20)
+    if (!gSpecialStatuses[gBattlerAttacker].flag20)
     {
         switch (gBattleMoves[gCurrentMove].target)
         {
         case MOVE_TARGET_FOES_AND_ALLY:
-            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBattleMoveAttacker, ABILITY_PRESSURE, 0, 0);
+            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBattlerAttacker, ABILITY_PRESSURE, 0, 0);
             break;
         case MOVE_TARGET_BOTH:
         case MOVE_TARGET_OPPONENTS_FIELD:
-            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattleMoveAttacker, ABILITY_PRESSURE, 0, 0);
+            ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattlerAttacker, ABILITY_PRESSURE, 0, 0);
             break;
         default:
-            if (gBattleMoveAttacker != gBattleMoveTarget && gBattleMons[gBattleMoveTarget].ability == ABILITY_PRESSURE)
+            if (gBattlerAttacker != gBattlerTarget && gBattleMons[gBattlerTarget].ability == ABILITY_PRESSURE)
                 ppToDeduct++;
             break;
         }
     }
 
-    if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos])
+    if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBattlerAttacker].pp[gCurrMovePos])
     {
-        gProtectStructs[gBattleMoveAttacker].notFirstStrike = 1;
+        gProtectStructs[gBattlerAttacker].notFirstStrike = 1;
 
-        if (gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] > ppToDeduct)
-            gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] -= ppToDeduct;
+        if (gBattleMons[gBattlerAttacker].pp[gCurrMovePos] > ppToDeduct)
+            gBattleMons[gBattlerAttacker].pp[gCurrMovePos] -= ppToDeduct;
         else
-            gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] = 0;
+            gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 0;
 
-        if (!(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_TRANSFORMED)
-            && !((gDisableStructs[gBattleMoveAttacker].unk18_b) & gBitTable[gCurrMovePos]))
+        if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED)
+            && !((gDisableStructs[gBattlerAttacker].unk18_b) & gBitTable[gCurrMovePos]))
         {
-            gActiveBattler = gBattleMoveAttacker;
-            BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos]);
-            MarkBattlerForControllerExec(gBattleMoveAttacker);
+            gActiveBattler = gBattlerAttacker;
+            BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattlerAttacker].pp[gCurrMovePos]);
+            MarkBattlerForControllerExec(gBattlerAttacker);
         }
     }
 
@@ -1359,29 +1359,29 @@ static void atk04_critcalc(void)
     u8 holdEffect;
     u16 item, critChance;
 
-    item = gBattleMons[gBattleMoveAttacker].item;
+    item = gBattleMons[gBattlerAttacker].item;
 
     if (item == ITEM_ENIGMA_BERRY)
-        holdEffect = gEnigmaBerries[gBattleMoveAttacker].holdEffect;
+        holdEffect = gEnigmaBerries[gBattlerAttacker].holdEffect;
     else
         holdEffect = ItemId_GetHoldEffect(item);
 
-    gStringBank = gBattleMoveAttacker;
+    gStringBattler = gBattlerAttacker;
 
-    critChance  = 2 * ((gBattleMons[gBattleMoveAttacker].status2 & STATUS2_FOCUS_ENERGY) != 0)
+    critChance  = 2 * ((gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY) != 0)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_HIGH_CRITICAL)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_SKY_ATTACK)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_BLAZE_KICK)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_POISON_TAIL)
                 + (holdEffect == HOLD_EFFECT_SCOPE_LENS)
-                + 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBattleMoveAttacker].species == SPECIES_CHANSEY)
-                + 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBattleMoveAttacker].species == SPECIES_FARFETCHD);
+                + 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBattlerAttacker].species == SPECIES_CHANSEY)
+                + 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBattlerAttacker].species == SPECIES_FARFETCHD);
 
     if (critChance > 4)
         critChance = 4;
 
-    if ((gBattleMons[gBattleMoveTarget].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBattleMoveTarget].ability != ABILITY_SHELL_ARMOR)
-     && !(gStatuses3[gBattleMoveAttacker] & STATUS3_CANT_SCORE_A_CRIT)
+    if ((gBattleMons[gBattlerTarget].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBattlerTarget].ability != ABILITY_SHELL_ARMOR)
+     && !(gStatuses3[gBattlerAttacker] & STATUS3_CANT_SCORE_A_CRIT)
      && !(gBattleTypeFlags & (BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_FIRST_BATTLE))
      && !(Random() % sCriticalHitChance[critChance]))
         gCritMultiplier = 2;
@@ -1393,15 +1393,15 @@ static void atk04_critcalc(void)
 
 static void atk05_damagecalc(void)
 {
-    u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(gBattleMoveTarget)];
-    gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleMoveAttacker], &gBattleMons[gBattleMoveTarget], gCurrentMove,
+    u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)];
+    gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove,
                                             sideStatus, gDynamicBasePower,
-                                            gBattleStruct->dynamicMoveType, gBattleMoveAttacker, gBattleMoveTarget);
+                                            gBattleStruct->dynamicMoveType, gBattlerAttacker, gBattlerTarget);
     gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleScripting.dmgMultiplier;
 
-    if (gStatuses3[gBattleMoveAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
+    if (gStatuses3[gBattlerAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
         gBattleMoveDamage *= 2;
-    if (gProtectStructs[gBattleMoveAttacker].helpingHand)
+    if (gProtectStructs[gBattlerAttacker].helpingHand)
         gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
 
     gBattlescriptCurrInstr++;
@@ -1470,20 +1470,20 @@ static void atk06_typecalc(void)
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
     // check stab
-    if (gBattleMons[gBattleMoveAttacker].type1 == moveType || gBattleMons[gBattleMoveAttacker].type2 == moveType)
+    if (gBattleMons[gBattlerAttacker].type1 == moveType || gBattleMons[gBattlerAttacker].type2 == moveType)
     {
         gBattleMoveDamage = gBattleMoveDamage * 15;
         gBattleMoveDamage = gBattleMoveDamage / 10;
     }
 
-    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBattlerTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
-        gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
+        gLastUsedAbility = gBattleMons[gBattlerTarget].ability;
         gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
-        gLastLandedMoves[gBattleMoveTarget] = 0;
-        gLastHitByType[gBattleMoveTarget] = 0;
+        gLastLandedMoves[gBattlerTarget] = 0;
+        gLastHitByType[gBattlerTarget] = 0;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBattlerTarget, gLastUsedAbility);
     }
     else
     {
@@ -1491,7 +1491,7 @@ static void atk06_typecalc(void)
         {
             if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
-                if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_FORESIGHT)
+                if (gBattleMons[gBattlerTarget].status2 & STATUS2_FORESIGHT)
                     break;
                 i += 3;
                 continue;
@@ -1499,30 +1499,30 @@ static void atk06_typecalc(void)
             else if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type1)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type1)
                     ModulateDmgByType(TYPE_EFFECT_MULTIPLIER(i));
                 // check type2
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2 &&
-                    gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type2 &&
+                    gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2)
                     ModulateDmgByType(TYPE_EFFECT_MULTIPLIER(i));
             }
             i += 3;
         }
     }
 
-    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattleMoveAttacker, gCurrentMove) == 2
+    if (gBattleMons[gBattlerTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattlerAttacker, gCurrentMove) == 2
      && (!(gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) || ((gMoveResultFlags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
      && gBattleMoves[gCurrentMove].power)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
-        gLastLandedMoves[gBattleMoveTarget] = 0;
-        gLastHitByType[gBattleMoveTarget] = 0;
+        gLastLandedMoves[gBattlerTarget] = 0;
+        gLastHitByType[gBattlerTarget] = 0;
         gBattleCommunication[6] = 3;
-        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBattlerTarget, gLastUsedAbility);
     }
     if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
-        gProtectStructs[gBattleMoveAttacker].targetNotAffected = 1;
+        gProtectStructs[gBattlerAttacker].targetNotAffected = 1;
 
     gBattlescriptCurrInstr++;
 }
@@ -1538,11 +1538,11 @@ static void CheckWonderGuardAndLevitate(void)
 
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
-    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBattlerTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
         gLastUsedAbility = ABILITY_LEVITATE;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBattleMoveTarget, ABILITY_LEVITATE);
+        RecordAbilityBattle(gBattlerTarget, ABILITY_LEVITATE);
         return;
     }
 
@@ -1550,7 +1550,7 @@ static void CheckWonderGuardAndLevitate(void)
     {
         if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
         {
-            if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_FORESIGHT)
+            if (gBattleMons[gBattlerTarget].status2 & STATUS2_FORESIGHT)
                 break;
             i += 3;
             continue;
@@ -1558,46 +1558,46 @@ static void CheckWonderGuardAndLevitate(void)
         if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
         {
             // check no effect
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type1
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type1
                 && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
             {
                 gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
-                gProtectStructs[gBattleMoveAttacker].targetNotAffected = 1;
+                gProtectStructs[gBattlerAttacker].targetNotAffected = 1;
             }
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2 &&
-                gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2 &&
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type2 &&
+                gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2 &&
                 TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
             {
                 gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
-                gProtectStructs[gBattleMoveAttacker].targetNotAffected = 1;
+                gProtectStructs[gBattlerAttacker].targetNotAffected = 1;
             }
 
             // check super effective
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 20)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 20)
                 flags |= 1;
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2
-             && gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type2
+             && gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2
              && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                 flags |= 1;
 
             // check not very effective
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 5)
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 5)
                 flags |= 2;
-            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2
-             && gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2
+            if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type2
+             && gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2
              && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                 flags |= 2;
         }
         i += 3;
     }
 
-    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattleMoveAttacker, gCurrentMove) == 2)
+    if (gBattleMons[gBattlerTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattlerAttacker, gCurrentMove) == 2)
     {
         if (((flags & 2) || !(flags & 1)) && gBattleMoves[gCurrentMove].power)
         {
             gLastUsedAbility = ABILITY_WONDER_GUARD;
             gBattleCommunication[6] = 3;
-            RecordAbilityBattle(gBattleMoveTarget, ABILITY_WONDER_GUARD);
+            RecordAbilityBattle(gBattlerTarget, ABILITY_WONDER_GUARD);
         }
     }
 }
@@ -1764,42 +1764,42 @@ static void atk07_adjustnormaldamage(void)
 
     ApplyRandomDmgMultiplier();
 
-    if (gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect, quality = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect, quality = gEnigmaBerries[gBattlerTarget].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleMoveTarget].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleMoveTarget].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
-    gStringBank = gBattleMoveTarget;
+    gStringBattler = gBattlerTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBattleMoveTarget, holdEffect);
-        gSpecialStatuses[gBattleMoveTarget].focusBanded = 1;
+        RecordItemEffectBattle(gBattlerTarget, holdEffect);
+        gSpecialStatuses[gBattlerTarget].focusBanded = 1;
     }
-    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattleMoveTarget].endured
-     && !gSpecialStatuses[gBattleMoveTarget].focusBanded)
+    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattlerTarget].endured
+     && !gSpecialStatuses[gBattlerTarget].focusBanded)
         goto END;
 
-    if (gBattleMons[gBattleMoveTarget].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattlerTarget].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - 1;
 
-    if (gProtectStructs[gBattleMoveTarget].endured)
+    if (gProtectStructs[gBattlerTarget].endured)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBattleMoveTarget].focusBanded)
+    else if (gSpecialStatuses[gBattlerTarget].focusBanded)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-        gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
+        gLastUsedItem = gBattleMons[gBattlerTarget].item;
     }
 
     END:
@@ -1812,40 +1812,40 @@ static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't
 
     ApplyRandomDmgMultiplier();
 
-    if (gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect, quality = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect, quality = gEnigmaBerries[gBattlerTarget].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleMoveTarget].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleMoveTarget].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
-    gStringBank = gBattleMoveTarget;
+    gStringBattler = gBattlerTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBattleMoveTarget, holdEffect);
-        gSpecialStatuses[gBattleMoveTarget].focusBanded = 1;
+        RecordItemEffectBattle(gBattlerTarget, holdEffect);
+        gSpecialStatuses[gBattlerTarget].focusBanded = 1;
     }
-    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (!gProtectStructs[gBattleMoveTarget].endured && !gSpecialStatuses[gBattleMoveTarget].focusBanded)
+    if (!gProtectStructs[gBattlerTarget].endured && !gSpecialStatuses[gBattlerTarget].focusBanded)
         goto END;
-    if (gBattleMons[gBattleMoveTarget].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattlerTarget].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - 1;
 
-    if (gProtectStructs[gBattleMoveTarget].endured)
+    if (gProtectStructs[gBattlerTarget].endured)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBattleMoveTarget].focusBanded)
+    else if (gSpecialStatuses[gBattlerTarget].focusBanded)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-        gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
+        gLastUsedItem = gBattleMons[gBattlerTarget].item;
     }
 
     END:
@@ -1878,13 +1878,13 @@ static void atk09_attackanimation(void)
         {
             u8 multihit;
 
-            gActiveBattler = gBattleMoveAttacker;
+            gActiveBattler = gBattlerAttacker;
 
-            if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_SUBSTITUTE)
+            if (gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE)
                 multihit = gMultiHitCounter;
             else if (gMultiHitCounter != 0 && gMultiHitCounter != 1)
             {
-                if (gBattleMons[gBattleMoveTarget].hp <= gBattleMoveDamage)
+                if (gBattleMons[gBattlerTarget].hp <= gBattleMoveDamage)
                     multihit = 1;
                 else
                     multihit = gMultiHitCounter;
@@ -1892,10 +1892,10 @@ static void atk09_attackanimation(void)
             else
                 multihit = gMultiHitCounter;
 
-            BtlController_EmitMoveAnimation(0, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBattleMoveAttacker].friendship, &gDisableStructs[gBattleMoveAttacker], multihit);
+            BtlController_EmitMoveAnimation(0, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBattlerAttacker].friendship, &gDisableStructs[gBattlerAttacker], multihit);
             gBattleScripting.animTurn += 1;
             gBattleScripting.animTargetsHit += 1;
-            MarkBattlerForControllerExec(gBattleMoveAttacker);
+            MarkBattlerForControllerExec(gBattlerAttacker);
             gBattlescriptCurrInstr++;
         }
         else
@@ -2010,9 +2010,9 @@ static void atk0C_datahpupdate(void)
                 {
                     gTakenDmg[gActiveBattler] += gBattleMoveDamage;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
-                        gTakenDmgBanks[gActiveBattler] = gBattleMoveAttacker;
+                        gTakenDmgBanks[gActiveBattler] = gBattlerAttacker;
                     else
-                        gTakenDmgBanks[gActiveBattler] = gBattleMoveTarget;
+                        gTakenDmgBanks[gActiveBattler] = gBattlerTarget;
                 }
 
                 if (gBattleMons[gActiveBattler].hp > gBattleMoveDamage)
@@ -2035,13 +2035,13 @@ static void atk0C_datahpupdate(void)
                     gSpecialStatuses[gActiveBattler].moveturnLostHP_physical = gHpDealt;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                     {
-                        gProtectStructs[gActiveBattler].physicalBank = gBattleMoveAttacker;
-                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattleMoveAttacker;
+                        gProtectStructs[gActiveBattler].physicalBank = gBattlerAttacker;
+                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattlerAttacker;
                     }
                     else
                     {
-                        gProtectStructs[gActiveBattler].physicalBank = gBattleMoveTarget;
-                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattleMoveTarget;
+                        gProtectStructs[gActiveBattler].physicalBank = gBattlerTarget;
+                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattlerTarget;
                     }
                 }
                 else if (moveType > 8 && !(gHitMarker & HITMARKER_x100000))
@@ -2050,13 +2050,13 @@ static void atk0C_datahpupdate(void)
                     gSpecialStatuses[gActiveBattler].moveturnLostHP_special = gHpDealt;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                     {
-                        gProtectStructs[gActiveBattler].specialBank = gBattleMoveAttacker;
-                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattleMoveAttacker;
+                        gProtectStructs[gActiveBattler].specialBank = gBattlerAttacker;
+                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattlerAttacker;
                     }
                     else
                     {
-                        gProtectStructs[gActiveBattler].specialBank = gBattleMoveTarget;
-                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattleMoveTarget;
+                        gProtectStructs[gActiveBattler].specialBank = gBattlerTarget;
+                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattlerTarget;
                     }
                 }
             }
@@ -2080,7 +2080,7 @@ static void atk0D_critmessage(void)
     {
         if (gCritMultiplier == 2 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
         {
-            PrepareStringBattle(STRINGID_CRITICALHIT, gBattleMoveAttacker);
+            PrepareStringBattle(STRINGID_CRITICALHIT, gBattlerAttacker);
             gBattleCommunication[MSG_DISPLAY] = 1;
         }
         gBattlescriptCurrInstr++;
@@ -2092,7 +2092,7 @@ static void atk0E_effectivenesssound(void)
     if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = gBattleMoveTarget;
+    gActiveBattler = gBattlerTarget;
     if (!(gMoveResultFlags & MOVE_RESULT_MISSED))
     {
         switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED)))
@@ -2170,8 +2170,8 @@ static void atk0F_resultmessage(void)
             stringId = STRINGID_ITDOESNTAFFECT;
             break;
         case MOVE_RESULT_FOE_HUNG_ON:
-            gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
-            gStringBank = gBattleMoveTarget;
+            gLastUsedItem = gBattleMons[gBattlerTarget].item;
+            gStringBattler = gBattlerTarget;
             gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
             BattleScriptPushCursor();
             gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
@@ -2199,8 +2199,8 @@ static void atk0F_resultmessage(void)
             }
             else if (gMoveResultFlags & MOVE_RESULT_FOE_HUNG_ON)
             {
-                gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
-                gStringBank = gBattleMoveTarget;
+                gLastUsedItem = gBattleMons[gBattlerTarget].item;
+                gStringBattler = gBattlerTarget;
                 gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
@@ -2218,7 +2218,7 @@ static void atk0F_resultmessage(void)
     }
 
     if (stringId)
-        PrepareStringBattle(stringId, gBattleMoveAttacker);
+        PrepareStringBattle(stringId, gBattlerAttacker);
 
     gBattlescriptCurrInstr++;
 }
@@ -2228,7 +2228,7 @@ static void atk10_printstring(void)
     if (gBattleControllerExecFlags == 0)
     {
         u16 var = BS2ScriptRead16(gBattlescriptCurrInstr + 1);
-        PrepareStringBattle(var, gBattleMoveAttacker);
+        PrepareStringBattle(var, gBattlerAttacker);
         gBattlescriptCurrInstr += 3;
         gBattleCommunication[MSG_DISPLAY] = 1;
     }
@@ -2236,7 +2236,7 @@ static void atk10_printstring(void)
 
 static void atk11_printselectionstring(void)
 {
-    gActiveBattler = gBattleMoveAttacker;
+    gActiveBattler = gBattlerAttacker;
 
     BtlController_EmitPrintSelectionString(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
     MarkBattlerForControllerExec(gActiveBattler);
@@ -2273,7 +2273,7 @@ static void atk13_printfromtable(void)
         const u16 *ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         ptr += gBattleCommunication[MULTISTRING_CHOOSER];
 
-        PrepareStringBattle(*ptr, gBattleMoveAttacker);
+        PrepareStringBattle(*ptr, gBattlerAttacker);
 
         gBattlescriptCurrInstr += 5;
         gBattleCommunication[MSG_DISPLAY] = 1;
@@ -2287,7 +2287,7 @@ static void atk14_printselectionstringfromtable(void)
         const u16 *ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         ptr += gBattleCommunication[MULTISTRING_CHOOSER];
 
-        gActiveBattler = gBattleMoveAttacker;
+        gActiveBattler = gBattlerAttacker;
         BtlController_EmitPrintSelectionString(0, *ptr);
         MarkBattlerForControllerExec(gActiveBattler);
 
@@ -2328,15 +2328,15 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
     if (gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_AFFECTS_USER)
     {
-        gEffectBank = gBattleMoveAttacker; // bank that effects get applied on
+        gEffectBank = gBattlerAttacker; // bank that effects get applied on
         gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_AFFECTS_USER);
         affectsUser = MOVE_EFFECT_AFFECTS_USER;
-        gBattleScripting.battler = gBattleMoveTarget; // theoretically the attacker
+        gBattleScripting.battler = gBattlerTarget; // theoretically the attacker
     }
     else
     {
-        gEffectBank = gBattleMoveTarget;
-        gBattleScripting.battler = gBattleMoveAttacker;
+        gEffectBank = gBattlerTarget;
+        gBattleScripting.battler = gBattlerAttacker;
     }
 
     if (gBattleMons[gEffectBank].ability == ABILITY_SHIELD_DUST && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
@@ -2681,10 +2681,10 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 break;
             case MOVE_EFFECT_PAYDAY:
-                if (GET_BATTLER_SIDE(gBattleMoveAttacker) == B_SIDE_PLAYER)
+                if (GET_BATTLER_SIDE(gBattlerAttacker) == B_SIDE_PLAYER)
                 {
                     u16 PayDay = gPaydayMoney;
-                    gPaydayMoney += (gBattleMons[gBattleMoveAttacker].level * 5);
+                    gPaydayMoney += (gBattleMons[gBattlerAttacker].level * 5);
                     if (PayDay > gPaydayMoney)
                         gPaydayMoney = 0xFFFF;
                 }
@@ -2719,7 +2719,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
                     *(gBattleStruct->wrappedMove + gEffectBank * 2 + 0) = gCurrentMove;
                     *(gBattleStruct->wrappedMove + gEffectBank * 2 + 1) = gCurrentMove >> 8;
-                    *(gBattleStruct->wrappedBy + gEffectBank) = gBattleMoveAttacker;
+                    *(gBattleStruct->wrappedBy + gEffectBank) = gBattlerAttacker;
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
@@ -2832,7 +2832,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_RAGE:
-                gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_RAGE;
+                gBattleMons[gBattlerAttacker].status2 |= STATUS2_RAGE;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_STEAL_ITEM:
@@ -2843,8 +2843,8 @@ void SetMoveEffect(bool8 primary, u8 certain)
                         break;
                     }
 
-                    side = GetBattlerSide(gBattleMoveAttacker);
-                    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_OPPONENT
+                    side = GetBattlerSide(gBattlerAttacker);
+                    if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT
                         && !(gBattleTypeFlags &
                              (BATTLE_TYPE_EREADER_TRAINER
                               | BATTLE_TYPE_FRONTIER
@@ -2860,56 +2860,56 @@ void SetMoveEffect(bool8 primary, u8 certain)
                            | BATTLE_TYPE_LINK
                            | BATTLE_TYPE_x2000000
                            | BATTLE_TYPE_SECRET_BASE))
-                        && (gWishFutureKnock.knockedOffPokes[side] & gBitTable[gBattlerPartyIndexes[gBattleMoveAttacker]]))
+                        && (gWishFutureKnock.knockedOffPokes[side] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]]))
                     {
                         gBattlescriptCurrInstr++;
                     }
-                    else if (gBattleMons[gBattleMoveTarget].item
-                        && gBattleMons[gBattleMoveTarget].ability == ABILITY_STICKY_HOLD)
+                    else if (gBattleMons[gBattlerTarget].item
+                        && gBattleMons[gBattlerTarget].ability == ABILITY_STICKY_HOLD)
                     {
                         BattleScriptPushCursor();
                         gBattlescriptCurrInstr = BattleScript_NoItemSteal;
 
-                        gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
-                        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
+                        gLastUsedAbility = gBattleMons[gBattlerTarget].ability;
+                        RecordAbilityBattle(gBattlerTarget, gLastUsedAbility);
                     }
-                    else if (gBattleMons[gBattleMoveAttacker].item != 0
-                        || gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY
-                        || IS_ITEM_MAIL(gBattleMons[gBattleMoveTarget].item)
-                        || gBattleMons[gBattleMoveTarget].item == 0)
+                    else if (gBattleMons[gBattlerAttacker].item != 0
+                        || gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY
+                        || IS_ITEM_MAIL(gBattleMons[gBattlerTarget].item)
+                        || gBattleMons[gBattlerTarget].item == 0)
                     {
                         gBattlescriptCurrInstr++;
                     }
                     else
                     {
-                        u16* changedItem = &gBattleStruct->changedItems[gBattleMoveAttacker];
-                        gLastUsedItem = *changedItem = gBattleMons[gBattleMoveTarget].item;
-                        gBattleMons[gBattleMoveTarget].item = 0;
+                        u16* changedItem = &gBattleStruct->changedItems[gBattlerAttacker];
+                        gLastUsedItem = *changedItem = gBattleMons[gBattlerTarget].item;
+                        gBattleMons[gBattlerTarget].item = 0;
 
-                        gActiveBattler = gBattleMoveAttacker;
+                        gActiveBattler = gBattlerAttacker;
                         BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem);
-                        MarkBattlerForControllerExec(gBattleMoveAttacker);
+                        MarkBattlerForControllerExec(gBattlerAttacker);
 
-                        gActiveBattler = gBattleMoveTarget;
-                        BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattleMoveTarget].item);
-                        MarkBattlerForControllerExec(gBattleMoveTarget);
+                        gActiveBattler = gBattlerTarget;
+                        BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattlerTarget].item);
+                        MarkBattlerForControllerExec(gBattlerTarget);
 
                         BattleScriptPush(gBattlescriptCurrInstr + 1);
                         gBattlescriptCurrInstr = BattleScript_ItemSteal;
 
-                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveTarget]) + 0) = 0;
-                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveTarget]) + 1) = 0;
+                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0;
+                        *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0;
                     }
 
                 }
                 break;
             case MOVE_EFFECT_PREVENT_ESCAPE:
-                gBattleMons[gBattleMoveTarget].status2 |= STATUS2_ESCAPE_PREVENTION;
-                gDisableStructs[gBattleMoveTarget].bankPreventingEscape = gBattleMoveAttacker;
+                gBattleMons[gBattlerTarget].status2 |= STATUS2_ESCAPE_PREVENTION;
+                gDisableStructs[gBattlerTarget].battlerPreventingEscape = gBattlerAttacker;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_NIGHTMARE:
-                gBattleMons[gBattleMoveTarget].status2 |= STATUS2_NIGHTMARE;
+                gBattleMons[gBattlerTarget].status2 |= STATUS2_NIGHTMARE;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_ALL_STATS_UP:
@@ -2921,15 +2921,15 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattlescriptCurrInstr = BattleScript_RapidSpinAway;
                 break;
             case MOVE_EFFECT_REMOVE_PARALYSIS: // Smelling salts
-                if (!(gBattleMons[gBattleMoveTarget].status1 & STATUS1_PARALYSIS))
+                if (!(gBattleMons[gBattlerTarget].status1 & STATUS1_PARALYSIS))
                 {
                     gBattlescriptCurrInstr++;
                 }
                 else
                 {
-                    gBattleMons[gBattleMoveTarget].status1 &= ~(STATUS1_PARALYSIS);
+                    gBattleMons[gBattlerTarget].status1 &= ~(STATUS1_PARALYSIS);
 
-                    gActiveBattler = gBattleMoveTarget;
+                    gActiveBattler = gBattlerTarget;
                     BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
                     MarkBattlerForControllerExec(gActiveBattler);
 
@@ -3010,7 +3010,7 @@ static void atk15_seteffectwithchance(void)
 {
     u32 percentChance;
 
-    if (gBattleMons[gBattleMoveAttacker].ability == ABILITY_SERENE_GRACE)
+    if (gBattleMons[gBattlerAttacker].ability == ABILITY_SERENE_GRACE)
         percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance * 2;
     else
         percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance;
@@ -3089,14 +3089,14 @@ static void atk19_tryfaintmon(void)
 
         if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
         {
-            gActiveBattler = gBattleMoveAttacker;
-            bank = gBattleMoveTarget;
+            gActiveBattler = gBattlerAttacker;
+            bank = gBattlerTarget;
             BS_ptr = BattleScript_FaintAttacker;
         }
         else
         {
-            gActiveBattler = gBattleMoveTarget;
-            bank = gBattleMoveAttacker;
+            gActiveBattler = gBattlerTarget;
+            bank = gBattlerAttacker;
             BS_ptr = BattleScript_FaintTarget;
         }
         if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler])
@@ -3118,29 +3118,29 @@ static void atk19_tryfaintmon(void)
                     gBattleResults.opponentFaintCounter++;
                 gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES, NULL);
             }
-            if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBattleMoveAttacker].hp != 0)
+            if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBattlerAttacker].hp != 0)
             {
                 gHitMarker &= ~(HITMARKER_DESTINYBOND);
                 BattleScriptPush(gBattlescriptCurrInstr);
                 gBattleMoveDamage = gBattleMons[bank].hp;
                 gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife;
             }
-            if ((gStatuses3[gBattleMoveTarget] & STATUS3_GRUDGE)
+            if ((gStatuses3[gBattlerTarget] & STATUS3_GRUDGE)
              && !(gHitMarker & HITMARKER_GRUDGE)
-             && GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gBattleMoveTarget)
-             && gBattleMons[gBattleMoveAttacker].hp != 0
+             && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)
+             && gBattleMons[gBattlerAttacker].hp != 0
              && gCurrentMove != MOVE_STRUGGLE)
             {
-                u8 moveIndex = *(gBattleStruct->chosenMovePositions + gBattleMoveAttacker);
+                u8 moveIndex = *(gBattleStruct->chosenMovePositions + gBattlerAttacker);
 
-                gBattleMons[gBattleMoveAttacker].pp[moveIndex] = 0;
+                gBattleMons[gBattlerAttacker].pp[moveIndex] = 0;
                 BattleScriptPush(gBattlescriptCurrInstr);
                 gBattlescriptCurrInstr = BattleScript_GrudgeTakesPp;
-                gActiveBattler = gBattleMoveAttacker;
+                gActiveBattler = gBattlerAttacker;
                 BtlController_EmitSetMonData(0, moveIndex + REQUEST_PPMOVE1_BATTLE, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]);
                 MarkBattlerForControllerExec(gActiveBattler);
 
-                PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattleMoveAttacker].moves[moveIndex])
+                PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerAttacker].moves[moveIndex])
             }
         }
         else
@@ -3211,26 +3211,26 @@ static void atk1E_jumpifability(void)
 
     if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER_SIDE)
     {
-        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattleMoveAttacker, ability, 0, 0);
+        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattlerAttacker, ability, 0, 0);
         if (bank)
         {
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jumpPtr;
             RecordAbilityBattle(bank - 1, gLastUsedAbility);
-            gBattleScripting.bankWithAbility = bank - 1;
+            gBattleScripting.battlerWithAbility = bank - 1;
         }
         else
             gBattlescriptCurrInstr += 7;
     }
     else if (gBattlescriptCurrInstr[1] == BS_GET_NOT_ATTACKER_SIDE)
     {
-        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBattleMoveAttacker, ability, 0, 0);
+        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBattlerAttacker, ability, 0, 0);
         if (bank)
         {
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jumpPtr;
             RecordAbilityBattle(bank - 1, gLastUsedAbility);
-            gBattleScripting.bankWithAbility = bank - 1;
+            gBattleScripting.battlerWithAbility = bank - 1;
         }
         else
             gBattlescriptCurrInstr += 7;
@@ -3243,7 +3243,7 @@ static void atk1E_jumpifability(void)
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jumpPtr;
             RecordAbilityBattle(bank, gLastUsedAbility);
-            gBattleScripting.bankWithAbility = bank;
+            gBattleScripting.battlerWithAbility = bank;
         }
         else
             gBattlescriptCurrInstr += 7;
@@ -3257,9 +3257,9 @@ static void atk1F_jumpifsideaffecting(void)
     const u8* jumpPtr;
 
     if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
-        side = GET_BATTLER_SIDE(gBattleMoveAttacker);
+        side = GET_BATTLER_SIDE(gBattlerAttacker);
     else
-        side = GET_BATTLER_SIDE(gBattleMoveTarget);
+        side = GET_BATTLER_SIDE(gBattlerTarget);
 
     flags = BS2ScriptRead16(gBattlescriptCurrInstr + 2);
     jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 4);
@@ -3529,12 +3529,12 @@ static void atk23_getexp(void)
             gBattleBufferB[gBattleStruct->expGetterBank][0] = 0;
             if (GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL) != MAX_MON_LEVEL)
             {
-                BATTLE_LVLUP_STATS->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_MAX_HP);
-                BATTLE_LVLUP_STATS->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_ATK);
-                BATTLE_LVLUP_STATS->def = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_DEF);
-                BATTLE_LVLUP_STATS->spd = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPEED);
-                BATTLE_LVLUP_STATS->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPATK);
-                BATTLE_LVLUP_STATS->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPDEF);
+                gBattleResources->statsBeforeLvlUp->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_MAX_HP);
+                gBattleResources->statsBeforeLvlUp->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_ATK);
+                gBattleResources->statsBeforeLvlUp->def = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_DEF);
+                gBattleResources->statsBeforeLvlUp->spd = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPEED);
+                gBattleResources->statsBeforeLvlUp->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPATK);
+                gBattleResources->statsBeforeLvlUp->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPDEF);
 
                 gActiveBattler = gBattleStruct->expGetterBank;
                 BtlController_EmitExpUpdate(0, gBattleStruct->expGetterId, gBattleMoveDamage);
@@ -3646,7 +3646,7 @@ static void atk24(void)
         for (i = 0; i < 6; i++)
         {
             if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)
-                && (!(gBattleTypeFlags & BATTLE_TYPE_ARENA) || !(gBattleStruct->field_2A0 & gBitTable[i])))
+             && (!(gBattleTypeFlags & BATTLE_TYPE_ARENA) || !(gBattleStruct->field_2A0 & gBitTable[i])))
             {
                 HP_count += GetMonData(&gPlayerParty[i], MON_DATA_HP);
             }
@@ -4323,9 +4323,9 @@ static void atk3A_waitstate(void)
 static void atk3B_healthbar_update(void)
 {
     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
-        gActiveBattler = gBattleMoveTarget;
+        gActiveBattler = gBattlerTarget;
     else
-        gActiveBattler = gBattleMoveAttacker;
+        gActiveBattler = gBattlerAttacker;
 
     BtlController_EmitHealthBarUpdate(0, gBattleMoveDamage);
     MarkBattlerForControllerExec(gActiveBattler);
@@ -4340,7 +4340,7 @@ static void atk3C_return(void)
 static void atk3D_end(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
-        sub_81A5718(gBattleMoveAttacker);
+        sub_81A5718(gBattlerAttacker);
 
     gMoveResultFlags = 0;
     gActiveBattler = 0;
@@ -4356,9 +4356,9 @@ static void atk3E_end2(void)
 static void atk3F_end3(void) // pops the main function stack
 {
     BattleScriptPop();
-    if (BATTLE_CALLBACKS_STACK->size)
-        BATTLE_CALLBACKS_STACK->size--;
-    gBattleMainFunc = BATTLE_CALLBACKS_STACK->function[BATTLE_CALLBACKS_STACK->size];
+    if (gBattleResources->battleCallbackStack->size != 0)
+        gBattleResources->battleCallbackStack->size--;
+    gBattleMainFunc = gBattleResources->battleCallbackStack->function[gBattleResources->battleCallbackStack->size];
 }
 
 static void atk41_call(void)
@@ -4387,7 +4387,7 @@ static void atk43_jumpifabilitypresent(void)
 
 static void atk44_endselectionscript(void)
 {
-    *(gBattleMoveAttacker + gBattleStruct->selectionScriptFinished) = TRUE;
+    *(gBattlerAttacker + gBattleStruct->selectionScriptFinished) = TRUE;
 }
 
 static void atk45_playanimation(void)
@@ -4864,12 +4864,12 @@ static void atk49_moveend(void)
     arg1 = gBattlescriptCurrInstr[1];
     arg2 = gBattlescriptCurrInstr[2];
 
-    if (gBattleMons[gBattleMoveAttacker].item == ITEM_ENIGMA_BERRY)
-        holdEffectAtk = gEnigmaBerries[gBattleMoveAttacker].holdEffect;
+    if (gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY)
+        holdEffectAtk = gEnigmaBerries[gBattlerAttacker].holdEffect;
     else
-        holdEffectAtk = ItemId_GetHoldEffect(gBattleMons[gBattleMoveAttacker].item);
+        holdEffectAtk = ItemId_GetHoldEffect(gBattleMons[gBattlerAttacker].item);
 
-    choicedMoveAtk = &gBattleStruct->choicedMove[gBattleMoveAttacker];
+    choicedMoveAtk = &gBattleStruct->choicedMove[gBattlerAttacker];
 
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
@@ -4878,13 +4878,13 @@ static void atk49_moveend(void)
         switch (gBattleScripting.atk49_state)
         {
         case 0: // rage check
-            if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_RAGE
-                && gBattleMons[gBattleMoveTarget].hp != 0 && gBattleMoveAttacker != gBattleMoveTarget
-                && GetBattlerSide(gBattleMoveAttacker) != GetBattlerSide(gBattleMoveTarget)
+            if (gBattleMons[gBattlerTarget].status2 & STATUS2_RAGE
+                && gBattleMons[gBattlerTarget].hp != 0 && gBattlerAttacker != gBattlerTarget
+                && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED
-                && gBattleMoves[gCurrentMove].power && gBattleMons[gBattleMoveTarget].statStages[STAT_STAGE_ATK] <= 0xB)
+                && gBattleMoves[gCurrentMove].power && gBattleMons[gBattlerTarget].statStages[STAT_STAGE_ATK] <= 0xB)
             {
-                gBattleMons[gBattleMoveTarget].statStages[STAT_STAGE_ATK]++;
+                gBattleMons[gBattlerTarget].statStages[STAT_STAGE_ATK]++;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_RageIsBuilding;
                 effect = TRUE;
@@ -4892,14 +4892,14 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 1: // defrosting check
-            if (gBattleMons[gBattleMoveTarget].status1 & STATUS1_FREEZE
-                && gBattleMons[gBattleMoveTarget].hp != 0 && gBattleMoveAttacker != gBattleMoveTarget
-                && gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special
+            if (gBattleMons[gBattlerTarget].status1 & STATUS1_FREEZE
+                && gBattleMons[gBattlerTarget].hp != 0 && gBattlerAttacker != gBattlerTarget
+                && gSpecialStatuses[gBattlerTarget].moveturnLostHP_special
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && moveType == TYPE_FIRE)
             {
-                gBattleMons[gBattleMoveTarget].status1 &= ~(STATUS1_FREEZE);
-                gActiveBattler = gBattleMoveTarget;
-                BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBattleMoveTarget].status1);
+                gBattleMons[gBattlerTarget].status1 &= ~(STATUS1_FREEZE);
+                gActiveBattler = gBattlerTarget;
+                BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBattlerTarget].status1);
                 MarkBattlerForControllerExec(gActiveBattler);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove;
@@ -4908,12 +4908,12 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 2: // target synchronize
-            if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBattleMoveTarget, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBattlerTarget, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
         case 3: // contact abilities
-            if (AbilityBattleEffects(ABILITYEFFECT_CONTACT, gBattleMoveTarget, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_CONTACT, gBattlerTarget, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
@@ -4924,7 +4924,7 @@ static void atk49_moveend(void)
                 gBattleScripting.atk49_state++;
             break;
         case 5: // attacker synchronize
-            if (AbilityBattleEffects(ABILITYEFFECT_ATK_SYNCHRONIZE, gBattleMoveAttacker, 0, 0, 0))
+            if (AbilityBattleEffects(ABILITYEFFECT_ATK_SYNCHRONIZE, gBattlerAttacker, 0, 0, 0))
                 effect = TRUE;
             gBattleScripting.atk49_state++;
             break;
@@ -4942,7 +4942,7 @@ static void atk49_moveend(void)
             {
                 for (i = 0; i < 4; i++)
                 {
-                    if (gBattleMons[gBattleMoveAttacker].moves[i] == *choicedMoveAtk)
+                    if (gBattleMons[gBattlerAttacker].moves[i] == *choicedMoveAtk)
                         break;
                 }
                 if (i == 4)
@@ -4975,10 +4975,10 @@ static void atk49_moveend(void)
             gBattleScripting.atk49_state++;
             break;
         case 8: // make attacker sprite invisible
-            if (gStatuses3[gBattleMoveAttacker] & (STATUS3_SEMI_INVULNERABLE)
+            if (gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE)
                 && gHitMarker & HITMARKER_NO_ANIMATIONS)
             {
-                gActiveBattler = gBattleMoveAttacker;
+                gActiveBattler = gBattlerAttacker;
                 BtlController_EmitSpriteInvisibility(0, TRUE);
                 MarkBattlerForControllerExec(gActiveBattler);
                 gBattleScripting.atk49_state++;
@@ -4988,27 +4988,27 @@ static void atk49_moveend(void)
             break;
         case 9: // make attacker sprite visible
             if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT
-                || !(gStatuses3[gBattleMoveAttacker] & (STATUS3_SEMI_INVULNERABLE))
-                || WasUnableToUseMove(gBattleMoveAttacker))
+                || !(gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE))
+                || WasUnableToUseMove(gBattlerAttacker))
             {
-                gActiveBattler = gBattleMoveAttacker;
+                gActiveBattler = gBattlerAttacker;
                 BtlController_EmitSpriteInvisibility(0, FALSE);
                 MarkBattlerForControllerExec(gActiveBattler);
-                gStatuses3[gBattleMoveAttacker] &= ~(STATUS3_SEMI_INVULNERABLE);
-                gSpecialStatuses[gBattleMoveAttacker].restoredBankSprite = 1;
+                gStatuses3[gBattlerAttacker] &= ~(STATUS3_SEMI_INVULNERABLE);
+                gSpecialStatuses[gBattlerAttacker].restoredBankSprite = 1;
                 gBattleScripting.atk49_state++;
                 return;
             }
             gBattleScripting.atk49_state++;
             break;
         case 10: // make target sprite visible
-            if (!gSpecialStatuses[gBattleMoveTarget].restoredBankSprite && gBattleMoveTarget < gBattlersCount
-                && !(gStatuses3[gBattleMoveTarget] & STATUS3_SEMI_INVULNERABLE))
+            if (!gSpecialStatuses[gBattlerTarget].restoredBankSprite && gBattlerTarget < gBattlersCount
+                && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE))
             {
-                gActiveBattler = gBattleMoveTarget;
+                gActiveBattler = gBattlerTarget;
                 BtlController_EmitSpriteInvisibility(0, FALSE);
                 MarkBattlerForControllerExec(gActiveBattler);
-                gStatuses3[gBattleMoveTarget] &= ~(STATUS3_SEMI_INVULNERABLE);
+                gStatuses3[gBattlerTarget] &= ~(STATUS3_SEMI_INVULNERABLE);
                 gBattleScripting.atk49_state++;
                 return;
             }
@@ -5025,82 +5025,82 @@ static void atk49_moveend(void)
         case 14: // This case looks interesting, although I am not certain what it does. Probably fine tunes edge cases.
             if (gHitMarker & HITMARKER_PURSUIT_TRAP)
             {
-                gActiveBattler = gBattleMoveAttacker;
-                gBattleMoveAttacker = gBattleMoveTarget;
-                gBattleMoveTarget = gActiveBattler;
+                gActiveBattler = gBattlerAttacker;
+                gBattlerAttacker = gBattlerTarget;
+                gBattlerTarget = gActiveBattler;
                 gHitMarker &= ~(HITMARKER_PURSUIT_TRAP);
             }
             if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED)
             {
-                gLastPrintedMoves[gBattleMoveAttacker] = gChosenMove;
+                gLastPrintedMoves[gBattlerAttacker] = gChosenMove;
             }
-            if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveAttacker])
-                && !(gBattleStruct->field_91 & gBitTable[gBattleMoveAttacker])
+            if (!(gAbsentBattlerFlags & gBitTable[gBattlerAttacker])
+                && !(gBattleStruct->field_91 & gBitTable[gBattlerAttacker])
                 && gBattleMoves[originallyUsedMove].effect != EFFECT_BATON_PASS)
             {
                 if (gHitMarker & HITMARKER_OBEYS)
                 {
-                    gLastMoves[gBattleMoveAttacker] = gChosenMove;
-                    gLastResultingMoves[gBattleMoveAttacker] = gCurrentMove;
+                    gLastMoves[gBattlerAttacker] = gChosenMove;
+                    gLastResultingMoves[gBattlerAttacker] = gCurrentMove;
                 }
                 else
                 {
-                    gLastMoves[gBattleMoveAttacker] = 0xFFFF;
-                    gLastResultingMoves[gBattleMoveAttacker] = 0xFFFF;
+                    gLastMoves[gBattlerAttacker] = 0xFFFF;
+                    gLastResultingMoves[gBattlerAttacker] = 0xFFFF;
                 }
 
-                if (!(gHitMarker & HITMARKER_FAINTED(gBattleMoveTarget)))
-                    gLastHitBy[gBattleMoveTarget] = gBattleMoveAttacker;
+                if (!(gHitMarker & HITMARKER_FAINTED(gBattlerTarget)))
+                    gLastHitBy[gBattlerTarget] = gBattlerAttacker;
 
                 if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
                 {
                     if (gChosenMove == 0xFFFF)
                     {
-                        gLastLandedMoves[gBattleMoveTarget] = gChosenMove;
+                        gLastLandedMoves[gBattlerTarget] = gChosenMove;
                     }
                     else
                     {
-                        gLastLandedMoves[gBattleMoveTarget] = gCurrentMove;
-                        GET_MOVE_TYPE(gCurrentMove, gLastHitByType[gBattleMoveTarget]);
+                        gLastLandedMoves[gBattlerTarget] = gCurrentMove;
+                        GET_MOVE_TYPE(gCurrentMove, gLastHitByType[gBattlerTarget]);
                     }
                 }
                 else
                 {
-                    gLastLandedMoves[gBattleMoveTarget] = 0xFFFF;
+                    gLastLandedMoves[gBattlerTarget] = 0xFFFF;
                 }
             }
             gBattleScripting.atk49_state++;
             break;
         case 15: // mirror move
-            if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveAttacker]) && !(gBattleStruct->field_91 & gBitTable[gBattleMoveAttacker])
+            if (!(gAbsentBattlerFlags & gBitTable[gBattlerAttacker]) && !(gBattleStruct->field_91 & gBitTable[gBattlerAttacker])
                 && gBattleMoves[originallyUsedMove].flags & FLAG_MIRROR_MOVE_AFFECTED && gHitMarker & HITMARKER_OBEYS
-                && gBattleMoveAttacker != gBattleMoveTarget && !(gHitMarker & HITMARKER_FAINTED(gBattleMoveTarget))
+                && gBattlerAttacker != gBattlerTarget && !(gHitMarker & HITMARKER_FAINTED(gBattlerTarget))
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
             {
                 u8 target, attacker;
 
-                *(gBattleStruct->mirrorMoves + gBattleMoveTarget * 2 + 0) = gChosenMove;
-                *(gBattleStruct->mirrorMoves + gBattleMoveTarget * 2 + 1) = gChosenMove >> 8;
+                *(gBattleStruct->mirrorMoves + gBattlerTarget * 2 + 0) = gChosenMove;
+                *(gBattleStruct->mirrorMoves + gBattlerTarget * 2 + 1) = gChosenMove >> 8;
 
-                target = gBattleMoveTarget;
-                attacker = gBattleMoveAttacker;
+                target = gBattlerTarget;
+                attacker = gBattlerAttacker;
                 *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = gChosenMove;
 
-                target = gBattleMoveTarget;
-                attacker = gBattleMoveAttacker;
+                target = gBattlerTarget;
+                attacker = gBattlerAttacker;
                 *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) = gChosenMove >> 8;
             }
             gBattleScripting.atk49_state++;
             break;
         case 16: //
             if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-                && !gProtectStructs[gBattleMoveAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
+                && !gProtectStructs[gBattlerAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
                 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
             {
-                u8 bank = GetBattlerAtPosition(B_POSITION_PARTNER(GetBattlerPosition(gBattleMoveTarget)));
+                u8 bank = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gBattlerTarget)));
                 if (gBattleMons[bank].hp != 0)
                 {
-                    gBattleMoveTarget = bank;
+                    gBattlerTarget = bank;
                     gHitMarker |= HITMARKER_NO_ATTACKSTRING;
                     gBattleScripting.atk49_state = 0;
                     MoveValuesCleanUp();
@@ -5136,13 +5136,13 @@ static void atk4A_typecalc2(void)
     s32 i = 0;
     u8 moveType = gBattleMoves[gCurrentMove].type;
 
-    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
+    if (gBattleMons[gBattlerTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND)
     {
-        gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
+        gLastUsedAbility = gBattleMons[gBattlerTarget].ability;
         gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE);
-        gLastLandedMoves[gBattleMoveTarget] = 0;
+        gLastLandedMoves[gBattlerTarget] = 0;
         gBattleCommunication[6] = moveType;
-        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBattlerTarget, gLastUsedAbility);
     }
     else
     {
@@ -5150,7 +5150,7 @@ static void atk4A_typecalc2(void)
         {
             if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
             {
-                if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_FORESIGHT)
+                if (gBattleMons[gBattlerTarget].status2 & STATUS2_FORESIGHT)
                 {
                     break;
                 }
@@ -5164,7 +5164,7 @@ static void atk4A_typecalc2(void)
             if (TYPE_EFFECT_ATK_TYPE(i) == moveType)
             {
                 // check type1
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type1)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type1)
                 {
                     if (TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
                     {
@@ -5181,22 +5181,22 @@ static void atk4A_typecalc2(void)
                     }
                 }
                 // check type2
-                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2)
+                if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type2)
                 {
-                    if (gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2
+                    if (gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT)
                     {
                         gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE;
                         break;
                     }
-                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2
-                        && gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2
+                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type2
+                        && gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE)
                     {
                         flags |= MOVE_RESULT_NOT_VERY_EFFECTIVE;
                     }
-                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattleMoveTarget].type2
-                        && gBattleMons[gBattleMoveTarget].type1 != gBattleMons[gBattleMoveTarget].type2
+                    if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type2
+                        && gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2
                         && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE)
                     {
                         flags |= MOVE_RESULT_SUPER_EFFECTIVE;
@@ -5207,27 +5207,27 @@ static void atk4A_typecalc2(void)
         }
     }
 
-    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_WONDER_GUARD
+    if (gBattleMons[gBattlerTarget].ability == ABILITY_WONDER_GUARD
         && !(flags & MOVE_RESULT_NO_EFFECT)
-        && AttacksThisTurn(gBattleMoveAttacker, gCurrentMove) == 2
+        && AttacksThisTurn(gBattlerAttacker, gCurrentMove) == 2
         && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)))
         && gBattleMoves[gCurrentMove].power)
     {
         gLastUsedAbility = ABILITY_WONDER_GUARD;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
-        gLastLandedMoves[gBattleMoveTarget] = 0;
+        gLastLandedMoves[gBattlerTarget] = 0;
         gBattleCommunication[6] = 3;
-        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBattlerTarget, gLastUsedAbility);
     }
     if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
-        gProtectStructs[gBattleMoveAttacker].targetNotAffected = 1;
+        gProtectStructs[gBattlerAttacker].targetNotAffected = 1;
 
     gBattlescriptCurrInstr++;
 }
 
 static void atk4B_returnatktoball(void)
 {
-    gActiveBattler = gBattleMoveAttacker;
+    gActiveBattler = gBattlerAttacker;
     if (!(gHitMarker & HITMARKER_FAINTED(gActiveBattler)))
     {
         BtlController_EmitReturnMonToBall(0, 0);
@@ -5842,7 +5842,7 @@ static void atk51_switchhandleorder(void)
             sub_803BDA0(gActiveBattler);
         }
 
-        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattleMoveAttacker].species)
+        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerAttacker].species)
         PREPARE_MON_NICK_BUFFER(gBattleTextBuff2, gActiveBattler, gBattleBufferB[gActiveBattler][1])
 
         break;
@@ -5904,7 +5904,7 @@ static void atk52_switchineffects(void)
             for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleTurnOrder[i] == gActiveBattler)
-                    gActionsByTurnOrder[i] = ACTION_CANCEL_PARTNER;
+                    gActionsByTurnOrder[i] = B_ACTION_CANCEL_PARTNER;
             }
 
             for (i = 0; i < gBattlersCount; i++)
@@ -5943,7 +5943,7 @@ static void atk53_trainerslidein(void)
 
 static void atk54_playse(void)
 {
-    gActiveBattler = gBattleMoveAttacker;
+    gActiveBattler = gBattlerAttacker;
     BtlController_EmitPlaySE(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1));
     MarkBattlerForControllerExec(gActiveBattler);
 
@@ -5952,7 +5952,7 @@ static void atk54_playse(void)
 
 static void atk55_fanfare(void)
 {
-    gActiveBattler = gBattleMoveAttacker;
+    gActiveBattler = gBattlerAttacker;
     BtlController_EmitPlayFanfareOrBGM(0, BS2ScriptRead16(gBattlescriptCurrInstr + 1), FALSE);
     MarkBattlerForControllerExec(gActiveBattler);
 
@@ -6311,9 +6311,9 @@ static void atk5E(void)
 
 static void atk5F(void)
 {
-    gActiveBattler = gBattleMoveAttacker;
-    gBattleMoveAttacker = gBattleMoveTarget;
-    gBattleMoveTarget = gActiveBattler;
+    gActiveBattler = gBattlerAttacker;
+    gBattlerAttacker = gBattlerTarget;
+    gBattlerTarget = gActiveBattler;
 
     if (gHitMarker & HITMARKER_PURSUIT_TRAP)
         gHitMarker &= ~(HITMARKER_PURSUIT_TRAP);
@@ -6325,7 +6325,7 @@ static void atk5F(void)
 
 static void atk60_incrementgamestat(void)
 {
-    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
         IncrementGameStat(gBattlescriptCurrInstr[1]);
 
     gBattlescriptCurrInstr += 2;
@@ -6489,7 +6489,7 @@ static void atk68_cancelallactions(void)
     s32 i;
 
     for (i = 0; i < gBattlersCount; i++)
-        gActionsByTurnOrder[i] = ACTION_CANCEL_PARTNER;
+        gActionsByTurnOrder[i] = B_ACTION_CANCEL_PARTNER;
 
     gBattlescriptCurrInstr++;
 }
@@ -6498,42 +6498,42 @@ static void atk69_adjustsetdamage(void) // The same as 0x7, except there's no ra
 {
     u8 holdEffect, quality;
 
-    if (gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect, quality = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect, quality = gEnigmaBerries[gBattlerTarget].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleMoveTarget].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattleMoveTarget].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
+        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
-    gStringBank = gBattleMoveTarget;
+    gStringBattler = gBattlerTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
     {
-        RecordItemEffectBattle(gBattleMoveTarget, holdEffect);
-        gSpecialStatuses[gBattleMoveTarget].focusBanded = 1;
+        RecordItemEffectBattle(gBattlerTarget, holdEffect);
+        gSpecialStatuses[gBattlerTarget].focusBanded = 1;
     }
-    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_SUBSTITUTE)
+    if (gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE)
         goto END;
-    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattleMoveTarget].endured
-     && !gSpecialStatuses[gBattleMoveTarget].focusBanded)
+    if (gBattleMoves[gCurrentMove].effect != EFFECT_FALSE_SWIPE && !gProtectStructs[gBattlerTarget].endured
+     && !gSpecialStatuses[gBattlerTarget].focusBanded)
         goto END;
 
-    if (gBattleMons[gBattleMoveTarget].hp > gBattleMoveDamage)
+    if (gBattleMons[gBattlerTarget].hp > gBattleMoveDamage)
         goto END;
 
-    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - 1;
+    gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - 1;
 
-    if (gProtectStructs[gBattleMoveTarget].endured)
+    if (gProtectStructs[gBattlerTarget].endured)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
     }
-    else if (gSpecialStatuses[gBattleMoveTarget].focusBanded)
+    else if (gSpecialStatuses[gBattlerTarget].focusBanded)
     {
         gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-        gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
+        gLastUsedItem = gBattleMons[gBattlerTarget].item;
     }
 
     END:
@@ -6558,7 +6558,7 @@ static void atk6A_removeitem(void)
 
 static void atk6B_atknameinbuff1(void)
 {
-    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattleMoveAttacker, gBattlerPartyIndexes[gBattleMoveAttacker])
+    PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattlerPartyIndexes[gBattlerAttacker])
 
     gBattlescriptCurrInstr++;
 }
@@ -6845,7 +6845,7 @@ static void atk6D_resetsentmonsvalue(void)
 
 static void atk6E_setatktoplayer0(void)
 {
-    gBattleMoveAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+    gBattlerAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     gBattlescriptCurrInstr++;
 }
 
@@ -6939,8 +6939,8 @@ static void atk74_hpthresholds2(void)
 
 static void atk75_useitemonopponent(void)
 {
-    gBankInMenu = gBattleMoveAttacker;
-    ExecuteTableBasedItemEffect(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattleMoveAttacker], 0, 1);
+    gBankInMenu = gBattlerAttacker;
+    ExecuteTableBasedItemEffect(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, 1);
 
     gBattlescriptCurrInstr += 1;
 }
@@ -6958,18 +6958,18 @@ static void atk76_various(void)
         CancelMultiTurnMoves(gActiveBattler);
         break;
     case VARIOUS_SET_MAGIC_COAT_TARGET:
-        gBattleMoveAttacker = gBattleMoveTarget;
-        side = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
+        gBattlerAttacker = gBattlerTarget;
+        side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer != 0 && gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
-            gBattleMoveTarget = gSideTimers[side].followmeTarget;
+            gBattlerTarget = gSideTimers[side].followmeTarget;
         else
-            gBattleMoveTarget = gActiveBattler;
+            gBattlerTarget = gActiveBattler;
         break;
     case VARIOUS_IS_RUNNING_IMPOSSIBLE:
         gBattleCommunication[0] = IsRunningFromBattleImpossible();
         break;
     case VARIOUS_GET_MOVE_TARGET:
-        gBattleMoveTarget = GetMoveTarget(gCurrentMove, 0);
+        gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
         break;
     case 4:
         if (gHitMarker & HITMARKER_FAINTED(gActiveBattler))
@@ -7127,31 +7127,31 @@ static void atk76_various(void)
 static void atk77_setprotectlike(void) // protect and endure
 {
     bool8 notLastTurn = TRUE;
-    u16 lastMove = gLastResultingMoves[gBattleMoveAttacker];
+    u16 lastMove = gLastResultingMoves[gBattlerAttacker];
 
     if (lastMove != MOVE_PROTECT && lastMove != MOVE_DETECT && lastMove != MOVE_ENDURE)
-        gDisableStructs[gBattleMoveAttacker].protectUses = 0;
+        gDisableStructs[gBattlerAttacker].protectUses = 0;
 
     if (gCurrentTurnActionNumber == (gBattlersCount - 1))
         notLastTurn = FALSE;
 
-    if (sProtectSuccessRates[gDisableStructs[gBattleMoveAttacker].protectUses] >= Random() && notLastTurn)
+    if (sProtectSuccessRates[gDisableStructs[gBattlerAttacker].protectUses] >= Random() && notLastTurn)
     {
         if (gBattleMoves[gCurrentMove].effect == EFFECT_PROTECT)
         {
-            gProtectStructs[gBattleMoveAttacker].protected = 1;
+            gProtectStructs[gBattlerAttacker].protected = 1;
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         }
         if (gBattleMoves[gCurrentMove].effect == EFFECT_ENDURE)
         {
-            gProtectStructs[gBattleMoveAttacker].endured = 1;
+            gProtectStructs[gBattlerAttacker].endured = 1;
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
         }
-        gDisableStructs[gBattleMoveAttacker].protectUses++;
+        gDisableStructs[gBattlerAttacker].protectUses++;
     }
     else
     {
-        gDisableStructs[gBattleMoveAttacker].protectUses = 0;
+        gDisableStructs[gBattlerAttacker].protectUses = 0;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         gMoveResultFlags |= MOVE_RESULT_MISSED;
     }
@@ -7164,32 +7164,32 @@ static void atk78_faintifabilitynotdamp(void)
     if (gBattleControllerExecFlags)
         return;
 
-    for (gBattleMoveTarget = 0; gBattleMoveTarget < gBattlersCount; gBattleMoveTarget++)
+    for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++)
     {
-        if (gBattleMons[gBattleMoveTarget].ability == ABILITY_DAMP)
+        if (gBattleMons[gBattlerTarget].ability == ABILITY_DAMP)
             break;
     }
 
-    if (gBattleMoveTarget == gBattlersCount)
+    if (gBattlerTarget == gBattlersCount)
     {
-        gActiveBattler = gBattleMoveAttacker;
+        gActiveBattler = gBattlerAttacker;
         gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
         BtlController_EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP);
         MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr++;
 
-        for (gBattleMoveTarget = 0; gBattleMoveTarget < gBattlersCount; gBattleMoveTarget++)
+        for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++)
         {
-            if (gBattleMoveTarget == gBattleMoveAttacker)
+            if (gBattlerTarget == gBattlerAttacker)
                 continue;
-            if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]))
+            if (!(gAbsentBattlerFlags & gBitTable[gBattlerTarget]))
                 break;
         }
     }
     else
     {
         gLastUsedAbility = ABILITY_DAMP;
-        RecordAbilityBattle(gBattleMoveTarget, gBattleMons[gBattleMoveTarget].ability);
+        RecordAbilityBattle(gBattlerTarget, gBattleMons[gBattlerTarget].ability);
         gBattlescriptCurrInstr = BattleScript_DampStopsExplosion;
     }
 }
@@ -7199,7 +7199,7 @@ static void atk79_setatkhptozero(void)
     if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = gBattleMoveAttacker;
+    gActiveBattler = gBattlerAttacker;
     gBattleMons[gActiveBattler].hp = 0;
     BtlController_EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp);
     MarkBattlerForControllerExec(gActiveBattler);
@@ -7213,15 +7213,15 @@ static void atk7A_jumpifnexttargetvalid(void)
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
     {
-        for (gBattleMoveTarget++; ; gBattleMoveTarget++)
+        for (gBattlerTarget++; ; gBattlerTarget++)
         {
-            if (gBattleMoveTarget == gBattleMoveAttacker)
+            if (gBattlerTarget == gBattlerAttacker)
                 continue;
-            if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]))
+            if (!(gAbsentBattlerFlags & gBitTable[gBattlerTarget]))
                 break;
         }
 
-        if (gBattleMoveTarget >= gBattlersCount)
+        if (gBattlerTarget >= gBattlersCount)
             gBattlescriptCurrInstr += 5;
         else
             gBattlescriptCurrInstr = jumpPtr;
@@ -7237,14 +7237,14 @@ static void atk7B_tryhealhalfhealth(void)
     const u8* failPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
     if (gBattlescriptCurrInstr[5] == BS_GET_ATTACKER)
-        gBattleMoveTarget = gBattleMoveAttacker;
+        gBattlerTarget = gBattlerAttacker;
 
-    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].maxHP / 2;
+    gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2;
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
     gBattleMoveDamage *= -1;
 
-    if (gBattleMons[gBattleMoveTarget].hp == gBattleMons[gBattleMoveTarget].maxHP)
+    if (gBattleMons[gBattlerTarget].hp == gBattleMons[gBattlerTarget].maxHP)
         gBattlescriptCurrInstr = failPtr;
     else
         gBattlescriptCurrInstr += 6;
@@ -7262,10 +7262,10 @@ static void atk7C_trymirrormove(void)
 
     for (validMovesCount = 0, i = 0; i < gBattlersCount; i++)
     {
-        if (i != gBattleMoveAttacker)
+        if (i != gBattlerAttacker)
         {
-            move = *(i * 2 + gBattleMoveAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0)
-                | (*(i * 2 + gBattleMoveAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) << 8);
+            move = *(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0)
+                | (*(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 1) << 8);
 
             if (move != 0 && move != 0xFFFF)
             {
@@ -7275,14 +7275,14 @@ static void atk7C_trymirrormove(void)
         }
     }
 
-    move = *(gBattleStruct->mirrorMoves + gBattleMoveAttacker * 2 + 0)
-        | (*(gBattleStruct->mirrorMoves + gBattleMoveAttacker * 2 + 1) << 8);
+    move = *(gBattleStruct->mirrorMoves + gBattlerAttacker * 2 + 0)
+        | (*(gBattleStruct->mirrorMoves + gBattlerAttacker * 2 + 1) << 8);
 
     if (move != 0 && move != 0xFFFF)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gCurrentMove = move;
-        gBattleMoveTarget = GetMoveTarget(gCurrentMove, 0);
+        gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
         gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
     }
     else if (validMovesCount)
@@ -7290,12 +7290,12 @@ static void atk7C_trymirrormove(void)
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         i = Random() % validMovesCount;
         gCurrentMove = movesArray[i];
-        gBattleMoveTarget = GetMoveTarget(gCurrentMove, 0);
+        gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
         gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
     }
     else
     {
-        gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
+        gSpecialStatuses[gBattlerAttacker].flag20 = 1;
         gBattlescriptCurrInstr++;
     }
 }
@@ -7318,16 +7318,16 @@ static void atk7D_setrain(void)
 
 static void atk7E_setreflect(void)
 {
-    if (gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] & SIDE_STATUS_REFLECT)
+    if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_REFLECT)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] |= SIDE_STATUS_REFLECT;
-        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].reflectTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].reflectBank = gBattleMoveAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_REFLECT;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].reflectTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].reflectBank = gBattlerAttacker;
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMonsInBattle(BATTLE_ALIVE_ATK_SIDE) == 2)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
@@ -7339,20 +7339,20 @@ static void atk7E_setreflect(void)
 
 static void atk7F_setseeded(void)
 {
-    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBattleMoveTarget] & STATUS3_LEECHSEED)
+    if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBattlerTarget] & STATUS3_LEECHSEED)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
-    else if (gBattleMons[gBattleMoveTarget].type1 == TYPE_GRASS || gBattleMons[gBattleMoveTarget].type2 == TYPE_GRASS)
+    else if (gBattleMons[gBattlerTarget].type1 == TYPE_GRASS || gBattleMons[gBattlerTarget].type2 == TYPE_GRASS)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
     }
     else
     {
-        gStatuses3[gBattleMoveTarget] |= gBattleMoveAttacker;
-        gStatuses3[gBattleMoveTarget] |= STATUS3_LEECHSEED;
+        gStatuses3[gBattlerTarget] |= gBattlerAttacker;
+        gStatuses3[gBattlerTarget] |= STATUS3_LEECHSEED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
 
@@ -7370,8 +7370,8 @@ static void atk80_manipulatedamage(void)
         gBattleMoveDamage /= 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
-        if ((gBattleMons[gBattleMoveTarget].maxHP / 2) < gBattleMoveDamage)
-            gBattleMoveDamage = gBattleMons[gBattleMoveTarget].maxHP / 2;
+        if ((gBattleMons[gBattlerTarget].maxHP / 2) < gBattleMoveDamage)
+            gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2;
         break;
     case ATK80_DMG_DOUBLED:
         gBattleMoveDamage *= 2;
@@ -7384,21 +7384,21 @@ static void atk80_manipulatedamage(void)
 static void atk81_trysetrest(void)
 {
     const u8 *failJump = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
-    gActiveBattler = gBattleMoveTarget = gBattleMoveAttacker;
-    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].maxHP * (-1);
+    gActiveBattler = gBattlerTarget = gBattlerAttacker;
+    gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP * (-1);
 
-    if (gBattleMons[gBattleMoveTarget].hp == gBattleMons[gBattleMoveTarget].maxHP)
+    if (gBattleMons[gBattlerTarget].hp == gBattleMons[gBattlerTarget].maxHP)
     {
         gBattlescriptCurrInstr = failJump;
     }
     else
     {
-        if (gBattleMons[gBattleMoveTarget].status1 & ((u8)(~STATUS1_SLEEP)))
+        if (gBattleMons[gBattlerTarget].status1 & ((u8)(~STATUS1_SLEEP)))
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
         else
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
 
-        gBattleMons[gBattleMoveTarget].status1 = 3;
+        gBattleMons[gBattlerTarget].status1 = 3;
         BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
         MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 5;
@@ -7409,7 +7409,7 @@ static void atk82_jumpifnotfirstturn(void)
 {
     const u8* failJump = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (gDisableStructs[gBattleMoveAttacker].isFirstTurn)
+    if (gDisableStructs[gBattlerAttacker].isFirstTurn)
         gBattlescriptCurrInstr += 5;
     else
         gBattlescriptCurrInstr = failJump;
@@ -7431,9 +7431,9 @@ bool8 UproarWakeUpCheck(u8 bank)
 
         gBattleScripting.battler = i;
 
-        if (gBattleMoveTarget == 0xFF)
-            gBattleMoveTarget = i;
-        else if (gBattleMoveTarget == i)
+        if (gBattlerTarget == 0xFF)
+            gBattlerTarget = i;
+        else if (gBattlerTarget == i)
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         else
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -7451,17 +7451,17 @@ static void atk84_jumpifcantmakeasleep(void)
 {
     const u8 *jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (UproarWakeUpCheck(gBattleMoveTarget))
+    if (UproarWakeUpCheck(gBattlerTarget))
     {
         gBattlescriptCurrInstr = jumpPtr;
     }
-    else if (gBattleMons[gBattleMoveTarget].ability == ABILITY_INSOMNIA
-            || gBattleMons[gBattleMoveTarget].ability == ABILITY_VITAL_SPIRIT)
+    else if (gBattleMons[gBattlerTarget].ability == ABILITY_INSOMNIA
+            || gBattleMons[gBattlerTarget].ability == ABILITY_VITAL_SPIRIT)
     {
-        gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
+        gLastUsedAbility = gBattleMons[gBattlerTarget].ability;
         gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         gBattlescriptCurrInstr = jumpPtr;
-        RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
+        RecordAbilityBattle(gBattlerTarget, gLastUsedAbility);
     }
     else
     {
@@ -7471,16 +7471,16 @@ static void atk84_jumpifcantmakeasleep(void)
 
 static void atk85_stockpile(void)
 {
-    if (gDisableStructs[gBattleMoveAttacker].stockpileCounter == 3)
+    if (gDisableStructs[gBattlerAttacker].stockpileCounter == 3)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gDisableStructs[gBattleMoveAttacker].stockpileCounter++;
+        gDisableStructs[gBattlerAttacker].stockpileCounter++;
 
-        PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gBattleMoveAttacker].stockpileCounter)
+        PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gBattlerAttacker].stockpileCounter)
 
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
@@ -7490,7 +7490,7 @@ static void atk85_stockpile(void)
 static void atk86_stockpiletobasedamage(void)
 {
     const u8* jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
-    if (gDisableStructs[gBattleMoveAttacker].stockpileCounter == 0)
+    if (gDisableStructs[gBattlerAttacker].stockpileCounter == 0)
     {
         gBattlescriptCurrInstr = jumpPtr;
     }
@@ -7498,17 +7498,17 @@ static void atk86_stockpiletobasedamage(void)
     {
         if (gBattleCommunication[6] != 1)
         {
-            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleMoveAttacker], &gBattleMons[gBattleMoveTarget], gCurrentMove,
-                                                    gSideStatuses[GET_BATTLER_SIDE(gBattleMoveTarget)], 0,
-                                                    0, gBattleMoveAttacker, gBattleMoveTarget)
-                                * gDisableStructs[gBattleMoveAttacker].stockpileCounter;
-            gBattleScripting.animTurn = gDisableStructs[gBattleMoveAttacker].stockpileCounter;
+            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove,
+                                                    gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)], 0,
+                                                    0, gBattlerAttacker, gBattlerTarget)
+                                * gDisableStructs[gBattlerAttacker].stockpileCounter;
+            gBattleScripting.animTurn = gDisableStructs[gBattlerAttacker].stockpileCounter;
 
-            if (gProtectStructs[gBattleMoveAttacker].helpingHand)
+            if (gProtectStructs[gBattlerAttacker].helpingHand)
                 gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
         }
 
-        gDisableStructs[gBattleMoveAttacker].stockpileCounter = 0;
+        gDisableStructs[gBattlerAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -7517,30 +7517,30 @@ static void atk87_stockpiletohpheal(void)
 {
     const u8* jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (gDisableStructs[gBattleMoveAttacker].stockpileCounter == 0)
+    if (gDisableStructs[gBattlerAttacker].stockpileCounter == 0)
     {
         gBattlescriptCurrInstr = jumpPtr;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
-    else if (gBattleMons[gBattleMoveAttacker].maxHP == gBattleMons[gBattleMoveAttacker].hp)
+    else if (gBattleMons[gBattlerAttacker].maxHP == gBattleMons[gBattlerAttacker].hp)
     {
-        gDisableStructs[gBattleMoveAttacker].stockpileCounter = 0;
+        gDisableStructs[gBattlerAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr = jumpPtr;
-        gBattleMoveTarget = gBattleMoveAttacker;
+        gBattlerTarget = gBattlerAttacker;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / (1 << (3 - gDisableStructs[gBattleMoveAttacker].stockpileCounter));
+        gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / (1 << (3 - gDisableStructs[gBattlerAttacker].stockpileCounter));
 
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
 
-        gBattleScripting.animTurn = gDisableStructs[gBattleMoveAttacker].stockpileCounter;
-        gDisableStructs[gBattleMoveAttacker].stockpileCounter = 0;
+        gBattleScripting.animTurn = gDisableStructs[gBattlerAttacker].stockpileCounter;
+        gDisableStructs[gBattlerAttacker].stockpileCounter = 0;
         gBattlescriptCurrInstr += 5;
-        gBattleMoveTarget = gBattleMoveAttacker;
+        gBattlerTarget = gBattlerAttacker;
     }
 }
 
@@ -7560,9 +7560,9 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
     u32 index;
 
     if (flags & MOVE_EFFECT_AFFECTS_USER)
-        gActiveBattler = gBattleMoveAttacker;
+        gActiveBattler = gBattlerAttacker;
     else
-        gActiveBattler = gBattleMoveTarget;
+        gActiveBattler = gBattlerTarget;
 
     flags &= ~(MOVE_EFFECT_AFFECTS_USER);
 
@@ -7678,7 +7678,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
             if (gBattleMons[gActiveBattler].statStages[statId] == 0)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
             else
-                gBattleCommunication[MULTISTRING_CHOOSER] = (gBattleMoveTarget == gActiveBattler);
+                gBattleCommunication[MULTISTRING_CHOOSER] = (gBattlerTarget == gActiveBattler);
 
         }
     }
@@ -7705,7 +7705,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
         if (gBattleMons[gActiveBattler].statStages[statId] == 0xC)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         else
-            gBattleCommunication[MULTISTRING_CHOOSER] = (gBattleMoveTarget == gActiveBattler);
+            gBattleCommunication[MULTISTRING_CHOOSER] = (gBattlerTarget == gActiveBattler);
     }
 
     gBattleMons[gActiveBattler].statStages[statId] += statValue;
@@ -7745,17 +7745,17 @@ static void atk8A_normalisebuffs(void) // haze
 
 static void atk8B_setbide(void)
 {
-    gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_MULTIPLETURNS;
-    gLockedMoves[gBattleMoveAttacker] = gCurrentMove;
-    gTakenDmg[gBattleMoveAttacker] = 0;
-    gBattleMons[gBattleMoveAttacker].status2 |= (STATUS2_BIDE - 0x100); // 2 turns
+    gBattleMons[gBattlerAttacker].status2 |= STATUS2_MULTIPLETURNS;
+    gLockedMoves[gBattlerAttacker] = gCurrentMove;
+    gTakenDmg[gBattlerAttacker] = 0;
+    gBattleMons[gBattlerAttacker].status2 |= (STATUS2_BIDE - 0x100); // 2 turns
 
     gBattlescriptCurrInstr++;
 }
 
 static void atk8C_confuseifrepeatingattackends(void)
 {
-    if (!(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_LOCK_CONFUSE))
+    if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_LOCK_CONFUSE))
         gBattleCommunication[MOVE_EFFECT_BYTE] = (MOVE_EFFECT_THRASH | MOVE_EFFECT_AFFECTS_USER);
 
     gBattlescriptCurrInstr++;
@@ -7788,19 +7788,19 @@ static void atk8E_initmultihitstring(void)
 
 static bool8 TryDoForceSwitchOut(void)
 {
-    if (gBattleMons[gBattleMoveAttacker].level >= gBattleMons[gBattleMoveTarget].level)
+    if (gBattleMons[gBattlerAttacker].level >= gBattleMons[gBattlerTarget].level)
     {
-        *(gBattleStruct->field_58 + gBattleMoveTarget) = gBattlerPartyIndexes[gBattleMoveTarget];
+        *(gBattleStruct->field_58 + gBattlerTarget) = gBattlerPartyIndexes[gBattlerTarget];
     }
     else
     {
         u16 random = Random() & 0xFF;
-        if ((u32)((random * (gBattleMons[gBattleMoveAttacker].level + gBattleMons[gBattleMoveTarget].level) >> 8) + 1) <= (gBattleMons[gBattleMoveTarget].level / 4))
+        if ((u32)((random * (gBattleMons[gBattlerAttacker].level + gBattleMons[gBattlerTarget].level) >> 8) + 1) <= (gBattleMons[gBattlerTarget].level / 4))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
             return FALSE;
         }
-        *(gBattleStruct->field_58 + gBattleMoveTarget) = gBattlerPartyIndexes[gBattleMoveTarget];
+        *(gBattleStruct->field_58 + gBattlerTarget) = gBattlerPartyIndexes[gBattlerTarget];
     }
 
     gBattlescriptCurrInstr = BattleScript_SuccessForceOut;
@@ -7827,7 +7827,7 @@ static void atk8F_forcerandomswitch(void)
 
     if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER))
     {
-        if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER)
             party = gPlayerParty;
         else
             party = gEnemyParty;
@@ -7836,7 +7836,7 @@ static void atk8F_forcerandomswitch(void)
             || (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER && gBattleTypeFlags & BATTLE_TYPE_x2000000)
             || (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER))
         {
-            if ((gBattleMoveTarget & BIT_FLANK) != 0)
+            if ((gBattlerTarget & BIT_FLANK) != 0)
             {
                 firstMonId = 3;
                 lastMonId = 6;
@@ -7848,13 +7848,13 @@ static void atk8F_forcerandomswitch(void)
             }
             monsCount = 3;
             minNeeded = 1;
-            bank2PartyId = gBattlerPartyIndexes[gBattleMoveTarget];
-            bank1PartyId = gBattlerPartyIndexes[gBattleMoveTarget ^ BIT_FLANK];
+            bank2PartyId = gBattlerPartyIndexes[gBattlerTarget];
+            bank1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
         }
         else if ((gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
                  || (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_x2000000))
         {
-            if (sub_806D82C(GetBattlerMultiplayerId(gBattleMoveTarget)) == 1)
+            if (sub_806D82C(GetBattlerMultiplayerId(gBattlerTarget)) == 1)
             {
                 firstMonId = 3;
                 lastMonId = 6;
@@ -7866,12 +7866,12 @@ static void atk8F_forcerandomswitch(void)
             }
             monsCount = 3;
             minNeeded = 1;
-            bank2PartyId = gBattlerPartyIndexes[gBattleMoveTarget];
-            bank1PartyId = gBattlerPartyIndexes[gBattleMoveTarget ^ BIT_FLANK];
+            bank2PartyId = gBattlerPartyIndexes[gBattlerTarget];
+            bank1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
         {
-            if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
+            if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER)
             {
                 firstMonId = 0;
                 lastMonId = 6;
@@ -7880,7 +7880,7 @@ static void atk8F_forcerandomswitch(void)
             }
             else
             {
-                if ((gBattleMoveTarget & BIT_FLANK) != 0)
+                if ((gBattlerTarget & BIT_FLANK) != 0)
                 {
                     firstMonId = 3;
                     lastMonId = 6;
@@ -7893,8 +7893,8 @@ static void atk8F_forcerandomswitch(void)
                 monsCount = 3;
                 minNeeded = 1;
             }
-            bank2PartyId = gBattlerPartyIndexes[gBattleMoveTarget];
-            bank1PartyId = gBattlerPartyIndexes[gBattleMoveTarget ^ BIT_FLANK];
+            bank2PartyId = gBattlerPartyIndexes[gBattlerTarget];
+            bank1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
@@ -7902,8 +7902,8 @@ static void atk8F_forcerandomswitch(void)
             lastMonId = 6;
             monsCount = 6;
             minNeeded = 2;
-            bank2PartyId = gBattlerPartyIndexes[gBattleMoveTarget];
-            bank1PartyId = gBattlerPartyIndexes[gBattleMoveTarget ^ BIT_FLANK];
+            bank2PartyId = gBattlerPartyIndexes[gBattlerTarget];
+            bank1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
         }
         else
         {
@@ -7911,8 +7911,8 @@ static void atk8F_forcerandomswitch(void)
             lastMonId = 6;
             monsCount = 6;
             minNeeded = 1;
-            bank2PartyId = gBattlerPartyIndexes[gBattleMoveTarget]; // there is only one pokemon out in single battles
-            bank1PartyId = gBattlerPartyIndexes[gBattleMoveTarget];
+            bank2PartyId = gBattlerPartyIndexes[gBattlerTarget]; // there is only one pokemon out in single battles
+            bank1PartyId = gBattlerPartyIndexes[gBattlerTarget];
         }
 
         for (i = firstMonId; i < lastMonId; i++)
@@ -7944,22 +7944,22 @@ static void atk8F_forcerandomswitch(void)
                        || GetMonData(&party[i], MON_DATA_IS_EGG) == TRUE
                        || GetMonData(&party[i], MON_DATA_HP) == 0);
             }
-            *(gBattleStruct->monToSwitchIntoId + gBattleMoveTarget) = i;
+            *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i;
 
             if (!sub_81B1250())
-                sub_803BDA0(gBattleMoveTarget);
+                sub_803BDA0(gBattlerTarget);
 
             if ((gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                 || (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
                 || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
                 || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_MULTI))
             {
-                sub_81B8E80(gBattleMoveTarget, i, 0);
-                sub_81B8E80(gBattleMoveTarget ^ BIT_FLANK, i, 1);
+                sub_81B8E80(gBattlerTarget, i, 0);
+                sub_81B8E80(gBattlerTarget ^ BIT_FLANK, i, 1);
             }
 
             if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
-                sub_80571DC(gBattleMoveTarget, i);
+                sub_80571DC(gBattlerTarget, i);
         }
     }
     else
@@ -7976,7 +7976,7 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
 
     while (validMoves < 4)
     {
-        if (gBattleMons[gBattleMoveAttacker].moves[validMoves] == 0)
+        if (gBattleMons[gBattlerAttacker].moves[validMoves] == 0)
             break;
 
         validMoves++;
@@ -7984,17 +7984,17 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
 
     for (moveChecked = 0; moveChecked < validMoves; moveChecked++)
     {
-        moveType = gBattleMoves[gBattleMons[gBattleMoveAttacker].moves[moveChecked]].type;
+        moveType = gBattleMoves[gBattleMons[gBattlerAttacker].moves[moveChecked]].type;
 
         if (moveType == TYPE_MYSTERY)
         {
-            if (gBattleMons[gBattleMoveAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleMoveAttacker].type2 == TYPE_GHOST)
+            if (gBattleMons[gBattlerAttacker].type1 == TYPE_GHOST || gBattleMons[gBattlerAttacker].type2 == TYPE_GHOST)
                 moveType = TYPE_GHOST;
             else
                 moveType = TYPE_NORMAL;
         }
-        if (moveType != gBattleMons[gBattleMoveAttacker].type1
-            && moveType != gBattleMons[gBattleMoveAttacker].type2)
+        if (moveType != gBattleMons[gBattlerAttacker].type1
+            && moveType != gBattleMons[gBattlerAttacker].type2)
         {
             break;
         }
@@ -8011,20 +8011,20 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
 
             while ((moveChecked = Random() & 3) >= validMoves);
 
-            moveType = gBattleMoves[gBattleMons[gBattleMoveAttacker].moves[moveChecked]].type;
+            moveType = gBattleMoves[gBattleMons[gBattlerAttacker].moves[moveChecked]].type;
 
             if (moveType == TYPE_MYSTERY)
             {
-                if (gBattleMons[gBattleMoveAttacker].type1 == TYPE_GHOST || gBattleMons[gBattleMoveAttacker].type2 == TYPE_GHOST)
+                if (gBattleMons[gBattlerAttacker].type1 == TYPE_GHOST || gBattleMons[gBattlerAttacker].type2 == TYPE_GHOST)
                     moveType = TYPE_GHOST;
                 else
                     moveType = TYPE_NORMAL;
             }
         }
-        while (moveType == gBattleMons[gBattleMoveAttacker].type1 || moveType == gBattleMons[gBattleMoveAttacker].type2);
+        while (moveType == gBattleMons[gBattlerAttacker].type1 || moveType == gBattleMons[gBattlerAttacker].type2);
 
-        gBattleMons[gBattleMoveAttacker].type1 = moveType;
-        gBattleMons[gBattleMoveAttacker].type2 = moveType;
+        gBattleMons[gBattlerAttacker].type1 = moveType;
+        gBattleMons[gBattlerAttacker].type2 = moveType;
 
         PREPARE_TYPE_BUFFER(gBattleTextBuff1, moveType)
 
@@ -8052,16 +8052,16 @@ static void atk91_givepaydaymoney(void)
 
 static void atk92_setlightscreen(void)
 {
-    if (gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] & SIDE_STATUS_LIGHTSCREEN)
+    if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_LIGHTSCREEN)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] |= SIDE_STATUS_LIGHTSCREEN;
-        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].lightscreenTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].lightscreenBank = gBattleMoveAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_LIGHTSCREEN;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].lightscreenTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].lightscreenBank = gBattlerAttacker;
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMonsInBattle(BATTLE_ALIVE_ATK_SIDE) == 2)
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
@@ -8076,72 +8076,72 @@ static void atk93_tryKO(void)
 {
     u8 holdEffect, param;
 
-    if (gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
     {
-       holdEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect;
-       param = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
+       holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
+       param = gEnigmaBerries[gBattlerTarget].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattleMoveTarget].item);
-        param = ItemId_GetHoldEffectParam(gBattleMons[gBattleMoveTarget].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
+        param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
-    gStringBank = gBattleMoveTarget;
+    gStringBattler = gBattlerTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
-        RecordItemEffectBattle(gBattleMoveTarget, HOLD_EFFECT_FOCUS_BAND);
-        gSpecialStatuses[gBattleMoveTarget].focusBanded = 1;
+        RecordItemEffectBattle(gBattlerTarget, HOLD_EFFECT_FOCUS_BAND);
+        gSpecialStatuses[gBattlerTarget].focusBanded = 1;
     }
 
-    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_STURDY)
+    if (gBattleMons[gBattlerTarget].ability == ABILITY_STURDY)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gLastUsedAbility = ABILITY_STURDY;
         gBattlescriptCurrInstr = BattleScript_SturdyPreventsOHKO;
-        RecordAbilityBattle(gBattleMoveTarget, ABILITY_STURDY);
+        RecordAbilityBattle(gBattlerTarget, ABILITY_STURDY);
     }
     else
     {
         u16 chance;
-        if (!(gStatuses3[gBattleMoveTarget] & STATUS3_ALWAYS_HITS))
+        if (!(gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS))
         {
-            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattleMoveAttacker].level - gBattleMons[gBattleMoveTarget].level);
-            if (Random() % 100 + 1 < chance && gBattleMons[gBattleMoveAttacker].level >= gBattleMons[gBattleMoveTarget].level)
+            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattlerAttacker].level - gBattleMons[gBattlerTarget].level);
+            if (Random() % 100 + 1 < chance && gBattleMons[gBattlerAttacker].level >= gBattleMons[gBattlerTarget].level)
                 chance = TRUE;
             else
                 chance = FALSE;
         }
-        else if (gDisableStructs[gBattleMoveTarget].bankWithSureHit == gBattleMoveAttacker
-                 && gBattleMons[gBattleMoveAttacker].level >= gBattleMons[gBattleMoveTarget].level)
+        else if (gDisableStructs[gBattlerTarget].battlerWithSureHit == gBattlerAttacker
+                 && gBattleMons[gBattlerAttacker].level >= gBattleMons[gBattlerTarget].level)
         {
             chance = TRUE;
         }
         else
         {
-            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattleMoveAttacker].level - gBattleMons[gBattleMoveTarget].level);
-            if (Random() % 100 + 1 < chance && gBattleMons[gBattleMoveAttacker].level >= gBattleMons[gBattleMoveTarget].level)
+            chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattlerAttacker].level - gBattleMons[gBattlerTarget].level);
+            if (Random() % 100 + 1 < chance && gBattleMons[gBattlerAttacker].level >= gBattleMons[gBattlerTarget].level)
                 chance = TRUE;
             else
                 chance = FALSE;
         }
         if (chance)
         {
-            if (gProtectStructs[gBattleMoveTarget].endured)
+            if (gProtectStructs[gBattlerTarget].endured)
             {
-                gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - 1;
+                gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - 1;
                 gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED;
             }
-            else if (gSpecialStatuses[gBattleMoveTarget].focusBanded)
+            else if (gSpecialStatuses[gBattlerTarget].focusBanded)
             {
-                gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - 1;
+                gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - 1;
                 gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON;
-                gLastUsedItem = gBattleMons[gBattleMoveTarget].item;
+                gLastUsedItem = gBattleMons[gBattlerTarget].item;
             }
             else
             {
-                gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp;
+                gBattleMoveDamage = gBattleMons[gBattlerTarget].hp;
                 gMoveResultFlags |= MOVE_RESULT_ONE_HIT_KO;
             }
             gBattlescriptCurrInstr += 5;
@@ -8149,7 +8149,7 @@ static void atk93_tryKO(void)
         else
         {
             gMoveResultFlags |= MOVE_RESULT_MISSED;
-            if (gBattleMons[gBattleMoveAttacker].level >= gBattleMons[gBattleMoveTarget].level)
+            if (gBattleMons[gBattlerAttacker].level >= gBattleMons[gBattlerTarget].level)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             else
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -8160,7 +8160,7 @@ static void atk93_tryKO(void)
 
 static void atk94_damagetohalftargethp(void) // super fang
 {
-    gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp / 2;
+    gBattleMoveDamage = gBattleMons[gBattlerTarget].hp / 2;
     if (gBattleMoveDamage == 0)
         gBattleMoveDamage = 1;
 
@@ -8189,17 +8189,17 @@ static void atk96_weatherdamage(void)
     {
         if (gBattleWeather & WEATHER_SANDSTORM_ANY)
         {
-            if (gBattleMons[gBattleMoveAttacker].type1 != TYPE_ROCK
-                && gBattleMons[gBattleMoveAttacker].type1 != TYPE_STEEL
-                && gBattleMons[gBattleMoveAttacker].type1 != TYPE_GROUND
-                && gBattleMons[gBattleMoveAttacker].type2 != TYPE_ROCK
-                && gBattleMons[gBattleMoveAttacker].type2 != TYPE_STEEL
-                && gBattleMons[gBattleMoveAttacker].type2 != TYPE_GROUND
-                && gBattleMons[gBattleMoveAttacker].ability != ABILITY_SAND_VEIL
-                && !(gStatuses3[gBattleMoveAttacker] & STATUS3_UNDERGROUND)
-                && !(gStatuses3[gBattleMoveAttacker] & STATUS3_UNDERWATER))
-            {
-                gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 16;
+            if (gBattleMons[gBattlerAttacker].type1 != TYPE_ROCK
+                && gBattleMons[gBattlerAttacker].type1 != TYPE_STEEL
+                && gBattleMons[gBattlerAttacker].type1 != TYPE_GROUND
+                && gBattleMons[gBattlerAttacker].type2 != TYPE_ROCK
+                && gBattleMons[gBattlerAttacker].type2 != TYPE_STEEL
+                && gBattleMons[gBattlerAttacker].type2 != TYPE_GROUND
+                && gBattleMons[gBattlerAttacker].ability != ABILITY_SAND_VEIL
+                && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERGROUND)
+                && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERWATER))
+            {
+                gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 16;
                 if (gBattleMoveDamage == 0)
                     gBattleMoveDamage = 1;
             }
@@ -8210,12 +8210,12 @@ static void atk96_weatherdamage(void)
         }
         if (gBattleWeather & WEATHER_HAIL)
         {
-            if (gBattleMons[gBattleMoveAttacker].type1 != TYPE_ICE
-                && gBattleMons[gBattleMoveAttacker].type2 != TYPE_ICE
-                && !(gStatuses3[gBattleMoveAttacker] & STATUS3_UNDERGROUND)
-                && !(gStatuses3[gBattleMoveAttacker] & STATUS3_UNDERWATER))
+            if (gBattleMons[gBattlerAttacker].type1 != TYPE_ICE
+                && gBattleMons[gBattlerAttacker].type2 != TYPE_ICE
+                && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERGROUND)
+                && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERWATER))
             {
-                gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 16;
+                gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 16;
                 if (gBattleMoveDamage == 0)
                     gBattleMoveDamage = 1;
             }
@@ -8230,7 +8230,7 @@ static void atk96_weatherdamage(void)
         gBattleMoveDamage = 0;
     }
 
-    if (gAbsentBattlerFlags & gBitTable[gBattleMoveAttacker])
+    if (gAbsentBattlerFlags & gBitTable[gBattlerAttacker])
         gBattleMoveDamage = 0;
 
     gBattlescriptCurrInstr++;
@@ -8242,15 +8242,15 @@ static void atk97_tryinfatuating(void)
     u16 speciesAttacker, speciesTarget;
     u32 personalityAttacker, personalityTarget;
 
-    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
-        monAttacker = &gPlayerParty[gBattlerPartyIndexes[gBattleMoveAttacker]];
+    if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
+        monAttacker = &gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]];
     else
-        monAttacker = &gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker]];
+        monAttacker = &gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]];
 
-    if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
-        monTarget = &gPlayerParty[gBattlerPartyIndexes[gBattleMoveTarget]];
+    if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER)
+        monTarget = &gPlayerParty[gBattlerPartyIndexes[gBattlerTarget]];
     else
-        monTarget = &gEnemyParty[gBattlerPartyIndexes[gBattleMoveTarget]];
+        monTarget = &gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]];
 
     speciesAttacker = GetMonData(monAttacker, MON_DATA_SPECIES);
     personalityAttacker = GetMonData(monAttacker, MON_DATA_PERSONALITY);
@@ -8258,16 +8258,16 @@ static void atk97_tryinfatuating(void)
     speciesTarget = GetMonData(monTarget, MON_DATA_SPECIES);
     personalityTarget = GetMonData(monTarget, MON_DATA_PERSONALITY);
 
-    if (gBattleMons[gBattleMoveTarget].ability == ABILITY_OBLIVIOUS)
+    if (gBattleMons[gBattlerTarget].ability == ABILITY_OBLIVIOUS)
     {
         gBattlescriptCurrInstr = BattleScript_ObliviousPreventsAttraction;
         gLastUsedAbility = ABILITY_OBLIVIOUS;
-        RecordAbilityBattle(gBattleMoveTarget, ABILITY_OBLIVIOUS);
+        RecordAbilityBattle(gBattlerTarget, ABILITY_OBLIVIOUS);
     }
     else
     {
         if (GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget)
-            || gBattleMons[gBattleMoveTarget].status2 & STATUS2_INFATUATION
+            || gBattleMons[gBattlerTarget].status2 & STATUS2_INFATUATION
             || GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == MON_GENDERLESS
             || GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget) == MON_GENDERLESS)
         {
@@ -8275,7 +8275,7 @@ static void atk97_tryinfatuating(void)
         }
         else
         {
-            gBattleMons[gBattleMoveTarget].status2 |= STATUS2_INFATUATED_WITH(gBattleMoveAttacker);
+            gBattleMons[gBattlerTarget].status2 |= STATUS2_INFATUATED_WITH(gBattlerAttacker);
             gBattlescriptCurrInstr += 5;
         }
     }
@@ -8295,7 +8295,7 @@ static void atk98_updatestatusicon(void)
     }
     else
     {
-        gActiveBattler = gBattleMoveAttacker;
+        gActiveBattler = gBattlerAttacker;
         if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
         {
             BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
@@ -8303,7 +8303,7 @@ static void atk98_updatestatusicon(void)
         }
         if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
         {
-            gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_FLANK);
+            gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK);
             if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
             {
                 BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
@@ -8316,16 +8316,16 @@ static void atk98_updatestatusicon(void)
 
 static void atk99_setmist(void)
 {
-    if (gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].mistTimer)
+    if (gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistTimer)
     {
         gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].mistTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].mistBank = gBattleMoveAttacker;
-        gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] |= SIDE_STATUS_MIST;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistBank = gBattlerAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_MIST;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     gBattlescriptCurrInstr++;
@@ -8333,14 +8333,14 @@ static void atk99_setmist(void)
 
 static void atk9A_setfocusenergy(void)
 {
-    if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_FOCUS_ENERGY)
+    if (gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY)
     {
         gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_FOCUS_ENERGY;
+        gBattleMons[gBattlerAttacker].status2 |= STATUS2_FOCUS_ENERGY;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     gBattlescriptCurrInstr++;
@@ -8350,8 +8350,8 @@ static void atk9B_transformdataexecution(void)
 {
     gChosenMove = 0xFFFF;
     gBattlescriptCurrInstr++;
-    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_TRANSFORMED
-        || gStatuses3[gBattleMoveTarget] & STATUS3_SEMI_INVULNERABLE)
+    if (gBattleMons[gBattlerTarget].status2 & STATUS2_TRANSFORMED
+        || gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)
     {
         gMoveResultFlags |= MOVE_RESULT_FAILED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -8361,29 +8361,29 @@ static void atk9B_transformdataexecution(void)
         s32 i;
         u8 *battleMonAttacker, *battleMonTarget;
 
-        gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_TRANSFORMED;
-        gDisableStructs[gBattleMoveAttacker].disabledMove = 0;
-        gDisableStructs[gBattleMoveAttacker].disableTimer1 = 0;
-        gDisableStructs[gBattleMoveAttacker].transformedMonPersonality = gBattleMons[gBattleMoveTarget].personality;
-        gDisableStructs[gBattleMoveAttacker].unk18_b = 0;
+        gBattleMons[gBattlerAttacker].status2 |= STATUS2_TRANSFORMED;
+        gDisableStructs[gBattlerAttacker].disabledMove = 0;
+        gDisableStructs[gBattlerAttacker].disableTimer1 = 0;
+        gDisableStructs[gBattlerAttacker].transformedMonPersonality = gBattleMons[gBattlerTarget].personality;
+        gDisableStructs[gBattlerAttacker].unk18_b = 0;
 
-        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattleMoveTarget].species)
+        PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].species)
 
-        battleMonAttacker = (u8*)(&gBattleMons[gBattleMoveAttacker]);
-        battleMonTarget = (u8*)(&gBattleMons[gBattleMoveTarget]);
+        battleMonAttacker = (u8*)(&gBattleMons[gBattlerAttacker]);
+        battleMonTarget = (u8*)(&gBattleMons[gBattlerTarget]);
 
         for (i = 0; i < offsetof(struct BattlePokemon, pp); i++)
             battleMonAttacker[i] = battleMonTarget[i];
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMoves[gBattleMons[gBattleMoveAttacker].moves[i]].pp < 5)
-                gBattleMons[gBattleMoveAttacker].pp[i] = gBattleMoves[gBattleMons[gBattleMoveAttacker].moves[i]].pp;
+            if (gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].pp < 5)
+                gBattleMons[gBattlerAttacker].pp[i] = gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].pp;
             else
-                gBattleMons[gBattleMoveAttacker].pp[i] = 5;
+                gBattleMons[gBattlerAttacker].pp[i] = 5;
         }
 
-        gActiveBattler = gBattleMoveAttacker;
+        gActiveBattler = gBattlerAttacker;
         BtlController_EmitResetActionMoveSelection(0, RESET_MOVE_SELECTION);
         MarkBattlerForControllerExec(gActiveBattler);
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -8392,24 +8392,24 @@ static void atk9B_transformdataexecution(void)
 
 static void atk9C_setsubstitute(void)
 {
-    u32 hp = gBattleMons[gBattleMoveAttacker].maxHP / 4;
-    if (gBattleMons[gBattleMoveAttacker].maxHP / 4 == 0)
+    u32 hp = gBattleMons[gBattlerAttacker].maxHP / 4;
+    if (gBattleMons[gBattlerAttacker].maxHP / 4 == 0)
         hp = 1;
 
-    if (gBattleMons[gBattleMoveAttacker].hp <= hp)
+    if (gBattleMons[gBattlerAttacker].hp <= hp)
     {
         gBattleMoveDamage = 0;
         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
     }
     else
     {
-        gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 4; // one bit value will only work for pokemon which max hp can go to 1020(which is more than possible in games)
+        gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4; // one bit value will only work for pokemon which max hp can go to 1020(which is more than possible in games)
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
-        gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_SUBSTITUTE;
-        gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_WRAPPED);
-        gDisableStructs[gBattleMoveAttacker].substituteHP = gBattleMoveDamage;
+        gBattleMons[gBattlerAttacker].status2 |= STATUS2_SUBSTITUTE;
+        gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_WRAPPED);
+        gDisableStructs[gBattlerAttacker].substituteHP = gBattleMoveDamage;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
         gHitMarker |= HITMARKER_IGNORE_SUBSTITUTE;
     }
@@ -8430,10 +8430,10 @@ static void atk9D_mimicattackcopy(void)
 {
     gChosenMove = 0xFFFF;
 
-    if (IsMoveUncopyableByMimic(gLastMoves[gBattleMoveTarget])
-        || gBattleMons[gBattleMoveAttacker].status2 & STATUS2_TRANSFORMED
-        || gLastMoves[gBattleMoveTarget] == 0
-        || gLastMoves[gBattleMoveTarget] == 0xFFFF)
+    if (IsMoveUncopyableByMimic(gLastMoves[gBattlerTarget])
+        || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED
+        || gLastMoves[gBattlerTarget] == 0
+        || gLastMoves[gBattlerTarget] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8443,22 +8443,22 @@ static void atk9D_mimicattackcopy(void)
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMons[gBattleMoveAttacker].moves[i] == gLastMoves[gBattleMoveTarget])
+            if (gBattleMons[gBattlerAttacker].moves[i] == gLastMoves[gBattlerTarget])
                 break;
         }
 
         if (i == 4)
         {
-            gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos] = gLastMoves[gBattleMoveTarget];
-            if (gBattleMoves[gLastMoves[gBattleMoveTarget]].pp < 5)
-                gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBattleMoveTarget]].pp;
+            gBattleMons[gBattlerAttacker].moves[gCurrMovePos] = gLastMoves[gBattlerTarget];
+            if (gBattleMoves[gLastMoves[gBattlerTarget]].pp < 5)
+                gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBattlerTarget]].pp;
             else
-                gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] = 5;
+                gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 5;
 
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattleMoveTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattlerTarget])
 
-            gDisableStructs[gBattleMoveAttacker].unk18_b |= gBitTable[gCurrMovePos];
+            gDisableStructs[gBattlerAttacker].unk18_b |= gBitTable[gCurrMovePos];
             gBattlescriptCurrInstr += 5;
         }
         else
@@ -8494,7 +8494,7 @@ static void atk9E_metronome(void)
         {
             gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
             gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
-            gBattleMoveTarget = GetMoveTarget(gCurrentMove, 0);
+            gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
             return;
         }
     }
@@ -8502,7 +8502,7 @@ static void atk9E_metronome(void)
 
 static void atk9F_dmgtolevel(void)
 {
-    gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].level;
+    gBattleMoveDamage = gBattleMons[gBattlerAttacker].level;
     gBattlescriptCurrInstr++;
 }
 
@@ -8513,54 +8513,54 @@ static void atkA0_psywavedamageeffect(void)
     while ((randDamage = (Random() & 0xF)) > 10);
 
     randDamage *= 10;
-    gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].level * (randDamage + 50) / 100;
+    gBattleMoveDamage = gBattleMons[gBattlerAttacker].level * (randDamage + 50) / 100;
     gBattlescriptCurrInstr++;
 }
 
 static void atkA1_counterdamagecalculator(void)
 {
-    u8 sideAttacker = GetBattlerSide(gBattleMoveAttacker);
-    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattleMoveAttacker].physicalBank);
+    u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
+    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].physicalBank);
 
-    if (gProtectStructs[gBattleMoveAttacker].physicalDmg
+    if (gProtectStructs[gBattlerAttacker].physicalDmg
         && sideAttacker != sideTarget
-        && gBattleMons[gProtectStructs[gBattleMoveAttacker].physicalBank].hp)
+        && gBattleMons[gProtectStructs[gBattlerAttacker].physicalBank].hp)
     {
-        gBattleMoveDamage = gProtectStructs[gBattleMoveAttacker].physicalDmg * 2;
+        gBattleMoveDamage = gProtectStructs[gBattlerAttacker].physicalDmg * 2;
 
         if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp)
-            gBattleMoveTarget = gSideTimers[sideTarget].followmeTarget;
+            gBattlerTarget = gSideTimers[sideTarget].followmeTarget;
         else
-            gBattleMoveTarget = gProtectStructs[gBattleMoveAttacker].physicalBank;
+            gBattlerTarget = gProtectStructs[gBattlerAttacker].physicalBank;
 
         gBattlescriptCurrInstr += 5;
     }
     else
     {
-        gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
+        gSpecialStatuses[gBattlerAttacker].flag20 = 1;
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
 
 static void atkA2_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the physical -> special field changes
 {
-    u8 sideAttacker = GetBattlerSide(gBattleMoveAttacker);
-    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattleMoveAttacker].specialBank);
+    u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
+    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].specialBank);
 
-    if (gProtectStructs[gBattleMoveAttacker].specialDmg && sideAttacker != sideTarget && gBattleMons[gProtectStructs[gBattleMoveAttacker].specialBank].hp)
+    if (gProtectStructs[gBattlerAttacker].specialDmg && sideAttacker != sideTarget && gBattleMons[gProtectStructs[gBattlerAttacker].specialBank].hp)
     {
-        gBattleMoveDamage = gProtectStructs[gBattleMoveAttacker].specialDmg * 2;
+        gBattleMoveDamage = gProtectStructs[gBattlerAttacker].specialDmg * 2;
 
         if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp)
-            gBattleMoveTarget = gSideTimers[sideTarget].followmeTarget;
+            gBattlerTarget = gSideTimers[sideTarget].followmeTarget;
         else
-            gBattleMoveTarget = gProtectStructs[gBattleMoveAttacker].specialBank;
+            gBattlerTarget = gProtectStructs[gBattlerAttacker].specialBank;
 
         gBattlescriptCurrInstr += 5;
     }
     else
     {
-        gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
+        gSpecialStatuses[gBattlerAttacker].flag20 = 1;
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
@@ -8571,17 +8571,17 @@ static void atkA3_disablelastusedattack(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBattleMoveTarget].moves[i] == gLastMoves[gBattleMoveTarget])
+        if (gBattleMons[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget])
             break;
     }
-    if (gDisableStructs[gBattleMoveTarget].disabledMove == 0
-        && i != 4 && gBattleMons[gBattleMoveTarget].pp[i] != 0)
+    if (gDisableStructs[gBattlerTarget].disabledMove == 0
+        && i != 4 && gBattleMons[gBattlerTarget].pp[i] != 0)
     {
-        PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattleMoveTarget].moves[i])
+        PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].moves[i])
 
-        gDisableStructs[gBattleMoveTarget].disabledMove = gBattleMons[gBattleMoveTarget].moves[i];
-        gDisableStructs[gBattleMoveTarget].disableTimer1 = (Random() & 3) + 2;
-        gDisableStructs[gBattleMoveTarget].disableTimer2 = gDisableStructs[gBattleMoveTarget].disableTimer1; // used to save the random amount of turns?
+        gDisableStructs[gBattlerTarget].disabledMove = gBattleMons[gBattlerTarget].moves[i];
+        gDisableStructs[gBattlerTarget].disableTimer1 = (Random() & 3) + 2;
+        gDisableStructs[gBattlerTarget].disableTimer2 = gDisableStructs[gBattlerTarget].disableTimer1; // used to save the random amount of turns?
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -8596,24 +8596,24 @@ static void atkA4_trysetencore(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (gBattleMons[gBattleMoveTarget].moves[i] == gLastMoves[gBattleMoveTarget])
+        if (gBattleMons[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget])
             break;
     }
 
-    if (gLastMoves[gBattleMoveTarget] == MOVE_STRUGGLE
-        || gLastMoves[gBattleMoveTarget] == MOVE_ENCORE
-        || gLastMoves[gBattleMoveTarget] == MOVE_MIRROR_MOVE)
+    if (gLastMoves[gBattlerTarget] == MOVE_STRUGGLE
+        || gLastMoves[gBattlerTarget] == MOVE_ENCORE
+        || gLastMoves[gBattlerTarget] == MOVE_MIRROR_MOVE)
     {
         i = 4;
     }
 
-    if (gDisableStructs[gBattleMoveTarget].encoredMove == 0
-        && i != 4 && gBattleMons[gBattleMoveTarget].pp[i] != 0)
+    if (gDisableStructs[gBattlerTarget].encoredMove == 0
+        && i != 4 && gBattleMons[gBattlerTarget].pp[i] != 0)
     {
-        gDisableStructs[gBattleMoveTarget].encoredMove = gBattleMons[gBattleMoveTarget].moves[i];
-        gDisableStructs[gBattleMoveTarget].encoredMovePos = i;
-        gDisableStructs[gBattleMoveTarget].encoreTimer1 = (Random() & 3) + 3;
-        gDisableStructs[gBattleMoveTarget].encoreTimer2 = gDisableStructs[gBattleMoveTarget].encoreTimer1;
+        gDisableStructs[gBattlerTarget].encoredMove = gBattleMons[gBattlerTarget].moves[i];
+        gDisableStructs[gBattlerTarget].encoredMovePos = i;
+        gDisableStructs[gBattlerTarget].encoreTimer1 = (Random() & 3) + 3;
+        gDisableStructs[gBattlerTarget].encoreTimer2 = gDisableStructs[gBattlerTarget].encoreTimer1;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -8624,10 +8624,10 @@ static void atkA4_trysetencore(void)
 
 static void atkA5_painsplitdmgcalc(void)
 {
-    if (!(gBattleMons[gBattleMoveTarget].status2 & STATUS2_SUBSTITUTE))
+    if (!(gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE))
     {
-        s32 hpDiff = (gBattleMons[gBattleMoveAttacker].hp + gBattleMons[gBattleMoveTarget].hp) / 2;
-        s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - hpDiff;
+        s32 hpDiff = (gBattleMons[gBattlerAttacker].hp + gBattleMons[gBattlerTarget].hp) / 2;
+        s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - hpDiff;
         u8* storeLoc = (void*)(&gBattleScripting.painSplitHp);
 
         storeLoc[0] = (painSplitHp);
@@ -8635,8 +8635,8 @@ static void atkA5_painsplitdmgcalc(void)
         storeLoc[2] = (painSplitHp & 0x00FF0000) >> 16;
         storeLoc[3] = (painSplitHp & 0xFF000000) >> 24;
 
-        gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].hp - hpDiff;
-        gSpecialStatuses[gBattleMoveTarget].moveturnLostHP = 0xFFFF;
+        gBattleMoveDamage = gBattleMons[gBattlerAttacker].hp - hpDiff;
+        gSpecialStatuses[gBattlerTarget].moveturnLostHP = 0xFFFF;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -8648,13 +8648,13 @@ static void atkA5_painsplitdmgcalc(void)
 
 static void atkA6_settypetorandomresistance(void) // conversion 2
 {
-    if (gLastLandedMoves[gBattleMoveAttacker] == 0
-        || gLastLandedMoves[gBattleMoveAttacker] == 0xFFFF)
+    if (gLastLandedMoves[gBattlerAttacker] == 0
+        || gLastLandedMoves[gBattlerAttacker] == 0xFFFF)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
-    else if (IsTwoTurnsMove(gLastLandedMoves[gBattleMoveAttacker])
-            && gBattleMons[gLastHitBy[gBattleMoveAttacker]].status2 & STATUS2_MULTIPLETURNS)
+    else if (IsTwoTurnsMove(gLastLandedMoves[gBattlerAttacker])
+            && gBattleMons[gLastHitBy[gBattlerAttacker]].status2 & STATUS2_MULTIPLETURNS)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -8668,13 +8668,13 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
 
             i *= 3;
 
-            if (TYPE_EFFECT_ATK_TYPE(i) == gLastHitByType[gBattleMoveAttacker]
+            if (TYPE_EFFECT_ATK_TYPE(i) == gLastHitByType[gBattlerAttacker]
                 && TYPE_EFFECT_MULTIPLIER(i) <= TYPE_MUL_NOT_EFFECTIVE
-                && gBattleMons[gBattleMoveAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
-                && gBattleMons[gBattleMoveAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
+                && gBattleMons[gBattlerAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
+                && gBattleMons[gBattlerAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
             {
-                gBattleMons[gBattleMoveAttacker].type1 = TYPE_EFFECT_DEF_TYPE(i);
-                gBattleMons[gBattleMoveAttacker].type2 = TYPE_EFFECT_DEF_TYPE(i);
+                gBattleMons[gBattlerAttacker].type1 = TYPE_EFFECT_DEF_TYPE(i);
+                gBattleMons[gBattlerAttacker].type2 = TYPE_EFFECT_DEF_TYPE(i);
 
                 PREPARE_TYPE_BUFFER(gBattleTextBuff1, TYPE_EFFECT_DEF_TYPE(i))
 
@@ -8691,13 +8691,13 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
             case TYPE_FORESIGHT:
                 break;
             default:
-                if (TYPE_EFFECT_ATK_TYPE(j) == gLastHitByType[gBattleMoveAttacker]
-                    && TYPE_EFFECT_MULTIPLIER(j) <= 5
-                    && gBattleMons[gBattleMoveAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
-                    && gBattleMons[gBattleMoveAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
+                if (TYPE_EFFECT_ATK_TYPE(j) == gLastHitByType[gBattlerAttacker]
+                 && TYPE_EFFECT_MULTIPLIER(j) <= 5
+                 && gBattleMons[gBattlerAttacker].type1 != TYPE_EFFECT_DEF_TYPE(i)
+                 && gBattleMons[gBattlerAttacker].type2 != TYPE_EFFECT_DEF_TYPE(i))
                 {
-                    gBattleMons[gBattleMoveAttacker].type1 = TYPE_EFFECT_DEF_TYPE(rands);
-                    gBattleMons[gBattleMoveAttacker].type2 = TYPE_EFFECT_DEF_TYPE(rands);
+                    gBattleMons[gBattlerAttacker].type1 = TYPE_EFFECT_DEF_TYPE(rands);
+                    gBattleMons[gBattlerAttacker].type2 = TYPE_EFFECT_DEF_TYPE(rands);
 
                     PREPARE_TYPE_BUFFER(gBattleTextBuff1, TYPE_EFFECT_DEF_TYPE(rands))
 
@@ -8714,9 +8714,9 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
 
 static void atkA7_setalwayshitflag(void)
 {
-    gStatuses3[gBattleMoveTarget] &= ~(STATUS3_ALWAYS_HITS);
-    gStatuses3[gBattleMoveTarget] |= 0x10;
-    gDisableStructs[gBattleMoveTarget].bankWithSureHit = gBattleMoveAttacker;
+    gStatuses3[gBattlerTarget] &= ~(STATUS3_ALWAYS_HITS);
+    gStatuses3[gBattlerTarget] |= 0x10;
+    gDisableStructs[gBattlerTarget].battlerWithSureHit = gBattlerAttacker;
     gBattlescriptCurrInstr++;
 }
 
@@ -8724,19 +8724,19 @@ static void atkA8_copymovepermanently(void) // sketch
 {
     gChosenMove = 0xFFFF;
 
-    if (!(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_TRANSFORMED)
-        && gLastPrintedMoves[gBattleMoveTarget] != MOVE_STRUGGLE
-        && gLastPrintedMoves[gBattleMoveTarget] != 0
-        && gLastPrintedMoves[gBattleMoveTarget] != 0xFFFF
-        && gLastPrintedMoves[gBattleMoveTarget] != MOVE_SKETCH)
+    if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED)
+        && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE
+        && gLastPrintedMoves[gBattlerTarget] != 0
+        && gLastPrintedMoves[gBattlerTarget] != 0xFFFF
+        && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH)
     {
         s32 i;
 
         for (i = 0; i < 4; i++)
         {
-            if (gBattleMons[gBattleMoveAttacker].moves[i] == MOVE_SKETCH)
+            if (gBattleMons[gBattlerAttacker].moves[i] == MOVE_SKETCH)
                 continue;
-            if (gBattleMons[gBattleMoveAttacker].moves[i] == gLastPrintedMoves[gBattleMoveTarget])
+            if (gBattleMons[gBattlerAttacker].moves[i] == gLastPrintedMoves[gBattlerTarget])
                 break;
         }
 
@@ -8748,21 +8748,21 @@ static void atkA8_copymovepermanently(void) // sketch
         {
             struct MovePpInfo movePpData;
 
-            gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBattleMoveTarget];
-            gBattleMons[gBattleMoveAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBattleMoveTarget]].pp;
-            gActiveBattler = gBattleMoveAttacker;
+            gBattleMons[gBattlerAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBattlerTarget];
+            gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBattlerTarget]].pp;
+            gActiveBattler = gBattlerAttacker;
 
             for (i = 0; i < 4; i++)
             {
-                movePpData.moves[i] = gBattleMons[gBattleMoveAttacker].moves[i];
-                movePpData.pp[i] = gBattleMons[gBattleMoveAttacker].pp[i];
+                movePpData.moves[i] = gBattleMons[gBattlerAttacker].moves[i];
+                movePpData.pp[i] = gBattleMons[gBattlerAttacker].pp[i];
             }
-            movePpData.ppBonuses = gBattleMons[gBattleMoveAttacker].ppBonuses;
+            movePpData.ppBonuses = gBattleMons[gBattlerAttacker].ppBonuses;
 
             BtlController_EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct MovePpInfo), &movePpData);
             MarkBattlerForControllerExec(gActiveBattler);
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBattleMoveTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBattlerTarget])
 
             gBattlescriptCurrInstr += 5;
         }
@@ -8822,17 +8822,17 @@ static void atkA9_trychoosesleeptalkmove(void)
 
     for (i = 0; i < 4; i++)
     {
-        if (IsInvalidForSleepTalkOrAssist(gBattleMons[gBattleMoveAttacker].moves[i])
-            || gBattleMons[gBattleMoveAttacker].moves[i] == MOVE_FOCUS_PUNCH
-            || gBattleMons[gBattleMoveAttacker].moves[i] == MOVE_UPROAR
-            || IsTwoTurnsMove(gBattleMons[gBattleMoveAttacker].moves[i]))
+        if (IsInvalidForSleepTalkOrAssist(gBattleMons[gBattlerAttacker].moves[i])
+            || gBattleMons[gBattlerAttacker].moves[i] == MOVE_FOCUS_PUNCH
+            || gBattleMons[gBattlerAttacker].moves[i] == MOVE_UPROAR
+            || IsTwoTurnsMove(gBattleMons[gBattlerAttacker].moves[i]))
         {
             unusableMovesBits |= gBitTable[i];
         }
 
     }
 
-    unusableMovesBits = CheckMoveLimitations(gBattleMoveAttacker, unusableMovesBits, ~(MOVE_LIMITATION_PP));
+    unusableMovesBits = CheckMoveLimitations(gBattlerAttacker, unusableMovesBits, ~(MOVE_LIMITATION_PP));
     if (unusableMovesBits == 0xF) // all 4 moves cannot be chosen
     {
         gBattlescriptCurrInstr += 5;
@@ -8846,25 +8846,25 @@ static void atkA9_trychoosesleeptalkmove(void)
             movePosition = Random() & 3;
         } while ((gBitTable[movePosition] & unusableMovesBits));
 
-        gRandomMove = gBattleMons[gBattleMoveAttacker].moves[movePosition];
+        gRandomMove = gBattleMons[gBattlerAttacker].moves[movePosition];
         gCurrMovePos = movePosition;
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
-        gBattleMoveTarget = GetMoveTarget(gRandomMove, 0);
+        gBattlerTarget = GetMoveTarget(gRandomMove, 0);
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
 
 static void atkAA_setdestinybond(void)
 {
-    gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_DESTINY_BOND;
+    gBattleMons[gBattlerAttacker].status2 |= STATUS2_DESTINY_BOND;
     gBattlescriptCurrInstr++;
 }
 
 static void TrySetDestinyBondToHappen(void)
 {
-    u8 sideAttacker = GetBattlerSide(gBattleMoveAttacker);
-    u8 sideTarget = GetBattlerSide(gBattleMoveTarget);
-    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_DESTINY_BOND
+    u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
+    u8 sideTarget = GetBattlerSide(gBattlerTarget);
+    if (gBattleMons[gBattlerTarget].status2 & STATUS2_DESTINY_BOND
         && sideAttacker != sideTarget
         && !(gHitMarker & HITMARKER_GRUDGE))
     {
@@ -8881,7 +8881,7 @@ static void atkAB_trysetdestinybondtohappen(void)
 static void atkAC_remaininghptopower(void)
 {
     s32 i;
-    s32 hpFraction = GetScaledHPFraction(gBattleMons[gBattleMoveAttacker].hp, gBattleMons[gBattleMoveAttacker].maxHP, 48);
+    s32 hpFraction = GetScaledHPFraction(gBattleMons[gBattlerAttacker].hp, gBattleMons[gBattlerAttacker].maxHP, 48);
 
     for (i = 0; i < (s32) sizeof(sFlailHpScaleToPowerTable); i += 2)
     {
@@ -8895,31 +8895,31 @@ static void atkAC_remaininghptopower(void)
 
 static void atkAD_tryspiteppreduce(void)
 {
-    if (gLastMoves[gBattleMoveTarget] != 0
-        && gLastMoves[gBattleMoveTarget] != 0xFFFF)
+    if (gLastMoves[gBattlerTarget] != 0
+        && gLastMoves[gBattlerTarget] != 0xFFFF)
     {
         s32 i;
 
         for (i = 0; i < 4; i++)
         {
-            if (gLastMoves[gBattleMoveTarget] == gBattleMons[gBattleMoveTarget].moves[i])
+            if (gLastMoves[gBattlerTarget] == gBattleMons[gBattlerTarget].moves[i])
                 break;
         }
 
-        if (i != 4 && gBattleMons[gBattleMoveTarget].pp[i] > 1)
+        if (i != 4 && gBattleMons[gBattlerTarget].pp[i] > 1)
         {
             s32 ppToDeduct = (Random() & 3) + 2;
-            if (gBattleMons[gBattleMoveTarget].pp[i] < ppToDeduct)
-                ppToDeduct = gBattleMons[gBattleMoveTarget].pp[i];
+            if (gBattleMons[gBattlerTarget].pp[i] < ppToDeduct)
+                ppToDeduct = gBattleMons[gBattlerTarget].pp[i];
 
-            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattleMoveTarget])
+            PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattlerTarget])
 
             ConvertIntToDecimalStringN(gBattleTextBuff2, ppToDeduct, 0, 1);
 
             PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 1, ppToDeduct)
 
-            gBattleMons[gBattleMoveTarget].pp[i] -= ppToDeduct;
-            gActiveBattler = gBattleMoveTarget;
+            gBattleMons[gBattlerTarget].pp[i] -= ppToDeduct;
+            gActiveBattler = gBattlerTarget;
 
             if (!(gDisableStructs[gActiveBattler].unk18_b & gBitTable[i])
                 && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
@@ -8930,8 +8930,8 @@ static void atkAD_tryspiteppreduce(void)
 
             gBattlescriptCurrInstr += 5;
 
-            if (gBattleMons[gBattleMoveTarget].pp[i] == 0)
-                CancelMultiTurnMoves(gBattleMoveTarget);
+            if (gBattleMons[gBattlerTarget].pp[i] == 0)
+                CancelMultiTurnMoves(gBattlerTarget);
         }
         else
         {
@@ -8956,23 +8956,23 @@ static void atkAE_healpartystatus(void)
 
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
 
-        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+        if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
             party = gPlayerParty;
         else
             party = gEnemyParty;
 
-        if (gBattleMons[gBattleMoveAttacker].ability != ABILITY_SOUNDPROOF)
+        if (gBattleMons[gBattlerAttacker].ability != ABILITY_SOUNDPROOF)
         {
-            gBattleMons[gBattleMoveAttacker].status1 = 0;
-            gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+            gBattleMons[gBattlerAttacker].status1 = 0;
+            gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE);
         }
         else
         {
-            RecordAbilityBattle(gBattleMoveAttacker, gBattleMons[gBattleMoveAttacker].ability);
+            RecordAbilityBattle(gBattlerAttacker, gBattleMons[gBattlerAttacker].ability);
             gBattleCommunication[MULTISTRING_CHOOSER] |= 1;
         }
 
-        gActiveBattler = gBattleScripting.battler = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_FLANK);
+        gActiveBattler = gBattleScripting.battler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK);
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
             && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
@@ -8998,8 +8998,8 @@ static void atkAE_healpartystatus(void)
             {
                 u8 ability;
 
-                if (gBattlerPartyIndexes[gBattleMoveAttacker] == i)
-                    ability = gBattleMons[gBattleMoveAttacker].ability;
+                if (gBattlerPartyIndexes[gBattlerAttacker] == i)
+                    ability = gBattleMons[gBattlerAttacker].ability;
                 else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
                          && gBattlerPartyIndexes[gActiveBattler] == i
                          && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
@@ -9017,10 +9017,10 @@ static void atkAE_healpartystatus(void)
         gBattleCommunication[MULTISTRING_CHOOSER] = 4;
         toHeal = 0x3F;
 
-        gBattleMons[gBattleMoveAttacker].status1 = 0;
-        gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+        gBattleMons[gBattlerAttacker].status1 = 0;
+        gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE);
 
-        gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_FLANK);
+        gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
             && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
         {
@@ -9032,7 +9032,7 @@ static void atkAE_healpartystatus(void)
 
     if (toHeal)
     {
-        gActiveBattler = gBattleMoveAttacker;
+        gActiveBattler = gBattlerAttacker;
         BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, toHeal, 4, &zero);
         MarkBattlerForControllerExec(gActiveBattler);
     }
@@ -9042,14 +9042,14 @@ static void atkAE_healpartystatus(void)
 
 static void atkAF_cursetarget(void)
 {
-    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_CURSED)
+    if (gBattleMons[gBattlerTarget].status2 & STATUS2_CURSED)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMons[gBattleMoveTarget].status2 |= STATUS2_CURSED;
-        gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 2;
+        gBattleMons[gBattlerTarget].status2 |= STATUS2_CURSED;
+        gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
@@ -9059,11 +9059,11 @@ static void atkAF_cursetarget(void)
 
 static void atkB0_trysetspikes(void)
 {
-    u8 targetSide = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
+    u8 targetSide = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
 
     if (gSideTimers[targetSide].spikesAmount == 3)
     {
-        gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
+        gSpecialStatuses[gBattlerAttacker].flag20 = 1;
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
@@ -9076,7 +9076,7 @@ static void atkB0_trysetspikes(void)
 
 static void atkB1_setforesight(void)
 {
-    gBattleMons[gBattleMoveTarget].status2 |= STATUS2_FORESIGHT;
+    gBattleMons[gBattlerTarget].status2 |= STATUS2_FORESIGHT;
     gBattlescriptCurrInstr++;
 }
 
@@ -9100,7 +9100,7 @@ static void atkB2_trysetperishsong(void)
         }
     }
 
-    PressurePPLoseOnUsingPerishSong(gBattleMoveAttacker);
+    PressurePPLoseOnUsingPerishSong(gBattlerAttacker);
 
     if (notAffectedCount == gBattlersCount)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
@@ -9112,31 +9112,31 @@ static void atkB3_rolloutdamagecalculation(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
-        CancelMultiTurnMoves(gBattleMoveAttacker);
+        CancelMultiTurnMoves(gBattlerAttacker);
         gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
     }
     else
     {
         s32 i;
 
-        if (!(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS)) // first hit
+        if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) // first hit
         {
-            gDisableStructs[gBattleMoveAttacker].rolloutCounter1 = 5;
-            gDisableStructs[gBattleMoveAttacker].rolloutCounter2 = 5;
-            gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_MULTIPLETURNS;
-            gLockedMoves[gBattleMoveAttacker] = gCurrentMove;
+            gDisableStructs[gBattlerAttacker].rolloutCounter1 = 5;
+            gDisableStructs[gBattlerAttacker].rolloutCounter2 = 5;
+            gBattleMons[gBattlerAttacker].status2 |= STATUS2_MULTIPLETURNS;
+            gLockedMoves[gBattlerAttacker] = gCurrentMove;
         }
-        if (--gDisableStructs[gBattleMoveAttacker].rolloutCounter1 == 0) // last hit
+        if (--gDisableStructs[gBattlerAttacker].rolloutCounter1 == 0) // last hit
         {
-            gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
+            gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
         }
 
         gDynamicBasePower = gBattleMoves[gCurrentMove].power;
 
-        for (i = 1; i < (5 - gDisableStructs[gBattleMoveAttacker].rolloutCounter1); i++)
+        for (i = 1; i < (5 - gDisableStructs[gBattlerAttacker].rolloutCounter1); i++)
             gDynamicBasePower *= 2;
 
-        if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_DEFENSE_CURL)
+        if (gBattleMons[gBattlerAttacker].status2 & STATUS2_DEFENSE_CURL)
             gDynamicBasePower *= 2;
 
         gBattlescriptCurrInstr++;
@@ -9145,8 +9145,8 @@ static void atkB3_rolloutdamagecalculation(void)
 
 static void atkB4_jumpifconfusedandstatmaxed(void)
 {
-    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_CONFUSION
-        && gBattleMons[gBattleMoveTarget].statStages[gBattlescriptCurrInstr[1]] == 0xC)
+    if (gBattleMons[gBattlerTarget].status2 & STATUS2_CONFUSION
+        && gBattleMons[gBattlerTarget].statStages[gBattlescriptCurrInstr[1]] == 0xC)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
     else
         gBattlescriptCurrInstr += 6;
@@ -9156,19 +9156,19 @@ static void atkB5_furycuttercalc(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
-        gDisableStructs[gBattleMoveAttacker].furyCutterCounter = 0;
+        gDisableStructs[gBattlerAttacker].furyCutterCounter = 0;
         gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
     }
     else
     {
         s32 i;
 
-        if (gDisableStructs[gBattleMoveAttacker].furyCutterCounter != 5)
-            gDisableStructs[gBattleMoveAttacker].furyCutterCounter++;
+        if (gDisableStructs[gBattlerAttacker].furyCutterCounter != 5)
+            gDisableStructs[gBattlerAttacker].furyCutterCounter++;
 
         gDynamicBasePower = gBattleMoves[gCurrentMove].power;
 
-        for (i = 1; i < gDisableStructs[gBattleMoveAttacker].furyCutterCounter; i++)
+        for (i = 1; i < gDisableStructs[gBattlerAttacker].furyCutterCounter; i++)
             gDynamicBasePower *= 2;
 
         gBattlescriptCurrInstr++;
@@ -9178,9 +9178,9 @@ static void atkB5_furycuttercalc(void)
 static void atkB6_happinesstodamagecalculation(void)
 {
     if (gBattleMoves[gCurrentMove].effect == EFFECT_RETURN)
-        gDynamicBasePower = 10 * (gBattleMons[gBattleMoveAttacker].friendship) / 25;
+        gDynamicBasePower = 10 * (gBattleMons[gBattlerAttacker].friendship) / 25;
     else // EFFECT_FRUSTRATION
-        gDynamicBasePower = 10 * (255 - gBattleMons[gBattleMoveAttacker].friendship) / 25;
+        gDynamicBasePower = 10 * (255 - gBattleMons[gBattlerAttacker].friendship) / 25;
 
     gBattlescriptCurrInstr++;
 }
@@ -9197,14 +9197,14 @@ static void atkB7_presentdamagecalculation(void)
         gDynamicBasePower = 120;
     else
     {
-        gBattleMoveDamage = gBattleMons[gBattleMoveTarget].maxHP / 4;
+        gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 4;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
     }
     if (rand < 204)
         gBattlescriptCurrInstr = BattleScript_HitFromCritCalc;
-    else if (gBattleMons[gBattleMoveTarget].maxHP == gBattleMons[gBattleMoveTarget].hp)
+    else if (gBattleMons[gBattlerTarget].maxHP == gBattleMons[gBattlerTarget].hp)
         gBattlescriptCurrInstr = BattleScript_AlreadyAtFullHp;
     else
     {
@@ -9215,16 +9215,16 @@ static void atkB7_presentdamagecalculation(void)
 
 static void atkB8_setsafeguard(void)
 {
-    if (gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] & SIDE_STATUS_SAFEGUARD)
+    if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_SAFEGUARD)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
     else
     {
-        gSideStatuses[GET_BATTLER_SIDE(gBattleMoveAttacker)] |= SIDE_STATUS_SAFEGUARD;
-        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].safeguardTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattleMoveAttacker)].safeguardBank = gBattleMoveAttacker;
+        gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_SAFEGUARD;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].safeguardTimer = 5;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].safeguardBank = gBattlerAttacker;
         gBattleCommunication[MULTISTRING_CHOOSER] = 5;
     }
 
@@ -9274,11 +9274,11 @@ static void atkB9_magnitudedamagecalculation(void)
 
     PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 2, magnitude)
 
-    for (gBattleMoveTarget = 0; gBattleMoveTarget < gBattlersCount; gBattleMoveTarget++)
+    for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++)
     {
-        if (gBattleMoveTarget == gBattleMoveAttacker)
+        if (gBattlerTarget == gBattlerAttacker)
             continue;
-        if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])) // a valid target was found
+        if (!(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) // a valid target was found
             break;
     }
 
@@ -9289,36 +9289,36 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
 {
     if (gMultiHitCounter == 1)
     {
-        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
-            gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
+            gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         else
-            gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
+            gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     }
     else
     {
-        if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
-            gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+        if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
+            gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
         else
-            gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
+            gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
     }
 
-    if (gActionForBanks[gBattleMoveTarget] == ACTION_USE_MOVE
-        && gBattleMoveAttacker == *(gBattleStruct->moveTarget + gBattleMoveTarget)
-        && !(gBattleMons[gBattleMoveTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
-        && gBattleMons[gBattleMoveAttacker].hp
-        && !gDisableStructs[gBattleMoveTarget].truantCounter
-        && gChosenMovesByBanks[gBattleMoveTarget] == MOVE_PURSUIT)
+    if (gChosenActionByBattler[gBattlerTarget] == B_ACTION_USE_MOVE
+        && gBattlerAttacker == *(gBattleStruct->moveTarget + gBattlerTarget)
+        && !(gBattleMons[gBattlerTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
+        && gBattleMons[gBattlerAttacker].hp
+        && !gDisableStructs[gBattlerTarget].truantCounter
+        && gChosenMoveByBattler[gBattlerTarget] == MOVE_PURSUIT)
     {
         s32 i;
 
         for (i = 0; i < gBattlersCount; i++)
         {
-            if (gBattleTurnOrder[i] == gBattleMoveTarget)
+            if (gBattleTurnOrder[i] == gBattlerTarget)
                 gActionsByTurnOrder[i] = 11;
         }
 
         gCurrentMove = MOVE_PURSUIT;
-        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattleMoveTarget);
+        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattlerTarget);
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
@@ -9348,16 +9348,16 @@ static void atkBB_setsunny(void)
 
 static void atkBC_maxattackhalvehp(void) // belly drum
 {
-    u32 halfHp = gBattleMons[gBattleMoveAttacker].maxHP / 2;
+    u32 halfHp = gBattleMons[gBattlerAttacker].maxHP / 2;
 
-    if (!(gBattleMons[gBattleMoveAttacker].maxHP / 2))
+    if (!(gBattleMons[gBattlerAttacker].maxHP / 2))
         halfHp = 1;
 
-    if (gBattleMons[gBattleMoveAttacker].statStages[STAT_STAGE_ATK] < 12
-        && gBattleMons[gBattleMoveAttacker].hp > halfHp)
+    if (gBattleMons[gBattlerAttacker].statStages[STAT_STAGE_ATK] < 12
+        && gBattleMons[gBattlerAttacker].hp > halfHp)
     {
-        gBattleMons[gBattleMoveAttacker].statStages[STAT_STAGE_ATK] = 12;
-        gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 2;
+        gBattleMons[gBattlerAttacker].statStages[STAT_STAGE_ATK] = 12;
+        gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
 
@@ -9375,7 +9375,7 @@ static void atkBD_copyfoestats(void) // psych up
 
     for (i = 0; i < BATTLE_STATS_NO; i++)
     {
-        gBattleMons[gBattleMoveAttacker].statStages[i] = gBattleMons[gBattleMoveTarget].statStages[i];
+        gBattleMons[gBattlerAttacker].statStages[i] = gBattleMons[gBattlerTarget].statStages[i];
     }
 
     gBattlescriptCurrInstr += 5; // Has an unused jump ptr(possibly for a failed attempt) parameter.
@@ -9383,32 +9383,32 @@ static void atkBD_copyfoestats(void) // psych up
 
 static void atkBE_rapidspinfree(void)
 {
-    if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_WRAPPED)
+    if (gBattleMons[gBattlerAttacker].status2 & STATUS2_WRAPPED)
     {
-        gBattleScripting.battler = gBattleMoveTarget;
-        gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_WRAPPED);
-        gBattleMoveTarget = *(gBattleStruct->wrappedBy + gBattleMoveAttacker);
+        gBattleScripting.battler = gBattlerTarget;
+        gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_WRAPPED);
+        gBattlerTarget = *(gBattleStruct->wrappedBy + gBattlerAttacker);
 
         gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN;
         gBattleTextBuff1[1] = B_BUFF_MOVE;
-        gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gBattleMoveAttacker * 2 + 0);
-        gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gBattleMoveAttacker * 2 + 1);
+        gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gBattlerAttacker * 2 + 0);
+        gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gBattlerAttacker * 2 + 1);
         gBattleTextBuff1[4] = B_BUFF_EOS;
 
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_WrapFree;
     }
-    else if (gStatuses3[gBattleMoveAttacker] & STATUS3_LEECHSEED)
+    else if (gStatuses3[gBattlerAttacker] & STATUS3_LEECHSEED)
     {
-        gStatuses3[gBattleMoveAttacker] &= ~(STATUS3_LEECHSEED);
-        gStatuses3[gBattleMoveAttacker] &= ~(STATUS3_LEECHSEED_BANK);
+        gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED);
+        gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED_BANK);
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_LeechSeedFree;
     }
-    else if (gSideStatuses[GetBattlerSide(gBattleMoveAttacker)] & SIDE_STATUS_SPIKES)
+    else if (gSideStatuses[GetBattlerSide(gBattlerAttacker)] & SIDE_STATUS_SPIKES)
     {
-        gSideStatuses[GetBattlerSide(gBattleMoveAttacker)] &= ~(SIDE_STATUS_SPIKES);
-        gSideTimers[GetBattlerSide(gBattleMoveAttacker)].spikesAmount = 0;
+        gSideStatuses[GetBattlerSide(gBattlerAttacker)] &= ~(SIDE_STATUS_SPIKES);
+        gSideTimers[GetBattlerSide(gBattlerAttacker)].spikesAmount = 0;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_SpikesFree;
     }
@@ -9420,22 +9420,22 @@ static void atkBE_rapidspinfree(void)
 
 static void atkBF_setdefensecurlbit(void)
 {
-    gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_DEFENSE_CURL;
+    gBattleMons[gBattlerAttacker].status2 |= STATUS2_DEFENSE_CURL;
     gBattlescriptCurrInstr++;
 }
 
 static void atkC0_recoverbasedonsunlight(void)
 {
-    gBattleMoveTarget = gBattleMoveAttacker;
+    gBattlerTarget = gBattlerAttacker;
 
-    if (gBattleMons[gBattleMoveAttacker].hp != gBattleMons[gBattleMoveAttacker].maxHP)
+    if (gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP)
     {
         if (gBattleWeather == 0 || !WEATHER_HAS_EFFECT)
-            gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 2;
+            gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2;
         else if (gBattleWeather & WEATHER_SUN_ANY)
-            gBattleMoveDamage = 20 * gBattleMons[gBattleMoveAttacker].maxHP / 30;
+            gBattleMoveDamage = 20 * gBattleMons[gBattlerAttacker].maxHP / 30;
         else // not sunny weather
-            gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 4;
+            gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4;
 
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
@@ -9455,19 +9455,19 @@ static void atkC1_hiddenpowercalc(void)
     u32 powerBits = 0;
     u32 typeBits = 0;
 
-    powerBits |= ((gBattleMons[gBattleMoveAttacker].hpIV & 2) >> 1);
-    powerBits |= ((gBattleMons[gBattleMoveAttacker].attackIV & 2) << 0);
-    powerBits |= ((gBattleMons[gBattleMoveAttacker].defenseIV & 2) << 1);
-    powerBits |= ((gBattleMons[gBattleMoveAttacker].speedIV & 2) << 2);
-    powerBits |= ((gBattleMons[gBattleMoveAttacker].spAttackIV & 2) << 3);
-    powerBits |= ((gBattleMons[gBattleMoveAttacker].spDefenseIV & 2) << 4);
+    powerBits |= ((gBattleMons[gBattlerAttacker].hpIV & 2) >> 1);
+    powerBits |= ((gBattleMons[gBattlerAttacker].attackIV & 2) << 0);
+    powerBits |= ((gBattleMons[gBattlerAttacker].defenseIV & 2) << 1);
+    powerBits |= ((gBattleMons[gBattlerAttacker].speedIV & 2) << 2);
+    powerBits |= ((gBattleMons[gBattlerAttacker].spAttackIV & 2) << 3);
+    powerBits |= ((gBattleMons[gBattlerAttacker].spDefenseIV & 2) << 4);
 
-    typeBits |= ((gBattleMons[gBattleMoveAttacker].hpIV & 1) << 0);
-    typeBits |= ((gBattleMons[gBattleMoveAttacker].attackIV & 1) << 1);
-    typeBits |= ((gBattleMons[gBattleMoveAttacker].defenseIV & 1) << 2);
-    typeBits |= ((gBattleMons[gBattleMoveAttacker].speedIV & 1) << 3);
-    typeBits |= ((gBattleMons[gBattleMoveAttacker].spAttackIV & 1) << 4);
-    typeBits |= ((gBattleMons[gBattleMoveAttacker].spDefenseIV & 1) << 5);
+    typeBits |= ((gBattleMons[gBattlerAttacker].hpIV & 1) << 0);
+    typeBits |= ((gBattleMons[gBattlerAttacker].attackIV & 1) << 1);
+    typeBits |= ((gBattleMons[gBattlerAttacker].defenseIV & 1) << 2);
+    typeBits |= ((gBattleMons[gBattlerAttacker].speedIV & 1) << 3);
+    typeBits |= ((gBattleMons[gBattlerAttacker].spAttackIV & 1) << 4);
+    typeBits |= ((gBattleMons[gBattlerAttacker].spDefenseIV & 1) << 5);
 
     gDynamicBasePower = (40 * powerBits) / 63 + 30;
 
@@ -9490,7 +9490,7 @@ static void atkC1_hiddenpowercalc(void)
 	mov r5, r8\n\
 	push {r5-r7}\n\
 	ldr r2, =gBattleMons\n\
-	ldr r0, =gBattleMoveAttacker\n\
+	ldr r0, =gBattlerAttacker\n\
 	ldrb r1, [r0]\n\
 	movs r0, 0x58\n\
 	adds r4, r1, 0\n\
@@ -9626,11 +9626,11 @@ _080544F0:\n\
 
 static void atkC2_selectfirstvalidtarget(void)
 {
-    for (gBattleMoveTarget = 0; gBattleMoveTarget < gBattlersCount; gBattleMoveTarget++)
+    for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++)
     {
-        if (gBattleMoveTarget == gBattleMoveAttacker)
+        if (gBattlerTarget == gBattlerAttacker)
             continue;
-        if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]))
+        if (!(gAbsentBattlerFlags & gBitTable[gBattlerTarget]))
             break;
     }
     gBattlescriptCurrInstr++;
@@ -9638,22 +9638,22 @@ static void atkC2_selectfirstvalidtarget(void)
 
 static void atkC3_trysetfutureattack(void)
 {
-    if (gWishFutureKnock.futureSightCounter[gBattleMoveTarget] != 0)
+    if (gWishFutureKnock.futureSightCounter[gBattlerTarget] != 0)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gSideStatuses[GET_BATTLER_SIDE(gBattleMoveTarget)] |= SIDE_STATUS_FUTUREATTACK;
-        gWishFutureKnock.futureSightMove[gBattleMoveTarget] = gCurrentMove;
-        gWishFutureKnock.futureSightAttacker[gBattleMoveTarget] = gBattleMoveAttacker;
-        gWishFutureKnock.futureSightCounter[gBattleMoveTarget] = 3;
-        gWishFutureKnock.futureSightDmg[gBattleMoveTarget] = CalculateBaseDamage(&gBattleMons[gBattleMoveAttacker], &gBattleMons[gBattleMoveTarget], gCurrentMove,
-                                                    gSideStatuses[GET_BATTLER_SIDE(gBattleMoveTarget)], 0,
-                                                    0, gBattleMoveAttacker, gBattleMoveTarget);
+        gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)] |= SIDE_STATUS_FUTUREATTACK;
+        gWishFutureKnock.futureSightMove[gBattlerTarget] = gCurrentMove;
+        gWishFutureKnock.futureSightAttacker[gBattlerTarget] = gBattlerAttacker;
+        gWishFutureKnock.futureSightCounter[gBattlerTarget] = 3;
+        gWishFutureKnock.futureSightDmg[gBattlerTarget] = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove,
+                                                    gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)], 0,
+                                                    0, gBattlerAttacker, gBattlerTarget);
 
-        if (gProtectStructs[gBattleMoveAttacker].helpingHand)
-            gWishFutureKnock.futureSightDmg[gBattleMoveTarget] = gWishFutureKnock.futureSightDmg[gBattleMoveTarget] * 15 / 10;
+        if (gProtectStructs[gBattlerAttacker].helpingHand)
+            gWishFutureKnock.futureSightDmg[gBattlerTarget] = gWishFutureKnock.futureSightDmg[gBattlerTarget] * 15 / 10;
 
         if (gCurrentMove == MOVE_DOOM_DESIRE)
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -9668,12 +9668,12 @@ static void atkC4_trydobeatup(void)
 {
     struct Pokemon *party;
 
-    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+    if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
         party = gPlayerParty;
     else
         party = gEnemyParty;
 
-    if (gBattleMons[gBattleMoveTarget].hp == 0)
+    if (gBattleMons[gBattlerTarget].hp == 0)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -9690,16 +9690,16 @@ static void atkC4_trydobeatup(void)
         }
         if (gBattleCommunication[0] < 6)
         {
-            PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleMoveAttacker, gBattleCommunication[0])
+            PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattleCommunication[0])
 
             gBattlescriptCurrInstr += 9;
 
             gBattleMoveDamage = gBaseStats[GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES)].baseAttack;
             gBattleMoveDamage *= gBattleMoves[gCurrentMove].power;
             gBattleMoveDamage *= (GetMonData(&party[gBattleCommunication[0]], MON_DATA_LEVEL) * 2 / 5 + 2);
-            gBattleMoveDamage /= gBaseStats[gBattleMons[gBattleMoveTarget].species].baseDefense;
+            gBattleMoveDamage /= gBaseStats[gBattleMons[gBattlerTarget].species].baseDefense;
             gBattleMoveDamage = (gBattleMoveDamage / 50) + 2;
-            if (gProtectStructs[gBattleMoveAttacker].helpingHand)
+            if (gProtectStructs[gBattlerAttacker].helpingHand)
                 gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
 
             gBattleCommunication[0]++;
@@ -9717,13 +9717,13 @@ static void atkC5_setsemiinvulnerablebit(void)
     {
     case MOVE_FLY:
     case MOVE_BOUNCE:
-        gStatuses3[gBattleMoveAttacker] |= STATUS3_ON_AIR;
+        gStatuses3[gBattlerAttacker] |= STATUS3_ON_AIR;
         break;
     case MOVE_DIG:
-        gStatuses3[gBattleMoveAttacker] |= STATUS3_UNDERGROUND;
+        gStatuses3[gBattlerAttacker] |= STATUS3_UNDERGROUND;
         break;
     case MOVE_DIVE:
-        gStatuses3[gBattleMoveAttacker] |= STATUS3_UNDERWATER;
+        gStatuses3[gBattlerAttacker] |= STATUS3_UNDERWATER;
         break;
     }
 
@@ -9736,13 +9736,13 @@ static void atkC6_clearsemiinvulnerablebit(void)
     {
     case MOVE_FLY:
     case MOVE_BOUNCE:
-        gStatuses3[gBattleMoveAttacker] &= ~STATUS3_ON_AIR;
+        gStatuses3[gBattlerAttacker] &= ~STATUS3_ON_AIR;
         break;
     case MOVE_DIG:
-        gStatuses3[gBattleMoveAttacker] &= ~STATUS3_UNDERGROUND;
+        gStatuses3[gBattlerAttacker] &= ~STATUS3_UNDERGROUND;
         break;
     case MOVE_DIVE:
-        gStatuses3[gBattleMoveAttacker] &= ~STATUS3_UNDERWATER;
+        gStatuses3[gBattlerAttacker] &= ~STATUS3_UNDERWATER;
         break;
     }
 
@@ -9752,7 +9752,7 @@ static void atkC6_clearsemiinvulnerablebit(void)
 static void atkC7_setminimize(void)
 {
     if (gHitMarker & HITMARKER_OBEYS)
-        gStatuses3[gBattleMoveAttacker] |= STATUS3_MINIMIZED;
+        gStatuses3[gBattlerAttacker] |= STATUS3_MINIMIZED;
 
     gBattlescriptCurrInstr++;
 }
@@ -9776,15 +9776,15 @@ static void atkC8_sethail(void)
 
 static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento
 {
-    if (gBattleMons[gBattleMoveTarget].statStages[STAT_STAGE_ATK] == 0
-        && gBattleMons[gBattleMoveTarget].statStages[STAT_STAGE_SPATK] == 0
+    if (gBattleMons[gBattlerTarget].statStages[STAT_STAGE_ATK] == 0
+        && gBattleMons[gBattlerTarget].statStages[STAT_STAGE_SPATK] == 0
         && gBattleCommunication[6] != 1)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gActiveBattler = gBattleMoveAttacker;
+        gActiveBattler = gBattlerAttacker;
         gBattleMoveDamage = gBattleMons[gActiveBattler].hp;
         BtlController_EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP);
         MarkBattlerForControllerExec(gActiveBattler);
@@ -9794,16 +9794,16 @@ static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento
 
 static void atkCA_setforcedtarget(void) // follow me
 {
-    gSideTimers[GetBattlerSide(gBattleMoveAttacker)].followmeTimer = 1;
-    gSideTimers[GetBattlerSide(gBattleMoveAttacker)].followmeTarget = gBattleMoveAttacker;
+    gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTimer = 1;
+    gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTarget = gBattlerAttacker;
     gBattlescriptCurrInstr++;
 }
 
 static void atkCB_setcharge(void)
 {
-    gStatuses3[gBattleMoveAttacker] |= STATUS3_CHARGED_UP;
-    gDisableStructs[gBattleMoveAttacker].chargeTimer1 = 2;
-    gDisableStructs[gBattleMoveAttacker].chargeTimer2 = 2;
+    gStatuses3[gBattlerAttacker] |= STATUS3_CHARGED_UP;
+    gDisableStructs[gBattlerAttacker].chargeTimer1 = 2;
+    gDisableStructs[gBattlerAttacker].chargeTimer2 = 2;
     gBattlescriptCurrInstr++;
 }
 
@@ -9811,18 +9811,18 @@ static void atkCC_callterrainattack(void) // nature power
 {
     gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
     gCurrentMove = sNaturePowerMoves[gBattleTerrain];
-    gBattleMoveTarget = GetMoveTarget(gCurrentMove, 0);
+    gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
     BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
     gBattlescriptCurrInstr++;
 }
 
 static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
 {
-    if (gBattleMons[gBattleMoveAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
+    if (gBattleMons[gBattlerAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
     {
-        gBattleMons[gBattleMoveAttacker].status1 = 0;
+        gBattleMons[gBattlerAttacker].status1 = 0;
         gBattlescriptCurrInstr += 5;
-        gActiveBattler = gBattleMoveAttacker;
+        gActiveBattler = gBattlerAttacker;
         BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
         MarkBattlerForControllerExec(gActiveBattler);
     }
@@ -9834,20 +9834,20 @@ static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
 
 static void atkCE_settorment(void)
 {
-    if (gBattleMons[gBattleMoveTarget].status2 & STATUS2_TORMENT)
+    if (gBattleMons[gBattlerTarget].status2 & STATUS2_TORMENT)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMons[gBattleMoveTarget].status2 |= STATUS2_TORMENT;
+        gBattleMons[gBattlerTarget].status2 |= STATUS2_TORMENT;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkCF_jumpifnodamage(void)
 {
-    if (gProtectStructs[gBattleMoveAttacker].physicalDmg || gProtectStructs[gBattleMoveAttacker].specialDmg)
+    if (gProtectStructs[gBattlerAttacker].physicalDmg || gProtectStructs[gBattlerAttacker].specialDmg)
         gBattlescriptCurrInstr += 5;
     else
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
@@ -9855,10 +9855,10 @@ static void atkCF_jumpifnodamage(void)
 
 static void atkD0_settaunt(void)
 {
-    if (gDisableStructs[gBattleMoveTarget].tauntTimer1 == 0)
+    if (gDisableStructs[gBattlerTarget].tauntTimer1 == 0)
     {
-        gDisableStructs[gBattleMoveTarget].tauntTimer1 = 2;
-        gDisableStructs[gBattleMoveTarget].tauntTimer2 = 2;
+        gDisableStructs[gBattlerTarget].tauntTimer1 = 2;
+        gDisableStructs[gBattlerTarget].tauntTimer2 = 2;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9869,14 +9869,14 @@ static void atkD0_settaunt(void)
 
 static void atkD1_trysethelpinghand(void)
 {
-    gBattleMoveTarget = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_FLANK);
+    gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-        && !(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
-        && !gProtectStructs[gBattleMoveAttacker].helpingHand
-        && !gProtectStructs[gBattleMoveTarget].helpingHand)
+        && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget])
+        && !gProtectStructs[gBattlerAttacker].helpingHand
+        && !gProtectStructs[gBattlerTarget].helpingHand)
     {
-        gProtectStructs[gBattleMoveTarget].helpingHand = 1;
+        gProtectStructs[gBattlerTarget].helpingHand = 1;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9889,7 +9889,7 @@ static void atkD2_tryswapitems(void) // trick
 {
     // opponent can't swap items with player in regular battles
     if (gBattleTypeFlags & BATTLE_TYPE_x4000000
-        || (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_OPPONENT
+        || (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT
             && !(gBattleTypeFlags & (BATTLE_TYPE_LINK
                                   | BATTLE_TYPE_EREADER_TRAINER
                                   | BATTLE_TYPE_FRONTIER
@@ -9900,8 +9900,8 @@ static void atkD2_tryswapitems(void) // trick
     }
     else
     {
-        u8 sideAttacker = GetBattlerSide(gBattleMoveAttacker);
-        u8 sideTarget = GetBattlerSide(gBattleMoveTarget);
+        u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
+        u8 sideTarget = GetBattlerSide(gBattlerTarget);
 
         // you can't swap items if they were knocked off in regular battles
         if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
@@ -9909,53 +9909,53 @@ static void atkD2_tryswapitems(void) // trick
                              | BATTLE_TYPE_FRONTIER
                              | BATTLE_TYPE_SECRET_BASE
                              | BATTLE_TYPE_x2000000))
-            && (gWishFutureKnock.knockedOffPokes[sideAttacker] & gBitTable[gBattlerPartyIndexes[gBattleMoveAttacker]]
-                || gWishFutureKnock.knockedOffPokes[sideTarget] & gBitTable[gBattlerPartyIndexes[gBattleMoveTarget]]))
+            && (gWishFutureKnock.knockedOffPokes[sideAttacker] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]]
+                || gWishFutureKnock.knockedOffPokes[sideTarget] & gBitTable[gBattlerPartyIndexes[gBattlerTarget]]))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         // can't swap if two pokemon don't have an item
         // or if either of them is an enigma berry or a mail
-        else if ((gBattleMons[gBattleMoveAttacker].item == 0 && gBattleMons[gBattleMoveTarget].item == 0)
-                 || gBattleMons[gBattleMoveAttacker].item == ITEM_ENIGMA_BERRY
-                 || gBattleMons[gBattleMoveTarget].item == ITEM_ENIGMA_BERRY
-                 || IS_ITEM_MAIL(gBattleMons[gBattleMoveAttacker].item)
-                 || IS_ITEM_MAIL(gBattleMons[gBattleMoveTarget].item))
+        else if ((gBattleMons[gBattlerAttacker].item == 0 && gBattleMons[gBattlerTarget].item == 0)
+                 || gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY
+                 || gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY
+                 || IS_ITEM_MAIL(gBattleMons[gBattlerAttacker].item)
+                 || IS_ITEM_MAIL(gBattleMons[gBattlerTarget].item))
         {
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         // check if ability prevents swapping
-        else if (gBattleMons[gBattleMoveTarget].ability == ABILITY_STICKY_HOLD)
+        else if (gBattleMons[gBattlerTarget].ability == ABILITY_STICKY_HOLD)
         {
             gBattlescriptCurrInstr = BattleScript_StickyHoldActivates;
-            gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
-            RecordAbilityBattle(gBattleMoveTarget, gLastUsedAbility);
+            gLastUsedAbility = gBattleMons[gBattlerTarget].ability;
+            RecordAbilityBattle(gBattlerTarget, gLastUsedAbility);
         }
         // took a while, but all checks passed and items can be safely swapped
         else
         {
             u16 oldItemAtk, *newItemAtk;
 
-            newItemAtk = &gBattleStruct->changedItems[gBattleMoveAttacker];
-            oldItemAtk = gBattleMons[gBattleMoveAttacker].item;
-            *newItemAtk = gBattleMons[gBattleMoveTarget].item;
+            newItemAtk = &gBattleStruct->changedItems[gBattlerAttacker];
+            oldItemAtk = gBattleMons[gBattlerAttacker].item;
+            *newItemAtk = gBattleMons[gBattlerTarget].item;
 
-            gBattleMons[gBattleMoveAttacker].item = 0;
-            gBattleMons[gBattleMoveTarget].item = oldItemAtk;
+            gBattleMons[gBattlerAttacker].item = 0;
+            gBattleMons[gBattlerTarget].item = oldItemAtk;
 
-            gActiveBattler = gBattleMoveAttacker;
+            gActiveBattler = gBattlerAttacker;
             BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, newItemAtk);
-            MarkBattlerForControllerExec(gBattleMoveAttacker);
+            MarkBattlerForControllerExec(gBattlerAttacker);
 
-            gActiveBattler = gBattleMoveTarget;
-            BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattleMoveTarget].item);
-            MarkBattlerForControllerExec(gBattleMoveTarget);
+            gActiveBattler = gBattlerTarget;
+            BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattlerTarget].item);
+            MarkBattlerForControllerExec(gBattlerTarget);
 
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveTarget]) + 0) = 0;
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveTarget]) + 1) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0;
 
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveAttacker]) + 0) = 0;
-            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattleMoveAttacker]) + 1) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerAttacker]) + 0) = 0;
+            *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerAttacker]) + 1) = 0;
 
             gBattlescriptCurrInstr += 5;
 
@@ -9974,11 +9974,11 @@ static void atkD2_tryswapitems(void) // trick
 
 static void atkD3_trycopyability(void) // role play
 {
-    if (gBattleMons[gBattleMoveTarget].ability != 0
-        && gBattleMons[gBattleMoveTarget].ability != ABILITY_WONDER_GUARD)
+    if (gBattleMons[gBattlerTarget].ability != 0
+        && gBattleMons[gBattlerTarget].ability != ABILITY_WONDER_GUARD)
     {
-        gBattleMons[gBattleMoveAttacker].ability = gBattleMons[gBattleMoveTarget].ability;
-        gLastUsedAbility = gBattleMons[gBattleMoveTarget].ability;
+        gBattleMons[gBattlerAttacker].ability = gBattleMons[gBattlerTarget].ability;
+        gLastUsedAbility = gBattleMons[gBattlerTarget].ability;
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -9992,10 +9992,10 @@ static void atkD4_trywish(void)
     switch (gBattlescriptCurrInstr[1])
     {
     case 0: // use wish
-        if (gWishFutureKnock.wishCounter[gBattleMoveAttacker] == 0)
+        if (gWishFutureKnock.wishCounter[gBattlerAttacker] == 0)
         {
-            gWishFutureKnock.wishCounter[gBattleMoveAttacker] = 2;
-            gWishFutureKnock.wishUserID[gBattleMoveAttacker] = gBattlerPartyIndexes[gBattleMoveAttacker];
+            gWishFutureKnock.wishCounter[gBattlerAttacker] = 2;
+            gWishFutureKnock.wishUserID[gBattlerAttacker] = gBattlerPartyIndexes[gBattlerAttacker];
             gBattlescriptCurrInstr += 6;
         }
         else
@@ -10004,14 +10004,14 @@ static void atkD4_trywish(void)
         }
         break;
     case 1: // heal effect
-        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleMoveTarget, gWishFutureKnock.wishUserID[gBattleMoveTarget])
+        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattlerTarget, gWishFutureKnock.wishUserID[gBattlerTarget])
 
-        gBattleMoveDamage = gBattleMons[gBattleMoveTarget].maxHP / 2;
+        gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         gBattleMoveDamage *= -1;
 
-        if (gBattleMons[gBattleMoveTarget].hp == gBattleMons[gBattleMoveTarget].maxHP)
+        if (gBattleMons[gBattlerTarget].hp == gBattleMons[gBattlerTarget].maxHP)
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
         else
             gBattlescriptCurrInstr += 6;
@@ -10022,23 +10022,23 @@ static void atkD4_trywish(void)
 
 static void atkD5_trysetroots(void) // ingrain
 {
-    if (gStatuses3[gBattleMoveAttacker] & STATUS3_ROOTED)
+    if (gStatuses3[gBattlerAttacker] & STATUS3_ROOTED)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gStatuses3[gBattleMoveAttacker] |= STATUS3_ROOTED;
+        gStatuses3[gBattlerAttacker] |= STATUS3_ROOTED;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkD6_doubledamagedealtifdamaged(void)
 {
-    if ((gProtectStructs[gBattleMoveAttacker].physicalDmg
-         && gProtectStructs[gBattleMoveAttacker].physicalBank == gBattleMoveTarget)
-        || (gProtectStructs[gBattleMoveAttacker].specialDmg
-            && gProtectStructs[gBattleMoveAttacker].specialBank == gBattleMoveTarget))
+    if ((gProtectStructs[gBattlerAttacker].physicalDmg
+         && gProtectStructs[gBattlerAttacker].physicalBank == gBattlerTarget)
+        || (gProtectStructs[gBattlerAttacker].specialDmg
+            && gProtectStructs[gBattlerAttacker].specialBank == gBattlerTarget))
     {
         gBattleScripting.dmgMultiplier = 2;
     }
@@ -10048,27 +10048,27 @@ static void atkD6_doubledamagedealtifdamaged(void)
 
 static void atkD7_setyawn(void)
 {
-    if (gStatuses3[gBattleMoveTarget] & STATUS3_YAWN
-        || gBattleMons[gBattleMoveTarget].status1 & STATUS1_ANY)
+    if (gStatuses3[gBattlerTarget] & STATUS3_YAWN
+        || gBattleMons[gBattlerTarget].status1 & STATUS1_ANY)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gStatuses3[gBattleMoveTarget] |= 0x1000;
+        gStatuses3[gBattlerTarget] |= 0x1000;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkD8_setdamagetohealthdifference(void)
 {
-    if (gBattleMons[gBattleMoveTarget].hp <= gBattleMons[gBattleMoveAttacker].hp)
+    if (gBattleMons[gBattlerTarget].hp <= gBattleMons[gBattlerAttacker].hp)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gBattleMoveDamage = gBattleMons[gBattleMoveTarget].hp - gBattleMons[gBattleMoveAttacker].hp;
+        gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - gBattleMons[gBattlerAttacker].hp;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -10078,7 +10078,7 @@ static void atkD9_scaledamagebyhealthratio(void)
     if (gDynamicBasePower == 0)
     {
         u8 power = gBattleMoves[gCurrentMove].power;
-        gDynamicBasePower = gBattleMons[gBattleMoveAttacker].hp * power / gBattleMons[gBattleMoveAttacker].maxHP;
+        gDynamicBasePower = gBattleMons[gBattlerAttacker].hp * power / gBattleMons[gBattlerAttacker].maxHP;
         if (gDynamicBasePower == 0)
             gDynamicBasePower = 1;
     }
@@ -10087,19 +10087,19 @@ static void atkD9_scaledamagebyhealthratio(void)
 
 static void atkDA_tryswapabilities(void) // skill swap
 {
-    if ((gBattleMons[gBattleMoveAttacker].ability == 0
-         && gBattleMons[gBattleMoveTarget].ability == 0)
-     || gBattleMons[gBattleMoveAttacker].ability == ABILITY_WONDER_GUARD
-     || gBattleMons[gBattleMoveTarget].ability == ABILITY_WONDER_GUARD
+    if ((gBattleMons[gBattlerAttacker].ability == 0
+         && gBattleMons[gBattlerTarget].ability == 0)
+     || gBattleMons[gBattlerAttacker].ability == ABILITY_WONDER_GUARD
+     || gBattleMons[gBattlerTarget].ability == ABILITY_WONDER_GUARD
      || gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
      {
          gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
      }
     else
     {
-        u8 abilityAtk = gBattleMons[gBattleMoveAttacker].ability;
-        gBattleMons[gBattleMoveAttacker].ability = gBattleMons[gBattleMoveTarget].ability;
-        gBattleMons[gBattleMoveTarget].ability = abilityAtk;
+        u8 abilityAtk = gBattleMons[gBattlerAttacker].ability;
+        gBattleMons[gBattlerAttacker].ability = gBattleMons[gBattlerTarget].ability;
+        gBattleMons[gBattlerTarget].ability = abilityAtk;
 
             gBattlescriptCurrInstr += 5;
     }
@@ -10107,7 +10107,7 @@ static void atkDA_tryswapabilities(void) // skill swap
 
 static void atkDB_tryimprision(void)
 {
-    if ((gStatuses3[gBattleMoveAttacker] & STATUS3_IMPRISONED_OTHERS))
+    if ((gStatuses3[gBattlerAttacker] & STATUS3_IMPRISONED_OTHERS))
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
@@ -10115,8 +10115,8 @@ static void atkDB_tryimprision(void)
     {
         u8 bank, sideAttacker;
 
-        sideAttacker = GetBattlerSide(gBattleMoveAttacker);
-        PressurePPLoseOnUsingImprision(gBattleMoveAttacker);
+        sideAttacker = GetBattlerSide(gBattlerAttacker);
+        PressurePPLoseOnUsingImprision(gBattlerAttacker);
         for (bank = 0; bank < gBattlersCount; bank++)
         {
             if (sideAttacker != GetBattlerSide(bank))
@@ -10127,8 +10127,8 @@ static void atkDB_tryimprision(void)
                     s32 i;
                     for (i = 0; i < 4; i++)
                     {
-                        if (gBattleMons[gBattleMoveAttacker].moves[attackerMoveId] == gBattleMons[bank].moves[i]
-                            && gBattleMons[gBattleMoveAttacker].moves[attackerMoveId] != MOVE_NONE)
+                        if (gBattleMons[gBattlerAttacker].moves[attackerMoveId] == gBattleMons[bank].moves[i]
+                            && gBattleMons[gBattlerAttacker].moves[attackerMoveId] != MOVE_NONE)
                             break;
                     }
                     if (i != 4)
@@ -10136,7 +10136,7 @@ static void atkDB_tryimprision(void)
                 }
                 if (attackerMoveId != 4)
                 {
-                    gStatuses3[gBattleMoveAttacker] |= STATUS3_IMPRISONED_OTHERS;
+                    gStatuses3[gBattlerAttacker] |= STATUS3_IMPRISONED_OTHERS;
                     gBattlescriptCurrInstr += 5;
                     break;
                 }
@@ -10149,13 +10149,13 @@ static void atkDB_tryimprision(void)
 
 static void atkDC_trysetgrudge(void)
 {
-    if (gStatuses3[gBattleMoveAttacker] & STATUS3_GRUDGE)
+    if (gStatuses3[gBattlerAttacker] & STATUS3_GRUDGE)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gStatuses3[gBattleMoveAttacker] |= STATUS3_GRUDGE;
+        gStatuses3[gBattlerAttacker] |= STATUS3_GRUDGE;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -10165,7 +10165,7 @@ static void atkDD_weightdamagecalculation(void)
     s32 i;
     for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2)
     {
-        if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattleMoveTarget].species), 1))
+        if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1))
             break;
     }
 
@@ -10184,14 +10184,14 @@ static void atkDE_asistattackselect(void)
     s32 monId, moveId;
     u16* movesArray = gBattleStruct->assistPossibleMoves;
 
-    if (GET_BATTLER_SIDE(gBattleMoveAttacker) != B_SIDE_PLAYER)
+    if (GET_BATTLER_SIDE(gBattlerAttacker) != B_SIDE_PLAYER)
         party = gEnemyParty;
     else
         party = gPlayerParty;
 
     for (monId = 0; monId < 6; monId++)
     {
-        if (monId == gBattlerPartyIndexes[gBattleMoveAttacker])
+        if (monId == gBattlerPartyIndexes[gBattlerAttacker])
             continue;
         if (GetMonData(&party[monId], MON_DATA_SPECIES2) == SPECIES_NONE)
             continue;
@@ -10221,7 +10221,7 @@ static void atkDE_asistattackselect(void)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gRandomMove = movesArray[((Random() & 0xFF) * chooseableMovesNo) >> 8];
-        gBattleMoveTarget = GetMoveTarget(gRandomMove, 0);
+        gBattlerTarget = GetMoveTarget(gRandomMove, 0);
         gBattlescriptCurrInstr += 5;
     }
     else
@@ -10232,29 +10232,29 @@ static void atkDE_asistattackselect(void)
 
 static void atkDF_trysetmagiccoat(void)
 {
-    gBattleMoveTarget = gBattleMoveAttacker;
-    gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
+    gBattlerTarget = gBattlerAttacker;
+    gSpecialStatuses[gBattlerAttacker].flag20 = 1;
     if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gProtectStructs[gBattleMoveAttacker].bounceMove = 1;
+        gProtectStructs[gBattlerAttacker].bounceMove = 1;
         gBattlescriptCurrInstr += 5;
     }
 }
 
 static void atkE0_trysetsnatch(void) // snatch
 {
-    gSpecialStatuses[gBattleMoveAttacker].flag20 = 1;
+    gSpecialStatuses[gBattlerAttacker].flag20 = 1;
     if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
     else
     {
-        gProtectStructs[gBattleMoveAttacker].stealMove = 1;
+        gProtectStructs[gBattlerAttacker].stealMove = 1;
         gBattlescriptCurrInstr += 5;
     }
 }
@@ -10268,15 +10268,15 @@ static void atkE1_trygetintimidatetarget(void)
 
     PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gBattleMons[gBattleScripting.battler].ability)
 
-    for (;gBattleMoveTarget < gBattlersCount; gBattleMoveTarget++)
+    for (;gBattlerTarget < gBattlersCount; gBattlerTarget++)
     {
-        if (GetBattlerSide(gBattleMoveTarget) == side)
+        if (GetBattlerSide(gBattlerTarget) == side)
             continue;
-        if (!(gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]))
+        if (!(gAbsentBattlerFlags & gBitTable[gBattlerTarget]))
             break;
     }
 
-    if (gBattleMoveTarget >= gBattlersCount)
+    if (gBattlerTarget >= gBattlersCount)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -10451,18 +10451,18 @@ static void atkE8_settypebasedhalvers(void) // water and mud sport
 
     if (gBattleMoves[gCurrentMove].effect == EFFECT_MUD_SPORT)
     {
-        if (!(gStatuses3[gBattleMoveAttacker] & STATUS3_MUDSPORT))
+        if (!(gStatuses3[gBattlerAttacker] & STATUS3_MUDSPORT))
         {
-            gStatuses3[gBattleMoveAttacker] |= STATUS3_MUDSPORT;
+            gStatuses3[gBattlerAttacker] |= STATUS3_MUDSPORT;
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             worked = TRUE;
         }
     }
     else // water sport
     {
-        if (!(gStatuses3[gBattleMoveAttacker] & STATUS3_WATERSPORT))
+        if (!(gStatuses3[gBattlerAttacker] & STATUS3_WATERSPORT))
         {
-            gStatuses3[gBattleMoveAttacker] |= STATUS3_WATERSPORT;
+            gStatuses3[gBattlerAttacker] |= STATUS3_WATERSPORT;
             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
             worked = TRUE;
         }
@@ -10499,7 +10499,7 @@ static void atkEA_tryrecycleitem(void)
 {
     u16 *usedHeldItem;
 
-    gActiveBattler = gBattleMoveAttacker;
+    gActiveBattler = gBattlerAttacker;
     usedHeldItem = &gBattleStruct->usedHeldItems[gActiveBattler];
     if (*usedHeldItem != 0 && gBattleMons[gActiveBattler].item == 0)
     {
@@ -10520,11 +10520,11 @@ static void atkEA_tryrecycleitem(void)
 
 static void atkEB_settypetoterrain(void)
 {
-    if (gBattleMons[gBattleMoveAttacker].type1 != sTerrainToType[gBattleTerrain]
-        && gBattleMons[gBattleMoveAttacker].type2 != sTerrainToType[gBattleTerrain])
+    if (gBattleMons[gBattlerAttacker].type1 != sTerrainToType[gBattleTerrain]
+        && gBattleMons[gBattlerAttacker].type2 != sTerrainToType[gBattleTerrain])
     {
-        gBattleMons[gBattleMoveAttacker].type1 = sTerrainToType[gBattleTerrain];
-        gBattleMons[gBattleMoveAttacker].type2 = sTerrainToType[gBattleTerrain];
+        gBattleMons[gBattlerAttacker].type1 = sTerrainToType[gBattleTerrain];
+        gBattleMons[gBattlerAttacker].type2 = sTerrainToType[gBattleTerrain];
 
         PREPARE_TYPE_BUFFER(gBattleTextBuff1, sTerrainToType[gBattleTerrain])
 
@@ -10538,19 +10538,19 @@ static void atkEB_settypetoterrain(void)
 
 static void atkEC_pursuitrelated(void)
 {
-    gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattleMoveAttacker) ^ BIT_FLANK);
+    gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK);
 
     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
         && !(gAbsentBattlerFlags & gBitTable[gActiveBattler])
-        && gActionForBanks[gActiveBattler] == 0
-        && gChosenMovesByBanks[gActiveBattler] == MOVE_PURSUIT)
+        && gChosenActionByBattler[gActiveBattler] == 0
+        && gChosenMoveByBattler[gActiveBattler] == MOVE_PURSUIT)
     {
         gActionsByTurnOrder[gActiveBattler] = 11;
         gCurrentMove = MOVE_PURSUIT;
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
-        gBattleScripting.field_20 = gBattleMoveAttacker;
-        gBattleMoveAttacker = gActiveBattler;
+        gBattleScripting.field_20 = gBattlerAttacker;
+        gBattlerAttacker = gActiveBattler;
     }
     else
     {
@@ -10560,12 +10560,12 @@ static void atkEC_pursuitrelated(void)
 
 static void atkEF_snatchsetbanks(void)
 {
-    gEffectBank = gBattleMoveAttacker;
+    gEffectBank = gBattlerAttacker;
 
-    if (gBattleMoveAttacker == gBattleMoveTarget)
-        gBattleMoveAttacker = gBattleMoveTarget = gBattleScripting.battler;
+    if (gBattlerAttacker == gBattlerTarget)
+        gBattlerAttacker = gBattlerTarget = gBattleScripting.battler;
     else
-        gBattleMoveTarget = gBattleScripting.battler;
+        gBattlerTarget = gBattleScripting.battler;
 
     gBattleScripting.battler = gEffectBank;
     gBattlescriptCurrInstr++;
@@ -10573,7 +10573,7 @@ static void atkEF_snatchsetbanks(void)
 
 static void atkEE_removelightscreenreflect(void) // brick break
 {
-    u8 opposingSide = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
+    u8 opposingSide = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
 
     if (gSideTimers[opposingSide].reflectTimer || gSideTimers[opposingSide].lightscreenTimer)
     {
@@ -10600,8 +10600,8 @@ static void atkEF_handleballthrow(void)
     if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = gBattleMoveAttacker;
-    gBattleMoveTarget = gBattleMoveAttacker ^ BIT_SIDE;
+    gActiveBattler = gBattlerAttacker;
+    gBattlerTarget = gBattlerAttacker ^ BIT_SIDE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
@@ -10623,17 +10623,17 @@ static void atkEF_handleballthrow(void)
         if (gLastUsedItem == ITEM_SAFARI_BALL)
             catchRate = gBattleStruct->field_7C * 1275 / 100;
         else
-            catchRate = gBaseStats[gBattleMons[gBattleMoveTarget].species].catchRate;
+            catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate;
 
         if (gLastUsedItem > ITEM_SAFARI_BALL)
         {
             switch (gLastUsedItem)
             {
             case ITEM_NET_BALL:
-                if (gBattleMons[gBattleMoveTarget].type1 == TYPE_WATER
-                    || gBattleMons[gBattleMoveTarget].type2 == TYPE_WATER
-                    || gBattleMons[gBattleMoveTarget].type1 == TYPE_BUG
-                    || gBattleMons[gBattleMoveTarget].type2 == TYPE_BUG)
+                if (gBattleMons[gBattlerTarget].type1 == TYPE_WATER
+                    || gBattleMons[gBattlerTarget].type2 == TYPE_WATER
+                    || gBattleMons[gBattlerTarget].type1 == TYPE_BUG
+                    || gBattleMons[gBattlerTarget].type2 == TYPE_BUG)
                     ballMultiplier = 30;
                 else
                     ballMultiplier = 10;
@@ -10645,9 +10645,9 @@ static void atkEF_handleballthrow(void)
                     ballMultiplier = 10;
                 break;
             case ITEM_NEST_BALL:
-                if (gBattleMons[gBattleMoveTarget].level < 40)
+                if (gBattleMons[gBattlerTarget].level < 40)
                 {
-                    ballMultiplier = 40 - gBattleMons[gBattleMoveTarget].level;
+                    ballMultiplier = 40 - gBattleMons[gBattlerTarget].level;
                     if (ballMultiplier <= 9)
                         ballMultiplier = 10;
                 }
@@ -10657,7 +10657,7 @@ static void atkEF_handleballthrow(void)
                 }
                 break;
             case ITEM_REPEAT_BALL:
-                if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBattleMoveTarget].species), FLAG_GET_CAUGHT))
+                if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), FLAG_GET_CAUGHT))
                     ballMultiplier = 30;
                 else
                     ballMultiplier = 10;
@@ -10677,12 +10677,12 @@ static void atkEF_handleballthrow(void)
             ballMultiplier = sBallCatchBonuses[gLastUsedItem - 2];
 
         odds = (catchRate * ballMultiplier / 10)
-            * (gBattleMons[gBattleMoveTarget].maxHP * 3 - gBattleMons[gBattleMoveTarget].hp * 2)
-            / (3 * gBattleMons[gBattleMoveTarget].maxHP);
+            * (gBattleMons[gBattlerTarget].maxHP * 3 - gBattleMons[gBattlerTarget].hp * 2)
+            / (3 * gBattleMons[gBattlerTarget].maxHP);
 
-        if (gBattleMons[gBattleMoveTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
+        if (gBattleMons[gBattlerTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE))
             odds *= 2;
-        if (gBattleMons[gBattleMoveTarget].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
+        if (gBattleMons[gBattlerTarget].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
             odds = (odds * 15) / 10;
 
         if (gLastUsedItem != ITEM_SAFARI_BALL)
@@ -10703,7 +10703,7 @@ static void atkEF_handleballthrow(void)
             BtlController_EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS);
             MarkBattlerForControllerExec(gActiveBattler);
             gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
-            SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveTarget]], MON_DATA_POKEBALL, &gLastUsedItem);
+            SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_POKEBALL, &gLastUsedItem);
 
             if (CalculatePlayerPartyCount() == 6)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -10728,7 +10728,7 @@ static void atkEF_handleballthrow(void)
             if (shakes == BALL_3_SHAKES_SUCCESS) // mon caught, copy of the code above
             {
                 gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
-                SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveTarget]], MON_DATA_POKEBALL, &gLastUsedItem);
+                SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_POKEBALL, &gLastUsedItem);
 
                 if (CalculatePlayerPartyCount() == 6)
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -10746,18 +10746,18 @@ static void atkEF_handleballthrow(void)
 
 static void atkF0_givecaughtmon(void)
 {
-    if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY)
+    if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY)
     {
         if (!sub_813B21C())
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
             StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN)));
-            GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
+            GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
         }
         else
         {
             StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_STORAGE_UNKNOWN)));
-            GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
+            GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2);
             StringCopy(gStringVar3, GetBoxNamePtr(get_unknown_box_id()));
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
         }
@@ -10766,9 +10766,9 @@ static void atkF0_givecaughtmon(void)
             gBattleCommunication[MULTISTRING_CHOOSER]++;
     }
 
-    gBattleResults.caughtMonSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_SPECIES, NULL);
-    GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleResults.caughtMonNick);
-    gBattleResults.caughtMonBall = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_POKEBALL, NULL);
+    gBattleResults.caughtMonSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_SPECIES, NULL);
+    GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleResults.caughtMonNick);
+    gBattleResults.caughtMonBall = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_POKEBALL, NULL);
 
     gBattlescriptCurrInstr++;
 }
@@ -10804,8 +10804,8 @@ static void atkF2_displaydexinfo(void)
         {
             FreeAllWindowBuffers();
             gBattleCommunication[TASK_ID] = CreateDexDisplayMonDataTask(SpeciesToNationalPokedexNum(species),
-                                                                        gBattleMons[gBattleMoveTarget].otId,
-                                                                        gBattleMons[gBattleMoveTarget].personality);
+                                                                        gBattleMons[gBattlerTarget].otId,
+                                                                        gBattleMons[gBattlerTarget].personality);
             gBattleCommunication[0]++;
         }
         break;
@@ -10956,13 +10956,13 @@ static void atkF3_trygivecaughtmonnick(void)
     case 2:
         if (!gPaletteFade.active)
         {
-            GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
+            GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
             FreeAllWindowBuffers();
 
             DoNamingScreen(NAMING_SCREEN_CAUGHT_MON, gBattleStruct->caughtMonNick,
-                           GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_SPECIES),
-                           GetMonGender(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]]),
-                           GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_PERSONALITY, NULL),
+                           GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_SPECIES),
+                           GetMonGender(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]),
+                           GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_PERSONALITY, NULL),
                            BattleMainCB2);
 
             gBattleCommunication[MULTIUSE_STATE]++;
@@ -10971,7 +10971,7 @@ static void atkF3_trygivecaughtmonnick(void)
     case 3:
         if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active )
         {
-            SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
+            SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
         }
         break;
@@ -10986,24 +10986,24 @@ static void atkF3_trygivecaughtmonnick(void)
 
 static void atkF4_subattackerhpbydmg(void)
 {
-    gBattleMons[gBattleMoveAttacker].hp -= gBattleMoveDamage;
+    gBattleMons[gBattlerAttacker].hp -= gBattleMoveDamage;
     gBattlescriptCurrInstr++;
 }
 
 static void atkF5_removeattackerstatus1(void)
 {
-    gBattleMons[gBattleMoveAttacker].status1 = 0;
+    gBattleMons[gBattlerAttacker].status1 = 0;
     gBattlescriptCurrInstr++;
 }
 
 static void atkF6_finishaction(void)
 {
-    gCurrentActionFuncId = ACTION_FINISHED;
+    gCurrentActionFuncId = B_ACTION_FINISHED;
 }
 
 static void atkF7_finishturn(void)
 {
-    gCurrentActionFuncId = ACTION_FINISHED;
+    gCurrentActionFuncId = B_ACTION_FINISHED;
     gCurrentTurnActionNumber = gBattlersCount;
 }
 
diff --git a/src/battle_util.c b/src/battle_util.c
index 228727585..bbb4bf41d 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -28,13 +28,13 @@ extern const u8* gSelectionBattleScripts[MAX_BATTLERS_COUNT];
 extern const u8* gPalaceSelectionBattleScripts[MAX_BATTLERS_COUNT];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern u8 gActiveBattler;
-extern u8 gStringBank;
+extern u8 gStringBattler;
 extern u16 gCurrentMove;
 extern u16 gLastUsedItem;
 extern u8 gBattlersCount;
 extern u32 gStatuses3[MAX_BATTLERS_COUNT];
-extern u8 gBattleMoveAttacker;
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerAttacker;
+extern u8 gBattlerTarget;
 extern u8 gAbsentBattlerFlags;
 extern u16 gBattleWeather;
 extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
@@ -50,7 +50,7 @@ extern u32 gHitMarker;
 extern u8 gEffectBank;
 extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBank1;
-extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
+extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT];
 extern u8 gMoveResultFlags;
 extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
 extern u8 gTakenDmgBanks[MAX_BATTLERS_COUNT];
@@ -79,10 +79,10 @@ u8 GetBattleBank(u8 caseId)
     switch (caseId)
     {
     case BS_GET_TARGET:
-        ret = gBattleMoveTarget;
+        ret = gBattlerTarget;
         break;
     case BS_GET_ATTACKER:
-        ret = gBattleMoveAttacker;
+        ret = gBattlerAttacker;
         break;
     case BS_GET_EFFECT_BANK:
         ret = gEffectBank;
@@ -335,17 +335,17 @@ void sub_803FA70(u8 battler)
 
 void BattleScriptPush(const u8* bsPtr)
 {
-    BATTLESCRIPTS_STACK->ptr[BATTLESCRIPTS_STACK->size++] = bsPtr;
+    gBattleResources->battleScriptsStack->ptr[gBattleResources->battleScriptsStack->size++] = bsPtr;
 }
 
 void BattleScriptPushCursor(void)
 {
-    BATTLESCRIPTS_STACK->ptr[BATTLESCRIPTS_STACK->size++] = gBattlescriptCurrInstr;
+    gBattleResources->battleScriptsStack->ptr[gBattleResources->battleScriptsStack->size++] = gBattlescriptCurrInstr;
 }
 
 void BattleScriptPop(void)
 {
-    gBattlescriptCurrInstr = BATTLESCRIPTS_STACK->ptr[--BATTLESCRIPTS_STACK->size];
+    gBattlescriptCurrInstr = gBattleResources->battleScriptsStack->ptr[--gBattleResources->battleScriptsStack->size];
 }
 
 u8 TrySetCantSelectMoveBattleScript(void)
@@ -421,7 +421,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
     else
         holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
 
-    gStringBank = gActiveBattler;
+    gStringBattler = gActiveBattler;
 
     if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move)
     {
@@ -465,7 +465,7 @@ u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check)
     else
         holdEffect = ItemId_GetHoldEffect(gBattleMons[bank].item);
 
-    gStringBank = bank;
+    gStringBattler = bank;
 
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
@@ -536,10 +536,10 @@ u8 UpdateTurnCounters(void)
     u8 effect = 0;
     s32 i;
 
-    for (gBattleMoveAttacker = 0; gBattleMoveAttacker < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattleMoveAttacker]; gBattleMoveAttacker++)
+    for (gBattlerAttacker = 0; gBattlerAttacker < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattlerAttacker]; gBattlerAttacker++)
     {
     }
-    for (gBattleMoveTarget = 0; gBattleMoveTarget < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattleMoveTarget]; gBattleMoveTarget++)
+    for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount && gAbsentBattlerFlags & gBitTable[gBattlerTarget]; gBattlerTarget++)
     {
     }
 
@@ -575,7 +575,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattleMoveAttacker = gSideTimers[sideBank].reflectBank;
+                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].reflectBank;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_REFLECT)
                 {
                     if (--gSideTimers[sideBank].reflectTimer == 0)
@@ -600,7 +600,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattleMoveAttacker = gSideTimers[sideBank].lightscreenBank;
+                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].lightscreenBank;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_LIGHTSCREEN)
                 {
                     if (--gSideTimers[sideBank].lightscreenTimer == 0)
@@ -626,7 +626,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattleMoveAttacker = gSideTimers[sideBank].mistBank;
+                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].mistBank;
                 if (gSideTimers[sideBank].mistTimer != 0
                  && --gSideTimers[sideBank].mistTimer == 0)
                 {
@@ -650,7 +650,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattleMoveAttacker = gSideTimers[sideBank].safeguardBank;
+                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].safeguardBank;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_SAFEGUARD)
                 {
                     if (--gSideTimers[sideBank].safeguardTimer == 0)
@@ -678,7 +678,7 @@ u8 UpdateTurnCounters(void)
                  && --gWishFutureKnock.wishCounter[gActiveBattler] == 0
                  && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveTarget = gActiveBattler;
+                    gBattlerTarget = gActiveBattler;
                     BattleScriptExecute(BattleScript_WishComesTrue);
                     effect++;
                 }
@@ -796,7 +796,7 @@ u8 TurnBasedEffects(void)
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
     while (gBattleStruct->turnEffectsBank < gBattlersCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
     {
-        gActiveBattler = gBattleMoveAttacker = gBattleTurnOrder[gBattleStruct->turnEffectsBank];
+        gActiveBattler = gBattlerAttacker = gBattleTurnOrder[gBattleStruct->turnEffectsBank];
         if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
         {
             gBattleStruct->turnEffectsBank++;
@@ -839,12 +839,12 @@ u8 TurnBasedEffects(void)
                  && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK].hp != 0
                  && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattleMoveTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
+                    gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
                     gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    gBattleScripting.animArg1 = gBattleMoveTarget;
-                    gBattleScripting.animArg2 = gBattleMoveAttacker;
+                    gBattleScripting.animArg1 = gBattlerTarget;
+                    gBattleScripting.animArg2 = gBattlerAttacker;
                     BattleScriptExecute(BattleScript_LeechSeedTurnDrain);
                     effect++;
                 }
@@ -953,29 +953,29 @@ u8 TurnBasedEffects(void)
             case 10:  // uproar
                 if (gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR)
                 {
-                    for (gBattleMoveAttacker = 0; gBattleMoveAttacker < gBattlersCount; gBattleMoveAttacker++)
+                    for (gBattlerAttacker = 0; gBattlerAttacker < gBattlersCount; gBattlerAttacker++)
                     {
-                        if ((gBattleMons[gBattleMoveAttacker].status1 & STATUS1_SLEEP)
-                         && gBattleMons[gBattleMoveAttacker].ability != ABILITY_SOUNDPROOF)
+                        if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP)
+                         && gBattleMons[gBattlerAttacker].ability != ABILITY_SOUNDPROOF)
                         {
-                            gBattleMons[gBattleMoveAttacker].status1 &= ~(STATUS1_SLEEP);
-                            gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+                            gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_SLEEP);
+                            gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                             BattleScriptExecute(BattleScript_MonWokeUpInUproar);
-                            gActiveBattler = gBattleMoveAttacker;
+                            gActiveBattler = gBattlerAttacker;
                             BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
                             MarkBattlerForControllerExec(gActiveBattler);
                             break;
                         }
                     }
-                    if (gBattleMoveAttacker != gBattlersCount)
+                    if (gBattlerAttacker != gBattlersCount)
                     {
                         effect = 2;  // a pokemon was awaken
                         break;
                     }
                     else
                     {
-                        gBattleMoveAttacker = gActiveBattler;
+                        gBattlerAttacker = gActiveBattler;
                         gBattleMons[gActiveBattler].status2 -= 0x10;  // uproar timer goes down
                         if (WasUnableToUseMove(gActiveBattler))
                         {
@@ -1138,16 +1138,16 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
 
                 PREPARE_MOVE_BUFFER(gBattleTextBuff1, gWishFutureKnock.futureSightMove[gActiveBattler]);
 
-                gBattleMoveTarget = gActiveBattler;
-                gBattleMoveAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler];
+                gBattlerTarget = gActiveBattler;
+                gBattlerAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler];
                 gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler];
-                gSpecialStatuses[gBattleMoveTarget].moveturnLostHP = 0xFFFF;
+                gSpecialStatuses[gBattlerTarget].moveturnLostHP = 0xFFFF;
                 BattleScriptExecute(BattleScript_MonTookFutureAttack);
 
                 if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0
                  && gWishFutureKnock.futureSightCounter[gActiveBattler ^ BIT_FLANK] == 0)
                 {
-                    gSideStatuses[GET_BATTLER_SIDE(gBattleMoveTarget)] &= ~(SIDE_STATUS_FUTUREATTACK);
+                    gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)] &= ~(SIDE_STATUS_FUTUREATTACK);
                 }
                 return TRUE;
             }
@@ -1162,7 +1162,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
     case 1:
         while (gBattleStruct->wishPerishSongBank < gBattlersCount)
         {
-            gActiveBattler = gBattleMoveAttacker = gBattleTurnOrder[gBattleStruct->wishPerishSongBank];
+            gActiveBattler = gBattlerAttacker = gBattleTurnOrder[gBattleStruct->wishPerishSongBank];
             if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
             {
                 gBattleStruct->wishPerishSongBank++;
@@ -1240,7 +1240,7 @@ bool8 HandleFaintedMonActions(void)
         case 1:
             do
             {
-                gBank1 = gBattleMoveTarget = gBattleStruct->faintedActionsBank;
+                gBank1 = gBattlerTarget = gBattleStruct->faintedActionsBank;
                 if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
                  && !(gBattleStruct->field_DF & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBank]])
                  && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBank]))
@@ -1266,7 +1266,7 @@ bool8 HandleFaintedMonActions(void)
         case 4:
             do
             {
-                gBank1 = gBattleMoveTarget = gBattleStruct->faintedActionsBank;
+                gBank1 = gBattlerTarget = gBattleStruct->faintedActionsBank;
                 if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
                  && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBank]))
                 {
@@ -1300,7 +1300,7 @@ void TryClearRageStatuses(void)
     int i;
     for (i = 0; i < gBattlersCount; i++)
     {
-        if ((gBattleMons[i].status2 & STATUS2_RAGE) && gChosenMovesByBanks[i] != MOVE_RAGE)
+        if ((gBattleMons[i].status2 & STATUS2_RAGE) && gChosenMoveByBattler[i] != MOVE_RAGE)
             gBattleMons[i].status2 &= ~(STATUS2_RAGE);
     }
 }
@@ -1316,17 +1316,17 @@ u8 AtkCanceller_UnableToUseMove(void)
         switch (gBattleStruct->atkCancellerTracker)
         {
         case 0: // flags clear
-            gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_DESTINY_BOND);
-            gStatuses3[gBattleMoveAttacker] &= ~(STATUS3_GRUDGE);
+            gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_DESTINY_BOND);
+            gStatuses3[gBattlerAttacker] &= ~(STATUS3_GRUDGE);
             gBattleStruct->atkCancellerTracker++;
             break;
         case 1: // check being asleep
-            if (gBattleMons[gBattleMoveAttacker].status1 & STATUS1_SLEEP)
+            if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP)
             {
-                if (UproarWakeUpCheck(gBattleMoveAttacker))
+                if (UproarWakeUpCheck(gBattlerAttacker))
                 {
-                    gBattleMons[gBattleMoveAttacker].status1 &= ~(STATUS1_SLEEP);
-                    gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+                    gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_SLEEP);
+                    gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                     gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
@@ -1335,15 +1335,15 @@ u8 AtkCanceller_UnableToUseMove(void)
                 else
                 {
                     u8 toSub;
-                    if (gBattleMons[gBattleMoveAttacker].ability == ABILITY_EARLY_BIRD)
+                    if (gBattleMons[gBattlerAttacker].ability == ABILITY_EARLY_BIRD)
                         toSub = 2;
                     else
                         toSub = 1;
-                    if ((gBattleMons[gBattleMoveAttacker].status1 & STATUS1_SLEEP) < toSub)
-                        gBattleMons[gBattleMoveAttacker].status1 &= ~(STATUS1_SLEEP);
+                    if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP) < toSub)
+                        gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_SLEEP);
                     else
-                        gBattleMons[gBattleMoveAttacker].status1 -= toSub;
-                    if (gBattleMons[gBattleMoveAttacker].status1 & STATUS1_SLEEP)
+                        gBattleMons[gBattlerAttacker].status1 -= toSub;
+                    if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP)
                     {
                         if (gCurrentMove != MOVE_SNORE && gCurrentMove != MOVE_SLEEP_TALK)
                         {
@@ -1354,7 +1354,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                     }
                     else
                     {
-                        gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+                        gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE);
                         BattleScriptPushCursor();
                         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                         gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
@@ -1365,7 +1365,7 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 2: // check being frozen
-            if (gBattleMons[gBattleMoveAttacker].status1 & STATUS1_FREEZE)
+            if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE)
             {
                 if (Random() % 5)
                 {
@@ -1382,7 +1382,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                 }
                 else // unfreeze
                 {
-                    gBattleMons[gBattleMoveAttacker].status1 &= ~(STATUS1_FREEZE);
+                    gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -1392,9 +1392,9 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 3: // truant
-            if (gBattleMons[gBattleMoveAttacker].ability == ABILITY_TRUANT && gDisableStructs[gBattleMoveAttacker].truantCounter)
+            if (gBattleMons[gBattlerAttacker].ability == ABILITY_TRUANT && gDisableStructs[gBattlerAttacker].truantCounter)
             {
-                CancelMultiTurnMoves(gBattleMoveAttacker);
+                CancelMultiTurnMoves(gBattlerAttacker);
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                 gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround;
@@ -1404,11 +1404,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 4: // recharge
-            if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_RECHARGE)
+            if (gBattleMons[gBattlerAttacker].status2 & STATUS2_RECHARGE)
             {
-                gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_RECHARGE);
-                gDisableStructs[gBattleMoveAttacker].rechargeCounter = 0;
-                CancelMultiTurnMoves(gBattleMoveAttacker);
+                gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_RECHARGE);
+                gDisableStructs[gBattlerAttacker].rechargeCounter = 0;
+                CancelMultiTurnMoves(gBattlerAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedMustRecharge;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1416,11 +1416,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 5: // flinch
-            if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_FLINCHED)
+            if (gBattleMons[gBattlerAttacker].status2 & STATUS2_FLINCHED)
             {
-                gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_FLINCHED);
-                gProtectStructs[gBattleMoveAttacker].flinchImmobility = 1;
-                CancelMultiTurnMoves(gBattleMoveAttacker);
+                gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_FLINCHED);
+                gProtectStructs[gBattlerAttacker].flinchImmobility = 1;
+                CancelMultiTurnMoves(gBattlerAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedFlinched;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1428,11 +1428,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 6: // disabled move
-            if (gDisableStructs[gBattleMoveAttacker].disabledMove == gCurrentMove && gDisableStructs[gBattleMoveAttacker].disabledMove != 0)
+            if (gDisableStructs[gBattlerAttacker].disabledMove == gCurrentMove && gDisableStructs[gBattlerAttacker].disabledMove != 0)
             {
-                gProtectStructs[gBattleMoveAttacker].usedDisabledMove = 1;
-                gBattleScripting.battler = gBattleMoveAttacker;
-                CancelMultiTurnMoves(gBattleMoveAttacker);
+                gProtectStructs[gBattlerAttacker].usedDisabledMove = 1;
+                gBattleScripting.battler = gBattlerAttacker;
+                CancelMultiTurnMoves(gBattlerAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsDisabled;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1440,10 +1440,10 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 7: // taunt
-            if (gDisableStructs[gBattleMoveAttacker].tauntTimer1 && gBattleMoves[gCurrentMove].power == 0)
+            if (gDisableStructs[gBattlerAttacker].tauntTimer1 && gBattleMoves[gCurrentMove].power == 0)
             {
-                gProtectStructs[gBattleMoveAttacker].usedTauntedMove = 1;
-                CancelMultiTurnMoves(gBattleMoveAttacker);
+                gProtectStructs[gBattlerAttacker].usedTauntedMove = 1;
+                CancelMultiTurnMoves(gBattlerAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsTaunted;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1451,10 +1451,10 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 8: // imprisoned
-            if (GetImprisonedMovesCount(gBattleMoveAttacker, gCurrentMove))
+            if (GetImprisonedMovesCount(gBattlerAttacker, gCurrentMove))
             {
-                gProtectStructs[gBattleMoveAttacker].usedImprisionedMove = 1;
-                CancelMultiTurnMoves(gBattleMoveAttacker);
+                gProtectStructs[gBattlerAttacker].usedImprisionedMove = 1;
+                CancelMultiTurnMoves(gBattlerAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsImprisoned;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1462,10 +1462,10 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 9: // confusion
-            if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_CONFUSION)
+            if (gBattleMons[gBattlerAttacker].status2 & STATUS2_CONFUSION)
             {
-                gBattleMons[gBattleMoveAttacker].status2--;
-                if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_CONFUSION)
+                gBattleMons[gBattlerAttacker].status2--;
+                if (gBattleMons[gBattlerAttacker].status2 & STATUS2_CONFUSION)
                 {
                     if (Random() & 1)
                     {
@@ -1475,9 +1475,9 @@ u8 AtkCanceller_UnableToUseMove(void)
                     else // confusion dmg
                     {
                         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                        gBattleMoveTarget = gBattleMoveAttacker;
-                        gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleMoveAttacker], &gBattleMons[gBattleMoveAttacker], MOVE_POUND, 0, 40, 0, gBattleMoveAttacker, gBattleMoveAttacker);
-                        gProtectStructs[gBattleMoveAttacker].confusionSelfDmg = 1;
+                        gBattlerTarget = gBattlerAttacker;
+                        gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerAttacker], MOVE_POUND, 0, 40, 0, gBattlerAttacker, gBattlerAttacker);
+                        gProtectStructs[gBattlerAttacker].confusionSelfDmg = 1;
                         gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                     }
                     gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfused;
@@ -1492,11 +1492,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 10: // paralysis
-            if ((gBattleMons[gBattleMoveAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0)
+            if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_PARALYSIS) && (Random() % 4) == 0)
             {
-                gProtectStructs[gBattleMoveAttacker].prlzImmobility = 1;
+                gProtectStructs[gBattlerAttacker].prlzImmobility = 1;
                 // This is removed in Emerald for some reason
-                //CancelMultiTurnMoves(gBattleMoveAttacker);
+                //CancelMultiTurnMoves(gBattlerAttacker);
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsParalyzed;
                 gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
                 effect = 1;
@@ -1504,17 +1504,17 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 11: // infatuation
-            if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_INFATUATION)
+            if (gBattleMons[gBattlerAttacker].status2 & STATUS2_INFATUATION)
             {
-                gBattleScripting.battler = CountTrailingZeroBits((gBattleMons[gBattleMoveAttacker].status2 & STATUS2_INFATUATION) >> 0x10);
+                gBattleScripting.battler = CountTrailingZeroBits((gBattleMons[gBattlerAttacker].status2 & STATUS2_INFATUATION) >> 0x10);
                 if (Random() & 1)
                     BattleScriptPushCursor();
                 else
                 {
                     BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack);
                     gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
-                    gProtectStructs[gBattleMoveAttacker].loveImmobility = 1;
-                    CancelMultiTurnMoves(gBattleMoveAttacker);
+                    gProtectStructs[gBattlerAttacker].loveImmobility = 1;
+                    CancelMultiTurnMoves(gBattlerAttacker);
                 }
                 gBattlescriptCurrInstr = BattleScript_MoveUsedIsInLove;
                 effect = 1;
@@ -1522,22 +1522,22 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 12: // bide
-            if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_BIDE)
+            if (gBattleMons[gBattlerAttacker].status2 & STATUS2_BIDE)
             {
-                gBattleMons[gBattleMoveAttacker].status2 -= 0x100;
-                if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_BIDE)
+                gBattleMons[gBattlerAttacker].status2 -= 0x100;
+                if (gBattleMons[gBattlerAttacker].status2 & STATUS2_BIDE)
                     gBattlescriptCurrInstr = BattleScript_BideStoringEnergy;
                 else
                 {
                     // This is removed in Emerald for some reason
-                    //gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
-                    if (gTakenDmg[gBattleMoveAttacker])
+                    //gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
+                    if (gTakenDmg[gBattlerAttacker])
                     {
                         gCurrentMove = MOVE_BIDE;
-                        *bideDmg = gTakenDmg[gBattleMoveAttacker] * 2;
-                        gBattleMoveTarget = gTakenDmgBanks[gBattleMoveAttacker];
-                        if (gAbsentBattlerFlags & gBitTable[gBattleMoveTarget])
-                            gBattleMoveTarget = GetMoveTarget(MOVE_BIDE, 1);
+                        *bideDmg = gTakenDmg[gBattlerAttacker] * 2;
+                        gBattlerTarget = gTakenDmgBanks[gBattlerAttacker];
+                        if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
+                            gBattlerTarget = GetMoveTarget(MOVE_BIDE, 1);
                         gBattlescriptCurrInstr = BattleScript_BideAttack;
                     }
                     else
@@ -1548,11 +1548,11 @@ u8 AtkCanceller_UnableToUseMove(void)
             gBattleStruct->atkCancellerTracker++;
             break;
         case 13: // move thawing
-            if (gBattleMons[gBattleMoveAttacker].status1 & STATUS1_FREEZE)
+            if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE)
             {
                 if (gBattleMoves[gCurrentMove].effect == EFFECT_THAW_HIT)
                 {
-                    gBattleMons[gBattleMoveAttacker].status1 &= ~(STATUS1_FREEZE);
+                    gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -1569,7 +1569,7 @@ u8 AtkCanceller_UnableToUseMove(void)
 
     if (effect == 2)
     {
-        gActiveBattler = gBattleMoveAttacker;
+        gActiveBattler = gBattlerAttacker;
         BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
         MarkBattlerForControllerExec(gActiveBattler);
     }
@@ -1750,19 +1750,19 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
     u32 pidAtk;
     u32 pidDef;
 
-    if (gBattleMoveAttacker >= gBattlersCount)
-        gBattleMoveAttacker = battler;
-    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
-        pokeAtk = &gPlayerParty[gBattlerPartyIndexes[gBattleMoveAttacker]];
+    if (gBattlerAttacker >= gBattlersCount)
+        gBattlerAttacker = battler;
+    if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
+        pokeAtk = &gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]];
     else
-        pokeAtk = &gEnemyParty[gBattlerPartyIndexes[gBattleMoveAttacker]];
+        pokeAtk = &gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]];
 
-    if (gBattleMoveTarget >= gBattlersCount)
-        gBattleMoveTarget = battler;
-    if (GetBattlerSide(gBattleMoveTarget) == B_SIDE_PLAYER)
-        pokeDef = &gPlayerParty[gBattlerPartyIndexes[gBattleMoveTarget]];
+    if (gBattlerTarget >= gBattlersCount)
+        gBattlerTarget = battler;
+    if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER)
+        pokeDef = &gPlayerParty[gBattlerPartyIndexes[gBattlerTarget]];
     else
-        pokeDef = &gEnemyParty[gBattlerPartyIndexes[gBattleMoveTarget]];
+        pokeDef = &gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]];
 
     speciesAtk = GetMonData(pokeAtk, MON_DATA_SPECIES);
     pidAtk = GetMonData(pokeAtk, MON_DATA_PERSONALITY);
@@ -1793,8 +1793,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
         switch (caseID)
         {
         case ABILITYEFFECT_ON_SWITCHIN: // 0
-            if (gBattleMoveAttacker >= gBattlersCount)
-                gBattleMoveAttacker = battler;
+            if (gBattlerAttacker >= gBattlersCount)
+                gBattlerAttacker = battler;
             switch (gLastUsedAbility)
             {
             case ABILITYEFFECT_SWITCH_IN_WEATHER:
@@ -1911,7 +1911,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
         case ABILITYEFFECT_ENDTURN: // 1
             if (gBattleMons[battler].hp != 0)
             {
-                gBattleMoveAttacker = battler;
+                gBattlerAttacker = battler;
                 switch (gLastUsedAbility)
                 {
                 case ABILITY_RAIN_DISH:
@@ -1961,7 +1961,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                     }
                     break;
                 case ABILITY_TRUANT:
-                    gDisableStructs[gBattleMoveAttacker].truantCounter ^= 1;
+                    gDisableStructs[gBattlerAttacker].truantCounter ^= 1;
                     break;
                 }
             }
@@ -1976,7 +1976,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 }
                 if (sSoundMovesTable[i] != 0xFFFF)
                 {
-                    if (gBattleMons[gBattleMoveAttacker].status2 & STATUS2_MULTIPLETURNS)
+                    if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)
                         gHitMarker |= HITMARKER_NO_PPDEDUCT;
                     gBattlescriptCurrInstr = BattleScript_SoundproofProtected;
                     effect = 1;
@@ -1991,7 +1991,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 case ABILITY_VOLT_ABSORB:
                     if (moveType == TYPE_ELECTRIC && gBattleMoves[move].power != 0)
                     {
-                        if (gProtectStructs[gBattleMoveAttacker].notFirstStrike)
+                        if (gProtectStructs[gBattlerAttacker].notFirstStrike)
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain;
                         else
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss;
@@ -2002,7 +2002,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 case ABILITY_WATER_ABSORB:
                     if (moveType == TYPE_WATER && gBattleMoves[move].power != 0)
                     {
-                        if (gProtectStructs[gBattleMoveAttacker].notFirstStrike)
+                        if (gProtectStructs[gBattlerAttacker].notFirstStrike)
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain;
                         else
                             gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss;
@@ -2016,7 +2016,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                         if (!(gBattleResources->flags->flags[battler] & UNKNOWN_FLAG_FLASH_FIRE))
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
-                            if (gProtectStructs[gBattleMoveAttacker].notFirstStrike)
+                            if (gProtectStructs[gBattlerAttacker].notFirstStrike)
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost;
                             else
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
@@ -2027,7 +2027,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                         else
                         {
                             gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                            if (gProtectStructs[gBattleMoveAttacker].notFirstStrike)
+                            if (gProtectStructs[gBattlerAttacker].notFirstStrike)
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost;
                             else
                                 gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss;
@@ -2041,7 +2041,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 {
                     if (gBattleMons[battler].maxHP == gBattleMons[battler].hp)
                     {
-                        if ((gProtectStructs[gBattleMoveAttacker].notFirstStrike))
+                        if ((gProtectStructs[gBattlerAttacker].notFirstStrike))
                             gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless;
                         else
                             gBattlescriptCurrInstr = BattleScript_MonMadeMoveUseless_PPLoss;
@@ -2063,7 +2063,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && move != MOVE_STRUGGLE
                  && gBattleMoves[move].power != 0
-                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
                  && gBattleMons[battler].type1 != moveType
                  && gBattleMons[battler].type2 != moveType
                  && gBattleMons[battler].hp != 0)
@@ -2078,12 +2078,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_ROUGH_SKIN:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleMoveAttacker].hp != 0
-                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
+                 && gBattleMons[gBattlerAttacker].hp != 0
+                 && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT))
                 {
-                    gBattleMoveDamage = gBattleMons[gBattleMoveAttacker].maxHP / 16;
+                    gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
                     BattleScriptPushCursor();
@@ -2093,9 +2093,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_EFFECT_SPORE:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleMoveAttacker].hp != 0
-                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
+                 && gBattleMons[gBattlerAttacker].hp != 0
+                 && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 10) == 0)
                 {
@@ -2116,9 +2116,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_POISON_POINT:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleMoveAttacker].hp != 0
-                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
+                 && gBattleMons[gBattlerAttacker].hp != 0
+                 && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 3) == 0)
                 {
@@ -2131,9 +2131,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_STATIC:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleMoveAttacker].hp != 0
-                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
+                 && gBattleMons[gBattlerAttacker].hp != 0
+                 && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
+                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 3) == 0)
                 {
@@ -2146,10 +2146,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_FLAME_BODY:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleMoveAttacker].hp != 0
-                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
+                 && gBattleMons[gBattlerAttacker].hp != 0
+                 && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
-                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
                  && (Random() % 3) == 0)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_BURN;
@@ -2161,19 +2161,19 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 break;
             case ABILITY_CUTE_CHARM:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                 && gBattleMons[gBattleMoveAttacker].hp != 0
-                 && !gProtectStructs[gBattleMoveAttacker].confusionSelfDmg
+                 && gBattleMons[gBattlerAttacker].hp != 0
+                 && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
-                 && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
-                 && gBattleMons[gBattleMoveTarget].hp != 0
+                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
+                 && gBattleMons[gBattlerTarget].hp != 0
                  && (Random() % 3) == 0
-                 && gBattleMons[gBattleMoveAttacker].ability != ABILITY_OBLIVIOUS
+                 && gBattleMons[gBattlerAttacker].ability != ABILITY_OBLIVIOUS
                  && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != GetGenderFromSpeciesAndPersonality(speciesDef, pidDef)
-                 && !(gBattleMons[gBattleMoveAttacker].status2 & STATUS2_INFATUATION)
+                 && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_INFATUATION)
                  && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != MON_GENDERLESS
                  && GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != MON_GENDERLESS)
                 {
-                    gBattleMons[gBattleMoveAttacker].status2 |= STATUS2_INFATUATED_WITH(gBattleMoveTarget);
+                    gBattleMons[gBattlerAttacker].status2 |= STATUS2_INFATUATED_WITH(gBattlerTarget);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_CuteCharmActivates;
                     effect++;
@@ -2288,7 +2288,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                     gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
 
                 gBattleCommunication[MOVE_EFFECT_BYTE] = gBattleStruct->synchronizeMoveEffect + MOVE_EFFECT_AFFECTS_USER;
-                gBattleScripting.battler = gBattleMoveTarget;
+                gBattleScripting.battler = gBattlerTarget;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
                 gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
@@ -2304,7 +2304,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                     gBattleStruct->synchronizeMoveEffect = MOVE_EFFECT_POISON;
 
                 gBattleCommunication[MOVE_EFFECT_BYTE] = gBattleStruct->synchronizeMoveEffect;
-                gBattleScripting.battler = gBattleMoveAttacker;
+                gBattleScripting.battler = gBattlerAttacker;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_SynchronizeActivates;
                 gHitMarker |= HITMARKER_IGNORE_SAFEGUARD;
@@ -2512,7 +2512,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
 void BattleScriptExecute(const u8 *BS_ptr)
 {
     gBattlescriptCurrInstr = BS_ptr;
-    BATTLE_CALLBACKS_STACK->function[BATTLE_CALLBACKS_STACK->size++] = gBattleMainFunc;
+    gBattleResources->battleCallbackStack->function[gBattleResources->battleCallbackStack->size++] = gBattleMainFunc;
     gBattleMainFunc = RunBattleScriptCommands_PopCallbacksStack;
     gCurrentActionFuncId = 0;
 }
@@ -2521,7 +2521,7 @@ void BattleScriptPushCursorAndCallback(const u8 *BS_ptr)
 {
     BattleScriptPushCursor();
     gBattlescriptCurrInstr = BS_ptr;
-    BATTLE_CALLBACKS_STACK->function[BATTLE_CALLBACKS_STACK->size++] = gBattleMainFunc;
+    gBattleResources->battleCallbackStack->function[gBattleResources->battleCallbackStack->size++] = gBattleMainFunc;
     gBattleMainFunc = RunBattleScriptCommands;
 }
 
@@ -2556,11 +2556,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
         bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem);
     }
 
-    atkItem = gBattleMons[gBattleMoveAttacker].item;
+    atkItem = gBattleMons[gBattlerAttacker].item;
     if (atkItem == ITEM_ENIGMA_BERRY)
     {
-        atkHoldEffect = gEnigmaBerries[gBattleMoveAttacker].holdEffect;
-        atkQuality = gEnigmaBerries[gBattleMoveAttacker].holdEffectParam;
+        atkHoldEffect = gEnigmaBerries[gBattlerAttacker].holdEffect;
+        atkQuality = gEnigmaBerries[gBattlerAttacker].holdEffectParam;
     }
     else
     {
@@ -2569,11 +2569,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     }
 
     // def variables are unused
-    defItem = gBattleMons[gBattleMoveTarget].item;
+    defItem = gBattleMons[gBattlerTarget].item;
     if (defItem == ITEM_ENIGMA_BERRY)
     {
-        defHoldEffect = gEnigmaBerries[gBattleMoveTarget].holdEffect;
-        defQuality = gEnigmaBerries[gBattleMoveTarget].holdEffectParam;
+        defHoldEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
+        defQuality = gEnigmaBerries[gBattlerTarget].holdEffectParam;
     }
     else
     {
@@ -2602,8 +2602,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             if (effect)
             {
                 gBattleScripting.battler = bank;
-                gStringBank = bank;
-                gActiveBattler = gBattleMoveAttacker = bank;
+                gStringBattler = bank;
+                gActiveBattler = gBattlerAttacker = bank;
                 BattleScriptExecute(BattleScript_WhiteHerbEnd2);
             }
             break;
@@ -2673,8 +2673,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (effect)
                 {
                     gBattleScripting.battler = bank;
-                    gStringBank = bank;
-                    gActiveBattler = gBattleMoveAttacker = bank;
+                    gStringBattler = bank;
+                    gActiveBattler = gBattlerAttacker = bank;
                     BattleScriptExecute(BattleScript_WhiteHerbEnd2);
                 }
                 break;
@@ -3001,8 +3001,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             if (effect)
             {
                 gBattleScripting.battler = bank;
-                gStringBank = bank;
-                gActiveBattler = gBattleMoveAttacker = bank;
+                gStringBattler = bank;
+                gActiveBattler = gBattlerAttacker = bank;
                 switch (effect)
                 {
                 case ITEM_STATUS_CHANGE:
@@ -3149,7 +3149,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 if (effect)
                 {
                     gBattleScripting.battler = bank;
-                    gStringBank = bank;
+                    gStringBattler = bank;
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_WhiteHerbRet;
                     return effect; // unnecessary return
@@ -3159,7 +3159,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             if (effect)
             {
                 gBattleScripting.battler = bank;
-                gStringBank = bank;
+                gStringBattler = bank;
                 gActiveBattler = bank;
                 BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
                 MarkBattlerForControllerExec(gActiveBattler);
@@ -3174,10 +3174,10 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             {
             case HOLD_EFFECT_FLINCH:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                    && (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_physical || gSpecialStatuses[gBattleMoveTarget].moveturnLostHP_special)
+                    && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
                     && (Random() % 100) < atkQuality
                     && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED
-                    && gBattleMons[gBattleMoveTarget].hp)
+                    && gBattleMons[gBattlerTarget].hp)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_FLINCH;
                     BattleScriptPushCursor();
@@ -3187,19 +3187,19 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 break;
             case HOLD_EFFECT_SHELL_BELL:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                    && gSpecialStatuses[gBattleMoveTarget].moveturnLostHP != 0
-                    && gSpecialStatuses[gBattleMoveTarget].moveturnLostHP != 0xFFFF
-                    && gBattleMoveAttacker != gBattleMoveTarget
-                    && gBattleMons[gBattleMoveAttacker].hp != gBattleMons[gBattleMoveAttacker].maxHP
-                    && gBattleMons[gBattleMoveAttacker].hp != 0)
+                    && gSpecialStatuses[gBattlerTarget].moveturnLostHP != 0
+                    && gSpecialStatuses[gBattlerTarget].moveturnLostHP != 0xFFFF
+                    && gBattlerAttacker != gBattlerTarget
+                    && gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP
+                    && gBattleMons[gBattlerAttacker].hp != 0)
                 {
                     gLastUsedItem = atkItem;
-                    gStringBank = gBattleMoveAttacker;
-                    gBattleScripting.battler = gBattleMoveAttacker;
-                    gBattleMoveDamage = (gSpecialStatuses[gBattleMoveTarget].moveturnLostHP / atkQuality) * -1;
+                    gStringBattler = gBattlerAttacker;
+                    gBattleScripting.battler = gBattlerAttacker;
+                    gBattleMoveDamage = (gSpecialStatuses[gBattlerTarget].moveturnLostHP / atkQuality) * -1;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = -1;
-                    gSpecialStatuses[gBattleMoveTarget].moveturnLostHP = 0;
+                    gSpecialStatuses[gBattlerTarget].moveturnLostHP = 0;
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ItemHealHP_Ret;
                     effect++;
@@ -3240,18 +3240,18 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     switch (moveTarget)
     {
     case MOVE_TARGET_SELECTED:
-        side = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
+        side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
             targetBank = gSideTimers[side].followmeTarget;
         else
         {
-            side = GetBattlerSide(gBattleMoveAttacker);
+            side = GetBattlerSide(gBattlerAttacker);
             do
             {
                 targetBank = Random() % gBattlersCount;
-            } while (targetBank == gBattleMoveAttacker || side == GetBattlerSide(targetBank) || gAbsentBattlerFlags & gBitTable[targetBank]);
+            } while (targetBank == gBattlerAttacker || side == GetBattlerSide(targetBank) || gAbsentBattlerFlags & gBitTable[targetBank]);
             if (gBattleMoves[move].type == TYPE_ELECTRIC
-                && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattleMoveAttacker, ABILITY_LIGHTNING_ROD, 0, 0)
+                && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattlerAttacker, ABILITY_LIGHTNING_ROD, 0, 0)
                 && gBattleMons[targetBank].ability != ABILITY_LIGHTNING_ROD)
             {
                 targetBank ^= BIT_FLANK;
@@ -3264,17 +3264,17 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     case MOVE_TARGET_BOTH:
     case MOVE_TARGET_FOES_AND_ALLY:
     case MOVE_TARGET_OPPONENTS_FIELD:
-        targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattleMoveAttacker) & BIT_SIDE) ^ BIT_SIDE);
+        targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE);
         if (gAbsentBattlerFlags & gBitTable[targetBank])
             targetBank ^= BIT_FLANK;
         break;
     case MOVE_TARGET_RANDOM:
-        side = GetBattlerSide(gBattleMoveAttacker) ^ BIT_SIDE;
+        side = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
         if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
             targetBank = gSideTimers[side].followmeTarget;
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & MOVE_TARGET_RANDOM)
         {
-            if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_PLAYER)
+            if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
             {
                 if (Random() & 1)
                     targetBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
@@ -3292,15 +3292,15 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
                 targetBank ^= BIT_FLANK;
         }
         else
-            targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattleMoveAttacker) & BIT_SIDE) ^ BIT_SIDE);
+            targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE);
         break;
     case MOVE_TARGET_USER:
     case MOVE_TARGET_x10:
-        targetBank = gBattleMoveAttacker;
+        targetBank = gBattlerAttacker;
         break;
     }
 
-    *(gBattleStruct->moveTarget + gBattleMoveAttacker) = targetBank;
+    *(gBattleStruct->moveTarget + gBattlerAttacker) = targetBank;
 
     return targetBank;
 }
@@ -3323,18 +3323,18 @@ u8 IsMonDisobedient(void)
 
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
         return 0;
-    if (GetBattlerSide(gBattleMoveAttacker) == B_SIDE_OPPONENT)
+    if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT)
         return 0;
 
-    if (HasObedientBitSet(gBattleMoveAttacker)) // only if species is Mew or Deoxys
+    if (HasObedientBitSet(gBattlerAttacker)) // only if species is Mew or Deoxys
     {
-        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(gBattleMoveAttacker) == 2)
+        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(gBattlerAttacker) == 2)
             return 0;
         if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
             return 0;
         if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
             return 0;
-        if (!IsOtherTrainer(gBattleMons[gBattleMoveAttacker].otId, gBattleMons[gBattleMoveAttacker].otName))
+        if (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName))
             return 0;
         if (FlagGet(FLAG_BADGE08_GET))
             return 0;
@@ -3349,27 +3349,27 @@ u8 IsMonDisobedient(void)
             obedienceLevel = 70;
     }
 
-    if (gBattleMons[gBattleMoveAttacker].level <= obedienceLevel)
+    if (gBattleMons[gBattlerAttacker].level <= obedienceLevel)
         return 0;
     rnd = (Random() & 255);
-    calc = (gBattleMons[gBattleMoveAttacker].level + obedienceLevel) * rnd >> 8;
+    calc = (gBattleMons[gBattlerAttacker].level + obedienceLevel) * rnd >> 8;
     if (calc < obedienceLevel)
         return 0;
 
     // is not obedient
     if (gCurrentMove == MOVE_RAGE)
-        gBattleMons[gBattleMoveAttacker].status2 &= ~(STATUS2_RAGE);
-    if (gBattleMons[gBattleMoveAttacker].status1 & STATUS1_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK))
+        gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_RAGE);
+    if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK))
     {
         gBattlescriptCurrInstr = BattleScript_82DB695;
         return 1;
     }
 
     rnd = (Random() & 255);
-    calc = (gBattleMons[gBattleMoveAttacker].level + obedienceLevel) * rnd >> 8;
+    calc = (gBattleMons[gBattlerAttacker].level + obedienceLevel) * rnd >> 8;
     if (calc < obedienceLevel)
     {
-        calc = CheckMoveLimitations(gBattleMoveAttacker, gBitTable[gCurrMovePos], 0xFF);
+        calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], 0xFF);
         if (calc == 0xF) // all moves cannot be used
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3;
@@ -3383,19 +3383,19 @@ u8 IsMonDisobedient(void)
                 gCurrMovePos = gUnknown_020241E9 = Random() & 3;
             } while (gBitTable[gCurrMovePos] & calc);
 
-            gRandomMove = gBattleMons[gBattleMoveAttacker].moves[gCurrMovePos];
+            gRandomMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
             gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove;
-            gBattleMoveTarget = GetMoveTarget(gRandomMove, 0);
+            gBattlerTarget = GetMoveTarget(gRandomMove, 0);
             gHitMarker |= HITMARKER_x200000;
             return 2;
         }
     }
     else
     {
-        obedienceLevel = gBattleMons[gBattleMoveAttacker].level - obedienceLevel;
+        obedienceLevel = gBattleMons[gBattlerAttacker].level - obedienceLevel;
 
         calc = (Random() & 255);
-        if (calc < obedienceLevel && !(gBattleMons[gBattleMoveAttacker].status1 & STATUS1_ANY) && gBattleMons[gBattleMoveAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBattleMoveAttacker].ability != ABILITY_INSOMNIA)
+        if (calc < obedienceLevel && !(gBattleMons[gBattlerAttacker].status1 & STATUS1_ANY) && gBattleMons[gBattlerAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBattlerAttacker].ability != ABILITY_INSOMNIA)
         {
             // try putting asleep
             int i;
@@ -3413,8 +3413,8 @@ u8 IsMonDisobedient(void)
         calc -= obedienceLevel;
         if (calc < obedienceLevel)
         {
-            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattleMoveAttacker], &gBattleMons[gBattleMoveAttacker], MOVE_POUND, 0, 40, 0, gBattleMoveAttacker, gBattleMoveAttacker);
-            gBattleMoveTarget = gBattleMoveAttacker;
+            gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerAttacker], MOVE_POUND, 0, 40, 0, gBattlerAttacker, gBattlerAttacker);
+            gBattlerTarget = gBattlerAttacker;
             gBattlescriptCurrInstr = BattleScript_82DB6F0;
             gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
             return 2;
diff --git a/src/pokeball.c b/src/pokeball.c
index 87802d6ba..ada0258db 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -17,7 +17,7 @@
 
 extern bool8 gDoingBattleAnim;
 extern u8 gActiveBattler;
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerTarget;
 extern u16 gBattlerPartyIndexes[];
 extern u8 gBattlerSpriteIds[];
 extern u8 gHealthboxSpriteIds[];
@@ -378,7 +378,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     switch (throwCaseId)
     {
     case POKEBALL_PLAYER_SENDOUT:
-        gBattleMoveTarget = bank;
+        gBattlerTarget = bank;
         gSprites[ballSpriteId].pos1.x = 24;
         gSprites[ballSpriteId].pos1.y = 68;
         gSprites[ballSpriteId].callback = SpriteCB_PlayerMonSendOut_1;
@@ -386,17 +386,17 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     case POKEBALL_OPPONENT_SENDOUT:
         gSprites[ballSpriteId].pos1.x = GetBattlerSpriteCoord(bank, BANK_X_POS);
         gSprites[ballSpriteId].pos1.y = GetBattlerSpriteCoord(bank, BANK_Y_POS) + 24;
-        gBattleMoveTarget = bank;
+        gBattlerTarget = bank;
         gSprites[ballSpriteId].data[0] = 0;
         gSprites[ballSpriteId].callback = SpriteCB_OpponentMonSendOut;
         break;
     default:
-        gBattleMoveTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+        gBattlerTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         notSendOut = TRUE;
         break;
     }
 
-    gSprites[ballSpriteId].sBank = gBattleMoveTarget;
+    gSprites[ballSpriteId].sBank = gBattlerTarget;
     if (!notSendOut)
     {
         DestroyTask(taskId);
@@ -405,12 +405,12 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
 
     // this will perform an unused ball throw animation
     gSprites[ballSpriteId].data[0] = 0x22;
-    gSprites[ballSpriteId].data[2] = GetBattlerSpriteCoord(gBattleMoveTarget, BANK_X_POS);
-    gSprites[ballSpriteId].data[4] = GetBattlerSpriteCoord(gBattleMoveTarget, BANK_Y_POS) - 16;
+    gSprites[ballSpriteId].data[2] = GetBattlerSpriteCoord(gBattlerTarget, BANK_X_POS);
+    gSprites[ballSpriteId].data[4] = GetBattlerSpriteCoord(gBattlerTarget, BANK_Y_POS) - 16;
     gSprites[ballSpriteId].data[5] = -40;
     sub_80A68D4(&gSprites[ballSpriteId]);
     gSprites[ballSpriteId].oam.affineParam = taskId;
-    gTasks[taskId].tOpponentBank = gBattleMoveTarget;
+    gTasks[taskId].tOpponentBank = gBattlerTarget;
     gTasks[taskId].func = TaskDummy;
     PlaySE(SE_NAGERU);
 }
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 4e3364486..e484b21a4 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -16,8 +16,8 @@ struct Unknown_020249B4
 
 extern u8 gAbsentBattlerFlags;
 extern u8 gActiveBattler;
-extern u8 gBattleMoveAttacker;
-extern u8 gBattleMoveTarget;
+extern u8 gBattlerAttacker;
+extern u8 gBattlerTarget;
 extern u8 gLastUsedAbility;
 extern u16 gTrainerBattleOpponent_A;
 extern u32 gBattleTypeFlags;
@@ -55,14 +55,14 @@ u8 CountAliveMonsInBattle(u8 caseId)
     case BATTLE_ALIVE_ATK_SIDE:
         for (i = 0; i < 4; i++)
         {
-            if (GetBattlerSide(i) == GetBattlerSide(gBattleMoveAttacker) && !(gAbsentBattlerFlags & gBitTable[i]))
+            if (GetBattlerSide(i) == GetBattlerSide(gBattlerAttacker) && !(gAbsentBattlerFlags & gBitTable[i]))
                 retVal++;
         }
         break;
     case BATTLE_ALIVE_DEF_SIDE:
         for (i = 0; i < 4; i++)
         {
-            if (GetBattlerSide(i) == GetBattlerSide(gBattleMoveTarget) && !(gAbsentBattlerFlags & gBitTable[i]))
+            if (GetBattlerSide(i) == GetBattlerSide(gBattlerTarget) && !(gAbsentBattlerFlags & gBitTable[i]))
                 retVal++;
         }
         break;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index e11afa91e..6442679a6 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -27,9 +27,9 @@ extern struct BattlePokemon gBattleMons[4];
 extern struct BattleEnigmaBerry gEnigmaBerries[4];
 extern u8 gActiveBattler;
 extern u8 gBankInMenu;
-extern u8 gBattleMoveTarget;
-extern u8 gBattleMoveAttacker;
-extern u8 gStringBank;
+extern u8 gBattlerTarget;
+extern u8 gBattlerAttacker;
+extern u8 gStringBattler;
 extern u16 gTrainerBattleOpponent_A;
 extern u32 gBattleTypeFlags;
 extern u8 gBattleMonForms[4];
@@ -210,7 +210,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
 
 void sub_806CF24(s32 stat)
 {
-    gBattleMoveTarget = gBankInMenu;
+    gBattlerTarget = gBankInMenu;
     StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_08329EC8[stat]]);
     StringCopy(gBattleTextBuff2, gText_StatRose);
     BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2);
@@ -233,7 +233,7 @@ u8 *sub_806CF78(u16 itemId)
         itemEffect = gItemEffectTable[itemId - 13];
     }
 
-    gStringBank = gBankInMenu;
+    gStringBattler = gBankInMenu;
 
     for (i = 0; i < 3; i++)
     {
@@ -247,7 +247,7 @@ u8 *sub_806CF78(u16 itemId)
             }
             else
             {
-                gBattleMoveAttacker = gBankInMenu;
+                gBattlerAttacker = gBankInMenu;
                 BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnGettingPumped);
             }
         }
@@ -255,7 +255,7 @@ u8 *sub_806CF78(u16 itemId)
 
     if (itemEffect[3] & 0x80)
     {
-        gBattleMoveAttacker = gBankInMenu;
+        gBattlerAttacker = gBankInMenu;
         BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnShroudedInMist);
     }
 
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 34611b509..fc576462b 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -29,7 +29,7 @@ extern u8 gActiveBattler;
 extern u8 gBattlersCount;
 extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u16 gChosenMovesByBanks[MAX_BATTLERS_COUNT];
+extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_03001278;
 extern u8 gUnknown_03001279;
 
@@ -221,7 +221,7 @@ void RecordedBattle_ClearBattlerAction(u8 bank, u8 bytesToClear)
     }
 }
 
-u8 RecordedBattle_GetBankAction(u8 bank)
+u8 RecordedBattle_GetBattlerAction(u8 bank)
 {
     // trying to read past array or invalid action byte, battle is over
     if (sRecordedBytesNo[bank] >= BANK_RECORD_SIZE || sBattleRecords[bank][sRecordedBytesNo[bank]] == 0xFF)
@@ -1561,14 +1561,14 @@ void sub_818603C(u8 arg0)
                     u8 array3[8];
                     u8 var;
 
-                    RecordedBattle_GetBankAction(bank);
+                    RecordedBattle_GetBattlerAction(bank);
                     for (j = 0; j < 4; j++)
                     {
                         ppBonuses[j] = ((gBattleMons[bank].ppBonuses & ((3 << (j << 1)))) >> (j << 1));
                     }
                     for (j = 0; j < 4; j++)
                     {
-                        array1[j] = RecordedBattle_GetBankAction(bank);
+                        array1[j] = RecordedBattle_GetBattlerAction(bank);
                         movePp.moves[j] = gBattleMons[bank].moves[array1[j]];
                         movePp.pp[j] = gBattleMons[bank].pp[array1[j]];
                         array3[j] = ppBonuses[array1[j]];
@@ -1612,7 +1612,7 @@ void sub_818603C(u8 arg0)
                         SetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_PP_BONUSES, &var);
                     }
 
-                    gChosenMovesByBanks[bank] = gBattleMons[bank].moves[*(gBattleStruct->chosenMovePositions + bank)];
+                    gChosenMoveByBattler[bank] = gBattleMons[bank].moves[*(gBattleStruct->chosenMovePositions + bank)];
                 }
             }
         }
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index c1e37a9ac..925b65de5 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -46,8 +46,8 @@ extern u8 GetBattlerSpriteCoord(u8 bank, u8 caseId);
 
 // this file's functions
 static void CB2_ReshowBattleScreenAfterMenu(void);
-static bool8 LoadBankSpriteGfx(u8 bank);
-static void CreateBankSprite(u8 bank);
+static bool8 LoadBattlerSpriteGfx(u8 bank);
+static void CreateBattlerSprite(u8 bank);
 static void CreateHealthboxSprite(u8 bank);
 static void sub_80A95F4(void);
 
@@ -118,32 +118,32 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
         }
         break;
     case 7:
-        if (!LoadBankSpriteGfx(0))
+        if (!LoadBattlerSpriteGfx(0))
             gBattleScripting.reshowMainState--;
         break;
     case 8:
-        if (!LoadBankSpriteGfx(1))
+        if (!LoadBattlerSpriteGfx(1))
             gBattleScripting.reshowMainState--;
         break;
     case 9:
-        if (!LoadBankSpriteGfx(2))
+        if (!LoadBattlerSpriteGfx(2))
             gBattleScripting.reshowMainState--;
         break;
     case 10:
-        if (!LoadBankSpriteGfx(3))
+        if (!LoadBattlerSpriteGfx(3))
             gBattleScripting.reshowMainState--;
         break;
     case 11:
-        CreateBankSprite(0);
+        CreateBattlerSprite(0);
         break;
     case 12:
-        CreateBankSprite(1);
+        CreateBattlerSprite(1);
         break;
     case 13:
-        CreateBankSprite(2);
+        CreateBattlerSprite(2);
         break;
     case 14:
-        CreateBankSprite(3);
+        CreateBattlerSprite(3);
         break;
     case 15:
         CreateHealthboxSprite(0);
@@ -208,25 +208,25 @@ static void sub_80A95F4(void)
     regBgcnt2->charBaseBlock = 0;
 }
 
-static bool8 LoadBankSpriteGfx(u8 bank)
+static bool8 LoadBattlerSpriteGfx(u8 battler)
 {
-    if (bank < gBattlersCount)
+    if (battler < gBattlersCount)
     {
-        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
+        if (GetBattlerSide(battler) != B_SIDE_PLAYER)
         {
-            if (!gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
-                BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[bank]], bank);
+            if (!gBattleSpritesDataPtr->battlerData[battler].behindSubstitute)
+                BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battler]], battler);
             else
-                BattleLoadSubstituteOrMonSpriteGfx(bank, FALSE);
+                BattleLoadSubstituteOrMonSpriteGfx(battler, FALSE);
         }
-        else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
-            DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, bank);
-        else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
-            DecompressTrainerBackPic(BACK_PIC_WALLY, bank);
-        else if (!gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
-            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[bank]], bank);
+        else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == 0)
+            DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, battler);
+        else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == 0)
+            DecompressTrainerBackPic(BACK_PIC_WALLY, battler);
+        else if (!gBattleSpritesDataPtr->battlerData[battler].behindSubstitute)
+            BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[battler]], battler);
         else
-            BattleLoadSubstituteOrMonSpriteGfx(bank, FALSE);
+            BattleLoadSubstituteOrMonSpriteGfx(battler, FALSE);
 
         gBattleScripting.reshowHelperState = 0;
     }
@@ -243,111 +243,111 @@ struct MonCoords
 };
 extern const struct MonCoords gTrainerBackPicCoords[];
 
-static void CreateBankSprite(u8 bank)
+static void CreateBattlerSprite(u8 battler)
 {
-    if (bank < gBattlersCount)
+    if (battler < gBattlersCount)
     {
         u8 posY;
 
-        if (gBattleSpritesDataPtr->bankData[bank].behindSubstitute)
-            posY = GetSubstituteSpriteDefault_Y(bank);
+        if (gBattleSpritesDataPtr->battlerData[battler].behindSubstitute)
+            posY = GetSubstituteSpriteDefault_Y(battler);
         else
-            posY = GetBattlerSpriteDefault_Y(bank);
+            posY = GetBattlerSpriteDefault_Y(battler);
 
-        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
+        if (GetBattlerSide(battler) != B_SIDE_PLAYER)
         {
-            if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
+            if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_HP) == 0)
                 return;
 
-            sub_806A068(GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
-            gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBattlerSpriteCoord(bank, 2), posY, sub_80A82E4(bank));
-            gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
-            gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
-            gSprites[gBattlerSpriteIds[bank]].data[2] = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
+            sub_806A068(GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES), GetBattlerPosition(battler));
+            gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, GetBattlerSpriteCoord(battler, 2), posY, sub_80A82E4(battler));
+            gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler;
+            gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy;
+            gSprites[gBattlerSpriteIds[battler]].data[0] = battler;
+            gSprites[gBattlerSpriteIds[battler]].data[2] = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES);
 
-            StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
-            if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_CASTFORM)
-                gSprites[gBattlerSpriteIds[bank]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM];
+            StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], gBattleMonForms[battler]);
+            if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_CASTFORM)
+                gSprites[gBattlerSpriteIds[battler]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM];
         }
-        else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
+        else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == 0)
         {
             sub_806A12C(gSaveBlock2Ptr->playerGender, GetBattlerPosition(B_POSITION_PLAYER_LEFT));
-            gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, 0x50,
+            gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, 0x50,
                                                 (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].coords) * 4 + 80,
                                                  sub_80A82E4(0));
-            gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
-            gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+            gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler;
+            gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy;
+            gSprites[gBattlerSpriteIds[battler]].data[0] = battler;
         }
-        else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
+        else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == 0)
         {
             sub_806A12C(BACK_PIC_WALLY, GetBattlerPosition(0));
-            gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, 0x50,
+            gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, 0x50,
                                                 (8 - gTrainerBackPicCoords[BACK_PIC_WALLY].coords) * 4 + 80,
                                                  sub_80A82E4(0));
-            gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
-            gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
+            gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler;
+            gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy;
+            gSprites[gBattlerSpriteIds[battler]].data[0] = battler;
         }
         else
         {
-            if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
+            if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_HP) == 0)
                 return;
 
-            sub_806A068(GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
-            gBattlerSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, GetBattlerSpriteCoord(bank, 2), posY, sub_80A82E4(bank));
-            gSprites[gBattlerSpriteIds[bank]].oam.paletteNum = bank;
-            gSprites[gBattlerSpriteIds[bank]].callback = SpriteCallbackDummy;
-            gSprites[gBattlerSpriteIds[bank]].data[0] = bank;
-            gSprites[gBattlerSpriteIds[bank]].data[2] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
+            sub_806A068(GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES), GetBattlerPosition(battler));
+            gBattlerSpriteIds[battler] = CreateSprite(&gUnknown_0202499C, GetBattlerSpriteCoord(battler, 2), posY, sub_80A82E4(battler));
+            gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler;
+            gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy;
+            gSprites[gBattlerSpriteIds[battler]].data[0] = battler;
+            gSprites[gBattlerSpriteIds[battler]].data[2] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES);
 
-            StartSpriteAnim(&gSprites[gBattlerSpriteIds[bank]], gBattleMonForms[bank]);
-            if (gBattleSpritesDataPtr->bankData[bank].transformSpecies == SPECIES_CASTFORM)
-                gSprites[gBattlerSpriteIds[bank]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM];
+            StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], gBattleMonForms[battler]);
+            if (gBattleSpritesDataPtr->battlerData[battler].transformSpecies == SPECIES_CASTFORM)
+                gSprites[gBattlerSpriteIds[battler]].anims = gMonAnimationsSpriteAnimsPtrTable[SPECIES_CASTFORM];
         }
 
-        gSprites[gBattlerSpriteIds[bank]].invisible = gBattleSpritesDataPtr->bankData[bank].invisible;
+        gSprites[gBattlerSpriteIds[battler]].invisible = gBattleSpritesDataPtr->battlerData[battler].invisible;
     }
 }
 
-static void CreateHealthboxSprite(u8 bank)
+static void CreateHealthboxSprite(u8 battler)
 {
-    if (bank < gBattlersCount)
+    if (battler < gBattlersCount)
     {
         u8 healthboxSpriteId;
 
-        if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
+        if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && battler == 0)
             healthboxSpriteId = CreateSafariPlayerHealthboxSprites();
-        else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
+        else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == 0)
             return;
         else
-            healthboxSpriteId = CreateHealthboxSprites(bank);
+            healthboxSpriteId = CreateBattlerHealthboxSprites(battler);
 
-        gHealthboxSpriteIds[bank] = healthboxSpriteId;
-        InitBattlerHealthboxCoords(bank);
+        gHealthboxSpriteIds[battler] = healthboxSpriteId;
+        InitBattlerHealthboxCoords(battler);
         SetHealthboxSpriteVisible(healthboxSpriteId);
 
-        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
-            UpdateHealthboxAttribute(gHealthboxSpriteIds[bank], &gEnemyParty[gBattlerPartyIndexes[bank]], HEALTHBOX_ALL);
+        if (GetBattlerSide(battler) != B_SIDE_PLAYER)
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], &gEnemyParty[gBattlerPartyIndexes[battler]], HEALTHBOX_ALL);
         else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-            UpdateHealthboxAttribute(gHealthboxSpriteIds[bank], &gPlayerParty[gBattlerPartyIndexes[bank]], HEALTHBOX_SAFARI_ALL_TEXT);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], &gPlayerParty[gBattlerPartyIndexes[battler]], HEALTHBOX_SAFARI_ALL_TEXT);
         else
-            UpdateHealthboxAttribute(gHealthboxSpriteIds[bank], &gPlayerParty[gBattlerPartyIndexes[bank]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], &gPlayerParty[gBattlerPartyIndexes[battler]], HEALTHBOX_ALL);
 
-        if (GetBattlerPosition(bank) == B_POSITION_OPPONENT_RIGHT || GetBattlerPosition(bank) == B_POSITION_PLAYER_RIGHT)
-            DummyBattleInterfaceFunc(gHealthboxSpriteIds[bank], TRUE);
+        if (GetBattlerPosition(battler) == B_POSITION_OPPONENT_RIGHT || GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT)
+            DummyBattleInterfaceFunc(gHealthboxSpriteIds[battler], TRUE);
         else
-            DummyBattleInterfaceFunc(gHealthboxSpriteIds[bank], FALSE);
+            DummyBattleInterfaceFunc(gHealthboxSpriteIds[battler], FALSE);
 
-        if (GetBattlerSide(bank) != B_SIDE_PLAYER)
+        if (GetBattlerSide(battler) != B_SIDE_PLAYER)
         {
-            if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
+            if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_HP) == 0)
                 SetHealthboxSpriteInvisible(healthboxSpriteId);
         }
         else if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
         {
-            if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
+            if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_HP) == 0)
                 SetHealthboxSpriteInvisible(healthboxSpriteId);
         }
     }
-- 
cgit v1.2.3


From 18abda9dca7e38a1dee63ff0d167e1e2601504bf Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 6 Feb 2018 20:37:54 -0600
Subject: Finish menu.s and eliminate TextColor

---
 src/battle_interface.c       | 10 +++---
 src/berry_blender.c          | 24 ++++++-------
 src/diploma.c                | 11 ++----
 src/egg_hatch.c              | 10 +++---
 src/menu.c                   | 86 ++++++++++++++++++++++++++++++++++----------
 src/naming_screen.c          | 31 ++++++++--------
 src/pokeblock.c              |  4 +--
 src/pokemon_storage_system.c |  2 +-
 src/pokemon_summary_screen.c |  6 ++--
 src/save_failed_screen.c     | 10 +++---
 src/window.c                 |  2 +-
 11 files changed, 120 insertions(+), 76 deletions(-)

(limited to 'src')

diff --git a/src/battle_interface.c b/src/battle_interface.c
index 2338682e2..0917f0cfc 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -2565,17 +2565,17 @@ u8 GetHPBarLevel(s16 hp, s16 maxhp)
 static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y, u32 arg3, u32 *windowId)
 {
     u16 winId;
-    struct TextColor color;
+    u8 color[3];
     struct WindowTemplate winTemplate = sHealthboxWindowTemplate;
 
     winId = AddWindow(&winTemplate);
     FillWindowPixelBuffer(winId, (arg3 << 4) | (arg3));
 
-    color.fgColor = arg3;
-    color.bgColor = 1;
-    color.shadowColor = 3;
+    color[0] = arg3;
+    color[1] = 1;
+    color[2] = 3;
 
-    AddTextPrinterParameterized2(winId, 0, x, y, 0, 0, &color, -1, str);
+    AddTextPrinterParameterized2(winId, 0, x, y, 0, 0, color, -1, str);
 
     *windowId = winId;
     return (u8*)(GetWindowAttribute(winId, WINDOW_TILE_DATA));
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 3494492de..a9360ca5f 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -3574,35 +3574,35 @@ static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlen
 
 static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s32 speed, s32 caseId)
 {
-    struct TextColor txtColor;
+    u8 txtColor[3];
     u32 letterSpacing = 0;
 
     switch (caseId)
     {
     case 0:
     case 3:
-        txtColor.fgColor = 1;
-        txtColor.bgColor = 2;
-        txtColor.shadowColor = 3;
+        txtColor[0] = 1;
+        txtColor[1] = 2;
+        txtColor[2] = 3;
         break;
     case 1:
-        txtColor.fgColor = 0;
-        txtColor.bgColor = 2;
-        txtColor.shadowColor = 3;
+        txtColor[0] = 0;
+        txtColor[1] = 2;
+        txtColor[2] = 3;
         break;
     case 2:
-        txtColor.fgColor = 0;
-        txtColor.bgColor = 4;
-        txtColor.shadowColor = 5;
+        txtColor[0] = 0;
+        txtColor[1] = 4;
+        txtColor[2] = 5;
         break;
     }
 
     if (caseId != 3)
     {
-        FillWindowPixelBuffer(windowId, txtColor.fgColor | (txtColor.fgColor << 4));
+        FillWindowPixelBuffer(windowId, txtColor[0] | (txtColor[0] << 4));
     }
 
-    AddTextPrinterParameterized2(windowId, 1, x, y, letterSpacing, 1, &txtColor, speed, string);
+    AddTextPrinterParameterized2(windowId, 1, x, y, letterSpacing, 1, txtColor, speed, string);
 }
 
 static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed)
diff --git a/src/diploma.c b/src/diploma.c
index 24e5e9727..987596227 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -17,7 +17,7 @@ extern int decompress_and_copy_tile_data_to_vram(u8 bg_id, void *src, int size,
 extern bool8 free_temp_tile_data_buffers_if_possible(void);
 extern void sub_80861E8(void); // rom4
 extern bool16 sub_80C0944(void);
-extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str);
+extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 *color, s8 speed, u8 *str);
 
 extern u16 gUnknown_0860F074[];
 
@@ -208,12 +208,7 @@ static void InitDiplomaWindow(void)
 
 static void PrintDiplomaText(u8 *text, u8 var1, u8 var2)
 {
-    struct TextColor color =
-    {
-        .fgColor = 0,
-        .bgColor = 2,
-        .shadowColor = 3,
-    };
+    u8 color[3] = {0, 2, 3};
 
-    AddTextPrinterParameterized2(0, 1, var1, var2, 0, 0, &color, -1, text);
+    AddTextPrinterParameterized2(0, 1, var1, var2, 0, 0, color, -1, text);
 }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 435886638..c78cb2c08 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -41,7 +41,7 @@ struct EggHatchData
     u8 unused_9;
     u8 unused_A;
     u16 species;
-    struct TextColor textColor;
+    u8 textColor[3];
 };
 
 extern struct SpriteTemplate gUnknown_0202499C;
@@ -863,10 +863,10 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8
 static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed)
 {
     FillWindowPixelBuffer(windowId, 0xFF);
-    sEggHatchData->textColor.fgColor = 0;
-    sEggHatchData->textColor.bgColor = 5;
-    sEggHatchData->textColor.shadowColor = 6;
-    AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, &sEggHatchData->textColor, speed, string);
+    sEggHatchData->textColor[0] = 0;
+    sEggHatchData->textColor[1] = 5;
+    sEggHatchData->textColor[2] = 6;
+    AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, sEggHatchData->textColor, speed, string);
 }
 
 u8 GetEggStepsToSubtract(void)
diff --git a/src/menu.c b/src/menu.c
index bcbc21a3b..4916c00ea 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -13,6 +13,10 @@
 #include "dma3.h"
 #include "string_util.h"
 #include "pokemon_icon.h"
+#include "constants/flags.h"
+#include "event_data.h"
+#include "pokedex.h"
+#include "region_map.h"
 
 struct SomeUnkStruct
 {
@@ -47,7 +51,7 @@ extern EWRAM_DATA u16 gUnknown_0203CDA8;
 extern EWRAM_DATA void *gUnknown_0203CDAC[0x20];
 
 const u16 gUnknown_0860F0B0[] = INCBIN_U16("graphics/interface/860F0B0.gbapal");
-const struct TextColor gUnknown_0860F0D0[] = { 15, 1, 2 };
+const u8 gUnknown_0860F0D0[] = { 15, 1, 2 };
 const struct SomeUnkStruct gUnknown_0860F0D4[] = 
 {
     { 12, 12, 0x00 },
@@ -386,22 +390,22 @@ void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram)
 
 void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram)
 {
-    struct TextColor color;
+    u8 color[3];
     u16 width = 0;
     
     if (gUnknown_0203CDA0 != 0xFF)
     {
         if (a3 != 0)
         {
-            color.fgColor = 0;
-            color.bgColor = 1;
-            color.shadowColor = 2;
+            color[0] = 0;
+            color[1] = 1;
+            color[2] = 2;
         }
         else
         {
-            color.fgColor = 15;
-            color.bgColor = 1;
-            color.shadowColor = 2;
+            color[0] = 15;
+            color[1] = 1;
+            color[2] = 2;
         }
         PutWindowTilemap(gUnknown_0203CDA0);
         FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
@@ -412,11 +416,11 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo
                       0,
                       0xEC - (GetWindowAttribute(gUnknown_0203CDA0, WINDOW_TILEMAP_LEFT) * 8) - a4 - width,
                       1,
-                      &color,
+                      color,
                       0,
                       string2);
         }
-        AddTextPrinterParameterized2(gUnknown_0203CDA0, 1, 4, 1, 0, 0, &color, 0, string);
+        AddTextPrinterParameterized2(gUnknown_0203CDA0, 1, 4, 1, 0, 0, color, 0, string);
         if (copyToVram)
             CopyWindowToVram(gUnknown_0203CDA0, 3);
     }
@@ -1498,7 +1502,7 @@ void sub_8199DF0(u32 bg, u8 a1, int a2, int a3)
     RequestDma3Fill(a1 << 24 | a1 << 16 | a1 << 8 | a1, addr + VRAM, a3 * temp, 1);
 }
 
-void box_print(u8 windowId, u8 fontId, u8 left, u8 top, const struct TextColor *color, s8 speed, const u8 *str)
+void box_print(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str)
 {
     struct TextSubPrinter printer;
     
@@ -1512,14 +1516,14 @@ void box_print(u8 windowId, u8 fontId, u8 left, u8 top, const struct TextColor *
     printer.letterSpacing = GetFontAttribute(fontId, 2);
     printer.lineSpacing = GetFontAttribute(fontId, 3);
     printer.fontColor_l = 0;
-    printer.fgColor = color->bgColor;
-    printer.bgColor = color->fgColor;
-    printer.shadowColor = color->shadowColor;
+    printer.fgColor = color[1];
+    printer.bgColor = color[0];
+    printer.shadowColor = color[2];
     
     AddTextPrinter(&printer, speed, NULL);
 }
 
-void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str)
+void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str)
 {
     struct TextSubPrinter printer;
     
@@ -1533,9 +1537,9 @@ void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 left, u8 top, u8 le
     printer.letterSpacing = letterSpacing;
     printer.lineSpacing = lineSpacing;
     printer.fontColor_l = 0;
-    printer.fgColor = color->bgColor;
-    printer.bgColor = color->fgColor;
-    printer.shadowColor = color->shadowColor;
+    printer.fgColor = color[1];
+    printer.bgColor = color[0];
+    printer.shadowColor = color[2];
     
     AddTextPrinter(&printer, speed, NULL);
 }
@@ -1874,3 +1878,49 @@ void blit_move_info_icon(u8 windowId, u8 iconId, u16 x, u16 y)
 {
     BlitBitmapRectToWindow(windowId, gFireRedMenuElements_Gfx + gUnknown_0860F0D4[iconId].unk3 * 32, 0, 0, 128, 128, x, y, gUnknown_0860F0D4[iconId].unk1, gUnknown_0860F0D4[iconId].unk2);
 }
+
+void sub_819A344(u8 a0, u8 *a1, u8 a2)
+{
+    s32 curFlag;
+    s32 flagCount;
+    u8 *endOfString;
+    u8 *string = a1;
+    
+    *(string++) = EXT_CTRL_CODE_BEGIN;
+    *(string++) = EXT_CTRL_CODE_COLOR;
+    *(string++) = a2;
+    *(string++) = EXT_CTRL_CODE_BEGIN;
+    *(string++) = EXT_CTRL_CODE_SHADOW;
+    *(string++) = a2 + 1;
+    
+    switch (a0)
+    {
+        case 0:
+            StringCopy(string, gSaveBlock2Ptr->playerName);
+            break;
+        case 1:
+            if (IsNationalPokedexEnabled())
+                string = ConvertIntToDecimalStringN(string, pokedex_count(1), 0, 3);
+            else
+                string = ConvertIntToDecimalStringN(string, sub_80C0844(1), 0, 3);
+            *string = EOS;
+            break;
+        case 2:
+            string = ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->playTimeHours, 0, 3);
+            *(string++) = CHAR_COLON;
+            ConvertIntToDecimalStringN(string, gSaveBlock2Ptr->playTimeMinutes, 2, 2);
+            break;
+        case 3:
+            sub_81245DC(string, gMapHeader.regionMapSectionId);
+            break;
+        case 4:
+            for (curFlag = FLAG_BADGE01_GET, flagCount = 0, endOfString = string + 1; curFlag <= FLAG_BADGE08_GET; curFlag++)
+            {
+                if (FlagGet(curFlag))
+                    flagCount++;
+            }
+            *string = flagCount + CHAR_0;
+            *endOfString = EOS;
+            break;
+    }
+}
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 9a5cec1e0..917782e88 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1496,7 +1496,7 @@ static void TaskDummy3(void)
     
 }
 
-static const struct TextColor sGenderColors[2] = 
+static const u8 sGenderColors[2][3] = 
 {
     {0, 9, 8},
     {0, 5, 4}
@@ -1516,7 +1516,7 @@ static void sub_80E49BC(void)
             StringCopy(genderSymbol, gText_FemaleSymbol);
             isFemale = TRUE;
         }
-        box_print(gNamingScreenData->windows[2], 1, 0x68, 1, &sGenderColors[isFemale], -1, genderSymbol);
+        box_print(gNamingScreenData->windows[2], 1, 0x68, 1, sGenderColors[isFemale], -1, genderSymbol);
     }
 }
 
@@ -1661,19 +1661,18 @@ static void sub_80E4D10(void)
     PutWindowTilemap(gNamingScreenData->windows[2]);
 }
 
-static const struct AlignedTextColor sUnkColor1 =
+struct TextColorThing   // needed because of alignment... it's so stupid
 {
-    13, 1, 2
+    u8 colors[3][4];
 };
 
-static const struct AlignedTextColor sUnkColor2 =
+static const struct TextColorThing sUnkColorStruct =
 {
-    14, 1, 2
-};
-
-static const struct AlignedTextColor sUnkColor3 =
-{
-    15, 1, 2
+    {
+        {13, 1, 2},
+        {14, 1, 2},
+        {15, 1, 2}
+    }
 };
 
 static const u8 sFillValues[3] = 
@@ -1681,11 +1680,11 @@ static const u8 sFillValues[3] =
     0xEE, 0xDD, 0xFF
 };
 
-static const struct AlignedTextColor *const sUnkColors[3] = 
+static const u8 *const sUnkColors[3] = 
 {
-    &sUnkColor2,
-    &sUnkColor1,
-    &sUnkColor3
+    sUnkColorStruct.colors[1],
+    sUnkColorStruct.colors[0],
+    sUnkColorStruct.colors[2]
 };
 
 static void sub_80E4DE4(u8 window, u8 a1)
@@ -1738,7 +1737,7 @@ static void sub_80E4E5C(void)
 
 static void sub_80E4EF0(void)
 {
-    const struct TextColor color[] = { 15, 1, 2 };
+    const u8 color[3] = { 15, 1, 2 };
     
     FillWindowPixelBuffer(gNamingScreenData->windows[4], 0xFF);
     box_print(gNamingScreenData->windows[4], 0, 2, 1, color, 0, gText_MoveOkBack);
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 1a4ce3155..c20c8c643 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -284,7 +284,7 @@ static const struct SpriteTemplate sSpriteTemplate_PokeblockCase =
     SpriteCallbackDummy
 };
 
-static const struct TextColor sTextColorInPokeblockMenu = {0, 2, 3};
+static const u8 sTextColorInPokeblockMenu[3] = {0, 2, 3};
 
 static const struct Pokeblock sFavoritePokeblocksTable[] =
 {
@@ -583,7 +583,7 @@ static void HandleInitWindows(void)
 
 static void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x)
 {
-    AddTextPrinterParameterized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string);
+    AddTextPrinterParameterized2(windowId, 1, x, 1, 0, 0, sTextColorInPokeblockMenu, 0, string);
 }
 
 static void PutPokeblockInfoText(void)
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index bb196dd27..7f8c24ab7 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -71,7 +71,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_8571730[] =
     sSpriteAffineAnim_8571720
 };
 
-const struct TextColor gUnknown_08571734[] = {4, 0xF, 0xE};
+const u8 gUnknown_08571734[] = {4, 0xF, 0xE};
 const u8 gUnknown_08571737[] = _("/30");
 
 // code
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 4affd830d..e11ba881e 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -54,7 +54,7 @@ extern u16 gSummaryScreenWindow_Tilemap[];
 extern struct ContestMove gContestMoves[];
 extern struct ContestEffect gContestEffects[];
 extern struct WindowTemplate gUnknown_0861CC24;
-extern struct TextColor gUnknown_0861CD2C[];
+extern u8 gUnknown_0861CD2C[][3];
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern u8 gText_MaleSymbol[];
 extern u8 gText_FemaleSymbol[];
@@ -162,7 +162,7 @@ extern struct BattleMove gBattleMoves[];
 
 extern u32 ChangeBgX(u8 bg, u32 value, u8 op);
 extern void sub_8199C30(u8 a, u8 b, u8 c, u8 d, u8 e, u8 f);
-extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor* colors, s8 speed, u8 *str);
+extern void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const u8* colors, s8 speed, u8 *str);
 extern s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth);
 extern s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth);
 extern bool8 sub_81A6BF4();
@@ -2557,7 +2557,7 @@ void sub_81C2554()
 
 void sub_81C25A4(u8 a, u8 *b, u8 c, u8 d, u8 e, u8 f)
 {
-    AddTextPrinterParameterized2(a, 1, c, d, 0, e, &gUnknown_0861CD2C[f], 0, b);
+    AddTextPrinterParameterized2(a, 1, c, d, 0, e, gUnknown_0861CD2C[f], 0, b);
 }
 
 void sub_81C25E8()
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 95897e721..b207d7e74 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -168,12 +168,12 @@ static bool8 WipeSectors(u32);
 // although this is a general text printer, it's only used in this file.
 static void SaveFailedScreenTextPrint(u8 *text, u8 var1, u8 var2)
 {
-    struct TextColor color;
+    u8 color[3];
 
-    color.fgColor = 0;
-    color.bgColor = 15;
-    color.shadowColor = 3;
-    AddTextPrinterParameterized2(gSaveFailedWindowIds[TEXT_WIN_ID], 1, var1 * 8, var2 * 8 + 1, 0, 0, &color, 0, text);
+    color[0] = 0;
+    color[1] = 15;
+    color[2] = 3;
+    AddTextPrinterParameterized2(gSaveFailedWindowIds[TEXT_WIN_ID], 1, var1 * 8, var2 * 8 + 1, 0, 0, color, 0, text);
 }
 
 void DoSaveFailedScreen(u8 saveType)
diff --git a/src/window.c b/src/window.c
index 3913b5800..9a892d079 100644
--- a/src/window.c
+++ b/src/window.c
@@ -403,7 +403,7 @@ void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height)
     }
 }
 
-void BlitBitmapToWindow(u8 windowId, u8 *pixels, u16 x, u16 y, u16 width, u16 height)
+void BlitBitmapToWindow(u8 windowId, const u8 *pixels, u16 x, u16 y, u16 width, u16 height)
 {
     BlitBitmapRectToWindow(windowId, pixels, 0, 0, width, height, x, y, width, height);
 }
-- 
cgit v1.2.3


From d396a8f89caa2d47ae39f7dfa8da02017945d7f7 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Wed, 7 Feb 2018 00:07:42 -0600
Subject: Merge new_menu_helpers and menu

---
 src/battle_bg.c        |   2 +-
 src/berry_blender.c    |   1 -
 src/coins.c            |   1 -
 src/decoration.c       |   2 +-
 src/hall_of_fame.c     |   1 -
 src/menu.c             | 540 +++++++++++++++++++++++++++++++++++++++++++------
 src/naming_screen.c    |   1 -
 src/new_menu_helpers.c | 437 ---------------------------------------
 src/pokeblock.c        |   1 -
 src/pokeblock_feed.c   |   1 -
 src/scrcmd.c           |   1 -
 src/secret_base.c      |   1 -
 12 files changed, 483 insertions(+), 506 deletions(-)
 delete mode 100644 src/new_menu_helpers.c

(limited to 'src')

diff --git a/src/battle_bg.c b/src/battle_bg.c
index 5d5bbf0e9..a67f56fd8 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -17,7 +17,7 @@
 #include "strings.h"
 #include "window.h"
 #include "text_window.h"
-#include "new_menu_helpers.h"
+#include "menu.h"
 
 struct BattleBackground
 {
diff --git a/src/berry_blender.c b/src/berry_blender.c
index a9360ca5f..45e3acd24 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -18,7 +18,6 @@
 #include "event_data.h"
 #include "main.h"
 #include "link.h"
-#include "new_menu_helpers.h"
 #include "item_menu_icons.h"
 #include "berry.h"
 #include "item.h"
diff --git a/src/coins.c b/src/coins.c
index 50c31cac0..12e0bd4ef 100644
--- a/src/coins.c
+++ b/src/coins.c
@@ -4,7 +4,6 @@
 #include "window.h"
 #include "strings.h"
 #include "string_util.h"
-#include "new_menu_helpers.h"
 #include "menu.h"
 #include "international_string_util.h"
 
diff --git a/src/decoration.c b/src/decoration.c
index 8fb620b36..885b1b0b0 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -20,7 +20,7 @@
 #include "field_map_obj.h"
 #include "list_menu.h"
 #include "menu_helpers.h"
-#include "new_menu_helpers.h"
+#include "menu.h"
 #include "menu_indicators.h"
 #include "sound.h"
 #include "event_scripts.h"
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 85fb518b5..9ac415c32 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -82,7 +82,6 @@ extern const u8 gContestConfetti_Gfx[];
 extern const u8 gContestConfetti_Pal[];
 
 extern void NewMenuHelpers_DrawDialogueFrame(u8, u8);
-extern u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
 extern void sub_8175620(void);
 extern u8 TrySavingData(u8);
 extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);
diff --git a/src/menu.c b/src/menu.c
index 4916c00ea..08b718a46 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "new_menu_helpers.h"
 #include "bg.h"
 #include "window.h"
 #include "palette.h"
@@ -17,8 +16,16 @@
 #include "event_data.h"
 #include "pokedex.h"
 #include "region_map.h"
+#include "text_window.h"
+#include "strings.h"
+#include "graphics.h"
 
-struct SomeUnkStruct
+#define DLG_WINDOW_PALETTE_NUM 15
+#define DLG_WINDOW_BASE_TILE_NUM 0x200
+#define STD_WINDOW_PALETTE_NUM 14
+#define STD_WINDOW_BASE_TILE_NUM 0x214
+
+struct SomeUnkStruct_60F0D4
 {
     u8 unk1;
     u8 unk2;
@@ -41,18 +48,35 @@ struct Menu
     bool8 APressMuted;
 };
 
-extern EWRAM_DATA struct Menu gUnknown_0203CD90;
-extern EWRAM_DATA u16 gUnknown_0203CD9C;
-extern EWRAM_DATA u8 gUnknown_0203CD9E;
-extern EWRAM_DATA u8 gUnknown_0203CD9F;
-extern EWRAM_DATA u8 gUnknown_0203CDA0;
-extern EWRAM_DATA bool8 gUnknown_0203CDA4[4];
-extern EWRAM_DATA u16 gUnknown_0203CDA8;
-extern EWRAM_DATA void *gUnknown_0203CDAC[0x20];
+static EWRAM_DATA u8 gUnknown_0203CD8C = 0;
+static EWRAM_DATA u8 gUnknown_0203CD8D = 0;
+static EWRAM_DATA struct Menu gUnknown_0203CD90 = {0};
+static EWRAM_DATA u16 gUnknown_0203CD9C = 0;
+static EWRAM_DATA u8 gUnknown_0203CD9E = 0;
+static EWRAM_DATA u8 gUnknown_0203CD9F = 0;
+static EWRAM_DATA u8 gUnknown_0203CDA0 = 0;
+static EWRAM_DATA u16 sFiller = 0;  // needed to align
+static EWRAM_DATA bool8 gUnknown_0203CDA4[4] = {FALSE};
+static EWRAM_DATA u16 gUnknown_0203CDA8 = 0;
+static EWRAM_DATA void *gUnknown_0203CDAC[0x20] = {NULL};
+
+const u16 gUnknown_0860F074[] = INCBIN_U16("graphics/interface/860F074.gbapal");
+static const u8 gUnknown_0860F094[] = { 8, 4, 1 };
+
+static const struct WindowTemplate gUnknown_0860F098[] = 
+{
+    { 0x00, 0x02, 0x0F, 0x1B, 0x04, 0x0F, 0x194 },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate gUnknown_0860F0A8 =
+{
+    0x00, 0x15, 0x09, 0x05, 0x04, 0x0F, 0x125
+};
 
 const u16 gUnknown_0860F0B0[] = INCBIN_U16("graphics/interface/860F0B0.gbapal");
 const u8 gUnknown_0860F0D0[] = { 15, 1, 2 };
-const struct SomeUnkStruct gUnknown_0860F0D4[] = 
+const struct SomeUnkStruct_60F0D4 gUnknown_0860F0D4[] = 
 {
     { 12, 12, 0x00 },
     { 32, 12, 0x20 },
@@ -82,13 +106,12 @@ const struct SomeUnkStruct gUnknown_0860F0D4[] =
     {  8,  8, 0xAF },
 };
 
-extern const u8 gText_SelectorArrow3[];
-extern const u8 gText_YesNo[];
-extern const u16 gFireRedMenuElements1_Pal[16];
-extern const u16 gFireRedMenuElements2_Pal[16];
-extern const u16 gFireRedMenuElements3_Pal[16];
-extern const u8 gFireRedMenuElements_Gfx[];
-
+// Forward declarations
+extern void sub_81973A4(void);
+extern void DrawStandardFrame(u8, u8, u8, u8, u8, u8);
+extern void DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
+extern void sub_81977BC(u8, u8, u8, u8, u8, u8);
+extern void sub_8197804(u8, u8, u8, u8, u8, u8);
 extern void sub_8197BB4(u8, u8, u8, u8, u8, u8);
 extern void sub_8197E30(u8, u8, u8, u8, u8, u8);
 extern void DrawWindowBorder(u8, u8, u8, u8, u8, u8);
@@ -99,6 +122,405 @@ extern void sub_8199F74(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top,
 extern void sub_8198C78(void);
 extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
 
+void sub_81971D0(void)
+{
+    InitWindows(gUnknown_0860F098);
+    gUnknown_0203CD8C = 0xFF;
+    gUnknown_0203CD8D = 0xFF;
+}
+
+void sub_81971F4(void)
+{
+    FreeAllWindowBuffers();
+}
+
+void sub_8197200(void)
+{
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    DeactivateAllTextPrinters();
+    sub_81973A4();
+}
+
+u16 sub_8197224(void)
+{
+    RunTextPrinters();
+    return IsTextPrinterActive(0);
+}
+
+u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor)
+{
+    struct TextSubPrinter printer;
+    
+    printer.current_text_offset = str;
+    printer.windowId = windowId;
+    printer.fontId = fontId;
+    printer.x = 0;
+    printer.y = 1;
+    printer.currentX = 0;
+    printer.currentY = 1;
+    printer.letterSpacing = 0;
+    printer.lineSpacing = 0;
+    printer.fontColor_l = 0;
+    printer.fgColor = fgColor;
+    printer.bgColor = bgColor;
+    printer.shadowColor = shadowColor;
+    
+    gTextFlags.flag_1 = 0;
+    return AddTextPrinter(&printer, speed, callback); 
+}
+
+void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress)
+{
+    void (*callback)(struct TextSubPrinter *, u16) = NULL;
+    gTextFlags.flag_0 = allowSkippingDelayWithButtonPress;
+    AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), callback, 2, 1, 3);
+}
+
+void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress)
+{
+    gTextFlags.flag_0 = allowSkippingDelayWithButtonPress;
+    AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3);
+}
+
+void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed)
+{
+    gTextFlags.flag_0 = allowSkippingDelayWithButtonPress;
+    AddTextPrinterParameterized(0, 1, gStringVar4, speed, NULL, 2, 1, 3);
+}
+
+void sub_81973A4(void)
+{
+    copy_textbox_border_tile_patterns_to_vram(0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10);
+    sub_809882C(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10);
+}
+
+void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram)
+{
+    CallWindowFunction(windowId, DrawDialogueFrame);
+    FillWindowPixelBuffer(windowId, 0x11);
+    PutWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 copyToVram)
+{
+    CallWindowFunction(windowId, DrawStandardFrame);
+    FillWindowPixelBuffer(windowId, 0x11);
+    PutWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void sub_8197434(u8 windowId, bool8 copyToVram)
+{
+    CallWindowFunction(windowId, sub_8197804);
+    FillWindowPixelBuffer(windowId, 0x11);
+    ClearWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void sub_819746C(u8 windowId, bool8 copyToVram)
+{
+    CallWindowFunction(windowId, sub_81977BC);
+    FillWindowPixelBuffer(windowId, 0x11);
+    ClearWindowTilemap(windowId);
+    if (copyToVram == TRUE)
+        CopyWindowToVram(windowId, 3);
+}
+
+void DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    int i;
+    
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 0,
+                            tilemapLeft - 1,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 1,
+                            tilemapLeft,
+                            tilemapTop - 1,
+                            width,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 2,
+                            tilemapLeft + width,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+    
+    for (i = tilemapTop; i < tilemapTop + height; i++)
+    {
+        FillBgTilemapBufferRect(bg,
+                                STD_WINDOW_BASE_TILE_NUM + 3,
+                                tilemapLeft - 1,
+                                i,
+                                1,
+                                1,
+                                STD_WINDOW_PALETTE_NUM);
+        FillBgTilemapBufferRect(bg,
+                                STD_WINDOW_BASE_TILE_NUM + 5,
+                                tilemapLeft + width,
+                                i,
+                                1,
+                                1,
+                                STD_WINDOW_PALETTE_NUM);
+    }
+    
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 6,
+                            tilemapLeft - 1,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 7,
+                            tilemapLeft,
+                            tilemapTop + height,
+                            width,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            STD_WINDOW_BASE_TILE_NUM + 8,
+                            tilemapLeft + width,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            STD_WINDOW_PALETTE_NUM);
+}
+
+void DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 1,
+                            tilemapLeft - 2,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 3,
+                            tilemapLeft - 1,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 4,
+                            tilemapLeft,
+                            tilemapTop - 1,
+                            width - 1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 5,
+                            tilemapLeft + width - 1,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 6,
+                            tilemapLeft + width,
+                            tilemapTop - 1,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 7,
+                            tilemapLeft - 2,
+                            tilemapTop,
+                            1,
+                            5,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 9,
+                            tilemapLeft - 1,
+                            tilemapTop,
+                            width + 1,
+                            5,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            DLG_WINDOW_BASE_TILE_NUM + 10,
+                            tilemapLeft + width,
+                            tilemapTop,
+                            1,
+                            5,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 1),
+                            tilemapLeft - 2,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 3),
+                            tilemapLeft - 1,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 4),
+                            tilemapLeft,
+                            tilemapTop + height,
+                            width - 1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 5),
+                            tilemapLeft + width - 1,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+    FillBgTilemapBufferRect(bg,
+                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 6),
+                            tilemapLeft + width,
+                            tilemapTop + height,
+                            1,
+                            1,
+                            DLG_WINDOW_PALETTE_NUM);
+}
+
+void sub_81977BC(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, STD_WINDOW_PALETTE_NUM);
+}
+
+void sub_8197804(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
+{
+    FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, STD_WINDOW_PALETTE_NUM);
+}
+
+void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram)
+{
+    SetWindowBorderStyle(windowId, copyToVram, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM);
+}
+
+void sub_819786C(u8 windowId, bool8 copyToVram)
+{
+    copy_textbox_border_tile_patterns_to_vram(windowId, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10);
+    sub_8197B1C(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, 0xF);
+}
+
+void sub_819789C(void)
+{
+    LoadPalette(gUnknown_0860F074, STD_WINDOW_PALETTE_NUM * 0x10, 0x14);
+}
+
+void sub_81978B0(u16 offset)
+{
+    LoadPalette(gUnknown_0860F074, offset, 0x14);
+}
+
+const u16 *sub_81978C8(void)
+{
+    return gUnknown_0860F074;
+}
+
+u16 sub_81978D0(u8 colorNum)
+{
+    if (colorNum > 15)
+        colorNum = 0;
+    return gUnknown_0860F074[colorNum];
+}
+
+void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback)
+{
+    sub_81973A4();
+    DisplayMessageAndContinueTask(taskId, 0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM, 1, GetPlayerTextSpeed(), string, callback);
+    CopyWindowToVram(0, 3);
+}
+
+void sub_8197930(void)
+{
+    CreateYesNoMenu(&gUnknown_0860F0A8, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0);
+}
+
+void sub_8197948(u8 initialCursorPos)
+{
+    CreateYesNoMenu(&gUnknown_0860F0A8, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, initialCursorPos);
+}
+
+u32 sub_8197964(void)
+{
+    if (gTextFlags.flag_3)
+        return 1;
+    return gSaveBlock2Ptr->optionsTextSpeed;
+}
+
+u8 GetPlayerTextSpeed(void)
+{
+    u32 speed;
+    if (gSaveBlock2Ptr->optionsTextSpeed > 2)
+        gSaveBlock2Ptr->optionsTextSpeed = 1;
+    speed = sub_8197964();
+    return gUnknown_0860F094[speed];
+}
+
+u8 sub_81979C4(u8 a1)
+{
+    if (gUnknown_0203CD8C == 0xFF)
+        gUnknown_0203CD8C = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139);
+    return gUnknown_0203CD8C;
+}
+
+u8 GetStartMenuWindowId(void)
+{
+    return gUnknown_0203CD8C;
+}
+
+void remove_start_menu_window_maybe(void)
+{
+    if (gUnknown_0203CD8C != 0xFF)
+    {
+        RemoveWindow(gUnknown_0203CD8C);
+        gUnknown_0203CD8C = 0xFF;
+    }
+}
+
+u16 sub_8197A30(void)
+{
+    return DLG_WINDOW_BASE_TILE_NUM;
+}
+
+u16 sub_8197A38(void)
+{
+    return STD_WINDOW_BASE_TILE_NUM;
+}
+
+u8 AddMapNamePopUpWindow(void)
+{
+    if (gUnknown_0203CD8D == 0xFF)
+        gUnknown_0203CD8D = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107);
+    return gUnknown_0203CD8D;
+}
+
+u8 GetMapNamePopUpWindowId(void)
+{
+    return gUnknown_0203CD8D;
+}
+
+void RemoveMapNamePopUpWindow(void)
+{
+    if (gUnknown_0203CD8D != 0xFF)
+    {
+        RemoveWindow(gUnknown_0203CD8D);
+        gUnknown_0203CD8D = 0xFF;
+    }
+}
+
 void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextSubPrinter *, u16))
 {
     gTextFlags.flag_0 = a1;
@@ -545,22 +967,22 @@ s8 ProcessMenuInput(void)
     }
     else if (gMain.newKeys & B_BUTTON)
     {
-        return -1;
+        return MENU_B_PRESSED;
     }
     else if (gMain.newKeys & DPAD_UP)
     {
         PlaySE(SE_SELECT);
         MoveMenuCursor(-1);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
         PlaySE(SE_SELECT);
         MoveMenuCursor(1);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
 
-    return -2;
+    return MENU_NOTHING_CHOSEN;
 }
 
 s8 ProcessMenuInputNoWrapAround(void)
@@ -575,22 +997,22 @@ s8 ProcessMenuInputNoWrapAround(void)
     }
     else if (gMain.newKeys & B_BUTTON)
     {
-        return -1;
+        return MENU_B_PRESSED;
     }
     else if (gMain.newKeys & DPAD_UP)
     {
         if (oldPos != MoveMenuCursorNoWrapAround(-1))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
         if (oldPos != MoveMenuCursorNoWrapAround(1))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
 
-    return -2;
+    return MENU_NOTHING_CHOSEN;
 }
 
 s8 ProcessMenuInput_other(void)
@@ -603,22 +1025,22 @@ s8 ProcessMenuInput_other(void)
     }
     else if (gMain.newKeys & B_BUTTON)
     {
-        return -1;
+        return MENU_B_PRESSED;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
     {
         PlaySE(SE_SELECT);
         MoveMenuCursor(-1);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
     {
         PlaySE(SE_SELECT);
         MoveMenuCursor(1);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
 
-    return -2;
+    return MENU_NOTHING_CHOSEN;
 }
 
 s8 ProcessMenuInputNoWrapAround_other(void)
@@ -633,22 +1055,22 @@ s8 ProcessMenuInputNoWrapAround_other(void)
     }
     else if (gMain.newKeys & B_BUTTON)
     {
-        return -1;
+        return MENU_B_PRESSED;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
     {
         if (oldPos != MoveMenuCursorNoWrapAround(-1))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
     {
         if (oldPos != MoveMenuCursorNoWrapAround(1))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
 
-    return -2;
+    return MENU_NOTHING_CHOSEN;
 }
 
 void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs)
@@ -767,7 +1189,7 @@ void sub_8198C34(const struct WindowTemplate *window, u8 fontId, u16 baseTileNum
 s8 ProcessMenuInputNoWrap_(void)
 {
     s8 result = ProcessMenuInputNoWrapAround();
-    if (result != -2)
+    if (result != MENU_NOTHING_CHOSEN)
         sub_8198C78();
     return result;
 }
@@ -980,34 +1402,34 @@ s8 sub_8199284(void)
     }
     else if (gMain.newKeys & B_BUTTON)
     {
-        return -1;
+        return MENU_B_PRESSED;
     }
     else if (gMain.newKeys & DPAD_UP)
     {
         PlaySE(SE_SELECT);
         sub_8199134(0, -1);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
         PlaySE(SE_SELECT);
         sub_8199134(0, 1);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
     {
         PlaySE(SE_SELECT);
         sub_8199134(-1, 0);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
     {
         PlaySE(SE_SELECT);
         sub_8199134(1, 0);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
 
-    return -2;
+    return MENU_NOTHING_CHOSEN;
 }
 
 s8 sub_8199334(void)
@@ -1021,34 +1443,34 @@ s8 sub_8199334(void)
     }
     else if (gMain.newKeys & B_BUTTON)
     {
-        return -1;
+        return MENU_B_PRESSED;
     }
     else if (gMain.newKeys & DPAD_UP)
     {
         if (oldPos != sub_81991F8(0, -1))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if (gMain.newKeys & DPAD_DOWN)
     {
         if (oldPos != sub_81991F8(0, 1))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if (gMain.newKeys & DPAD_LEFT || GetLRKeysState() == 1)
     {
         if (oldPos != sub_81991F8(-1, 0))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if (gMain.newKeys & DPAD_RIGHT || GetLRKeysState() == 2)
     {
         if (oldPos != sub_81991F8(1, 0))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
 
-    return -2;
+    return MENU_NOTHING_CHOSEN;
 }
 
 s8 sub_81993D8(void)
@@ -1060,34 +1482,34 @@ s8 sub_81993D8(void)
     }
     else if (gMain.newKeys & B_BUTTON)
     {
-        return -1;
+        return MENU_B_PRESSED;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
     {
         PlaySE(SE_SELECT);
         sub_8199134(0, -1);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
     {
         PlaySE(SE_SELECT);
         sub_8199134(0, 1);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT || sub_812210C() == 1)
     {
         PlaySE(SE_SELECT);
         sub_8199134(-1, 0);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT || sub_812210C() == 2)
     {
         PlaySE(SE_SELECT);
         sub_8199134(1, 0);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
 
-    return -2;
+    return MENU_NOTHING_CHOSEN;
 }
 
 s8 sub_8199484(void)
@@ -1101,34 +1523,34 @@ s8 sub_8199484(void)
     }
     else if (gMain.newKeys & B_BUTTON)
     {
-        return -1;
+        return MENU_B_PRESSED;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
     {
         if (oldPos != sub_81991F8(0, -1))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
     {
         if (oldPos != sub_81991F8(0, 1))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_LEFT || sub_812210C() == 1)
     {
         if (oldPos != sub_81991F8(-1, 0))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
     else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_RIGHT || sub_812210C() == 2)
     {
         if (oldPos != sub_81991F8(1, 0))
             PlaySE(SE_SELECT);
-        return -2;
+        return MENU_NOTHING_CHOSEN;
     }
 
-    return -2;
+    return MENU_NOTHING_CHOSEN;
 }
 
 u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted)
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 917782e88..47d8b8ad1 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -5,7 +5,6 @@
 #include "task.h"
 #include "sprite.h"
 #include "string_util.h"
-#include "new_menu_helpers.h"
 #include "window.h"
 #include "bg.h"
 #include "gpu_regs.h"
diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c
deleted file mode 100644
index a4aad4058..000000000
--- a/src/new_menu_helpers.c
+++ /dev/null
@@ -1,437 +0,0 @@
-#include "global.h"
-#include "bg.h"
-#include "palette.h"
-#include "window.h"
-#include "text.h"
-#include "new_menu_helpers.h"
-#include "text_window.h"
-#include "menu.h"
-#include "menu_helpers.h"
-
-#define STD_WINDOW_PALETTE_NUM 14
-#define STD_WINDOW_BASE_TILE_NUM 0x214
-#define DLG_WINDOW_PALETTE_NUM 15
-#define DLG_WINDOW_BASE_TILE_NUM 0x200
-
-static EWRAM_DATA u8 gUnknown_0203CD8C = 0;
-static EWRAM_DATA u8 gUnknown_0203CD8D = 0;
-
-const u16 gUnknown_0860F074[] = INCBIN_U16("graphics/interface/860F074.gbapal");
-static const u8 gUnknown_0860F094[] = { 8, 4, 1 };
-
-static const struct WindowTemplate gUnknown_0860F098[] = 
-{
-    { 0x00, 0x02, 0x0F, 0x1B, 0x04, 0x0F, 0x194 },
-    DUMMY_WIN_TEMPLATE
-};
-
-static const struct WindowTemplate gUnknown_0860F0A8 =
-{
-    0x00, 0x15, 0x09, 0x05, 0x04, 0x0F, 0x125
-};
-
-// Forward declarations
-extern void sub_81973A4(void);
-extern void DrawStandardFrame(u8, u8, u8, u8, u8, u8);
-extern void DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
-extern void sub_81977BC(u8, u8, u8, u8, u8, u8);
-extern void sub_8197804(u8, u8, u8, u8, u8, u8);
-
-void sub_81971D0(void)
-{
-    InitWindows(gUnknown_0860F098);
-    gUnknown_0203CD8C = 0xFF;
-    gUnknown_0203CD8D = 0xFF;
-}
-
-void sub_81971F4(void)
-{
-    FreeAllWindowBuffers();
-}
-
-void sub_8197200(void)
-{
-    ChangeBgX(0, 0, 0);
-    ChangeBgY(0, 0, 0);
-    DeactivateAllTextPrinters();
-    sub_81973A4();
-}
-
-u16 sub_8197224(void)
-{
-    RunTextPrinters();
-    return IsTextPrinterActive(0);
-}
-
-u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor)
-{
-    struct TextSubPrinter printer;
-    
-    printer.current_text_offset = str;
-    printer.windowId = windowId;
-    printer.fontId = fontId;
-    printer.x = 0;
-    printer.y = 1;
-    printer.currentX = 0;
-    printer.currentY = 1;
-    printer.letterSpacing = 0;
-    printer.lineSpacing = 0;
-    printer.fontColor_l = 0;
-    printer.fgColor = fgColor;
-    printer.bgColor = bgColor;
-    printer.shadowColor = shadowColor;
-    
-    gTextFlags.flag_1 = 0;
-    return AddTextPrinter(&printer, speed, callback); 
-}
-
-void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress)
-{
-    void (*callback)(struct TextSubPrinter *, u16) = NULL;
-    gTextFlags.flag_0 = allowSkippingDelayWithButtonPress;
-    AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), callback, 2, 1, 3);
-}
-
-void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress)
-{
-    gTextFlags.flag_0 = allowSkippingDelayWithButtonPress;
-    AddTextPrinterParameterized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3);
-}
-
-void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed)
-{
-    gTextFlags.flag_0 = allowSkippingDelayWithButtonPress;
-    AddTextPrinterParameterized(0, 1, gStringVar4, speed, NULL, 2, 1, 3);
-}
-
-void sub_81973A4(void)
-{
-    copy_textbox_border_tile_patterns_to_vram(0, DLG_WINDOW_BASE_TILE_NUM, 0xF0);
-    sub_809882C(0, STD_WINDOW_BASE_TILE_NUM, 0xE0);
-}
-
-void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram)
-{
-    CallWindowFunction(windowId, DrawDialogueFrame);
-    FillWindowPixelBuffer(windowId, 0x11);
-    PutWindowTilemap(windowId);
-    if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
-}
-
-void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 copyToVram)
-{
-    CallWindowFunction(windowId, DrawStandardFrame);
-    FillWindowPixelBuffer(windowId, 0x11);
-    PutWindowTilemap(windowId);
-    if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
-}
-
-void sub_8197434(u8 windowId, bool8 copyToVram)
-{
-    CallWindowFunction(windowId, sub_8197804);
-    FillWindowPixelBuffer(windowId, 0x11);
-    ClearWindowTilemap(windowId);
-    if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
-}
-
-void sub_819746C(u8 windowId, bool8 copyToVram)
-{
-    CallWindowFunction(windowId, sub_81977BC);
-    FillWindowPixelBuffer(windowId, 0x11);
-    ClearWindowTilemap(windowId);
-    if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
-}
-
-void DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
-{
-    int i;
-    
-    FillBgTilemapBufferRect(bg,
-                            STD_WINDOW_BASE_TILE_NUM + 0,
-                            tilemapLeft - 1,
-                            tilemapTop - 1,
-                            1,
-                            1,
-                            STD_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            STD_WINDOW_BASE_TILE_NUM + 1,
-                            tilemapLeft,
-                            tilemapTop - 1,
-                            width,
-                            1,
-                            STD_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            STD_WINDOW_BASE_TILE_NUM + 2,
-                            tilemapLeft + width,
-                            tilemapTop - 1,
-                            1,
-                            1,
-                            STD_WINDOW_PALETTE_NUM);
-    
-    for (i = tilemapTop; i < tilemapTop + height; i++)
-    {
-        FillBgTilemapBufferRect(bg,
-                                STD_WINDOW_BASE_TILE_NUM + 3,
-                                tilemapLeft - 1,
-                                i,
-                                1,
-                                1,
-                                STD_WINDOW_PALETTE_NUM);
-        FillBgTilemapBufferRect(bg,
-                                STD_WINDOW_BASE_TILE_NUM + 5,
-                                tilemapLeft + width,
-                                i,
-                                1,
-                                1,
-                                STD_WINDOW_PALETTE_NUM);
-    }
-    
-    FillBgTilemapBufferRect(bg,
-                            STD_WINDOW_BASE_TILE_NUM + 6,
-                            tilemapLeft - 1,
-                            tilemapTop + height,
-                            1,
-                            1,
-                            STD_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            STD_WINDOW_BASE_TILE_NUM + 7,
-                            tilemapLeft,
-                            tilemapTop + height,
-                            width,
-                            1,
-                            STD_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            STD_WINDOW_BASE_TILE_NUM + 8,
-                            tilemapLeft + width,
-                            tilemapTop + height,
-                            1,
-                            1,
-                            STD_WINDOW_PALETTE_NUM);
-}
-
-void DrawDialogueFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
-{
-    FillBgTilemapBufferRect(bg,
-                            DLG_WINDOW_BASE_TILE_NUM + 1,
-                            tilemapLeft - 2,
-                            tilemapTop - 1,
-                            1,
-                            1,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            DLG_WINDOW_BASE_TILE_NUM + 3,
-                            tilemapLeft - 1,
-                            tilemapTop - 1,
-                            1,
-                            1,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            DLG_WINDOW_BASE_TILE_NUM + 4,
-                            tilemapLeft,
-                            tilemapTop - 1,
-                            width - 1,
-                            1,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            DLG_WINDOW_BASE_TILE_NUM + 5,
-                            tilemapLeft + width - 1,
-                            tilemapTop - 1,
-                            1,
-                            1,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            DLG_WINDOW_BASE_TILE_NUM + 6,
-                            tilemapLeft + width,
-                            tilemapTop - 1,
-                            1,
-                            1,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            DLG_WINDOW_BASE_TILE_NUM + 7,
-                            tilemapLeft - 2,
-                            tilemapTop,
-                            1,
-                            5,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            DLG_WINDOW_BASE_TILE_NUM + 9,
-                            tilemapLeft - 1,
-                            tilemapTop,
-                            width + 1,
-                            5,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            DLG_WINDOW_BASE_TILE_NUM + 10,
-                            tilemapLeft + width,
-                            tilemapTop,
-                            1,
-                            5,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 1),
-                            tilemapLeft - 2,
-                            tilemapTop + height,
-                            1,
-                            1,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 3),
-                            tilemapLeft - 1,
-                            tilemapTop + height,
-                            1,
-                            1,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 4),
-                            tilemapLeft,
-                            tilemapTop + height,
-                            width - 1,
-                            1,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 5),
-                            tilemapLeft + width - 1,
-                            tilemapTop + height,
-                            1,
-                            1,
-                            DLG_WINDOW_PALETTE_NUM);
-    FillBgTilemapBufferRect(bg,
-                            BG_TILE_V_FLIP(DLG_WINDOW_BASE_TILE_NUM + 6),
-                            tilemapLeft + width,
-                            tilemapTop + height,
-                            1,
-                            1,
-                            DLG_WINDOW_PALETTE_NUM);
-}
-
-void sub_81977BC(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
-{
-    FillBgTilemapBufferRect(bg, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, STD_WINDOW_PALETTE_NUM);
-}
-
-void sub_8197804(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
-{
-    FillBgTilemapBufferRect(bg, 0, tilemapLeft - 3, tilemapTop - 1, width + 6, height + 2, STD_WINDOW_PALETTE_NUM);
-}
-
-void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram)
-{
-    SetWindowBorderStyle(windowId, copyToVram, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM);
-}
-
-void sub_819786C(u8 windowId, bool8 copyToVram)
-{
-    copy_textbox_border_tile_patterns_to_vram(windowId, DLG_WINDOW_BASE_TILE_NUM, 0xF0);
-    sub_8197B1C(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, 0xF);
-}
-
-void sub_819789C(void)
-{
-    LoadPalette(gUnknown_0860F074, 0xE0, 0x14);
-}
-
-void sub_81978B0(u16 offset)
-{
-    LoadPalette(gUnknown_0860F074, offset, 0x14);
-}
-
-const u16 *sub_81978C8(void)
-{
-    return gUnknown_0860F074;
-}
-
-u16 sub_81978D0(u8 colorNum)
-{
-    if (colorNum > 15)
-        colorNum = 0;
-    return gUnknown_0860F074[colorNum];
-}
-
-void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback)
-{
-    sub_81973A4();
-    DisplayMessageAndContinueTask(taskId, 0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM, 1, GetPlayerTextSpeed(), string, callback);
-    CopyWindowToVram(0, 3);
-}
-
-void sub_8197930(void)
-{
-    CreateYesNoMenu(&gUnknown_0860F0A8, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0);
-}
-
-void sub_8197948(u8 initialCursorPos)
-{
-    CreateYesNoMenu(&gUnknown_0860F0A8, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, initialCursorPos);
-}
-
-u32 sub_8197964(void)
-{
-    if (gTextFlags.flag_3)
-        return 1;
-    return gSaveBlock2Ptr->optionsTextSpeed;
-}
-
-u8 GetPlayerTextSpeed(void)
-{
-    u32 speed;
-    if (gSaveBlock2Ptr->optionsTextSpeed > 2)
-        gSaveBlock2Ptr->optionsTextSpeed = 1;
-    speed = sub_8197964();
-    return gUnknown_0860F094[speed];
-}
-
-u8 sub_81979C4(u8 a1)
-{
-    if (gUnknown_0203CD8C == 0xFF)
-        gUnknown_0203CD8C = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139);
-    return gUnknown_0203CD8C;
-}
-
-u8 GetStartMenuWindowId(void)
-{
-    return gUnknown_0203CD8C;
-}
-
-void remove_start_menu_window_maybe(void)
-{
-    if (gUnknown_0203CD8C != 0xFF)
-    {
-        RemoveWindow(gUnknown_0203CD8C);
-        gUnknown_0203CD8C = 0xFF;
-    }
-}
-
-u16 sub_8197A30(void)
-{
-    return DLG_WINDOW_BASE_TILE_NUM;
-}
-
-u16 sub_8197A38(void)
-{
-    return STD_WINDOW_BASE_TILE_NUM;
-}
-
-u8 AddMapNamePopUpWindow(void)
-{
-    if (gUnknown_0203CD8D == 0xFF)
-        gUnknown_0203CD8D = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107);
-    return gUnknown_0203CD8D;
-}
-
-u8 GetMapNamePopUpWindowId(void)
-{
-    return gUnknown_0203CD8D;
-}
-
-void RemoveMapNamePopUpWindow(void)
-{
-    if (gUnknown_0203CD8D != 0xFF)
-    {
-        RemoveWindow(gUnknown_0203CD8D);
-        gUnknown_0203CD8D = 0xFF;
-    }
-}
diff --git a/src/pokeblock.c b/src/pokeblock.c
index c20c8c643..2623e12c4 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -6,7 +6,6 @@
 #include "menu.h"
 #include "task.h"
 #include "menu_helpers.h"
-#include "new_menu_helpers.h"
 #include "pokemon.h"
 #include "graphics.h"
 #include "malloc.h"
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index d899e54f1..2039808cb 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -16,7 +16,6 @@
 #include "event_data.h"
 #include "strings.h"
 #include "string_util.h"
-#include "new_menu_helpers.h"
 #include "party_menu.h"
 #include "m4a.h"
 #include "sound.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 5a4cc4591..ffdccdbe1 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -29,7 +29,6 @@
 #include "menu.h"
 #include "money.h"
 #include "mystery_event_script.h"
-#include "new_menu_helpers.h"
 #include "palette.h"
 #include "party_menu.h"
 #include "pokemon_3.h"
diff --git a/src/secret_base.c b/src/secret_base.c
index bf6bec1f8..359cc7aca 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -9,7 +9,6 @@
 #include "window.h"
 #include "menu.h"
 #include "menu_helpers.h"
-#include "new_menu_helpers.h"
 #include "menu_indicators.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
-- 
cgit v1.2.3


From 96ab6f835388ec994c3636480f661beca0e00f24 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 7 Feb 2018 13:49:33 +0100
Subject: match secret base func and fix struct

---
 src/battle_script_commands.c |   2 +-
 src/field_map_obj_helpers.c  |   8 +-
 src/pokemon_2.c              |  16 +--
 src/secret_base.c            | 234 ++++---------------------------------------
 4 files changed, 34 insertions(+), 226 deletions(-)

(limited to 'src')

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c7976fc2a..dbd3375bc 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -6226,7 +6226,7 @@ static u32 GetTrainerMoneyToGive(u16 trainerId)
 
     if (trainerId == SECRET_BASE_OPPONENT)
     {
-        moneyReward = 20 * gBattleResources->secretBase->partyLevels[0] * gBattleStruct->moneyMultiplier;
+        moneyReward = 20 * gBattleResources->secretBase->party.levels[0] * gBattleStruct->moneyMultiplier;
     }
     else
     {
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index 1e0e9b66b..de26cb034 100755
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -549,14 +549,14 @@ bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
         {
             if (firstFreeSlot == 16 && gUnknown_020375B8[i] == 0)
                 firstFreeSlot = i;
-            
+
             if (gUnknown_020375B8[i] == mapObject->localId)
             {
                 found = TRUE;
                 break;
             }
         }
-        
+
         if (!found && firstFreeSlot != 16)
         {
             gUnknown_020375B8[firstFreeSlot] = mapObject->localId;
@@ -564,13 +564,13 @@ bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
             ableToStore = TRUE; // the nonmatching problem is that ableToStore == TRUE isnt being merged with the above ableToStore = TRUE assignment.
         }
     }
-    
+
     if (ableToStore == TRUE)
     {
         mapObject->mapobj_bit_12 = TRUE;
         mapObject->mapobj_bit_9 = TRUE;
     }
-    
+
     sprite->data[2] = 1;
     return TRUE;
 }
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index db176e025..fa416798e 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -1197,26 +1197,26 @@ void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord)
 
     for (i = 0; i < PARTY_SIZE; i++)
     {
-        if (gBattleResources->secretBase->partySpecies[i])
+        if (gBattleResources->secretBase->party.species[i])
         {
             CreateMon(&gEnemyParty[i],
-                gBattleResources->secretBase->partySpecies[i],
-                gBattleResources->secretBase->partyLevels[i],
+                gBattleResources->secretBase->party.species[i],
+                gBattleResources->secretBase->party.levels[i],
                 15,
                 1,
-                gBattleResources->secretBase->partyPersonality[i],
+                gBattleResources->secretBase->party.personality[i],
                 2,
                 0);
 
-            SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleResources->secretBase->partyHeldItems[i]);
+            SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleResources->secretBase->party.heldItems[i]);
 
             for (j = 0; j < 6; j++)
-                SetMonData(&gEnemyParty[i], MON_DATA_HP_EV + j, &gBattleResources->secretBase->partyEVs[i]);
+                SetMonData(&gEnemyParty[i], MON_DATA_HP_EV + j, &gBattleResources->secretBase->party.EVs[i]);
 
             for (j = 0; j < 4; j++)
             {
-                SetMonData(&gEnemyParty[i], MON_DATA_MOVE1 + j, &gBattleResources->secretBase->partyMoves[i * 4 + j]);
-                SetMonData(&gEnemyParty[i], MON_DATA_PP1 + j, &gBattleMoves[gBattleResources->secretBase->partyMoves[i * 4 + j]].pp);
+                SetMonData(&gEnemyParty[i], MON_DATA_MOVE1 + j, &gBattleResources->secretBase->party.moves[i * 4 + j]);
+                SetMonData(&gEnemyParty[i], MON_DATA_PP1 + j, &gBattleMoves[gBattleResources->secretBase->party.moves[i * 4 + j]].pp);
             }
         }
     }
diff --git a/src/secret_base.c b/src/secret_base.c
index 61c2511b7..bb92bc5a9 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -13,6 +13,7 @@
 #include "menu_indicators.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
+#include "constants/species.h"
 #include "sound.h"
 #include "overworld.h"
 #include "fieldmap.h"
@@ -711,237 +712,45 @@ u8 sub_80E98AC(struct Pokemon *pokemon)
     return evTotal / 6;
 }
 
-#ifdef NONMATCHING
-// This function is a meme
 void sub_80E9914(void)
 {
-    u32 zero;
-    u32 *personality;
     u16 partyIdx;
     u16 moveIdx;
     u16 sbPartyIdx;
-    u16 *species;
-    u16 *items;
-    u16 *moves;
-    u8 *levels;
-    u8 *evs;
+    struct SecretBaseParty *party;
 
     sbPartyIdx = 0;
-    personality = gSaveBlock1Ptr->secretBases[0].partyPersonality;
+    party = &gSaveBlock1Ptr->secretBases[0].party;
     if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0)
     {
-        partyIdx = 0;
-        moves = gSaveBlock1Ptr->secretBases[0].partyMoves;
-        species = gSaveBlock1Ptr->secretBases[0].partySpecies;
-        items = gSaveBlock1Ptr->secretBases[0].partyHeldItems;
-        levels = gSaveBlock1Ptr->secretBases[0].partyLevels;
-        evs = gSaveBlock1Ptr->secretBases[0].partyEVs;
-        zero = 0;
-        for (partyIdx = 0; partyIdx < PARTY_SIZE; partyIdx ++)
+        for (partyIdx = 0; partyIdx < PARTY_SIZE; partyIdx++)
         {
-            for (moveIdx = 0; moveIdx < 4; moveIdx ++)
+            for (moveIdx = 0; moveIdx < 4; moveIdx++)
             {
-                moves[partyIdx * 4 + moveIdx] = zero;
+                party->moves[partyIdx * 4 + moveIdx] = 0;
             }
-            species[partyIdx] = zero;
-            items[partyIdx] = zero;
-            levels[partyIdx] = zero;
-            personality[partyIdx] = zero;
-            evs[partyIdx] = zero;
-            if (GetMonData(&gPlayerParty[partyIdx], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&gPlayerParty[partyIdx], MON_DATA_IS_EGG))
+            party->species[partyIdx] = 0;
+            party->heldItems[partyIdx] = 0;
+            party->levels[partyIdx] = 0;
+            party->personality[partyIdx] = 0;
+            party->EVs[partyIdx] = 0;
+            if (GetMonData(&gPlayerParty[partyIdx], MON_DATA_SPECIES) != SPECIES_NONE
+                && !GetMonData(&gPlayerParty[partyIdx], MON_DATA_IS_EGG))
             {
-                for (moveIdx = 0; moveIdx < 4; moveIdx ++)
+                for (moveIdx = 0; moveIdx < 4; moveIdx++)
                 {
-                    moves[sbPartyIdx * 4 + moveIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_MOVE1 + moveIdx);
+                    party->moves[sbPartyIdx * 4 + moveIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_MOVE1 + moveIdx);
                 }
-                species[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_SPECIES);
-                items[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_HELD_ITEM);
-                levels[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_LEVEL);
-                personality[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_PERSONALITY);
-                evs[sbPartyIdx] = sub_80E98AC(&gPlayerParty[partyIdx]);
-                sbPartyIdx ++;
+                party->species[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_SPECIES);
+                party->heldItems[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_HELD_ITEM);
+                party->levels[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_LEVEL);
+                party->personality[sbPartyIdx] = GetMonData(&gPlayerParty[partyIdx], MON_DATA_PERSONALITY);
+                party->EVs[sbPartyIdx] = sub_80E98AC(&gPlayerParty[partyIdx]);
+                sbPartyIdx++;
             }
         }
     }
 }
-#else
-__attribute__((naked)) void sub_80E9914(void)
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                    "\tmov r7, r10\n"
-                    "\tmov r6, r9\n"
-                    "\tmov r5, r8\n"
-                    "\tpush {r5-r7}\n"
-                    "\tsub sp, 0x24\n"
-                    "\tmovs r0, 0\n"
-                    "\tmov r10, r0\n"
-                    "\tldr r0, =gSaveBlock1Ptr\n"
-                    "\tldr r1, [r0]\n"
-                    "\tldr r2, =0x00001ad0\n"
-                    "\tadds r2, r1, r2\n"
-                    "\tstr r2, [sp]\n"
-                    "\tldr r3, =0x00001a9c\n"
-                    "\tadds r0, r1, r3\n"
-                    "\tldrb r0, [r0]\n"
-                    "\tcmp r0, 0\n"
-                    "\tbne _080E993A\n"
-                    "\tb _080E9A60\n"
-                    "_080E993A:\n"
-                    "\tmovs r6, 0\n"
-                    "\tldr r7, =0x00001ae8\n"
-                    "\tadds r7, r1, r7\n"
-                    "\tstr r7, [sp, 0x14]\n"
-                    "\tldr r0, =0x00001b18\n"
-                    "\tadds r0, r1, r0\n"
-                    "\tstr r0, [sp, 0xC]\n"
-                    "\tldr r2, =0x00001b24\n"
-                    "\tadds r2, r1, r2\n"
-                    "\tstr r2, [sp, 0x10]\n"
-                    "\tadds r3, 0x94\n"
-                    "\tadds r3, r1, r3\n"
-                    "\tstr r3, [sp, 0x18]\n"
-                    "\tldr r7, =0x00001b36\n"
-                    "\tadds r7, r1, r7\n"
-                    "\tstr r7, [sp, 0x1C]\n"
-                    "\tmov r9, r6\n"
-                    "_080E995C:\n"
-                    "\tmovs r4, 0\n"
-                    "\tlsls r5, r6, 2\n"
-                    "\tlsls r3, r6, 1\n"
-                    "\tldr r0, =gPlayerParty\n"
-                    "\tmov r8, r0\n"
-                    "\tadds r1, r6, 0x1\n"
-                    "\tstr r1, [sp, 0x4]\n"
-                    "\tadds r2, r5, 0\n"
-                    "\tldr r1, [sp, 0x14]\n"
-                    "_080E996E:\n"
-                    "\tadds r0, r2, r4\n"
-                    "\tlsls r0, 1\n"
-                    "\tadds r0, r1, r0\n"
-                    "\tmov r7, r9\n"
-                    "\tstrh r7, [r0]\n"
-                    "\tadds r0, r4, 0x1\n"
-                    "\tlsls r0, 16\n"
-                    "\tlsrs r4, r0, 16\n"
-                    "\tcmp r4, 0x3\n"
-                    "\tbls _080E996E\n"
-                    "\tldr r1, [sp, 0xC]\n"
-                    "\tadds r0, r1, r3\n"
-                    "\tmov r2, r9\n"
-                    "\tstrh r2, [r0]\n"
-                    "\tldr r7, [sp, 0x10]\n"
-                    "\tadds r0, r7, r3\n"
-                    "\tstrh r2, [r0]\n"
-                    "\tldr r1, [sp, 0x18]\n"
-                    "\tadds r0, r1, r6\n"
-                    "\tmov r2, r9\n"
-                    "\tstrb r2, [r0]\n"
-                    "\tldr r3, [sp]\n"
-                    "\tadds r0, r3, r5\n"
-                    "\tmov r7, r9\n"
-                    "\tstr r7, [r0]\n"
-                    "\tldr r1, [sp, 0x1C]\n"
-                    "\tadds r0, r1, r6\n"
-                    "\tstrb r7, [r0]\n"
-                    "\tmovs r2, 0x64\n"
-                    "\tadds r5, r6, 0\n"
-                    "\tmuls r5, r2\n"
-                    "\tmov r3, r8\n"
-                    "\tadds r4, r5, r3\n"
-                    "\tadds r0, r4, 0\n"
-                    "\tmovs r1, 0xB\n"
-                    "\tbl GetMonData\n"
-                    "\tcmp r0, 0\n"
-                    "\tbeq _080E9A54\n"
-                    "\tadds r0, r4, 0\n"
-                    "\tmovs r1, 0x2D\n"
-                    "\tbl GetMonData\n"
-                    "\tcmp r0, 0\n"
-                    "\tbne _080E9A54\n"
-                    "\tmovs r4, 0\n"
-                    "\tmov r7, r10\n"
-                    "\tlsls r7, 2\n"
-                    "\tmov r8, r7\n"
-                    "\tmov r0, r10\n"
-                    "\tlsls r7, r0, 1\n"
-                    "\tadds r0, 0x1\n"
-                    "\tstr r0, [sp, 0x8]\n"
-                    "\tldr r2, =gPlayerParty\n"
-                    "_080E99DA:\n"
-                    "\tadds r1, r4, 0\n"
-                    "\tadds r1, 0xD\n"
-                    "\tadds r0, r5, r2\n"
-                    "\tstr r2, [sp, 0x20]\n"
-                    "\tbl GetMonData\n"
-                    "\tmov r3, r8\n"
-                    "\tadds r1, r3, r4\n"
-                    "\tlsls r1, 1\n"
-                    "\tldr r3, [sp, 0x14]\n"
-                    "\tadds r1, r3, r1\n"
-                    "\tstrh r0, [r1]\n"
-                    "\tadds r0, r4, 0x1\n"
-                    "\tlsls r0, 16\n"
-                    "\tlsrs r4, r0, 16\n"
-                    "\tldr r2, [sp, 0x20]\n"
-                    "\tcmp r4, 0x3\n"
-                    "\tbls _080E99DA\n"
-                    "\tmovs r0, 0x64\n"
-                    "\tadds r4, r6, 0\n"
-                    "\tmuls r4, r0\n"
-                    "\tldr r0, =gPlayerParty\n"
-                    "\tadds r4, r0\n"
-                    "\tadds r0, r4, 0\n"
-                    "\tmovs r1, 0xB\n"
-                    "\tbl GetMonData\n"
-                    "\tldr r2, [sp, 0xC]\n"
-                    "\tadds r1, r2, r7\n"
-                    "\tstrh r0, [r1]\n"
-                    "\tadds r0, r4, 0\n"
-                    "\tmovs r1, 0xC\n"
-                    "\tbl GetMonData\n"
-                    "\tldr r3, [sp, 0x10]\n"
-                    "\tadds r1, r3, r7\n"
-                    "\tstrh r0, [r1]\n"
-                    "\tadds r0, r4, 0\n"
-                    "\tmovs r1, 0x38\n"
-                    "\tbl GetMonData\n"
-                    "\tldr r1, [sp, 0x18]\n"
-                    "\tadd r1, r10\n"
-                    "\tstrb r0, [r1]\n"
-                    "\tadds r0, r4, 0\n"
-                    "\tmovs r1, 0\n"
-                    "\tbl GetMonData\n"
-                    "\tldr r1, [sp]\n"
-                    "\tadd r1, r8\n"
-                    "\tstr r0, [r1]\n"
-                    "\tadds r0, r4, 0\n"
-                    "\tbl sub_80E98AC\n"
-                    "\tldr r1, [sp, 0x1C]\n"
-                    "\tadd r1, r10\n"
-                    "\tstrb r0, [r1]\n"
-                    "\tldr r7, [sp, 0x8]\n"
-                    "\tlsls r0, r7, 16\n"
-                    "\tlsrs r0, 16\n"
-                    "\tmov r10, r0\n"
-                    "_080E9A54:\n"
-                    "\tldr r1, [sp, 0x4]\n"
-                    "\tlsls r0, r1, 16\n"
-                    "\tlsrs r6, r0, 16\n"
-                    "\tcmp r6, 0x5\n"
-                    "\tbhi _080E9A60\n"
-                    "\tb _080E995C\n"
-                    "_080E9A60:\n"
-                    "\tadd sp, 0x24\n"
-                    "\tpop {r3-r5}\n"
-                    "\tmov r8, r3\n"
-                    "\tmov r9, r4\n"
-                    "\tmov r10, r5\n"
-                    "\tpop {r4-r7}\n"
-                    "\tpop {r0}\n"
-                    "\tbx r0\n"
-                    "\t.pool");
-}
-#endif
 
 void sub_80E9A90(void)
 {
@@ -1357,7 +1166,6 @@ void sub_80EA354(void)
     gSpecialVar_Result = gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_5;
 }
 
-
 void sub_80EA3E4(u8 taskId)
 {
     s16 x;
-- 
cgit v1.2.3


From b3a94a359f3412503d8bab5ef99e91d2bdd92ebb Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 7 Feb 2018 15:02:47 +0100
Subject: match berry fix func

---
 src/berry_fix_program.c | 238 ++++--------------------------------------------
 1 file changed, 17 insertions(+), 221 deletions(-)

(limited to 'src')

diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 7b968a221..542622e89 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -217,10 +217,9 @@ static void berry_fix_main(void)
     }
 }
 
-#ifdef NONMATCHING
 static void berry_fix_gpu_set(void)
 {
-    s32 width;
+    s32 width, left;
 
     SetGpuReg(REG_OFFSET_BG0CNT, 0x0000);
     SetGpuReg(REG_OFFSET_BG1CNT, 0x0000);
@@ -249,230 +248,27 @@ static void berry_fix_gpu_set(void)
     FillWindowPixelBuffer(3, 0);
     FillWindowPixelBuffer(0, 0xAA);
 
-// This block is a meme among memes
-    width = (0x78 - GetStringWidth(0, sUnknown_08617E9B, 0)) / 2;
-    box_print(2, 0, width, 3, sUnknown_0861815B, -1, sUnknown_08617E9B);
-    width = (s32)(0x78 - GetStringWidth(0, sUnknown_08617E9B, 0)) / 2 + 0x78;
-    box_print(2, 0, width, 3, sUnknown_0861815B, -1, sUnknown_08617E8D);
-    width = (0x70 - GetStringWidth(0, sUnknown_08617E8D, 0)) / 2;
-    box_print(3, 0, width, 0, sUnknown_0861815B, -1, sUnknown_08617E8D);
-    width = (0xd0 - GetStringWidth(1, sUnknown_08617E78, 0)) / 2;
-    box_print(0, 1, width, 2, sUnknown_08618158, -1, sUnknown_08617E78);
+    width = GetStringWidth(0, sUnknown_08617E9B, 0);
+    left = (0x78 - width) / 2;
+    box_print(2, 0, left, 3, sUnknown_0861815B, TEXT_SPEED_FF, sUnknown_08617E9B);
+
+    width = GetStringWidth(0, sUnknown_08617E8D, 0);
+    left = (0x78 - width) / 2 + 0x78;
+    box_print(2, 0, left, 3, sUnknown_0861815B, TEXT_SPEED_FF, sUnknown_08617E8D);
+
+    width = GetStringWidth(0, sUnknown_08617E8D, 0);
+    left = (0x70 - width) / 2;
+    box_print(3, 0, left, 0, sUnknown_0861815B, TEXT_SPEED_FF, sUnknown_08617E8D);
+
+    width = GetStringWidth(1, sUnknown_08617E78, 0);
+    left = (0xD0 - width) / 2;
+    box_print(0, 1, left, 2, sUnknown_08618158, TEXT_SPEED_FF, sUnknown_08617E78);
 
     CopyWindowToVram(2, 2);
     CopyWindowToVram(3, 2);
     CopyWindowToVram(0, 2);
 }
 
-#else
-__attribute__((naked)) static void berry_fix_gpu_set(void)
-{
-    asm(".syntax unified\n"
-        "\tpush {r4-r6,lr}\n"
-        "\tmov r6, r8\n"
-        "\tpush {r6}\n"
-        "\tsub sp, 0x10\n"
-        "\tmovs r0, 0x8\n"
-        "\tmovs r1, 0\n"
-        "\tbl SetGpuReg\n"
-        "\tmovs r0, 0xA\n"
-        "\tmovs r1, 0\n"
-        "\tbl SetGpuReg\n"
-        "\tmovs r0, 0x10\n"
-        "\tmovs r1, 0\n"
-        "\tbl SetGpuReg\n"
-        "\tmovs r0, 0x12\n"
-        "\tmovs r1, 0\n"
-        "\tbl SetGpuReg\n"
-        "\tmovs r0, 0x14\n"
-        "\tmovs r1, 0\n"
-        "\tbl SetGpuReg\n"
-        "\tmovs r0, 0x16\n"
-        "\tmovs r1, 0\n"
-        "\tbl SetGpuReg\n"
-        "\tmovs r0, 0x50\n"
-        "\tmovs r1, 0\n"
-        "\tbl SetGpuReg\n"
-        "\tmovs r1, 0\n"
-        "\tstr r1, [sp, 0xC]\n"
-        "\tldr r4, =0x040000d4\n"
-        "\tadd r0, sp, 0xC\n"
-        "\tstr r0, [r4]\n"
-        "\tmovs r0, 0xC0\n"
-        "\tlsls r0, 19\n"
-        "\tstr r0, [r4, 0x4]\n"
-        "\tldr r0, =0x85006000\n"
-        "\tstr r0, [r4, 0x8]\n"
-        "\tldr r0, [r4, 0x8]\n"
-        "\tstr r1, [sp, 0xC]\n"
-        "\tadd r0, sp, 0xC\n"
-        "\tstr r0, [r4]\n"
-        "\tmovs r0, 0xE0\n"
-        "\tlsls r0, 19\n"
-        "\tstr r0, [r4, 0x4]\n"
-        "\tldr r2, =0x85000100\n"
-        "\tstr r2, [r4, 0x8]\n"
-        "\tldr r0, [r4, 0x8]\n"
-        "\tstr r1, [sp, 0xC]\n"
-        "\tadd r0, sp, 0xC\n"
-        "\tstr r0, [r4]\n"
-        "\tmovs r0, 0xA0\n"
-        "\tlsls r0, 19\n"
-        "\tstr r0, [r4, 0x4]\n"
-        "\tstr r2, [r4, 0x8]\n"
-        "\tldr r0, [r4, 0x8]\n"
-        "\tmovs r0, 0\n"
-        "\tbl ResetBgsAndClearDma3BusyFlags\n"
-        "\tldr r1, =gUnknown_08618108\n"
-        "\tmovs r0, 0\n"
-        "\tmovs r2, 0x2\n"
-        "\tbl InitBgsFromTemplates\n"
-        "\tmovs r0, 0\n"
-        "\tmovs r1, 0\n"
-        "\tmovs r2, 0\n"
-        "\tbl ChangeBgX\n"
-        "\tmovs r0, 0\n"
-        "\tmovs r1, 0\n"
-        "\tmovs r2, 0\n"
-        "\tbl ChangeBgY\n"
-        "\tmovs r0, 0x1\n"
-        "\tmovs r1, 0\n"
-        "\tmovs r2, 0\n"
-        "\tbl ChangeBgX\n"
-        "\tmovs r0, 0x1\n"
-        "\tmovs r1, 0\n"
-        "\tmovs r2, 0\n"
-        "\tbl ChangeBgY\n"
-        "\tldr r0, =gUnknown_08618110\n"
-        "\tbl InitWindows\n"
-        "\tbl DeactivateAllTextPrinters\n"
-        "\tldr r0, =sUnknown_08618138\n"
-        "\tstr r0, [r4]\n"
-        "\tldr r0, =0x050001e0\n"
-        "\tstr r0, [r4, 0x4]\n"
-        "\tldr r0, =0x84000008\n"
-        "\tstr r0, [r4, 0x8]\n"
-        "\tldr r0, [r4, 0x8]\n"
-        "\tmovs r0, 0\n"
-        "\tmovs r1, 0x40\n"
-        "\tbl SetGpuReg\n"
-        "\tmovs r0, 0x2\n"
-        "\tmovs r1, 0\n"
-        "\tbl FillWindowPixelBuffer\n"
-        "\tmovs r0, 0x3\n"
-        "\tmovs r1, 0\n"
-        "\tbl FillWindowPixelBuffer\n"
-        "\tmovs r0, 0\n"
-        "\tmovs r1, 0xAA\n"
-        "\tbl FillWindowPixelBuffer\n"
-        "\tldr r5, =sUnknown_08617E9B\n"
-        "\tmovs r0, 0\n"
-        "\tadds r1, r5, 0\n"
-        "\tmovs r2, 0\n"
-        "\tbl GetStringWidth\n"
-        "\tadds r1, r0, 0\n"
-        "\tmovs r4, 0x78\n"
-        "\tsubs r0, r4, r1\n"
-        "\tlsrs r1, r0, 31\n"
-        "\tadds r0, r1\n"
-        "\tasrs r0, 1\n"
-        "\tlsls r2, r0, 24\n"
-        "\tlsrs r2, 24\n"
-        "\tldr r6, =sUnknown_0861815B\n"
-        "\tstr r6, [sp]\n"
-        "\tmovs r0, 0x1\n"
-        "\tnegs r0, r0\n"
-        "\tmov r8, r0\n"
-        "\tstr r0, [sp, 0x4]\n"
-        "\tstr r5, [sp, 0x8]\n"
-        "\tmovs r0, 0x2\n"
-        "\tmovs r1, 0\n"
-        "\tmovs r3, 0x3\n"
-        "\tbl box_print\n"
-        "\tldr r5, =sUnknown_08617E8D\n"
-        "\tmovs r0, 0\n"
-        "\tadds r1, r5, 0\n"
-        "\tmovs r2, 0\n"
-        "\tbl GetStringWidth\n"
-        "\tadds r1, r0, 0\n"
-        "\tsubs r4, r1\n"
-        "\tlsrs r0, r4, 31\n"
-        "\tadds r4, r0\n"
-        "\tasrs r4, 1\n"
-        "\tadds r0, r4, 0\n"
-        "\tadds r0, 0x78\n"
-        "\tlsls r2, r0, 24\n"
-        "\tlsrs r2, 24\n"
-        "\tstr r6, [sp]\n"
-        "\tmov r0, r8\n"
-        "\tstr r0, [sp, 0x4]\n"
-        "\tstr r5, [sp, 0x8]\n"
-        "\tmovs r0, 0x2\n"
-        "\tmovs r1, 0\n"
-        "\tmovs r3, 0x3\n"
-        "\tbl box_print\n"
-        "\tmovs r0, 0\n"
-        "\tadds r1, r5, 0\n"
-        "\tmovs r2, 0\n"
-        "\tbl GetStringWidth\n"
-        "\tadds r1, r0, 0\n"
-        "\tmovs r0, 0x70\n"
-        "\tsubs r0, r1\n"
-        "\tlsrs r1, r0, 31\n"
-        "\tadds r0, r1\n"
-        "\tasrs r0, 1\n"
-        "\tlsls r2, r0, 24\n"
-        "\tlsrs r2, 24\n"
-        "\tstr r6, [sp]\n"
-        "\tmov r0, r8\n"
-        "\tstr r0, [sp, 0x4]\n"
-        "\tstr r5, [sp, 0x8]\n"
-        "\tmovs r0, 0x3\n"
-        "\tmovs r1, 0\n"
-        "\tmovs r3, 0\n"
-        "\tbl box_print\n"
-        "\tldr r4, =sUnknown_08617E78\n"
-        "\tmovs r0, 0x1\n"
-        "\tadds r1, r4, 0\n"
-        "\tmovs r2, 0\n"
-        "\tbl GetStringWidth\n"
-        "\tadds r1, r0, 0\n"
-        "\tmovs r0, 0xD0\n"
-        "\tsubs r0, r1\n"
-        "\tlsrs r1, r0, 31\n"
-        "\tadds r0, r1\n"
-        "\tasrs r0, 1\n"
-        "\tlsls r2, r0, 24\n"
-        "\tlsrs r2, 24\n"
-        "\tldr r0, =sUnknown_08618158\n"
-        "\tstr r0, [sp]\n"
-        "\tmov r0, r8\n"
-        "\tstr r0, [sp, 0x4]\n"
-        "\tstr r4, [sp, 0x8]\n"
-        "\tmovs r0, 0\n"
-        "\tmovs r1, 0x1\n"
-        "\tmovs r3, 0x2\n"
-        "\tbl box_print\n"
-        "\tmovs r0, 0x2\n"
-        "\tmovs r1, 0x2\n"
-        "\tbl CopyWindowToVram\n"
-        "\tmovs r0, 0x3\n"
-        "\tmovs r1, 0x2\n"
-        "\tbl CopyWindowToVram\n"
-        "\tmovs r0, 0\n"
-        "\tmovs r1, 0x2\n"
-        "\tbl CopyWindowToVram\n"
-        "\tadd sp, 0x10\n"
-        "\tpop {r3}\n"
-        "\tmov r8, r3\n"
-        "\tpop {r4-r6}\n"
-        "\tpop {r0}\n"
-        "\tbx r0\n"
-        "\t.pool\n"
-        ".syntax divided");
-}
-#endif
-
 static int berry_fix_text_update(int checkval)
 {
     if (berry_fix_mb_manager->unk1 == checkval)
@@ -522,7 +318,7 @@ static void berry_fix_text_print(int scene)
     ShowBg(1);
 }
 
-static void berry_fix_bg_hide()
+static void berry_fix_bg_hide(void)
 {
     HideBg(0);
     HideBg(1);
-- 
cgit v1.2.3


From 593031904b1f90bd6afdf3d9f968c5eebc658823 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 7 Feb 2018 19:47:55 +0100
Subject: ray changes

---
 src/rayquaza_scene.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index e2701cd99..25b9ccd53 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -1264,7 +1264,7 @@ static void CB2_RayquazaScene(void)
     UpdatePaletteFade();
 }
 
-static void VblankCB_RayquazaScene(void)
+static void VBlankCB_RayquazaScene(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
@@ -1493,9 +1493,9 @@ static void sub_81D6D20(struct Sprite *sprite)
     }
 }
 
-static void VblankCB_DuoFight(void)
+static void VBlankCB_DuoFight(void)
 {
-    VblankCB_RayquazaScene();
+    VBlankCB_RayquazaScene();
     ScanlineEffect_InitHBlankDmaTransfer();
 }
 
@@ -1564,7 +1564,7 @@ static void Task_DuoFightAnim(u8 taskId)
 
     BlendPalettes(-1, 0x10, 0);
     BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
-    SetVBlankCallback(VblankCB_DuoFight);
+    SetVBlankCallback(VBlankCB_DuoFight);
     PlaySE(SE_T_OOAME);
 }
 
@@ -1654,7 +1654,7 @@ static void Task_HandleDuoFight(u8 taskId)
                 DuoFightEnd(taskId, 2);
                 return;
             case 380:
-                SetGpuReg(REG_OFFSET_BLDCNT, 0x244);
+                SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG2 | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND);
                 gTasks[data[1]].func = sub_81D752C;
                 gTasks[data[1]].data[0] = 0;
                 gTasks[data[1]].data[2] = data[2];
@@ -1953,10 +1953,10 @@ static void Task_RayTakesFlightAnim(u8 taskId)
     PlayNewMapMusic(MUS_REKKUU_KOURIN);
     sub_81D7E10();
     sub_81D7E9C();
-    SetGpuReg(REG_OFFSET_BLDCNT, 0x250);
+    SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_OBJ | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0x808);
     BlendPalettes(-1, 0x10, 0);
-    SetVBlankCallback(VblankCB_RayquazaScene);
+    SetVBlankCallback(VBlankCB_RayquazaScene);
     CreateTask(sub_81D81A4, 0);
     data[0] = 0;
     data[1] = 0;
@@ -2152,10 +2152,10 @@ static void Task_RayDescendsAnim(u8 taskId)
     s16 *data = gTasks[taskId].data;
     sub_81D82B0();
     sub_81D8358();
-    SetGpuRegBits(REG_OFFSET_BLDCNT, 0x1E41);
+    SetGpuRegBits(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_BLEND);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000);
     BlendPalettes(-1, 0x10, 0);
-    SetVBlankCallback(VblankCB_RayquazaScene);
+    SetVBlankCallback(VBlankCB_RayquazaScene);
     sRayScene->field_2008 = 0;
     sRayScene->field_200A = 0;
     data[0] = 0;
@@ -2346,7 +2346,7 @@ static void Task_RayChargesAnim(u8 taskId)
     sub_81D88D0();
     sub_81D68C8();
     BlendPalettes(-1, 0x10, 0);
-    SetVBlankCallback(VblankCB_RayquazaScene);
+    SetVBlankCallback(VBlankCB_RayquazaScene);
     data[0] = 0;
     data[1] = 0;
     data[2] = CreateTask(sub_81D8AD8, 0);
@@ -2508,10 +2508,10 @@ static void Task_RayChasesAwayAnim(u8 taskId)
     sub_81D8CC4();
     sub_81D68C8();
     ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
-    SetGpuReg(REG_OFFSET_BLDCNT, 0x241);
+    SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0xE09);
     BlendPalettes(-1, 0x10, 0);
-    SetVBlankCallback(VblankCB_RayquazaScene);
+    SetVBlankCallback(VBlankCB_RayquazaScene);
     data[0] = 0;
     data[1] = 0;
     gTasks[taskId].func = Task_HandleRayChasesAway;
-- 
cgit v1.2.3


From 9b4b19fd5a800f381a149038e87b399bb6595930 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 7 Feb 2018 19:59:02 +0100
Subject: rtc screen review changes

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

(limited to 'src')

diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index 16cc72166..75d994162 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -171,7 +171,7 @@ static const struct SpriteTemplate sSpriteTemplate_85104F0 =
 };
 
 // code
-static void SpriteCB_ResetRtcCusor0(struct Sprite *sprite)
+static void SpriteCB_ResetRtcCursor0(struct Sprite *sprite)
 {
     int state = gTasks[sprite->data[0]].data[2];
     if (state != sprite->data[1])
@@ -221,7 +221,7 @@ static void SpriteCB_ResetRtcCusor0(struct Sprite *sprite)
     }
 }
 
-static void SpriteCB_ResetRtcCusor1(struct Sprite *sprite)
+static void SpriteCB_ResetRtcCursor1(struct Sprite *sprite)
 {
     int state = gTasks[sprite->data[0]].data[2];
     if (state != sprite->data[1])
@@ -274,12 +274,12 @@ static void CreateCursor(u8 taskId)
     LoadSpritePalette(&sSpritePalette_Arrow);
 
     spriteId = CreateSpriteAtEnd(&sSpriteTemplate_85104F0, 53, 68, 0);
-    gSprites[spriteId].callback = SpriteCB_ResetRtcCusor0;
+    gSprites[spriteId].callback = SpriteCB_ResetRtcCursor0;
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].data[1] = -1;
 
     spriteId = CreateSpriteAtEnd(&sSpriteTemplate_85104F0, 53, 68, 0);
-    gSprites[spriteId].callback = SpriteCB_ResetRtcCusor1;
+    gSprites[spriteId].callback = SpriteCB_ResetRtcCursor1;
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].data[1] = -1;
 }
@@ -330,13 +330,13 @@ static bool32 MoveTimeUpDown(s16 *val, int minVal, int maxVal, u16 keys)
 {
     if (keys & DPAD_DOWN)
     {
-        (*val)--;
+        *val -= 1;
         if (*val < minVal)
             *val = maxVal;
     }
     else if (keys & DPAD_UP)
     {
-        (*val)++;
+        *val += 1;
         if (*val > maxVal)
             *val = minVal;
     }
-- 
cgit v1.2.3


From 5ac6cc48609f34f8d0d75093ecf6d9d056c0a92b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 7 Feb 2018 22:53:40 +0100
Subject: move battle vars to c file

---
 src/battle_controller_player.c          |   6 +-
 src/battle_controller_player_partner.c  |   2 +-
 src/battle_controller_recorded_player.c |   2 +-
 src/battle_controller_safari.c          |   4 +-
 src/battle_controller_wally.c           |   4 +-
 src/battle_main.c                       | 123 ++++++++++++++---
 src/battle_script_commands.c            | 226 ++++++++++++++++----------------
 src/battle_util.c                       | 114 ++++++++--------
 src/item_use.c                          |   4 +-
 src/pokemon_3.c                         |  14 +-
 src/reshow_battle_screen.c              |   4 +-
 11 files changed, 298 insertions(+), 205 deletions(-)

(limited to 'src')

diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 08af2e902..e62985b3b 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -58,7 +58,7 @@ extern u8 gNumberOfMovesToChoose;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern s32 gUnknown_0203CD70;
-extern u8 gBankInMenu;
+extern u8 gBattlerInMenuId;
 extern u32 gBattlePalaceMoveSelectionRngValue;
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_020244B4[];
@@ -2677,7 +2677,7 @@ static void PlayerHandleChooseItem(void)
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
     gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
-    gBankInMenu = gActiveBattler;
+    gBattlerInMenuId = gActiveBattler;
 
     for (i = 0; i < 3; i++)
         gUnknown_0203CF00[i] = gBattleBufferA[gActiveBattler][1 + i];
@@ -2704,7 +2704,7 @@ static void PlayerHandleChoosePokemon(void)
         *(&gBattleStruct->field_B0) = gBattleBufferA[gActiveBattler][3];
         BeginNormalPaletteFade(-1, 0, 0, 16, 0);
         gBattlerControllerFuncs[gActiveBattler] = sub_80597CC;
-        gBankInMenu = gActiveBattler;
+        gBattlerInMenuId = gActiveBattler;
     }
 }
 
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index b2b6baa0a..ac17a4938 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -41,7 +41,7 @@ extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u8 gBankInMenu;
+extern u8 gBattlerInMenuId;
 extern u16 gUnknown_020243FC;
 extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 953f989e9..dca2a7022 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -42,7 +42,7 @@ extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u8 gBankInMenu;
+extern u8 gBattlerInMenuId;
 extern u16 gUnknown_020243FC;
 extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 608d59418..6264d8324 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -40,7 +40,7 @@ extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u8 gBankInMenu;
+extern u8 gBattlerInMenuId;
 extern u16 gUnknown_020243FC;
 
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
@@ -500,7 +500,7 @@ static void SafariHandleChooseItem(void)
 
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
     gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
-    gBankInMenu = gActiveBattler;
+    gBattlerInMenuId = gActiveBattler;
 }
 
 static void SafariHandleChoosePokemon(void)
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index dd01e5996..f85c6792a 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -54,7 +54,7 @@ extern u8 gNumberOfMovesToChoose;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern s32 gUnknown_0203CD70;
-extern u8 gBankInMenu;
+extern u8 gBattlerInMenuId;
 extern u32 gBattlePalaceMoveSelectionRngValue;
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_020244B4[];
@@ -1282,7 +1282,7 @@ static void WallyHandleChooseItem(void)
 {
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
     gBattlerControllerFuncs[gActiveBattler] = OpenBagAfterPaletteFade;
-    gBankInMenu = gActiveBattler;
+    gBattlerInMenuId = gActiveBattler;
 }
 
 static void WallyHandleChoosePokemon(void)
diff --git a/src/battle_main.c b/src/battle_main.c
index 3704ff3b4..25d959ff3 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -81,8 +81,6 @@ extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
 extern void (*gPreBattleCallback1)(void);
 extern void (*gBattleMainFunc)(void);
 extern void (*gCB2_AfterEvolution)(void);
-extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for?
-extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern u8 gDecompressionBuffer[];
@@ -92,7 +90,6 @@ extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
 extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern u8 gStringBattler;
-extern u32 gUnknown_02022F88;
 extern u32 gHitMarker;
 extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
@@ -261,6 +258,102 @@ static void HandleAction_Action11(void);
 static void HandleAction_NothingIsFainted(void);
 static void HandleAction_ActionFinished(void);
 
+// EWRAM vars
+EWRAM_DATA u32 gUnknown_02022F88[25] = {0};
+EWRAM_DATA u32 gBattleTypeFlags = 0;
+EWRAM_DATA u8 gBattleTerrain = 0;
+EWRAM_DATA u32 gUnknown_02022FF4 = 0;
+EWRAM_DATA struct UnknownPokemonStruct2 gUnknown_02022FF8[3] = {0}; // what is it used for?
+EWRAM_DATA struct UnknownPokemonStruct2* gUnknown_02023058 = NULL; // what is it used for?
+EWRAM_DATA u8 *gUnknown_0202305C = NULL;
+EWRAM_DATA u8 *gUnknown_02023060 = NULL;
+EWRAM_DATA u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200] = {0};
+EWRAM_DATA u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200] = {0};
+EWRAM_DATA u8 gActiveBattler = 0;
+EWRAM_DATA u32 gBattleControllerExecFlags = 0;
+EWRAM_DATA u8 gBattlersCount = 0;
+EWRAM_DATA u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gBattlerPositions[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gBattleTurnOrder[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gCurrentTurnActionNumber = 0;
+EWRAM_DATA u8 gCurrentActionFuncId = 0;
+EWRAM_DATA struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gCurrMovePos = 0;
+EWRAM_DATA u8 gUnknown_020241E9 = 0;
+EWRAM_DATA u16 gCurrentMove = 0;
+EWRAM_DATA u16 gChosenMove = 0;
+EWRAM_DATA u16 gRandomMove = 0;
+EWRAM_DATA s32 gBattleMoveDamage = 0;
+EWRAM_DATA s32 gHpDealt = 0;
+EWRAM_DATA s32 gTakenDmg[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u16 gLastUsedItem = 0;
+EWRAM_DATA u8 gLastUsedAbility = 0;
+EWRAM_DATA u8 gBattlerAttacker = 0;
+EWRAM_DATA u8 gBattlerTarget = 0;
+EWRAM_DATA u8 gBank1 = 0;
+EWRAM_DATA u8 gEffectBank = 0;
+EWRAM_DATA u8 gStringBattler = 0;
+EWRAM_DATA u8 gAbsentBattlerFlags = 0;
+EWRAM_DATA u8 gCritMultiplier = 0;
+EWRAM_DATA u8 gMultiHitCounter = 0;
+EWRAM_DATA const u8 *gBattlescriptCurrInstr = NULL;
+EWRAM_DATA u32 gUnusedBattleMainVar = 0;
+EWRAM_DATA u8 gChosenActionByBattler[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA const u8 *gSelectionBattleScripts[MAX_BATTLERS_COUNT] = {NULL};
+EWRAM_DATA const u8 *gPalaceSelectionBattleScripts[MAX_BATTLERS_COUNT] = {NULL};
+EWRAM_DATA u16 gLastPrintedMoves[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u16 gLastMoves[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u16 gLastLandedMoves[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u16 gLastHitByType[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u16 gLastResultingMoves[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u16 gLockedMoves[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gLastHitBy[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gMoveResultFlags = 0;
+EWRAM_DATA u32 gHitMarker = 0;
+EWRAM_DATA u8 gUnknown_02024284[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gUnknown_0202428C = 0;
+EWRAM_DATA u16 gSideStatuses[2] = {0};
+EWRAM_DATA struct SideTimer gSideTimers[2] = {0};
+EWRAM_DATA u32 gStatuses3[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA struct DisableStruct gDisableStructs[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u16 gPauseCounterBattle = 0;
+EWRAM_DATA u16 gPaydayMoney = 0;
+EWRAM_DATA u16 gRandomTurnNumber = 0;
+EWRAM_DATA u8 gBattleCommunication[BATTLE_COMMUNICATION_ENTRIES_COUNT] = {0};
+EWRAM_DATA u8 gBattleOutcome = 0;
+EWRAM_DATA struct ProtectStruct gProtectStructs[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA struct SpecialStatus gSpecialStatuses[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u16 gBattleWeather = 0;
+EWRAM_DATA struct WishFutureKnock gWishFutureKnock = {0};
+EWRAM_DATA u16 gUnknown_020243FC = 0;
+EWRAM_DATA u8 gSentPokesToOpponent[2] = {0};
+EWRAM_DATA u16 gDynamicBasePower = 0;
+EWRAM_DATA u16 gExpShareExp = 0;
+EWRAM_DATA struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA struct BattleScripting gBattleScripting = {0};
+EWRAM_DATA struct BattleStruct *gBattleStruct = NULL;
+EWRAM_DATA u8 *gLinkBattleSendBuffer = NULL;
+EWRAM_DATA u8 *gLinkBattleRecvBuffer = NULL;
+EWRAM_DATA struct BattleResources *gBattleResources = NULL;
+EWRAM_DATA u8 gActionSelectionCursor[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gUnknown_020244B4[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gBattlerInMenuId = 0;
+EWRAM_DATA bool8 gDoingBattleAnim = FALSE;
+EWRAM_DATA u32 gTransformedPersonalities[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gPlayerDpadHoldFrames = 0;
+EWRAM_DATA struct BattleSpriteData *gBattleSpritesDataPtr = NULL;
+EWRAM_DATA struct MonSpritesGfx *gMonSpritesGfxPtr = NULL;
+EWRAM_DATA u8 *gUnknown_020244D8 = NULL;
+EWRAM_DATA u8 *gUnknown_020244DC = NULL;
+EWRAM_DATA u16 gBattleMovePower = 0;
+EWRAM_DATA u16 gMoveToLearn = 0;
+EWRAM_DATA u8 gBattleMonForms[MAX_BATTLERS_COUNT] = {0};
+
 // rom const data
 static void (* const sTurnActionsFuncsTable[])(void) =
 {
@@ -2437,7 +2530,7 @@ static void sub_80398D0(struct Sprite *sprite)
         {
             sprite->invisible = FALSE;
             sprite->callback = SpriteCallbackDummy_2;
-            gUnknown_02022F88 = 0;
+            gUnknown_02022F88[0] = 0;
         }
     }
 }
@@ -3656,12 +3749,12 @@ static void TryDoEventsBeforeFirstTurn(void)
         gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
 
     *(&gBattleStruct->turnEffectsTracker) = 0;
-    *(&gBattleStruct->turnEffectsBank) = 0;
+    *(&gBattleStruct->turnEffectsBattlerId) = 0;
     *(&gBattleStruct->wishPerishSongState) = 0;
-    *(&gBattleStruct->wishPerishSongBank) = 0;
+    *(&gBattleStruct->wishPerishSongBattlerId) = 0;
     gBattleScripting.atk49_state = 0;
     gBattleStruct->faintedActionsState = 0;
-    gBattleStruct->turncountersTracker = 0;
+    gBattleStruct->turnCountersTracker = 0;
     gMoveResultFlags = 0;
 
     gRandomTurnNumber = Random();
@@ -3689,10 +3782,10 @@ static void HandleEndTurn_ContinueBattle(void)
                 CancelMultiTurnMoves(i);
         }
         gBattleStruct->turnEffectsTracker = 0;
-        gBattleStruct->turnEffectsBank = 0;
+        gBattleStruct->turnEffectsBattlerId = 0;
         gBattleStruct->wishPerishSongState = 0;
-        gBattleStruct->wishPerishSongBank = 0;
-        gBattleStruct->turncountersTracker = 0;
+        gBattleStruct->wishPerishSongBattlerId = 0;
+        gBattleStruct->turnCountersTracker = 0;
         gMoveResultFlags = 0;
     }
 }
@@ -4556,7 +4649,7 @@ static void SetActionsAndBanksTurnOrder(void)
                 }
             }
             gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
-            gBattleStruct->focusPunchBank = 0;
+            gBattleStruct->focusPunchBattlerId = 0;
             return;
         }
         else
@@ -4598,7 +4691,7 @@ static void SetActionsAndBanksTurnOrder(void)
         }
     }
     gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts;
-    gBattleStruct->focusPunchBank = 0;
+    gBattleStruct->focusPunchBattlerId = 0;
 }
 
 static void TurnValuesCleanUp(bool8 var0)
@@ -4654,10 +4747,10 @@ static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void)
 {
     if (!(gHitMarker & HITMARKER_RUN))
     {
-        while (gBattleStruct->focusPunchBank < gBattlersCount)
+        while (gBattleStruct->focusPunchBattlerId < gBattlersCount)
         {
-            gActiveBattler = gBattlerAttacker = gBattleStruct->focusPunchBank;
-            gBattleStruct->focusPunchBank++;
+            gActiveBattler = gBattlerAttacker = gBattleStruct->focusPunchBattlerId;
+            gBattleStruct->focusPunchBattlerId++;
             if (gChosenMoveByBattler[gActiveBattler] == MOVE_FOCUS_PUNCH
                 && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
                 && !(gDisableStructs[gBattlerAttacker].truantCounter)
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c6314082c..f4926ba20 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -79,7 +79,7 @@ extern u16 gLastUsedItem;
 extern u16 gBattleMovePower;
 extern s32 gHpDealt;
 extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
-extern u8 gTakenDmgBanks[MAX_BATTLERS_COUNT];
+extern u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT];
 extern u8 gSentPokesToOpponent[2];
 extern u8 gBank1;
 extern u16 gExpShareExp;
@@ -88,7 +88,7 @@ extern void (*gBattleMainFunc)(void);
 extern u8 gPlayerPartyCount;
 extern u16 gMoveToLearn;
 extern u16 gRandomMove;
-extern u8 gBankInMenu;
+extern u8 gBattlerInMenuId;
 extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
 extern u8 gCurrentTurnActionNumber;
 extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
@@ -157,8 +157,8 @@ extern const u8 gText_BattleYesNoChoice[];
 
 #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
 
-#define TARGET_TURN_DAMAGED (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical != 0 \
-                          || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special != 0)
+#define TARGET_TURN_DAMAGED (gSpecialStatuses[gBattlerTarget].physicalDmg != 0 \
+                          || gSpecialStatuses[gBattlerTarget].specialDmg != 0)
 
 // this file's functions
 static bool8 IsTwoTurnsMove(u16 move);
@@ -1969,15 +1969,15 @@ static void atk0C_datahpupdate(void)
         {
             if (gDisableStructs[gActiveBattler].substituteHP >= gBattleMoveDamage)
             {
-                if (gSpecialStatuses[gActiveBattler].moveturnLostHP == 0)
-                    gSpecialStatuses[gActiveBattler].moveturnLostHP = gBattleMoveDamage;
+                if (gSpecialStatuses[gActiveBattler].dmg == 0)
+                    gSpecialStatuses[gActiveBattler].dmg = gBattleMoveDamage;
                 gDisableStructs[gActiveBattler].substituteHP -= gBattleMoveDamage;
                 gHpDealt = gBattleMoveDamage;
             }
             else
             {
-                if (gSpecialStatuses[gActiveBattler].moveturnLostHP == 0)
-                    gSpecialStatuses[gActiveBattler].moveturnLostHP = gDisableStructs[gActiveBattler].substituteHP;
+                if (gSpecialStatuses[gActiveBattler].dmg == 0)
+                    gSpecialStatuses[gActiveBattler].dmg = gDisableStructs[gActiveBattler].substituteHP;
                 gHpDealt = gDisableStructs[gActiveBattler].substituteHP;
                 gDisableStructs[gActiveBattler].substituteHP = 0;
             }
@@ -2010,9 +2010,9 @@ static void atk0C_datahpupdate(void)
                 {
                     gTakenDmg[gActiveBattler] += gBattleMoveDamage;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
-                        gTakenDmgBanks[gActiveBattler] = gBattlerAttacker;
+                        gTakenDmgByBattler[gActiveBattler] = gBattlerAttacker;
                     else
-                        gTakenDmgBanks[gActiveBattler] = gBattlerTarget;
+                        gTakenDmgByBattler[gActiveBattler] = gBattlerTarget;
                 }
 
                 if (gBattleMons[gActiveBattler].hp > gBattleMoveDamage)
@@ -2026,37 +2026,37 @@ static void atk0C_datahpupdate(void)
                     gBattleMons[gActiveBattler].hp = 0;
                 }
 
-                if (!gSpecialStatuses[gActiveBattler].moveturnLostHP && !(gHitMarker & HITMARKER_x100000))
-                    gSpecialStatuses[gActiveBattler].moveturnLostHP = gHpDealt;
+                if (!gSpecialStatuses[gActiveBattler].dmg && !(gHitMarker & HITMARKER_x100000))
+                    gSpecialStatuses[gActiveBattler].dmg = gHpDealt;
 
                 if (moveType <= 8 && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT)
                 {
                     gProtectStructs[gActiveBattler].physicalDmg = gHpDealt;
-                    gSpecialStatuses[gActiveBattler].moveturnLostHP_physical = gHpDealt;
+                    gSpecialStatuses[gActiveBattler].physicalDmg = gHpDealt;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                     {
-                        gProtectStructs[gActiveBattler].physicalBank = gBattlerAttacker;
-                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattlerAttacker;
+                        gProtectStructs[gActiveBattler].physicalBattlerId = gBattlerAttacker;
+                        gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerAttacker;
                     }
                     else
                     {
-                        gProtectStructs[gActiveBattler].physicalBank = gBattlerTarget;
-                        gSpecialStatuses[gActiveBattler].moveturnPhysicalBank = gBattlerTarget;
+                        gProtectStructs[gActiveBattler].physicalBattlerId = gBattlerTarget;
+                        gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerTarget;
                     }
                 }
                 else if (moveType > 8 && !(gHitMarker & HITMARKER_x100000))
                 {
                     gProtectStructs[gActiveBattler].specialDmg = gHpDealt;
-                    gSpecialStatuses[gActiveBattler].moveturnLostHP_special = gHpDealt;
+                    gSpecialStatuses[gActiveBattler].specialDmg = gHpDealt;
                     if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
                     {
-                        gProtectStructs[gActiveBattler].specialBank = gBattlerAttacker;
-                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattlerAttacker;
+                        gProtectStructs[gActiveBattler].specialBattlerId = gBattlerAttacker;
+                        gSpecialStatuses[gActiveBattler].specialBattlerId = gBattlerAttacker;
                     }
                     else
                     {
-                        gProtectStructs[gActiveBattler].specialBank = gBattlerTarget;
-                        gSpecialStatuses[gActiveBattler].moveturnSpecialBank = gBattlerTarget;
+                        gProtectStructs[gActiveBattler].specialBattlerId = gBattlerTarget;
+                        gSpecialStatuses[gActiveBattler].specialBattlerId = gBattlerTarget;
                     }
                 }
             }
@@ -2068,8 +2068,8 @@ static void atk0C_datahpupdate(void)
     else
     {
         gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
-        if (gSpecialStatuses[gActiveBattler].moveturnLostHP == 0)
-            gSpecialStatuses[gActiveBattler].moveturnLostHP = 0xFFFF;
+        if (gSpecialStatuses[gActiveBattler].dmg == 0)
+            gSpecialStatuses[gActiveBattler].dmg = 0xFFFF;
     }
     gBattlescriptCurrInstr += 2;
 }
@@ -3424,14 +3424,14 @@ static void atk23_getexp(void)
             }
 
             gBattleScripting.atk23_state++;
-            gBattleStruct->expGetterId = 0;
+            gBattleStruct->expGetterMonId = 0;
             gBattleStruct->sentInPokes = sentIn;
         }
         // fall through
     case 2: // set exp value to the poke in expgetter_id and print message
         if (gBattleControllerExecFlags == 0)
         {
-            item = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_HELD_ITEM);
+            item = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HELD_ITEM);
 
             if (item == ITEM_ENIGMA_BERRY)
                 holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
@@ -3444,7 +3444,7 @@ static void atk23_getexp(void)
                 gBattleScripting.atk23_state = 5;
                 gBattleMoveDamage = 0; // used for exp
             }
-            else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL) == MAX_MON_LEVEL)
+            else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == MAX_MON_LEVEL)
             {
                 *(&gBattleStruct->sentInPokes) >>= 1;
                 gBattleScripting.atk23_state = 5;
@@ -3460,7 +3460,7 @@ static void atk23_getexp(void)
                     gBattleStruct->wildVictorySong++;
                 }
 
-                if (GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_HP))
+                if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP))
                 {
                     if (gBattleStruct->sentInPokes & 1)
                         gBattleMoveDamage = *exp;
@@ -3474,10 +3474,10 @@ static void atk23_getexp(void)
                     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
                         gBattleMoveDamage = (gBattleMoveDamage * 150) / 100;
 
-                    if (IsTradedMon(&gPlayerParty[gBattleStruct->expGetterId]))
+                    if (IsTradedMon(&gPlayerParty[gBattleStruct->expGetterMonId]))
                     {
                         // check if the pokemon doesn't belong to the player
-                        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gBattleStruct->expGetterId >= 3)
+                        if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gBattleStruct->expGetterMonId >= 3)
                         {
                             i = 0x149;
                         }
@@ -3495,28 +3495,28 @@ static void atk23_getexp(void)
                     // get exp getter bank
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
                     {
-                        if (!(gBattlerPartyIndexes[2] != gBattleStruct->expGetterId) && !(gAbsentBattlerFlags & gBitTable[2]))
-                            gBattleStruct->expGetterBank = 2;
+                        if (!(gBattlerPartyIndexes[2] != gBattleStruct->expGetterMonId) && !(gAbsentBattlerFlags & gBitTable[2]))
+                            gBattleStruct->expGetterBattlerId = 2;
                         else
                         {
                             if (!(gAbsentBattlerFlags & gBitTable[0]))
-                                gBattleStruct->expGetterBank = 0;
+                                gBattleStruct->expGetterBattlerId = 0;
                             else
-                                gBattleStruct->expGetterBank = 2;
+                                gBattleStruct->expGetterBattlerId = 2;
                         }
                     }
                     else
-                        gBattleStruct->expGetterBank = 0;
+                        gBattleStruct->expGetterBattlerId = 0;
 
-                    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBank, gBattleStruct->expGetterId)
+                    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId)
 
 					// buffer 'gained' or 'gained a boosted'
 					PREPARE_STRING_BUFFER(gBattleTextBuff2, i)
 
                     PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage)
 
-                    PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBank);
-                    MonGainEVs(&gPlayerParty[gBattleStruct->expGetterId], gBattleMons[gBank1].species);
+                    PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBattlerId);
+                    MonGainEVs(&gPlayerParty[gBattleStruct->expGetterMonId], gBattleMons[gBank1].species);
                 }
                 gBattleStruct->sentInPokes >>= 1;
                 gBattleScripting.atk23_state++;
@@ -3526,18 +3526,18 @@ static void atk23_getexp(void)
     case 3: // Set stats and give exp
         if (gBattleControllerExecFlags == 0)
         {
-            gBattleBufferB[gBattleStruct->expGetterBank][0] = 0;
-            if (GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL) != MAX_MON_LEVEL)
+            gBattleBufferB[gBattleStruct->expGetterBattlerId][0] = 0;
+            if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) != MAX_MON_LEVEL)
             {
-                gBattleResources->statsBeforeLvlUp->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_MAX_HP);
-                gBattleResources->statsBeforeLvlUp->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_ATK);
-                gBattleResources->statsBeforeLvlUp->def = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_DEF);
-                gBattleResources->statsBeforeLvlUp->spd = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPEED);
-                gBattleResources->statsBeforeLvlUp->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPATK);
-                gBattleResources->statsBeforeLvlUp->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPDEF);
+                gBattleResources->statsBeforeLvlUp->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP);
+                gBattleResources->statsBeforeLvlUp->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK);
+                gBattleResources->statsBeforeLvlUp->def = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF);
+                gBattleResources->statsBeforeLvlUp->spd = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED);
+                gBattleResources->statsBeforeLvlUp->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK);
+                gBattleResources->statsBeforeLvlUp->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF);
 
-                gActiveBattler = gBattleStruct->expGetterBank;
-                BtlController_EmitExpUpdate(0, gBattleStruct->expGetterId, gBattleMoveDamage);
+                gActiveBattler = gBattleStruct->expGetterBattlerId;
+                BtlController_EmitExpUpdate(0, gBattleStruct->expGetterMonId, gBattleMoveDamage);
                 MarkBattlerForControllerExec(gActiveBattler);
             }
             gBattleScripting.atk23_state++;
@@ -3546,50 +3546,50 @@ static void atk23_getexp(void)
     case 4: // lvl up if necessary
         if (gBattleControllerExecFlags == 0)
         {
-            gActiveBattler = gBattleStruct->expGetterBank;
+            gActiveBattler = gBattleStruct->expGetterBattlerId;
             if (gBattleBufferB[gActiveBattler][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBattler][1] == RET_VALUE_LEVELLED_UP)
             {
-                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterId)
+                if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId)
                     HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
 
-                PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterId)
+                PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterMonId)
 
-                PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL))
+                PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL))
 
                 BattleScriptPushCursor();
-                gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterId];
+                gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterMonId];
                 gBattlescriptCurrInstr = BattleScript_LevelUp;
                 gBattleMoveDamage = (gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8));
-                AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterId], 0);
+                AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterMonId], 0);
 
                 // update battle mon structure after level up
-                if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterId && gBattleMons[0].hp)
+                if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId && gBattleMons[0].hp)
                 {
-                    gBattleMons[0].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL);
-                    gBattleMons[0].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_HP);
-                    gBattleMons[0].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_MAX_HP);
-                    gBattleMons[0].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_ATK);
-                    gBattleMons[0].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_DEF);
+                    gBattleMons[0].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL);
+                    gBattleMons[0].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP);
+                    gBattleMons[0].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP);
+                    gBattleMons[0].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK);
+                    gBattleMons[0].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF);
                     // Why is this duplicated?
-                    gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPEED);
-                    gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPEED);
+                    gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED);
+                    gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED);
 
-                    gBattleMons[0].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPATK);
-                    gBattleMons[0].spDefense = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPDEF);
+                    gBattleMons[0].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK);
+                    gBattleMons[0].spDefense = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF);
                 }
                 // What is else if?
-                if (gBattlerPartyIndexes[2] == gBattleStruct->expGetterId && gBattleMons[2].hp && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
+                if (gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId && gBattleMons[2].hp && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
                 {
-                    gBattleMons[2].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL);
-                    gBattleMons[2].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_HP);
-                    gBattleMons[2].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_MAX_HP);
-                    gBattleMons[2].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_ATK);
-                    gBattleMons[2].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_DEF);
+                    gBattleMons[2].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL);
+                    gBattleMons[2].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP);
+                    gBattleMons[2].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP);
+                    gBattleMons[2].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK);
+                    gBattleMons[2].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF);
                     // Duplicated again, but this time there's no Sp Defense
-                    gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPEED);
-                    gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPEED);
+                    gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED);
+                    gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED);
 
-                    gBattleMons[2].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPATK);
+                    gBattleMons[2].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK);
                 }
                 gBattleScripting.atk23_state = 5;
             }
@@ -3605,8 +3605,8 @@ static void atk23_getexp(void)
             gBattleScripting.atk23_state = 3;
         else
         {
-            gBattleStruct->expGetterId++;
-            if (gBattleStruct->expGetterId <= 5)
+            gBattleStruct->expGetterMonId++;
+            if (gBattleStruct->expGetterMonId <= 5)
                 gBattleScripting.atk23_state = 2; // loop again
             else
                 gBattleScripting.atk23_state = 6; // we're done
@@ -4894,7 +4894,7 @@ static void atk49_moveend(void)
         case 1: // defrosting check
             if (gBattleMons[gBattlerTarget].status1 & STATUS1_FREEZE
                 && gBattleMons[gBattlerTarget].hp != 0 && gBattlerAttacker != gBattlerTarget
-                && gSpecialStatuses[gBattlerTarget].moveturnLostHP_special
+                && gSpecialStatuses[gBattlerTarget].specialDmg
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && moveType == TYPE_FIRE)
             {
                 gBattleMons[gBattlerTarget].status1 &= ~(STATUS1_FREEZE);
@@ -5991,9 +5991,9 @@ static void atk59_handlelearnnewmove(void)
     const u8 *jumpPtr1 = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     const u8 *jumpPtr2 = BSScriptReadPtr(gBattlescriptCurrInstr + 5);
 
-    u16 ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterId], gBattlescriptCurrInstr[9]);
+    u16 ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], gBattlescriptCurrInstr[9]);
     while (ret == 0xFFFE)
-        ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterId], 0);
+        ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], 0);
 
     if (ret == 0)
     {
@@ -6007,7 +6007,7 @@ static void atk59_handlelearnnewmove(void)
     {
         gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
 
-        if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterId
+        if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId
             && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
         {
             GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret);
@@ -6015,7 +6015,7 @@ static void atk59_handlelearnnewmove(void)
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
             gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
-            if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterId
+            if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId
                 && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED))
             {
                 GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret);
@@ -6078,7 +6078,7 @@ static void atk5A_yesnoboxlearnmove(void)
         if (!gPaletteFade.active)
         {
             FreeAllWindowBuffers();
-            sub_81BFA38(gPlayerParty, gBattleStruct->expGetterId, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, gMoveToLearn);
+            sub_81BFA38(gPlayerParty, gBattleStruct->expGetterMonId, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, gMoveToLearn);
             gBattleScripting.learnMoveState++;
         }
         break;
@@ -6098,7 +6098,7 @@ static void atk5A_yesnoboxlearnmove(void)
             }
             else
             {
-                u16 moveId = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_MOVE1 + movePosition);
+                u16 moveId = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MOVE1 + movePosition);
                 if (IsHMMove2(moveId))
                 {
                     PrepareStringBattle(STRINGID_HMMOVESCANTBEFORGOTTEN, gActiveBattler);
@@ -6110,10 +6110,10 @@ static void atk5A_yesnoboxlearnmove(void)
 
                     PREPARE_MOVE_BUFFER(gBattleTextBuff2, moveId)
 
-                    RemoveMonPPBonus(&gPlayerParty[gBattleStruct->expGetterId], movePosition);
-                    SetMonMoveSlot(&gPlayerParty[gBattleStruct->expGetterId], gMoveToLearn, movePosition);
+                    RemoveMonPPBonus(&gPlayerParty[gBattleStruct->expGetterMonId], movePosition);
+                    SetMonMoveSlot(&gPlayerParty[gBattleStruct->expGetterMonId], gMoveToLearn, movePosition);
 
-                    if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterId
+                    if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId
                         && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED)
                         && !(gDisableStructs[0].unk18_b & gBitTable[movePosition]))
                     {
@@ -6121,7 +6121,7 @@ static void atk5A_yesnoboxlearnmove(void)
                         SetBattleMonMoveSlot(&gBattleMons[0], gMoveToLearn, movePosition);
                     }
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-                        && gBattlerPartyIndexes[2] == gBattleStruct->expGetterId
+                        && gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId
                         && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED)
                         && !(gDisableStructs[2].unk18_b & gBitTable[movePosition]))
                     {
@@ -6659,7 +6659,7 @@ static void sub_804F100(void)
 {
     struct StatsArray currentStats;
 
-    sub_81D388C(&gPlayerParty[gBattleStruct->expGetterId], &currentStats);
+    sub_81D388C(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
     sub_81D3640(0xD, gBattleResources->statsBeforeLvlUp, &currentStats, 0xE, 0xD, 0xF);
 }
 
@@ -6667,7 +6667,7 @@ static void sub_804F144(void)
 {
     struct StatsArray currentStats;
 
-    sub_81D388C(&gPlayerParty[gBattleStruct->expGetterId], &currentStats);
+    sub_81D388C(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
     sub_81D3784(0xD, &currentStats, 0xE, 0xD, 0xF);
 }
 
@@ -6710,9 +6710,9 @@ static void PutLevelAndGenderOnLvlUpBox(void)
     u8 *txtPtr;
     u32 var;
 
-    monLevel = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_LEVEL);
-    monGender = GetMonGender(&gPlayerParty[gBattleStruct->expGetterId]);
-    GetMonNickname(&gPlayerParty[gBattleStruct->expGetterId], gStringVar4);
+    monLevel = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL);
+    monGender = GetMonGender(&gPlayerParty[gBattleStruct->expGetterMonId]);
+    GetMonNickname(&gPlayerParty[gBattleStruct->expGetterMonId], gStringVar4);
 
     subPrinter.current_text_offset = gStringVar4;
     subPrinter.windowId = 14;
@@ -6788,8 +6788,8 @@ static void PutMonIconOnLvlUpBox(void)
     struct SpriteSheet iconSheet;
     struct SpritePalette iconPalSheet;
 
-    u16 species = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_SPECIES);
-    u32 personality = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_PERSONALITY);
+    u16 species = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPECIES);
+    u32 personality = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_PERSONALITY);
 
     const u8* iconPtr = GetMonIconPtr(species, personality, 1);
     iconSheet.data = iconPtr;
@@ -6829,9 +6829,9 @@ static void SpriteCB_MonIconOnLvlUpBox(struct Sprite* sprite)
 
 static bool32 IsMonGettingExpSentOut(void)
 {
-    if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterId)
+    if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId)
         return TRUE;
-    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlerPartyIndexes[2] == gBattleStruct->expGetterId)
+    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId)
         return TRUE;
 
     return FALSE;
@@ -6939,7 +6939,7 @@ static void atk74_hpthresholds2(void)
 
 static void atk75_useitemonopponent(void)
 {
-    gBankInMenu = gBattlerAttacker;
+    gBattlerInMenuId = gBattlerAttacker;
     ExecuteTableBasedItemEffect(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, 1);
 
     gBattlescriptCurrInstr += 1;
@@ -6982,11 +6982,11 @@ static void atk76_various(void)
         gSpecialStatuses[gActiveBattler].traced = 0;
         break;
     case VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP:
-        if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterId || gBattlerPartyIndexes[2] == gBattleStruct->expGetterId)
+        if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId || gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId)
         {
             u16 *choicedMove;
 
-            if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterId)
+            if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId)
                 gActiveBattler = 0;
             else
                 gActiveBattler = 2;
@@ -7327,7 +7327,7 @@ static void atk7E_setreflect(void)
     {
         gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_REFLECT;
         gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].reflectTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].reflectBank = gBattlerAttacker;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].reflectBattlerId = gBattlerAttacker;
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMonsInBattle(BATTLE_ALIVE_ATK_SIDE) == 2)
             gBattleCommunication[MULTISTRING_CHOOSER] = 2;
@@ -8061,7 +8061,7 @@ static void atk92_setlightscreen(void)
     {
         gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_LIGHTSCREEN;
         gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].lightscreenTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].lightscreenBank = gBattlerAttacker;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].lightscreenBattlerId = gBattlerAttacker;
 
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMonsInBattle(BATTLE_ALIVE_ATK_SIDE) == 2)
             gBattleCommunication[MULTISTRING_CHOOSER] = 4;
@@ -8324,7 +8324,7 @@ static void atk99_setmist(void)
     else
     {
         gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistBank = gBattlerAttacker;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistBattlerId = gBattlerAttacker;
         gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_MIST;
         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
     }
@@ -8520,18 +8520,18 @@ static void atkA0_psywavedamageeffect(void)
 static void atkA1_counterdamagecalculator(void)
 {
     u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
-    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].physicalBank);
+    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].physicalBattlerId);
 
     if (gProtectStructs[gBattlerAttacker].physicalDmg
         && sideAttacker != sideTarget
-        && gBattleMons[gProtectStructs[gBattlerAttacker].physicalBank].hp)
+        && gBattleMons[gProtectStructs[gBattlerAttacker].physicalBattlerId].hp)
     {
         gBattleMoveDamage = gProtectStructs[gBattlerAttacker].physicalDmg * 2;
 
         if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp)
             gBattlerTarget = gSideTimers[sideTarget].followmeTarget;
         else
-            gBattlerTarget = gProtectStructs[gBattlerAttacker].physicalBank;
+            gBattlerTarget = gProtectStructs[gBattlerAttacker].physicalBattlerId;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -8545,16 +8545,16 @@ static void atkA1_counterdamagecalculator(void)
 static void atkA2_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the physical -> special field changes
 {
     u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
-    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].specialBank);
+    u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].specialBattlerId);
 
-    if (gProtectStructs[gBattlerAttacker].specialDmg && sideAttacker != sideTarget && gBattleMons[gProtectStructs[gBattlerAttacker].specialBank].hp)
+    if (gProtectStructs[gBattlerAttacker].specialDmg && sideAttacker != sideTarget && gBattleMons[gProtectStructs[gBattlerAttacker].specialBattlerId].hp)
     {
         gBattleMoveDamage = gProtectStructs[gBattlerAttacker].specialDmg * 2;
 
         if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp)
             gBattlerTarget = gSideTimers[sideTarget].followmeTarget;
         else
-            gBattlerTarget = gProtectStructs[gBattlerAttacker].specialBank;
+            gBattlerTarget = gProtectStructs[gBattlerAttacker].specialBattlerId;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -8636,7 +8636,7 @@ static void atkA5_painsplitdmgcalc(void)
         storeLoc[3] = (painSplitHp & 0xFF000000) >> 24;
 
         gBattleMoveDamage = gBattleMons[gBattlerAttacker].hp - hpDiff;
-        gSpecialStatuses[gBattlerTarget].moveturnLostHP = 0xFFFF;
+        gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -9224,7 +9224,7 @@ static void atkB8_setsafeguard(void)
     {
         gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_SAFEGUARD;
         gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].safeguardTimer = 5;
-        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].safeguardBank = gBattlerAttacker;
+        gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].safeguardBattlerId = gBattlerAttacker;
         gBattleCommunication[MULTISTRING_CHOOSER] = 5;
     }
 
@@ -9995,7 +9995,7 @@ static void atkD4_trywish(void)
         if (gWishFutureKnock.wishCounter[gBattlerAttacker] == 0)
         {
             gWishFutureKnock.wishCounter[gBattlerAttacker] = 2;
-            gWishFutureKnock.wishUserID[gBattlerAttacker] = gBattlerPartyIndexes[gBattlerAttacker];
+            gWishFutureKnock.wishMonId[gBattlerAttacker] = gBattlerPartyIndexes[gBattlerAttacker];
             gBattlescriptCurrInstr += 6;
         }
         else
@@ -10004,7 +10004,7 @@ static void atkD4_trywish(void)
         }
         break;
     case 1: // heal effect
-        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattlerTarget, gWishFutureKnock.wishUserID[gBattlerTarget])
+        PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattlerTarget, gWishFutureKnock.wishMonId[gBattlerTarget])
 
         gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2;
         if (gBattleMoveDamage == 0)
@@ -10036,9 +10036,9 @@ static void atkD5_trysetroots(void) // ingrain
 static void atkD6_doubledamagedealtifdamaged(void)
 {
     if ((gProtectStructs[gBattlerAttacker].physicalDmg
-         && gProtectStructs[gBattlerAttacker].physicalBank == gBattlerTarget)
+         && gProtectStructs[gBattlerAttacker].physicalBattlerId == gBattlerTarget)
         || (gProtectStructs[gBattlerAttacker].specialDmg
-            && gProtectStructs[gBattlerAttacker].specialBank == gBattlerTarget))
+            && gProtectStructs[gBattlerAttacker].specialBattlerId == gBattlerTarget))
     {
         gBattleScripting.dmgMultiplier = 2;
     }
diff --git a/src/battle_util.c b/src/battle_util.c
index bbb4bf41d..145169f34 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -53,7 +53,7 @@ extern u8 gBank1;
 extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT];
 extern u8 gMoveResultFlags;
 extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
-extern u8 gTakenDmgBanks[MAX_BATTLERS_COUNT];
+extern u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT];
 extern u8 gLastUsedAbility;
 extern u8 gCurrentActionFuncId;
 extern u32 gBattleControllerExecFlags;
@@ -547,7 +547,7 @@ u8 UpdateTurnCounters(void)
     {
         u8 sideBank;
 
-        switch (gBattleStruct->turncountersTracker)
+        switch (gBattleStruct->turnCountersTracker)
         {
         case 0:
             for (i = 0; i < gBattlersCount; i++)
@@ -566,7 +566,7 @@ u8 UpdateTurnCounters(void)
 
             // It's stupid, but won't match without it
             {
-                u8* var = &gBattleStruct->turncountersTracker;
+                u8* var = &gBattleStruct->turnCountersTracker;
                 (*var)++;
                 gBattleStruct->turnSideTracker = 0;
             }
@@ -575,7 +575,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].reflectBank;
+                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].reflectBattlerId;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_REFLECT)
                 {
                     if (--gSideTimers[sideBank].reflectTimer == 0)
@@ -592,7 +592,7 @@ u8 UpdateTurnCounters(void)
             }
             if (!effect)
             {
-                gBattleStruct->turncountersTracker++;
+                gBattleStruct->turnCountersTracker++;
                 gBattleStruct->turnSideTracker = 0;
             }
             break;
@@ -600,7 +600,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].lightscreenBank;
+                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].lightscreenBattlerId;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_LIGHTSCREEN)
                 {
                     if (--gSideTimers[sideBank].lightscreenTimer == 0)
@@ -618,7 +618,7 @@ u8 UpdateTurnCounters(void)
             }
             if (!effect)
             {
-                gBattleStruct->turncountersTracker++;
+                gBattleStruct->turnCountersTracker++;
                 gBattleStruct->turnSideTracker = 0;
             }
             break;
@@ -626,7 +626,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].mistBank;
+                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].mistBattlerId;
                 if (gSideTimers[sideBank].mistTimer != 0
                  && --gSideTimers[sideBank].mistTimer == 0)
                 {
@@ -642,7 +642,7 @@ u8 UpdateTurnCounters(void)
             }
             if (!effect)
             {
-                gBattleStruct->turncountersTracker++;
+                gBattleStruct->turnCountersTracker++;
                 gBattleStruct->turnSideTracker = 0;
             }
             break;
@@ -650,7 +650,7 @@ u8 UpdateTurnCounters(void)
             while (gBattleStruct->turnSideTracker < 2)
             {
                 sideBank = gBattleStruct->turnSideTracker;
-                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].safeguardBank;
+                gActiveBattler = gBattlerAttacker = gSideTimers[sideBank].safeguardBattlerId;
                 if (gSideStatuses[sideBank] & SIDE_STATUS_SAFEGUARD)
                 {
                     if (--gSideTimers[sideBank].safeguardTimer == 0)
@@ -666,7 +666,7 @@ u8 UpdateTurnCounters(void)
             }
             if (!effect)
             {
-                gBattleStruct->turncountersTracker++;
+                gBattleStruct->turnCountersTracker++;
                 gBattleStruct->turnSideTracker = 0;
             }
             break;
@@ -688,7 +688,7 @@ u8 UpdateTurnCounters(void)
             }
             if (!effect)
             {
-                gBattleStruct->turncountersTracker++;
+                gBattleStruct->turnCountersTracker++;
             }
             break;
         case 6:
@@ -719,7 +719,7 @@ u8 UpdateTurnCounters(void)
                 BattleScriptExecute(BattleScript_RainContinuesOrEnds);
                 effect++;
             }
-            gBattleStruct->turncountersTracker++;
+            gBattleStruct->turnCountersTracker++;
             break;
         case 7:
             if (gBattleWeather & WEATHER_SANDSTORM_ANY)
@@ -739,7 +739,7 @@ u8 UpdateTurnCounters(void)
                 BattleScriptExecute(gBattlescriptCurrInstr);
                 effect++;
             }
-            gBattleStruct->turncountersTracker++;
+            gBattleStruct->turnCountersTracker++;
             break;
         case 8:
             if (gBattleWeather & WEATHER_SUN_ANY)
@@ -757,7 +757,7 @@ u8 UpdateTurnCounters(void)
                 BattleScriptExecute(gBattlescriptCurrInstr);
                 effect++;
             }
-            gBattleStruct->turncountersTracker++;
+            gBattleStruct->turnCountersTracker++;
             break;
         case 9:
             if (gBattleWeather & WEATHER_HAIL)
@@ -777,7 +777,7 @@ u8 UpdateTurnCounters(void)
                 BattleScriptExecute(gBattlescriptCurrInstr);
                 effect++;
             }
-            gBattleStruct->turncountersTracker++;
+            gBattleStruct->turnCountersTracker++;
             break;
         case 10:
             effect++;
@@ -794,12 +794,12 @@ u8 TurnBasedEffects(void)
     u8 effect = 0;
 
     gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
-    while (gBattleStruct->turnEffectsBank < gBattlersCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
+    while (gBattleStruct->turnEffectsBattlerId < gBattlersCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE)
     {
-        gActiveBattler = gBattlerAttacker = gBattleTurnOrder[gBattleStruct->turnEffectsBank];
+        gActiveBattler = gBattlerAttacker = gBattleTurnOrder[gBattleStruct->turnEffectsBattlerId];
         if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
         {
-            gBattleStruct->turnEffectsBank++;
+            gBattleStruct->turnEffectsBattlerId++;
         }
         else
         {
@@ -1099,7 +1099,7 @@ u8 TurnBasedEffects(void)
                 break;
             case 19:  // done
                 gBattleStruct->turnEffectsTracker = 0;
-                gBattleStruct->turnEffectsBank++;
+                gBattleStruct->turnEffectsBattlerId++;
                 break;
             }
             if (effect != 0)
@@ -1117,16 +1117,16 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
     switch (gBattleStruct->wishPerishSongState)
     {
     case 0:
-        while (gBattleStruct->wishPerishSongBank < gBattlersCount)
+        while (gBattleStruct->wishPerishSongBattlerId < gBattlersCount)
         {
-            gActiveBattler = gBattleStruct->wishPerishSongBank;
+            gActiveBattler = gBattleStruct->wishPerishSongBattlerId;
             if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
             {
-                gBattleStruct->wishPerishSongBank++;
+                gBattleStruct->wishPerishSongBattlerId++;
                 continue;
             }
 
-            gBattleStruct->wishPerishSongBank++;
+            gBattleStruct->wishPerishSongBattlerId++;
             if (gWishFutureKnock.futureSightCounter[gActiveBattler] != 0
              && --gWishFutureKnock.futureSightCounter[gActiveBattler] == 0
              && gBattleMons[gActiveBattler].hp != 0)
@@ -1141,7 +1141,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
                 gBattlerTarget = gActiveBattler;
                 gBattlerAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler];
                 gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler];
-                gSpecialStatuses[gBattlerTarget].moveturnLostHP = 0xFFFF;
+                gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF;
                 BattleScriptExecute(BattleScript_MonTookFutureAttack);
 
                 if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0
@@ -1156,19 +1156,19 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
         {
             u8 *state = &gBattleStruct->wishPerishSongState;
             *state = 1;
-            gBattleStruct->wishPerishSongBank = 0;
+            gBattleStruct->wishPerishSongBattlerId = 0;
         }
         // fall through
     case 1:
-        while (gBattleStruct->wishPerishSongBank < gBattlersCount)
+        while (gBattleStruct->wishPerishSongBattlerId < gBattlersCount)
         {
-            gActiveBattler = gBattlerAttacker = gBattleTurnOrder[gBattleStruct->wishPerishSongBank];
+            gActiveBattler = gBattlerAttacker = gBattleTurnOrder[gBattleStruct->wishPerishSongBattlerId];
             if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
             {
-                gBattleStruct->wishPerishSongBank++;
+                gBattleStruct->wishPerishSongBattlerId++;
                 continue;
             }
-            gBattleStruct->wishPerishSongBank++;
+            gBattleStruct->wishPerishSongBattlerId++;
             if (gStatuses3[gActiveBattler] & STATUS3_PERISH_SONG)
             {
                 PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gActiveBattler].perishSongTimer1);
@@ -1191,7 +1191,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
         {
             u8 *state = &gBattleStruct->wishPerishSongState;
             *state = 2;
-            gBattleStruct->wishPerishSongBank = 0;
+            gBattleStruct->wishPerishSongBattlerId = 0;
         }
         // fall through
     case 2:
@@ -1229,7 +1229,7 @@ bool8 HandleFaintedMonActions(void)
         switch (gBattleStruct->faintedActionsState)
         {
         case 0:
-            gBattleStruct->faintedActionsBank = 0;
+            gBattleStruct->faintedActionsBattlerId = 0;
             gBattleStruct->faintedActionsState++;
             for (i = 0; i < gBattlersCount; i++)
             {
@@ -1240,45 +1240,45 @@ bool8 HandleFaintedMonActions(void)
         case 1:
             do
             {
-                gBank1 = gBattlerTarget = gBattleStruct->faintedActionsBank;
-                if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
-                 && !(gBattleStruct->field_DF & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBank]])
-                 && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBank]))
+                gBank1 = gBattlerTarget = gBattleStruct->faintedActionsBattlerId;
+                if (gBattleMons[gBattleStruct->faintedActionsBattlerId].hp == 0
+                 && !(gBattleStruct->field_DF & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]])
+                 && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBattlerId]))
                 {
                     BattleScriptExecute(BattleScript_GiveExp);
                     gBattleStruct->faintedActionsState = 2;
                     return TRUE;
                 }
-            } while (++gBattleStruct->faintedActionsBank != gBattlersCount);
+            } while (++gBattleStruct->faintedActionsBattlerId != gBattlersCount);
             gBattleStruct->faintedActionsState = 3;
             break;
         case 2:
             sub_803F9EC(gBank1);
-            if (++gBattleStruct->faintedActionsBank == gBattlersCount)
+            if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount)
                 gBattleStruct->faintedActionsState = 3;
             else
                 gBattleStruct->faintedActionsState = 1;
             break;
         case 3:
-            gBattleStruct->faintedActionsBank = 0;
+            gBattleStruct->faintedActionsBattlerId = 0;
             gBattleStruct->faintedActionsState++;
             // fall through
         case 4:
             do
             {
-                gBank1 = gBattlerTarget = gBattleStruct->faintedActionsBank;
-                if (gBattleMons[gBattleStruct->faintedActionsBank].hp == 0
-                 && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBank]))
+                gBank1 = gBattlerTarget = gBattleStruct->faintedActionsBattlerId;
+                if (gBattleMons[gBattleStruct->faintedActionsBattlerId].hp == 0
+                 && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBattlerId]))
                 {
                     BattleScriptExecute(BattleScript_HandleFaintedMon);
                     gBattleStruct->faintedActionsState = 5;
                     return TRUE;
                 }
-            } while (++gBattleStruct->faintedActionsBank != gBattlersCount);
+            } while (++gBattleStruct->faintedActionsBattlerId != gBattlersCount);
             gBattleStruct->faintedActionsState = 6;
             break;
         case 5:
-            if (++gBattleStruct->faintedActionsBank == gBattlersCount)
+            if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount)
                 gBattleStruct->faintedActionsState = 6;
             else
                 gBattleStruct->faintedActionsState = 4;
@@ -1535,7 +1535,7 @@ u8 AtkCanceller_UnableToUseMove(void)
                     {
                         gCurrentMove = MOVE_BIDE;
                         *bideDmg = gTakenDmg[gBattlerAttacker] * 2;
-                        gBattlerTarget = gTakenDmgBanks[gBattlerAttacker];
+                        gBattlerTarget = gTakenDmgByBattler[gBattlerAttacker];
                         if (gAbsentBattlerFlags & gBitTable[gBattlerTarget])
                             gBattlerTarget = GetMoveTarget(MOVE_BIDE, 1);
                         gBattlescriptCurrInstr = BattleScript_BideAttack;
@@ -2063,7 +2063,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && move != MOVE_STRUGGLE
                  && gBattleMoves[move].power != 0
-                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattlerTarget].physicalDmg || gSpecialStatuses[gBattlerTarget].specialDmg)
                  && gBattleMons[battler].type1 != moveType
                  && gBattleMons[battler].type2 != moveType
                  && gBattleMons[battler].hp != 0)
@@ -2080,7 +2080,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && gBattleMons[gBattlerAttacker].hp != 0
                  && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattlerTarget].physicalDmg || gSpecialStatuses[gBattlerTarget].specialDmg)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT))
                 {
                     gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 16;
@@ -2095,7 +2095,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && gBattleMons[gBattlerAttacker].hp != 0
                  && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattlerTarget].physicalDmg || gSpecialStatuses[gBattlerTarget].specialDmg)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 10) == 0)
                 {
@@ -2118,7 +2118,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && gBattleMons[gBattlerAttacker].hp != 0
                  && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattlerTarget].physicalDmg || gSpecialStatuses[gBattlerTarget].specialDmg)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 3) == 0)
                 {
@@ -2133,7 +2133,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                  && gBattleMons[gBattlerAttacker].hp != 0
                  && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
-                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattlerTarget].physicalDmg || gSpecialStatuses[gBattlerTarget].specialDmg)
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
                  && (Random() % 3) == 0)
                 {
@@ -2149,7 +2149,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                  && gBattleMons[gBattlerAttacker].hp != 0
                  && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
-                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattlerTarget].physicalDmg || gSpecialStatuses[gBattlerTarget].specialDmg)
                  && (Random() % 3) == 0)
                 {
                     gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_BURN;
@@ -2164,7 +2164,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                  && gBattleMons[gBattlerAttacker].hp != 0
                  && !gProtectStructs[gBattlerAttacker].confusionSelfDmg
                  && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)
-                 && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
+                 && (gSpecialStatuses[gBattlerTarget].physicalDmg || gSpecialStatuses[gBattlerTarget].specialDmg)
                  && gBattleMons[gBattlerTarget].hp != 0
                  && (Random() % 3) == 0
                  && gBattleMons[gBattlerAttacker].ability != ABILITY_OBLIVIOUS
@@ -3174,7 +3174,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             {
             case HOLD_EFFECT_FLINCH:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                    && (gSpecialStatuses[gBattlerTarget].moveturnLostHP_physical || gSpecialStatuses[gBattlerTarget].moveturnLostHP_special)
+                    && (gSpecialStatuses[gBattlerTarget].physicalDmg || gSpecialStatuses[gBattlerTarget].specialDmg)
                     && (Random() % 100) < atkQuality
                     && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED
                     && gBattleMons[gBattlerTarget].hp)
@@ -3187,8 +3187,8 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 break;
             case HOLD_EFFECT_SHELL_BELL:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
-                    && gSpecialStatuses[gBattlerTarget].moveturnLostHP != 0
-                    && gSpecialStatuses[gBattlerTarget].moveturnLostHP != 0xFFFF
+                    && gSpecialStatuses[gBattlerTarget].dmg != 0
+                    && gSpecialStatuses[gBattlerTarget].dmg != 0xFFFF
                     && gBattlerAttacker != gBattlerTarget
                     && gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP
                     && gBattleMons[gBattlerAttacker].hp != 0)
@@ -3196,10 +3196,10 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     gLastUsedItem = atkItem;
                     gStringBattler = gBattlerAttacker;
                     gBattleScripting.battler = gBattlerAttacker;
-                    gBattleMoveDamage = (gSpecialStatuses[gBattlerTarget].moveturnLostHP / atkQuality) * -1;
+                    gBattleMoveDamage = (gSpecialStatuses[gBattlerTarget].dmg / atkQuality) * -1;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = -1;
-                    gSpecialStatuses[gBattlerTarget].moveturnLostHP = 0;
+                    gSpecialStatuses[gBattlerTarget].dmg = 0;
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_ItemHealHP_Ret;
                     effect++;
diff --git a/src/item_use.c b/src/item_use.c
index 6f585ed8b..bf9109dc8 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -88,7 +88,7 @@ extern void sub_80B7CC8(void);
 extern void flagmods_08054D70(void);
 extern u8* sub_806CF78(u16);
 extern bool8 ExecuteTableBasedItemEffect_(struct Pokemon*, u16, u8, u8);
-extern u8 gBankInMenu;
+extern u8 gBattlerInMenuId;
 extern u16 gBattlerPartyIndexes[];
 extern void sub_81B89F0(void);
 extern u8 GetItemEffectType(u16);
@@ -984,7 +984,7 @@ void sub_80FE440(u8 taskId)
 
 void ItemUseInBattle_StatIncrease(u8 taskId)
 {
-    u16 partyId = gBattlerPartyIndexes[gBankInMenu];
+    u16 partyId = gBattlerPartyIndexes[gBattlerInMenuId];
 
     if (ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gSpecialVar_ItemId, partyId, 0) != FALSE)
     {
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 6442679a6..48185c304 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -26,7 +26,7 @@
 extern struct BattlePokemon gBattleMons[4];
 extern struct BattleEnigmaBerry gEnigmaBerries[4];
 extern u8 gActiveBattler;
-extern u8 gBankInMenu;
+extern u8 gBattlerInMenuId;
 extern u8 gBattlerTarget;
 extern u8 gBattlerAttacker;
 extern u8 gStringBattler;
@@ -210,7 +210,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
 
 void sub_806CF24(s32 stat)
 {
-    gBattlerTarget = gBankInMenu;
+    gBattlerTarget = gBattlerInMenuId;
     StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_08329EC8[stat]]);
     StringCopy(gBattleTextBuff2, gText_StatRose);
     BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2);
@@ -224,7 +224,7 @@ u8 *sub_806CF78(u16 itemId)
     if (itemId == ITEM_ENIGMA_BERRY)
     {
         if (gMain.inBattle)
-            itemEffect = gEnigmaBerries[gBankInMenu].itemEffect;
+            itemEffect = gEnigmaBerries[gBattlerInMenuId].itemEffect;
         else
             itemEffect = gSaveBlock1Ptr->enigmaBerry.itemEffect;
     }
@@ -233,7 +233,7 @@ u8 *sub_806CF78(u16 itemId)
         itemEffect = gItemEffectTable[itemId - 13];
     }
 
-    gStringBattler = gBankInMenu;
+    gStringBattler = gBattlerInMenuId;
 
     for (i = 0; i < 3; i++)
     {
@@ -247,7 +247,7 @@ u8 *sub_806CF78(u16 itemId)
             }
             else
             {
-                gBattlerAttacker = gBankInMenu;
+                gBattlerAttacker = gBattlerInMenuId;
                 BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnGettingPumped);
             }
         }
@@ -255,7 +255,7 @@ u8 *sub_806CF78(u16 itemId)
 
     if (itemEffect[3] & 0x80)
     {
-        gBattlerAttacker = gBankInMenu;
+        gBattlerAttacker = gBattlerInMenuId;
         BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnShroudedInMist);
     }
 
@@ -1371,7 +1371,7 @@ void sub_806E994(void)
     else
         gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->field_49];
 
-    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBankInMenu, pokemon_order_func(gBattlerPartyIndexes[gBankInMenu]))
+    PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff2, gBattlerInMenuId, pokemon_order_func(gBattlerPartyIndexes[gBattlerInMenuId]))
 
     BattleStringExpandPlaceholders(gText_PkmnsXPreventsSwitching, gStringVar4);
 }
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 925b65de5..71b544fdc 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -23,7 +23,7 @@ extern u16 gBattle_BG3_X;
 extern u16 gBattle_BG3_Y;
 extern u8 gReservedSpritePaletteCount;
 extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gBankInMenu;
+extern u8 gBattlerInMenuId;
 extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gBattlersCount;
 extern u32 gBattleTypeFlags;
@@ -175,7 +175,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
                 SetBattlerShadowSpriteCallback(opponentBank, species);
             }
 
-            ActionSelectionCreateCursorAt(gActionSelectionCursor[gBankInMenu], 0);
+            ActionSelectionCreateCursorAt(gActionSelectionCursor[gBattlerInMenuId], 0);
 
             if (gLinkVSyncDisabled != 0 && gReceivedRemoteLinkPlayers != 0)
             {
-- 
cgit v1.2.3


From 1a32010f13d6df0a3eec20e2eb2bb069e79c73bc Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 7 Feb 2018 23:21:51 +0100
Subject: iwram common symbols to c

---
 src/battle_main.c            | 75 +++++++-------------------------------------
 src/battle_script_commands.c | 64 ++-----------------------------------
 2 files changed, 14 insertions(+), 125 deletions(-)

(limited to 'src')

diff --git a/src/battle_main.c b/src/battle_main.c
index 25d959ff3..1195cda52 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -45,6 +45,7 @@
 #include "safari_zone.h"
 #include "battle_string_ids.h"
 #include "data2.h"
+#include "decompress.h"
 
 struct UnknownPokemonStruct2
 {
@@ -60,8 +61,6 @@ struct UnknownPokemonStruct2
     /*0x1D*/ u8 language;
 };
 
-extern u8 gBattleCommunication[];
-extern u8 gBattleTerrain;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern u16 gBattle_BG1_X;
@@ -70,74 +69,13 @@ extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG3_X;
 extern u16 gBattle_BG3_Y;
-extern u16 gPartnerTrainerId;
 extern u16 gBattle_WIN0H;
 extern u16 gBattle_WIN0V;
 extern u16 gBattle_WIN1H;
 extern u16 gBattle_WIN1V;
-extern u16 gTrainerBattleOpponent_A;
-extern u16 gTrainerBattleOpponent_B;
-extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
-extern void (*gPreBattleCallback1)(void);
-extern void (*gBattleMainFunc)(void);
-extern void (*gCB2_AfterEvolution)(void);
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
-extern u8 gDecompressionBuffer[];
-extern u16 gUnknown_020243FC;
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern u8 gStringBattler;
-extern u32 gHitMarker;
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u16 gPaydayMoney;
-extern u16 gBattleWeather;
-extern u16 gPauseCounterBattle;
-extern u16 gRandomTurnNumber;
-extern u8 gActiveBattler;
-extern u8 gBattlersCount;
-extern u8 gBattlerAttacker;
-extern u8 gBattlerTarget;
-extern u8 gLeveledUpInBattle;
-extern u8 gAbsentBattlerFlags;
-extern u32 gBattleControllerExecFlags;
-extern u8 gMultiHitCounter;
-extern u8 gMoveResultFlags;
-extern s32 gBattleMoveDamage;
-extern const u8* gPalaceSelectionBattleScripts[MAX_BATTLERS_COUNT];
-extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
-extern u16 gLastMoves[MAX_BATTLERS_COUNT];
-extern u16 gLastLandedMoves[MAX_BATTLERS_COUNT];
-extern u16 gLastHitByType[MAX_BATTLERS_COUNT];
-extern u16 gLastResultingMoves[MAX_BATTLERS_COUNT];
-extern u16 gLockedMoves[MAX_BATTLERS_COUNT];
-extern u8 gLastHitBy[MAX_BATTLERS_COUNT];
-extern u8 gUnknown_02024284[MAX_BATTLERS_COUNT];
-extern u32 gStatuses3[MAX_BATTLERS_COUNT];
-extern u16 gSideStatuses[2];
-extern u16 gCurrentMove;
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
-extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
-extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT];
-extern u8 gCurrentActionFuncId;
-extern u8 gLastUsedAbility;
 extern u8 gUnknown_0203CF00[];
-extern const u8* gSelectionBattleScripts[MAX_BATTLERS_COUNT];
-extern const u8* gBattlescriptCurrInstr;
-extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
-extern u8 gCurrentTurnActionNumber;
-extern u16 gDynamicBasePower;
-extern u8 gCritMultiplier;
-extern u8 gCurrMovePos;
-extern u8 gUnknown_020241E9;
-extern u16 gChosenMove;
 
 extern const struct BattleMove gBattleMoves[];
 extern const u16 gBattleTextboxPalette[]; // battle textbox palette
@@ -354,6 +292,17 @@ EWRAM_DATA u16 gBattleMovePower = 0;
 EWRAM_DATA u16 gMoveToLearn = 0;
 EWRAM_DATA u8 gBattleMonForms[MAX_BATTLERS_COUNT] = {0};
 
+// IWRAM common vars
+void (*gPreBattleCallback1)(void);
+void (*gBattleMainFunc)(void);
+struct BattleResults gBattleResults;
+u8 gLeveledUpInBattle;
+void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
+u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
+u8 gMultiUsePlayerCursor;
+u8 gNumberOfMovesToChoose;
+u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
+
 // rom const data
 static void (* const sTurnActionsFuncsTable[])(void) =
 {
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index f4926ba20..57aff68ec 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -39,67 +39,9 @@
 #include "task.h"
 #include "naming_screen.h"
 #include "battle_string_ids.h"
+#include "battle_setup.h"
+#include "overworld.h"
 
-// variables
-
-extern u8 gCritMultiplier;
-extern s32 gBattleMoveDamage;
-extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u8 gActiveBattler;
-extern u32 gBattleControllerExecFlags;
-extern u8 gBattlersCount;
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
-extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
-extern u16 gCurrentMove;
-extern u8 gLastUsedAbility;
-extern u8 gStringBattler;
-extern u8 gEffectBank;
-extern u8 gAbsentBattlerFlags;
-extern u8 gMultiHitCounter;
-extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT];
-extern u16 gPauseCounterBattle;
-extern u16 gPaydayMoney;
-extern u16 gRandomTurnNumber;
-extern u8 gBattlerAttacker;
-extern u8 gBattlerTarget;
-extern const u8* gBattlescriptCurrInstr;
-extern u8 gCurrMovePos;
-extern u8 gCurrentActionFuncId;
-extern u8 gMoveResultFlags;
-extern u8 gBattleCommunication[];
-extern u16 gLastLandedMoves[4];
-extern u16 gLastHitByType[4];
-extern u16 gLastResultingMoves[4];
-extern u8 gLastHitBy[4];
-extern u8 gStringBattler;
-extern u16 gDynamicBasePower;
-extern u16 gLastUsedItem;
-extern u16 gBattleMovePower;
-extern s32 gHpDealt;
-extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
-extern u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT];
-extern u8 gSentPokesToOpponent[2];
-extern u8 gBank1;
-extern u16 gExpShareExp;
-extern u8 gLeveledUpInBattle;
-extern void (*gBattleMainFunc)(void);
-extern u8 gPlayerPartyCount;
-extern u16 gMoveToLearn;
-extern u16 gRandomMove;
-extern u8 gBattlerInMenuId;
-extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
-extern u8 gCurrentTurnActionNumber;
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern u16 gLockedMoves[MAX_BATTLERS_COUNT];
-extern u16 gPartnerTrainerId;
-extern u16 gChosenMove;
-extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
-extern u16 gLastMoves[MAX_BATTLERS_COUNT];
-extern u16 gTrainerBattleOpponent_A;
-extern u16 gTrainerBattleOpponent_B;
-extern u8 gUnknown_020241E9;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG2_X;
@@ -114,7 +56,6 @@ struct TrainerMoney
 };
 
 extern const struct BattleMove gBattleMoves[];
-extern const struct BaseStats gBaseStats[];
 extern const u8 gTypeEffectiveness[336];
 extern const struct TrainerMoney gTrainerMoneyTable[];
 extern const u8* const gBattleScriptsForMoveEffects[];
@@ -124,7 +65,6 @@ extern void sub_81A5718(u8 bank); // battle frontier 2
 extern void sub_81A56B4(void); // battle frontier 2
 extern void sub_81BFA38(struct Pokemon* party, u8 monPartyId, u8 monCount, void (*callback)(void), u16 move); // pokemon summary screen
 extern u8 sub_81C1B94(void); // pokemon summary screen
-extern void IncrementGameStat(u8 statId); // rom_4
 extern void sub_81D388C(struct Pokemon* mon, void* statStoreLocation); // pokenav.s
 extern void sub_81D3640(u8 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s
 extern void sub_81D3784(u8 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s
-- 
cgit v1.2.3


From caf9af321d913e6938f5c70188ad0aca5e5eefeb Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 8 Feb 2018 00:00:25 +0100
Subject: get rid of unnecessary externs

---
 src/battle_ai_script_commands.c           | 20 +---------------
 src/battle_ai_switch_items.c              | 14 -----------
 src/battle_anim.c                         |  5 ----
 src/battle_bg.c                           |  4 +---
 src/battle_controller_link_opponent.c     | 28 ++--------------------
 src/battle_controller_link_partner.c      | 26 ++-------------------
 src/battle_controller_opponent.c          | 26 +++------------------
 src/battle_controller_player.c            | 34 ++++-----------------------
 src/battle_controller_player_partner.c    | 27 +++------------------
 src/battle_controller_recorded_opponent.c | 28 +++-------------------
 src/battle_controller_recorded_player.c   | 26 ++-------------------
 src/battle_controller_safari.c            | 16 +------------
 src/battle_controller_wally.c             | 27 ++-------------------
 src/battle_controllers.c                  | 26 +--------------------
 src/battle_gfx_sfx_util.c                 | 10 --------
 src/battle_interface.c                    |  5 ----
 src/battle_main.c                         |  4 ++--
 src/battle_message.c                      | 25 ++++----------------
 src/battle_setup.c                        |  5 +---
 src/battle_transition.c                   |  1 -
 src/battle_util.c                         | 39 -------------------------------
 src/battle_util2.c                        |  5 ----
 src/calculate_base_damage.c               | 10 +-------
 src/evolution_scene.c                     |  4 +---
 src/item_use.c                            |  6 ++---
 src/pokeball.c                            |  6 -----
 src/pokemon_summary_screen.c              |  4 +---
 src/recorded_battle.c                     | 10 +-------
 src/reset_save_heap.c                     |  2 +-
 src/reshow_battle_screen.c                | 14 +----------
 src/scrcmd.c                              |  7 ------
 31 files changed, 42 insertions(+), 422 deletions(-)

(limited to 'src')

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 355d81d2c..d6ccf9305 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -2,6 +2,7 @@
 #include "battle_ai_script_commands.h"
 #include "pokemon.h"
 #include "battle.h"
+#include "battle_setup.h"
 #include "constants/species.h"
 #include "constants/abilities.h"
 #include "random.h"
@@ -44,26 +45,7 @@ in order to read the next command correctly. refer to battle_ai_scripts.s for th
 AI scripts.
 */
 
-extern u32 gBattleTypeFlags;
-extern u8 gActiveBattler;
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u16 gCurrentMove;
-extern u8 gBattlerTarget;
-extern u8 gAbsentBattlerFlags;
-extern u16 gLastMoves[MAX_BATTLERS_COUNT];
-extern u16 gTrainerBattleOpponent_A;
-extern u16 gTrainerBattleOpponent_B;
-extern u32 gStatuses3[MAX_BATTLERS_COUNT];
-extern u16 gSideStatuses[2];
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u16 gDynamicBasePower;
-extern u8 gMoveResultFlags;
-extern s32 gBattleMoveDamage;
-extern u8 gCritMultiplier;
-extern u16 gBattleWeather;
-
 extern const struct BattleMove gBattleMoves[];
-extern const struct BaseStats gBaseStats[];
 extern const u8 * const gBattleAI_ScriptsTable[];
 
 extern u32 GetAiScriptsInRecordedBattle();
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 23d223308..b0fcc2e29 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -10,21 +10,7 @@
 #include "constants/items.h"
 #include "pokemon_item_effects.h"
 
-extern u8 gActiveBattler;
-extern u8 gAbsentBattlerFlags;
-extern u32 gBattleTypeFlags;
-extern u32 gStatuses3[MAX_BATTLERS_COUNT];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u16 gLastLandedMoves[MAX_BATTLERS_COUNT];
-extern u8 gLastHitBy[MAX_BATTLERS_COUNT];
-extern u16 gDynamicBasePower;
-extern u8 gMoveResultFlags;
-extern u8 gCritMultiplier;
-extern s32 gBattleMoveDamage;
-
 extern const struct BattleMove gBattleMoves[];
-extern const struct BaseStats gBaseStats[];
 extern const u8 gTypeEffectiveness[];
 extern const u8 * const gItemEffectTable[]; // todo: fix once struct is declared
 
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 34b7a7476..7606f701d 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -25,8 +25,6 @@
 
 #define ANIM_SPRITE_INDEX_COUNT 8
 
-extern u8 gBattlerAttacker;
-extern u8 gBattlerTarget;
 extern u16 gBattle_WIN0H;
 extern u16 gBattle_WIN0V;
 extern u16 gBattle_WIN1H;
@@ -35,12 +33,9 @@ extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
-extern u8 gDecompressionBuffer[];
 
 extern const u16 gUnknown_082C8D64[];
 extern const u8 * const gBattleAnims_Moves[];
diff --git a/src/battle_bg.c b/src/battle_bg.c
index cb106adae..df3818731 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -18,6 +18,7 @@
 #include "window.h"
 #include "text_window.h"
 #include "new_menu_helpers.h"
+#include "battle_setup.h"
 
 struct BattleBackground
 {
@@ -35,13 +36,10 @@ extern const struct BgTemplate gUnknown_0831AA08[4];
 extern const struct WindowTemplate *gUnknown_0831ABA0[];
 extern const struct BattleBackground gBattleTerrainTable[];
 
-extern u8 gBattleTerrain;
-extern u16 gTrainerBattleOpponent_A;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
-extern u16 gPartnerTrainerId;
 
 extern u8 GetCurrentMapBattleScene(void);
 
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 3775cf1fb..27c67bd6f 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -23,38 +23,13 @@
 #include "reshow_battle_screen.h"
 #include "pokeball.h"
 #include "data2.h"
+#include "battle_setup.h"
 
-extern u32 gBattleControllerExecFlags;
-extern u8 gActiveBattler;
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gBattlersCount;
-extern bool8 gDoingBattleAnim;
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gSpecialVar_ItemId;
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u16 gUnknown_020243FC;
-extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u16 gPartnerTrainerId;
-extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattlerTarget;
-extern u8 gAbsentBattlerFlags;
-extern u8 gUnknown_020244B4[];
-extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
-extern u16 gTrainerBattleOpponent_A;
-extern u16 gTrainerBattleOpponent_B;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct BattleMove gBattleMoves[];
@@ -64,6 +39,7 @@ extern void sub_8172EF0(u8 bank, struct Pokemon *mon);
 extern void sub_806A068(u16, u8);
 extern void sub_81851A8(u8 *);
 extern u16 sub_8068B48(void);
+extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
 
 // this file's functions
 static void LinkOpponentHandleGetMonData(void);
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 340a2b566..bce5aa52e 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -23,34 +23,11 @@
 #include "reshow_battle_screen.h"
 #include "pokeball.h"
 #include "data2.h"
+#include "battle_setup.h"
 
-extern u32 gBattleControllerExecFlags;
-extern u8 gActiveBattler;
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gBattlersCount;
-extern bool8 gDoingBattleAnim;
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gSpecialVar_ItemId;
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u16 gUnknown_020243FC;
-extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u16 gPartnerTrainerId;
-extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattlerTarget;
-extern u8 gAbsentBattlerFlags;
-extern u8 gUnknown_020244B4[];
-extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
@@ -60,6 +37,7 @@ extern const struct BattleMove gBattleMoves[];
 extern void sub_8172EF0(u8 bank, struct Pokemon *mon);
 extern void sub_806A068(u16, u8);
 extern void sub_81851A8(u8 *);
+extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
 
 // this file's functions
 static void LinkPartnerHandleGetMonData(void);
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 760205d90..4d1190ec8 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -27,33 +27,13 @@
 #include "random.h"
 #include "pokeball.h"
 #include "data2.h"
+#include "battle_setup.h"
 
-extern u32 gBattleControllerExecFlags;
-extern u8 gActiveBattler;
-extern u8 gBattlerTarget;
-extern u8 gAbsentBattlerFlags;
-extern bool8 gDoingBattleAnim;
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern void *gUnknown_020244D8;
-extern void *gUnknown_020244DC;
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern struct UnusedControllerStruct gUnknown_02022D0C;
-extern u16 gTrainerBattleOpponent_A;
-extern u16 gTrainerBattleOpponent_B;
-extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u16 gUnknown_020243FC;
-extern u8 gUnknown_020244B4[];
-extern void (*gPreBattleCallback1)(void);
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
+extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct BattleMove gBattleMoves[];
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index e62985b3b..3805fcc4d 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -26,44 +26,20 @@
 #include "random.h"
 #include "pokeball.h"
 #include "data2.h"
+#include "battle_setup.h"
+#include "item_use.h"
+#include "recorded_battle.h"
 
-extern u32 gBattleControllerExecFlags;
-extern u8 gActiveBattler;
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gAbsentBattlerFlags;
-extern u8 gBattlersCount;
-extern bool8 gDoingBattleAnim;
-extern u8 gPlayerDpadHoldFrames;
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern u8 gMultiUsePlayerCursor;
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern u16 gPartnerTrainerId;
-extern struct SpriteTemplate gUnknown_0202499C;
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u16 gSpecialVar_ItemId;
 extern u8 gUnknown_0203CEE8;
 extern u8 gUnknown_0203CEE9;
 extern u8 gUnknown_0203CF00[];
-extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleOutcome;
-extern u8 gNumberOfMovesToChoose;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern s32 gUnknown_0203CD70;
-extern u8 gBattlerInMenuId;
-extern u32 gBattlePalaceMoveSelectionRngValue;
-extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
-extern u8 gUnknown_020244B4[];
 extern u16 gUnknown_020243FC;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
+extern struct MusicPlayerInfo gMPlayInfo_BGM;
+extern struct SpriteTemplate gUnknown_0202499C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index ac17a4938..26cb71e6e 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -22,35 +22,13 @@
 #include "reshow_battle_screen.h"
 #include "pokeball.h"
 #include "data2.h"
+#include "battle_setup.h"
+#include "item_use.h"
 
-extern u32 gBattleControllerExecFlags;
-extern u8 gActiveBattler;
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gBattlersCount;
-extern bool8 gDoingBattleAnim;
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gSpecialVar_ItemId;
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u8 gBattlerInMenuId;
 extern u16 gUnknown_020243FC;
-extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u16 gPartnerTrainerId;
-extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattlerTarget;
-extern u8 gAbsentBattlerFlags;
-extern u8 gUnknown_020244B4[];
-extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
@@ -60,6 +38,7 @@ extern const struct BattleMove gBattleMoves[];
 extern void sub_81358F4(void);
 extern void sub_8172EF0(u8 bank, struct Pokemon *mon);
 extern void sub_806A068(u16, u8);
+extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
 
 // this file's functions
 static void PlayerPartnerHandleGetMonData(void);
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 8078d0af2..501de3fec 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -24,38 +24,15 @@
 #include "reshow_battle_screen.h"
 #include "pokeball.h"
 #include "data2.h"
+#include "item_use.h"
+#include "battle_setup.h"
 
-extern u32 gBattleControllerExecFlags;
-extern u8 gActiveBattler;
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gBattlersCount;
-extern bool8 gDoingBattleAnim;
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gSpecialVar_ItemId;
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern u16 gUnknown_020243FC;
-extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u16 gPartnerTrainerId;
-extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattlerTarget;
-extern u8 gAbsentBattlerFlags;
-extern u8 gUnknown_020244B4[];
-extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
-extern u16 gTrainerBattleOpponent_A;
-extern u16 gTrainerBattleOpponent_B;
 extern u8 gUnknown_0203C7B4;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
@@ -63,6 +40,7 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern void sub_8172EF0(u8 bank, struct Pokemon *mon);
 extern void sub_806A068(u16, u8);
 extern u16 sub_8068B48(void);
+extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
 
 // this file's functions
 static void RecordedOpponentHandleGetMonData(void);
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index dca2a7022..09834fdb7 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -23,36 +23,13 @@
 #include "reshow_battle_screen.h"
 #include "pokeball.h"
 #include "data2.h"
+#include "item_use.h"
 
-extern u32 gBattleControllerExecFlags;
-extern u8 gActiveBattler;
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gBattlersCount;
-extern bool8 gDoingBattleAnim;
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gSpecialVar_ItemId;
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u8 gBattlerInMenuId;
 extern u16 gUnknown_020243FC;
-extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u16 gPartnerTrainerId;
-extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
-extern u8 gBattlerTarget;
-extern u8 gAbsentBattlerFlags;
-extern u8 gUnknown_020244B4[];
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
-extern u8 gBattleCommunication[];
 extern u8 gUnknown_0203C7B4;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
@@ -63,6 +40,7 @@ extern const struct BattleMove gBattleMoves[];
 
 extern void sub_8172EF0(u8 bank, struct Pokemon *mon);
 extern void sub_806A068(u16, u8);
+extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
 
 // this file's functions
 static void RecordedPlayerHandleGetMonData(void);
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 6264d8324..799632c05 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -21,26 +21,12 @@
 #include "pokeball.h"
 #include "data2.h"
 #include "pokeblock.h"
+#include "item_use.h"
 
-extern u32 gBattleControllerExecFlags;
-extern u8 gActiveBattler;
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gBattlersCount;
-extern bool8 gDoingBattleAnim;
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern void (*gPreBattleCallback1)(void);
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
 extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u16 gSpecialVar_ItemId;
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleOutcome;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u8 gBattlerInMenuId;
 extern u16 gUnknown_020243FC;
 
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index f85c6792a..449edc21f 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -27,37 +27,14 @@
 #include "pokeball.h"
 #include "data2.h"
 #include "party_menu.h"
+#include "battle_setup.h"
+#include "item_use.h"
 
-extern u32 gBattleControllerExecFlags;
-extern u8 gActiveBattler;
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gAbsentBattlerFlags;
-extern u8 gBattlersCount;
-extern bool8 gDoingBattleAnim;
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern u8 gMultiUsePlayerCursor;
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern u16 gPartnerTrainerId;
 extern struct SpriteTemplate gUnknown_0202499C;
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u16 gSpecialVar_ItemId;
-extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleOutcome;
-extern u8 gNumberOfMovesToChoose;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern s32 gUnknown_0203CD70;
-extern u8 gBattlerInMenuId;
-extern u32 gBattlePalaceMoveSelectionRngValue;
-extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
-extern u8 gUnknown_020244B4[];
 extern u16 gUnknown_020243FC;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 4f523cfa0..b30d8834a 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -12,37 +12,13 @@
 #include "constants/abilities.h"
 #include "battle_message.h"
 
-extern u32 gBattleTypeFlags;
-extern u32 gBattleControllerExecFlags;
-extern void (*gBattleMainFunc)(void);
-extern void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void);
-extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gBattlersCount;
-extern u8 gActiveBattler;
+extern u8 gBattleBuffersTransferData[0x100];
 extern u8 gUnknown_0202428C;
 extern u32 gUnknown_02022FF4;
 extern u8 gUnknown_0203C7B4;
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern u8 gBattleBuffersTransferData[0x100];
 extern u8 gUnknown_02022D08;
 extern u8 gUnknown_02022D09;
 extern u8 gUnknown_02022D0A;
-extern u8 gBattlerAttacker;
-extern u8 gBattlerTarget;
-extern u8 gAbsentBattlerFlags;
-extern u8 gEffectBank;
-extern u16 gBattleWeather;
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u16 gCurrentMove;
-extern u16 gChosenMove;
-extern u16 gLastUsedItem;
-extern u8 gBattleOutcome;
-extern u8 gLastUsedAbility;
-extern u8 gStringBattler;
 
 extern const struct BattleMove gBattleMoves[];
 
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 7958d07b3..b622afc9c 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -23,17 +23,7 @@
 #include "contest.h"
 #include "constants/songs.h"
 
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gActiveBattler;
-extern u8 gBattlersCount;
 extern u16 gUnknown_020243FC;
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
diff --git a/src/battle_interface.c b/src/battle_interface.c
index debbc8eb7..e5aa79a0a 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -153,11 +153,6 @@ enum
     HEALTHBOX_GFX_117,
 };
 
-extern u8 gBattlerPositions[MAX_BATTLERS_COUNT];
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattlersCount;
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
-
 extern const u8 * const gNatureNamePointers[];
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 
diff --git a/src/battle_main.c b/src/battle_main.c
index 1195cda52..be0e3d2b0 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -286,8 +286,8 @@ EWRAM_DATA u32 gTransformedPersonalities[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gPlayerDpadHoldFrames = 0;
 EWRAM_DATA struct BattleSpriteData *gBattleSpritesDataPtr = NULL;
 EWRAM_DATA struct MonSpritesGfx *gMonSpritesGfxPtr = NULL;
-EWRAM_DATA u8 *gUnknown_020244D8 = NULL;
-EWRAM_DATA u8 *gUnknown_020244DC = NULL;
+EWRAM_DATA struct BattleHealthboxInfo *gUnknown_020244D8 = NULL;
+EWRAM_DATA struct BattleHealthboxInfo *gUnknown_020244DC = NULL;
 EWRAM_DATA u16 gBattleMovePower = 0;
 EWRAM_DATA u16 gMoveToLearn = 0;
 EWRAM_DATA u8 gBattleMonForms[MAX_BATTLERS_COUNT] = {0};
diff --git a/src/battle_message.c b/src/battle_message.c
index 88d11163d..e37a6883f 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -14,22 +14,7 @@
 #include "battle_controllers.h"
 #include "battle_setup.h"
 
-extern u16 gLastUsedItem;
-extern u8 gLastUsedAbility;
-extern u8 gActiveBattler;
-extern u8 gBattlerAttacker;
-extern u8 gBattlerTarget;
-extern u8 gStringBattler;
-extern u8 gEffectBank;
 extern u8 gBattlerAbilities[MAX_BATTLERS_COUNT];
-extern u32 gBattleTypeFlags;
-extern u16 gTrainerBattleOpponent_A;
-extern u16 gTrainerBattleOpponent_B;
-extern u16 gPartnerTrainerId;
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferA[MAX_BATTLERS_COUNT][0x200];
-extern u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_0203C7B4;
 extern struct StringInfoBattle *gStringInfo;
 
@@ -2360,20 +2345,20 @@ static void sub_814F8F8(u8* textBuff)
 
 // Appends "!" to the text buffer `dst`. In the original Japanese this looked
 // into the table of moves at sUnknownMoveTable and varied the line accordingly.
-// 
+//
 // gText_ExclamationMark was a plain "!", used for any attack not on the list.
 // It resulted in the translation "<NAME>'s <ATTACK>!".
-// 
+//
 // gText_ExclamationMark2 was "を つかった！". This resulted in the translation
 // "<NAME> used <ATTACK>!", which was used for all attacks in English.
-// 
+//
 // gText_ExclamationMark3 was "した！". This was used for those moves whose
 // names were verbs, such as Recover, and resulted in translations like "<NAME>
 // recovered itself!".
-// 
+//
 // gText_ExclamationMark4 was "を した！" This resulted in a translation of
 // "<NAME> did an <ATTACK>!".
-// 
+//
 // gText_ExclamationMark5 was " こうげき！" This resulted in a translation of
 // "<NAME>'s <ATTACK> attack!".
 static void sub_814F950(u8* dst)
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 96af536fe..04496ffcd 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -30,6 +30,7 @@
 #include "strings.h"
 #include "secret_base.h"
 #include "string_util.h"
+#include "overworld.h"
 
 enum
 {
@@ -82,11 +83,7 @@ extern void sub_81D61E8(void);
 extern void sub_80982B8(void);
 extern void sub_81A9EDC(u16 a0);
 extern void sub_81D572C(u8 a0, u16 arg1);
-extern void IncrementGameStat(u8 statId);
-extern u32 GetGameStat(u8 statId);
 
-extern u32 gBattleTypeFlags;
-extern u8 gBattleOutcome;
 extern void (*gFieldCallback)(void);
 
 // this file's functions
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 0ff8cd903..bb7a02f41 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -63,7 +63,6 @@ extern const struct OamData gFieldObjectBaseOam_32x32;
 
 extern void c2_exit_to_overworld_2_switch(void);
 extern void sub_80AC3D0(void);
-extern void ScanlineEffect_Clear(void);
 
 // this file's functions
 static void LaunchBattleTransitionTask(u8 transitionId);
diff --git a/src/battle_util.c b/src/battle_util.c
index 145169f34..861ef0f58 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -23,45 +23,6 @@
 #include "link.h"
 #include "berry.h"
 
-extern const u8* gBattlescriptCurrInstr;
-extern const u8* gSelectionBattleScripts[MAX_BATTLERS_COUNT];
-extern const u8* gPalaceSelectionBattleScripts[MAX_BATTLERS_COUNT];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u8 gActiveBattler;
-extern u8 gStringBattler;
-extern u16 gCurrentMove;
-extern u16 gLastUsedItem;
-extern u8 gBattlersCount;
-extern u32 gStatuses3[MAX_BATTLERS_COUNT];
-extern u8 gBattlerAttacker;
-extern u8 gBattlerTarget;
-extern u8 gAbsentBattlerFlags;
-extern u16 gBattleWeather;
-extern u8 gBattleTurnOrder[MAX_BATTLERS_COUNT];
-extern u16 gSideStatuses[2];
-extern u8 gBattleCommunication[];
-extern void (*gBattleMainFunc)(void);
-extern s32 gBattleMoveDamage;
-extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
-extern u8 gBattleBufferB[MAX_BATTLERS_COUNT][0x200];
-extern u32 gBattleTypeFlags;
-extern u16 gLastMoves[MAX_BATTLERS_COUNT];
-extern u32 gHitMarker;
-extern u8 gEffectBank;
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBank1;
-extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT];
-extern u8 gMoveResultFlags;
-extern s32 gTakenDmg[MAX_BATTLERS_COUNT];
-extern u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT];
-extern u8 gLastUsedAbility;
-extern u8 gCurrentActionFuncId;
-extern u32 gBattleControllerExecFlags;
-extern u16 gRandomMove;
-extern u8 gCurrMovePos;
-extern u8 gUnknown_020241E9;
-extern u8 gSentPokesToOpponent[2];
-
 extern const struct BattleMove gBattleMoves[];
 
 extern u8 weather_get_current(void);
diff --git a/src/battle_util2.c b/src/battle_util2.c
index ba42d4ea9..d079ccb25 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -8,12 +8,7 @@
 #include "random.h"
 #include "battle_scripts.h"
 
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_0203CF00[];
-extern const u8 *gBattlescriptCurrInstr;
-extern u8 gBattleCommunication[];
-extern u8 gActiveBattler;
 
 extern void sub_81D55D0(void);
 extern void sub_81D5694(void);
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c
index b6b83086b..7bf3e7c29 100644
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "constants/abilities.h"
 #include "battle.h"
+#include "battle_setup.h"
 #include "constants/hold_effects.h"
 #include "event_data.h"
 #include "item.h"
@@ -10,15 +11,6 @@
 #include "constants/moves.h"
 #include "constants/battle_move_effects.h"
 
-extern u32 gBattleTypeFlags;
-extern struct BattlePokemon gBattleMons[4];
-extern u16 gCurrentMove;
-extern u8 gCritMultiplier;
-extern u16 gBattleWeather;
-extern struct BattleEnigmaBerry gEnigmaBerries[];
-extern u16 gBattleMovePower;
-extern u16 gTrainerBattleOpponent_A;
-
 bool8 ShouldGetStatBadgeBoost(u16 flagId, u8 bank);
 
 extern const struct BattleMove gBattleMoves[];
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index cbd37be52..3004af93c 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -48,13 +48,11 @@ extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG3_X;
 extern u16 gBattle_BG3_Y;
-extern u8 gBattleTerrain;
 extern struct SpriteTemplate gUnknown_0202499C;
 extern bool8 gAffineAnimsDisabled;
 extern u16 gMoveToLearn;
 extern const u8 gSpeciesNames[][11];
 
-extern u8 gBattleCommunication[];
 #define sEvoCursorPos           gBattleCommunication[1] // when learning a new move
 #define sEvoGraphicsTaskID      gBattleCommunication[2]
 
@@ -113,7 +111,7 @@ static const u16 sUnknown_085B5884[] = INCBIN_U16("graphics/evolution_scene/tran
 
 static const u8 Text_ShedinjaJapaneseName[] = _("ヌケニン");
 
-static const u8 sUnknown_085B58C9[][4] = 
+static const u8 sUnknown_085B58C9[][4] =
 {
     { 0x00, 0x0C, 0x01, 0x06 },
     { 0x0D, 0x24, 0x05, 0x02 },
diff --git a/src/item_use.c b/src/item_use.c
index bf9109dc8..9a40e0aa5 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "item_use.h"
 #include "battle.h"
 #include "berry.h"
 #include "bike.h"
@@ -28,7 +29,6 @@
 #include "task.h"
 #include "text.h"
 
-extern u16 gSpecialVar_ItemId;
 extern void(**gUnknown_0203CE54)(void);
 extern void(**gUnknown_0203CF2C)(void);
 extern void(*gUnknown_0203A0F4)(u8 taskId);
@@ -88,14 +88,12 @@ extern void sub_80B7CC8(void);
 extern void flagmods_08054D70(void);
 extern u8* sub_806CF78(u16);
 extern bool8 ExecuteTableBasedItemEffect_(struct Pokemon*, u16, u8, u8);
-extern u8 gBattlerInMenuId;
-extern u16 gBattlerPartyIndexes[];
 extern void sub_81B89F0(void);
 extern u8 GetItemEffectType(u16);
 extern struct MapConnection *sub_8088A8C(s16, s16);
 
 void MapPostLoadHook_UseItem(void);
-extern void sub_80AF6D4(void);
+void sub_80AF6D4(void);
 void Task_CallItemUseOnFieldCallback(u8 taskId);
 void bag_menu_inits_lists_menu(u8 taskId);
 void ItemUseOnFieldCB_Bike(u8 taskId);
diff --git a/src/pokeball.c b/src/pokeball.c
index ada0258db..795a33827 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -15,12 +15,6 @@
 #include "util.h"
 #include "graphics.h"
 
-extern bool8 gDoingBattleAnim;
-extern u8 gActiveBattler;
-extern u8 gBattlerTarget;
-extern u16 gBattlerPartyIndexes[];
-extern u8 gBattlerSpriteIds[];
-extern u8 gHealthboxSpriteIds[];
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
 // this file's functions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 4affd830d..a1f422180 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -20,6 +20,7 @@
 #include "task.h"
 #include "text.h"
 #include "window.h"
+#include "event_data.h"
 
 struct ContestMove
 {
@@ -36,8 +37,6 @@ struct ContestEffect
     u8 jam;
 };
 
-
-
 extern struct UnkSummaryStruct* gUnknown_0203CF1C;
 extern struct BgTemplate gUnknown_0861CBB4;
 extern u8 gUnknown_0203CF20;
@@ -45,7 +44,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern s8 gUnknown_0861CC1C[];
 extern u8 gUnknown_08329D22[];
 extern u8 gUnknown_0203CF21;
-extern u16 gSpecialVar_0x8005;
 extern struct UnkStruct_61CC04 gUnknown_0861CC04;
 extern struct UnkStruct_61CC04 gUnknown_0861CC10;
 extern struct UnkStruct_61CC04 gUnknown_0861CBEC;
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index fc576462b..f7febfa58 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -13,6 +13,7 @@
 #include "util.h"
 #include "task.h"
 #include "text.h"
+#include "battle_setup.h"
 
 #define BANK_RECORD_SIZE 664
 #define ILLEGAL_BATTLE_TYPES ((BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_FIRST_BATTLE                  \
@@ -21,15 +22,6 @@
                               | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE           \
                               | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA))
 
-extern u32 gBattleTypeFlags;
-extern u16 gTrainerBattleOpponent_A;
-extern u16 gTrainerBattleOpponent_B;
-extern u16 gPartnerTrainerId;
-extern u8 gActiveBattler;
-extern u8 gBattlersCount;
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
-extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_03001278;
 extern u8 gUnknown_03001279;
 
diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c
index 099edce49..9950f6691 100644
--- a/src/reset_save_heap.c
+++ b/src/reset_save_heap.c
@@ -15,7 +15,7 @@ void sub_81700F8(void)
     imeBackup = REG_IME;
     REG_IME = 0;
     RegisterRamReset(0x00000001);
-    ClearGpuRegBits(REG_OFFSET_DISPCNT, 0x80);
+    ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_FORCED_BLANK);
     REG_IME = imeBackup;
     gMain.inBattle = FALSE;
     SetSaveBlocksPointers(sub_815355C());
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 71b544fdc..1a7792e36 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -12,6 +12,7 @@
 #include "sprite.h"
 #include "constants/species.h"
 #include "battle_interface.h"
+#include "battle_anim.h"
 
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
@@ -21,28 +22,15 @@ extern u16 gBattle_BG2_X;
 extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG3_X;
 extern u16 gBattle_BG3_Y;
-extern u8 gReservedSpritePaletteCount;
-extern u8 gActionSelectionCursor[MAX_BATTLERS_COUNT];
-extern u8 gBattlerInMenuId;
-extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
-extern u8 gBattlersCount;
-extern u32 gBattleTypeFlags;
-extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
-extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
-extern u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 
 extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
 
-extern void ScanlineEffect_Clear(void);
 extern void sub_8035658(void);
-extern bool8 IsDoubleBattle(void);
 extern u8 GetSubstituteSpriteDefault_Y(u8 bank);
-extern u8 GetBattlerSpriteDefault_Y(u8 bank);
 extern u8 sub_80A82E4(u8 bank);
 extern void sub_806A068(u16 species, u8 bankIdentity);
 extern void sub_806A12C(u16 backPicId, u8 bankIdentity);
-extern u8 GetBattlerSpriteCoord(u8 bank, u8 caseId);
 
 // this file's functions
 static void CB2_ReshowBattleScreenAfterMenu(void);
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 1768f0d4c..b73ea2125 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -64,13 +64,6 @@ static EWRAM_DATA u16 sMovingNpcMapBank = 0;
 static EWRAM_DATA u16 sMovingNpcMapId = 0;
 static EWRAM_DATA u16 sFieldEffectScriptId = 0;
 
-extern u16 gSpecialVar_0x8000;
-extern u16 gSpecialVar_0x8001;
-extern u16 gSpecialVar_0x8002;
-extern u16 gSpecialVar_0x8004;
-
-extern u16 gSpecialVar_Result;
-
 extern u16 gSpecialVar_ContestCategory;
 
 IWRAM_DATA u8 gUnknown_03000F30;
-- 
cgit v1.2.3


From 5db765a475bf401417bbf7a3ca8b89dc0425f793 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Wed, 7 Feb 2018 17:13:59 -0600
Subject: Make small change to sub_819A080

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

(limited to 'src')

diff --git a/src/menu.c b/src/menu.c
index 34a689c73..d06f950d3 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -2018,7 +2018,7 @@ void sub_819A080(struct UnkStruct_819A080 *a0, struct UnkStruct_819A080 *a1, u16
     // sp+04 = a1
     // sp+08 = a2
     // sp+0c = a4
-    int sp10 = a1->unk04 - a4 > a6 ? a6 + a2 : a1->unk04 - a4;
+    int sp10 = a1->unk04 - a4 < a6 ? a1->unk04 - a4 + a2 : a6 + a2;
     int sp14 = a0->unk06 - a5 < a7 ? a3 + a0->unk06 - a5 : a3 + a7;
     int sp18 = (a0->unk04 + (a0->unk04 & 0x7)) / 8;
     int sp1c = (a1->unk04 + (a1->unk04 & 0x7)) / 8;
-- 
cgit v1.2.3


From a10fd5a7c4d92551c579baacf07c499b6f434619 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 8 Feb 2018 00:35:13 +0100
Subject: create more battle constants

---
 src/battle_main.c            | 12 ++++++------
 src/battle_message.c         |  2 +-
 src/battle_script_commands.c |  4 ++--
 src/battle_setup.c           |  4 ++--
 src/battle_util.c            |  2 +-
 src/evolution_scene.c        |  2 +-
 src/safari_zone.c            |  4 ++--
 src/tv.c                     |  8 ++++----
 8 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/battle_main.c b/src/battle_main.c
index be0e3d2b0..22468196f 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -43,7 +43,7 @@
 #include "roamer.h"
 #include "tv.h"
 #include "safari_zone.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
 #include "data2.h"
 #include "decompress.h"
 
@@ -330,11 +330,11 @@ static void (* const sEndTurnFuncsTable[])(void) =
     HandleEndTurn_BattleLost,           // B_OUTCOME_DREW
     HandleEndTurn_RanFromBattle,        // B_OUTCOME_RAN
     HandleEndTurn_FinishBattle,         // B_OUTCOME_PLAYER_TELEPORTED
-    HandleEndTurn_MonFled,              // B_OUTCOME_POKE_FLED
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_CAUGHT_POKE
+    HandleEndTurn_MonFled,              // B_OUTCOME_MON_FLED
+    HandleEndTurn_FinishBattle,         // B_OUTCOME_CAUGHT
     HandleEndTurn_FinishBattle,         // battle outcome 8
     HandleEndTurn_FinishBattle,         // B_OUTCOME_FORFEITED
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_POKE_TELEPORTED
+    HandleEndTurn_FinishBattle,         // B_OUTCOME_MON_TELEPORTED
 };
 
 const u8 gStatusConditionString_PoisonJpn[8] = _("どく$$$$$");
@@ -5025,7 +5025,7 @@ static void ReturnFromBattleToOverworld(void)
     if (gBattleTypeFlags & BATTLE_TYPE_ROAMER)
     {
         UpdateRoamerHPStatus(&gEnemyParty[0]);
-        if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
+        if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT)
             SetRoamerInactive();
     }
 
@@ -5496,7 +5496,7 @@ static void HandleAction_Run(void)
             else
             {
                 gCurrentTurnActionNumber = gBattlersCount;
-                gBattleOutcome = B_OUTCOME_POKE_FLED;
+                gBattleOutcome = B_OUTCOME_MON_FLED;
             }
         }
     }
diff --git a/src/battle_message.c b/src/battle_message.c
index e37a6883f..2f7124554 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_message.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
 #include "constants/moves.h"
 #include "text.h"
 #include "string_util.h"
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 57aff68ec..753dd1f7e 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -38,7 +38,7 @@
 #include "pokemon_storage_system.h"
 #include "task.h"
 #include "naming_screen.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
 #include "battle_setup.h"
 #include "overworld.h"
 
@@ -7053,7 +7053,7 @@ static void atk76_various(void)
         if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
             gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED;
         else
-            gBattleOutcome = B_OUTCOME_POKE_TELEPORTED;
+            gBattleOutcome = B_OUTCOME_MON_TELEPORTED;
         break;
     case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC:
         BtlController_EmitPlayFanfareOrBGM(0, MUS_KACHI1, TRUE);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 04496ffcd..81600cab7 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -993,8 +993,8 @@ static bool32 IsPlayerDefeated(u32 battleOutcome)
     case B_OUTCOME_WON:
     case B_OUTCOME_RAN:
     case B_OUTCOME_PLAYER_TELEPORTED:
-    case B_OUTCOME_POKE_FLED:
-    case B_OUTCOME_CAUGHT_POKE:
+    case B_OUTCOME_MON_FLED:
+    case B_OUTCOME_CAUGHT:
         return FALSE;
     default:
         return FALSE;
diff --git a/src/battle_util.c b/src/battle_util.c
index 861ef0f58..06d80d7ca 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -15,7 +15,7 @@
 #include "text.h"
 #include "string_util.h"
 #include "battle_message.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
 #include "battle_ai_script_commands.h"
 #include "battle_controllers.h"
 #include "event_data.h"
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 3004af93c..e7a9d7cbd 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -21,7 +21,7 @@
 #include "constants/songs.h"
 #include "overworld.h"
 #include "battle_message.h"
-#include "battle_string_ids.h"
+#include "constants/battle_string_ids.h"
 #include "gpu_regs.h"
 #include "bg.h"
 #include "link.h"
diff --git a/src/safari_zone.c b/src/safari_zone.c
index 12da73090..dd3cf3733 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -108,7 +108,7 @@ void SafariZoneRetirePrompt(void)
 void CB2_EndSafariBattle(void)
 {
     sSafariZoneFleedMons += gBattleResults.field_1F;
-    if (gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
+    if (gBattleOutcome == B_OUTCOME_CAUGHT)
         sSafariZoneCaughtMons++;
     if (gNumSafariBalls != 0)
     {
@@ -121,7 +121,7 @@ void CB2_EndSafariBattle(void)
         gFieldCallback = sub_80AF6F0;
         SetMainCallback2(c2_load_new_map);
     }
-    else if (gBattleOutcome == B_OUTCOME_CAUGHT_POKE)
+    else if (gBattleOutcome == B_OUTCOME_CAUGHT)
     {
         ScriptContext1_SetupScript(EventScript_2A4B9B);
         ScriptContext1_Stop();
diff --git a/src/tv.c b/src/tv.c
index 0fb2997ad..ddcff9f1d 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1208,7 +1208,7 @@ void PutPokemonTodayFailedOnTheAir(void)
         {
             ct = 0xFF;
         }
-        if (ct > 2 && (gBattleOutcome == B_OUTCOME_POKE_FLED || gBattleOutcome == B_OUTCOME_WON))
+        if (ct > 2 && (gBattleOutcome == B_OUTCOME_MON_FLED || gBattleOutcome == B_OUTCOME_WON))
         {
             sCurTVShowSlot = FindEmptyTVSlotBeyondFirstFiveShowsOfArray(gSaveBlock1Ptr->tvShows);
             if (sCurTVShowSlot != -1 && HasMixableShowAlreadyBeenSpawnedWithPlayerID(TVSHOW_POKEMON_TODAY_FAILED, FALSE) != TRUE)
@@ -2406,7 +2406,7 @@ void sub_80EE184(void)
             case B_OUTCOME_DREW:
                 show->breakingNews.kind = TVSHOW_OFF_AIR;
                 return;
-            case B_OUTCOME_CAUGHT_POKE:
+            case B_OUTCOME_CAUGHT:
                 show->breakingNews.outcome = 0;
                 break;
             case B_OUTCOME_WON:
@@ -2417,8 +2417,8 @@ void sub_80EE184(void)
             case B_OUTCOME_NO_SAFARI_BALLS:
                 show->breakingNews.outcome = 2;
                 break;
-            case B_OUTCOME_POKE_FLED:
-            case B_OUTCOME_POKE_TELEPORTED:
+            case B_OUTCOME_MON_FLED:
+            case B_OUTCOME_MON_TELEPORTED:
                 show->breakingNews.outcome = 3;
                 break;
         }
-- 
cgit v1.2.3


From 96290f4ee3864afdd9946541706102ecf6c1c009 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 8 Feb 2018 11:17:41 +0100
Subject: pokemon and battle constants

---
 src/battle_controller_link_opponent.c     |   8 +-
 src/battle_controller_link_partner.c      |   8 +-
 src/battle_controller_opponent.c          |   8 +-
 src/battle_controller_player.c            |   9 +-
 src/battle_controller_player_partner.c    |   9 +-
 src/battle_controller_recorded_opponent.c |  11 +-
 src/battle_controller_recorded_player.c   |  11 +-
 src/battle_controller_safari.c            |   3 +-
 src/battle_controller_wally.c             |   7 +-
 src/battle_controllers.c                  |   4 +-
 src/battle_gfx_sfx_util.c                 |   3 +-
 src/battle_interface.c                    |   2 +-
 src/battle_main.c                         | 192 ++++++++--------
 src/battle_message.c                      |   4 +-
 src/battle_script_commands.c              | 371 +++++++++++++++---------------
 src/battle_util.c                         | 363 ++++++++++++++---------------
 src/battle_util2.c                        |  46 ++--
 src/calculate_base_damage.c               |  28 +--
 src/recorded_battle.c                     |  98 ++++----
 19 files changed, 591 insertions(+), 594 deletions(-)

(limited to 'src')

diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 27c67bd6f..d95527965 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1697,7 +1697,7 @@ static void LinkOpponentHandleFaintingCry(void)
 static void LinkOpponentHandleIntroSlide(void)
 {
     HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_020243FC |= 1;
+    gIntroSlideFlags |= 1;
     LinkOpponentBufferExecCompleted();
 }
 
@@ -1719,7 +1719,7 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void)
     gTasks[taskId].data[0] = gActiveBattler;
 
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
     gBattlerControllerFuncs[gActiveBattler] = nullsub_28;
@@ -1779,7 +1779,7 @@ static void LinkOpponentHandleDrawPartyStatusSummary(void)
             }
         }
 
-        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
         if (gBattleBufferA[gActiveBattler][2] != 0)
@@ -1801,7 +1801,7 @@ static void sub_806782C(void)
 static void LinkOpponentHandleCmd49(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
     LinkOpponentBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index bce5aa52e..9d2c79922 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -1521,7 +1521,7 @@ static void LinkPartnerHandleFaintingCry(void)
 static void LinkPartnerHandleIntroSlide(void)
 {
     HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_020243FC |= 1;
+    gIntroSlideFlags |= 1;
     LinkPartnerBufferExecCompleted();
 }
 
@@ -1567,7 +1567,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
     gTasks[taskId].data[0] = gActiveBattler;
 
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
     gBattlerControllerFuncs[gActiveBattler] = nullsub_112;
@@ -1614,7 +1614,7 @@ static void LinkPartnerHandleDrawPartyStatusSummary(void)
     else
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
-        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
         if (gBattleBufferA[gActiveBattler][2] != 0)
@@ -1636,7 +1636,7 @@ static void sub_814DE9C(void)
 static void LinkPartnerHandleCmd49(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
     LinkPartnerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 4d1190ec8..5a3732f8b 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1846,7 +1846,7 @@ static void OpponentHandleFaintingCry(void)
 static void OpponentHandleIntroSlide(void)
 {
     HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_020243FC |= 1;
+    gIntroSlideFlags |= 1;
     OpponentBufferExecCompleted();
 }
 
@@ -1868,7 +1868,7 @@ static void OpponentHandleIntroTrainerBallThrow(void)
     gTasks[taskId].data[0] = gActiveBattler;
 
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
     gBattlerControllerFuncs[gActiveBattler] = nullsub_26;
@@ -1933,7 +1933,7 @@ static void OpponentHandleDrawPartyStatusSummary(void)
             }
         }
 
-        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
         if (gBattleBufferA[gActiveBattler][2] != 0)
@@ -1955,7 +1955,7 @@ static void sub_8062A2C(void)
 static void OpponentHandleCmd49(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
     OpponentBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 3805fcc4d..897122ddd 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -36,7 +36,6 @@ extern u8 gUnknown_0203CF00[];
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern s32 gUnknown_0203CD70;
-extern u16 gUnknown_020243FC;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct SpriteTemplate gUnknown_0202499C;
@@ -2929,7 +2928,7 @@ static void PlayerHandleFaintingCry(void)
 static void PlayerHandleIntroSlide(void)
 {
     HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_020243FC |= 1;
+    gIntroSlideFlags |= 1;
     PlayerBufferExecCompleted();
 }
 
@@ -2957,7 +2956,7 @@ static void PlayerHandleIntroTrainerBallThrow(void)
     gTasks[taskId].data[0] = gActiveBattler;
 
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
     gBattlerControllerFuncs[gActiveBattler] = nullsub_21;
@@ -3015,7 +3014,7 @@ static void PlayerHandleDrawPartyStatusSummary(void)
     else
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
-        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
         if (gBattleBufferA[gActiveBattler][2] != 0)
@@ -3037,7 +3036,7 @@ static void sub_805CE38(void)
 static void PlayerHandleCmd49(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
     PlayerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 26cb71e6e..159fdb2ff 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -28,7 +28,6 @@
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u16 gUnknown_020243FC;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
@@ -1775,7 +1774,7 @@ static void PlayerPartnerHandleFaintingCry(void)
 static void PlayerPartnerHandleIntroSlide(void)
 {
     HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_020243FC |= 1;
+    gIntroSlideFlags |= 1;
     PlayerPartnerBufferExecCompleted();
 }
 
@@ -1814,7 +1813,7 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
     gTasks[taskId].data[0] = gActiveBattler;
 
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
     gBattlerControllerFuncs[gActiveBattler] = nullsub_77;
@@ -1861,7 +1860,7 @@ static void PlayerPartnerHandleDrawPartyStatusSummary(void)
     else
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
-        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
         if (gBattleBufferA[gActiveBattler][2] != 0)
@@ -1883,7 +1882,7 @@ static void sub_81BE498(void)
 static void PlayerPartnerHandleCmd49(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
     PlayerPartnerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 501de3fec..855dfc554 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -30,7 +30,6 @@
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u16 gUnknown_020243FC;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 extern u8 gUnknown_0203C7B4;
@@ -1236,7 +1235,7 @@ static void RecordedOpponentHandleDrawTrainerPic(void)
         }
         else
         {
-            trainerPicId = PlayerGenderToFrontTrainerPicId(GetActiveBankLinkPlayerGender());
+            trainerPicId = PlayerGenderToFrontTrainerPicId(GetActiveBattlerLinkPlayerGender());
         }
     }
     else
@@ -1639,7 +1638,7 @@ static void RecordedOpponentHandleFaintingCry(void)
 static void RecordedOpponentHandleIntroSlide(void)
 {
     HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_020243FC |= 1;
+    gIntroSlideFlags |= 1;
     RecordedOpponentBufferExecCompleted();
 }
 
@@ -1661,7 +1660,7 @@ static void RecordedOpponentHandleIntroTrainerBallThrow(void)
     gTasks[taskId].data[0] = gActiveBattler;
 
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
     gBattlerControllerFuncs[gActiveBattler] = nullsub_70;
@@ -1721,7 +1720,7 @@ static void RecordedOpponentHandleDrawPartyStatusSummary(void)
             }
         }
 
-        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
         if (gBattleBufferA[gActiveBattler][2] != 0)
@@ -1743,7 +1742,7 @@ static void sub_818975C(void)
 static void RecordedOpponentHandleCmd49(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
     RecordedOpponentBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 09834fdb7..4efe5babf 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -28,7 +28,6 @@
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u16 gUnknown_020243FC;
 extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_0203C7B4;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
@@ -1208,7 +1207,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
     if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
     {
         if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
-            trainerPicId = GetActiveBankLinkPlayerGender();
+            trainerPicId = GetActiveBattlerLinkPlayerGender();
         else
             trainerPicId = gLinkPlayers[gUnknown_0203C7B4].gender;
     }
@@ -1662,7 +1661,7 @@ static void RecordedPlayerHandleFaintingCry(void)
 static void RecordedPlayerHandleIntroSlide(void)
 {
     HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_020243FC |= 1;
+    gIntroSlideFlags |= 1;
     RecordedPlayerBufferExecCompleted();
 }
 
@@ -1697,7 +1696,7 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void)
     gTasks[taskId].data[0] = gActiveBattler;
 
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
     gBattlerControllerFuncs[gActiveBattler] = nullsub_120;
@@ -1744,7 +1743,7 @@ static void RecordedPlayerHandleDrawPartyStatusSummary(void)
     else
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
-        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_5 = 0;
 
         if (gBattleBufferA[gActiveBattler][2] != 0)
@@ -1766,7 +1765,7 @@ static void sub_818CDF4(void)
 static void RecordedPlayerHandleCmd49(void)
 {
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
     RecordedPlayerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 799632c05..f65d11a84 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -27,7 +27,6 @@ extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT];
 extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
-extern u16 gUnknown_020243FC;
 
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
 
@@ -634,7 +633,7 @@ static void SafariHandleFaintingCry(void)
 static void SafariHandleIntroSlide(void)
 {
     HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_020243FC |= 1;
+    gIntroSlideFlags |= 1;
     SafariBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 449edc21f..ad028b719 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -35,7 +35,6 @@ extern struct SpriteTemplate gUnknown_0202499C;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG0_Y;
 extern s32 gUnknown_0203CD70;
-extern u16 gUnknown_020243FC;
 extern struct UnusedControllerStruct gUnknown_02022D0C;
 
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
@@ -1429,7 +1428,7 @@ static void WallyHandleFaintingCry(void)
 static void WallyHandleIntroSlide(void)
 {
     HandleIntroSlide(gBattleBufferA[gActiveBattler][1]);
-    gUnknown_020243FC |= 1;
+    gIntroSlideFlags |= 1;
     WallyBufferExecCompleted();
 }
 
@@ -1457,7 +1456,7 @@ static void WallyHandleIntroTrainerBallThrow(void)
     gTasks[taskId].data[0] = gActiveBattler;
 
     if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1)
-        gTasks[gUnknown_020244B4[gActiveBattler]].func = sub_8073C30;
+        gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = sub_8073C30;
 
     gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
     gBattlerControllerFuncs[gActiveBattler] = nullsub_21;
@@ -1518,7 +1517,7 @@ static void WallyHandleDrawPartyStatusSummary(void)
     else
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].flag_x1 = 1;
-        gUnknown_020244B4[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+        gBattlerStatusSummaryTaskId[gActiveBattler] = CreatePartyStatusSummarySprites(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
         WallyBufferExecCompleted();
     }
 }
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index b30d8834a..5c52e4f9e 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -733,7 +733,7 @@ void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data)
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_LO] = alignedSize;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8;
     gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BANK_FLAGS] = gAbsentBattlerFlags;
-    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_EFFECT_BANK] = gEffectBank;
+    gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_EFFECT_BANK] = gEffectBattler;
 
     for (i = 0; i < size; i++)
         gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_DATA + i] = data[i];
@@ -899,7 +899,7 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
                 gBattlerAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 2];
                 gBattlerTarget = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
                 gAbsentBattlerFlags = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 6];
-                gEffectBank = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 7];
+                gEffectBattler = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 7];
             }
             break;
         case 1:
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index b622afc9c..b94a6c7c9 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -23,7 +23,6 @@
 #include "contest.h"
 #include "constants/songs.h"
 
-extern u16 gUnknown_020243FC;
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
@@ -356,7 +355,7 @@ void sub_805D770(struct Sprite *sprite, bool8 arg1)
 
 void sub_805D7AC(struct Sprite *sprite)
 {
-    if (!(gUnknown_020243FC & 1))
+    if (!(gIntroSlideFlags & 1))
     {
         sprite->pos2.x += sprite->data[0];
         if (sprite->pos2.x == 0)
diff --git a/src/battle_interface.c b/src/battle_interface.c
index e5aa79a0a..3be01f8dc 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1531,7 +1531,7 @@ u8 CreatePartyStatusSummarySprites(u8 bank, struct HpAndStatus *partyInfo, u8 ar
         gSprites[barSpriteId].pos1.x += 96;
     }
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
     {
         ballIconSpritesIds[i] = CreateSpriteAtEnd(&sStatusSummaryBallsSpriteTemplates[isOpponent], bar_X, bar_Y - 4, 9);
 
diff --git a/src/battle_main.c b/src/battle_main.c
index 22468196f..c45d559b5 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -116,11 +116,11 @@ extern void PadNameString(u8* dst, u8 arg2); //
 extern void sub_81B9150(void);
 extern void sub_800AC34(void);
 extern void sub_80B3AF8(u8 taskId); // cable club
-extern void sub_8076918(u8 bank);
+extern void sub_8076918(u8 battlerId);
 extern void SetHealthboxSpriteVisible(u8 healthoxSpriteId);
 extern void sub_81A56B4(void); // battle frontier 2
 extern u8 sub_81A9E28(void); // battle frontier 2
-extern void sub_81A56E8(u8 bank); // battle frontier 2
+extern void sub_81A56E8(u8 battlerId); // battle frontier 2
 extern void sub_81B8FB0(u8, u8); // party menu
 extern u8 pokemon_order_func(u8); // party menu
 extern bool8 InBattlePyramid(void);
@@ -168,7 +168,7 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void);
 static void TryDoEventsBeforeFirstTurn(void);
 static void HandleTurnActionSelectionState(void);
 static void RunTurnActionsFunctions(void);
-static void SetActionsAndBanksTurnOrder(void);
+static void SetActionsAndBattlersTurnOrder(void);
 static void sub_803CDF8(void);
 static bool8 sub_803CDB8(void);
 static void CheckFocusPunch_ClearVarsBeforeTurnStarts(void);
@@ -197,7 +197,7 @@ static void HandleAction_NothingIsFainted(void);
 static void HandleAction_ActionFinished(void);
 
 // EWRAM vars
-EWRAM_DATA u32 gUnknown_02022F88[25] = {0};
+EWRAM_DATA static u32 sUnusedUnknownArray[25] = {0};
 EWRAM_DATA u32 gBattleTypeFlags = 0;
 EWRAM_DATA u8 gBattleTerrain = 0;
 EWRAM_DATA u32 gUnknown_02022FF4 = 0;
@@ -219,7 +219,7 @@ EWRAM_DATA u8 gCurrentActionFuncId = 0;
 EWRAM_DATA struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gCurrMovePos = 0;
-EWRAM_DATA u8 gUnknown_020241E9 = 0;
+EWRAM_DATA u8 gChosenMovePos = 0;
 EWRAM_DATA u16 gCurrentMove = 0;
 EWRAM_DATA u16 gChosenMove = 0;
 EWRAM_DATA u16 gRandomMove = 0;
@@ -230,8 +230,8 @@ EWRAM_DATA u16 gLastUsedItem = 0;
 EWRAM_DATA u8 gLastUsedAbility = 0;
 EWRAM_DATA u8 gBattlerAttacker = 0;
 EWRAM_DATA u8 gBattlerTarget = 0;
-EWRAM_DATA u8 gBank1 = 0;
-EWRAM_DATA u8 gEffectBank = 0;
+EWRAM_DATA u8 gBattlerFainted = 0;
+EWRAM_DATA u8 gEffectBattler = 0;
 EWRAM_DATA u8 gStringBattler = 0;
 EWRAM_DATA u8 gAbsentBattlerFlags = 0;
 EWRAM_DATA u8 gCritMultiplier = 0;
@@ -251,7 +251,7 @@ EWRAM_DATA u8 gLastHitBy[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gMoveResultFlags = 0;
 EWRAM_DATA u32 gHitMarker = 0;
-EWRAM_DATA u8 gUnknown_02024284[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA static u8 sUnusedBattlersArray[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gUnknown_0202428C = 0;
 EWRAM_DATA u16 gSideStatuses[2] = {0};
@@ -267,7 +267,7 @@ EWRAM_DATA struct ProtectStruct gProtectStructs[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA struct SpecialStatus gSpecialStatuses[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u16 gBattleWeather = 0;
 EWRAM_DATA struct WishFutureKnock gWishFutureKnock = {0};
-EWRAM_DATA u16 gUnknown_020243FC = 0;
+EWRAM_DATA u16 gIntroSlideFlags = 0;
 EWRAM_DATA u8 gSentPokesToOpponent[2] = {0};
 EWRAM_DATA u16 gDynamicBasePower = 0;
 EWRAM_DATA u16 gExpShareExp = 0;
@@ -279,7 +279,7 @@ EWRAM_DATA u8 *gLinkBattleRecvBuffer = NULL;
 EWRAM_DATA struct BattleResources *gBattleResources = NULL;
 EWRAM_DATA u8 gActionSelectionCursor[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gMoveSelectionCursor[MAX_BATTLERS_COUNT] = {0};
-EWRAM_DATA u8 gUnknown_020244B4[MAX_BATTLERS_COUNT] = {0};
+EWRAM_DATA u8 gBattlerStatusSummaryTaskId[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u8 gBattlerInMenuId = 0;
 EWRAM_DATA bool8 gDoingBattleAnim = FALSE;
 EWRAM_DATA u32 gTransformedPersonalities[MAX_BATTLERS_COUNT] = {0};
@@ -1740,7 +1740,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
             else
                 personalityValue = 0x88;
 
-            for (j = 0; gTrainers[trainerNum].trainerName[j] != 0xFF; j++)
+            for (j = 0; gTrainers[trainerNum].trainerName[j] != EOS; j++)
                 nameHash += gTrainers[trainerNum].trainerName[j];
 
             switch (gTrainers[trainerNum].partyFlags)
@@ -2425,7 +2425,7 @@ void oac_poke_opponent(struct Sprite *sprite)
 
 static void sub_803980C(struct Sprite *sprite)
 {
-    if ((gUnknown_020243FC & 1) == 0)
+    if ((gIntroSlideFlags & 1) == 0)
     {
         sprite->pos2.x += 2;
         if (sprite->pos2.x == 0)
@@ -2479,7 +2479,7 @@ static void sub_80398D0(struct Sprite *sprite)
         {
             sprite->invisible = FALSE;
             sprite->callback = SpriteCallbackDummy_2;
-            gUnknown_02022F88[0] = 0;
+            sUnusedUnknownArray[0] = 0;
         }
     }
 }
@@ -2602,7 +2602,7 @@ void sub_8039BB4(struct Sprite *sprite)
 
 static void oac_poke_ally_(struct Sprite *sprite)
 {
-    if ((gUnknown_020243FC & 1) == 0)
+    if ((gIntroSlideFlags & 1) == 0)
     {
         sprite->pos2.x -= 2;
         if (sprite->pos2.x == 0)
@@ -2624,7 +2624,7 @@ static void SpriteCallbackDummy_3(struct Sprite *sprite)
 
 void sub_8039C00(struct Sprite *sprite)
 {
-    if (!(gUnknown_020243FC & 1))
+    if (!(gIntroSlideFlags & 1))
     {
         sprite->pos2.x += sprite->data[1];
         sprite->pos2.y += sprite->data[2];
@@ -2773,7 +2773,7 @@ static void BattleStartClearSetData(void)
             dataPtr[j] = 0;
 
         gDisableStructs[i].isFirstTurn = 2;
-        gUnknown_02024284[i] = 0;
+        sUnusedBattlersArray[i] = 0;
         gLastMoves[i] = 0;
         gLastLandedMoves[i] = 0;
         gLastHitByType[i] = 0;
@@ -2826,7 +2826,7 @@ static void BattleStartClearSetData(void)
 
     gPauseCounterBattle = 0;
     gBattleMoveDamage = 0;
-    gUnknown_020243FC = 0;
+    gIntroSlideFlags = 0;
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
     gLeveledUpInBattle = 0;
@@ -3926,7 +3926,7 @@ static void HandleTurnActionSelectionState(void)
         switch (gBattleCommunication[gActiveBattler])
         {
         case STATE_TURN_START_RECORD: // recorded battle related on start of every turn
-            RecordedBattle_CopyBankMoves();
+            RecordedBattle_CopyBattlerMoves();
             gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN;
             break;
         case STATE_BEFORE_ACTION_CHOSEN: // choose an action
@@ -4330,7 +4330,7 @@ static void HandleTurnActionSelectionState(void)
     if (gBattleCommunication[ACTIONS_CONFIRMED_COUNT] == gBattlersCount)
     {
         sub_818603C(1);
-        gBattleMainFunc = SetActionsAndBanksTurnOrder;
+        gBattleMainFunc = SetActionsAndBattlersTurnOrder;
 
         if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
         {
@@ -4387,162 +4387,162 @@ void SwapTurnOrder(u8 id1, u8 id2)
     gBattleTurnOrder[id2] = temp;
 }
 
-u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves)
+u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
 {
     u8 strikesFirst = 0;
-    u8 speedMultiplierBank1 = 0, speedMultiplierBank2 = 0;
-    u32 speedBank1 = 0, speedBank2 = 0;
+    u8 speedMultiplierBattler1 = 0, speedMultiplierBattler2 = 0;
+    u32 speedBattler1 = 0, speedBattler2 = 0;
     u8 holdEffect = 0;
     u8 holdEffectParam = 0;
-    u16 moveBank1 = 0, moveBank2 = 0;
+    u16 moveBattler1 = 0, moveBattler2 = 0;
 
     if (WEATHER_HAS_EFFECT)
     {
-        if ((gBattleMons[bank1].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY)
-            || (gBattleMons[bank1].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY))
-            speedMultiplierBank1 = 2;
+        if ((gBattleMons[battler1].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY)
+            || (gBattleMons[battler1].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY))
+            speedMultiplierBattler1 = 2;
         else
-            speedMultiplierBank1 = 1;
+            speedMultiplierBattler1 = 1;
 
-        if ((gBattleMons[bank2].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY)
-            || (gBattleMons[bank2].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY))
-            speedMultiplierBank2 = 2;
+        if ((gBattleMons[battler2].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY)
+            || (gBattleMons[battler2].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY))
+            speedMultiplierBattler2 = 2;
         else
-            speedMultiplierBank2 = 1;
+            speedMultiplierBattler2 = 1;
     }
     else
     {
-        speedMultiplierBank1 = 1;
-        speedMultiplierBank2 = 1;
+        speedMultiplierBattler1 = 1;
+        speedMultiplierBattler2 = 1;
     }
 
-    speedBank1 = (gBattleMons[bank1].speed * speedMultiplierBank1)
-                * (gStatStageRatios[gBattleMons[bank1].statStages[STAT_STAGE_SPEED]][0])
-                / (gStatStageRatios[gBattleMons[bank1].statStages[STAT_STAGE_SPEED]][1]);
+    speedBattler1 = (gBattleMons[battler1].speed * speedMultiplierBattler1)
+                * (gStatStageRatios[gBattleMons[battler1].statStages[STAT_STAGE_SPEED]][0])
+                / (gStatStageRatios[gBattleMons[battler1].statStages[STAT_STAGE_SPEED]][1]);
 
-    if (gBattleMons[bank1].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[battler1].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[bank1].holdEffect;
-        holdEffectParam = gEnigmaBerries[bank1].holdEffectParam;
+        holdEffect = gEnigmaBerries[battler1].holdEffect;
+        holdEffectParam = gEnigmaBerries[battler1].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank1].item);
-        holdEffectParam = ItemId_GetHoldEffectParam(gBattleMons[bank1].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[battler1].item);
+        holdEffectParam = ItemId_GetHoldEffectParam(gBattleMons[battler1].item);
     }
 
     // badge boost
     if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
         && FlagGet(FLAG_BADGE03_GET)
-        && GetBattlerSide(bank1) == B_SIDE_PLAYER)
+        && GetBattlerSide(battler1) == B_SIDE_PLAYER)
     {
-        speedBank1 = (speedBank1 * 110) / 100;
+        speedBattler1 = (speedBattler1 * 110) / 100;
     }
 
     if (holdEffect == HOLD_EFFECT_MACHO_BRACE)
-        speedBank1 /= 2;
+        speedBattler1 /= 2;
 
-    if (gBattleMons[bank1].status1 & STATUS1_PARALYSIS)
-        speedBank1 /= 4;
+    if (gBattleMons[battler1].status1 & STATUS1_PARALYSIS)
+        speedBattler1 /= 4;
 
     if (holdEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (0xFFFF * holdEffectParam) / 100)
-        speedBank1 = UINT_MAX;
+        speedBattler1 = UINT_MAX;
 
-    // check second bank's speed
+    // check second battlerId's speed
 
-    speedBank2 = (gBattleMons[bank2].speed * speedMultiplierBank2)
-                * (gStatStageRatios[gBattleMons[bank2].statStages[STAT_STAGE_SPEED]][0])
-                / (gStatStageRatios[gBattleMons[bank2].statStages[STAT_STAGE_SPEED]][1]);
+    speedBattler2 = (gBattleMons[battler2].speed * speedMultiplierBattler2)
+                * (gStatStageRatios[gBattleMons[battler2].statStages[STAT_STAGE_SPEED]][0])
+                / (gStatStageRatios[gBattleMons[battler2].statStages[STAT_STAGE_SPEED]][1]);
 
-    if (gBattleMons[bank2].item == ITEM_ENIGMA_BERRY)
+    if (gBattleMons[battler2].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[bank2].holdEffect;
-        holdEffectParam = gEnigmaBerries[bank2].holdEffectParam;
+        holdEffect = gEnigmaBerries[battler2].holdEffect;
+        holdEffectParam = gEnigmaBerries[battler2].holdEffectParam;
     }
     else
     {
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank2].item);
-        holdEffectParam = ItemId_GetHoldEffectParam(gBattleMons[bank2].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[battler2].item);
+        holdEffectParam = ItemId_GetHoldEffectParam(gBattleMons[battler2].item);
     }
 
     // badge boost
     if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER))
         && FlagGet(FLAG_BADGE03_GET)
-        && GetBattlerSide(bank2) == B_SIDE_PLAYER)
+        && GetBattlerSide(battler2) == B_SIDE_PLAYER)
     {
-        speedBank2 = (speedBank2 * 110) / 100;
+        speedBattler2 = (speedBattler2 * 110) / 100;
     }
 
     if (holdEffect == HOLD_EFFECT_MACHO_BRACE)
-        speedBank2 /= 2;
+        speedBattler2 /= 2;
 
-    if (gBattleMons[bank2].status1 & STATUS1_PARALYSIS)
-        speedBank2 /= 4;
+    if (gBattleMons[battler2].status1 & STATUS1_PARALYSIS)
+        speedBattler2 /= 4;
 
     if (holdEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (0xFFFF * holdEffectParam) / 100)
-        speedBank2 = UINT_MAX;
+        speedBattler2 = UINT_MAX;
 
     if (ignoreChosenMoves)
     {
-        moveBank1 = MOVE_NONE;
-        moveBank2 = MOVE_NONE;
+        moveBattler1 = MOVE_NONE;
+        moveBattler2 = MOVE_NONE;
     }
     else
     {
-        if (gChosenActionByBattler[bank1] == B_ACTION_USE_MOVE)
+        if (gChosenActionByBattler[battler1] == B_ACTION_USE_MOVE)
         {
-            if (gProtectStructs[bank1].onlyStruggle)
-                moveBank1 = MOVE_STRUGGLE;
+            if (gProtectStructs[battler1].onlyStruggle)
+                moveBattler1 = MOVE_STRUGGLE;
             else
-                moveBank1 = gBattleMons[bank1].moves[*(gBattleStruct->chosenMovePositions + bank1)];
+                moveBattler1 = gBattleMons[battler1].moves[*(gBattleStruct->chosenMovePositions + battler1)];
         }
         else
-            moveBank1 = MOVE_NONE;
+            moveBattler1 = MOVE_NONE;
 
-        if (gChosenActionByBattler[bank2] == B_ACTION_USE_MOVE)
+        if (gChosenActionByBattler[battler2] == B_ACTION_USE_MOVE)
         {
-            if (gProtectStructs[bank2].onlyStruggle)
-                moveBank2 = MOVE_STRUGGLE;
+            if (gProtectStructs[battler2].onlyStruggle)
+                moveBattler2 = MOVE_STRUGGLE;
             else
-                moveBank2 = gBattleMons[bank2].moves[*(gBattleStruct->chosenMovePositions + bank2)];
+                moveBattler2 = gBattleMons[battler2].moves[*(gBattleStruct->chosenMovePositions + battler2)];
         }
         else
-            moveBank2 = MOVE_NONE;
+            moveBattler2 = MOVE_NONE;
     }
 
     // both move priorities are different than 0
-    if (gBattleMoves[moveBank1].priority != 0 || gBattleMoves[moveBank2].priority != 0)
+    if (gBattleMoves[moveBattler1].priority != 0 || gBattleMoves[moveBattler2].priority != 0)
     {
         // both priorities are the same
-        if (gBattleMoves[moveBank1].priority == gBattleMoves[moveBank2].priority)
+        if (gBattleMoves[moveBattler1].priority == gBattleMoves[moveBattler2].priority)
         {
-            if (speedBank1 == speedBank2 && Random() & 1)
+            if (speedBattler1 == speedBattler2 && Random() & 1)
                 strikesFirst = 2; // same speeds, same priorities
-            else if (speedBank1 < speedBank2)
-                strikesFirst = 1; // bank2 has more speed
+            else if (speedBattler1 < speedBattler2)
+                strikesFirst = 1; // battler2 has more speed
 
-            // else bank1 has more speed
+            // else battler1 has more speed
         }
-        else if (gBattleMoves[moveBank1].priority < gBattleMoves[moveBank2].priority)
-            strikesFirst = 1; // bank2's move has greater priority
+        else if (gBattleMoves[moveBattler1].priority < gBattleMoves[moveBattler2].priority)
+            strikesFirst = 1; // battler2's move has greater priority
 
-        // else bank1's move has greater priority
+        // else battler1's move has greater priority
     }
     // both priorities are equal to 0
     else
     {
-        if (speedBank1 == speedBank2 && Random() & 1)
+        if (speedBattler1 == speedBattler2 && Random() & 1)
             strikesFirst = 2; // same speeds, same priorities
-        else if (speedBank1 < speedBank2)
-            strikesFirst = 1; // bank2 has more speed
+        else if (speedBattler1 < speedBattler2)
+            strikesFirst = 1; // battler2 has more speed
 
-        // else bank1 has more speed
+        // else battler1 has more speed
     }
 
     return strikesFirst;
 }
 
-static void SetActionsAndBanksTurnOrder(void)
+static void SetActionsAndBattlersTurnOrder(void)
 {
     s32 var = 0;
     s32 i, j;
@@ -4625,14 +4625,14 @@ static void SetActionsAndBanksTurnOrder(void)
             {
                 for (j = i + 1; j < gBattlersCount; j++)
                 {
-                    u8 bank1 = gBattleTurnOrder[i];
-                    u8 bank2 = gBattleTurnOrder[j];
+                    u8 battler1 = gBattleTurnOrder[i];
+                    u8 battler2 = gBattleTurnOrder[j];
                     if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM
                         && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM
                         && gActionsByTurnOrder[i] != B_ACTION_SWITCH
                         && gActionsByTurnOrder[j] != B_ACTION_SWITCH)
                     {
-                        if (GetWhoStrikesFirst(bank1, bank2, FALSE))
+                        if (GetWhoStrikesFirst(battler1, battler2, FALSE))
                             SwapTurnOrder(i, j);
                     }
                 }
@@ -4742,7 +4742,7 @@ static void RunTurnActionsFunctions(void)
     }
     else
     {
-        if (gBattleStruct->savedTurnActionNumber != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another bank
+        if (gBattleStruct->savedTurnActionNumber != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another battlerId
         {
             gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
             gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
@@ -4976,7 +4976,7 @@ static void TryEvolvePokemon(void)
 
     while (gLeveledUpInBattle != 0)
     {
-        for (i = 0; i < 6; i++)
+        for (i = 0; i < PARTY_SIZE; i++)
         {
             if (gLeveledUpInBattle & gBitTable[i])
             {
@@ -5073,7 +5073,7 @@ static void HandleAction_UseMove(void)
     gMoveResultFlags = 0;
     gMultiHitCounter = 0;
     gBattleCommunication[6] = 0;
-    gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattlerAttacker);
+    gCurrMovePos = gChosenMovePos = *(gBattleStruct->chosenMovePositions + gBattlerAttacker);
 
     // choose move
     if (gProtectStructs[gBattlerAttacker].onlyStruggle)
@@ -5092,14 +5092,14 @@ static void HandleAction_UseMove(void)
              && gDisableStructs[gBattlerAttacker].encoredMove == gBattleMons[gBattlerAttacker].moves[gDisableStructs[gBattlerAttacker].encoredMovePos])
     {
         gCurrentMove = gChosenMove = gDisableStructs[gBattlerAttacker].encoredMove;
-        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattlerAttacker].encoredMovePos;
+        gCurrMovePos = gChosenMovePos = gDisableStructs[gBattlerAttacker].encoredMovePos;
         *(gBattleStruct->moveTarget + gBattlerAttacker) = GetMoveTarget(gCurrentMove, 0);
     }
     // check if the encored move wasn't overwritten
     else if (gDisableStructs[gBattlerAttacker].encoredMove != MOVE_NONE
              && gDisableStructs[gBattlerAttacker].encoredMove != gBattleMons[gBattlerAttacker].moves[gDisableStructs[gBattlerAttacker].encoredMovePos])
     {
-        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBattlerAttacker].encoredMovePos;
+        gCurrMovePos = gChosenMovePos = gDisableStructs[gBattlerAttacker].encoredMovePos;
         gCurrentMove = gChosenMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
         gDisableStructs[gBattlerAttacker].encoredMove = MOVE_NONE;
         gDisableStructs[gBattlerAttacker].encoredMovePos = 0;
diff --git a/src/battle_message.c b/src/battle_message.c
index 2f7124554..4c980312d 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1888,7 +1888,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 HANDLE_NICKNAME_STRING_CASE(gBattlerTarget, gBattlerPartyIndexes[gBattlerTarget])
                 break;
             case B_TXT_EFF_NAME_WITH_PREFIX: // effect bank name with prefix
-                HANDLE_NICKNAME_STRING_CASE(gEffectBank, gBattlerPartyIndexes[gEffectBank])
+                HANDLE_NICKNAME_STRING_CASE(gEffectBattler, gBattlerPartyIndexes[gEffectBattler])
                 break;
             case B_TXT_ACTIVE_NAME_WITH_PREFIX: // active bank name with prefix
                 HANDLE_NICKNAME_STRING_CASE(gActiveBattler, gBattlerPartyIndexes[gActiveBattler])
@@ -1964,7 +1964,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                 toCpy = gAbilityNames[gBattlerAbilities[gBattleScripting.battler]];
                 break;
             case B_TXT_EFF_ABILITY: // effect bank ability
-                toCpy = gAbilityNames[gBattlerAbilities[gEffectBank]];
+                toCpy = gAbilityNames[gBattlerAbilities[gEffectBattler]];
                 break;
             case B_TXT_TRAINER1_CLASS: // trainer class name
                 if (gBattleTypeFlags & BATTLE_TYPE_SECRET_BASE)
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 753dd1f7e..dc2eab357 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "constants/battle_move_effects.h"
+#include "constants/battle_script_commands.h"
 #include "battle_message.h"
 #include "battle_ai_script_commands.h"
 #include "battle_scripts.h"
@@ -1157,7 +1158,7 @@ static void atk01_accuracycheck(void)
     }
     else
     {
-        u8 type, moveAcc, holdEffect, quality;
+        u8 type, moveAcc, holdEffect, param;
         s8 buff;
         u16 calc;
 
@@ -1205,18 +1206,18 @@ static void atk01_accuracycheck(void)
         if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
         {
             holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
-            quality = gEnigmaBerries[gBattlerTarget].holdEffectParam;
+            param = gEnigmaBerries[gBattlerTarget].holdEffectParam;
         }
         else
         {
             holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
-            quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
+            param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
         }
 
         gStringBattler = gBattlerTarget;
 
         if (holdEffect == HOLD_EFFECT_EVASION_UP)
-            calc = (calc * (100 - quality)) / 100;
+            calc = (calc * (100 - param)) / 100;
 
         // final calculation
         if ((Random() % 100 + 1) > calc)
@@ -1700,23 +1701,24 @@ static void Unused_ApplyRandomDmgMultiplier(void)
 
 static void atk07_adjustnormaldamage(void)
 {
-    u8 holdEffect, quality;
+    u8 holdEffect, param;
 
     ApplyRandomDmgMultiplier();
 
     if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect, quality = gEnigmaBerries[gBattlerTarget].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
+        param = gEnigmaBerries[gBattlerTarget].holdEffectParam;
     }
     else
     {
         holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
+        param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
     gStringBattler = gBattlerTarget;
 
-    if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
+    if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
         RecordItemEffectBattle(gBattlerTarget, holdEffect);
         gSpecialStatuses[gBattlerTarget].focusBanded = 1;
@@ -1748,23 +1750,24 @@ static void atk07_adjustnormaldamage(void)
 
 static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't check for false swipe move effect.
 {
-    u8 holdEffect, quality;
+    u8 holdEffect, param;
 
     ApplyRandomDmgMultiplier();
 
     if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect, quality = gEnigmaBerries[gBattlerTarget].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
+        param = gEnigmaBerries[gBattlerTarget].holdEffectParam;
     }
     else
     {
         holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
+        param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
     gStringBattler = gBattlerTarget;
 
-    if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
+    if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
         RecordItemEffectBattle(gBattlerTarget, holdEffect);
         gSpecialStatuses[gBattlerTarget].focusBanded = 1;
@@ -1859,7 +1862,7 @@ static void atk0B_healthbarupdate(void)
 
     if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
         if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
         {
@@ -1904,7 +1907,7 @@ static void atk0C_datahpupdate(void)
 
     if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
         {
             if (gDisableStructs[gActiveBattler].substituteHP >= gBattleMoveDamage)
@@ -1949,7 +1952,7 @@ static void atk0C_datahpupdate(void)
                 else
                 {
                     gTakenDmg[gActiveBattler] += gBattleMoveDamage;
-                    if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
+                    if (gBattlescriptCurrInstr[1] == BS_TARGET)
                         gTakenDmgByBattler[gActiveBattler] = gBattlerAttacker;
                     else
                         gTakenDmgByBattler[gActiveBattler] = gBattlerTarget;
@@ -1973,7 +1976,7 @@ static void atk0C_datahpupdate(void)
                 {
                     gProtectStructs[gActiveBattler].physicalDmg = gHpDealt;
                     gSpecialStatuses[gActiveBattler].physicalDmg = gHpDealt;
-                    if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
+                    if (gBattlescriptCurrInstr[1] == BS_TARGET)
                     {
                         gProtectStructs[gActiveBattler].physicalBattlerId = gBattlerAttacker;
                         gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerAttacker;
@@ -1988,7 +1991,7 @@ static void atk0C_datahpupdate(void)
                 {
                     gProtectStructs[gActiveBattler].specialDmg = gHpDealt;
                     gSpecialStatuses[gActiveBattler].specialDmg = gHpDealt;
-                    if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
+                    if (gBattlescriptCurrInstr[1] == BS_TARGET)
                     {
                         gProtectStructs[gActiveBattler].specialBattlerId = gBattlerAttacker;
                         gSpecialStatuses[gActiveBattler].specialBattlerId = gBattlerAttacker;
@@ -2007,7 +2010,7 @@ static void atk0C_datahpupdate(void)
     }
     else
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         if (gSpecialStatuses[gActiveBattler].dmg == 0)
             gSpecialStatuses[gActiveBattler].dmg = 0xFFFF;
     }
@@ -2268,31 +2271,31 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
     if (gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_AFFECTS_USER)
     {
-        gEffectBank = gBattlerAttacker; // bank that effects get applied on
+        gEffectBattler = gBattlerAttacker; // bank that effects get applied on
         gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_AFFECTS_USER);
         affectsUser = MOVE_EFFECT_AFFECTS_USER;
         gBattleScripting.battler = gBattlerTarget; // theoretically the attacker
     }
     else
     {
-        gEffectBank = gBattlerTarget;
+        gEffectBattler = gBattlerTarget;
         gBattleScripting.battler = gBattlerAttacker;
     }
 
-    if (gBattleMons[gEffectBank].ability == ABILITY_SHIELD_DUST && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
+    if (gBattleMons[gEffectBattler].ability == ABILITY_SHIELD_DUST && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
         && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 9)
         INCREMENT_RESET_RETURN
 
-    if (gSideStatuses[GET_BATTLER_SIDE(gEffectBank)] & SIDE_STATUS_SAFEGUARD && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
+    if (gSideStatuses[GET_BATTLER_SIDE(gEffectBattler)] & SIDE_STATUS_SAFEGUARD && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
         && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 7)
         INCREMENT_RESET_RETURN
 
-    if (gBattleMons[gEffectBank].hp == 0
+    if (gBattleMons[gEffectBattler].hp == 0
         && gBattleCommunication[MOVE_EFFECT_BYTE] != MOVE_EFFECT_PAYDAY
         && gBattleCommunication[MOVE_EFFECT_BYTE] != MOVE_EFFECT_STEAL_ITEM)
         INCREMENT_RESET_RETURN
 
-    if (gBattleMons[gEffectBank].status2 & STATUS2_SUBSTITUTE && affectsUser != MOVE_EFFECT_AFFECTS_USER)
+    if (gBattleMons[gEffectBattler].status2 & STATUS2_SUBSTITUTE && affectsUser != MOVE_EFFECT_AFFECTS_USER)
         INCREMENT_RESET_RETURN
 
     if (gBattleCommunication[MOVE_EFFECT_BYTE] <= 6) // status change
@@ -2301,7 +2304,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
         {
         case STATUS1_SLEEP:
             // check active uproar
-            if (gBattleMons[gEffectBank].ability != ABILITY_SOUNDPROOF)
+            if (gBattleMons[gEffectBattler].ability != ABILITY_SOUNDPROOF)
             {
                 for (gActiveBattler = 0;
                     gActiveBattler < gBattlersCount && !(gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR);
@@ -2311,24 +2314,24 @@ void SetMoveEffect(bool8 primary, u8 certain)
             else
                 gActiveBattler = gBattlersCount;
 
-            if (gBattleMons[gEffectBank].status1)
+            if (gBattleMons[gEffectBattler].status1)
                 break;
             if (gActiveBattler != gBattlersCount)
                 break;
-            if (gBattleMons[gEffectBank].ability == ABILITY_VITAL_SPIRIT)
+            if (gBattleMons[gEffectBattler].ability == ABILITY_VITAL_SPIRIT)
                 break;
-            if (gBattleMons[gEffectBank].ability == ABILITY_INSOMNIA)
+            if (gBattleMons[gEffectBattler].ability == ABILITY_INSOMNIA)
                 break;
 
-            CancelMultiTurnMoves(gEffectBank);
+            CancelMultiTurnMoves(gEffectBattler);
             statusChanged = TRUE;
             break;
         case STATUS1_POISON:
-            if (gBattleMons[gEffectBank].ability == ABILITY_IMMUNITY
+            if (gBattleMons[gEffectBattler].ability == ABILITY_IMMUNITY
                 && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN))
             {
                 gLastUsedAbility = ABILITY_IMMUNITY;
-                RecordAbilityBattle(gEffectBank, ABILITY_IMMUNITY);
+                RecordAbilityBattle(gEffectBattler, ABILITY_IMMUNITY);
 
                 BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_PSNPrevention;
@@ -2344,8 +2347,8 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 RESET_RETURN
             }
-            if ((gBattleMons[gEffectBank].type1 == TYPE_POISON || gBattleMons[gEffectBank].type2 == TYPE_POISON
-                 || gBattleMons[gEffectBank].type1 == TYPE_STEEL || gBattleMons[gEffectBank].type2 == TYPE_STEEL)
+            if ((gBattleMons[gEffectBattler].type1 == TYPE_POISON || gBattleMons[gEffectBattler].type2 == TYPE_POISON
+                 || gBattleMons[gEffectBattler].type1 == TYPE_STEEL || gBattleMons[gEffectBattler].type2 == TYPE_STEEL)
                 && (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
                 && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN))
             {
@@ -2355,27 +2358,27 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
                 RESET_RETURN
             }
-            if (gBattleMons[gEffectBank].type1 == TYPE_POISON)
+            if (gBattleMons[gEffectBattler].type1 == TYPE_POISON)
                 break;
-            if (gBattleMons[gEffectBank].type2 == TYPE_POISON)
+            if (gBattleMons[gEffectBattler].type2 == TYPE_POISON)
                 break;
-            if (gBattleMons[gEffectBank].type1 == TYPE_STEEL)
+            if (gBattleMons[gEffectBattler].type1 == TYPE_STEEL)
                 break;
-            if (gBattleMons[gEffectBank].type2 == TYPE_STEEL)
+            if (gBattleMons[gEffectBattler].type2 == TYPE_STEEL)
                 break;
-            if (gBattleMons[gEffectBank].status1)
+            if (gBattleMons[gEffectBattler].status1)
                 break;
-            if (gBattleMons[gEffectBank].ability == ABILITY_IMMUNITY)
+            if (gBattleMons[gEffectBattler].ability == ABILITY_IMMUNITY)
                 break;
 
             statusChanged = TRUE;
             break;
         case STATUS1_BURN:
-            if (gBattleMons[gEffectBank].ability == ABILITY_WATER_VEIL
+            if (gBattleMons[gEffectBattler].ability == ABILITY_WATER_VEIL
                 && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN))
             {
                 gLastUsedAbility = ABILITY_WATER_VEIL;
-                RecordAbilityBattle(gEffectBank, ABILITY_WATER_VEIL);
+                RecordAbilityBattle(gEffectBattler, ABILITY_WATER_VEIL);
 
                 BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_BRNPrevention;
@@ -2390,8 +2393,8 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 RESET_RETURN
             }
-            if ((gBattleMons[gEffectBank].type1 == TYPE_FIRE
-                 || gBattleMons[gEffectBank].type2 == TYPE_FIRE)
+            if ((gBattleMons[gEffectBattler].type1 == TYPE_FIRE
+                 || gBattleMons[gEffectBattler].type2 == TYPE_FIRE)
                 && (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
                 && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN))
             {
@@ -2401,13 +2404,13 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
                 RESET_RETURN
             }
-            if (gBattleMons[gEffectBank].type1 == TYPE_FIRE)
+            if (gBattleMons[gEffectBattler].type1 == TYPE_FIRE)
                 break;
-            if (gBattleMons[gEffectBank].type2 == TYPE_FIRE)
+            if (gBattleMons[gEffectBattler].type2 == TYPE_FIRE)
                 break;
-            if (gBattleMons[gEffectBank].ability == ABILITY_WATER_VEIL)
+            if (gBattleMons[gEffectBattler].ability == ABILITY_WATER_VEIL)
                 break;
-            if (gBattleMons[gEffectBank].status1)
+            if (gBattleMons[gEffectBattler].status1)
                 break;
 
             statusChanged = TRUE;
@@ -2415,27 +2418,27 @@ void SetMoveEffect(bool8 primary, u8 certain)
         case STATUS1_FREEZE:
             if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY)
                 noSunCanFreeze = FALSE;
-            if (gBattleMons[gEffectBank].type1 == TYPE_ICE)
+            if (gBattleMons[gEffectBattler].type1 == TYPE_ICE)
                 break;
-            if (gBattleMons[gEffectBank].type2 == TYPE_ICE)
+            if (gBattleMons[gEffectBattler].type2 == TYPE_ICE)
                 break;
-            if (gBattleMons[gEffectBank].status1)
+            if (gBattleMons[gEffectBattler].status1)
                 break;
             if (noSunCanFreeze == 0)
                 break;
-            if (gBattleMons[gEffectBank].ability == ABILITY_MAGMA_ARMOR)
+            if (gBattleMons[gEffectBattler].ability == ABILITY_MAGMA_ARMOR)
                 break;
 
-            CancelMultiTurnMoves(gEffectBank);
+            CancelMultiTurnMoves(gEffectBattler);
             statusChanged = TRUE;
             break;
         case STATUS1_PARALYSIS:
-            if (gBattleMons[gEffectBank].ability == ABILITY_LIMBER)
+            if (gBattleMons[gEffectBattler].ability == ABILITY_LIMBER)
             {
                 if (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)
                 {
                     gLastUsedAbility = ABILITY_LIMBER;
-                    RecordAbilityBattle(gEffectBank, ABILITY_LIMBER);
+                    RecordAbilityBattle(gEffectBattler, ABILITY_LIMBER);
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = BattleScript_PRLZPrevention;
@@ -2454,16 +2457,16 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 else
                     break;
             }
-            if (gBattleMons[gEffectBank].status1)
+            if (gBattleMons[gEffectBattler].status1)
                 break;
 
             statusChanged = TRUE;
             break;
         case STATUS1_TOXIC_POISON:
-            if (gBattleMons[gEffectBank].ability == ABILITY_IMMUNITY && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN))
+            if (gBattleMons[gEffectBattler].ability == ABILITY_IMMUNITY && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN))
             {
                 gLastUsedAbility = ABILITY_IMMUNITY;
-                RecordAbilityBattle(gEffectBank, ABILITY_IMMUNITY);
+                RecordAbilityBattle(gEffectBattler, ABILITY_IMMUNITY);
 
                 BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = BattleScript_PSNPrevention;
@@ -2479,8 +2482,8 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 RESET_RETURN
             }
-            if ((gBattleMons[gEffectBank].type1 == TYPE_POISON || gBattleMons[gEffectBank].type2 == TYPE_POISON
-                 || gBattleMons[gEffectBank].type1 == TYPE_STEEL || gBattleMons[gEffectBank].type2 == TYPE_STEEL)
+            if ((gBattleMons[gEffectBattler].type1 == TYPE_POISON || gBattleMons[gEffectBattler].type2 == TYPE_POISON
+                 || gBattleMons[gEffectBattler].type1 == TYPE_STEEL || gBattleMons[gEffectBattler].type2 == TYPE_STEEL)
                 && (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
                 && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN))
             {
@@ -2490,19 +2493,19 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 2;
                 RESET_RETURN
             }
-            if (gBattleMons[gEffectBank].status1)
+            if (gBattleMons[gEffectBattler].status1)
                 break;
-            if (gBattleMons[gEffectBank].type1 != TYPE_POISON
-                && gBattleMons[gEffectBank].type2 != TYPE_POISON
-                && gBattleMons[gEffectBank].type1 != TYPE_STEEL
-                && gBattleMons[gEffectBank].type2 != TYPE_STEEL)
+            if (gBattleMons[gEffectBattler].type1 != TYPE_POISON
+                && gBattleMons[gEffectBattler].type2 != TYPE_POISON
+                && gBattleMons[gEffectBattler].type1 != TYPE_STEEL
+                && gBattleMons[gEffectBattler].type2 != TYPE_STEEL)
             {
-                if (gBattleMons[gEffectBank].ability == ABILITY_IMMUNITY)
+                if (gBattleMons[gEffectBattler].ability == ABILITY_IMMUNITY)
                     break;
 
                 // It's redundant, because at this point we know the status1 value is 0.
-                gBattleMons[gEffectBank].status1 &= ~(STATUS1_TOXIC_POISON);
-                gBattleMons[gEffectBank].status1 &= ~(STATUS1_POISON);
+                gBattleMons[gEffectBattler].status1 &= ~(STATUS1_TOXIC_POISON);
+                gBattleMons[gEffectBattler].status1 &= ~(STATUS1_POISON);
                 statusChanged = TRUE;
                 break;
             }
@@ -2517,14 +2520,14 @@ void SetMoveEffect(bool8 primary, u8 certain)
             BattleScriptPush(gBattlescriptCurrInstr + 1);
 
             if (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS1_SLEEP)
-                gBattleMons[gEffectBank].status1 |= ((Random() & 3) + 2);
+                gBattleMons[gEffectBattler].status1 |= ((Random() & 3) + 2);
             else
-                gBattleMons[gEffectBank].status1 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
+                gBattleMons[gEffectBattler].status1 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
 
             gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
 
-            gActiveBattler = gEffectBank;
-            BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBank].status1);
+            gActiveBattler = gEffectBattler;
+            BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBattler].status1);
             MarkBattlerForControllerExec(gActiveBattler);
 
             if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
@@ -2560,7 +2563,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
     }
     else
     {
-        if (gBattleMons[gEffectBank].status2 & sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]])
+        if (gBattleMons[gEffectBattler].status2 & sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]])
         {
             gBattlescriptCurrInstr++;
         }
@@ -2570,26 +2573,26 @@ void SetMoveEffect(bool8 primary, u8 certain)
             switch (gBattleCommunication[MOVE_EFFECT_BYTE])
             {
             case MOVE_EFFECT_CONFUSION:
-                if (gBattleMons[gEffectBank].ability == ABILITY_OWN_TEMPO
-                    || gBattleMons[gEffectBank].status2 & STATUS2_CONFUSION)
+                if (gBattleMons[gEffectBattler].ability == ABILITY_OWN_TEMPO
+                    || gBattleMons[gEffectBattler].status2 & STATUS2_CONFUSION)
                 {
                     gBattlescriptCurrInstr++;
                 }
                 else
                 {
-                    gBattleMons[gEffectBank].status2 |= (((Random()) % 0x4)) + 2;
+                    gBattleMons[gEffectBattler].status2 |= (((Random()) % 0x4)) + 2;
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
                 }
                 break;
             case MOVE_EFFECT_FLINCH:
-                if (gBattleMons[gEffectBank].ability == ABILITY_INNER_FOCUS)
+                if (gBattleMons[gEffectBattler].ability == ABILITY_INNER_FOCUS)
                 {
                     if (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)
                     {
                         gLastUsedAbility = ABILITY_INNER_FOCUS;
-                        RecordAbilityBattle(gEffectBank, ABILITY_INNER_FOCUS);
+                        RecordAbilityBattle(gEffectBattler, ABILITY_INNER_FOCUS);
                         gBattlescriptCurrInstr = BattleScript_FlinchPrevention;
                     }
                     else
@@ -2599,18 +2602,18 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 else
                 {
-                    if (GetBattlerTurnOrderNum(gEffectBank) > gCurrentTurnActionNumber)
-                        gBattleMons[gEffectBank].status2 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
+                    if (GetBattlerTurnOrderNum(gEffectBattler) > gCurrentTurnActionNumber)
+                        gBattleMons[gEffectBattler].status2 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]];
                     gBattlescriptCurrInstr++;
                 }
                 break;
             case MOVE_EFFECT_UPROAR:
-                if (!(gBattleMons[gEffectBank].status2 & STATUS2_UPROAR))
+                if (!(gBattleMons[gEffectBattler].status2 & STATUS2_UPROAR))
                 {
 
-                    gBattleMons[gEffectBank].status2 |= STATUS2_MULTIPLETURNS;
-                    gLockedMoves[gEffectBank] = gCurrentMove;
-                    gBattleMons[gEffectBank].status2 |= ((Random() & 3) + 2) << 4;
+                    gBattleMons[gEffectBattler].status2 |= STATUS2_MULTIPLETURNS;
+                    gLockedMoves[gEffectBattler] = gCurrentMove;
+                    gBattleMons[gEffectBattler].status2 |= ((Random() & 3) + 2) << 4;
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
@@ -2632,7 +2635,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
                 break;
             case MOVE_EFFECT_TRI_ATTACK:
-                if (gBattleMons[gEffectBank].status1)
+                if (gBattleMons[gEffectBattler].status1)
                 {
                     gBattlescriptCurrInstr++;
                 }
@@ -2643,23 +2646,23 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 break;
             case MOVE_EFFECT_CHARGING:
-                gBattleMons[gEffectBank].status2 |= STATUS2_MULTIPLETURNS;
-                gLockedMoves[gEffectBank] = gCurrentMove;
-                gProtectStructs[gEffectBank].chargingTurn = 1;
+                gBattleMons[gEffectBattler].status2 |= STATUS2_MULTIPLETURNS;
+                gLockedMoves[gEffectBattler] = gCurrentMove;
+                gProtectStructs[gEffectBattler].chargingTurn = 1;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_WRAP:
-                if (gBattleMons[gEffectBank].status2 & STATUS2_WRAPPED)
+                if (gBattleMons[gEffectBattler].status2 & STATUS2_WRAPPED)
                 {
                     gBattlescriptCurrInstr++;
                 }
                 else
                 {
-                    gBattleMons[gEffectBank].status2 |= ((Random() & 3) + 3) << 0xD;
+                    gBattleMons[gEffectBattler].status2 |= ((Random() & 3) + 3) << 0xD;
 
-                    *(gBattleStruct->wrappedMove + gEffectBank * 2 + 0) = gCurrentMove;
-                    *(gBattleStruct->wrappedMove + gEffectBank * 2 + 1) = gCurrentMove >> 8;
-                    *(gBattleStruct->wrappedBy + gEffectBank) = gBattlerAttacker;
+                    *(gBattleStruct->wrappedMove + gEffectBattler * 2 + 0) = gCurrentMove;
+                    *(gBattleStruct->wrappedMove + gEffectBattler * 2 + 1) = gCurrentMove >> 8;
+                    *(gBattleStruct->wrappedBy + gEffectBattler) = gBattlerAttacker;
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
@@ -2766,9 +2769,9 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 break;
             case MOVE_EFFECT_RECHARGE:
-                gBattleMons[gEffectBank].status2 |= STATUS2_RECHARGE;
-                gDisableStructs[gEffectBank].rechargeCounter = 2;
-                gLockedMoves[gEffectBank] = gCurrentMove;
+                gBattleMons[gEffectBattler].status2 |= STATUS2_RECHARGE;
+                gDisableStructs[gEffectBattler].rechargeCounter = 2;
+                gLockedMoves[gEffectBattler] = gCurrentMove;
                 gBattlescriptCurrInstr++;
                 break;
             case MOVE_EFFECT_RAGE:
@@ -2890,21 +2893,21 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
                 break;
             case MOVE_EFFECT_THRASH:
-                if (gBattleMons[gEffectBank].status2 & STATUS2_LOCK_CONFUSE)
+                if (gBattleMons[gEffectBattler].status2 & STATUS2_LOCK_CONFUSE)
                 {
                     gBattlescriptCurrInstr++;
                 }
                 else
                 {
-                    gBattleMons[gEffectBank].status2 |= STATUS2_MULTIPLETURNS;
-                    gLockedMoves[gEffectBank] = gCurrentMove;
-                    gBattleMons[gEffectBank].status2 |= (((Random() & 1) + 2) << 0xA);
+                    gBattleMons[gEffectBattler].status2 |= STATUS2_MULTIPLETURNS;
+                    gLockedMoves[gEffectBattler] = gCurrentMove;
+                    gBattleMons[gEffectBattler].status2 |= (((Random() & 1) + 2) << 0xA);
                 }
                 break;
             case MOVE_EFFECT_KNOCK_OFF:
-                if (gBattleMons[gEffectBank].ability == ABILITY_STICKY_HOLD)
+                if (gBattleMons[gEffectBattler].ability == ABILITY_STICKY_HOLD)
                 {
-                    if (gBattleMons[gEffectBank].item == 0)
+                    if (gBattleMons[gEffectBattler].item == 0)
                     {
                         gBattlescriptCurrInstr++;
                     }
@@ -2912,23 +2915,23 @@ void SetMoveEffect(bool8 primary, u8 certain)
                     {
                         gLastUsedAbility = ABILITY_STICKY_HOLD;
                         gBattlescriptCurrInstr = BattleScript_StickyHoldActivates;
-                        RecordAbilityBattle(gEffectBank, ABILITY_STICKY_HOLD);
+                        RecordAbilityBattle(gEffectBattler, ABILITY_STICKY_HOLD);
                     }
                     break;
                 }
-                if (gBattleMons[gEffectBank].item)
+                if (gBattleMons[gEffectBattler].item)
                 {
-                    side = GetBattlerSide(gEffectBank);
+                    side = GetBattlerSide(gEffectBattler);
 
-                    gLastUsedItem = gBattleMons[gEffectBank].item;
-                    gBattleMons[gEffectBank].item = 0;
-                    gWishFutureKnock.knockedOffPokes[side] |= gBitTable[gBattlerPartyIndexes[gEffectBank]];
+                    gLastUsedItem = gBattleMons[gEffectBattler].item;
+                    gBattleMons[gEffectBattler].item = 0;
+                    gWishFutureKnock.knockedOffPokes[side] |= gBitTable[gBattlerPartyIndexes[gEffectBattler]];
 
                     BattleScriptPush(gBattlescriptCurrInstr + 1);
                     gBattlescriptCurrInstr = BattleScript_KnockedOff;
 
-                    *(u8*)((u8*)(&gBattleStruct->choicedMove[gEffectBank]) + 0) = 0;
-                    *(u8*)((u8*)(&gBattleStruct->choicedMove[gEffectBank]) + 1) = 0;
+                    *(u8*)((u8*)(&gBattleStruct->choicedMove[gEffectBattler]) + 0) = 0;
+                    *(u8*)((u8*)(&gBattleStruct->choicedMove[gEffectBattler]) + 1) = 0;
                 }
                 else
                 {
@@ -2991,7 +2994,7 @@ static void atk17_seteffectsecondary(void)
 
 static void atk18_clearstatusfromeffect(void)
 {
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     if (gBattleCommunication[MOVE_EFFECT_BYTE] <= MOVE_EFFECT_TOXIC)
         gBattleMons[gActiveBattler].status1 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]);
@@ -3009,7 +3012,7 @@ static void atk19_tryfaintmon(void)
 
     if (gBattlescriptCurrInstr[2] != 0)
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         if (gHitMarker & HITMARKER_FAINTED(gActiveBattler))
         {
             BS_ptr = BSScriptReadPtr(gBattlescriptCurrInstr + 3);
@@ -3027,7 +3030,7 @@ static void atk19_tryfaintmon(void)
     {
         u8 bank;
 
-        if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
+        if (gBattlescriptCurrInstr[1] == BS_ATTACKER)
         {
             gActiveBattler = gBattlerAttacker;
             bank = gBattlerTarget;
@@ -3094,7 +3097,7 @@ static void atk1A_dofaintanimation(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         BtlController_EmitFaintAnimation(0);
         MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 2;
@@ -3105,7 +3108,7 @@ static void atk1B_cleareffectsonfaint(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
         if (!(gBattleTypeFlags & BATTLE_TYPE_ARENA) || gBattleMons[gActiveBattler].hp == 0)
         {
@@ -3121,7 +3124,7 @@ static void atk1B_cleareffectsonfaint(void)
 
 static void atk1C_jumpifstatus(void)
 {
-    u8 bank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    u8 bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u32 flags = BS2ScriptRead32(gBattlescriptCurrInstr + 2);
     const u8* jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 6);
 
@@ -3133,7 +3136,7 @@ static void atk1C_jumpifstatus(void)
 
 static void atk1D_jumpifstatus2(void)
 {
-    u8 bank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    u8 bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u32 flags = BS2ScriptRead32(gBattlescriptCurrInstr + 2);
     const u8* jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 6);
 
@@ -3149,7 +3152,7 @@ static void atk1E_jumpifability(void)
     u8 ability = gBattlescriptCurrInstr[2];
     const u8* jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 3);
 
-    if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER_SIDE)
+    if (gBattlescriptCurrInstr[1] == BS_ATTACKER_SIDE)
     {
         bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattlerAttacker, ability, 0, 0);
         if (bank)
@@ -3162,7 +3165,7 @@ static void atk1E_jumpifability(void)
         else
             gBattlescriptCurrInstr += 7;
     }
-    else if (gBattlescriptCurrInstr[1] == BS_GET_NOT_ATTACKER_SIDE)
+    else if (gBattlescriptCurrInstr[1] == BS_NOT_ATTACKER_SIDE)
     {
         bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBattlerAttacker, ability, 0, 0);
         if (bank)
@@ -3177,7 +3180,7 @@ static void atk1E_jumpifability(void)
     }
     else
     {
-        bank = GetBattleBank(gBattlescriptCurrInstr[1]);
+        bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         if (gBattleMons[bank].ability == ability)
         {
             gLastUsedAbility = ability;
@@ -3196,7 +3199,7 @@ static void atk1F_jumpifsideaffecting(void)
     u16 flags;
     const u8* jumpPtr;
 
-    if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
+    if (gBattlescriptCurrInstr[1] == BS_ATTACKER)
         side = GET_BATTLER_SIDE(gBattlerAttacker);
     else
         side = GET_BATTLER_SIDE(gBattlerTarget);
@@ -3213,7 +3216,7 @@ static void atk1F_jumpifsideaffecting(void)
 static void atk20_jumpifstat(void)
 {
     u8 ret = 0;
-    u8 bank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    u8 bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u8 value = gBattleMons[bank].statStages[gBattlescriptCurrInstr[3]];
 
     switch (gBattlescriptCurrInstr[2])
@@ -3255,7 +3258,7 @@ static void atk21_jumpifstatus3condition(void)
     u32 flags;
     const u8 *jumpPtr;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     flags = BS2ScriptRead32(gBattlescriptCurrInstr + 2);
     jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 7);
 
@@ -3277,7 +3280,7 @@ static void atk21_jumpifstatus3condition(void)
 
 static void atk22_jumpiftype(void)
 {
-    u8 bank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    u8 bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u8 type = gBattlescriptCurrInstr[2];
     const u8* jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 3);
 
@@ -3297,13 +3300,13 @@ static void atk23_getexp(void)
     s32 viaExpShare = 0;
     u16* exp = &gBattleStruct->expValue;
 
-    gBank1 = GetBattleBank(gBattlescriptCurrInstr[1]);
-    sentIn = gSentPokesToOpponent[(gBank1 & 2) >> 1];
+    gBattlerFainted = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
+    sentIn = gSentPokesToOpponent[(gBattlerFainted & 2) >> 1];
 
     switch (gBattleScripting.atk23_state)
     {
     case 0: // check if should receive exp at all
-        if (GetBattlerSide(gBank1) != B_SIDE_OPPONENT || (gBattleTypeFlags &
+        if (GetBattlerSide(gBattlerFainted) != B_SIDE_OPPONENT || (gBattleTypeFlags &
              (BATTLE_TYPE_LINK
               | BATTLE_TYPE_x2000000
               | BATTLE_TYPE_x4000000
@@ -3317,7 +3320,7 @@ static void atk23_getexp(void)
         else
         {
             gBattleScripting.atk23_state++;
-            gBattleStruct->field_DF |= gBitTable[gBattlerPartyIndexes[gBank1]];
+            gBattleStruct->field_DF |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]];
         }
         break;
     case 1: // calculate experience points to redistribute
@@ -3343,7 +3346,7 @@ static void atk23_getexp(void)
                     viaExpShare++;
             }
 
-            calculatedExp = gBaseStats[gBattleMons[gBank1].species].expYield * gBattleMons[gBank1].level / 7;
+            calculatedExp = gBaseStats[gBattleMons[gBattlerFainted].species].expYield * gBattleMons[gBattlerFainted].level / 7;
 
             if (viaExpShare) // at least one mon is getting exp via exp share
             {
@@ -3456,7 +3459,7 @@ static void atk23_getexp(void)
                     PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage)
 
                     PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBattlerId);
-                    MonGainEVs(&gPlayerParty[gBattleStruct->expGetterMonId], gBattleMons[gBank1].species);
+                    MonGainEVs(&gPlayerParty[gBattleStruct->expGetterMonId], gBattleMons[gBattlerFainted].species);
                 }
                 gBattleStruct->sentInPokes >>= 1;
                 gBattleScripting.atk23_state++;
@@ -3556,8 +3559,8 @@ static void atk23_getexp(void)
         if (gBattleControllerExecFlags == 0)
         {
             // not sure why gf clears the item and ability here
-            gBattleMons[gBank1].item = 0;
-            gBattleMons[gBank1].ability = 0;
+            gBattleMons[gBattlerFainted].item = 0;
+            gBattleMons[gBattlerFainted].ability = 0;
             gBattlescriptCurrInstr += 2;
         }
         break;
@@ -4262,7 +4265,7 @@ static void atk3A_waitstate(void)
 
 static void atk3B_healthbar_update(void)
 {
-    if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
+    if (gBattlescriptCurrInstr[1] == BS_TARGET)
         gActiveBattler = gBattlerTarget;
     else
         gActiveBattler = gBattlerAttacker;
@@ -4309,7 +4312,7 @@ static void atk41_call(void)
 
 static void atk42_jumpiftype2(void)
 {
-    u8 bank = GetBattleBank(gBattlescriptCurrInstr[1]);
+    u8 bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     if (gBattlescriptCurrInstr[2] == gBattleMons[bank].type1 || gBattlescriptCurrInstr[2] == gBattleMons[bank].type2)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 3);
@@ -4334,7 +4337,7 @@ static void atk45_playanimation(void)
 {
     const u16* argumentPtr;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     argumentPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 3);
 
     if (gBattlescriptCurrInstr[2] == B_ANIM_STATS_CHANGE
@@ -4376,7 +4379,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
     const u16* argumentPtr;
     const u8* animationIdPtr;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     animationIdPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 2);
     argumentPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 6);
 
@@ -4445,7 +4448,7 @@ static void atk48_playstatchangeanimation(void)
     s32 changeableStats = 0;
     u32 statsToCheck = 0;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     statsToCheck = gBattlescriptCurrInstr[2];
 
     if (gBattlescriptCurrInstr[3] & ATK48_STAT_NEGATIVE) // goes down
@@ -4546,7 +4549,7 @@ static void atk48_playstatchangeanimation(void)
 	ldr r0, [r5]\n\
 	ldrb r0, [r0, 0x1]\n\
 	str r3, [sp]\n\
-	bl GetBattleBank\n\
+	bl GetBattlerForBattleScript\n\
 	ldr r2, =gActiveBattler\n\
 	strb r0, [r2]\n\
 	ldr r0, [r5]\n\
@@ -4810,7 +4813,6 @@ static void atk49_moveend(void)
         holdEffectAtk = ItemId_GetHoldEffect(gBattleMons[gBattlerAttacker].item);
 
     choicedMoveAtk = &gBattleStruct->choicedMove[gBattlerAttacker];
-
     GET_MOVE_TYPE(gCurrentMove, moveType);
 
     do
@@ -5181,7 +5183,7 @@ static void atk4C_getswitchedmondata(void)
     if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     gBattlerPartyIndexes[gActiveBattler] = *(gBattleStruct->monToSwitchIntoId + gActiveBattler);
 
@@ -5200,7 +5202,7 @@ static void atk4D_switchindataupdate(void)
     if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     oldData = gBattleMons[gActiveBattler];
     monData = (u8*)(&gBattleMons[gActiveBattler]);
 
@@ -5249,7 +5251,7 @@ static void atk4E_switchinanim(void)
     if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT
         && !(gBattleTypeFlags & (BATTLE_TYPE_LINK
@@ -5277,7 +5279,7 @@ static void atk4F_jumpifcantswitch(void)
     struct Pokemon *party = NULL;
     s32 r7 = 0;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1] & ~(ATK4F_DONT_CHECK_STATUSES));
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(ATK4F_DONT_CHECK_STATUSES));
 
     if (!(gBattlescriptCurrInstr[1] & ATK4F_DONT_CHECK_STATUSES)
         && ((gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
@@ -5653,17 +5655,17 @@ static void atk50_openpartyscreen(void)
 
         hitmarkerFaintBits = gHitMarker >> 0x1C;
 
-        gBank1 = 0;
+        gBattlerFainted = 0;
         while (1)
         {
-            if (gBitTable[gBank1] & hitmarkerFaintBits)
+            if (gBitTable[gBattlerFainted] & hitmarkerFaintBits)
                 break;
-            if (gBank1 >= gBattlersCount)
+            if (gBattlerFainted >= gBattlersCount)
                 break;
-            gBank1++;
+            gBattlerFainted++;
         }
 
-        if (gBank1 == gBattlersCount)
+        if (gBattlerFainted == gBattlersCount)
             gBattlescriptCurrInstr = jumpPtr;
     }
     else
@@ -5673,7 +5675,7 @@ static void atk50_openpartyscreen(void)
         else
             hitmarkerFaintBits = 1;
 
-        bank = GetBattleBank(gBattlescriptCurrInstr[1] & ~(0x80));
+        bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(0x80));
         if (gSpecialStatuses[bank].flag40)
         {
             gBattlescriptCurrInstr += 6;
@@ -5730,7 +5732,7 @@ static void atk51_switchhandleorder(void)
     if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     switch (gBattlescriptCurrInstr[2])
     {
@@ -5795,7 +5797,7 @@ static void atk52_switchineffects(void)
 {
     s32 i;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     sub_803FA70(gActiveBattler);
 
     gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
@@ -5822,12 +5824,12 @@ static void atk52_switchineffects(void)
         gBattleScripting.battler = gActiveBattler;
         BattleScriptPushCursor();
 
-        if (gBattlescriptCurrInstr[1] == BS_GET_TARGET)
+        if (gBattlescriptCurrInstr[1] == BS_TARGET)
             gBattlescriptCurrInstr = BattleScript_SpikesOnTarget;
-        else if (gBattlescriptCurrInstr[1] == BS_GET_ATTACKER)
+        else if (gBattlescriptCurrInstr[1] == BS_ATTACKER)
             gBattlescriptCurrInstr = BattleScript_SpikesOnAttacker;
         else
-            gBattlescriptCurrInstr = BattleScript_SpikesOngBank1;
+            gBattlescriptCurrInstr = BattleScript_SpikesOnFaintedBattler;
     }
     else
     {
@@ -5857,14 +5859,14 @@ static void atk52_switchineffects(void)
             {
                 u32 hitmarkerFaintBits = gHitMarker >> 0x1C;
 
-                gBank1++;
+                gBattlerFainted++;
                 while (1)
                 {
-                    if (hitmarkerFaintBits & gBitTable[gBank1] && !(gAbsentBattlerFlags & gBitTable[gBank1]))
+                    if (hitmarkerFaintBits & gBitTable[gBattlerFainted] && !(gAbsentBattlerFlags & gBitTable[gBattlerFainted]))
                         break;
-                    if (gBank1 >= gBattlersCount)
+                    if (gBattlerFainted >= gBattlersCount)
                         break;
-                    gBank1++;
+                    gBattlerFainted++;
                 }
             }
             gBattlescriptCurrInstr += 2;
@@ -5901,7 +5903,7 @@ static void atk55_fanfare(void)
 
 static void atk56_playfaintcry(void)
 {
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitFaintingCry(0);
     MarkBattlerForControllerExec(gActiveBattler);
 
@@ -5919,7 +5921,7 @@ static void atk57(void)
 
 static void atk58_returntoball(void)
 {
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitReturnMonToBall(0, 1);
     MarkBattlerForControllerExec(gActiveBattler);
 
@@ -6134,7 +6136,7 @@ static void atk5B_yesnoboxstoplearningmove(void)
 
 static void atk5C_hitanimation(void)
 {
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
@@ -6224,7 +6226,7 @@ static void atk5D_getmoneyreward(void)
 
 static void atk5E(void)
 {
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     switch (gBattleCommunication[0])
     {
@@ -6280,7 +6282,7 @@ static void atk61_drawpartystatussummary(void)
     if (gBattleControllerExecFlags)
         return;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
         party = gPlayerParty;
@@ -6310,7 +6312,7 @@ static void atk61_drawpartystatussummary(void)
 
 static void atk62(void)
 {
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitCmd49(0);
     MarkBattlerForControllerExec(gActiveBattler);
 
@@ -6331,7 +6333,7 @@ static void atk64_statusanimation(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
             && gDisableStructs[gActiveBattler].substituteHP == 0
             && !(gHitMarker & HITMARKER_NO_ANIMATIONS))
@@ -6349,7 +6351,7 @@ static void atk65_status2animation(void)
 
     if (gBattleControllerExecFlags == 0)
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         wantedToAnimate = BSScriptRead32(gBattlescriptCurrInstr + 2);
         if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
             && gDisableStructs[gActiveBattler].substituteHP == 0
@@ -6368,7 +6370,7 @@ static void atk66_chosenstatusanimation(void)
 
     if (gBattleControllerExecFlags == 0)
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         wantedStatus = BSScriptRead32(gBattlescriptCurrInstr + 3);
         if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE)
             && gDisableStructs[gActiveBattler].substituteHP == 0
@@ -6436,21 +6438,22 @@ static void atk68_cancelallactions(void)
 
 static void atk69_adjustsetdamage(void) // The same as 0x7, except there's no random damage multiplier.
 {
-    u8 holdEffect, quality;
+    u8 holdEffect, param;
 
     if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
     {
-        holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect, quality = gEnigmaBerries[gBattlerTarget].holdEffectParam;
+        holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
+        param = gEnigmaBerries[gBattlerTarget].holdEffectParam;
     }
     else
     {
         holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item);
-        quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
+        param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
     gStringBattler = gBattlerTarget;
 
-    if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality)
+    if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
         RecordItemEffectBattle(gBattlerTarget, holdEffect);
         gSpecialStatuses[gBattlerTarget].focusBanded = 1;
@@ -6484,7 +6487,7 @@ static void atk6A_removeitem(void)
 {
     u16* usedHeldItem;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     usedHeldItem = &gBattleStruct->usedHeldItems[gActiveBattler];
     *usedHeldItem = gBattleMons[gActiveBattler].item;
@@ -6791,7 +6794,7 @@ static void atk6E_setatktoplayer0(void)
 
 static void atk6F_makevisible(void)
 {
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitSpriteInvisibility(0, FALSE);
     MarkBattlerForControllerExec(gActiveBattler);
 
@@ -6800,7 +6803,7 @@ static void atk6F_makevisible(void)
 
 static void atk70_recordlastability(void)
 {
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
     gBattlescriptCurrInstr += 1; // UB: Should be + 2, one byte for command and one byte for bank argument.
 }
@@ -6818,7 +6821,7 @@ static void atk71_buffermovetolearn(void)
 
 static void atk72_jumpifplayerran(void)
 {
-    if (TryRunFromBattle(gBank1))
+    if (TryRunFromBattle(gBattlerFainted))
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     else
         gBattlescriptCurrInstr += 5;
@@ -6831,7 +6834,7 @@ static void atk73_hpthresholds(void)
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         opposingBank = gActiveBattler ^ BIT_SIDE;
 
         result = gBattleMons[opposingBank].hp * 100 / gBattleMons[opposingBank].maxHP;
@@ -6859,7 +6862,7 @@ static void atk74_hpthresholds2(void)
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE))
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         opposingBank = gActiveBattler ^ BIT_SIDE;
         hpSwitchout = *(gBattleStruct->hpOnSwitchout + GetBattlerSide(opposingBank));
         result = (hpSwitchout - gBattleMons[opposingBank].hp) * 100 / hpSwitchout;
@@ -6890,7 +6893,7 @@ static void atk76_various(void)
     u8 side;
     s32 i;
 
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     switch (gBattlescriptCurrInstr[2])
     {
@@ -7176,7 +7179,7 @@ static void atk7B_tryhealhalfhealth(void)
 {
     const u8* failPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
 
-    if (gBattlescriptCurrInstr[5] == BS_GET_ATTACKER)
+    if (gBattlescriptCurrInstr[5] == BS_ATTACKER)
         gBattlerTarget = gBattlerAttacker;
 
     gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2;
@@ -8228,7 +8231,7 @@ static void atk98_updatestatusicon(void)
 
     if (gBattlescriptCurrInstr[1] != BS_ATTACKER_WITH_PARTNER)
     {
-        gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+        gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2);
         MarkBattlerForControllerExec(gActiveBattler);
         gBattlescriptCurrInstr += 2;
@@ -9258,7 +9261,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
         }
 
         gCurrentMove = MOVE_PURSUIT;
-        gCurrMovePos = gUnknown_020241E9 = *(gBattleStruct->chosenMovePositions + gBattlerTarget);
+        gCurrMovePos = gChosenMovePos = *(gBattleStruct->chosenMovePositions + gBattlerTarget);
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
@@ -10224,7 +10227,7 @@ static void atkE1_trygetintimidatetarget(void)
 
 static void atkE2_switchoutabilities(void)
 {
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     switch (gBattleMons[gActiveBattler].ability)
     {
@@ -10240,7 +10243,7 @@ static void atkE2_switchoutabilities(void)
 
 static void atkE3_jumpifhasnohp(void)
 {
-    gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]);
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
     if (gBattleMons[gActiveBattler].hp == 0)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
@@ -10500,14 +10503,14 @@ static void atkEC_pursuitrelated(void)
 
 static void atkEF_snatchsetbanks(void)
 {
-    gEffectBank = gBattlerAttacker;
+    gEffectBattler = gBattlerAttacker;
 
     if (gBattlerAttacker == gBattlerTarget)
         gBattlerAttacker = gBattlerTarget = gBattleScripting.battler;
     else
         gBattlerTarget = gBattleScripting.battler;
 
-    gBattleScripting.battler = gEffectBank;
+    gBattleScripting.battler = gEffectBattler;
     gBattlescriptCurrInstr++;
 }
 
diff --git a/src/battle_util.c b/src/battle_util.c
index 06d80d7ca..70d1ffab2 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "constants/battle_script_commands.h"
 #include "constants/abilities.h"
 #include "constants/moves.h"
 #include "constants/hold_effects.h"
@@ -34,46 +35,46 @@ static const u16 sSoundMovesTable[] =
     MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, 0xFFFF
 };
 
-u8 GetBattleBank(u8 caseId)
+u8 GetBattlerForBattleScript(u8 caseId)
 {
     u8 ret = 0;
     switch (caseId)
     {
-    case BS_GET_TARGET:
+    case BS_TARGET:
         ret = gBattlerTarget;
         break;
-    case BS_GET_ATTACKER:
+    case BS_ATTACKER:
         ret = gBattlerAttacker;
         break;
-    case BS_GET_EFFECT_BANK:
-        ret = gEffectBank;
+    case BS_EFFECT_BATTLER:
+        ret = gEffectBattler;
         break;
-    case BS_GET_BANK_0:
+    case BS_BANK_0:
         ret = 0;
         break;
-    case BS_GET_SCRIPTING_BANK:
+    case BS_SCRIPTING:
         ret = gBattleScripting.battler;
         break;
-    case BS_GET_gBank1:
-        ret = gBank1;
+    case BS_FAINTED:
+        ret = gBattlerFainted;
         break;
     case 5:
-        ret = gBank1;
+        ret = gBattlerFainted;
         break;
     case 4:
     case 6:
     case 8:
     case 9:
-    case BS_GET_PLAYER1:
+    case BS_PLAYER1:
         ret = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         break;
-    case BS_GET_OPPONENT1:
+    case BS_OPPONENT1:
         ret = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
         break;
-    case BS_GET_PLAYER2:
+    case BS_PLAYER2:
         ret = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
         break;
-    case BS_GET_OPPONENT2:
+    case BS_OPPONENT2:
         ret = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
         break;
     }
@@ -415,36 +416,36 @@ u8 TrySetCantSelectMoveBattleScript(void)
     return limitations;
 }
 
-u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check)
+u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
 {
     u8 holdEffect;
-    u16 *choicedMove = &gBattleStruct->choicedMove[bank];
+    u16 *choicedMove = &gBattleStruct->choicedMove[battlerId];
     s32 i;
 
-    if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY)
-        holdEffect = gEnigmaBerries[bank].holdEffect;
+    if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY)
+        holdEffect = gEnigmaBerries[battlerId].holdEffect;
     else
-        holdEffect = ItemId_GetHoldEffect(gBattleMons[bank].item);
+        holdEffect = ItemId_GetHoldEffect(gBattleMons[battlerId].item);
 
-    gStringBattler = bank;
+    gStringBattler = battlerId;
 
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
-        if (gBattleMons[bank].moves[i] == 0 && check & MOVE_LIMITATION_ZEROMOVE)
+        if (gBattleMons[battlerId].moves[i] == 0 && check & MOVE_LIMITATION_ZEROMOVE)
             unusableMoves |= gBitTable[i];
-        if (gBattleMons[bank].pp[i] == 0 && check & MOVE_LIMITATION_PP)
+        if (gBattleMons[battlerId].pp[i] == 0 && check & MOVE_LIMITATION_PP)
             unusableMoves |= gBitTable[i];
-        if (gBattleMons[bank].moves[i] == gDisableStructs[bank].disabledMove && check & MOVE_LIMITATION_DISABLED)
+        if (gBattleMons[battlerId].moves[i] == gDisableStructs[battlerId].disabledMove && check & MOVE_LIMITATION_DISABLED)
             unusableMoves |= gBitTable[i];
-        if (gBattleMons[bank].moves[i] == gLastMoves[bank] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[bank].status2 & STATUS2_TORMENT)
+        if (gBattleMons[battlerId].moves[i] == gLastMoves[battlerId] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[battlerId].status2 & STATUS2_TORMENT)
             unusableMoves |= gBitTable[i];
-        if (gDisableStructs[bank].tauntTimer1 && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[bank].moves[i]].power == 0)
+        if (gDisableStructs[battlerId].tauntTimer1 && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[battlerId].moves[i]].power == 0)
             unusableMoves |= gBitTable[i];
-        if (GetImprisonedMovesCount(bank, gBattleMons[bank].moves[i]) && check & MOVE_LIMITATION_IMPRISION)
+        if (GetImprisonedMovesCount(battlerId, gBattleMons[battlerId].moves[i]) && check & MOVE_LIMITATION_IMPRISION)
             unusableMoves |= gBitTable[i];
-        if (gDisableStructs[bank].encoreTimer1 && gDisableStructs[bank].encoredMove != gBattleMons[bank].moves[i])
+        if (gDisableStructs[battlerId].encoreTimer1 && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i])
             unusableMoves |= gBitTable[i];
-        if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[bank].moves[i])
+        if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i])
             unusableMoves |= gBitTable[i];
     }
     return unusableMoves;
@@ -468,11 +469,11 @@ bool8 AreAllMovesUnusable(void)
     return (unusable == 0xF);
 }
 
-u8 GetImprisonedMovesCount(u8 bank, u16 move)
+u8 GetImprisonedMovesCount(u8 battlerId, u16 move)
 {
     s32 i;
     u8 imprisionedMoves = 0;
-    u8 bankSide = GetBattlerSide(bank);
+    u8 bankSide = GetBattlerSide(battlerId);
 
     for (i = 0; i < gBattlersCount; i++)
     {
@@ -800,7 +801,7 @@ u8 TurnBasedEffects(void)
                  && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK].hp != 0
                  && gBattleMons[gActiveBattler].hp != 0)
                 {
-                    gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP
+                    gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the battlerId that receives HP
                     gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
@@ -1051,7 +1052,7 @@ u8 TurnBasedEffects(void)
                         gBattleMons[gActiveBattler].status1 |= (Random() & 3) + 2;
                         BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
                         MarkBattlerForControllerExec(gActiveBattler);
-                        gEffectBank = gActiveBattler;
+                        gEffectBattler = gActiveBattler;
                         BattleScriptExecute(BattleScript_YawnMakesAsleep);
                         effect++;
                     }
@@ -1201,7 +1202,7 @@ bool8 HandleFaintedMonActions(void)
         case 1:
             do
             {
-                gBank1 = gBattlerTarget = gBattleStruct->faintedActionsBattlerId;
+                gBattlerFainted = gBattlerTarget = gBattleStruct->faintedActionsBattlerId;
                 if (gBattleMons[gBattleStruct->faintedActionsBattlerId].hp == 0
                  && !(gBattleStruct->field_DF & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]])
                  && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBattlerId]))
@@ -1214,7 +1215,7 @@ bool8 HandleFaintedMonActions(void)
             gBattleStruct->faintedActionsState = 3;
             break;
         case 2:
-            sub_803F9EC(gBank1);
+            sub_803F9EC(gBattlerFainted);
             if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount)
                 gBattleStruct->faintedActionsState = 3;
             else
@@ -1227,7 +1228,7 @@ bool8 HandleFaintedMonActions(void)
         case 4:
             do
             {
-                gBank1 = gBattlerTarget = gBattleStruct->faintedActionsBattlerId;
+                gBattlerFainted = gBattlerTarget = gBattleStruct->faintedActionsBattlerId;
                 if (gBattleMons[gBattleStruct->faintedActionsBattlerId].hp == 0
                  && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBattlerId]))
                 {
@@ -2496,7 +2497,7 @@ enum
     ITEM_STATS_CHANGE, // 5
 };
 
-u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
+u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
 {
     int i = 0;
     u8 effect = ITEM_NO_EFFECT;
@@ -2505,11 +2506,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     u8 bankQuality, atkQuality, defQuality;
     u16 atkItem, defItem;
 
-    gLastUsedItem = gBattleMons[bank].item;
+    gLastUsedItem = gBattleMons[battlerId].item;
     if (gLastUsedItem == ITEM_ENIGMA_BERRY)
     {
-        bankHoldEffect = gEnigmaBerries[bank].holdEffect;
-        bankQuality = gEnigmaBerries[bank].holdEffectParam;
+        bankHoldEffect = gEnigmaBerries[battlerId].holdEffect;
+        bankQuality = gEnigmaBerries[battlerId].holdEffectParam;
     }
     else
     {
@@ -2548,39 +2549,39 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
         switch (bankHoldEffect)
         {
         case HOLD_EFFECT_DOUBLE_PRIZE:
-            if (GetBattlerSide(bank) == B_SIDE_PLAYER)
+            if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
                 gBattleStruct->moneyMultiplier = 2;
             break;
         case HOLD_EFFECT_RESTORE_STATS:
             for (i = 0; i < BATTLE_STATS_NO; i++)
             {
-                if (gBattleMons[bank].statStages[i] < 6)
+                if (gBattleMons[battlerId].statStages[i] < 6)
                 {
-                    gBattleMons[bank].statStages[i] = 6;
+                    gBattleMons[battlerId].statStages[i] = 6;
                     effect = ITEM_STATS_CHANGE;
                 }
             }
             if (effect)
             {
-                gBattleScripting.battler = bank;
-                gStringBattler = bank;
-                gActiveBattler = gBattlerAttacker = bank;
+                gBattleScripting.battler = battlerId;
+                gStringBattler = battlerId;
+                gActiveBattler = gBattlerAttacker = battlerId;
                 BattleScriptExecute(BattleScript_WhiteHerbEnd2);
             }
             break;
         }
         break;
     case 1:
-        if (gBattleMons[bank].hp)
+        if (gBattleMons[battlerId].hp)
         {
             switch (bankHoldEffect)
             {
             case HOLD_EFFECT_RESTORE_HP:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2 && !moveTurn)
                 {
                     gBattleMoveDamage = bankQuality;
-                    if (gBattleMons[bank].hp + bankQuality > gBattleMons[bank].maxHP)
-                        gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
+                    if (gBattleMons[battlerId].hp + bankQuality > gBattleMons[battlerId].maxHP)
+                        gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp;
                     gBattleMoveDamage *= -1;
                     BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
                     effect = 4;
@@ -2593,10 +2594,10 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                     u8 ppBonuses;
                     u16 move;
 
-                    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
-                        mon = &gPlayerParty[gBattlerPartyIndexes[bank]];
+                    if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
+                        mon = &gPlayerParty[gBattlerPartyIndexes[battlerId]];
                     else
-                        mon = &gEnemyParty[gBattlerPartyIndexes[bank]];
+                        mon = &gEnemyParty[gBattlerPartyIndexes[battlerId]];
                     for (i = 0; i < 4; i++)
                     {
                         move = GetMonData(mon, MON_DATA_MOVE1 + i);
@@ -2625,47 +2626,47 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_RESTORE_STATS:
                 for (i = 0; i < BATTLE_STATS_NO; i++)
                 {
-                    if (gBattleMons[bank].statStages[i] < 6)
+                    if (gBattleMons[battlerId].statStages[i] < 6)
                     {
-                        gBattleMons[bank].statStages[i] = 6;
+                        gBattleMons[battlerId].statStages[i] = 6;
                         effect = ITEM_STATS_CHANGE;
                     }
                 }
                 if (effect)
                 {
-                    gBattleScripting.battler = bank;
-                    gStringBattler = bank;
-                    gActiveBattler = gBattlerAttacker = bank;
+                    gBattleScripting.battler = battlerId;
+                    gStringBattler = battlerId;
+                    gActiveBattler = gBattlerAttacker = battlerId;
                     BattleScriptExecute(BattleScript_WhiteHerbEnd2);
                 }
                 break;
             case HOLD_EFFECT_LEFTOVERS:
-                if (gBattleMons[bank].hp < gBattleMons[bank].maxHP && !moveTurn)
+                if (gBattleMons[battlerId].hp < gBattleMons[battlerId].maxHP && !moveTurn)
                 {
-                    gBattleMoveDamage = gBattleMons[bank].maxHP / 16;
+                    gBattleMoveDamage = gBattleMons[battlerId].maxHP / 16;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
-                        gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
+                    if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP)
+                        gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp;
                     gBattleMoveDamage *= -1;
                     BattleScriptExecute(BattleScript_ItemHealHP_End2);
                     effect = ITEM_HP_CHANGE;
-                    RecordItemEffectBattle(bank, bankHoldEffect);
+                    RecordItemEffectBattle(battlerId, bankHoldEffect);
                 }
                 break;
             // nice copy/paste there gamefreak, making a function for confuse berries was too much eh?
             case HOLD_EFFECT_CONFUSE_SPICY:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2 && !moveTurn)
                 {
                     PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SPICY);
 
-                    gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
+                    gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
-                        gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
+                    if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP)
+                        gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp;
                     gBattleMoveDamage *= -1;
-                    if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SPICY) < 0)
+                    if (GetFlavorRelationByPersonality(gBattleMons[battlerId].personality, FLAVOR_SPICY) < 0)
                         BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
                         BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
@@ -2673,17 +2674,17 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CONFUSE_DRY:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2 && !moveTurn)
                 {
                     PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_DRY);
 
-                    gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
+                    gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
-                        gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
+                    if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP)
+                        gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp;
                     gBattleMoveDamage *= -1;
-                    if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_DRY) < 0)
+                    if (GetFlavorRelationByPersonality(gBattleMons[battlerId].personality, FLAVOR_DRY) < 0)
                         BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
                         BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
@@ -2691,17 +2692,17 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CONFUSE_SWEET:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2 && !moveTurn)
                 {
                     PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SWEET);
 
-                    gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
+                    gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
-                        gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
+                    if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP)
+                        gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp;
                     gBattleMoveDamage *= -1;
-                    if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SWEET) < 0)
+                    if (GetFlavorRelationByPersonality(gBattleMons[battlerId].personality, FLAVOR_SWEET) < 0)
                         BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
                         BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
@@ -2709,17 +2710,17 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CONFUSE_BITTER:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2 && !moveTurn)
                 {
                     PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_BITTER);
 
-                    gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
+                    gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
-                        gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
+                    if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP)
+                        gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp;
                     gBattleMoveDamage *= -1;
-                    if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_BITTER) < 0)
+                    if (GetFlavorRelationByPersonality(gBattleMons[battlerId].personality, FLAVOR_BITTER) < 0)
                         BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
                         BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
@@ -2727,17 +2728,17 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CONFUSE_SOUR:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / 2 && !moveTurn)
                 {
                     PREPARE_FLAVOR_BUFFER(gBattleTextBuff1, FLAVOR_SOUR);
 
-                    gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality;
+                    gBattleMoveDamage = gBattleMons[battlerId].maxHP / bankQuality;
                     if (gBattleMoveDamage == 0)
                         gBattleMoveDamage = 1;
-                    if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP)
-                        gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp;
+                    if (gBattleMons[battlerId].hp + gBattleMoveDamage > gBattleMons[battlerId].maxHP)
+                        gBattleMoveDamage = gBattleMons[battlerId].maxHP - gBattleMons[battlerId].hp;
                     gBattleMoveDamage *= -1;
-                    if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SOUR) < 0)
+                    if (GetFlavorRelationByPersonality(gBattleMons[battlerId].personality, FLAVOR_SOUR) < 0)
                         BattleScriptExecute(BattleScript_BerryConfuseHealEnd2);
                     else
                         BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem);
@@ -2746,12 +2747,12 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 break;
             // copy/paste again, smh
             case HOLD_EFFECT_ATTACK_UP:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_ATK] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_STAGE_ATK] < 0xC)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_ATK);
                     PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE);
 
-                    gEffectBank = bank;
+                    gEffectBattler = battlerId;
                     SET_STATCHANGER(STAT_STAGE_ATK, 1, FALSE);
                     gBattleScripting.animArg1 = 0xE + STAT_STAGE_ATK;
                     gBattleScripting.animArg2 = 0;
@@ -2760,11 +2761,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_DEFENSE_UP:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_DEF] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_STAGE_DEF] < 0xC)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_DEF);
 
-                    gEffectBank = bank;
+                    gEffectBattler = battlerId;
                     SET_STATCHANGER(STAT_STAGE_DEF, 1, FALSE);
                     gBattleScripting.animArg1 = 0xE + STAT_STAGE_DEF;
                     gBattleScripting.animArg2 = 0;
@@ -2773,11 +2774,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_SPEED_UP:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPEED] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_STAGE_SPEED] < 0xC)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_SPEED);
 
-                    gEffectBank = bank;
+                    gEffectBattler = battlerId;
                     SET_STATCHANGER(STAT_STAGE_SPEED, 1, FALSE);
                     gBattleScripting.animArg1 = 0xE + STAT_STAGE_SPEED;
                     gBattleScripting.animArg2 = 0;
@@ -2786,11 +2787,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_SP_ATTACK_UP:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPATK] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_STAGE_SPATK] < 0xC)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_SPATK);
 
-                    gEffectBank = bank;
+                    gEffectBattler = battlerId;
                     SET_STATCHANGER(STAT_STAGE_SPATK, 1, FALSE);
                     gBattleScripting.animArg1 = 0xE + STAT_STAGE_SPATK;
                     gBattleScripting.animArg2 = 0;
@@ -2799,11 +2800,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_SP_DEFENSE_UP:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPDEF] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_STAGE_SPDEF] < 0xC)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_SPDEF);
 
-                    gEffectBank = bank;
+                    gEffectBattler = battlerId;
                     SET_STATCHANGER(STAT_STAGE_SPDEF, 1, FALSE);
                     gBattleScripting.animArg1 = 0xE + STAT_STAGE_SPDEF;
                     gBattleScripting.animArg2 = 0;
@@ -2812,19 +2813,19 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CRITICAL_UP:
-                if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && !(gBattleMons[bank].status2 & STATUS2_FOCUS_ENERGY))
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY))
                 {
-                    gBattleMons[bank].status2 |= STATUS2_FOCUS_ENERGY;
+                    gBattleMons[battlerId].status2 |= STATUS2_FOCUS_ENERGY;
                     BattleScriptExecute(BattleScript_BerryFocusEnergyEnd2);
                     effect = ITEM_EFFECT_OTHER;
                 }
                 break;
             case HOLD_EFFECT_RANDOM_STAT_UP:
-                if (!moveTurn && gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality)
+                if (!moveTurn && gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality)
                 {
                     for (i = 0; i < 5; i++)
                     {
-                        if (gBattleMons[bank].statStages[STAT_STAGE_ATK + i] < 0xC)
+                        if (gBattleMons[battlerId].statStages[STAT_STAGE_ATK + i] < 0xC)
                             break;
                     }
                     if (i != 5)
@@ -2832,7 +2833,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         do
                         {
                             i = Random() % 5;
-                        } while (gBattleMons[bank].statStages[STAT_STAGE_ATK + i] == 0xC);
+                        } while (gBattleMons[battlerId].statStages[STAT_STAGE_ATK + i] == 0xC);
 
                         PREPARE_STAT_BUFFER(gBattleTextBuff1, i + 1);
 
@@ -2845,7 +2846,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         gBattleTextBuff2[6] = STRINGID_STATROSE >> 8;
                         gBattleTextBuff2[7] = EOS;
 
-                        gEffectBank = bank;
+                        gEffectBattler = battlerId;
                         SET_STATCHANGER(i + 1, 2, FALSE);
                         gBattleScripting.animArg1 = 0x21 + i + 6;
                         gBattleScripting.animArg2 = 0;
@@ -2855,85 +2856,85 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CURE_PAR:
-                if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
+                if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_PARALYSIS);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_PARALYSIS);
                     BattleScriptExecute(BattleScript_BerryCurePrlzEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_PSN:
-                if (gBattleMons[bank].status1 & STATUS1_PSN_ANY)
+                if (gBattleMons[battlerId].status1 & STATUS1_PSN_ANY)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER);
                     BattleScriptExecute(BattleScript_BerryCurePsnEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_BRN:
-                if (gBattleMons[bank].status1 & STATUS1_BURN)
+                if (gBattleMons[battlerId].status1 & STATUS1_BURN)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_BURN);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_BURN);
                     BattleScriptExecute(BattleScript_BerryCureBrnEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_FRZ:
-                if (gBattleMons[bank].status1 & STATUS1_FREEZE)
+                if (gBattleMons[battlerId].status1 & STATUS1_FREEZE)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_FREEZE);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptExecute(BattleScript_BerryCureFrzEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_SLP:
-                if (gBattleMons[bank].status1 & STATUS1_SLEEP)
+                if (gBattleMons[battlerId].status1 & STATUS1_SLEEP)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_SLEEP);
-                    gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_SLEEP);
+                    gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptExecute(BattleScript_BerryCureSlpEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_CONFUSION:
-                if (gBattleMons[bank].status2 & STATUS2_CONFUSION)
+                if (gBattleMons[battlerId].status2 & STATUS2_CONFUSION)
                 {
-                    gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
+                    gBattleMons[battlerId].status2 &= ~(STATUS2_CONFUSION);
                     BattleScriptExecute(BattleScript_BerryCureConfusionEnd2);
                     effect = ITEM_EFFECT_OTHER;
                 }
                 break;
             case HOLD_EFFECT_CURE_STATUS:
-                if (gBattleMons[bank].status1 & STATUS1_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION)
+                if (gBattleMons[battlerId].status1 & STATUS1_ANY || gBattleMons[battlerId].status2 & STATUS2_CONFUSION)
                 {
                     i = 0;
-                    if (gBattleMons[bank].status1 & STATUS1_PSN_ANY)
+                    if (gBattleMons[battlerId].status1 & STATUS1_PSN_ANY)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
                         i++;
                     }
-                    if (gBattleMons[bank].status1 & STATUS1_SLEEP)
+                    if (gBattleMons[battlerId].status1 & STATUS1_SLEEP)
                     {
-                        gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
+                        gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
                         StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
                         i++;
                     }
-                    if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
+                    if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
                         i++;
                     }
-                    if (gBattleMons[bank].status1 & STATUS1_BURN)
+                    if (gBattleMons[battlerId].status1 & STATUS1_BURN)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
                         i++;
                     }
-                    if (gBattleMons[bank].status1 & STATUS1_FREEZE)
+                    if (gBattleMons[battlerId].status1 & STATUS1_FREEZE)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
                         i++;
                     }
-                    if (gBattleMons[bank].status2 & STATUS2_CONFUSION)
+                    if (gBattleMons[battlerId].status2 & STATUS2_CONFUSION)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn);
                         i++;
@@ -2942,16 +2943,16 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                     else
                         gBattleCommunication[MULTISTRING_CHOOSER] = 1;
-                    gBattleMons[bank].status1 = 0;
-                    gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
+                    gBattleMons[battlerId].status1 = 0;
+                    gBattleMons[battlerId].status2 &= ~(STATUS2_CONFUSION);
                     BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2);
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_ATTRACT:
-                if (gBattleMons[bank].status2 & STATUS2_INFATUATION)
+                if (gBattleMons[battlerId].status2 & STATUS2_INFATUATION)
                 {
-                    gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION);
+                    gBattleMons[battlerId].status2 &= ~(STATUS2_INFATUATION);
                     StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
                     BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2);
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -2961,18 +2962,18 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             }
             if (effect)
             {
-                gBattleScripting.battler = bank;
-                gStringBattler = bank;
-                gActiveBattler = gBattlerAttacker = bank;
+                gBattleScripting.battler = battlerId;
+                gStringBattler = battlerId;
+                gActiveBattler = gBattlerAttacker = battlerId;
                 switch (effect)
                 {
                 case ITEM_STATUS_CHANGE:
-                    BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1);
+                    BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[battlerId].status1);
                     MarkBattlerForControllerExec(gActiveBattler);
                     break;
                 case ITEM_PP_CHANGE:
-                    if (!(gBattleMons[bank].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[bank].unk18_b & gBitTable[i]))
-                        gBattleMons[bank].pp[i] = changedPP;
+                    if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[battlerId].unk18_b & gBitTable[i]))
+                        gBattleMons[battlerId].pp[i] = changedPP;
                     break;
                 }
             }
@@ -2981,13 +2982,13 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     case 2:
         break;
     case 3:
-        for (bank = 0; bank < gBattlersCount; bank++)
+        for (battlerId = 0; battlerId < gBattlersCount; battlerId++)
         {
-            gLastUsedItem = gBattleMons[bank].item;
-            if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY)
+            gLastUsedItem = gBattleMons[battlerId].item;
+            if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY)
             {
-                bankHoldEffect = gEnigmaBerries[bank].holdEffect;
-                bankQuality = gEnigmaBerries[bank].holdEffectParam;
+                bankHoldEffect = gEnigmaBerries[battlerId].holdEffect;
+                bankQuality = gEnigmaBerries[battlerId].holdEffectParam;
             }
             else
             {
@@ -2997,64 +2998,64 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             switch (bankHoldEffect)
             {
             case HOLD_EFFECT_CURE_PAR:
-                if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
+                if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_PARALYSIS);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_PARALYSIS);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureParRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_PSN:
-                if (gBattleMons[bank].status1 & STATUS1_PSN_ANY)
+                if (gBattleMons[battlerId].status1 & STATUS1_PSN_ANY)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCurePsnRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_BRN:
-                if (gBattleMons[bank].status1 & STATUS1_BURN)
+                if (gBattleMons[battlerId].status1 & STATUS1_BURN)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_BURN);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_BURN);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureBrnRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_FRZ:
-                if (gBattleMons[bank].status1 & STATUS1_FREEZE)
+                if (gBattleMons[battlerId].status1 & STATUS1_FREEZE)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_FREEZE);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureFrzRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_SLP:
-                if (gBattleMons[bank].status1 & STATUS1_SLEEP)
+                if (gBattleMons[battlerId].status1 & STATUS1_SLEEP)
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_SLEEP);
-                    gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_SLEEP);
+                    gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureSlpRet;
                     effect = ITEM_STATUS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_CURE_CONFUSION:
-                if (gBattleMons[bank].status2 & STATUS2_CONFUSION)
+                if (gBattleMons[battlerId].status2 & STATUS2_CONFUSION)
                 {
-                    gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
+                    gBattleMons[battlerId].status2 &= ~(STATUS2_CONFUSION);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_BerryCureConfusionRet;
                     effect = ITEM_EFFECT_OTHER;
                 }
                 break;
             case HOLD_EFFECT_CURE_ATTRACT:
-                if (gBattleMons[bank].status2 & STATUS2_INFATUATION)
+                if (gBattleMons[battlerId].status2 & STATUS2_INFATUATION)
                 {
-                    gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION);
+                    gBattleMons[battlerId].status2 &= ~(STATUS2_INFATUATION);
                     StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
                     BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -3063,35 +3064,35 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CURE_STATUS:
-                if (gBattleMons[bank].status1 & STATUS1_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION)
+                if (gBattleMons[battlerId].status1 & STATUS1_ANY || gBattleMons[battlerId].status2 & STATUS2_CONFUSION)
                 {
-                    if (gBattleMons[bank].status1 & STATUS1_PSN_ANY)
+                    if (gBattleMons[battlerId].status1 & STATUS1_PSN_ANY)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn);
                     }
-                    if (gBattleMons[bank].status1 & STATUS1_SLEEP)
+                    if (gBattleMons[battlerId].status1 & STATUS1_SLEEP)
                     {
-                        gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
+                        gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
                         StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn);
                     }
-                    if (gBattleMons[bank].status1 & STATUS1_PARALYSIS)
+                    if (gBattleMons[battlerId].status1 & STATUS1_PARALYSIS)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn);
                     }
-                    if (gBattleMons[bank].status1 & STATUS1_BURN)
+                    if (gBattleMons[battlerId].status1 & STATUS1_BURN)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn);
                     }
-                    if (gBattleMons[bank].status1 & STATUS1_FREEZE)
+                    if (gBattleMons[battlerId].status1 & STATUS1_FREEZE)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn);
                     }
-                    if (gBattleMons[bank].status2 & STATUS2_CONFUSION)
+                    if (gBattleMons[battlerId].status2 & STATUS2_CONFUSION)
                     {
                         StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn);
                     }
-                    gBattleMons[bank].status1 = 0;
-                    gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
+                    gBattleMons[battlerId].status1 = 0;
+                    gBattleMons[battlerId].status2 &= ~(STATUS2_CONFUSION);
                     BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                     gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet;
@@ -3101,16 +3102,16 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             case HOLD_EFFECT_RESTORE_STATS:
                 for (i = 0; i < BATTLE_STATS_NO; i++)
                 {
-                    if (gBattleMons[bank].statStages[i] < 6)
+                    if (gBattleMons[battlerId].statStages[i] < 6)
                     {
-                        gBattleMons[bank].statStages[i] = 6;
+                        gBattleMons[battlerId].statStages[i] = 6;
                         effect = ITEM_STATS_CHANGE;
                     }
                 }
                 if (effect)
                 {
-                    gBattleScripting.battler = bank;
-                    gStringBattler = bank;
+                    gBattleScripting.battler = battlerId;
+                    gStringBattler = battlerId;
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_WhiteHerbRet;
                     return effect; // unnecessary return
@@ -3119,9 +3120,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
             }
             if (effect)
             {
-                gBattleScripting.battler = bank;
-                gStringBattler = bank;
-                gActiveBattler = bank;
+                gBattleScripting.battler = battlerId;
+                gStringBattler = battlerId;
+                gActiveBattler = battlerId;
                 BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
                 MarkBattlerForControllerExec(gActiveBattler);
                 break;
@@ -3174,11 +3175,11 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
     return effect;
 }
 
-void ClearFuryCutterDestinyBondGrudge(u8 bank)
+void ClearFuryCutterDestinyBondGrudge(u8 battlerId)
 {
-    gDisableStructs[bank].furyCutterCounter = 0;
-    gBattleMons[bank].status2 &= ~(STATUS2_DESTINY_BOND);
-    gStatuses3[bank] &= ~(STATUS3_GRUDGE);
+    gDisableStructs[battlerId].furyCutterCounter = 0;
+    gBattleMons[battlerId].status2 &= ~(STATUS2_DESTINY_BOND);
+    gStatuses3[battlerId] &= ~(STATUS3_GRUDGE);
 }
 
 void HandleAction_RunBattleScript(void) // identical to RunBattleScriptCommands
@@ -3266,14 +3267,14 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget)
     return targetBank;
 }
 
-static bool32 HasObedientBitSet(u8 bank)
+static bool32 HasObedientBitSet(u8 battlerId)
 {
-    if (GetBattlerSide(bank) == B_SIDE_OPPONENT)
+    if (GetBattlerSide(battlerId) == B_SIDE_OPPONENT)
         return TRUE;
-    if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS
-        && GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES, NULL) != SPECIES_MEW)
+    if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS
+        && GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_MEW)
             return TRUE;
-    return GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_OBEDIENCE, NULL);
+    return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_OBEDIENCE, NULL);
 }
 
 u8 IsMonDisobedient(void)
@@ -3341,7 +3342,7 @@ u8 IsMonDisobedient(void)
         {
             do
             {
-                gCurrMovePos = gUnknown_020241E9 = Random() & 3;
+                gCurrMovePos = gChosenMovePos = Random() & 3;
             } while (gBitTable[gCurrMovePos] & calc);
 
             gRandomMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
diff --git a/src/battle_util2.c b/src/battle_util2.c
index d079ccb25..c1bbabc85 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -74,7 +74,7 @@ void FreeBattleResources(void)
     }
 }
 
-void AdjustFriendshipOnBattleFaint(u8 bank)
+void AdjustFriendshipOnBattleFaint(u8 battlerId)
 {
     u8 opposingBank;
 
@@ -93,22 +93,22 @@ void AdjustFriendshipOnBattleFaint(u8 bank)
         opposingBank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
     }
 
-    if (gBattleMons[opposingBank].level > gBattleMons[bank].level)
+    if (gBattleMons[opposingBank].level > gBattleMons[battlerId].level)
     {
-        if (gBattleMons[opposingBank].level - gBattleMons[bank].level > 29)
-            AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[bank]], 8);
+        if (gBattleMons[opposingBank].level - gBattleMons[battlerId].level > 29)
+            AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[battlerId]], 8);
         else
-            AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[bank]], 6);
+            AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[battlerId]], 6);
     }
     else
     {
-        AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[bank]], 6);
+        AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[battlerId]], 6);
     }
 }
 
-void sub_80571DC(u8 bank, u8 arg1)
+void sub_80571DC(u8 battlerId, u8 arg1)
 {
-    if (GetBattlerSide(bank) != B_SIDE_OPPONENT)
+    if (GetBattlerSide(battlerId) != B_SIDE_OPPONENT)
     {
         s32 i;
 
@@ -117,14 +117,14 @@ void sub_80571DC(u8 bank, u8 arg1)
         for (i = 0; i < 3; i++)
             gUnknown_0203CF00[i] = *(0 * 3 + i + (u8*)(gBattleStruct->field_60));
 
-        sub_81B8FB0(pokemon_order_func(gBattlerPartyIndexes[bank]), pokemon_order_func(arg1));
+        sub_81B8FB0(pokemon_order_func(gBattlerPartyIndexes[battlerId]), pokemon_order_func(arg1));
 
         for (i = 0; i < 3; i++)
             *(0 * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
     }
 }
 
-u32 sub_805725C(u8 bank)
+u32 sub_805725C(u8 battlerId)
 {
     u32 effect = 0;
 
@@ -133,12 +133,12 @@ u32 sub_805725C(u8 bank)
         switch (gBattleCommunication[MULTIUSE_STATE])
         {
         case 0:
-            if (gBattleMons[bank].status1 & STATUS1_SLEEP)
+            if (gBattleMons[battlerId].status1 & STATUS1_SLEEP)
             {
-                if (UproarWakeUpCheck(bank))
+                if (UproarWakeUpCheck(battlerId))
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_SLEEP);
-                    gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_SLEEP);
+                    gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptPushCursor();
                     gBattleCommunication[MULTISTRING_CHOOSER] = 1;
                     gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
@@ -148,24 +148,24 @@ u32 sub_805725C(u8 bank)
                 {
                     u32 toSub;
 
-                    if (gBattleMons[bank].ability == ABILITY_EARLY_BIRD)
+                    if (gBattleMons[battlerId].ability == ABILITY_EARLY_BIRD)
                         toSub = 2;
                     else
                         toSub = 1;
 
-                    if ((gBattleMons[bank].status1 & STATUS1_SLEEP) < toSub)
-                        gBattleMons[bank].status1 &= ~(STATUS1_SLEEP);
+                    if ((gBattleMons[battlerId].status1 & STATUS1_SLEEP) < toSub)
+                        gBattleMons[battlerId].status1 &= ~(STATUS1_SLEEP);
                     else
-                        gBattleMons[bank].status1 -= toSub;
+                        gBattleMons[battlerId].status1 -= toSub;
 
-                    if (gBattleMons[bank].status1 & STATUS1_SLEEP)
+                    if (gBattleMons[battlerId].status1 & STATUS1_SLEEP)
                     {
                         gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep;
                         effect = 2;
                     }
                     else
                     {
-                        gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE);
+                        gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
                         BattleScriptPushCursor();
                         gBattleCommunication[MULTISTRING_CHOOSER] = 0;
                         gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp;
@@ -176,7 +176,7 @@ u32 sub_805725C(u8 bank)
             gBattleCommunication[MULTIUSE_STATE]++;
             break;
         case 1:
-            if (gBattleMons[bank].status1 & STATUS1_FREEZE)
+            if (gBattleMons[battlerId].status1 & STATUS1_FREEZE)
             {
                 if (Random() % 5 != 0)
                 {
@@ -184,7 +184,7 @@ u32 sub_805725C(u8 bank)
                 }
                 else
                 {
-                    gBattleMons[bank].status1 &= ~(STATUS1_FREEZE);
+                    gBattleMons[battlerId].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
                     gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -201,7 +201,7 @@ u32 sub_805725C(u8 bank)
 
     if (effect == 2)
     {
-        gActiveBattler = bank;
+        gActiveBattler = battlerId;
         BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
         MarkBattlerForControllerExec(gActiveBattler);
     }
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c
index 7bf3e7c29..98468caa2 100644
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@@ -141,30 +141,30 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     if (gBattleMoves[gCurrentMove].effect == EFFECT_EXPLOSION)
         defense /= 2;
 
-    if (type < TYPE_MYSTERY) // is physical
+    if (IS_MOVE_PHYSICAL(type))
     {
         if (gCritMultiplier == 2)
         {
-            if (attacker->statStages[STAT_STAGE_ATK] > 6)
-                APPLY_STAT_MOD(damage, attacker, attack, STAT_STAGE_ATK)
+            if (attacker->statStages[STAT_ATK] > 6)
+                APPLY_STAT_MOD(damage, attacker, attack, STAT_ATK)
             else
                 damage = attack;
         }
         else
-            APPLY_STAT_MOD(damage, attacker, attack, STAT_STAGE_ATK)
+            APPLY_STAT_MOD(damage, attacker, attack, STAT_ATK)
 
         damage = damage * gBattleMovePower;
         damage *= (2 * attacker->level / 5 + 2);
 
         if (gCritMultiplier == 2)
         {
-            if (defender->statStages[STAT_STAGE_DEF] < 6)
-                APPLY_STAT_MOD(damageHelper, defender, defense, STAT_STAGE_DEF)
+            if (defender->statStages[STAT_DEF] < 6)
+                APPLY_STAT_MOD(damageHelper, defender, defense, STAT_DEF)
             else
                 damageHelper = defense;
         }
         else
-            APPLY_STAT_MOD(damageHelper, defender, defense, STAT_STAGE_DEF)
+            APPLY_STAT_MOD(damageHelper, defender, defense, STAT_DEF)
 
         damage = damage / damageHelper;
         damage /= 50;
@@ -191,30 +191,30 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
     if (type == TYPE_MYSTERY)
         damage = 0; // is ??? type. does 0 damage.
 
-    if (type > TYPE_MYSTERY) // is special?
+    if (IS_MOVE_SPECIAL(type))
     {
         if (gCritMultiplier == 2)
         {
-            if (attacker->statStages[STAT_STAGE_SPATK] > 6)
-                APPLY_STAT_MOD(damage, attacker, spAttack, STAT_STAGE_SPATK)
+            if (attacker->statStages[STAT_SPATK] > 6)
+                APPLY_STAT_MOD(damage, attacker, spAttack, STAT_SPATK)
             else
                 damage = spAttack;
         }
         else
-            APPLY_STAT_MOD(damage, attacker, spAttack, STAT_STAGE_SPATK)
+            APPLY_STAT_MOD(damage, attacker, spAttack, STAT_SPATK)
 
         damage = damage * gBattleMovePower;
         damage *= (2 * attacker->level / 5 + 2);
 
         if (gCritMultiplier == 2)
         {
-            if (defender->statStages[STAT_STAGE_SPDEF] < 6)
-                APPLY_STAT_MOD(damageHelper, defender, spDefense, STAT_STAGE_SPDEF)
+            if (defender->statStages[STAT_SPDEF] < 6)
+                APPLY_STAT_MOD(damageHelper, defender, spDefense, STAT_SPDEF)
             else
                 damageHelper = spDefense;
         }
         else
-            APPLY_STAT_MOD(damageHelper, defender, spDefense, STAT_STAGE_SPDEF)
+            APPLY_STAT_MOD(damageHelper, defender, spDefense, STAT_SPDEF)
 
         damage = (damage / damageHelper);
         damage /= 50;
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index f7febfa58..5ad43712d 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -30,7 +30,7 @@ struct PlayerInfo
     u32 trainerId;
     u8 name[PLAYER_NAME_LENGTH];
     u8 gender;
-    u16 bank;
+    u16 battlerId;
     u16 language;
 };
 
@@ -50,7 +50,7 @@ struct RecordedBattleSave
     u8 playersLanguage[MAX_BATTLERS_COUNT];
     u32 rngSeed;
     u32 battleFlags;
-    u8 playersBank[MAX_BATTLERS_COUNT];
+    u8 playersBattler[MAX_BATTLERS_COUNT];
     u16 opponentA;
     u16 opponentB;
     u16 partnerId;
@@ -160,7 +160,7 @@ void sub_8184E58(void)
         {
             sRecordedBattle_Players[i].trainerId = gLinkPlayers[i].trainerId;
             sRecordedBattle_Players[i].gender = gLinkPlayers[i].gender;
-            sRecordedBattle_Players[i].bank = gLinkPlayers[i].lp_field_18;
+            sRecordedBattle_Players[i].battlerId = gLinkPlayers[i].lp_field_18;
             sRecordedBattle_Players[i].language = gLinkPlayers[i].language;
 
             if (i < linkPlayersCount)
@@ -184,7 +184,7 @@ void sub_8184E58(void)
                                     | (gSaveBlock2Ptr->playerTrainerId[3] << 24);
 
         sRecordedBattle_Players[0].gender = gSaveBlock2Ptr->playerGender;
-        sRecordedBattle_Players[0].bank = 0;
+        sRecordedBattle_Players[0].battlerId = 0;
         sRecordedBattle_Players[0].language = gGameLanguage;
 
         for (i = 0; i < PLAYER_NAME_LENGTH; i++)
@@ -192,31 +192,31 @@ void sub_8184E58(void)
     }
 }
 
-void RecordedBattle_SetBattlerAction(u8 bank, u8 action)
+void RecordedBattle_SetBattlerAction(u8 battlerId, u8 action)
 {
-    if (sRecordedBytesNo[bank] < BANK_RECORD_SIZE && sUnknown_0203C7AC != 2)
+    if (sRecordedBytesNo[battlerId] < BANK_RECORD_SIZE && sUnknown_0203C7AC != 2)
     {
-        sBattleRecords[bank][sRecordedBytesNo[bank]++] = action;
+        sBattleRecords[battlerId][sRecordedBytesNo[battlerId]++] = action;
     }
 }
 
-void RecordedBattle_ClearBattlerAction(u8 bank, u8 bytesToClear)
+void RecordedBattle_ClearBattlerAction(u8 battlerId, u8 bytesToClear)
 {
     s32 i;
 
     for (i = 0; i < bytesToClear; i++)
     {
-        sRecordedBytesNo[bank]--;
-        sBattleRecords[bank][sRecordedBytesNo[bank]] |= 0xFF;
-        if (sRecordedBytesNo[bank] == 0)
+        sRecordedBytesNo[battlerId]--;
+        sBattleRecords[battlerId][sRecordedBytesNo[battlerId]] |= 0xFF;
+        if (sRecordedBytesNo[battlerId] == 0)
             break;
     }
 }
 
-u8 RecordedBattle_GetBattlerAction(u8 bank)
+u8 RecordedBattle_GetBattlerAction(u8 battlerId)
 {
     // trying to read past array or invalid action byte, battle is over
-    if (sRecordedBytesNo[bank] >= BANK_RECORD_SIZE || sBattleRecords[bank][sRecordedBytesNo[bank]] == 0xFF)
+    if (sRecordedBytesNo[battlerId] >= BANK_RECORD_SIZE || sBattleRecords[battlerId][sRecordedBytesNo[battlerId]] == 0xFF)
     {
         gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; // hah
         ResetPaletteFadeControl();
@@ -226,7 +226,7 @@ u8 RecordedBattle_GetBattlerAction(u8 bank)
     }
     else
     {
-        return sBattleRecords[bank][sRecordedBytesNo[bank]++];
+        return sBattleRecords[battlerId][sRecordedBytesNo[battlerId]++];
     }
 }
 
@@ -350,7 +350,7 @@ u32 MoveRecordedBattleToSaveData(void)
         }
         battleSave->playersGender[i] = sRecordedBattle_Players[i].gender;
         battleSave->playersLanguage[i] = sRecordedBattle_Players[i].language;
-        battleSave->playersBank[i] = sRecordedBattle_Players[i].bank;
+        battleSave->playersBattler[i] = sRecordedBattle_Players[i].battlerId;
         battleSave->playersTrainerId[i] = sRecordedBattle_Players[i].trainerId;
     }
 
@@ -367,16 +367,16 @@ u32 MoveRecordedBattleToSaveData(void)
         }
         else if (sRecordedBattle_BattleFlags & BATTLE_TYPE_MULTI)
         {
-            switch (sRecordedBattle_Players[0].bank)
+            switch (sRecordedBattle_Players[0].battlerId)
             {
             case 0:
             case 2:
-                if (!(sRecordedBattle_Players[gUnknown_0203C7B4].bank & 1))
+                if (!(sRecordedBattle_Players[gUnknown_0203C7B4].battlerId & 1))
                     battleSave->battleFlags |= BATTLE_TYPE_x80000000;
                 break;
             case 1:
             case 3:
-                if ((sRecordedBattle_Players[gUnknown_0203C7B4].bank & 1))
+                if ((sRecordedBattle_Players[gUnknown_0203C7B4].battlerId & 1))
                     battleSave->battleFlags |= BATTLE_TYPE_x80000000;
                 break;
             }
@@ -1341,7 +1341,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src)
         }
         gLinkPlayers[i].gender = src->playersGender[i];
         gLinkPlayers[i].language = src->playersLanguage[i];
-        gLinkPlayers[i].lp_field_18 = src->playersBank[i];
+        gLinkPlayers[i].lp_field_18 = src->playersBattler[i];
         gLinkPlayers[i].trainerId = src->playersTrainerId[i];
 
         if (var)
@@ -1448,7 +1448,7 @@ static void RecordedBattle_RestoreSavedParties(void)
     }
 }
 
-u8 GetActiveBankLinkPlayerGender(void)
+u8 GetActiveBattlerLinkPlayerGender(void)
 {
     s32 i;
 
@@ -1489,7 +1489,7 @@ u8 GetTextSpeedInRecordedBattle(void)
     return sRecordedBattle_TextSpeed;
 }
 
-void RecordedBattle_CopyBankMoves(void)
+void RecordedBattle_CopyBattlerMoves(void)
 {
     s32 i;
 
@@ -1510,32 +1510,32 @@ void RecordedBattle_CopyBankMoves(void)
 
 void sub_818603C(u8 arg0)
 {
-    s32 bank, j, k;
+    s32 battlerId, j, k;
 
     if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
         return;
 
-    for (bank = 0; bank < gBattlersCount; bank++)
+    for (battlerId = 0; battlerId < gBattlersCount; battlerId++)
     {
-        if (GetBattlerSide(bank) != B_SIDE_OPPONENT) // player's side only
+        if (GetBattlerSide(battlerId) != B_SIDE_OPPONENT) // player's side only
         {
             if (arg0 == 1)
             {
                 for (j = 0; j < 4; j++)
                 {
-                    if (gBattleMons[bank].moves[j] != sRecordedBattle_PlayerMonMoves[bank / 2][j])
+                    if (gBattleMons[battlerId].moves[j] != sRecordedBattle_PlayerMonMoves[battlerId / 2][j])
                         break;
                 }
                 if (j != 4) // player's mon's move has been changed
                 {
-                    RecordedBattle_SetBattlerAction(bank, ACTION_MOVE_CHANGE);
+                    RecordedBattle_SetBattlerAction(battlerId, ACTION_MOVE_CHANGE);
                     for (j = 0; j < 4; j++)
                     {
                         for (k = 0; k < 4; k++)
                         {
-                            if (gBattleMons[bank].moves[j] == sRecordedBattle_PlayerMonMoves[bank / 2][k])
+                            if (gBattleMons[battlerId].moves[j] == sRecordedBattle_PlayerMonMoves[battlerId / 2][k])
                             {
-                                RecordedBattle_SetBattlerAction(bank, k);
+                                RecordedBattle_SetBattlerAction(battlerId, k);
                                 break;
                             }
                         }
@@ -1544,7 +1544,7 @@ void sub_818603C(u8 arg0)
             }
             else
             {
-                if (sBattleRecords[bank][sRecordedBytesNo[bank]] == ACTION_MOVE_CHANGE)
+                if (sBattleRecords[battlerId][sRecordedBytesNo[battlerId]] == ACTION_MOVE_CHANGE)
                 {
                     u8 ppBonuses[4];
                     u8 array1[4];
@@ -1553,58 +1553,58 @@ void sub_818603C(u8 arg0)
                     u8 array3[8];
                     u8 var;
 
-                    RecordedBattle_GetBattlerAction(bank);
+                    RecordedBattle_GetBattlerAction(battlerId);
                     for (j = 0; j < 4; j++)
                     {
-                        ppBonuses[j] = ((gBattleMons[bank].ppBonuses & ((3 << (j << 1)))) >> (j << 1));
+                        ppBonuses[j] = ((gBattleMons[battlerId].ppBonuses & ((3 << (j << 1)))) >> (j << 1));
                     }
                     for (j = 0; j < 4; j++)
                     {
-                        array1[j] = RecordedBattle_GetBattlerAction(bank);
-                        movePp.moves[j] = gBattleMons[bank].moves[array1[j]];
-                        movePp.pp[j] = gBattleMons[bank].pp[array1[j]];
+                        array1[j] = RecordedBattle_GetBattlerAction(battlerId);
+                        movePp.moves[j] = gBattleMons[battlerId].moves[array1[j]];
+                        movePp.pp[j] = gBattleMons[battlerId].pp[array1[j]];
                         array3[j] = ppBonuses[array1[j]];
-                        array2[j] = (gDisableStructs[bank].unk18_b & gBitTable[j]) >> j;
+                        array2[j] = (gDisableStructs[battlerId].unk18_b & gBitTable[j]) >> j;
                     }
                     for (j = 0; j < 4; j++)
                     {
-                        gBattleMons[bank].moves[j] = movePp.moves[j];
-                        gBattleMons[bank].pp[j] = movePp.pp[j];
+                        gBattleMons[battlerId].moves[j] = movePp.moves[j];
+                        gBattleMons[battlerId].pp[j] = movePp.pp[j];
                     }
-                    gBattleMons[bank].ppBonuses = 0;
-                    gDisableStructs[bank].unk18_b = 0;
+                    gBattleMons[battlerId].ppBonuses = 0;
+                    gDisableStructs[battlerId].unk18_b = 0;
                     for (j = 0; j < 4; j++)
                     {
-                        gBattleMons[bank].ppBonuses |= (array3[j]) << (j << 1);
-                        gDisableStructs[bank].unk18_b |= (array2[j]) << (j);
+                        gBattleMons[battlerId].ppBonuses |= (array3[j]) << (j << 1);
+                        gDisableStructs[battlerId].unk18_b |= (array2[j]) << (j);
                     }
 
-                    if (!(gBattleMons[bank].status2 & STATUS2_TRANSFORMED))
+                    if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED))
                     {
                         for (j = 0; j < 4; j++)
                         {
-                            ppBonuses[j] = ((GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_PP_BONUSES, NULL) & ((3 << (j << 1)))) >> (j << 1));
+                            ppBonuses[j] = ((GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_PP_BONUSES, NULL) & ((3 << (j << 1)))) >> (j << 1));
                         }
                         for (j = 0; j < 4; j++)
                         {
-                            movePp.moves[j] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_MOVE1 + array1[j], NULL);
-                            movePp.pp[j] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_PP1 + array1[j], NULL);
+                            movePp.moves[j] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_MOVE1 + array1[j], NULL);
+                            movePp.pp[j] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_PP1 + array1[j], NULL);
                             array3[j] = ppBonuses[array1[j]];
                         }
                         for (j = 0; j < 4; j++)
                         {
-                            SetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_MOVE1 + j, &movePp.moves[j]);
-                            SetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_PP1 + j, &movePp.pp[j]);
+                            SetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_MOVE1 + j, &movePp.moves[j]);
+                            SetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_PP1 + j, &movePp.pp[j]);
                         }
                         var = 0;
                         for (j = 0; j < 4; j++)
                         {
                             var |= (array3[j]) << (j << 1);
                         }
-                        SetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_PP_BONUSES, &var);
+                        SetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_PP_BONUSES, &var);
                     }
 
-                    gChosenMoveByBattler[bank] = gBattleMons[bank].moves[*(gBattleStruct->chosenMovePositions + bank)];
+                    gChosenMoveByBattler[battlerId] = gBattleMons[battlerId].moves[*(gBattleStruct->chosenMovePositions + battlerId)];
                 }
             }
         }
-- 
cgit v1.2.3


From 9df5e16343a7540a18607d13e098cf8ff8e252e3 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 8 Feb 2018 12:13:29 +0100
Subject: more battle labels

---
 src/battle_controllers.c     |   2 +-
 src/battle_gfx_sfx_util.c    | 243 ++++++++++++++++++++++---------------------
 src/battle_main.c            |  14 +--
 src/battle_message.c         |  16 +--
 src/battle_script_commands.c | 188 ++++++++++++++++-----------------
 src/battle_util.c            |  64 ++++++------
 src/pokemon_3.c              |   4 +-
 7 files changed, 266 insertions(+), 265 deletions(-)

(limited to 'src')

diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 5c52e4f9e..cbb4fff69 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -1102,7 +1102,7 @@ void BtlController_EmitPrintString(u8 bufferId, u16 stringID)
     stringInfo->scrActive = gBattleScripting.battler;
     stringInfo->unk1605E = gBattleStruct->field_52;
     stringInfo->hpScale = gBattleStruct->hpScale;
-    stringInfo->StringBank = gStringBattler;
+    stringInfo->StringBank = gPotentialItemEffectBattler;
     stringInfo->moveType = gBattleMoves[gCurrentMove].type;
 
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index b94a6c7c9..803b3eeab 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -22,6 +22,7 @@
 #include "blend_palette.h"
 #include "contest.h"
 #include "constants/songs.h"
+#include "constants/rgb.h"
 
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
@@ -57,7 +58,7 @@ extern const u8 gBlankGfxCompressed[];
 extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
 
-extern u8 sub_80688F8(u8, u8 bank);
+extern u8 sub_80688F8(u8, u8 battlerId);
 extern u8 pokemon_order_func(u8); // party menu
 extern void sub_81B8C68(void);
 
@@ -410,7 +411,7 @@ void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status)
     }
 }
 
-#define tBank data[0]
+#define tBattlerId data[0]
 
 bool8 TryHandleLaunchBattleTableAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId, u16 argument)
 {
@@ -440,8 +441,8 @@ bool8 TryHandleLaunchBattleTableAnimation(u8 activeBank, u8 atkBank, u8 defBank,
     gBattleSpritesDataPtr->animationData->animArg = argument;
     LaunchBattleAnimation(gBattleAnims_VariousTable, tableId, FALSE);
     taskId = CreateTask(Task_ClearBitWhenBattleTableAnimDone, 10);
-    gTasks[taskId].tBank = activeBank;
-    gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBank].animFromTableActive = 1;
+    gTasks[taskId].tBattlerId = activeBank;
+    gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].animFromTableActive = 1;
 
     return FALSE;
 }
@@ -451,12 +452,12 @@ static void Task_ClearBitWhenBattleTableAnimDone(u8 taskId)
     gAnimScriptCallback();
     if (!gAnimScriptActive)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBank].animFromTableActive = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].animFromTableActive = 0;
         DestroyTask(taskId);
     }
 }
 
-#undef tBank
+#undef tBattlerId
 
 static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId)
 {
@@ -474,7 +475,7 @@ static bool8 ShouldAnimBeDoneRegardlessOfSubsitute(u8 animId)
     }
 }
 
-#define tBank data[0]
+#define tBattlerId data[0]
 
 void InitAndLaunchSpecialAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId)
 {
@@ -484,8 +485,8 @@ void InitAndLaunchSpecialAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tab
     gBattleAnimTarget = defBank;
     LaunchBattleAnimation(gBattleAnims_Special, tableId, FALSE);
     taskId = CreateTask(Task_ClearBitWhenSpecialAnimDone, 10);
-    gTasks[taskId].tBank = activeBank;
-    gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBank].specialAnimActive = 1;
+    gTasks[taskId].tBattlerId = activeBank;
+    gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].specialAnimActive = 1;
 }
 
 static void Task_ClearBitWhenSpecialAnimDone(u8 taskId)
@@ -493,12 +494,12 @@ static void Task_ClearBitWhenSpecialAnimDone(u8 taskId)
     gAnimScriptCallback();
     if (!gAnimScriptActive)
     {
-        gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBank].specialAnimActive = 0;
+        gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].specialAnimActive = 0;
         DestroyTask(taskId);
     }
 }
 
-#undef tBank
+#undef tBattlerId
 
 // great function to include newly added moves that don't have animation yet
 bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn)
@@ -506,13 +507,13 @@ bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn)
     return FALSE;
 }
 
-bool8 mplay_80342A4(u8 bank)
+bool8 mplay_80342A4(u8 battlerId)
 {
     u8 zero = 0;
 
     if (IsSEPlaying())
     {
-        gBattleSpritesDataPtr->healthBoxesData[bank].field_8++;
+        gBattleSpritesDataPtr->healthBoxesData[battlerId].field_8++;
         if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_8 < 30)
             return TRUE;
 
@@ -521,14 +522,14 @@ bool8 mplay_80342A4(u8 bank)
     }
     if (zero == 0)
     {
-        gBattleSpritesDataPtr->healthBoxesData[bank].field_8 = 0;
+        gBattleSpritesDataPtr->healthBoxesData[battlerId].field_8 = 0;
         return FALSE;
     }
 
     return TRUE;
 }
 
-void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
+void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId)
 {
     u32 monsPersonality, currentPersonality, otId;
     u16 species;
@@ -538,50 +539,50 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank)
 
     monsPersonality = GetMonData(mon, MON_DATA_PERSONALITY);
 
-    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies == SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies == SPECIES_NONE)
     {
         species = GetMonData(mon, MON_DATA_SPECIES);
         currentPersonality = monsPersonality;
     }
     else
     {
-        species = gBattleSpritesDataPtr->battlerData[bank].transformSpecies;
-        currentPersonality = gTransformedPersonalities[bank];
+        species = gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies;
+        currentPersonality = gTransformedPersonalities[battlerId];
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
-    position = GetBattlerPosition(bank);
+    position = GetBattlerPosition(battlerId);
     HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
                                               gMonSpritesGfxPtr->sprites[position],
                                               species, currentPersonality);
 
-    paletteOffset = 0x100 + bank * 16;
+    paletteOffset = 0x100 + battlerId * 16;
 
-    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies == SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies == SPECIES_NONE)
         lzPaletteData = GetMonFrontSpritePal(mon);
     else
         lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
 
     LZDecompressWram(lzPaletteData, gDecompressionBuffer);
     LoadPalette(gDecompressionBuffer, paletteOffset, 0x20);
-    LoadPalette(gDecompressionBuffer, 0x80 + bank * 16, 0x20);
+    LoadPalette(gDecompressionBuffer, 0x80 + battlerId * 16, 0x20);
 
     if (species == SPECIES_CASTFORM)
     {
-        paletteOffset = 0x100 + bank * 16;
+        paletteOffset = 0x100 + battlerId * 16;
         LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]);
-        LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[bank]], paletteOffset, 0x20);
+        LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerId]], paletteOffset, 0x20);
     }
 
     // transform's pink color
-    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies != SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE)
     {
-        BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+        BlendPalette(paletteOffset, 16, 6, RGB_WHITE);
         CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
     }
 }
 
-void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
+void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId)
 {
     u32 monsPersonality, currentPersonality, otId;
     u16 species;
@@ -591,21 +592,21 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
 
     monsPersonality = GetMonData(mon, MON_DATA_PERSONALITY);
 
-    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies == SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies == SPECIES_NONE)
     {
         species = GetMonData(mon, MON_DATA_SPECIES);
         currentPersonality = monsPersonality;
     }
     else
     {
-        species = gBattleSpritesDataPtr->battlerData[bank].transformSpecies;
-        currentPersonality = gTransformedPersonalities[bank];
+        species = gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies;
+        currentPersonality = gTransformedPersonalities[battlerId];
     }
 
     otId = GetMonData(mon, MON_DATA_OT_ID);
-    position = GetBattlerPosition(bank);
+    position = GetBattlerPosition(battlerId);
 
-    if (sub_80688F8(1, bank) == 1 || gBattleSpritesDataPtr->battlerData[bank].transformSpecies != SPECIES_NONE)
+    if (sub_80688F8(1, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE)
     {
         HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species],
                                                   gMonSpritesGfxPtr->sprites[position],
@@ -618,28 +619,28 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank)
                                 species, currentPersonality);
     }
 
-    paletteOffset = 0x100 + bank * 16;
+    paletteOffset = 0x100 + battlerId * 16;
 
-    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies == SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies == SPECIES_NONE)
         lzPaletteData = GetMonFrontSpritePal(mon);
     else
         lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
 
     LZDecompressWram(lzPaletteData, gDecompressionBuffer);
     LoadPalette(gDecompressionBuffer, paletteOffset, 0x20);
-    LoadPalette(gDecompressionBuffer, 0x80 + bank * 16, 0x20);
+    LoadPalette(gDecompressionBuffer, 0x80 + battlerId * 16, 0x20);
 
     if (species == SPECIES_CASTFORM)
     {
-        paletteOffset = 0x100 + bank * 16;
+        paletteOffset = 0x100 + battlerId * 16;
         LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette[0]);
-        LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[bank]], paletteOffset, 0x20);
+        LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerId]], paletteOffset, 0x20);
     }
 
     // transform's pink color
-    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies != SPECIES_NONE)
+    if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE)
     {
-        BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+        BlendPalette(paletteOffset, 16, 6, RGB_WHITE);
         CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
     }
 }
@@ -652,23 +653,23 @@ void nullsub_24(u16 species)
 {
 }
 
-void DecompressTrainerFrontPic(u16 frontPicId, u8 bank)
+void DecompressTrainerFrontPic(u16 frontPicId, u8 battlerId)
 {
-    u8 position = GetBattlerPosition(bank);
+    u8 position = GetBattlerPosition(battlerId);
     DecompressPicFromTable_2(&gTrainerFrontPicTable[frontPicId],
                              gMonSpritesGfxPtr->sprites[position],
                              SPECIES_NONE);
     LoadCompressedObjectPalette(&gTrainerFrontPicPaletteTable[frontPicId]);
 }
 
-void DecompressTrainerBackPic(u16 backPicId, u8 bank)
+void DecompressTrainerBackPic(u16 backPicId, u8 battlerId)
 {
-    u8 position = GetBattlerPosition(bank);
+    u8 position = GetBattlerPosition(battlerId);
     DecompressPicFromTable_2(&gTrainerBackPicTable[backPicId],
                              gMonSpritesGfxPtr->sprites[position],
                              SPECIES_NONE);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[backPicId].data,
-                          0x100 + 16 * bank, 0x20);
+                          0x100 + 16 * battlerId, 0x20);
 }
 
 void nullsub_25(u8 arg0)
@@ -765,7 +766,7 @@ void LoadBattleBarGfx(u8 arg0)
     LZDecompressWram(gUnknown_08C093F0, gMonSpritesGfxPtr->barFontGfx);
 }
 
-bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
+bool8 BattleInitAllSprites(u8 *state1, u8 *battlerId)
 {
     bool8 retVal = FALSE;
 
@@ -776,13 +777,13 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
         (*state1)++;
         break;
     case 1:
-        if (!BattleLoadAllHealthBoxesGfx(*bank))
+        if (!BattleLoadAllHealthBoxesGfx(*battlerId))
         {
-            (*bank)++;
+            (*battlerId)++;
         }
         else
         {
-            *bank = 0;
+            *battlerId = 0;
             (*state1)++;
         }
         break;
@@ -790,47 +791,47 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *bank)
         (*state1)++;
         break;
     case 3:
-        if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) && *bank == 0)
-            gHealthboxSpriteIds[*bank] = CreateSafariPlayerHealthboxSprites();
+        if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) && *battlerId == 0)
+            gHealthboxSpriteIds[*battlerId] = CreateSafariPlayerHealthboxSprites();
         else
-            gHealthboxSpriteIds[*bank] = CreateBattlerHealthboxSprites(*bank);
+            gHealthboxSpriteIds[*battlerId] = CreateBattlerHealthboxSprites(*battlerId);
 
-        (*bank)++;
-        if (*bank == gBattlersCount)
+        (*battlerId)++;
+        if (*battlerId == gBattlersCount)
         {
-            *bank = 0;
+            *battlerId = 0;
             (*state1)++;
         }
         break;
     case 4:
-        InitBattlerHealthboxCoords(*bank);
-        if (gBattlerPositions[*bank] <= 1)
-            DummyBattleInterfaceFunc(gHealthboxSpriteIds[*bank], FALSE);
+        InitBattlerHealthboxCoords(*battlerId);
+        if (gBattlerPositions[*battlerId] <= 1)
+            DummyBattleInterfaceFunc(gHealthboxSpriteIds[*battlerId], FALSE);
         else
-            DummyBattleInterfaceFunc(gHealthboxSpriteIds[*bank], TRUE);
+            DummyBattleInterfaceFunc(gHealthboxSpriteIds[*battlerId], TRUE);
 
-        (*bank)++;
-        if (*bank == gBattlersCount)
+        (*battlerId)++;
+        if (*battlerId == gBattlersCount)
         {
-            *bank = 0;
+            *battlerId = 0;
             (*state1)++;
         }
         break;
     case 5:
-        if (GetBattlerSide(*bank) == B_SIDE_PLAYER)
+        if (GetBattlerSide(*battlerId) == B_SIDE_PLAYER)
         {
             if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
-                UpdateHealthboxAttribute(gHealthboxSpriteIds[*bank], &gPlayerParty[gBattlerPartyIndexes[*bank]], HEALTHBOX_ALL);
+                UpdateHealthboxAttribute(gHealthboxSpriteIds[*battlerId], &gPlayerParty[gBattlerPartyIndexes[*battlerId]], HEALTHBOX_ALL);
         }
         else
         {
-            UpdateHealthboxAttribute(gHealthboxSpriteIds[*bank], &gEnemyParty[gBattlerPartyIndexes[*bank]], HEALTHBOX_ALL);
+            UpdateHealthboxAttribute(gHealthboxSpriteIds[*battlerId], &gEnemyParty[gBattlerPartyIndexes[*battlerId]], HEALTHBOX_ALL);
         }
-        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[*bank]);
-        (*bank)++;
-        if (*bank == gBattlersCount)
+        SetHealthboxSpriteInvisible(gHealthboxSpriteIds[*battlerId]);
+        (*battlerId)++;
+        if (*battlerId == gBattlersCount)
         {
-            *bank = 0;
+            *battlerId = 0;
             (*state1)++;
         }
         break;
@@ -864,9 +865,9 @@ void CopyAllBattleSpritesInvisibilities(void)
         gBattleSpritesDataPtr->battlerData[i].invisible = gSprites[gBattlerSpriteIds[i]].invisible;
 }
 
-void CopyBattleSpriteInvisibility(u8 bank)
+void CopyBattleSpriteInvisibility(u8 battlerId)
 {
-    gBattleSpritesDataPtr->battlerData[bank].invisible = gSprites[gBattlerSpriteIds[bank]].invisible;
+    gBattleSpritesDataPtr->battlerData[battlerId].invisible = gSprites[gBattlerSpriteIds[battlerId]].invisible;
 }
 
 void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
@@ -885,7 +886,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
         gBattleMonForms[bankAtk] = gBattleSpritesDataPtr->animationData->animArg;
         if (gBattleSpritesDataPtr->battlerData[bankAtk].transformSpecies != SPECIES_NONE)
         {
-            BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+            BlendPalette(paletteOffset, 16, 6, RGB_WHITE);
             CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
         }
         gSprites[gBattlerSpriteIds[bankAtk]].pos1.y = GetBattlerSpriteDefault_Y(bankAtk);
@@ -954,7 +955,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
             LoadPalette(gBattleStruct->castformPalette[0] + gBattleMonForms[bankDef] * 16, paletteOffset, 32);
         }
 
-        BlendPalette(paletteOffset, 16, 6, 0x7FFF);
+        BlendPalette(paletteOffset, 16, 6, RGB_WHITE);
         CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
 
         if (!IsContest())
@@ -968,7 +969,7 @@ void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform)
     }
 }
 
-void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
+void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite)
 {
     u8 position;
     s32 i;
@@ -980,17 +981,17 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
         if (IsContest())
             position = 0;
         else
-            position = GetBattlerPosition(bank);
+            position = GetBattlerPosition(battlerId);
 
         if (IsContest())
             LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[position]);
-        else if (GetBattlerSide(bank) != B_SIDE_PLAYER)
+        else if (GetBattlerSide(battlerId) != B_SIDE_PLAYER)
             LZDecompressVram(gSubstituteDollGfx, gMonSpritesGfxPtr->sprites[position]);
         else
             LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites[position]);
 
         i = 1;
-        var = bank * 16;
+        var = battlerId * 16;
         substitutePal = gSubstituteDollPal;
         for (; i < 4; i++)
         {
@@ -1007,59 +1008,59 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite)
     {
         if (!IsContest())
         {
-            if (GetBattlerSide(bank) != B_SIDE_PLAYER)
-                BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[bank]], bank);
+            if (GetBattlerSide(battlerId) != B_SIDE_PLAYER)
+                BattleLoadOpponentMonSpriteGfx(&gEnemyParty[gBattlerPartyIndexes[battlerId]], battlerId);
             else
-                BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[bank]], bank);
+                BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlerPartyIndexes[battlerId]], battlerId);
         }
     }
 }
 
-void LoadBattleMonGfxAndAnimate(u8 bank, bool8 loadMonSprite, u8 spriteId)
+void LoadBattleMonGfxAndAnimate(u8 battlerId, bool8 loadMonSprite, u8 spriteId)
 {
-    BattleLoadSubstituteOrMonSpriteGfx(bank, loadMonSprite);
-    StartSpriteAnim(&gSprites[spriteId], gBattleMonForms[bank]);
+    BattleLoadSubstituteOrMonSpriteGfx(battlerId, loadMonSprite);
+    StartSpriteAnim(&gSprites[spriteId], gBattleMonForms[battlerId]);
 
     if (!loadMonSprite)
-        gSprites[spriteId].pos1.y = GetSubstituteSpriteDefault_Y(bank);
+        gSprites[spriteId].pos1.y = GetSubstituteSpriteDefault_Y(battlerId);
     else
-        gSprites[spriteId].pos1.y = GetBattlerSpriteDefault_Y(bank);
+        gSprites[spriteId].pos1.y = GetBattlerSpriteDefault_Y(battlerId);
 }
 
-void TrySetBehindSubstituteSpriteBit(u8 bank, u16 move)
+void TrySetBehindSubstituteSpriteBit(u8 battlerId, u16 move)
 {
     if (move == MOVE_SUBSTITUTE)
-        gBattleSpritesDataPtr->battlerData[bank].behindSubstitute = 1;
+        gBattleSpritesDataPtr->battlerData[battlerId].behindSubstitute = 1;
 }
 
-void ClearBehindSubstituteBit(u8 bank)
+void ClearBehindSubstituteBit(u8 battlerId)
 {
-    gBattleSpritesDataPtr->battlerData[bank].behindSubstitute = 0;
+    gBattleSpritesDataPtr->battlerData[battlerId].behindSubstitute = 0;
 }
 
-void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank)
+void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId)
 {
     u16 hp = GetMonData(mon, MON_DATA_HP);
     u16 maxHP = GetMonData(mon, MON_DATA_MAX_HP);
 
     if (GetHPBarLevel(hp, maxHP) == HP_BAR_RED)
     {
-        if (!gBattleSpritesDataPtr->battlerData[bank].lowHpSong)
+        if (!gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong)
         {
-            if (!gBattleSpritesDataPtr->battlerData[bank ^ BIT_FLANK].lowHpSong)
+            if (!gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong)
                 PlaySE(SE_HINSI);
-            gBattleSpritesDataPtr->battlerData[bank].lowHpSong = 1;
+            gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 1;
         }
     }
     else
     {
-        gBattleSpritesDataPtr->battlerData[bank].lowHpSong = 0;
+        gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 0;
         if (!IsDoubleBattle())
         {
             m4aSongNumStop(SE_HINSI);
             return;
         }
-        if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[bank ^ BIT_FLANK].lowHpSong)
+        if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong)
         {
             m4aSongNumStop(SE_HINSI);
             return;
@@ -1124,44 +1125,44 @@ void sub_805EB9C(u8 affineMode)
     }
 }
 
-#define tBank data[0]
+#define tBattlerId data[0]
 
 void LoadAndCreateEnemyShadowSprites(void)
 {
-    u8 bank;
+    u8 battlerId;
 
     LoadCompressedObjectPic(&gSpriteSheet_EnemyShadow);
 
-    bank = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
-    gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBattlerSpriteCoord(bank, 0), GetBattlerSpriteCoord(bank, 1) + 29, 0xC8);
-    gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
+    battlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
+    gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBattlerSpriteCoord(battlerId, 0), GetBattlerSpriteCoord(battlerId, 1) + 29, 0xC8);
+    gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].data[0] = battlerId;
 
     if (IsDoubleBattle())
     {
-        bank = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
-        gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBattlerSpriteCoord(bank, 0), GetBattlerSpriteCoord(bank, 1) + 29, 0xC8);
-        gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].data[0] = bank;
+        battlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
+        gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, GetBattlerSpriteCoord(battlerId, 0), GetBattlerSpriteCoord(battlerId, 1) + 29, 0xC8);
+        gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].data[0] = battlerId;
     }
 }
 
 void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
 {
     bool8 invisible = FALSE;
-    u8 bank = shadowSprite->tBank;
-    struct Sprite *bankSprite = &gSprites[gBattlerSpriteIds[bank]];
+    u8 battlerId = shadowSprite->tBattlerId;
+    struct Sprite *bankSprite = &gSprites[gBattlerSpriteIds[battlerId]];
 
-    if (!bankSprite->inUse || !IsBattlerSpritePresent(bank))
+    if (!bankSprite->inUse || !IsBattlerSpritePresent(battlerId))
     {
         shadowSprite->callback = SpriteCB_SetInvisible;
         return;
     }
     if (gAnimScriptActive || bankSprite->invisible)
         invisible = TRUE;
-    else if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies != SPECIES_NONE
-             && gEnemyMonElevation[gBattleSpritesDataPtr->battlerData[bank].transformSpecies] == 0)
+    else if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE
+             && gEnemyMonElevation[gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies] == 0)
         invisible = TRUE;
 
-    if (gBattleSpritesDataPtr->battlerData[bank].behindSubstitute)
+    if (gBattleSpritesDataPtr->battlerData[battlerId].behindSubstitute)
         invisible = TRUE;
 
     shadowSprite->pos1.x = bankSprite->pos1.x;
@@ -1169,31 +1170,31 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
     shadowSprite->invisible = invisible;
 }
 
-#undef tBank
+#undef tBattlerId
 
 void SpriteCB_SetInvisible(struct Sprite *sprite)
 {
     sprite->invisible = 1;
 }
 
-void SetBattlerShadowSpriteCallback(u8 bank, u16 species)
+void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species)
 {
     // The player's shadow is never seen
-    if (GetBattlerSide(bank) == B_SIDE_PLAYER)
+    if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
         return;
 
-    if (gBattleSpritesDataPtr->battlerData[bank].transformSpecies != SPECIES_NONE)
-        species = gBattleSpritesDataPtr->battlerData[bank].transformSpecies;
+    if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE)
+        species = gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies;
 
     if (gEnemyMonElevation[species] != 0)
-        gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].callback = SpriteCB_EnemyShadow;
+        gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].callback = SpriteCB_EnemyShadow;
     else
-        gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].callback = SpriteCB_SetInvisible;
+        gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].callback = SpriteCB_SetInvisible;
 }
 
-void HideBattlerShadowSprite(u8 bank)
+void HideBattlerShadowSprite(u8 battlerId)
 {
-    gSprites[gBattleSpritesDataPtr->healthBoxesData[bank].shadowSpriteId].callback = SpriteCB_SetInvisible;
+    gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].callback = SpriteCB_SetInvisible;
 }
 
 void sub_805EF14(void)
@@ -1219,12 +1220,12 @@ void sub_805EF14(void)
     }
 }
 
-void ClearTemporarySpeciesSpriteData(u8 bank, bool8 dontClearSubstitute)
+void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute)
 {
-    gBattleSpritesDataPtr->battlerData[bank].transformSpecies = SPECIES_NONE;
-    gBattleMonForms[bank] = 0;
+    gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies = SPECIES_NONE;
+    gBattleMonForms[battlerId] = 0;
     if (!dontClearSubstitute)
-        ClearBehindSubstituteBit(bank);
+        ClearBehindSubstituteBit(battlerId);
 }
 
 void AllocateMonSpritesGfx(void)
diff --git a/src/battle_main.c b/src/battle_main.c
index c45d559b5..c1dfde8c3 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -232,7 +232,7 @@ EWRAM_DATA u8 gBattlerAttacker = 0;
 EWRAM_DATA u8 gBattlerTarget = 0;
 EWRAM_DATA u8 gBattlerFainted = 0;
 EWRAM_DATA u8 gEffectBattler = 0;
-EWRAM_DATA u8 gStringBattler = 0;
+EWRAM_DATA u8 gPotentialItemEffectBattler = 0;
 EWRAM_DATA u8 gAbsentBattlerFlags = 0;
 EWRAM_DATA u8 gCritMultiplier = 0;
 EWRAM_DATA u8 gMultiHitCounter = 0;
@@ -3815,7 +3815,7 @@ u8 IsRunningFromBattleImpossible(void)
     else
         holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
 
-    gStringBattler = gActiveBattler;
+    gPotentialItemEffectBattler = gActiveBattler;
 
     if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
         return 0;
@@ -4417,8 +4417,8 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
     }
 
     speedBattler1 = (gBattleMons[battler1].speed * speedMultiplierBattler1)
-                * (gStatStageRatios[gBattleMons[battler1].statStages[STAT_STAGE_SPEED]][0])
-                / (gStatStageRatios[gBattleMons[battler1].statStages[STAT_STAGE_SPEED]][1]);
+                * (gStatStageRatios[gBattleMons[battler1].statStages[STAT_SPEED]][0])
+                / (gStatStageRatios[gBattleMons[battler1].statStages[STAT_SPEED]][1]);
 
     if (gBattleMons[battler1].item == ITEM_ENIGMA_BERRY)
     {
@@ -4451,8 +4451,8 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
     // check second battlerId's speed
 
     speedBattler2 = (gBattleMons[battler2].speed * speedMultiplierBattler2)
-                * (gStatStageRatios[gBattleMons[battler2].statStages[STAT_STAGE_SPEED]][0])
-                / (gStatStageRatios[gBattleMons[battler2].statStages[STAT_STAGE_SPEED]][1]);
+                * (gStatStageRatios[gBattleMons[battler2].statStages[STAT_SPEED]][0])
+                / (gStatStageRatios[gBattleMons[battler2].statStages[STAT_SPEED]][1]);
 
     if (gBattleMons[battler2].item == ITEM_ENIGMA_BERRY)
     {
@@ -5380,7 +5380,7 @@ bool8 TryRunFromBattle(u8 battler)
     else
         holdEffect = ItemId_GetHoldEffect(gBattleMons[battler].item);
 
-    gStringBattler = battler;
+    gPotentialItemEffectBattler = battler;
 
     if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
     {
diff --git a/src/battle_message.c b/src/battle_message.c
index 4c980312d..36ff3ecc7 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1421,7 +1421,7 @@ void BufferStringBattle(u16 stringID)
     gBattleScripting.battler = gStringInfo->scrActive;
     *(&gBattleStruct->field_52) = gStringInfo->unk1605E;
     *(&gBattleStruct->hpScale) = gStringInfo->hpScale;
-    gStringBattler = gStringInfo->StringBank;
+    gPotentialItemEffectBattler = gStringInfo->StringBank;
     *(&gBattleStruct->stringMoveType) = gStringInfo->moveType;
 
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
@@ -1915,10 +1915,10 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                     {
                         if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
                         {
-                            if ((gBattleScripting.multiplayerId != 0 && (gStringBattler & BIT_SIDE))
-                                || (gBattleScripting.multiplayerId == 0 && !(gStringBattler & BIT_SIDE)))
+                            if ((gBattleScripting.multiplayerId != 0 && (gPotentialItemEffectBattler & BIT_SIDE))
+                                || (gBattleScripting.multiplayerId == 0 && !(gPotentialItemEffectBattler & BIT_SIDE)))
                             {
-                                StringCopy(text, gEnigmaBerries[gStringBattler].name);
+                                StringCopy(text, gEnigmaBerries[gPotentialItemEffectBattler].name);
                                 StringAppend(text, gText_BerrySuffix);
                                 toCpy = text;
                             }
@@ -1929,9 +1929,9 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                         }
                         else
                         {
-                            if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gStringBattler)
+                            if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gPotentialItemEffectBattler)
                             {
-                                StringCopy(text, gEnigmaBerries[gStringBattler].name);
+                                StringCopy(text, gEnigmaBerries[gPotentialItemEffectBattler].name);
                                 StringAppend(text, gText_BerrySuffix);
                                 toCpy = text;
                             }
@@ -2298,9 +2298,9 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
             {
                 if (hword == ITEM_ENIGMA_BERRY)
                 {
-                    if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gStringBattler)
+                    if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gPotentialItemEffectBattler)
                     {
-                        StringCopy(dst, gEnigmaBerries[gStringBattler].name);
+                        StringCopy(dst, gEnigmaBerries[gPotentialItemEffectBattler].name);
                         StringAppend(dst, gText_BerrySuffix);
                     }
                     else
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index dc2eab357..e7ee19c23 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -62,7 +62,7 @@ extern const struct TrainerMoney gTrainerMoneyTable[];
 extern const u8* const gBattleScriptsForMoveEffects[];
 
 // functions
-extern void sub_81A5718(u8 bank); // battle frontier 2
+extern void sub_81A5718(u8 battlerId); // battle frontier 2
 extern void sub_81A56B4(void); // battle frontier 2
 extern void sub_81BFA38(struct Pokemon* party, u8 monPartyId, u8 monCount, void (*callback)(void), u16 move); // pokemon summary screen
 extern u8 sub_81C1B94(void); // pokemon summary screen
@@ -73,7 +73,7 @@ extern u8* GetMonNickname(struct Pokemon* mon, u8* dst); // party_menu
 extern u8 sub_81A5258(u8* arg0); // battle frontier 2
 extern void sub_81A5BF8(void); // battle frontier 2
 extern void sub_81A5D44(void); // battle frontier 2
-extern void sub_81B8E80(u8 bank, u8, u8); // party menu
+extern void sub_81B8E80(u8 battlerId, u8, u8); // party menu
 extern bool8 sub_81B1250(void); // ?
 extern bool8 InBattlePike(void);
 extern bool8 InBattlePyramid(void);
@@ -104,7 +104,7 @@ extern const u8 gText_BattleYesNoChoice[];
 // this file's functions
 static bool8 IsTwoTurnsMove(u16 move);
 static void TrySetDestinyBondToHappen(void);
-static u8 AttacksThisTurn(u8 bank, u16 move); // Note: returns 1 if it's a charging turn, otherwise 2.
+static u8 AttacksThisTurn(u8 battlerId, u16 move); // Note: returns 1 if it's a charging turn, otherwise 2.
 static void CheckWonderGuardAndLevitate(void);
 static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8, const u8* BS_ptr);
 static bool32 IsMonGettingExpSentOut(void);
@@ -1174,13 +1174,13 @@ static void atk01_accuracycheck(void)
 
         if (gBattleMons[gBattlerTarget].status2 & STATUS2_FORESIGHT)
         {
-            u8 acc = gBattleMons[gBattlerAttacker].statStages[STAT_STAGE_ACC];
+            u8 acc = gBattleMons[gBattlerAttacker].statStages[STAT_ACC];
             buff = acc;
         }
         else
         {
-            u8 acc = gBattleMons[gBattlerAttacker].statStages[STAT_STAGE_ACC];
-            buff = acc + 6 - gBattleMons[gBattlerTarget].statStages[STAT_STAGE_EVASION];
+            u8 acc = gBattleMons[gBattlerAttacker].statStages[STAT_ACC];
+            buff = acc + 6 - gBattleMons[gBattlerTarget].statStages[STAT_EVASION];
         }
 
         if (buff < 0)
@@ -1214,7 +1214,7 @@ static void atk01_accuracycheck(void)
             param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
         }
 
-        gStringBattler = gBattlerTarget;
+        gPotentialItemEffectBattler = gBattlerTarget;
 
         if (holdEffect == HOLD_EFFECT_EVASION_UP)
             calc = (calc * (100 - param)) / 100;
@@ -1307,7 +1307,7 @@ static void atk04_critcalc(void)
     else
         holdEffect = ItemId_GetHoldEffect(item);
 
-    gStringBattler = gBattlerAttacker;
+    gPotentialItemEffectBattler = gBattlerAttacker;
 
     critChance  = 2 * ((gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY) != 0)
                 + (gBattleMoves[gCurrentMove].effect == EFFECT_HIGH_CRITICAL)
@@ -1716,7 +1716,7 @@ static void atk07_adjustnormaldamage(void)
         param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
-    gStringBattler = gBattlerTarget;
+    gPotentialItemEffectBattler = gBattlerTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
@@ -1765,7 +1765,7 @@ static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't
         param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
-    gStringBattler = gBattlerTarget;
+    gPotentialItemEffectBattler = gBattlerTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
@@ -1972,7 +1972,7 @@ static void atk0C_datahpupdate(void)
                 if (!gSpecialStatuses[gActiveBattler].dmg && !(gHitMarker & HITMARKER_x100000))
                     gSpecialStatuses[gActiveBattler].dmg = gHpDealt;
 
-                if (moveType <= 8 && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT)
+                if (IS_MOVE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT)
                 {
                     gProtectStructs[gActiveBattler].physicalDmg = gHpDealt;
                     gSpecialStatuses[gActiveBattler].physicalDmg = gHpDealt;
@@ -1987,7 +1987,7 @@ static void atk0C_datahpupdate(void)
                         gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerTarget;
                     }
                 }
-                else if (moveType > 8 && !(gHitMarker & HITMARKER_x100000))
+                else if (!IS_MOVE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000))
                 {
                     gProtectStructs[gActiveBattler].specialDmg = gHpDealt;
                     gSpecialStatuses[gActiveBattler].specialDmg = gHpDealt;
@@ -2114,7 +2114,7 @@ static void atk0F_resultmessage(void)
             break;
         case MOVE_RESULT_FOE_HUNG_ON:
             gLastUsedItem = gBattleMons[gBattlerTarget].item;
-            gStringBattler = gBattlerTarget;
+            gPotentialItemEffectBattler = gBattlerTarget;
             gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
             BattleScriptPushCursor();
             gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
@@ -2143,7 +2143,7 @@ static void atk0F_resultmessage(void)
             else if (gMoveResultFlags & MOVE_RESULT_FOE_HUNG_ON)
             {
                 gLastUsedItem = gBattleMons[gBattlerTarget].item;
-                gStringBattler = gBattlerTarget;
+                gPotentialItemEffectBattler = gBattlerTarget;
                 gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_HangedOnMsg;
@@ -2239,12 +2239,12 @@ static void atk14_printselectionstringfromtable(void)
     }
 }
 
-u8 GetBattlerTurnOrderNum(u8 bank)
+u8 GetBattlerTurnOrderNum(u8 battlerId)
 {
     s32 i;
     for (i = 0; i < gBattlersCount; i++)
     {
-        if (gBattleTurnOrder[i] == bank)
+        if (gBattleTurnOrder[i] == battlerId)
             break;
     }
     return i;
@@ -2271,7 +2271,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
 
     if (gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_AFFECTS_USER)
     {
-        gEffectBattler = gBattlerAttacker; // bank that effects get applied on
+        gEffectBattler = gBattlerAttacker; // battlerId that effects get applied on
         gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_AFFECTS_USER);
         affectsUser = MOVE_EFFECT_AFFECTS_USER;
         gBattleScripting.battler = gBattlerTarget; // theoretically the attacker
@@ -3028,18 +3028,18 @@ static void atk19_tryfaintmon(void)
     }
     else
     {
-        u8 bank;
+        u8 battlerId;
 
         if (gBattlescriptCurrInstr[1] == BS_ATTACKER)
         {
             gActiveBattler = gBattlerAttacker;
-            bank = gBattlerTarget;
+            battlerId = gBattlerTarget;
             BS_ptr = BattleScript_FaintAttacker;
         }
         else
         {
             gActiveBattler = gBattlerTarget;
-            bank = gBattlerAttacker;
+            battlerId = gBattlerAttacker;
             BS_ptr = BattleScript_FaintTarget;
         }
         if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler])
@@ -3065,7 +3065,7 @@ static void atk19_tryfaintmon(void)
             {
                 gHitMarker &= ~(HITMARKER_DESTINYBOND);
                 BattleScriptPush(gBattlescriptCurrInstr);
-                gBattleMoveDamage = gBattleMons[bank].hp;
+                gBattleMoveDamage = gBattleMons[battlerId].hp;
                 gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife;
             }
             if ((gStatuses3[gBattlerTarget] & STATUS3_GRUDGE)
@@ -3124,11 +3124,11 @@ static void atk1B_cleareffectsonfaint(void)
 
 static void atk1C_jumpifstatus(void)
 {
-    u8 bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
+    u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u32 flags = BS2ScriptRead32(gBattlescriptCurrInstr + 2);
     const u8* jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 6);
 
-    if (gBattleMons[bank].status1 & flags && gBattleMons[bank].hp)
+    if (gBattleMons[battlerId].status1 & flags && gBattleMons[battlerId].hp)
         gBattlescriptCurrInstr = jumpPtr;
     else
         gBattlescriptCurrInstr += 10;
@@ -3136,11 +3136,11 @@ static void atk1C_jumpifstatus(void)
 
 static void atk1D_jumpifstatus2(void)
 {
-    u8 bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
+    u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u32 flags = BS2ScriptRead32(gBattlescriptCurrInstr + 2);
     const u8* jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 6);
 
-    if (gBattleMons[bank].status2 & flags && gBattleMons[bank].hp)
+    if (gBattleMons[battlerId].status2 & flags && gBattleMons[battlerId].hp)
         gBattlescriptCurrInstr = jumpPtr;
     else
         gBattlescriptCurrInstr += 10;
@@ -3148,45 +3148,45 @@ static void atk1D_jumpifstatus2(void)
 
 static void atk1E_jumpifability(void)
 {
-    u8 bank;
+    u8 battlerId;
     u8 ability = gBattlescriptCurrInstr[2];
     const u8* jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 3);
 
     if (gBattlescriptCurrInstr[1] == BS_ATTACKER_SIDE)
     {
-        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattlerAttacker, ability, 0, 0);
-        if (bank)
+        battlerId = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattlerAttacker, ability, 0, 0);
+        if (battlerId)
         {
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jumpPtr;
-            RecordAbilityBattle(bank - 1, gLastUsedAbility);
-            gBattleScripting.battlerWithAbility = bank - 1;
+            RecordAbilityBattle(battlerId - 1, gLastUsedAbility);
+            gBattleScripting.battlerWithAbility = battlerId - 1;
         }
         else
             gBattlescriptCurrInstr += 7;
     }
     else if (gBattlescriptCurrInstr[1] == BS_NOT_ATTACKER_SIDE)
     {
-        bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBattlerAttacker, ability, 0, 0);
-        if (bank)
+        battlerId = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBattlerAttacker, ability, 0, 0);
+        if (battlerId)
         {
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jumpPtr;
-            RecordAbilityBattle(bank - 1, gLastUsedAbility);
-            gBattleScripting.battlerWithAbility = bank - 1;
+            RecordAbilityBattle(battlerId - 1, gLastUsedAbility);
+            gBattleScripting.battlerWithAbility = battlerId - 1;
         }
         else
             gBattlescriptCurrInstr += 7;
     }
     else
     {
-        bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
-        if (gBattleMons[bank].ability == ability)
+        battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
+        if (gBattleMons[battlerId].ability == ability)
         {
             gLastUsedAbility = ability;
             gBattlescriptCurrInstr = jumpPtr;
-            RecordAbilityBattle(bank, gLastUsedAbility);
-            gBattleScripting.battlerWithAbility = bank;
+            RecordAbilityBattle(battlerId, gLastUsedAbility);
+            gBattleScripting.battlerWithAbility = battlerId;
         }
         else
             gBattlescriptCurrInstr += 7;
@@ -3216,8 +3216,8 @@ static void atk1F_jumpifsideaffecting(void)
 static void atk20_jumpifstat(void)
 {
     u8 ret = 0;
-    u8 bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
-    u8 value = gBattleMons[bank].statStages[gBattlescriptCurrInstr[3]];
+    u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
+    u8 value = gBattleMons[battlerId].statStages[gBattlescriptCurrInstr[3]];
 
     switch (gBattlescriptCurrInstr[2])
     {
@@ -3280,11 +3280,11 @@ static void atk21_jumpifstatus3condition(void)
 
 static void atk22_jumpiftype(void)
 {
-    u8 bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
+    u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u8 type = gBattlescriptCurrInstr[2];
     const u8* jumpPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 3);
 
-    if (gBattleMons[bank].type1 == type || gBattleMons[bank].type2 == type)
+    if (gBattleMons[battlerId].type1 == type || gBattleMons[battlerId].type2 == type)
         gBattlescriptCurrInstr = jumpPtr;
     else
         gBattlescriptCurrInstr += 7;
@@ -3435,7 +3435,7 @@ static void atk23_getexp(void)
                         i = 0x149;
                     }
 
-                    // get exp getter bank
+                    // get exp getter battlerId
                     if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
                     {
                         if (!(gBattlerPartyIndexes[2] != gBattleStruct->expGetterMonId) && !(gAbsentBattlerFlags & gBitTable[2]))
@@ -4312,9 +4312,9 @@ static void atk41_call(void)
 
 static void atk42_jumpiftype2(void)
 {
-    u8 bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
+    u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
-    if (gBattlescriptCurrInstr[2] == gBattleMons[bank].type1 || gBattlescriptCurrInstr[2] == gBattleMons[bank].type2)
+    if (gBattlescriptCurrInstr[2] == gBattleMons[battlerId].type1 || gBattlescriptCurrInstr[2] == gBattleMons[battlerId].type2)
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 3);
     else
         gBattlescriptCurrInstr += 7;
@@ -4469,8 +4469,8 @@ static void atk48_playstatchangeanimation(void)
                 else if (!gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].mistTimer
                         && gBattleMons[gActiveBattler].ability != ABILITY_CLEAR_BODY
                         && gBattleMons[gActiveBattler].ability != ABILITY_WHITE_SMOKE
-                        && !(gBattleMons[gActiveBattler].ability == ABILITY_KEEN_EYE && currStat == STAT_STAGE_ACC)
-                        && !(gBattleMons[gActiveBattler].ability == ABILITY_HYPER_CUTTER && currStat == STAT_STAGE_ATK))
+                        && !(gBattleMons[gActiveBattler].ability == ABILITY_KEEN_EYE && currStat == STAT_ACC)
+                        && !(gBattleMons[gActiveBattler].ability == ABILITY_HYPER_CUTTER && currStat == STAT_ATK))
                 {
                     if (gBattleMons[gActiveBattler].statStages[currStat] > 0)
                     {
@@ -4824,9 +4824,9 @@ static void atk49_moveend(void)
                 && gBattleMons[gBattlerTarget].hp != 0 && gBattlerAttacker != gBattlerTarget
                 && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED
-                && gBattleMoves[gCurrentMove].power && gBattleMons[gBattlerTarget].statStages[STAT_STAGE_ATK] <= 0xB)
+                && gBattleMoves[gCurrentMove].power && gBattleMons[gBattlerTarget].statStages[STAT_ATK] <= 0xB)
             {
-                gBattleMons[gBattlerTarget].statStages[STAT_STAGE_ATK]++;
+                gBattleMons[gBattlerTarget].statStages[STAT_ATK]++;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_RageIsBuilding;
                 effect = TRUE;
@@ -4861,7 +4861,7 @@ static void atk49_moveend(void)
             break;
         case 4: // status immunities
             if (AbilityBattleEffects(ABILITYEFFECT_IMMUNITY, 0, 0, 0, 0))
-                effect = TRUE; // it loops through all banks, so we increment after its done with all banks
+                effect = TRUE; // it loops through all battlers, so we increment after its done with all battlers
             else
                 gBattleScripting.atk49_state++;
             break;
@@ -4905,7 +4905,7 @@ static void atk49_moveend(void)
             }
             gBattleScripting.atk49_state++;
             break;
-        case 11: // item effects for all banks
+        case 11: // item effects for all battlers
             if (ItemBattleEffects(3, 0, FALSE))
                 effect = TRUE;
             else
@@ -5039,10 +5039,10 @@ static void atk49_moveend(void)
                 && !gProtectStructs[gBattlerAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH
                 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
             {
-                u8 bank = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gBattlerTarget)));
-                if (gBattleMons[bank].hp != 0)
+                u8 battlerId = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gBattlerTarget)));
+                if (gBattleMons[battlerId].hp != 0)
                 {
-                    gBattlerTarget = bank;
+                    gBattlerTarget = battlerId;
                     gHitMarker |= HITMARKER_NO_ATTACKSTRING;
                     gBattleScripting.atk49_state = 0;
                     MoveValuesCleanUp();
@@ -5440,10 +5440,10 @@ static void atk50_openpartyscreen(void)
 {
     u32 flags;
     u8 hitmarkerFaintBits;
-    u8 bank;
+    u8 battlerId;
     const u8 *jumpPtr;
 
-    bank = 0;
+    battlerId = 0;
     flags = 0;
     jumpPtr = BSScriptReadPtr(gBattlescriptCurrInstr + 2);
 
@@ -5675,21 +5675,21 @@ static void atk50_openpartyscreen(void)
         else
             hitmarkerFaintBits = 1;
 
-        bank = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(0x80));
-        if (gSpecialStatuses[bank].flag40)
+        battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(0x80));
+        if (gSpecialStatuses[battlerId].flag40)
         {
             gBattlescriptCurrInstr += 6;
         }
-        else if (sub_80423F4(bank, 6, 6))
+        else if (sub_80423F4(battlerId, 6, 6))
         {
-            gActiveBattler = bank;
+            gActiveBattler = battlerId;
             gAbsentBattlerFlags |= gBitTable[gActiveBattler];
             gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
             gBattlescriptCurrInstr = jumpPtr;
         }
         else
         {
-            gActiveBattler = bank;
+            gActiveBattler = battlerId;
             *(gBattleStruct->field_58 + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler];
             *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
             gBattleStruct->field_93 &= ~(gBitTable[gActiveBattler]);
@@ -5706,7 +5706,7 @@ static void atk50_openpartyscreen(void)
             {
                 for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++)
                 {
-                    if (gActiveBattler != bank)
+                    if (gActiveBattler != battlerId)
                     {
                         BtlController_EmitLinkStandbyMsg(0, 2, 0);
                         MarkBattlerForControllerExec(gActiveBattler);
@@ -5715,7 +5715,7 @@ static void atk50_openpartyscreen(void)
             }
             else
             {
-                gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(bank) ^ BIT_SIDE);
+                gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(battlerId) ^ BIT_SIDE);
                 if (gAbsentBattlerFlags & gBitTable[gActiveBattler])
                     gActiveBattler ^= BIT_FLANK;
 
@@ -6451,7 +6451,7 @@ static void atk69_adjustsetdamage(void) // The same as 0x7, except there's no ra
         param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
-    gStringBattler = gBattlerTarget;
+    gPotentialItemEffectBattler = gBattlerTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
@@ -6805,7 +6805,7 @@ static void atk70_recordlastability(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     RecordAbilityBattle(gActiveBattler, gLastUsedAbility);
-    gBattlescriptCurrInstr += 1; // UB: Should be + 2, one byte for command and one byte for bank argument.
+    gBattlescriptCurrInstr += 1; // UB: Should be + 2, one byte for command and one byte for battlerId argument.
 }
 
 void BufferMoveToLearnIntoBattleTextBuff2(void)
@@ -7363,13 +7363,13 @@ static void atk83_nop(void)
     gBattlescriptCurrInstr++;
 }
 
-bool8 UproarWakeUpCheck(u8 bank)
+bool8 UproarWakeUpCheck(u8 battlerId)
 {
     s32 i;
 
     for (i = 0; i < gBattlersCount; i++)
     {
-        if (!(gBattleMons[i].status2 & STATUS2_UPROAR) || gBattleMons[bank].ability == ABILITY_SOUNDPROOF)
+        if (!(gBattleMons[i].status2 & STATUS2_UPROAR) || gBattleMons[battlerId].ability == ABILITY_SOUNDPROOF)
             continue;
 
         gBattleScripting.battler = i;
@@ -7569,7 +7569,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
             return STAT_CHANGE_DIDNT_WORK;
         }
         else if (gBattleMons[gActiveBattler].ability == ABILITY_KEEN_EYE
-                 && !certain && statId == STAT_STAGE_ACC)
+                 && !certain && statId == STAT_ACC)
         {
             if (flags == STAT_CHANGE_BS_PTR)
             {
@@ -7582,7 +7582,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
             return STAT_CHANGE_DIDNT_WORK;
         }
         else if (gBattleMons[gActiveBattler].ability == ABILITY_HYPER_CUTTER
-                 && !certain && statId == STAT_STAGE_ATK)
+                 && !certain && statId == STAT_ATK)
         {
             if (flags == STAT_CHANGE_BS_PTR)
             {
@@ -7753,8 +7753,8 @@ static bool8 TryDoForceSwitchOut(void)
 static void atk8F_forcerandomswitch(void)
 {
     s32 i;
-    s32 bank1PartyId = 0;
-    s32 bank2PartyId = 0;
+    s32 battler1PartyId = 0;
+    s32 battler2PartyId = 0;
 
     #ifdef NONMATCHING
         s32 lastMonId = 0; // + 1
@@ -7791,8 +7791,8 @@ static void atk8F_forcerandomswitch(void)
             }
             monsCount = 3;
             minNeeded = 1;
-            bank2PartyId = gBattlerPartyIndexes[gBattlerTarget];
-            bank1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
+            battler2PartyId = gBattlerPartyIndexes[gBattlerTarget];
+            battler1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
         }
         else if ((gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK)
                  || (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_x2000000))
@@ -7809,8 +7809,8 @@ static void atk8F_forcerandomswitch(void)
             }
             monsCount = 3;
             minNeeded = 1;
-            bank2PartyId = gBattlerPartyIndexes[gBattlerTarget];
-            bank1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
+            battler2PartyId = gBattlerPartyIndexes[gBattlerTarget];
+            battler1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
         {
@@ -7836,8 +7836,8 @@ static void atk8F_forcerandomswitch(void)
                 monsCount = 3;
                 minNeeded = 1;
             }
-            bank2PartyId = gBattlerPartyIndexes[gBattlerTarget];
-            bank1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
+            battler2PartyId = gBattlerPartyIndexes[gBattlerTarget];
+            battler1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
         {
@@ -7845,8 +7845,8 @@ static void atk8F_forcerandomswitch(void)
             lastMonId = 6;
             monsCount = 6;
             minNeeded = 2;
-            bank2PartyId = gBattlerPartyIndexes[gBattlerTarget];
-            bank1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
+            battler2PartyId = gBattlerPartyIndexes[gBattlerTarget];
+            battler1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK];
         }
         else
         {
@@ -7854,8 +7854,8 @@ static void atk8F_forcerandomswitch(void)
             lastMonId = 6;
             monsCount = 6;
             minNeeded = 1;
-            bank2PartyId = gBattlerPartyIndexes[gBattlerTarget]; // there is only one pokemon out in single battles
-            bank1PartyId = gBattlerPartyIndexes[gBattlerTarget];
+            battler2PartyId = gBattlerPartyIndexes[gBattlerTarget]; // there is only one pokemon out in single battles
+            battler1PartyId = gBattlerPartyIndexes[gBattlerTarget];
         }
 
         for (i = firstMonId; i < lastMonId; i++)
@@ -7881,8 +7881,8 @@ static void atk8F_forcerandomswitch(void)
                     i = Random() % monsCount;
                     i += firstMonId;
                 }
-                while (i == bank2PartyId
-                       || i == bank1PartyId
+                while (i == battler2PartyId
+                       || i == battler1PartyId
                        || GetMonData(&party[i], MON_DATA_SPECIES) == SPECIES_NONE
                        || GetMonData(&party[i], MON_DATA_IS_EGG) == TRUE
                        || GetMonData(&party[i], MON_DATA_HP) == 0);
@@ -8030,7 +8030,7 @@ static void atk93_tryKO(void)
         param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item);
     }
 
-    gStringBattler = gBattlerTarget;
+    gPotentialItemEffectBattler = gBattlerTarget;
 
     if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param)
     {
@@ -8738,7 +8738,7 @@ static bool8 IsInvalidForSleepTalkOrAssist(u16 move)
         return FALSE;
 }
 
-static u8 AttacksThisTurn(u8 bank, u16 move) // Note: returns 1 if it's a charging turn, otherwise 2
+static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a charging turn, otherwise 2
 {
     // first argument is unused
     if (gBattleMoves[move].effect == EFFECT_SOLARBEAM
@@ -9296,10 +9296,10 @@ static void atkBC_maxattackhalvehp(void) // belly drum
     if (!(gBattleMons[gBattlerAttacker].maxHP / 2))
         halfHp = 1;
 
-    if (gBattleMons[gBattlerAttacker].statStages[STAT_STAGE_ATK] < 12
+    if (gBattleMons[gBattlerAttacker].statStages[STAT_ATK] < 12
         && gBattleMons[gBattlerAttacker].hp > halfHp)
     {
-        gBattleMons[gBattlerAttacker].statStages[STAT_STAGE_ATK] = 12;
+        gBattleMons[gBattlerAttacker].statStages[STAT_ATK] = 12;
         gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
@@ -9719,8 +9719,8 @@ static void atkC8_sethail(void)
 
 static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento
 {
-    if (gBattleMons[gBattlerTarget].statStages[STAT_STAGE_ATK] == 0
-        && gBattleMons[gBattlerTarget].statStages[STAT_STAGE_SPATK] == 0
+    if (gBattleMons[gBattlerTarget].statStages[STAT_ATK] == 0
+        && gBattleMons[gBattlerTarget].statStages[STAT_SPATK] == 0
         && gBattleCommunication[6] != 1)
     {
         gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
@@ -10056,13 +10056,13 @@ static void atkDB_tryimprision(void)
     }
     else
     {
-        u8 bank, sideAttacker;
+        u8 battlerId, sideAttacker;
 
         sideAttacker = GetBattlerSide(gBattlerAttacker);
         PressurePPLoseOnUsingImprision(gBattlerAttacker);
-        for (bank = 0; bank < gBattlersCount; bank++)
+        for (battlerId = 0; battlerId < gBattlersCount; battlerId++)
         {
-            if (sideAttacker != GetBattlerSide(bank))
+            if (sideAttacker != GetBattlerSide(battlerId))
             {
                 s32 attackerMoveId;
                 for (attackerMoveId = 0; attackerMoveId < 4; attackerMoveId++)
@@ -10070,7 +10070,7 @@ static void atkDB_tryimprision(void)
                     s32 i;
                     for (i = 0; i < 4; i++)
                     {
-                        if (gBattleMons[gBattlerAttacker].moves[attackerMoveId] == gBattleMons[bank].moves[i]
+                        if (gBattleMons[gBattlerAttacker].moves[attackerMoveId] == gBattleMons[battlerId].moves[i]
                             && gBattleMons[gBattlerAttacker].moves[attackerMoveId] != MOVE_NONE)
                             break;
                     }
@@ -10085,7 +10085,7 @@ static void atkDB_tryimprision(void)
                 }
             }
         }
-        if (bank == gBattlersCount) // In Generation 3 games, Imprison fails if the user doesn't share any moves with any of the foes
+        if (battlerId == gBattlersCount) // In Generation 3 games, Imprison fails if the user doesn't share any moves with any of the foes
             gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
     }
 }
diff --git a/src/battle_util.c b/src/battle_util.c
index 70d1ffab2..ddd61ae19 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -383,7 +383,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
     else
         holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
 
-    gStringBattler = gActiveBattler;
+    gPotentialItemEffectBattler = gActiveBattler;
 
     if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move)
     {
@@ -427,7 +427,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
     else
         holdEffect = ItemId_GetHoldEffect(gBattleMons[battlerId].item);
 
-    gStringBattler = battlerId;
+    gPotentialItemEffectBattler = battlerId;
 
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
@@ -1912,9 +1912,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                     }
                     break;
                 case ABILITY_SPEED_BOOST:
-                    if (gBattleMons[battler].statStages[STAT_STAGE_SPEED] < 0xC && gDisableStructs[battler].isFirstTurn != 2)
+                    if (gBattleMons[battler].statStages[STAT_SPEED] < 0xC && gDisableStructs[battler].isFirstTurn != 2)
                     {
-                        gBattleMons[battler].statStages[STAT_STAGE_SPEED]++;
+                        gBattleMons[battler].statStages[STAT_SPEED]++;
                         gBattleScripting.animArg1 = 0x11;
                         gBattleScripting.animArg2 = 0;
                         BattleScriptPushCursorAndCallback(BattleScript_SpeedBoostActivates);
@@ -2564,7 +2564,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
             if (effect)
             {
                 gBattleScripting.battler = battlerId;
-                gStringBattler = battlerId;
+                gPotentialItemEffectBattler = battlerId;
                 gActiveBattler = gBattlerAttacker = battlerId;
                 BattleScriptExecute(BattleScript_WhiteHerbEnd2);
             }
@@ -2635,7 +2635,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 if (effect)
                 {
                     gBattleScripting.battler = battlerId;
-                    gStringBattler = battlerId;
+                    gPotentialItemEffectBattler = battlerId;
                     gActiveBattler = gBattlerAttacker = battlerId;
                     BattleScriptExecute(BattleScript_WhiteHerbEnd2);
                 }
@@ -2747,66 +2747,66 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 break;
             // copy/paste again, smh
             case HOLD_EFFECT_ATTACK_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_STAGE_ATK] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < 0xC)
                 {
-                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_ATK);
+                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK);
                     PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE);
 
                     gEffectBattler = battlerId;
-                    SET_STATCHANGER(STAT_STAGE_ATK, 1, FALSE);
-                    gBattleScripting.animArg1 = 0xE + STAT_STAGE_ATK;
+                    SET_STATCHANGER(STAT_ATK, 1, FALSE);
+                    gBattleScripting.animArg1 = 0xE + STAT_ATK;
                     gBattleScripting.animArg2 = 0;
                     BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                     effect = ITEM_STATS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_DEFENSE_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_STAGE_DEF] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_DEF] < 0xC)
                 {
-                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_DEF);
+                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_DEF);
 
                     gEffectBattler = battlerId;
-                    SET_STATCHANGER(STAT_STAGE_DEF, 1, FALSE);
-                    gBattleScripting.animArg1 = 0xE + STAT_STAGE_DEF;
+                    SET_STATCHANGER(STAT_DEF, 1, FALSE);
+                    gBattleScripting.animArg1 = 0xE + STAT_DEF;
                     gBattleScripting.animArg2 = 0;
                     BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                     effect = ITEM_STATS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_SPEED_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_STAGE_SPEED] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPEED] < 0xC)
                 {
-                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_SPEED);
+                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPEED);
 
                     gEffectBattler = battlerId;
-                    SET_STATCHANGER(STAT_STAGE_SPEED, 1, FALSE);
-                    gBattleScripting.animArg1 = 0xE + STAT_STAGE_SPEED;
+                    SET_STATCHANGER(STAT_SPEED, 1, FALSE);
+                    gBattleScripting.animArg1 = 0xE + STAT_SPEED;
                     gBattleScripting.animArg2 = 0;
                     BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                     effect = ITEM_STATS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_SP_ATTACK_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_STAGE_SPATK] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPATK] < 0xC)
                 {
-                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_SPATK);
+                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPATK);
 
                     gEffectBattler = battlerId;
-                    SET_STATCHANGER(STAT_STAGE_SPATK, 1, FALSE);
-                    gBattleScripting.animArg1 = 0xE + STAT_STAGE_SPATK;
+                    SET_STATCHANGER(STAT_SPATK, 1, FALSE);
+                    gBattleScripting.animArg1 = 0xE + STAT_SPATK;
                     gBattleScripting.animArg2 = 0;
                     BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                     effect = ITEM_STATS_CHANGE;
                 }
                 break;
             case HOLD_EFFECT_SP_DEFENSE_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_STAGE_SPDEF] < 0xC)
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / bankQuality && !moveTurn && gBattleMons[battlerId].statStages[STAT_SPDEF] < 0xC)
                 {
-                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_STAGE_SPDEF);
+                    PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPDEF);
 
                     gEffectBattler = battlerId;
-                    SET_STATCHANGER(STAT_STAGE_SPDEF, 1, FALSE);
-                    gBattleScripting.animArg1 = 0xE + STAT_STAGE_SPDEF;
+                    SET_STATCHANGER(STAT_SPDEF, 1, FALSE);
+                    gBattleScripting.animArg1 = 0xE + STAT_SPDEF;
                     gBattleScripting.animArg2 = 0;
                     BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
                     effect = ITEM_STATS_CHANGE;
@@ -2825,7 +2825,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 {
                     for (i = 0; i < 5; i++)
                     {
-                        if (gBattleMons[battlerId].statStages[STAT_STAGE_ATK + i] < 0xC)
+                        if (gBattleMons[battlerId].statStages[STAT_ATK + i] < 0xC)
                             break;
                     }
                     if (i != 5)
@@ -2833,7 +2833,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                         do
                         {
                             i = Random() % 5;
-                        } while (gBattleMons[battlerId].statStages[STAT_STAGE_ATK + i] == 0xC);
+                        } while (gBattleMons[battlerId].statStages[STAT_ATK + i] == 0xC);
 
                         PREPARE_STAT_BUFFER(gBattleTextBuff1, i + 1);
 
@@ -2963,7 +2963,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
             if (effect)
             {
                 gBattleScripting.battler = battlerId;
-                gStringBattler = battlerId;
+                gPotentialItemEffectBattler = battlerId;
                 gActiveBattler = gBattlerAttacker = battlerId;
                 switch (effect)
                 {
@@ -3111,7 +3111,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 if (effect)
                 {
                     gBattleScripting.battler = battlerId;
-                    gStringBattler = battlerId;
+                    gPotentialItemEffectBattler = battlerId;
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_WhiteHerbRet;
                     return effect; // unnecessary return
@@ -3121,7 +3121,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
             if (effect)
             {
                 gBattleScripting.battler = battlerId;
-                gStringBattler = battlerId;
+                gPotentialItemEffectBattler = battlerId;
                 gActiveBattler = battlerId;
                 BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
                 MarkBattlerForControllerExec(gActiveBattler);
@@ -3156,7 +3156,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                     && gBattleMons[gBattlerAttacker].hp != 0)
                 {
                     gLastUsedItem = atkItem;
-                    gStringBattler = gBattlerAttacker;
+                    gPotentialItemEffectBattler = gBattlerAttacker;
                     gBattleScripting.battler = gBattlerAttacker;
                     gBattleMoveDamage = (gSpecialStatuses[gBattlerTarget].dmg / atkQuality) * -1;
                     if (gBattleMoveDamage == 0)
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 48185c304..7ce58a80b 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -29,7 +29,7 @@ extern u8 gActiveBattler;
 extern u8 gBattlerInMenuId;
 extern u8 gBattlerTarget;
 extern u8 gBattlerAttacker;
-extern u8 gStringBattler;
+extern u8 gPotentialItemEffectBattler;
 extern u16 gTrainerBattleOpponent_A;
 extern u32 gBattleTypeFlags;
 extern u8 gBattleMonForms[4];
@@ -233,7 +233,7 @@ u8 *sub_806CF78(u16 itemId)
         itemEffect = gItemEffectTable[itemId - 13];
     }
 
-    gStringBattler = gBattlerInMenuId;
+    gPotentialItemEffectBattler = gBattlerInMenuId;
 
     for (i = 0; i < 3; i++)
     {
-- 
cgit v1.2.3


From ff6a0316c1b38b158fa70acb1ce496a8d0d30c77 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 9 Feb 2018 01:09:02 +0100
Subject: get rid of unnecessary externs

---
 src/battle_interface.c       | 3 ---
 src/battle_main.c            | 9 +++------
 src/battle_message.c         | 6 +++---
 src/battle_script_commands.c | 1 -
 src/battle_setup.c           | 6 +-----
 src/battle_transition.c      | 1 -
 src/reshow_battle_screen.c   | 3 ---
 7 files changed, 7 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/battle_interface.c b/src/battle_interface.c
index c554863c5..bc6ff1122 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -172,9 +172,6 @@ extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
 extern const u8 gHealthboxElementsGfxTable[][32];
 
-// functions
-extern void LoadBattleBarGfx(u8 arg0);
-
 // this file's functions
 
 static const u8 *GetHealthboxElementGfxPtr(u8 elementId);
diff --git a/src/battle_main.c b/src/battle_main.c
index c1dfde8c3..3c4a61600 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -7,6 +7,7 @@
 #include "scanline_effect.h"
 #include "battle_setup.h"
 #include "battle_scripts.h"
+#include "battle_interface.h"
 #include "pokemon.h"
 #include "palette.h"
 #include "task.h"
@@ -46,6 +47,8 @@
 #include "constants/battle_string_ids.h"
 #include "data2.h"
 #include "decompress.h"
+#include "international_string_util.h"
+#include "pokeball.h"
 
 struct UnknownPokemonStruct2
 {
@@ -107,17 +110,11 @@ extern const u8 gText_Confusion[];
 extern const u8 gText_Love[];
 
 // functions
-extern void ScanlineEffect_Clear(void);
-extern void sub_80356D0(void);
 extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower
 extern void sub_8166188(void); // battle tower, sets link battle mons level but why?
 extern void sub_8165B88(u8* dst, u16 trainerId); // battle tower, gets language
-extern void PadNameString(u8* dst, u8 arg2); //
 extern void sub_81B9150(void);
-extern void sub_800AC34(void);
 extern void sub_80B3AF8(u8 taskId); // cable club
-extern void sub_8076918(u8 battlerId);
-extern void SetHealthboxSpriteVisible(u8 healthoxSpriteId);
 extern void sub_81A56B4(void); // battle frontier 2
 extern u8 sub_81A9E28(void); // battle frontier 2
 extern void sub_81A56E8(u8 battlerId); // battle frontier 2
diff --git a/src/battle_message.c b/src/battle_message.c
index ff608b6c5..2b9783f1a 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -13,6 +13,9 @@
 #include "palette.h"
 #include "battle_controllers.h"
 #include "battle_setup.h"
+#include "menu.h"
+#include "recorded_battle.h"
+#include "international_string_util.h"
 
 extern u8 gBattlerAbilities[MAX_BATTLERS_COUNT];
 extern u8 gUnknown_0203C7B4;
@@ -41,9 +44,6 @@ extern void GetEreaderTrainerName(u8 *txtPtr);
 extern void sub_81A36D0(u8 arg0, u16 trainerId); // battle_frontier_2
 extern void sub_81D572C(u8 arg0, u16 trainerId); // pokenav
 extern void GetFrontierTrainerName(u8 *dst, u16 trainerId);
-extern s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, const u8 *str, s32 totalWidth, s16 letterSpacing);
-extern u8 GetTextSpeedInRecordedBattle(void);
-extern u8 GetPlayerTextSpeed(void);
 
 // this file's functions
 static void sub_814F8F8(u8 *textPtr);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index e8f2a5508..4d40d83a8 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -81,7 +81,6 @@ extern u16 GetBattlePyramidPickupItemId(void);
 extern u8 sav1_map_get_light_level(void);
 extern u8 sub_813B21C(void);
 extern u16 get_unknown_box_id(void);
-extern void sub_80356D0(void);
 
 // strings
 extern const u8 gText_BattleYesNoChoice[];
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 81600cab7..52ed99b21 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -31,6 +31,7 @@
 #include "secret_base.h"
 #include "string_util.h"
 #include "overworld.h"
+#include "field_weather.h"
 
 enum
 {
@@ -60,14 +61,11 @@ extern void sub_81BE72C(void);
 extern void FreezeMapObjects(void);
 extern void sub_808BCF4(void);
 extern void sub_80EECC8(void);
-extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
-extern void c2_exit_to_overworld_2_switch(void);
 extern void Overworld_ClearSavedMusic(void);
 extern void CB2_WhiteOut(void);
 extern void sub_80AF6F0(void);
 extern void PlayBattleBGM(void);
 extern void sub_81DA57C(void);
-extern u8 GetSav1Weather(void);
 extern u8 Overworld_GetFlashLevel(void);
 extern u16 sub_81A9AA8(u8 localId);
 extern u16 sub_81D6180(u8 localId);
@@ -84,8 +82,6 @@ extern void sub_80982B8(void);
 extern void sub_81A9EDC(u16 a0);
 extern void sub_81D572C(u8 a0, u16 arg1);
 
-extern void (*gFieldCallback)(void);
-
 // this file's functions
 static void DoBattlePikeWildBattle(void);
 static void DoSafariBattle(void);
diff --git a/src/battle_transition.c b/src/battle_transition.c
index bb7a02f41..e0d208f23 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -61,7 +61,6 @@ extern u16 gBattle_BG0_Y;
 
 extern const struct OamData gFieldObjectBaseOam_32x32;
 
-extern void c2_exit_to_overworld_2_switch(void);
 extern void sub_80AC3D0(void);
 
 // this file's functions
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 1a7792e36..b12917c61 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -26,9 +26,6 @@ extern struct SpriteTemplate gUnknown_0202499C;
 
 extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
 
-extern void sub_8035658(void);
-extern u8 GetSubstituteSpriteDefault_Y(u8 bank);
-extern u8 sub_80A82E4(u8 bank);
 extern void sub_806A068(u16 species, u8 bankIdentity);
 extern void sub_806A12C(u16 backPicId, u8 bankIdentity);
 
-- 
cgit v1.2.3


From 4c19790ff1667a111fe9c404ec467d2413a34e3c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 11 Feb 2018 21:05:42 +0100
Subject: review battle code clean up change

---
 src/recorded_battle.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 5ad43712d..64a45605e 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -15,7 +15,7 @@
 #include "text.h"
 #include "battle_setup.h"
 
-#define BANK_RECORD_SIZE 664
+#define BATTLER_RECORD_SIZE 664
 #define ILLEGAL_BATTLE_TYPES ((BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_FIRST_BATTLE                  \
                               | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER   \
                               | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI           \
@@ -67,13 +67,13 @@ struct RecordedBattleSave
     u16 field_50E[6];
     u8 field_51A;
     u8 field_51B;
-    u8 battleRecord[MAX_BATTLERS_COUNT][BANK_RECORD_SIZE];
+    u8 battleRecord[MAX_BATTLERS_COUNT][BATTLER_RECORD_SIZE];
     u32 checksum;
 };
 
 EWRAM_DATA u32 gRecordedBattleRngSeed = 0;
 EWRAM_DATA u32 gBattlePalaceMoveSelectionRngValue = 0;
-EWRAM_DATA static u8 sBattleRecords[MAX_BATTLERS_COUNT][BANK_RECORD_SIZE] = {0};
+EWRAM_DATA static u8 sBattleRecords[MAX_BATTLERS_COUNT][BATTLER_RECORD_SIZE] = {0};
 EWRAM_DATA static u16 sRecordedBytesNo[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA static u16 sUnknown_0203C79C[4] = {0};
 EWRAM_DATA static u16 sUnknown_0203C7A4[4] = {0};
@@ -123,7 +123,7 @@ void sub_8184DA4(u8 arg0)
 
         if (arg0 == 1)
         {
-            for (j = 0; j < BANK_RECORD_SIZE; j++)
+            for (j = 0; j < BATTLER_RECORD_SIZE; j++)
             {
                 sBattleRecords[i][j] |= 0xFF;
             }
@@ -194,7 +194,7 @@ void sub_8184E58(void)
 
 void RecordedBattle_SetBattlerAction(u8 battlerId, u8 action)
 {
-    if (sRecordedBytesNo[battlerId] < BANK_RECORD_SIZE && sUnknown_0203C7AC != 2)
+    if (sRecordedBytesNo[battlerId] < BATTLER_RECORD_SIZE && sUnknown_0203C7AC != 2)
     {
         sBattleRecords[battlerId][sRecordedBytesNo[battlerId]++] = action;
     }
@@ -216,7 +216,7 @@ void RecordedBattle_ClearBattlerAction(u8 battlerId, u8 bytesToClear)
 u8 RecordedBattle_GetBattlerAction(u8 battlerId)
 {
     // trying to read past array or invalid action byte, battle is over
-    if (sRecordedBytesNo[battlerId] >= BANK_RECORD_SIZE || sBattleRecords[battlerId][sRecordedBytesNo[battlerId]] == 0xFF)
+    if (sRecordedBytesNo[battlerId] >= BATTLER_RECORD_SIZE || sBattleRecords[battlerId][sRecordedBytesNo[battlerId]] == 0xFF)
     {
         gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; // hah
         ResetPaletteFadeControl();
@@ -1380,7 +1380,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src)
 
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
-        for (j = 0; j < BANK_RECORD_SIZE; j++)
+        for (j = 0; j < BATTLER_RECORD_SIZE; j++)
         {
             sBattleRecords[i][j] = src->battleRecord[i][j];
         }
-- 
cgit v1.2.3


From d704a2b5df0a7957f6df06669cf4423e5026d87b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 11 Feb 2018 21:45:26 +0100
Subject: thonk

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

(limited to 'src')

diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 64a45605e..e60457257 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -50,7 +50,7 @@ struct RecordedBattleSave
     u8 playersLanguage[MAX_BATTLERS_COUNT];
     u32 rngSeed;
     u32 battleFlags;
-    u8 playersBattler[MAX_BATTLERS_COUNT];
+    u8 playersBattlers[MAX_BATTLERS_COUNT];
     u16 opponentA;
     u16 opponentB;
     u16 partnerId;
@@ -350,7 +350,7 @@ u32 MoveRecordedBattleToSaveData(void)
         }
         battleSave->playersGender[i] = sRecordedBattle_Players[i].gender;
         battleSave->playersLanguage[i] = sRecordedBattle_Players[i].language;
-        battleSave->playersBattler[i] = sRecordedBattle_Players[i].battlerId;
+        battleSave->playersBattlers[i] = sRecordedBattle_Players[i].battlerId;
         battleSave->playersTrainerId[i] = sRecordedBattle_Players[i].trainerId;
     }
 
@@ -1341,7 +1341,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src)
         }
         gLinkPlayers[i].gender = src->playersGender[i];
         gLinkPlayers[i].language = src->playersLanguage[i];
-        gLinkPlayers[i].lp_field_18 = src->playersBattler[i];
+        gLinkPlayers[i].lp_field_18 = src->playersBattlers[i];
         gLinkPlayers[i].trainerId = src->playersTrainerId[i];
 
         if (var)
-- 
cgit v1.2.3